From 739514ddfa15a27b02a2fd05ef65b2a5345e5c3b Mon Sep 17 00:00:00 2001 From: jerryjzhang Date: Sun, 29 Dec 2024 10:45:18 +0800 Subject: [PATCH] [fix][chat&headless]Adapt to new master. --- .../tencent/supersonic/headless/core/pojo/Ontology.java | 8 ++++++++ .../core/translator/DefaultSemanticTranslator.java | 3 +-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/pojo/Ontology.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/pojo/Ontology.java index e75e7c008..80a0f6a95 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/pojo/Ontology.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/pojo/Ontology.java @@ -1,5 +1,6 @@ package com.tencent.supersonic.headless.core.pojo; +import com.tencent.supersonic.common.pojo.enums.EngineType; import com.tencent.supersonic.headless.api.pojo.response.DatabaseResp; import com.tencent.supersonic.headless.api.pojo.response.DimSchemaResp; import com.tencent.supersonic.headless.api.pojo.response.MetricSchemaResp; @@ -31,4 +32,11 @@ public class Ontology { .collect(Collectors.toList()); } + public EngineType getDatabaseType() { + if (Objects.nonNull(database)) { + return EngineType.fromString(database.getType().toUpperCase()); + } + return null; + } + } diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/DefaultSemanticTranslator.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/DefaultSemanticTranslator.java index 1598b75b3..9beacff58 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/DefaultSemanticTranslator.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/DefaultSemanticTranslator.java @@ -75,8 +75,7 @@ public class DefaultSemanticTranslator implements SemanticTranslator { tables.add(Pair.of(ontologyInnerTable, ontologyInnerSql)); String finalSql = null; if (sqlQuery.isSupportWith()) { - EngineType engineType = - EngineType.fromString(queryStatement.getOntology().getDatabase().getType()); + EngineType engineType = queryStatement.getOntology().getDatabaseType(); if (!SqlMergeWithUtils.hasWith(engineType, ontologyQuerySql)) { finalSql = "with " + tables.stream() .map(t -> String.format("%s as (%s)", t.getLeft(), t.getRight()))