#63 SqlValidatorImpl - correct sql select rowType deduction (#64)

* SqlValidatorImpl - correct sql select rowType deduction * r28
Kyligence · Mar 23, 2020 · 1eae0a0 · 1eae0a0
1 parent aac7602
commit 1eae0a0
Show file tree

Hide file tree

Showing 21 changed files with 72 additions and 39 deletions.
diff --git a/cassandra/pom.xml b/cassandra/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite</artifactId>
-  <version>1.16.0-kylin-4.x-r27</version>
+  <version>1.16.0-kylin-4.x-r28</version>
   </parent>
 
   <artifactId>calcite-cassandra</artifactId>
   <packaging>jar</packaging>
-<version>1.16.0-kylin-4.x-r27</version>
+<version>1.16.0-kylin-4.x-r28</version>
   <name>Calcite Cassandra</name>
   <description>Cassandra adapter for Calcite</description>
 

diff --git a/core/pom.xml b/core/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite</artifactId>
-  <version>1.16.0-kylin-4.x-r27</version>
+  <version>1.16.0-kylin-4.x-r28</version>
   </parent>
 
   <artifactId>calcite-core</artifactId>
   <packaging>jar</packaging>
-<version>1.16.0-kylin-4.x-r27</version>
+<version>1.16.0-kylin-4.x-r28</version>
   <name>Calcite Core</name>
   <description>Core Calcite APIs and engine.</description>
 

diff --git a/core/src/main/java/org/apache/calcite/sql/validate/SqlValidatorImpl.java b/core/src/main/java/org/apache/calcite/sql/validate/SqlValidatorImpl.java
@@ -129,6 +129,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.TreeSet;
 
@@ -431,10 +432,42 @@ private boolean expandSelectItem(
     // parentheses-free functions such as LOCALTIME into explicit function
     // calls.
     SqlNode expanded = expand(selectItem, scope);
-    final String alias =
+    String alias =
         deriveAlias(
             selectItem,
             aliases.size());
+    // if the alias derived is found in already generated aliases set
+    // then there is a chance that two selectItem(SqlIdentifier) appear to have the same name
+    // In that case, we need to derive a different name for such selectItem
+    // eg.
+    // SELECT * FROM (
+    //   SELECT order_id, test_kylin_fact.cal_dt, edw.test_cal_dt.cal_dt
+    //   FROM test_kylin_fact LEFT JOIN edw.test_cal_dt
+    //   ON test_kylin_fact.order_id = test_cal_dt.DAY_OF_CAL_ID
+    // ) T where T.order_id = 4752
+    if (aliases.contains(alias) && selectItem instanceof SqlIdentifier) {
+      boolean foundEqualSelectNode = false;
+      int sameNameIdentifierCount = -1;
+      for (SqlNode item : selectItems) {
+        if (item instanceof SqlIdentifier) {
+          // if same selectItem appears before, then it is okay for them to share the same alias
+          if (item.equalsDeep(selectItem, Litmus.IGNORE)) {
+            foundEqualSelectNode = true;
+            break;
+          }
+          // count the same name selectItem
+          if (Objects.equals(
+                  Util.last(((SqlIdentifier) item).names),
+                  Util.last(((SqlIdentifier) selectItem).names))) {
+            sameNameIdentifierCount++;
+          }
+        }
+      }
+      if (!foundEqualSelectNode) {
+        Preconditions.checkArgument(sameNameIdentifierCount > -1);
+        alias += sameNameIdentifierCount;
+      }
+    }
 
     // If expansion has altered the natural alias, supply an explicit 'AS'.
     final SqlValidatorScope selectScope = getSelectScope(select);

diff --git a/druid/pom.xml b/druid/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite</artifactId>
-  <version>1.16.0-kylin-4.x-r27</version>
+  <version>1.16.0-kylin-4.x-r28</version>
   </parent>
 
   <artifactId>calcite-druid</artifactId>
   <packaging>jar</packaging>
-<version>1.16.0-kylin-4.x-r27</version>
+<version>1.16.0-kylin-4.x-r28</version>
   <name>Calcite Druid</name>
   <description>Druid adapter for Calcite</description>
 

diff --git a/elasticsearch2/pom.xml b/elasticsearch2/pom.xml
@@ -21,12 +21,12 @@ limitations under the License.
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite</artifactId>
-  <version>1.16.0-kylin-4.x-r27</version>
+  <version>1.16.0-kylin-4.x-r28</version>
   </parent>
 
   <artifactId>calcite-elasticsearch2</artifactId>
   <packaging>jar</packaging>
-<version>1.16.0-kylin-4.x-r27</version>
+<version>1.16.0-kylin-4.x-r28</version>
   <name>Calcite Elasticsearch</name>
   <description>Elasticsearch adapter for Calcite</description>
 

diff --git a/elasticsearch5/pom.xml b/elasticsearch5/pom.xml
@@ -21,12 +21,12 @@ limitations under the License.
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite</artifactId>
-  <version>1.16.0-kylin-4.x-r27</version>
+  <version>1.16.0-kylin-4.x-r28</version>
   </parent>
 
   <artifactId>calcite-elasticsearch5</artifactId>
   <packaging>jar</packaging>
-<version>1.16.0-kylin-4.x-r27</version>
+<version>1.16.0-kylin-4.x-r28</version>
   <name>Calcite Elasticsearch5</name>
   <description>Elasticsearch5 adapter for Calcite</description>
 

diff --git a/example/csv/pom.xml b/example/csv/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite-example</artifactId>
-  <version>1.16.0-kylin-4.x-r27</version>
+  <version>1.16.0-kylin-4.x-r28</version>
   </parent>
 
   <artifactId>calcite-example-csv</artifactId>
   <packaging>jar</packaging>
-<version>1.16.0-kylin-4.x-r27</version>
+<version>1.16.0-kylin-4.x-r28</version>
   <name>Calcite Example CSV</name>
   <description>An example Calcite provider that reads CSV files</description>
 

diff --git a/example/function/pom.xml b/example/function/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite-example</artifactId>
-  <version>1.16.0-kylin-4.x-r27</version>
+  <version>1.16.0-kylin-4.x-r28</version>
   </parent>
 
   <artifactId>calcite-example-function</artifactId>
   <packaging>jar</packaging>
-<version>1.16.0-kylin-4.x-r27</version>
+<version>1.16.0-kylin-4.x-r28</version>
   <name>Calcite Example Function</name>
   <description>Examples of user-defined Calcite functions</description>
 

diff --git a/example/pom.xml b/example/pom.xml
@@ -20,13 +20,13 @@ limitations under the License.
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite</artifactId>
-  <version>1.16.0-kylin-4.x-r27</version>
+  <version>1.16.0-kylin-4.x-r28</version>
   </parent>
 
   <!-- The basics. -->
   <artifactId>calcite-example</artifactId>
   <packaging>pom</packaging>
-<version>1.16.0-kylin-4.x-r27</version>
+<version>1.16.0-kylin-4.x-r28</version>
   <name>Calcite Examples</name>
   <description>Calcite examples</description>
 

diff --git a/file/pom.xml b/file/pom.xml
@@ -19,13 +19,13 @@ limitations under the License.
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite</artifactId>
-  <version>1.16.0-kylin-4.x-r27</version>
+  <version>1.16.0-kylin-4.x-r28</version>
   </parent>
 
   <!-- The basics. -->
   <artifactId>calcite-file</artifactId>
   <packaging>jar</packaging>
-<version>1.16.0-kylin-4.x-r27</version>
+<version>1.16.0-kylin-4.x-r28</version>
   <name>Calcite File</name>
   <description>Calcite provider that reads files and URIs</description>
 

diff --git a/geode/pom.xml b/geode/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite</artifactId>
-  <version>1.16.0-kylin-4.x-r27</version>
+  <version>1.16.0-kylin-4.x-r28</version>
   </parent>
 
   <artifactId>calcite-geode</artifactId>
   <packaging>jar</packaging>
-<version>1.16.0-kylin-4.x-r27</version>
+<version>1.16.0-kylin-4.x-r28</version>
   <name>Calcite Geode</name>
   <description>Geode adapter for Calcite</description>
 

diff --git a/linq4j/pom.xml b/linq4j/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite</artifactId>
-  <version>1.16.0-kylin-4.x-r27</version>
+  <version>1.16.0-kylin-4.x-r28</version>
   </parent>
 
   <artifactId>calcite-linq4j</artifactId>
   <packaging>jar</packaging>
-<version>1.16.0-kylin-4.x-r27</version>
+<version>1.16.0-kylin-4.x-r28</version>
   <name>Calcite Linq4j</name>
   <description>Calcite APIs for LINQ (Language-Integrated Query) in Java</description>
 

diff --git a/mongodb/pom.xml b/mongodb/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite</artifactId>
-  <version>1.16.0-kylin-4.x-r27</version>
+  <version>1.16.0-kylin-4.x-r28</version>
   </parent>
 
   <artifactId>calcite-mongodb</artifactId>
   <packaging>jar</packaging>
-<version>1.16.0-kylin-4.x-r27</version>
+<version>1.16.0-kylin-4.x-r28</version>
   <name>Calcite MongoDB</name>
   <description>MongoDB adapter for Calcite</description>
 

diff --git a/pig/pom.xml b/pig/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite</artifactId>
-  <version>1.16.0-kylin-4.x-r27</version>
+  <version>1.16.0-kylin-4.x-r28</version>
   </parent>
 
   <artifactId>calcite-pig</artifactId>
   <packaging>jar</packaging>
-<version>1.16.0-kylin-4.x-r27</version>
+<version>1.16.0-kylin-4.x-r28</version>
   <name>Calcite Pig</name>
   <description>Pig adapter for Calcite</description>
 

diff --git a/piglet/pom.xml b/piglet/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite</artifactId>
-  <version>1.16.0-kylin-4.x-r27</version>
+  <version>1.16.0-kylin-4.x-r28</version>
   </parent>
 
   <artifactId>calcite-piglet</artifactId>
   <packaging>jar</packaging>
-<version>1.16.0-kylin-4.x-r27</version>
+<version>1.16.0-kylin-4.x-r28</version>
   <name>Calcite Piglet</name>
   <description>Pig-like language built on top of Calcite algebra</description>
 

diff --git a/plus/pom.xml b/plus/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite</artifactId>
-  <version>1.16.0-kylin-4.x-r27</version>
+  <version>1.16.0-kylin-4.x-r28</version>
   </parent>
 
   <artifactId>calcite-plus</artifactId>
   <packaging>jar</packaging>
-<version>1.16.0-kylin-4.x-r27</version>
+<version>1.16.0-kylin-4.x-r28</version>
   <name>Calcite Plus</name>
   <description>Miscellaneous extras for Calcite</description>
 

diff --git a/pom.xml b/pom.xml
@@ -27,7 +27,7 @@ limitations under the License.
   <groupId>org.apache.calcite</groupId>
   <artifactId>calcite</artifactId>
   <packaging>pom</packaging>
-<version>1.16.0-kylin-4.x-r27</version>
+<version>1.16.0-kylin-4.x-r28</version>
 
   <!-- More project information. -->
   <name>Calcite</name>

diff --git a/server/pom.xml b/server/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite</artifactId>
-  <version>1.16.0-kylin-4.x-r27</version>
+  <version>1.16.0-kylin-4.x-r28</version>
   </parent>
 
   <artifactId>calcite-server</artifactId>
   <packaging>jar</packaging>
-<version>1.16.0-kylin-4.x-r27</version>
+<version>1.16.0-kylin-4.x-r28</version>
   <name>Calcite Server</name>
   <description>Calcite Server</description>
 

diff --git a/spark/pom.xml b/spark/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite</artifactId>
-  <version>1.16.0-kylin-4.x-r27</version>
+  <version>1.16.0-kylin-4.x-r28</version>
   </parent>
 
   <artifactId>calcite-spark</artifactId>
   <packaging>jar</packaging>
-<version>1.16.0-kylin-4.x-r27</version>
+<version>1.16.0-kylin-4.x-r28</version>
   <name>Calcite Spark</name>
 
   <properties>

diff --git a/splunk/pom.xml b/splunk/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite</artifactId>
-  <version>1.16.0-kylin-4.x-r27</version>
+  <version>1.16.0-kylin-4.x-r28</version>
   </parent>
 
   <artifactId>calcite-splunk</artifactId>
   <packaging>jar</packaging>
-<version>1.16.0-kylin-4.x-r27</version>
+<version>1.16.0-kylin-4.x-r28</version>
   <name>Calcite Splunk</name>
   <description>Splunk adapter for Calcite; also a JDBC driver for Splunk</description>
 

diff --git a/ubenchmark/pom.xml b/ubenchmark/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite</artifactId>
-  <version>1.16.0-kylin-4.x-r27</version>
+  <version>1.16.0-kylin-4.x-r28</version>
   </parent>
 
   <properties>