Merge remote-tracking branch 'origin/master'

tencentmusic · Sep 21, 2024 · a18c340 · a18c340
2 parents b676538 + 79dc6c0
commit a18c340
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.../tencent/supersonic/auth/authentication/interceptor/DefaultAuthenticationInterceptor.java b/.../tencent/supersonic/auth/authentication/interceptor/DefaultAuthenticationInterceptor.java
@@ -2,7 +2,6 @@
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
 import com.tencent.supersonic.auth.api.authentication.annotation.AuthenticationIgnore;
 import com.tencent.supersonic.auth.api.authentication.config.AuthenticationConfig;
 import com.tencent.supersonic.auth.api.authentication.pojo.User;

diff --git a/...ava/com/tencent/supersonic/chat/server/processor/execute/DimensionRecommendProcessor.java b/...ava/com/tencent/supersonic/chat/server/processor/execute/DimensionRecommendProcessor.java
@@ -46,6 +46,9 @@ public void process(ExecuteContext executeContext, QueryResult queryResult) {
     private List<SchemaElement> getDimensions(Long metricId, Long dataSetId) {
         SemanticLayerService semanticService = ContextUtils.getBean(SemanticLayerService.class);
         DataSetSchema dataSetSchema = semanticService.getDataSetSchema(dataSetId);
+        if (dataSetSchema == null) {
+            return Lists.newArrayList();
+        }
         List<Long> drillDownDimensions = Lists.newArrayList();
         Set<SchemaElement> metricElements = dataSetSchema.getMetrics();
         if (!CollectionUtils.isEmpty(metricElements)) {