diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java index e837cdeff0..a0520d9357 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java @@ -1832,7 +1832,8 @@ public RelNode apply(RelOptCluster cluster, RelOptSchema relOptSchema, SchemaPlu // We disable it for CTAS and MV creation queries (trying to avoid any problem // due to data freshness) if (conf.getBoolVar(ConfVars.HIVE_MATERIALIZED_VIEW_ENABLE_AUTO_REWRITING) && - !getQB().isMaterializedView() && !ctx.isLoadingMaterializedView() && !getQB().isCTAS()) { + !getQB().isMaterializedView() && !ctx.isLoadingMaterializedView() && !getQB().isCTAS() && + getQB().hasTableDefined()) { calcitePreCboPlan = applyMaterializedViewRewriting(planner, calcitePreCboPlan, mdProvider.getMetadataProvider(), executorProvider); }