Revert "Add position() to V2 engine (#177)"

This reverts commit eee57aa. Signed-off-by: Margarit Hakobyan <[email protected]>
Bit-Quill · Dec 6, 2022 · 35ac23b · 35ac23b
1 parent cab64ae
commit 35ac23b
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 73 deletions.
diff --git a/core/src/main/java/org/opensearch/sql/analysis/ExpressionAnalyzer.java b/core/src/main/java/org/opensearch/sql/analysis/ExpressionAnalyzer.java
@@ -34,7 +34,6 @@
 import org.opensearch.sql.ast.expression.Literal;
 import org.opensearch.sql.ast.expression.Not;
 import org.opensearch.sql.ast.expression.Or;
-import org.opensearch.sql.ast.expression.PositionFunction;
 import org.opensearch.sql.ast.expression.QualifiedName;
 import org.opensearch.sql.ast.expression.RelevanceFieldList;
 import org.opensearch.sql.ast.expression.Span;
@@ -202,13 +201,6 @@ public Expression visitHighlightFunction(HighlightFunction node, AnalysisContext
     return new HighlightExpression(expr);
   }
 
-  @Override
-  public Expression visitPositionFunction(PositionFunction node, AnalysisContext context) {
-    Expression stringPatternExpr = node.getStringPatternExpr().accept(this, context);
-    Expression searchStringExpr = node.getSearchStringExpr().accept(this, context);
-    return DSL.position(stringPatternExpr, searchStringExpr);
-  }
-
   @Override
   public Expression visitIn(In node, AnalysisContext context) {
     return visitIn(node.getField(), node.getValueList(), context);

diff --git a/core/src/main/java/org/opensearch/sql/ast/AbstractNodeVisitor.java b/core/src/main/java/org/opensearch/sql/ast/AbstractNodeVisitor.java
@@ -26,7 +26,6 @@
 import org.opensearch.sql.ast.expression.Map;
 import org.opensearch.sql.ast.expression.Not;
 import org.opensearch.sql.ast.expression.Or;
-import org.opensearch.sql.ast.expression.PositionFunction;
 import org.opensearch.sql.ast.expression.QualifiedName;
 import org.opensearch.sql.ast.expression.RelevanceFieldList;
 import org.opensearch.sql.ast.expression.Span;
@@ -274,10 +273,6 @@ public T visitHighlightFunction(HighlightFunction node, C context) {
     return visitChildren(node, context);
   }
 
-  public T visitPositionFunction(PositionFunction node, C context) {
-    return visitChildren(node, context);
-  }
-
   public T visitStatement(Statement node, C context) {
     return visit(node, context);
   }

diff --git a/core/src/main/java/org/opensearch/sql/ast/dsl/AstDSL.java b/core/src/main/java/org/opensearch/sql/ast/dsl/AstDSL.java
@@ -32,7 +32,6 @@
 import org.opensearch.sql.ast.expression.Not;
 import org.opensearch.sql.ast.expression.Or;
 import org.opensearch.sql.ast.expression.ParseMethod;
-import org.opensearch.sql.ast.expression.PositionFunction;
 import org.opensearch.sql.ast.expression.QualifiedName;
 import org.opensearch.sql.ast.expression.Span;
 import org.opensearch.sql.ast.expression.SpanUnit;
@@ -284,11 +283,6 @@ public UnresolvedExpression highlight(UnresolvedExpression fieldName,
     return new HighlightFunction(fieldName, arguments);
   }
 
-  public UnresolvedExpression position(UnresolvedExpression stringPatternExpr,
-                                       UnresolvedExpression searchStringExpr) {
-    return new PositionFunction(stringPatternExpr, searchStringExpr);
-  }
-
   public UnresolvedExpression window(UnresolvedExpression function,
                                      List<UnresolvedExpression> partitionByList,
                                      List<Pair<SortOption, UnresolvedExpression>> sortList) {

diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/PositionFunction.java b/core/src/main/java/org/opensearch/sql/ast/expression/PositionFunction.java
diff --git a/core/src/main/java/org/opensearch/sql/expression/DSL.java b/core/src/main/java/org/opensearch/sql/expression/DSL.java
@@ -234,10 +234,6 @@ public static FunctionExpression position(Expression... expressions) {
     return compile(FunctionProperties.None, BuiltinFunctionName.POSITION, expressions);
   }
 
-  public static FunctionExpression position(Expression... expressions) {
-    return compile(BuiltinFunctionName.POSITION, expressions);
-  }
-
   public static FunctionExpression truncate(Expression... expressions) {
     return compile(FunctionProperties.None, BuiltinFunctionName.TRUNCATE, expressions);
   }

diff --git a/core/src/test/java/org/opensearch/sql/analysis/NamedExpressionAnalyzerTest.java b/core/src/test/java/org/opensearch/sql/analysis/NamedExpressionAnalyzerTest.java
@@ -16,7 +16,6 @@
 import org.opensearch.sql.ast.expression.Alias;
 import org.opensearch.sql.ast.expression.HighlightFunction;
 import org.opensearch.sql.ast.expression.Literal;
-import org.opensearch.sql.ast.expression.PositionFunction;
 import org.opensearch.sql.expression.NamedExpression;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.context.ContextConfiguration;
@@ -49,14 +48,4 @@ void visit_highlight() {
     NamedExpression analyze = analyzer.analyze(alias, analysisContext);
     assertEquals("highlight(fieldA)", analyze.getNameOrAlias());
   }
-
-  @Test
-  void visit_position() {
-    Alias alias = AstDSL.alias("position(fieldA IN fieldB)",
-        new PositionFunction(AstDSL.stringLiteral("fieldA"), AstDSL.stringLiteral("fieldB")));
-    NamedExpressionAnalyzer analyzer = new NamedExpressionAnalyzer(expressionAnalyzer);
-
-    NamedExpression analyze = analyzer.analyze(alias, analysisContext);
-    assertEquals("position(fieldA IN fieldB)", analyze.getNameOrAlias());
-  }
 }