diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/HiveRelBuilder.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/HiveRelBuilder.java index 4794883223..f50779d8ef 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/HiveRelBuilder.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/HiveRelBuilder.java @@ -92,8 +92,8 @@ public static RelBuilderFactory proto(Object... factories) { @Override public RelBuilder filter(Iterable predicates) { - final RexNode x = RexUtil.simplify(cluster.getRexBuilder(), - RexUtil.composeConjunction(cluster.getRexBuilder(), predicates, false)); + final RexNode x = RexUtil.composeConjunction( + cluster.getRexBuilder(), predicates, false); if (!x.isAlwaysTrue()) { final RelNode input = build(); final RelNode filter = HiveRelFactories.HIVE_FILTER_FACTORY.createFilter(input, x); diff --git a/ql/src/test/results/clientpositive/llap/external_jdbc_table_perf.q.out b/ql/src/test/results/clientpositive/llap/external_jdbc_table_perf.q.out index c1314c62a8..a394f2b44b 100644 --- a/ql/src/test/results/clientpositive/llap/external_jdbc_table_perf.q.out +++ b/ql/src/test/results/clientpositive/llap/external_jdbc_table_perf.q.out @@ -2256,7 +2256,7 @@ FROM "STORE_SALES" WHERE "ss_customer_sk" IS NOT NULL AND "ss_sold_date_sk" IS NOT NULL) AS "t0" INNER JOIN (SELECT "d_date_sk" FROM "DATE_DIM" -WHERE "d_moy" BETWEEN 1 AND 3 AND "d_year" = 1999 AND "d_date_sk" IS NOT NULL) AS "t2" ON "t0"."ss_sold_date_sk" = "t2"."d_date_sk" +WHERE "d_year" = 1999 AND "d_moy" BETWEEN 1 AND 3 AND "d_date_sk" IS NOT NULL) AS "t2" ON "t0"."ss_sold_date_sk" = "t2"."d_date_sk" hive.sql.query.fieldNames ss_customer_sk0 hive.sql.query.fieldTypes int hive.sql.query.split false @@ -2289,7 +2289,7 @@ FROM "WEB_SALES" WHERE "ws_bill_customer_sk" IS NOT NULL AND "ws_sold_date_sk" IS NOT NULL) AS "t0" INNER JOIN (SELECT "d_date_sk" FROM "DATE_DIM" -WHERE "d_moy" BETWEEN 1 AND 3 AND "d_year" = 1999 AND "d_date_sk" IS NOT NULL) AS "t2" ON "t0"."ws_sold_date_sk" = "t2"."d_date_sk" +WHERE "d_year" = 1999 AND "d_moy" BETWEEN 1 AND 3 AND "d_date_sk" IS NOT NULL) AS "t2" ON "t0"."ws_sold_date_sk" = "t2"."d_date_sk" GROUP BY "t0"."ws_bill_customer_sk" hive.sql.query.fieldNames ws_bill_customer_sk0,$f1 hive.sql.query.fieldTypes int,boolean @@ -2318,7 +2318,7 @@ FROM "CATALOG_SALES" WHERE "cs_ship_customer_sk" IS NOT NULL AND "cs_sold_date_sk" IS NOT NULL) AS "t0" INNER JOIN (SELECT "d_date_sk" FROM "DATE_DIM" -WHERE "d_moy" BETWEEN 1 AND 3 AND "d_year" = 1999 AND "d_date_sk" IS NOT NULL) AS "t2" ON "t0"."cs_sold_date_sk" = "t2"."d_date_sk" +WHERE "d_year" = 1999 AND "d_moy" BETWEEN 1 AND 3 AND "d_date_sk" IS NOT NULL) AS "t2" ON "t0"."cs_sold_date_sk" = "t2"."d_date_sk" GROUP BY "t0"."cs_ship_customer_sk" hive.sql.query.fieldNames cs_ship_customer_sk0,$f1 hive.sql.query.fieldTypes int,boolean