From 4322ae42aca251f7efa25f6b5af17c5f81279f0d Mon Sep 17 00:00:00 2001
From: jipeli <54889677+jipeli@users.noreply.github.com>
Date: Thu, 11 Jan 2024 20:14:03 +0800
Subject: [PATCH] (improvement)(headless) simplify optimizer enable conf (#619)

---
 .../headless/core/parser/calcite/CalciteSqlParser.java         | 3 ++-
 .../tencent/supersonic/headless/server/utils/QueryUtils.java   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/CalciteSqlParser.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/CalciteSqlParser.java
index 1fcb1fed9..e9bceb208 100644
--- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/CalciteSqlParser.java
+++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/CalciteSqlParser.java
@@ -33,7 +33,8 @@ public class CalciteSqlParser implements SqlParser {
         aggBuilder.explain(queryStatement, isAgg);
         queryStatement.setSql(aggBuilder.getSql());
         queryStatement.setSourceId(aggBuilder.getSourceId());
-        if (Objects.nonNull(queryStatement.getViewAlias()) && !queryStatement.getViewAlias().isEmpty()) {
+        if (Objects.nonNull(queryStatement.getEnableOptimize()) && queryStatement.getEnableOptimize()
+                && Objects.nonNull(queryStatement.getViewAlias()) && !queryStatement.getViewAlias().isEmpty()) {
             // simplify model sql with query sql
             String simplifySql = aggBuilder.simplify(
                     getSqlByView(aggBuilder.getSql(), queryStatement.getViewSql(), queryStatement.getViewAlias()));
diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/QueryUtils.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/QueryUtils.java
index 6e47dd672..29b1b1f1b 100644
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/QueryUtils.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/QueryUtils.java
@@ -49,7 +49,7 @@ public class QueryUtils {
     @Value("${query.cache.enable:true}")
     private Boolean cacheEnable;
 
-    @Value("${query.optimizer.enable:true}")
+    @Value("${query.optimizer.enable:false}")
     private Boolean optimizeEnable;
 
     private final CacheUtils cacheUtils;