diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java index 45482764fd..345f647f78 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java @@ -320,9 +320,7 @@ private final List columnStatsAutoGatherContexts; private final Map joinContext; private final Map smbMapJoinContext; - private final HashMap topToTable; private final List reduceSinkOperatorsAddedByEnforceBucketingSorting; - private final HashMap> topToTableProps; private QB qb; private ASTNode ast; private int destTableId; @@ -440,9 +438,7 @@ public SemanticAnalyzer(QueryState queryState) throws SemanticException { joinContext = new HashMap(); smbMapJoinContext = new HashMap(); // Must be deterministic order map for consistent q-test output across Java versions - topToTable = new LinkedHashMap(); reduceSinkOperatorsAddedByEnforceBucketingSorting = new ArrayList(); - topToTableProps = new HashMap>(); destTableId = 1; uCtx = null; listMapJoinOpsNoReducer = new ArrayList>(); @@ -461,7 +457,7 @@ public SemanticAnalyzer(QueryState queryState) throws SemanticException { mergeIsDirect = true; noscan = false; tabNameToTabObject = new HashMap<>(); - defaultJoinMerge = false == HiveConf.getBoolVar(conf, HiveConf.ConfVars.HIVE_MERGE_NWAY_JOINS); + defaultJoinMerge = !HiveConf.getBoolVar(conf, HiveConf.ConfVars.HIVE_MERGE_NWAY_JOINS); disableJoinMerge = defaultJoinMerge; } @@ -497,7 +493,6 @@ protected void reset(boolean clearCache) { groupOpToInputTables.clear(); disableJoinMerge = defaultJoinMerge; aliasToCTEs.clear(); - topToTable.clear(); opToPartPruner.clear(); opToPartList.clear(); opToPartToSkewedPruner.clear(); @@ -512,7 +507,6 @@ protected void reset(boolean clearCache) { globalLimitCtx.disableOpt(); viewAliasToInput.clear(); reduceSinkOperatorsAddedByEnforceBucketingSorting.clear(); - topToTableProps.clear(); listMapJoinOpsNoReducer.clear(); unparseTranslator.clear(); queryProperties.clear(); @@ -11466,11 +11460,7 @@ private Operator genTablePlan(String alias, QB qb) throws SemanticException { // scan topOps.put(alias_id, top); - // Add a mapping from the table scan operator to Table - topToTable.put(top, tab); - if (properties != null) { - topToTableProps.put(top, properties); tsDesc.setOpProps(properties); }