diff --git a/pom.xml b/pom.xml
index 9f6ff46225b0..6c99e658def6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,7 +117,7 @@
     <avro.version>1.12.0</avro.version>
     <awaitility.version>4.2.1</awaitility.version>
     <bcprov-jdk18on.version>1.84</bcprov-jdk18on.version>
-    <calcite.version>1.42.0</calcite.version>
+    <calcite.version>1.43.0-SNAPSHOT</calcite.version>
     <datanucleus-api-jdo.version>6.0.5</datanucleus-api-jdo.version>
     <datanucleus-core.version>6.0.11</datanucleus-core.version>
     <datanucleus-jdo.version>3.2.0-release</datanucleus-jdo.version>
@@ -273,6 +273,19 @@
         <enabled>false</enabled>
       </snapshots>
     </repository>
+    <!-- Just for testing Apache Calcite Snapshot -->
+    <repository>
+      <id>apache.snapshots</id>
+      <name>Apache Snapshots</name>
+      <url>https://repository.apache.org/content/repositories/snapshots/</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+        <updatePolicy>daily</updatePolicy>
+      </snapshots>
+    </repository>
   </repositories>
   <dependencyManagement>
     <dependencies>
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/HiveRelShuttleImpl.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/HiveRelShuttleImpl.java
index 6f74664c0bd7..eb7176897dfa 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/HiveRelShuttleImpl.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/HiveRelShuttleImpl.java
@@ -22,8 +22,17 @@
 import java.util.Deque;
 import org.apache.calcite.linq4j.Ord;
 import org.apache.calcite.rel.RelNode;
+import org.apache.calcite.rel.core.Collect;
+import org.apache.calcite.rel.core.Combine;
+import org.apache.calcite.rel.core.ConditionalCorrelate;
+import org.apache.calcite.rel.core.Sample;
+import org.apache.calcite.rel.core.Snapshot;
+import org.apache.calcite.rel.core.SortExchange;
 import org.apache.calcite.rel.core.TableFunctionScan;
 import org.apache.calcite.rel.core.TableScan;
+import org.apache.calcite.rel.core.TableSpool;
+import org.apache.calcite.rel.core.Uncollect;
+import org.apache.calcite.rel.core.Window;
 import org.apache.calcite.rel.logical.LogicalAggregate;
 import org.apache.calcite.rel.logical.LogicalAsofJoin;
 import org.apache.calcite.rel.logical.LogicalCalc;
@@ -190,6 +199,51 @@ public RelNode visit(LogicalAsofJoin logicalAsofJoin) {
     public RelNode visit(LogicalRepeatUnion logicalRepeatUnion) {
         return visitChildren(logicalRepeatUnion);
     }
+
+    @Override
+    public RelNode visit(Window window) {
+        return visitChildren(window);
+    }
+
+    @Override
+    public RelNode visit(Snapshot snapshot) {
+        return visitChildren(snapshot);
+    }
+
+    @Override
+    public RelNode visit(Collect collect) {
+        return visitChildren(collect);
+    }
+
+    @Override
+    public RelNode visit(Sample sample) {
+        return visitChildren(sample);
+    }
+
+    @Override
+    public RelNode visit(Uncollect uncollect) {
+        return visitChildren(uncollect);
+    }
+
+    @Override
+    public RelNode visit(Combine combine) {
+        return visitChildren(combine);
+    }
+
+    @Override
+    public RelNode visit(ConditionalCorrelate conditionalCorrelate) {
+        return visitChildren(conditionalCorrelate);
+    }
+
+    @Override
+    public RelNode visit(SortExchange sortExchange) {
+        return visitChildren(sortExchange);
+    }
+
+    @Override
+    public RelNode visit(TableSpool tableSpool) {
+        return visitChildren(tableSpool);
+    }
 }
 
 // End RelShuttleImpl.java