Refactor to take-in the wrapping LHS parser

hypertrace · Dec 30, 2023 · cc4347c · cc4347c
1 parent 0960315
commit cc4347c
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/...org/hypertrace/core/documentstore/mongo/query/parser/MongoFilterTypeExpressionParser.java b/...org/hypertrace/core/documentstore/mongo/query/parser/MongoFilterTypeExpressionParser.java
@@ -6,6 +6,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.function.Function;
+import java.util.function.UnaryOperator;
 import org.hypertrace.core.documentstore.Key;
 import org.hypertrace.core.documentstore.expression.impl.ArrayRelationalFilterExpression;
 import org.hypertrace.core.documentstore.expression.impl.DocumentArrayFilterExpression;
@@ -20,16 +21,27 @@ public final class MongoFilterTypeExpressionParser implements FilterTypeExpressi
 
   private static final String FILTER_CLAUSE = "$match";
 
+  private final UnaryOperator<MongoSelectTypeExpressionParser> wrappingLhsParser;
+
+  public MongoFilterTypeExpressionParser() {
+    this(UnaryOperator.identity());
+  }
+
+  public MongoFilterTypeExpressionParser(
+      final UnaryOperator<MongoSelectTypeExpressionParser> wrappingLhsParser) {
+    this.wrappingLhsParser = wrappingLhsParser;
+  }
+
   @SuppressWarnings("unchecked")
   @Override
   public Map<String, Object> visit(final LogicalExpression expression) {
-    return new MongoLogicalExpressionParser().parse(expression);
+    return new MongoLogicalExpressionParser(wrappingLhsParser).parse(expression);
   }
 
   @SuppressWarnings("unchecked")
   @Override
   public Map<String, Object> visit(final RelationalExpression expression) {
-    return new MongoRelationalExpressionParser().parse(expression);
+    return new MongoRelationalExpressionParser(wrappingLhsParser).parse(expression);
   }
 
   @SuppressWarnings("unchecked")

diff --git a/...va/org/hypertrace/core/documentstore/mongo/query/parser/MongoLogicalExpressionParser.java b/...va/org/hypertrace/core/documentstore/mongo/query/parser/MongoLogicalExpressionParser.java
@@ -8,6 +8,7 @@
 import java.util.EnumMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.UnaryOperator;
 import java.util.stream.Collectors;
 import org.hypertrace.core.documentstore.expression.impl.LogicalExpression;
 import org.hypertrace.core.documentstore.expression.operators.LogicalOperator;
@@ -23,6 +24,13 @@ final class MongoLogicalExpressionParser {
             }
           });
 
+  private final UnaryOperator<MongoSelectTypeExpressionParser> wrappingLhsParser;
+
+  MongoLogicalExpressionParser(
+      final UnaryOperator<MongoSelectTypeExpressionParser> wrappingLhsParser) {
+    this.wrappingLhsParser = wrappingLhsParser;
+  }
+
   Map<String, Object> parse(final LogicalExpression expression) {
     LogicalOperator operator = expression.getOperator();
     String key = KEY_MAP.get(operator);
@@ -31,7 +39,7 @@ Map<String, Object> parse(final LogicalExpression expression) {
       throw getUnsupportedOperationException(operator);
     }
 
-    FilterTypeExpressionVisitor parser = new MongoFilterTypeExpressionParser();
+    FilterTypeExpressionVisitor parser = new MongoFilterTypeExpressionParser(wrappingLhsParser);
     List<Object> parsed =
         expression.getOperands().stream()
             .map(exp -> exp.accept(parser))