diff --git a/pom.xml b/pom.xml index 5be30f6696..841d22753f 100644 --- a/pom.xml +++ b/pom.xml @@ -121,7 +121,7 @@ 1.10.0 1.7.7 0.8.0.RELEASE - 1.15.0 + 1.16.0 4.2.4 4.1.17 4.1.19 @@ -260,6 +260,19 @@ false + + calcite + calcite repository + https://repository.apache.org/content/repositories/orgapachecalcite-1042 + default + + true + warn + + + false + + diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/views/HiveMaterializedViewRule.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/views/HiveMaterializedViewRule.java index ce5e354ced..df9c1802c8 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/views/HiveMaterializedViewRule.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/views/HiveMaterializedViewRule.java @@ -31,21 +31,27 @@ public class HiveMaterializedViewRule { public static final MaterializedViewProjectFilterRule INSTANCE_PROJECT_FILTER = - new MaterializedViewProjectFilterRule(HiveRelFactories.HIVE_BUILDER, true); + new MaterializedViewProjectFilterRule(HiveRelFactories.HIVE_BUILDER, true, + null, false); public static final MaterializedViewOnlyFilterRule INSTANCE_FILTER = - new MaterializedViewOnlyFilterRule(HiveRelFactories.HIVE_BUILDER, true); + new MaterializedViewOnlyFilterRule(HiveRelFactories.HIVE_BUILDER, true, + null, false); public static final MaterializedViewProjectJoinRule INSTANCE_PROJECT_JOIN = - new MaterializedViewProjectJoinRule(HiveRelFactories.HIVE_BUILDER, true); + new MaterializedViewProjectJoinRule(HiveRelFactories.HIVE_BUILDER, true, + null, false); public static final MaterializedViewOnlyJoinRule INSTANCE_JOIN = - new MaterializedViewOnlyJoinRule(HiveRelFactories.HIVE_BUILDER, true); + new MaterializedViewOnlyJoinRule(HiveRelFactories.HIVE_BUILDER, true, + null, false); public static final MaterializedViewProjectAggregateRule INSTANCE_PROJECT_AGGREGATE = - new MaterializedViewProjectAggregateRule(HiveRelFactories.HIVE_BUILDER, true); + new MaterializedViewProjectAggregateRule(HiveRelFactories.HIVE_BUILDER, true, + null); public static final MaterializedViewOnlyAggregateRule INSTANCE_AGGREGATE = - new MaterializedViewOnlyAggregateRule(HiveRelFactories.HIVE_BUILDER, true); + new MaterializedViewOnlyAggregateRule(HiveRelFactories.HIVE_BUILDER, true, + null); }