diff --git a/cassandra/pom.xml b/cassandra/pom.xml
index bc81900d4836..d7c86734cce3 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-4.x-r68</version>
+    <version>1.16.0-kylin-4.x-r69</version>
   </parent>
 
   <artifactId>calcite-cassandra</artifactId>
   <packaging>jar</packaging>
-  <version>1.16.0-kylin-4.x-r68</version>
+  <version>1.16.0-kylin-4.x-r69</version>
   <name>Calcite Cassandra</name>
   <description>Cassandra adapter for Calcite</description>
 
diff --git a/core/pom.xml b/core/pom.xml
index 7047552cab44..2e05ac3f96a4 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-4.x-r68</version>
+    <version>1.16.0-kylin-4.x-r69</version>
   </parent>
 
   <artifactId>calcite-core</artifactId>
   <packaging>jar</packaging>
-  <version>1.16.0-kylin-4.x-r68</version>
+  <version>1.16.0-kylin-4.x-r69</version>
   <name>Calcite Core</name>
   <description>Core Calcite APIs and engine.</description>
 
diff --git a/core/src/main/java/org/apache/calcite/rex/RexUtil.java b/core/src/main/java/org/apache/calcite/rex/RexUtil.java
index 6f467bed761f..1e135f8cff2e 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexUtil.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexUtil.java
@@ -1491,6 +1491,15 @@ public static RexNode toCnf(RexBuilder rexBuilder, int maxCnfNodeCount,
     return new CnfHelper(rexBuilder, maxCnfNodeCount).toCnf(rex);
   }
 
+  /**
+   * for example (a AND b) OR c -> (a OR c) AND (b OR c)
+   * maxCnfExprCount = 2    1. (a OR c)  2.(b OR c)
+   */
+  public static RexNode toCnf(RexBuilder rexBuilder, int maxCnfNodeCount, int maxCnfExprCount,
+                              RexNode rex) {
+    return new CnfHelper(rexBuilder, maxCnfNodeCount, maxCnfExprCount).toCnf(rex);
+  }
+
   /** Converts an expression to disjunctive normal form (DNF).
    *
    * <p>DNF: It is a form of logical formula which is disjunction of conjunctive
@@ -2213,12 +2222,18 @@ private static class CnfHelper {
     final RexBuilder rexBuilder;
     int currentCount;
     final int maxNodeCount; // negative means no limit
+    int maxExprCount = 10000;
 
     private CnfHelper(RexBuilder rexBuilder, int maxNodeCount) {
       this.rexBuilder = rexBuilder;
       this.maxNodeCount = maxNodeCount;
     }
 
+    private CnfHelper(RexBuilder rexBuilder, int maxNodeCount, int maxExprCount) {
+      this(rexBuilder, maxNodeCount);
+      this.maxExprCount = maxExprCount;
+    }
+
     public RexNode toCnf(RexNode rex) {
       try {
         this.currentCount = 0;
@@ -2264,6 +2279,9 @@ private RexNode toCnf2(RexNode rex) {
             list.add(or(ImmutableList.of(h, t)));
           }
         }
+        if (list.size() > maxExprCount) {
+          throw OverflowError.INSTANCE;
+        }
         return and(list);
       case NOT:
         final RexNode arg = ((RexCall) rex).getOperands().get(0);
diff --git a/druid/pom.xml b/druid/pom.xml
index 6abc12c386e4..64ec8f14254e 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-4.x-r68</version>
+    <version>1.16.0-kylin-4.x-r69</version>
   </parent>
 
   <artifactId>calcite-druid</artifactId>
   <packaging>jar</packaging>
-  <version>1.16.0-kylin-4.x-r68</version>
+  <version>1.16.0-kylin-4.x-r69</version>
   <name>Calcite Druid</name>
   <description>Druid adapter for Calcite</description>
 
diff --git a/elasticsearch2/pom.xml b/elasticsearch2/pom.xml
index 951ccd1e53ca..bb70925a0560 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-4.x-r68</version>
+    <version>1.16.0-kylin-4.x-r69</version>
   </parent>
 
   <artifactId>calcite-elasticsearch2</artifactId>
   <packaging>jar</packaging>
-  <version>1.16.0-kylin-4.x-r68</version>
+  <version>1.16.0-kylin-4.x-r69</version>
   <name>Calcite Elasticsearch</name>
   <description>Elasticsearch adapter for Calcite</description>
 
diff --git a/elasticsearch5/pom.xml b/elasticsearch5/pom.xml
index 3b9fe8562ca9..078fadf2d13e 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-4.x-r68</version>
+    <version>1.16.0-kylin-4.x-r69</version>
   </parent>
 
   <artifactId>calcite-elasticsearch5</artifactId>
   <packaging>jar</packaging>
-  <version>1.16.0-kylin-4.x-r68</version>
+  <version>1.16.0-kylin-4.x-r69</version>
   <name>Calcite Elasticsearch5</name>
   <description>Elasticsearch5 adapter for Calcite</description>
 
diff --git a/example/csv/pom.xml b/example/csv/pom.xml
index 49a84c9c2f3b..f18f2ba66705 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-4.x-r68</version>
+    <version>1.16.0-kylin-4.x-r69</version>
   </parent>
 
   <artifactId>calcite-example-csv</artifactId>
   <packaging>jar</packaging>
-  <version>1.16.0-kylin-4.x-r68</version>
+  <version>1.16.0-kylin-4.x-r69</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 c1d74b597e37..aec41f4f799c 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-4.x-r68</version>
+    <version>1.16.0-kylin-4.x-r69</version>
   </parent>
 
   <artifactId>calcite-example-function</artifactId>
   <packaging>jar</packaging>
-  <version>1.16.0-kylin-4.x-r68</version>
+  <version>1.16.0-kylin-4.x-r69</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 36e015377ee5..6f215a5e1462 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-4.x-r68</version>
+    <version>1.16.0-kylin-4.x-r69</version>
   </parent>
 
   <!-- The basics. -->
   <artifactId>calcite-example</artifactId>
   <packaging>pom</packaging>
-  <version>1.16.0-kylin-4.x-r68</version>
+  <version>1.16.0-kylin-4.x-r69</version>
   <name>Calcite Examples</name>
   <description>Calcite examples</description>
 
diff --git a/file/pom.xml b/file/pom.xml
index 35b12a66db57..abe6abbe57a8 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-4.x-r68</version>
+    <version>1.16.0-kylin-4.x-r69</version>
   </parent>
 
   <!-- The basics. -->
   <artifactId>calcite-file</artifactId>
   <packaging>jar</packaging>
-  <version>1.16.0-kylin-4.x-r68</version>
+  <version>1.16.0-kylin-4.x-r69</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 99e8c72e95f4..aa83a50dae35 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-4.x-r68</version>
+    <version>1.16.0-kylin-4.x-r69</version>
   </parent>
 
   <artifactId>calcite-geode</artifactId>
   <packaging>jar</packaging>
-  <version>1.16.0-kylin-4.x-r68</version>
+  <version>1.16.0-kylin-4.x-r69</version>
   <name>Calcite Geode</name>
   <description>Geode adapter for Calcite</description>
 
diff --git a/linq4j/pom.xml b/linq4j/pom.xml
index 5c84f9fb161d..2a5e3d2db286 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-4.x-r68</version>
+    <version>1.16.0-kylin-4.x-r69</version>
   </parent>
 
   <artifactId>calcite-linq4j</artifactId>
   <packaging>jar</packaging>
-  <version>1.16.0-kylin-4.x-r68</version>
+  <version>1.16.0-kylin-4.x-r69</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 d9d2e755eba5..c6bcb6a55550 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-4.x-r68</version>
+    <version>1.16.0-kylin-4.x-r69</version>
   </parent>
 
   <artifactId>calcite-mongodb</artifactId>
   <packaging>jar</packaging>
-<version>1.16.0-kylin-4.x-r68</version>
+<version>1.16.0-kylin-4.x-r69</version>
   <name>Calcite MongoDB</name>
   <description>MongoDB adapter for Calcite</description>
 
diff --git a/pig/pom.xml b/pig/pom.xml
index b615511c5676..f0dbd7790aef 100644
--- a/pig/pom.xml
+++ b/pig/pom.xml
@@ -20,11 +20,11 @@ limitations under the License.
   <parent>
     <groupId>org.apache.calcite</groupId>
     <artifactId>calcite</artifactId>
-    <version>1.16.0-kylin-4.x-r68</version></parent>
+    <version>1.16.0-kylin-4.x-r69</version></parent>
 
   <artifactId>calcite-pig</artifactId>
   <packaging>jar</packaging>
-  <version>1.16.0-kylin-4.x-r68</version>
+  <version>1.16.0-kylin-4.x-r69</version>
   <name>Calcite Pig</name>
   <description>Pig adapter for Calcite</description>
 
diff --git a/piglet/pom.xml b/piglet/pom.xml
index a10da517b282..ed5e4391536d 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-4.x-r68</version>
+    <version>1.16.0-kylin-4.x-r69</version>
   </parent>
 
   <artifactId>calcite-piglet</artifactId>
   <packaging>jar</packaging>
-  <version>1.16.0-kylin-4.x-r68</version>
+  <version>1.16.0-kylin-4.x-r69</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 42bb86c86d85..1d1275cdbec0 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-4.x-r68</version>
+    <version>1.16.0-kylin-4.x-r69</version>
   </parent>
 
   <artifactId>calcite-plus</artifactId>
   <packaging>jar</packaging>
-  <version>1.16.0-kylin-4.x-r68</version>
+  <version>1.16.0-kylin-4.x-r69</version>
   <name>Calcite Plus</name>
   <description>Miscellaneous extras for Calcite</description>
 
diff --git a/pom.xml b/pom.xml
index b5089369ad21..3b53dc1efd0b 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-4.x-r68</version>
+  <version>1.16.0-kylin-4.x-r69</version>
 
   <!-- More project information. -->
   <name>Calcite</name>
diff --git a/server/pom.xml b/server/pom.xml
index 970bafee1d31..bfc5944a3884 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-4.x-r68</version>
+    <version>1.16.0-kylin-4.x-r69</version>
   </parent>
 
   <artifactId>calcite-server</artifactId>
   <packaging>jar</packaging>
-  <version>1.16.0-kylin-4.x-r68</version>
+  <version>1.16.0-kylin-4.x-r69</version>
   <name>Calcite Server</name>
   <description>Calcite Server</description>
 
diff --git a/spark/pom.xml b/spark/pom.xml
index 0f74876e3c14..92e1740d6891 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-4.x-r68</version>
+    <version>1.16.0-kylin-4.x-r69</version>
   </parent>
 
   <artifactId>calcite-spark</artifactId>
   <packaging>jar</packaging>
-  <version>1.16.0-kylin-4.x-r68</version>
+  <version>1.16.0-kylin-4.x-r69</version>
   <name>Calcite Spark</name>
 
   <properties>
diff --git a/splunk/pom.xml b/splunk/pom.xml
index 2644e6df4d7d..866b41b848cb 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-4.x-r68</version>
+<version>1.16.0-kylin-4.x-r69</version>
   </parent>
 
   <artifactId>calcite-splunk</artifactId>
   <packaging>jar</packaging>
-<version>1.16.0-kylin-4.x-r68</version>
+<version>1.16.0-kylin-4.x-r69</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 fb0f26c7d495..822bff87f3c2 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-4.x-r68</version>
+<version>1.16.0-kylin-4.x-r69</version>
   </parent>
 
   <properties>