Adds Modulus, LOWER, and UPPER functions (#97)

Author: 0aix

src/main/java/com/yahoo/bullet/query/expressions/Operation.java

@@ -21,6 +21,7 @@ public enum Operation {
     SUB("-"),
     MUL("*"),
     DIV("/"),
+    MOD("%"),
     EQUALS("="),
     EQUALS_ANY("= ANY"),
     EQUALS_ALL("= ALL"),
@@ -62,17 +63,19 @@ public enum Operation {
     BETWEEN("BETWEEN"),
     NOT_BETWEEN("NOT BETWEEN"),
     SUBSTRING("SUBSTRING"),
-    UNIX_TIMESTAMP("UNIXTIMESTAMP");
+    UNIX_TIMESTAMP("UNIXTIMESTAMP"),
+    LOWER("LOWER"),
+    UPPER("UPPER");
 
     public static final Set<Operation> BINARY_OPERATIONS =
-            new HashSet<>(asList(ADD, SUB, MUL, DIV,
+            new HashSet<>(asList(ADD, SUB, MUL, DIV, MOD,
                                  EQUALS, EQUALS_ANY, EQUALS_ALL, NOT_EQUALS, NOT_EQUALS_ANY, NOT_EQUALS_ALL,
                                  GREATER_THAN, GREATER_THAN_ANY, GREATER_THAN_ALL, LESS_THAN, LESS_THAN_ANY, LESS_THAN_ALL,
                                  GREATER_THAN_OR_EQUALS, GREATER_THAN_OR_EQUALS_ANY, GREATER_THAN_OR_EQUALS_ALL,
                                  LESS_THAN_OR_EQUALS, LESS_THAN_OR_EQUALS_ANY, LESS_THAN_OR_EQUALS_ALL, REGEX_LIKE, REGEX_LIKE_ANY,
                                  NOT_REGEX_LIKE, NOT_REGEX_LIKE_ANY, SIZE_IS, CONTAINS_KEY, CONTAINS_VALUE, IN, NOT_IN,
                                  AND, OR, XOR, FILTER));
-    public static final Set<Operation> UNARY_OPERATIONS = new HashSet<>(asList(NOT, SIZE_OF, IS_NULL, IS_NOT_NULL, TRIM, ABS));
+    public static final Set<Operation> UNARY_OPERATIONS = new HashSet<>(asList(NOT, SIZE_OF, IS_NULL, IS_NOT_NULL, TRIM, ABS, LOWER, UPPER));
     public static final Set<Operation> N_ARY_OPERATIONS = new HashSet<>(asList(AND, OR, IF, BETWEEN, NOT_BETWEEN, SUBSTRING, UNIX_TIMESTAMP));
 
     private String name;

src/main/java/com/yahoo/bullet/querying/evaluators/BinaryOperations.java

@@ -37,6 +37,7 @@ public interface BinaryOperator extends Serializable {
         BINARY_OPERATORS.put(Operation.SUB, BinaryOperations::sub);
         BINARY_OPERATORS.put(Operation.MUL, BinaryOperations::mul);
         BINARY_OPERATORS.put(Operation.DIV, BinaryOperations::div);
+        BINARY_OPERATORS.put(Operation.MOD, BinaryOperations::mod);
         BINARY_OPERATORS.put(Operation.EQUALS, BinaryOperations::equals);
         BINARY_OPERATORS.put(Operation.EQUALS_ANY, BinaryOperations::equalsAny);
         BINARY_OPERATORS.put(Operation.EQUALS_ALL, BinaryOperations::equalsAll);
@@ -134,6 +135,22 @@ static TypedObject div(Evaluator left, Evaluator right, BulletRecord record) {
         });
     }
 
+    static TypedObject mod(Evaluator left, Evaluator right, BulletRecord record) {
+        return checkNull(left, right, record, (leftValue, rightValue) -> {
+            Type type = getArithmeticResultType(leftValue.getType(), rightValue.getType());
+            switch (type) {
+                case DOUBLE:
+                    return new TypedObject(Type.DOUBLE, getDouble(leftValue) % getDouble(rightValue));
+                case FLOAT:
+                    return new TypedObject(Type.FLOAT, getFloat(leftValue) % getFloat(rightValue));
+                case LONG:
+                    return new TypedObject(Type.LONG, getLong(leftValue) % getLong(rightValue));
+                default:
+                    return new TypedObject(Type.INTEGER, getInteger(leftValue) % getInteger(rightValue));
+            }
+        });
+    }
+
     static TypedObject equals(Evaluator left, Evaluator right, BulletRecord record) {
         return checkNull(left, right, record, (leftValue, rightValue) -> TypedObject.valueOf(leftValue.equalTo(rightValue)));
     }

src/main/java/com/yahoo/bullet/querying/evaluators/UnaryOperations.java

@@ -33,6 +33,8 @@ public interface UnaryOperator extends Serializable {
         UNARY_OPERATORS.put(Operation.IS_NOT_NULL, UnaryOperations::isNotNull);
         UNARY_OPERATORS.put(Operation.TRIM, UnaryOperations::trim);
         UNARY_OPERATORS.put(Operation.ABS, UnaryOperations::abs);
+        UNARY_OPERATORS.put(Operation.LOWER, UnaryOperations::lower);
+        UNARY_OPERATORS.put(Operation.UPPER, UnaryOperations::upper);
     }
 
     static TypedObject not(Evaluator evaluator, BulletRecord record) {
@@ -58,6 +60,20 @@ static TypedObject trim(Evaluator evaluator, BulletRecord record) {
         });
     }
 
+    static TypedObject lower(Evaluator evaluator, BulletRecord record) {
+        return checkNull(evaluator, record, value -> {
+            String str = (String) value.getValue();
+            return TypedObject.valueOf(str.toLowerCase());
+        });
+    }
+
+    static TypedObject upper(Evaluator evaluator, BulletRecord record) {
+        return checkNull(evaluator, record, value -> {
+            String str = (String) value.getValue();
+            return TypedObject.valueOf(str.toUpperCase());
+        });
+    }
+
     static TypedObject abs(Evaluator evaluator, BulletRecord record) {
         return checkNull(evaluator, record, value -> {
             Number number = (Number) value.getValue();

src/test/java/com/yahoo/bullet/querying/evaluators/BinaryOperationsTest.java

@@ -71,6 +71,17 @@ public void testDiv() {
         Assert.assertEquals(BinaryOperations.div(valueEvaluator(null), valueEvaluator(null), null), TypedObject.NULL);
     }
 
+    @Test
+    public void testMod() {
+        Assert.assertEquals(BinaryOperations.mod(valueEvaluator(7.0), valueEvaluator(4.0f), null), new TypedObject(Type.DOUBLE, 3.0));
+        Assert.assertEquals(BinaryOperations.mod(valueEvaluator(5.0f), valueEvaluator(4L), null), new TypedObject(Type.FLOAT, 1.0f));
+        Assert.assertEquals(BinaryOperations.mod(valueEvaluator(6L), valueEvaluator(4), null), new TypedObject(Type.LONG, 2L));
+        Assert.assertEquals(BinaryOperations.mod(valueEvaluator(4), valueEvaluator(4), null), new TypedObject(Type.INTEGER, 0));
+        Assert.assertEquals(BinaryOperations.mod(valueEvaluator(null), valueEvaluator(4), null), TypedObject.NULL);
+        Assert.assertEquals(BinaryOperations.mod(valueEvaluator(2), valueEvaluator(null), null), TypedObject.NULL);
+        Assert.assertEquals(BinaryOperations.mod(valueEvaluator(null), valueEvaluator(null), null), TypedObject.NULL);
+    }
+
     @Test
     public void testEquals() {
         Assert.assertEquals(BinaryOperations.equals(valueEvaluator(2), valueEvaluator(4), null), TypedObject.FALSE);

src/test/java/com/yahoo/bullet/querying/evaluators/UnaryOperationsTest.java

@@ -69,4 +69,18 @@ public void testAbs() {
         Assert.assertEquals(UnaryOperations.abs(valueEvaluator(-2), null), TypedObject.valueOf(2));
         Assert.assertEquals(UnaryOperations.abs(valueEvaluator(null), null), TypedObject.NULL);
     }
+
+    @Test
+    public void testLower() {
+        Assert.assertEquals(UnaryOperations.lower(valueEvaluator("HELLO"), null), TypedObject.valueOf("hello"));
+        Assert.assertEquals(UnaryOperations.lower(valueEvaluator("hello"), null), TypedObject.valueOf("hello"));
+        Assert.assertEquals(UnaryOperations.lower(valueEvaluator(null), null), TypedObject.NULL);
+    }
+
+    @Test
+    public void testUpper() {
+        Assert.assertEquals(UnaryOperations.upper(valueEvaluator("HELLO"), null), TypedObject.valueOf("HELLO"));
+        Assert.assertEquals(UnaryOperations.upper(valueEvaluator("hello"), null), TypedObject.valueOf("HELLO"));
+        Assert.assertEquals(UnaryOperations.upper(valueEvaluator(null), null), TypedObject.NULL);
+    }
 }