ConditionEvaluator - more string compare operators implemented

coinfirm · Nov 2, 2020 · 194c446 · 194c446
1 parent f0b594f
commit 194c446
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/src/main/java/com/mapr/db/impl/ConditionEvaluator.java b/src/main/java/com/mapr/db/impl/ConditionEvaluator.java
@@ -2,6 +2,7 @@
 
 import com.github.anicolaspp.ojai.DocumentProjector;
 import com.mapr.db.rowcol.KeyValue;
+import com.mapr.fs.proto.Dbfilters;
 import org.ojai.Document;
 import org.ojai.Value;
 import org.ojai.store.Connection;
@@ -32,7 +33,7 @@ private boolean evalCondition(ConditionNode condition, Document document) {
             return getAllLeafValues(projected, "")
                     .filter(pair -> pair._1.equals(leaf.getField().asPathString().replace("[]", "")))
                     .map(Tuple2::_2)
-                    .anyMatch(value -> cmp(leaf.getValue(), value));
+                    .anyMatch(value -> cmp(leaf.getValue(), value, leaf.getOp()));
         } else {
             ConditionBlock block = (ConditionBlock) condition;
 
@@ -46,15 +47,26 @@ private boolean evalCondition(ConditionNode condition, Document document) {
         }
     }
 
-    private boolean cmp(KeyValue keyValue, Value value) {
+    private boolean cmp(KeyValue keyValue, Value value, Dbfilters.CompareOpProto op) {
         switch (value.getType()) {
 
             case NULL:
                 return keyValue.getType().getCode() == Value.TYPE_CODE_NULL;
             case BOOLEAN:
                 return keyValue.getBoolean() == value.getBoolean();
             case STRING:
-                return keyValue.getString().equals(value.getString());
+                switch (op) {
+                    case LESS:
+                        return value.getString().compareTo(keyValue.getString()) < 0;
+                    case LESS_OR_EQUAL:
+                        return value.getString().compareTo(keyValue.getString()) <= 0;
+                    case GREATER:
+                        return value.getString().compareTo(keyValue.getString()) > 0;
+                    case GREATER_OR_EQUAL:
+                        return value.getString().compareTo(keyValue.getString()) >= 0;
+                    default:
+                        return keyValue.getString().equals(value.getString());
+                }
             case BYTE:
                 return keyValue.getByte() == value.getByte();
             case SHORT: