walterddr commented on code in PR #9017:
URL: https://github.com/apache/pinot/pull/9017#discussion_r918485973
##########
pinot-common/src/main/java/org/apache/pinot/sql/parsers/CalciteSqlParser.java:
##########
@@ -105,66 +106,80 @@ private static String removeTerminatingSemicolon(String
sql) {
}
public static SqlNodeAndOptions compileToSqlNodeAndOptions(String sql)
- throws Exception {
+ throws SqlCompilationException {
// Remove the comments from the query
sql = removeComments(sql);
// Remove the terminating semicolon from the query
sql = removeTerminatingSemicolon(sql);
- // Extract OPTION statements from sql as Calcite Parser doesn't parse it.
+ // extract and remove OPTIONS string
List<String> options = extractOptionsFromSql(sql);
- if (!options.isEmpty()) {
- sql = removeOptionsFromSql(sql);
- }
+ sql = removeOptionsFromSql(sql);
try (StringReader inStream = new StringReader(sql)) {
SqlParserImpl sqlParser = newSqlParser(inStream);
- return new SqlNodeAndOptions(sqlParser.parseSqlStmtEof(), options);
+ SqlNodeList sqlNodeList = sqlParser.SqlStmtsEof();
+ // Extract OPTION statements from sql.
+ SqlNodeAndOptions sqlNodeAndOptions =
extractSqlNodeAndOptions(sqlNodeList);
+ // add legacy OPTIONS keyword-based options
+ if (options.size() > 0) {
+ LOGGER.warn("Usage of 'OPTIONS(key=value)' is deprecated, use `SET key
= value` instead!");
Review Comment:
```suggestion
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
