[fix][dingo-calcite] Fix GROUP BY expression with argument name same with SELECT field and alias causes validation error

Author: wt0530

dingo-calcite/build.gradle

@@ -27,7 +27,7 @@ configurations {
 
 dependencies {
     annotationProcessor group: 'org.immutables', name: 'value', version: 'immutables'.v()
-    api group: 'io.dingodb', name: 'calcite-core', version: '1.33.0-SNAPSHOT'
+    implementation group: 'io.dingodb', name: 'calcite-core', version: '1.33.0-SNAPSHOT'
     api project(':dingo-exec')
     implementation project(':dingo-partition-api')
     implementation project(':dingo-codec-api')

dingo-calcite/src/test/java/io/dingodb/calcite/TestAggregate.java

@@ -133,7 +133,6 @@ public void testCountGroup() throws SqlParseException {
         RelRoot relRoot = parser.convert(sqlNode);
         Assert.relNode(relRoot.rel)
             .isA(LogicalDingoRoot.class)
-            .soleInput().isA(LogicalProject.class)
             .soleInput().isA(LogicalAggregate.class)
             .soleInput().isA(LogicalProject.class)
             .soleInput().isA(LogicalDingoTableScan.class);
@@ -256,7 +255,6 @@ public void testAvg1() throws SqlParseException {
         RelRoot relRoot = parser.convert(sqlNode);
         Assert.relNode(relRoot.rel)
             .isA(LogicalDingoRoot.class)
-            .soleInput().isA(LogicalProject.class)
             .soleInput().isA(LogicalAggregate.class)
             .soleInput().isA(LogicalProject.class)
             .soleInput().isA(LogicalDingoTableScan.class);
@@ -276,7 +274,6 @@ public void testAvg2() throws SqlParseException {
         RelRoot relRoot = parser.convert(sqlNode);
         Assert.relNode(relRoot.rel)
             .isA(LogicalDingoRoot.class)
-            .soleInput().isA(LogicalProject.class)
             .soleInput().isA(LogicalAggregate.class)
             .soleInput().isA(LogicalProject.class)
             .soleInput().isA(LogicalDingoTableScan.class);
@@ -353,7 +350,6 @@ public void testMultiDistinctCountWithGroup() throws SqlParseException {
         RelRoot relRoot = parser.convert(sqlNode);
         Assert.relNode(relRoot.rel)
             .isA(LogicalDingoRoot.class)
-            .soleInput().isA(LogicalProject.class)
             .soleInput().isA(LogicalAggregate.class)
             .soleInput().isA(LogicalProject.class)
             .soleInput().isA(LogicalDingoTableScan.class);

dingo-test/src/test/java/io/dingodb/test/dsl/BasicQueryCases.java

@@ -27,6 +27,21 @@ public BasicQueryCases() {
 
     @Override
     public void build() {
+        table("test_group_by", file("cases/tables/test_group_by.create.sql"))
+            .init(file("cases/tables/test_group_by.data.sql"), 2);
+
+        test("Select group by timestamp")
+            .use("table", "test_group_by")
+            .step(
+                "select substr(charge_start_time, 1, 16) as charge_start_time from {table} group by substr(charge_start_time, 1, 16)",
+                csv(
+                    "charge_start_time",
+                    "STRING",
+                    "2025-09-21 22:30",
+                    "2025-05-06 11:50"
+                )
+            );
+
         table("i4k_vs_f80", file("cases/tables/i4k_vs_f80.create.sql"))
             .init(file("cases/tables/i4k_vs_f80.data.sql"), 9);
 

dingo-test/src/test/resources/io/dingodb/test/dsl/cases/tables/test_group_by.create.sql

@@ -0,0 +1,6 @@
+create table {table} (
+    id int,
+    name varchar(255),
+    charge_start_time timestamp,
+    primary key(id)
+)

dingo-test/src/test/resources/io/dingodb/test/dsl/cases/tables/test_group_by.data.sql

@@ -0,0 +1,3 @@
+insert into {table} values
+(1, 'cccc', '2025-05-06 11:50:40'),
+(2, 'dddd', '2025-09-21 22:30:12')

dingo-verify/build.gradle

@@ -7,7 +7,7 @@ plugins {
 dependencies {
     annotationProcessor group: 'com.google.auto.service', name: 'auto-service', version: 'auto-service'.v()
     compileOnly group: 'com.google.auto.service', name: 'auto-service', version: 'auto-service'.v()
-    api group: 'org.apache.calcite', name: 'calcite-core', version: 'calcite'.v()
+    api group: 'io.dingodb', name: 'calcite-core', version: '1.33.0-SNAPSHOT'
     api group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.0'
     implementation project(":dingo-common")
     implementation project(":dingo-net-api")