Skip to content

Commit b0d0014

Browse files
committed
Revert "Add position() to V2 engine (#177)"
This reverts commit eee57aa.
1 parent eee57aa commit b0d0014

File tree

6 files changed

+0
-73
lines changed

6 files changed

+0
-73
lines changed

core/src/main/java/org/opensearch/sql/analysis/ExpressionAnalyzer.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import org.opensearch.sql.ast.expression.Literal;
3535
import org.opensearch.sql.ast.expression.Not;
3636
import org.opensearch.sql.ast.expression.Or;
37-
import org.opensearch.sql.ast.expression.PositionFunction;
3837
import org.opensearch.sql.ast.expression.QualifiedName;
3938
import org.opensearch.sql.ast.expression.RelevanceFieldList;
4039
import org.opensearch.sql.ast.expression.Span;
@@ -202,13 +201,6 @@ public Expression visitHighlightFunction(HighlightFunction node, AnalysisContext
202201
return new HighlightExpression(expr);
203202
}
204203

205-
@Override
206-
public Expression visitPositionFunction(PositionFunction node, AnalysisContext context) {
207-
Expression stringPatternExpr = node.getStringPatternExpr().accept(this, context);
208-
Expression searchStringExpr = node.getSearchStringExpr().accept(this, context);
209-
return DSL.position(stringPatternExpr, searchStringExpr);
210-
}
211-
212204
@Override
213205
public Expression visitIn(In node, AnalysisContext context) {
214206
return visitIn(node.getField(), node.getValueList(), context);

core/src/main/java/org/opensearch/sql/ast/AbstractNodeVisitor.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.opensearch.sql.ast.expression.Map;
2727
import org.opensearch.sql.ast.expression.Not;
2828
import org.opensearch.sql.ast.expression.Or;
29-
import org.opensearch.sql.ast.expression.PositionFunction;
3029
import org.opensearch.sql.ast.expression.QualifiedName;
3130
import org.opensearch.sql.ast.expression.RelevanceFieldList;
3231
import org.opensearch.sql.ast.expression.Span;
@@ -274,10 +273,6 @@ public T visitHighlightFunction(HighlightFunction node, C context) {
274273
return visitChildren(node, context);
275274
}
276275

277-
public T visitPositionFunction(PositionFunction node, C context) {
278-
return visitChildren(node, context);
279-
}
280-
281276
public T visitStatement(Statement node, C context) {
282277
return visit(node, context);
283278
}

core/src/main/java/org/opensearch/sql/ast/dsl/AstDSL.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import org.opensearch.sql.ast.expression.Not;
3333
import org.opensearch.sql.ast.expression.Or;
3434
import org.opensearch.sql.ast.expression.ParseMethod;
35-
import org.opensearch.sql.ast.expression.PositionFunction;
3635
import org.opensearch.sql.ast.expression.QualifiedName;
3736
import org.opensearch.sql.ast.expression.Span;
3837
import org.opensearch.sql.ast.expression.SpanUnit;
@@ -284,11 +283,6 @@ public UnresolvedExpression highlight(UnresolvedExpression fieldName,
284283
return new HighlightFunction(fieldName, arguments);
285284
}
286285

287-
public UnresolvedExpression position(UnresolvedExpression stringPatternExpr,
288-
UnresolvedExpression searchStringExpr) {
289-
return new PositionFunction(stringPatternExpr, searchStringExpr);
290-
}
291-
292286
public UnresolvedExpression window(UnresolvedExpression function,
293287
List<UnresolvedExpression> partitionByList,
294288
List<Pair<SortOption, UnresolvedExpression>> sortList) {

core/src/main/java/org/opensearch/sql/ast/expression/PositionFunction.java

Lines changed: 0 additions & 39 deletions
This file was deleted.

core/src/main/java/org/opensearch/sql/expression/DSL.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -234,10 +234,6 @@ public static FunctionExpression position(Expression... expressions) {
234234
return compile(FunctionProperties.None, BuiltinFunctionName.POSITION, expressions);
235235
}
236236

237-
public static FunctionExpression position(Expression... expressions) {
238-
return compile(BuiltinFunctionName.POSITION, expressions);
239-
}
240-
241237
public static FunctionExpression truncate(Expression... expressions) {
242238
return compile(FunctionProperties.None, BuiltinFunctionName.TRUNCATE, expressions);
243239
}

core/src/test/java/org/opensearch/sql/analysis/NamedExpressionAnalyzerTest.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import org.opensearch.sql.ast.expression.Alias;
1717
import org.opensearch.sql.ast.expression.HighlightFunction;
1818
import org.opensearch.sql.ast.expression.Literal;
19-
import org.opensearch.sql.ast.expression.PositionFunction;
2019
import org.opensearch.sql.expression.NamedExpression;
2120
import org.springframework.context.annotation.Configuration;
2221
import org.springframework.test.context.ContextConfiguration;
@@ -49,14 +48,4 @@ void visit_highlight() {
4948
NamedExpression analyze = analyzer.analyze(alias, analysisContext);
5049
assertEquals("highlight(fieldA)", analyze.getNameOrAlias());
5150
}
52-
53-
@Test
54-
void visit_position() {
55-
Alias alias = AstDSL.alias("position(fieldA IN fieldB)",
56-
new PositionFunction(AstDSL.stringLiteral("fieldA"), AstDSL.stringLiteral("fieldB")));
57-
NamedExpressionAnalyzer analyzer = new NamedExpressionAnalyzer(expressionAnalyzer);
58-
59-
NamedExpression analyze = analyzer.analyze(alias, analysisContext);
60-
assertEquals("position(fieldA IN fieldB)", analyze.getNameOrAlias());
61-
}
6251
}

0 commit comments

Comments
 (0)