From cc2d6a21c25e9760765db67671406ad78e0e8325 Mon Sep 17 00:00:00 2001
From: jerryjzhang <jerryjzhang@tencent.com>
Date: Fri, 14 Feb 2025 21:32:36 +0800
Subject: [PATCH] [fix][headless]Fix NPE issue.

---
 .../supersonic/headless/core/adaptor/db/DuckdbAdaptor.java   | 3 +++
 .../tencent/supersonic/headless/server/utils/QueryUtils.java | 5 -----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/adaptor/db/DuckdbAdaptor.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/adaptor/db/DuckdbAdaptor.java
index f578cbdce..d89193b57 100644
--- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/adaptor/db/DuckdbAdaptor.java
+++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/adaptor/db/DuckdbAdaptor.java
@@ -36,6 +36,9 @@ public class DuckdbAdaptor extends DefaultDbAdaptor {
 
     @Override
     public String rewriteSql(String sql) {
+        if (sql == null) {
+            return null;
+        }
         return sql.replaceAll("`", "");
     }
 
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 058dbe799..767e1a417 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
@@ -19,7 +19,6 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import static com.tencent.supersonic.common.pojo.Constants.JOIN_UNDERLINE;
 import static com.tencent.supersonic.common.pojo.Constants.UNIONALL;
 
 @Slf4j
@@ -73,10 +72,6 @@ public class QueryUtils {
             Map<String, String> nameTypePair, Map<String, MetricResp> metricRespMap,
             Map<String, DimensionResp> dimensionRespMap) {
         String nameEn = getName(column.getBizName());
-        if (nameEn.contains(JOIN_UNDERLINE)) {
-            nameEn = nameEn.split(JOIN_UNDERLINE)[1];
-        }
-        // set name
         if (namePair.containsKey(nameEn)) {
             column.setName(namePair.get(nameEn));
         } else {