diff --git ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java index bd6a984..a168865 100644 --- ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java +++ ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java @@ -49,7 +49,6 @@ import org.apache.calcite.plan.hep.HepProgramBuilder; import org.apache.calcite.rel.InvalidRelException; import org.apache.calcite.rel.RelCollation; -import org.apache.calcite.rel.RelCollations; import org.apache.calcite.rel.RelCollationImpl; import org.apache.calcite.rel.RelCollations; import org.apache.calcite.rel.RelFieldCollation; @@ -1327,13 +1326,11 @@ private RelNode genTableLogicalPlan(String tableAlias, QB qb) throws SemanticExc // 4. Build RelOptAbstractTable String fullyQualifiedTabName = tabMetaData.getDbName(); if (fullyQualifiedTabName != null && !fullyQualifiedTabName.isEmpty()) { - fullyQualifiedTabName = fullyQualifiedTabName + "." + tabMetaData.getTableName(); - } - else { - fullyQualifiedTabName = tabMetaData.getTableName(); - } - if (conf.getBoolVar(HiveConf.ConfVars.HIVE_CBO_RETPATH_HIVEOP)) { - fullyQualifiedTabName += "." + tableAlias; + fullyQualifiedTabName = fullyQualifiedTabName + "." + tabMetaData.getTableName() + + "." + tableAlias; + } else { + fullyQualifiedTabName = tabMetaData.getTableName() + + "." + tableAlias; } RelOptHiveTable optTable = new RelOptHiveTable(relOptSchema, fullyQualifiedTabName, tableAlias, rowType, tabMetaData, nonPartitionColumns, partitionColumns, virtualCols, conf,