diff options
author | Jon Bratseth <bratseth@gmail.com> | 2021-03-29 10:45:07 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2021-03-29 10:45:07 +0200 |
commit | 1db295c8c6e521af7a3b7f7f6ed4ceb4066e921a (patch) | |
tree | 2939420ddacf2efff4ff28bfcb1337b2b1791fc3 /container-search | |
parent | 6f8a35e84e54ca0b1a78f02f18bf8018479c0a58 (diff) |
Remove unsupported constructs
Diffstat (limited to 'container-search')
-rw-r--r-- | container-search/src/main/antlr4/com/yahoo/search/yql/yqlplus.g4 | 11 | ||||
-rw-r--r-- | container-search/src/main/java/com/yahoo/search/yql/ProgramParser.java | 16 |
2 files changed, 1 insertions, 26 deletions
diff --git a/container-search/src/main/antlr4/com/yahoo/search/yql/yqlplus.g4 b/container-search/src/main/antlr4/com/yahoo/search/yql/yqlplus.g4 index 26357267f4e..109e43d7029 100644 --- a/container-search/src/main/antlr4/com/yahoo/search/yql/yqlplus.g4 +++ b/container-search/src/main/antlr4/com/yahoo/search/yql/yqlplus.g4 @@ -262,22 +262,13 @@ select_source_multi ; select_source_join - : FROM source_spec join_expr* + : FROM source_spec ; source_list : namespaced_name (COMMA namespaced_name )* ; -join_expr - : (join_spec source_spec ON joinExpression) - ; - -join_spec - : LEFT JOIN - | 'inner'? JOIN - ; - source_spec : ( data_source (alias_def { ($data_source.ctx).addChild($alias_def.ctx); })? ) ; diff --git a/container-search/src/main/java/com/yahoo/search/yql/ProgramParser.java b/container-search/src/main/java/com/yahoo/search/yql/ProgramParser.java index 7fa8d05bb04..93545366c3a 100644 --- a/container-search/src/main/java/com/yahoo/search/yql/ProgramParser.java +++ b/container-search/src/main/java/com/yahoo/search/yql/ProgramParser.java @@ -33,7 +33,6 @@ import com.yahoo.search.yql.yqlplusParser.Insert_sourceContext; import com.yahoo.search.yql.yqlplusParser.Insert_statementContext; import com.yahoo.search.yql.yqlplusParser.Insert_valuesContext; import com.yahoo.search.yql.yqlplusParser.JoinExpressionContext; -import com.yahoo.search.yql.yqlplusParser.Join_exprContext; import com.yahoo.search.yql.yqlplusParser.LimitContext; import com.yahoo.search.yql.yqlplusParser.Literal_elementContext; import com.yahoo.search.yql.yqlplusParser.Literal_listContext; @@ -382,10 +381,6 @@ final class ProgramParser { break; case yqlplusParser.RULE_select_source_join: source = convertSource((ParserRuleContext) sourceNode.getChild(1), scope); - List<Join_exprContext> joinContexts = ((Select_source_joinContext)sourceNode).join_expr(); - for (Join_exprContext joinContext:joinContexts) { - source = convertJoin(joinContext, source, scope); - } break; case yqlplusParser.RULE_insert_source: Insert_sourceContext insertSourceContext = (Insert_sourceContext) sourceNode; @@ -588,17 +583,6 @@ final class ProgramParser { } - private OperatorNode<SequenceOperator> convertJoin(Join_exprContext node, OperatorNode<SequenceOperator> left, Scope scope) { - Source_specContext sourceSpec = node.source_spec(); - OperatorNode<SequenceOperator> right = convertSource(sourceSpec, scope); - JoinExpressionContext joinContext = node.joinExpression(); - OperatorNode<ExpressionOperator> joinExpression = readBinOp(ExpressionOperator.valueOf("EQ"), joinContext.getChild(0), joinContext.getChild(2), scope); - if (joinExpression.getOperator() != ExpressionOperator.EQ) { - throw new ProgramCompileException(joinExpression.getLocation(), "Unexpected join expression type: %s (expected EQ)", joinExpression.getOperator()); - } - return OperatorNode.create(toLocation(scope, sourceSpec), node.join_spec().LEFT() != null ? SequenceOperator.LEFT_JOIN : SequenceOperator.JOIN, left, right, joinExpression); - } - private String assignAlias(String alias, ParserRuleContext node, Scope scope) { if (alias == null) { alias = "source"; |