This is an automated email from the ASF dual-hosted git repository. caogaofei pushed a commit to branch agg_table_scan in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 3c17c2563f44b6fd053543d41f549b5bd9d0e3a4 Author: Beyyes <[email protected]> AuthorDate: Sun Sep 29 10:09:55 2024 +0800 fix conflict in SqlConstant --- .../main/java/org/apache/iotdb/db/utils/constant/SqlConstant.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/constant/SqlConstant.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/constant/SqlConstant.java index 63b82d29bdb..05ee87d2b12 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/constant/SqlConstant.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/constant/SqlConstant.java @@ -60,6 +60,7 @@ public class SqlConstant { public static final String FIRST = "first"; public static final String FIRST_BY = "first_by"; public static final String LAST_BY = "last_by"; + public static final String LAST = "last"; public static final String COUNT = "count"; public static final String AVG = "avg"; public static final String SUM = "sum"; @@ -79,11 +80,6 @@ public class SqlConstant { // names of scalar functions public static final String DIFF = "diff"; - public static final String MAX = "max"; - public static final String MIN = "min"; - public static final String FIRST = "first"; - public static final String LAST = "last"; - public static final String CAST_FUNCTION = "CAST"; public static final String CAST_TYPE = "type"; public static final String ROUND_FUNCTION = "ROUND";
