(improvement)(headless)Optimize compatibility and robustness in ontol…

…ogy query translation. (improvement)(headless)Optimize compatibility and robustness in ontology query translation.
tencentmusic · Mar 5, 2025 · e0dc3fb · e0dc3fb
1 parent efddf4c
commit e0dc3fb
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/common/src/main/java/com/tencent/supersonic/common/jsqlparser/FiledFilterReplaceVisitor.java b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/FiledFilterReplaceVisitor.java
@@ -91,7 +91,8 @@ public List<Expression> parserFilter(ComparisonOperator comparisonOperator, Stri
         }
 
         ExpressionList<?> leftFunctionParams = leftFunction.getParameters();
-        if (CollectionUtils.isEmpty(leftFunctionParams)) {
+        if (CollectionUtils.isEmpty(leftFunctionParams)
+                || !(leftFunctionParams.get(0) instanceof Column)) {
             return result;
         }
 

diff --git a/...ain/java/com/tencent/supersonic/headless/core/translator/parser/calcite/SemanticNode.java b/...ain/java/com/tencent/supersonic/headless/core/translator/parser/calcite/SemanticNode.java
@@ -78,7 +78,8 @@ public static SqlNode parse(String expression, SqlValidatorScope scope, EngineTy
                 scope.getValidator().getCatalogReader().getRootSchema(), engineType);
         if (Configuration.getSqlAdvisor(sqlValidatorWithHints, engineType).getReservedAndKeyWords()
                 .contains(expression.toUpperCase())) {
-            if (engineType == EngineType.HANADB || engineType == EngineType.PRESTO || engineType == EngineType.TRINO) {
+            if (engineType == EngineType.HANADB || engineType == EngineType.PRESTO
+                    || engineType == EngineType.TRINO) {
                 expression = String.format("\"%s\"", expression);
             } else {
                 expression = String.format("`%s`", expression);
@@ -166,9 +167,9 @@ public static SqlNode getTable(SqlNode sqlNode) {
         if (sqlNode instanceof SqlBasicCall) {
             SqlBasicCall sqlBasicCall = (SqlBasicCall) sqlNode;
             if (sqlBasicCall.getOperator().getKind().equals(SqlKind.AS)) {
-                if (sqlBasicCall.getOperandList().get(0) instanceof SqlSelect) {
-                    SqlSelect table = (SqlSelect) sqlBasicCall.getOperandList().get(0);
-                    return table;
+                SqlNode innerQuery = sqlBasicCall.getOperandList().get(0);
+                if (innerQuery instanceof SqlCall) {
+                    return innerQuery;
                 }
             }
         }

diff --git a/.../main/java/com/tencent/supersonic/headless/core/translator/parser/calcite/SqlBuilder.java b/.../main/java/com/tencent/supersonic/headless/core/translator/parser/calcite/SqlBuilder.java
@@ -69,7 +69,13 @@ public String buildOntologySql(QueryStatement queryStatement) throws Exception {
         SqlNode parserNode = tableView.build();
         DatabaseResp database = queryStatement.getOntology().getDatabase();
         EngineType engineType = EngineType.fromString(database.getType());
-        parserNode = optimizeParseNode(parserNode, engineType);
+        try {
+            parserNode = optimizeParseNode(parserNode, engineType);
+        } catch (Exception e) {
+            // failure in optimization phase doesn't affect the query result,
+            // just ignore it
+            log.error("optimizeParseNode error", e);
+        }
         return SemanticNode.getSql(parserNode, engineType);
     }