From 5b921f9e36fdf961d59433484f3557120e19c5ae Mon Sep 17 00:00:00 2001
From: Zhiting Guo <zhiting.guo@kyligence.io>
Date: Thu, 21 Oct 2021 14:20:19 +0800
Subject: [PATCH] AL-4273 fix bugs for ReduceExpressionsRule

---
 cassandra/pom.xml                                            | 4 ++--
 core/pom.xml                                                 | 4 ++--
 core/src/main/java/org/apache/calcite/rex/RexBuilder.java    | 2 ++
 core/src/main/java/org/apache/calcite/rex/RexExecutable.java | 1 +
 druid/pom.xml                                                | 4 ++--
 elasticsearch2/pom.xml                                       | 4 ++--
 elasticsearch5/pom.xml                                       | 4 ++--
 example/csv/pom.xml                                          | 4 ++--
 example/function/pom.xml                                     | 4 ++--
 example/pom.xml                                              | 4 ++--
 file/pom.xml                                                 | 4 ++--
 geode/pom.xml                                                | 4 ++--
 linq4j/pom.xml                                               | 4 ++--
 mongodb/pom.xml                                              | 4 ++--
 pig/pom.xml                                                  | 4 ++--
 piglet/pom.xml                                               | 4 ++--
 plus/pom.xml                                                 | 4 ++--
 pom.xml                                                      | 4 ++--
 server/pom.xml                                               | 4 ++--
 spark/pom.xml                                                | 4 ++--
 splunk/pom.xml                                               | 4 ++--
 ubenchmark/pom.xml                                           | 2 +-
 22 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/cassandra/pom.xml b/cassandra/pom.xml
index 31c5be6546ba..9499050cf33d 100644
--- 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-3.x-r58</version>
+    <version>1.16.0-kylin-3.x-r59</version>
   </parent>
 
   <artifactId>calcite-cassandra</artifactId>
   <packaging>jar</packaging>
-  <version>1.16.0-kylin-3.x-r58</version>
+  <version>1.16.0-kylin-3.x-r59</version>
   <name>Calcite Cassandra</name>
   <description>Cassandra adapter for Calcite</description>
 
diff --git a/core/pom.xml b/core/pom.xml
index c49139a24941..be459e1d06b6 100644
--- 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-3.x-r58</version>
+    <version>1.16.0-kylin-3.x-r59</version>
   </parent>
 
   <artifactId>calcite-core</artifactId>
   <packaging>jar</packaging>
-  <version>1.16.0-kylin-3.x-r58</version>
+  <version>1.16.0-kylin-3.x-r59</version>
   <name>Calcite Core</name>
   <description>Core Calcite APIs and engine.</description>
 
diff --git a/core/src/main/java/org/apache/calcite/rex/RexBuilder.java b/core/src/main/java/org/apache/calcite/rex/RexBuilder.java
index a04cbf06f727..205a2a06f87f 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexBuilder.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexBuilder.java
@@ -1509,6 +1509,8 @@ private static Object clean(Object o, RelDataType type) {
           throw new AssertionError();
         }
         return DateString.fromCalendarFields((Calendar) o);
+      } else if (o instanceof Long) {
+        return DateString.fromDaysSinceEpoch(((Long) o).intValue());
       } else {
         return DateString.fromDaysSinceEpoch((Integer) o);
       }
diff --git a/core/src/main/java/org/apache/calcite/rex/RexExecutable.java b/core/src/main/java/org/apache/calcite/rex/RexExecutable.java
index 29076515f460..a9f798690c84 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexExecutable.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexExecutable.java
@@ -88,6 +88,7 @@ public void reduce(RexBuilder rexBuilder, List<RexNode> constExps,
     } catch (RuntimeException e) {
       // One or more of the expressions failed.
       // Don't reduce any of the expressions.
+      reducedValues.clear();
       reducedValues.addAll(constExps);
       values = new Object[constExps.size()];
     }
diff --git a/druid/pom.xml b/druid/pom.xml
index 7a10bd0d00aa..77df062052a9 100644
--- 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-3.x-r58</version>
+    <version>1.16.0-kylin-3.x-r59</version>
   </parent>
 
   <artifactId>calcite-druid</artifactId>
   <packaging>jar</packaging>
-  <version>1.16.0-kylin-3.x-r58</version>
+  <version>1.16.0-kylin-3.x-r59</version>
   <name>Calcite Druid</name>
   <description>Druid adapter for Calcite</description>
 
diff --git a/elasticsearch2/pom.xml b/elasticsearch2/pom.xml
index b4bcf7c9efdb..7ba7a8549207 100644
--- 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-3.x-r58</version>
+    <version>1.16.0-kylin-3.x-r59</version>
   </parent>
 
   <artifactId>calcite-elasticsearch2</artifactId>
   <packaging>jar</packaging>
-  <version>1.16.0-kylin-3.x-r58</version>
+  <version>1.16.0-kylin-3.x-r59</version>
   <name>Calcite Elasticsearch</name>
   <description>Elasticsearch adapter for Calcite</description>
 
diff --git a/elasticsearch5/pom.xml b/elasticsearch5/pom.xml
index db7e3dc35365..abe43dc60806 100644
--- 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-3.x-r58</version>
+    <version>1.16.0-kylin-3.x-r59</version>
   </parent>
 
   <artifactId>calcite-elasticsearch5</artifactId>
   <packaging>jar</packaging>
-  <version>1.16.0-kylin-3.x-r58</version>
+  <version>1.16.0-kylin-3.x-r59</version>
   <name>Calcite Elasticsearch5</name>
   <description>Elasticsearch5 adapter for Calcite</description>
 
diff --git a/example/csv/pom.xml b/example/csv/pom.xml
index 07f454140a43..5d2e9e391f03 100644
--- 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-3.x-r58</version>
+    <version>1.16.0-kylin-3.x-r59</version>
   </parent>
 
   <artifactId>calcite-example-csv</artifactId>
   <packaging>jar</packaging>
-  <version>1.16.0-kylin-3.x-r58</version>
+  <version>1.16.0-kylin-3.x-r59</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
index 96154bc72306..91dbd7ebcbb3 100644
--- 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-3.x-r58</version>
+    <version>1.16.0-kylin-3.x-r59</version>
   </parent>
 
   <artifactId>calcite-example-function</artifactId>
   <packaging>jar</packaging>
-  <version>1.16.0-kylin-3.x-r58</version>
+  <version>1.16.0-kylin-3.x-r59</version>
   <name>Calcite Example Function</name>
   <description>Examples of user-defined Calcite functions</description>
 
diff --git a/example/pom.xml b/example/pom.xml
index 4203089830fa..c21242b0b9b9 100644
--- 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-3.x-r58</version>
+    <version>1.16.0-kylin-3.x-r59</version>
   </parent>
 
   <!-- The basics. -->
   <artifactId>calcite-example</artifactId>
   <packaging>pom</packaging>
-  <version>1.16.0-kylin-3.x-r58</version>
+  <version>1.16.0-kylin-3.x-r59</version>
   <name>Calcite Examples</name>
   <description>Calcite examples</description>
 
diff --git a/file/pom.xml b/file/pom.xml
index 84d6b84ac714..82a77a266839 100644
--- 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-3.x-r58</version>
+    <version>1.16.0-kylin-3.x-r59</version>
   </parent>
 
   <!-- The basics. -->
   <artifactId>calcite-file</artifactId>
   <packaging>jar</packaging>
-  <version>1.16.0-kylin-3.x-r58</version>
+  <version>1.16.0-kylin-3.x-r59</version>
   <name>Calcite File</name>
   <description>Calcite provider that reads files and URIs</description>
 
diff --git a/geode/pom.xml b/geode/pom.xml
index 36ddfda16228..35a18a3b26ff 100644
--- 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-3.x-r58</version>
+    <version>1.16.0-kylin-3.x-r59</version>
   </parent>
 
   <artifactId>calcite-geode</artifactId>
   <packaging>jar</packaging>
-  <version>1.16.0-kylin-3.x-r58</version>
+  <version>1.16.0-kylin-3.x-r59</version>
   <name>Calcite Geode</name>
   <description>Geode adapter for Calcite</description>
 
diff --git a/linq4j/pom.xml b/linq4j/pom.xml
index 53c971c408d6..428392679a60 100644
--- 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-3.x-r58</version>
+    <version>1.16.0-kylin-3.x-r59</version>
   </parent>
 
   <artifactId>calcite-linq4j</artifactId>
   <packaging>jar</packaging>
-  <version>1.16.0-kylin-3.x-r58</version>
+  <version>1.16.0-kylin-3.x-r59</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
index a9314dbd0c0d..f94dde57f077 100644
--- 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-3.x-r58</version>
+    <version>1.16.0-kylin-3.x-r59</version>
   </parent>
 
   <artifactId>calcite-mongodb</artifactId>
   <packaging>jar</packaging>
-  <version>1.16.0-kylin-3.x-r58</version>
+  <version>1.16.0-kylin-3.x-r59</version>
   <name>Calcite MongoDB</name>
   <description>MongoDB adapter for Calcite</description>
 
diff --git a/pig/pom.xml b/pig/pom.xml
index c3edf342b94c..0ca49c3ca3bf 100644
--- 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-3.x-r58</version>
+    <version>1.16.0-kylin-3.x-r59</version>
   </parent>
 
   <artifactId>calcite-pig</artifactId>
   <packaging>jar</packaging>
-  <version>1.16.0-kylin-3.x-r58</version>
+  <version>1.16.0-kylin-3.x-r59</version>
   <name>Calcite Pig</name>
   <description>Pig adapter for Calcite</description>
 
diff --git a/piglet/pom.xml b/piglet/pom.xml
index cfb9189399d6..769590b9ab4a 100644
--- 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-3.x-r58</version>
+    <version>1.16.0-kylin-3.x-r59</version>
   </parent>
 
   <artifactId>calcite-piglet</artifactId>
   <packaging>jar</packaging>
-  <version>1.16.0-kylin-3.x-r58</version>
+  <version>1.16.0-kylin-3.x-r59</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
index 121f7b65d5de..ac96e59cd057 100644
--- 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-3.x-r58</version>
+    <version>1.16.0-kylin-3.x-r59</version>
   </parent>
 
   <artifactId>calcite-plus</artifactId>
   <packaging>jar</packaging>
-  <version>1.16.0-kylin-3.x-r58</version>
+  <version>1.16.0-kylin-3.x-r59</version>
   <name>Calcite Plus</name>
   <description>Miscellaneous extras for Calcite</description>
 
diff --git a/pom.xml b/pom.xml
index 311ee0285970..fb05f1da03d3 100644
--- 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-3.x-r58</version>
+  <version>1.16.0-kylin-3.x-r59</version>
 
   <!-- More project information. -->
   <name>Calcite</name>
@@ -58,7 +58,7 @@ limitations under the License.
 
     <!-- This list is in alphabetical order. -->
     <airlift-tpch.version>0.1</airlift-tpch.version>
-    <avatica.version>1.11.0.x-3.x-r2</avatica.version>
+    <avatica.version>1.11.0.x-3.x-r3</avatica.version>
     <build-helper-maven-plugin.version>3.0.0</build-helper-maven-plugin.version>
     <cassandra-driver-core.version>3.4.0</cassandra-driver-core.version>
     <checksum-maven-plugin.version>1.2</checksum-maven-plugin.version>
diff --git a/server/pom.xml b/server/pom.xml
index 74f7bb893e2c..cee3019e5704 100644
--- 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-3.x-r58</version>
+    <version>1.16.0-kylin-3.x-r59</version>
   </parent>
 
   <artifactId>calcite-server</artifactId>
   <packaging>jar</packaging>
-  <version>1.16.0-kylin-3.x-r58</version>
+  <version>1.16.0-kylin-3.x-r59</version>
   <name>Calcite Server</name>
   <description>Calcite Server</description>
 
diff --git a/spark/pom.xml b/spark/pom.xml
index 8cc91c0ba8dd..d75306358f37 100644
--- 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-3.x-r58</version>
+    <version>1.16.0-kylin-3.x-r59</version>
   </parent>
 
   <artifactId>calcite-spark</artifactId>
   <packaging>jar</packaging>
-  <version>1.16.0-kylin-3.x-r58</version>
+  <version>1.16.0-kylin-3.x-r59</version>
   <name>Calcite Spark</name>
 
   <properties>
diff --git a/splunk/pom.xml b/splunk/pom.xml
index 408161c0c3e5..a4dfdec22987 100644
--- 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-3.x-r58</version>
+    <version>1.16.0-kylin-3.x-r59</version>
   </parent>
 
   <artifactId>calcite-splunk</artifactId>
   <packaging>jar</packaging>
-  <version>1.16.0-kylin-3.x-r58</version>
+  <version>1.16.0-kylin-3.x-r59</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
index e48fe0076c49..f8dc936d697f 100644
--- 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-3.x-r58</version>
+    <version>1.16.0-kylin-3.x-r59</version>
   </parent>
 
   <properties>