diff --git ql/src/java/org/apache/hadoop/hive/ql/parse/ParseContext.java ql/src/java/org/apache/hadoop/hive/ql/parse/ParseContext.java index b838bff..2296da7 100644 --- ql/src/java/org/apache/hadoop/hive/ql/parse/ParseContext.java +++ ql/src/java/org/apache/hadoop/hive/ql/parse/ParseContext.java @@ -64,7 +64,6 @@ public class ParseContext { private QB qb; - private ASTNode ast; private HashMap opToPartPruner; private HashMap opToPartList; private HashMap opToSamplePruner; @@ -148,7 +147,6 @@ public ParseContext() { public ParseContext( HiveConf conf, QB qb, - ASTNode ast, HashMap opToPartPruner, HashMap opToPartList, HashMap> topOps, @@ -170,7 +168,6 @@ public ParseContext( QueryProperties queryProperties) { this.conf = conf; this.qb = qb; - this.ast = ast; this.opToPartPruner = opToPartPruner; this.opToPartList = opToPartList; this.joinOps = joinOps; @@ -244,21 +241,6 @@ public void setConf(HiveConf conf) { } /** - * @return the ast - */ - public ASTNode getParseTree() { - return ast; - } - - /** - * @param ast - * the parsetree to set - */ - public void setParseTree(ASTNode ast) { - this.ast = ast; - } - - /** * @return the opToPartPruner */ public HashMap getOpToPartPruner() { diff --git ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java index 4364f28..3845528 100644 --- ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java +++ ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java @@ -397,7 +397,7 @@ public void initParseCtx(ParseContext pctx) { } public ParseContext getParseContext() { - return new ParseContext(conf, qb, ast, opToPartPruner, opToPartList, + return new ParseContext(conf, qb, opToPartPruner, opToPartList, topOps, opParseCtx, new HashSet(joinContext.keySet()), new HashSet(smbMapJoinContext.keySet()), @@ -10163,7 +10163,7 @@ void analyzeInternal(ASTNode ast, PlannerContext plannerCtx) throws SemanticExce } // 4. Generate Parse Context for Optimizer & Physical compiler - ParseContext pCtx = new ParseContext(conf, qb, plannerCtx.child, + ParseContext pCtx = new ParseContext(conf, qb, opToPartPruner, opToPartList, topOps, opParseCtx, new HashSet(joinContext.keySet()), new HashSet(smbMapJoinContext.keySet()), diff --git ql/src/java/org/apache/hadoop/hive/ql/parse/TaskCompiler.java ql/src/java/org/apache/hadoop/hive/ql/parse/TaskCompiler.java index f2eb4d2..99e2e12 100644 --- ql/src/java/org/apache/hadoop/hive/ql/parse/TaskCompiler.java +++ ql/src/java/org/apache/hadoop/hive/ql/parse/TaskCompiler.java @@ -385,7 +385,7 @@ protected abstract void generateTaskTree(List> root */ public ParseContext getParseContext(ParseContext pCtx, List> rootTasks) { ParseContext clone = new ParseContext(conf, - pCtx.getQB(), pCtx.getParseTree(), + pCtx.getQB(), pCtx.getOpToPartPruner(), pCtx.getOpToPartList(), pCtx.getTopOps(), pCtx.getOpParseCtx(), pCtx.getJoinOps(), pCtx.getSmbMapJoinOps(), pCtx.getLoadTableWork(), pCtx.getLoadFileWork(), pCtx.getContext(),