From d6620e6ea7e6e4d0de3de3361996332736953d68 Mon Sep 17 00:00:00 2001
From: jerryjzhang <jerryjzhang@tencent.com>
Date: Sun, 16 Feb 2025 10:40:11 +0800
Subject: [PATCH] [fix][headless]Adjust none operator enum.

---
 .../tencent/supersonic/common/pojo/enums/AggOperatorEnum.java   | 2 +-
 .../com/tencent/supersonic/headless/api/pojo/ColumnSchema.java  | 2 +-
 .../headless/core/translator/parser/MetricExpressionParser.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/src/main/java/com/tencent/supersonic/common/pojo/enums/AggOperatorEnum.java b/common/src/main/java/com/tencent/supersonic/common/pojo/enums/AggOperatorEnum.java
index e3eb7875d..4a18aa825 100644
--- a/common/src/main/java/com/tencent/supersonic/common/pojo/enums/AggOperatorEnum.java
+++ b/common/src/main/java/com/tencent/supersonic/common/pojo/enums/AggOperatorEnum.java
@@ -1,7 +1,7 @@
 package com.tencent.supersonic.common.pojo.enums;
 
 public enum AggOperatorEnum {
-    ANY("ANY"),
+    NONE(""),
 
     MAX("MAX"),
 
diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/ColumnSchema.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/ColumnSchema.java
index c84745aaf..ccc2e4bda 100644
--- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/ColumnSchema.java
+++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/ColumnSchema.java
@@ -15,7 +15,7 @@ public class ColumnSchema {
 
     private FieldType filedType;
 
-    private AggOperatorEnum agg = AggOperatorEnum.ANY;
+    private AggOperatorEnum agg = AggOperatorEnum.NONE;
 
     private String name;
 
diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/parser/MetricExpressionParser.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/parser/MetricExpressionParser.java
index 7628bc265..33b279e0b 100644
--- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/parser/MetricExpressionParser.java
+++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/parser/MetricExpressionParser.java
@@ -110,7 +110,7 @@ public class MetricExpressionParser implements QueryParser {
                         if (allMeasures.containsKey(field)) {
                             Measure measure = allMeasures.get(field);
                             String expr = metricExpr;
-                            if (Objects.nonNull(measure.getAgg())) {
+                            if (StringUtils.isNotBlank(measure.getAgg())) {
                                 expr = String.format("%s (%s)", measure.getAgg(), metricExpr);
                             }
                             replace.put(field, expr);