Rename SIZEOF to SIZEIS (#50)

Author: hbxie

src/main/java/com/yahoo/bullet/parsing/Clause.java

@@ -39,8 +39,8 @@ public enum Operation {
         LESS_EQUALS,
         @SerializedName("RLIKE")
         REGEX_LIKE,
-        @SerializedName("SIZEOF")
-        SIZE_OF,
+        @SerializedName("SIZEIS")
+        SIZE_IS,
         @SerializedName("CONTAINSKEY")
         CONTAINS_KEY,
         @SerializedName("CONTAINSVALUE")
@@ -53,7 +53,7 @@ public enum Operation {
         NOT;
 
         public static final List<String> LOGICALS = asList("AND", "OR", "NOT");
-        public static final List<String> RELATIONALS = asList("==", "!=", ">=", "<=", ">", "<", "RLIKE", "SIZEOF", "CONTAINSKEY", "CONTAINSVALUE");
+        public static final List<String> RELATIONALS = asList("==", "!=", ">=", "<=", ">", "<", "RLIKE", "SIZEIS", "CONTAINSKEY", "CONTAINSVALUE");
     }
 
     @Expose

src/main/java/com/yahoo/bullet/querying/FilterOperations.java

@@ -63,7 +63,7 @@ public interface LogicalOperator extends BiPredicate<BulletRecord, Stream<Boolea
     private static final Comparator<TypedObject> GE = (t, s) -> s.anyMatch(i -> t.compareTo(i) >= 0);
     private static final Comparator<TypedObject> LE = (t, s) -> s.anyMatch(i -> t.compareTo(i) <= 0);
     private static final Comparator<Pattern> RLIKE = (t, s) -> s.map(p -> p.matcher(t.toString())).anyMatch(Matcher::matches);
-    private static final Comparator<TypedObject> SIZEOF = (t, s) -> s.anyMatch(i -> i.equalTo(t.size()));
+    private static final Comparator<TypedObject> SIZEIS = (t, s) -> s.anyMatch(i -> i.equalTo(t.size()));
     private static final Comparator<TypedObject> CONTAINSKEY = (t, s) -> s.anyMatch(i -> t.containsKey((String) i.getValue()));
     private static final Comparator<TypedObject> CONTAINSVALUE = (t, s) -> s.anyMatch(t::containsValue);
     private static final LogicalOperator AND = (r, s) -> s.allMatch(Boolean::valueOf);
@@ -78,7 +78,7 @@ public interface LogicalOperator extends BiPredicate<BulletRecord, Stream<Boolea
         COMPARATORS.put(Clause.Operation.LESS_THAN, isNotNullAnd(LT));
         COMPARATORS.put(Clause.Operation.GREATER_EQUALS, isNotNullAnd(GE));
         COMPARATORS.put(Clause.Operation.LESS_EQUALS, isNotNullAnd(LE));
-        COMPARATORS.put(Clause.Operation.SIZE_OF, isNotNullAnd(SIZEOF));
+        COMPARATORS.put(Clause.Operation.SIZE_IS, isNotNullAnd(SIZEIS));
         COMPARATORS.put(Clause.Operation.CONTAINS_KEY, isNotNullAnd(CONTAINSKEY));
         COMPARATORS.put(Clause.Operation.CONTAINS_VALUE, isNotNullAnd(CONTAINSVALUE));
     }
@@ -129,8 +129,9 @@ private static boolean performRelational(BulletRecord record, ObjectFilterClause
             return REGEX_LIKE.compare(object, clause.getPatterns().stream());
         }
 
+
         Type type;
-        if (operator == Clause.Operation.SIZE_OF) {
+        if (operator == Clause.Operation.SIZE_IS) {
             type = Type.INTEGER;
         } else if (operator == Clause.Operation.CONTAINS_KEY) {
             type = Type.STRING;

src/test/java/com/yahoo/bullet/querying/FilterOperationsTest.java

@@ -39,7 +39,7 @@
 import static com.yahoo.bullet.parsing.Clause.Operation.NOT_EQUALS;
 import static com.yahoo.bullet.parsing.Clause.Operation.OR;
 import static com.yahoo.bullet.parsing.Clause.Operation.REGEX_LIKE;
-import static com.yahoo.bullet.parsing.Clause.Operation.SIZE_OF;
+import static com.yahoo.bullet.parsing.Clause.Operation.SIZE_IS;
 import static com.yahoo.bullet.parsing.FilterUtils.getFieldFilter;
 import static com.yahoo.bullet.parsing.FilterUtils.getObjectFieldFilter;
 import static com.yahoo.bullet.parsing.FilterUtils.makeClause;
@@ -362,7 +362,7 @@ public void testBadRegex() {
 
     @Test
     public void testSizeOf() {
-        FilterClause clause = getFieldFilter("id", SIZE_OF, "1", "2");
+        FilterClause clause = getFieldFilter("id", SIZE_IS, "1", "2");
         Assert.assertFalse(FilterOperations.perform(RecordBox.get().getRecord(), clause));
         Assert.assertFalse(FilterOperations.perform(RecordBox.get().add("id", 1).getRecord(), clause));
         Assert.assertTrue(FilterOperations.perform(RecordBox.get().add("id", "12").getRecord(), clause));