diff options
| author | Jon Bratseth <bratseth@gmail.com> | 2021-03-29 10:47:56 +0200 |
|---|---|---|
| committer | Jon Bratseth <bratseth@gmail.com> | 2021-03-29 10:47:56 +0200 |
| commit | f5d04998bfca09b8ae5daa747d55d73a50a62391 (patch) | |
| tree | f9e98a1ac4b52d40a750e3895f507ed941ec31d5 /container-search/src | |
| parent | 1db295c8c6e521af7a3b7f7f6ed4ceb4066e921a (diff) | |
Remove unsupported constructs
Diffstat (limited to 'container-search/src')
| -rw-r--r-- | container-search/src/main/antlr4/com/yahoo/search/yql/yqlplus.g4 | 4 | ||||
| -rw-r--r-- | container-search/src/main/java/com/yahoo/search/yql/ProgramParser.java | 5 |
2 files changed, 4 insertions, 5 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 109e43d7029..b3bb7a3a6bb 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 @@ -250,7 +250,7 @@ timeout select_source : select_source_all | select_source_multi - | select_source_join + | select_source_from ; select_source_all @@ -261,7 +261,7 @@ select_source_multi : FROM SOURCES source_list ; -select_source_join +select_source_from : FROM source_spec ; 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 93545366c3a..1e17bedc88f 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 @@ -32,7 +32,6 @@ import com.yahoo.search.yql.yqlplusParser.InNotInTargetContext; 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.LimitContext; import com.yahoo.search.yql.yqlplusParser.Literal_elementContext; import com.yahoo.search.yql.yqlplusParser.Literal_listContext; @@ -54,7 +53,7 @@ import com.yahoo.search.yql.yqlplusParser.RelationalExpressionContext; import com.yahoo.search.yql.yqlplusParser.RelationalOpContext; import com.yahoo.search.yql.yqlplusParser.Returning_specContext; import com.yahoo.search.yql.yqlplusParser.Scalar_literalContext; -import com.yahoo.search.yql.yqlplusParser.Select_source_joinContext; +import com.yahoo.search.yql.yqlplusParser.Select_source_fromContext; import com.yahoo.search.yql.yqlplusParser.Select_source_multiContext; import com.yahoo.search.yql.yqlplusParser.Select_statementContext; import com.yahoo.search.yql.yqlplusParser.Sequence_sourceContext; @@ -379,7 +378,7 @@ final class ProgramParser { source.putAnnotation("alias", "row"); scope.defineDataSource(toLocation(scope, multiSourceContext), "row"); break; - case yqlplusParser.RULE_select_source_join: + case yqlplusParser.RULE_select_source_from: source = convertSource((ParserRuleContext) sourceNode.getChild(1), scope); break; case yqlplusParser.RULE_insert_source: |