From 61316e939c2f34974469f466129c1c95be0c85d5 Mon Sep 17 00:00:00 2001
From: jipeli <54889677+jipeli@users.noreply.github.com>
Date: Fri, 23 Feb 2024 11:55:36 +0800
Subject: [PATCH] [improvement][headless] fix derived metric expression parse
 error (#742)

---
 .../util/jsqlparser/SqlSelectHelper.java       | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/SqlSelectHelper.java b/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/SqlSelectHelper.java
index f1596d3d8..13343691a 100644
--- a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/SqlSelectHelper.java
+++ b/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/SqlSelectHelper.java
@@ -1,5 +1,11 @@
 package com.tencent.supersonic.common.util.jsqlparser;
 
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
 import net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.expression.Alias;
@@ -9,6 +15,7 @@ import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.ExpressionVisitorAdapter;
 import net.sf.jsqlparser.expression.Function;
 import net.sf.jsqlparser.expression.LongValue;
+import net.sf.jsqlparser.expression.Parenthesis;
 import net.sf.jsqlparser.expression.StringValue;
 import net.sf.jsqlparser.expression.WhenClause;
 import net.sf.jsqlparser.expression.operators.conditional.AndExpression;
@@ -33,13 +40,6 @@ import net.sf.jsqlparser.statement.select.SubSelect;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collectors;
-
 /**
  * Sql Parser Select Helper
  */
@@ -543,6 +543,10 @@ public class SqlSelectHelper {
             getColumnFromExpr(expr.getLeftExpression(), columns);
             getColumnFromExpr(expr.getRightExpression(), columns);
         }
+        if (expression instanceof Parenthesis) {
+            Parenthesis expr = (Parenthesis) expression;
+            getColumnFromExpr(expr.getExpression(), columns);
+        }
     }
 }