Author: jpullokk
Date: Mon Feb 2 19:19:36 2015
New Revision: 1656545
URL: http://svn.apache.org/r1656545
Log:
HIVE-9431: Removing AST from ParseContext (Jesus Camacho Rodriguez via Laljo
John Pullokkaran
Modified:
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/ParseContext.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/TaskCompiler.java
Modified:
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/ParseContext.java
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/ParseContext.java?rev=1656545&r1=1656544&r2=1656545&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/ParseContext.java
(original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/ParseContext.java
Mon Feb 2 19:19:36 2015
@@ -63,7 +63,6 @@ import org.apache.hadoop.hive.ql.plan.Ta
public class ParseContext {
private QB qb;
- private ASTNode ast;
private HashMap<TableScanOperator, ExprNodeDesc> opToPartPruner;
private HashMap<TableScanOperator, PrunedPartitionList> opToPartList;
private HashMap<TableScanOperator, sampleDesc> opToSamplePruner;
@@ -146,7 +145,6 @@ public class ParseContext {
public ParseContext(
HiveConf conf,
QB qb,
- ASTNode ast,
HashMap<TableScanOperator, ExprNodeDesc> opToPartPruner,
HashMap<TableScanOperator, PrunedPartitionList> opToPartList,
HashMap<String, Operator<? extends OperatorDesc>> topOps,
@@ -167,7 +165,6 @@ public class ParseContext {
QueryProperties queryProperties) {
this.conf = conf;
this.qb = qb;
- this.ast = ast;
this.opToPartPruner = opToPartPruner;
this.opToPartList = opToPartList;
this.joinOps = joinOps;
@@ -240,21 +237,6 @@ public class ParseContext {
}
/**
- * @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<TableScanOperator, ExprNodeDesc> getOpToPartPruner() {
Modified:
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java?rev=1656545&r1=1656544&r2=1656545&view=diff
==============================================================================
---
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
(original)
+++
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
Mon Feb 2 19:19:36 2015
@@ -396,7 +396,7 @@ public class SemanticAnalyzer extends Ba
}
public ParseContext getParseContext() {
- return new ParseContext(conf, qb, ast, opToPartPruner, opToPartList,
topOps,
+ return new ParseContext(conf, qb, opToPartPruner, opToPartList, topOps,
new HashSet<JoinOperator>(joinContext.keySet()),
new HashSet<SMBMapJoinOperator>(smbMapJoinContext.keySet()),
loadTableWork, loadFileWork, ctx, idToTableNameMap, destTableId, uCtx,
@@ -10096,7 +10096,7 @@ public class SemanticAnalyzer extends Ba
}
// 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,
new HashSet<JoinOperator>(joinContext.keySet()),
new HashSet<SMBMapJoinOperator>(smbMapJoinContext.keySet()),
Modified:
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/TaskCompiler.java
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/TaskCompiler.java?rev=1656545&r1=1656544&r2=1656545&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/TaskCompiler.java
(original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/TaskCompiler.java
Mon Feb 2 19:19:36 2015
@@ -385,7 +385,7 @@ public abstract class TaskCompiler {
*/
public ParseContext getParseContext(ParseContext pCtx, List<Task<? extends
Serializable>> rootTasks) {
ParseContext clone = new ParseContext(conf,
- pCtx.getQB(), pCtx.getParseTree(),
+ pCtx.getQB(),
pCtx.getOpToPartPruner(), pCtx.getOpToPartList(), pCtx.getTopOps(),
pCtx.getJoinOps(), pCtx.getSmbMapJoinOps(),
pCtx.getLoadTableWork(), pCtx.getLoadFileWork(), pCtx.getContext(),
