diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/ExplainSQRewriteTask.java ql/src/java/org/apache/hadoop/hive/ql/exec/ExplainSQRewriteTask.java index ea3ac70..55c59a7 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/ExplainSQRewriteTask.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/ExplainSQRewriteTask.java @@ -95,7 +95,7 @@ void addRewrites(TokenRewriteStream stream, QB qb, String program, ASTNode sqNode = sqW != null ? sqW.getOriginalSubQueryASTForRewrite() : sqH.getOriginalSubQueryASTForRewrite(); ASTNode tokQry = getQueryASTNode(sqNode); - ASTNode tokFrom = (ASTNode) tokQry.getChild(0); + ASTNode tokFrom = (ASTNode) tokQry.getChild(1); StringBuilder addedJoins = new StringBuilder(); @@ -119,7 +119,7 @@ void addRewrites(TokenRewriteStream stream, QBSubQuery sq, String program, PrintStream out, String qbAlias, boolean isWhere, StringBuilder addedJoins) { ASTNode sqNode = sq.getOriginalSubQueryASTForRewrite(); ASTNode tokQry = getQueryASTNode(sqNode); - ASTNode tokInsert = (ASTNode) tokQry.getChild(1); + ASTNode tokInsert = (ASTNode) tokQry.getChild(0); ASTNode tokWhere = null; for(int i=0; i < tokInsert.getChildCount(); i++) { diff --git ql/src/java/org/apache/hadoop/hive/ql/parse/FromClauseParser.g ql/src/java/org/apache/hadoop/hive/ql/parse/FromClauseParser.g index f448b16..356f318 100644 --- ql/src/java/org/apache/hadoop/hive/ql/parse/FromClauseParser.g +++ ql/src/java/org/apache/hadoop/hive/ql/parse/FromClauseParser.g @@ -76,11 +76,13 @@ aliasList //----------------------- Rules for parsing fromClause ------------------------------ // from [col1, col2, col3] table1, [col4, col5] table2 -fromClause +fromClause[boolean base] @init { gParent.pushMsg("from clause", state); } @after { gParent.popMsg(state); } : - KW_FROM joinSource -> ^(TOK_FROM joinSource) + KW_FROM joinSource + -> {base}? ^(TOK_FROM_BASE joinSource) + -> ^(TOK_FROM joinSource) ; joinSource diff --git ql/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g ql/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g index f934ac4..a4fc3d5 100644 --- ql/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g +++ ql/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g @@ -33,6 +33,7 @@ TOK_SELECT; TOK_SELECTDI; TOK_SELEXPR; TOK_FROM; +TOK_FROM_BASE; TOK_TAB; TOK_PARTSPEC; TOK_PARTVAL; @@ -2051,37 +2052,42 @@ cteStatement ; fromStatement[boolean topLevel] -: (singleFromStatement -> singleFromStatement) - (u=setOperator r=singleFromStatement +: (singleFromStatement[topLevel] -> singleFromStatement) + (u=setOperator r=singleFromStatement[topLevel] -> ^($u {$fromStatement.tree} $r) )* -> {u != null && topLevel}? ^(TOK_QUERY + ^(TOK_INSERT + ^(TOK_DESTINATION ^(TOK_DIR TOK_TMP_FILE)) + ^(TOK_SELECT ^(TOK_SELEXPR TOK_ALLCOLREF)) + ) ^(TOK_FROM ^(TOK_SUBQUERY {$fromStatement.tree} {adaptor.create(Identifier, generateUnionAlias())} ) ) - ^(TOK_INSERT - ^(TOK_DESTINATION ^(TOK_DIR TOK_TMP_FILE)) - ^(TOK_SELECT ^(TOK_SELEXPR TOK_ALLCOLREF)) - ) ) -> {$fromStatement.tree} ; - -singleFromStatement +singleFromStatement[boolean topLevel] : - fromClause - ( b+=body )+ -> ^(TOK_QUERY fromClause body+) + fromClause[true] fromBody[topLevel] -> ^(TOK_QUERY fromClause fromBody) ; +fromBody[boolean topLevel] + : + singleInsertSelectStatement+ + | + selectStatement[topLevel] + ; + regularBody[boolean topLevel] : i=insertClause s=selectStatement[topLevel] - {$s.tree.getChild(1).replaceChildren(0, 0, $i.tree);} -> {$s.tree} + {$s.tree.getChild(0).replaceChildren(0, 0, $i.tree);} -> {$s.tree} | selectStatement[topLevel] ; @@ -2092,16 +2098,16 @@ regularBody[boolean topLevel] -> ^($u {$selectStatement.tree} $b) )* -> {u != null && topLevel}? ^(TOK_QUERY + ^(TOK_INSERT + ^(TOK_DESTINATION ^(TOK_DIR TOK_TMP_FILE)) + ^(TOK_SELECT ^(TOK_SELEXPR TOK_ALLCOLREF)) + ) ^(TOK_FROM ^(TOK_SUBQUERY {$selectStatement.tree} {adaptor.create(Identifier, generateUnionAlias())} ) ) - ^(TOK_INSERT - ^(TOK_DESTINATION ^(TOK_DIR TOK_TMP_FILE)) - ^(TOK_SELECT ^(TOK_SELEXPR TOK_ALLCOLREF)) - ) ) -> {$selectStatement.tree} ; @@ -2109,7 +2115,8 @@ regularBody[boolean topLevel] singleSelectStatement : selectClause - fromClause? + fromClause[false]? + lateralView? whereClause? groupByClause? havingClause? @@ -2118,26 +2125,17 @@ singleSelectStatement distributeByClause? sortByClause? window_clause? - limitClause? -> ^(TOK_QUERY fromClause? ^(TOK_INSERT ^(TOK_DESTINATION ^(TOK_DIR TOK_TMP_FILE)) - selectClause whereClause? groupByClause? havingClause? orderByClause? clusterByClause? - distributeByClause? sortByClause? window_clause? limitClause?)) + limitClause? -> + ^(TOK_QUERY ^(TOK_INSERT ^(TOK_DESTINATION ^(TOK_DIR TOK_TMP_FILE)) + selectClause lateralView? whereClause? groupByClause? havingClause? orderByClause? clusterByClause? + distributeByClause? sortByClause? window_clause? limitClause?) fromClause?) ; -selectStatementWithCTE - : - (w=withClause)? - selectStatement[true] { - if ($w.tree != null) { - adaptor.addChild($selectStatement.tree, $w.tree); - } - } - -> selectStatement - ; - -body +singleInsertSelectStatement : insertClause selectClause + fromClause[false]? lateralView? whereClause? groupByClause? @@ -2147,25 +2145,23 @@ body distributeByClause? sortByClause? window_clause? - limitClause? -> ^(TOK_INSERT insertClause + limitClause? -> + ^(TOK_QUERY ^(TOK_INSERT insertClause selectClause lateralView? whereClause? groupByClause? havingClause? orderByClause? clusterByClause? - distributeByClause? sortByClause? window_clause? limitClause?) - | - selectClause - lateralView? - whereClause? - groupByClause? - havingClause? - orderByClause? - clusterByClause? - distributeByClause? - sortByClause? - window_clause? - limitClause? -> ^(TOK_INSERT ^(TOK_DESTINATION ^(TOK_DIR TOK_TMP_FILE)) - selectClause lateralView? whereClause? groupByClause? havingClause? orderByClause? clusterByClause? - distributeByClause? sortByClause? window_clause? limitClause?) + distributeByClause? sortByClause? window_clause? limitClause?) fromClause?) ; +selectStatementWithCTE + : + (w=withClause)? + selectStatement[true] { + if ($w.tree != null) { + adaptor.addChild($selectStatement.tree, $w.tree); + } + } + -> selectStatement + ; + insertClause @init { pushMsg("insert clause", state); } @after { popMsg(state); } diff --git ql/src/java/org/apache/hadoop/hive/ql/parse/QB.java ql/src/java/org/apache/hadoop/hive/ql/parse/QB.java index 908db1e..9f9a36c 100644 --- ql/src/java/org/apache/hadoop/hive/ql/parse/QB.java +++ ql/src/java/org/apache/hadoop/hive/ql/parse/QB.java @@ -38,6 +38,8 @@ private static final Log LOG = LogFactory.getLog("hive.ql.parse.QB"); + private ASTNode source; + private final int numJoins = 0; private final int numGbys = 0; private int numSels = 0; @@ -55,6 +57,8 @@ private CreateTableDesc tblDesc = null; // table descriptor of the final private CreateTableDesc localDirectoryDesc = null ; + private String baseAlias; + // used by PTFs /* * This map maintains the PTFInvocationSpec for each PTF chain invocation in this QB. @@ -366,4 +370,14 @@ public QBSubQuery getHavingClauseSubQueryPredicate() { return havingClauseSubQueryPredicate; } + public String getBaseAlias() { + return baseAlias; + } + + public void setBaseAlias(String baseAlias) { + if (this.baseAlias != null) { + throw new IllegalStateException("never"); + } + this.baseAlias = baseAlias.toLowerCase(); + } } diff --git ql/src/java/org/apache/hadoop/hive/ql/parse/QBParseInfo.java ql/src/java/org/apache/hadoop/hive/ql/parse/QBParseInfo.java index 911ac8a..10a8237 100644 --- ql/src/java/org/apache/hadoop/hive/ql/parse/QBParseInfo.java +++ ql/src/java/org/apache/hadoop/hive/ql/parse/QBParseInfo.java @@ -90,6 +90,7 @@ private final HashMap> aliasToLateralViews; private final HashMap destToLateralView; + private final HashMap> destToSources; /* Order by clause */ private final HashMap destToOrderby; @@ -113,6 +114,7 @@ public QBParseInfo(String alias, boolean isSubQ) { nameToSample = new HashMap(); exprToColumnAlias = new HashMap(); destToLateralView = new HashMap(); + destToSources = new HashMap>(); destToSelExpr = new LinkedHashMap(); destToWhereExpr = new HashMap(); destToGroupby = new HashMap(); @@ -224,6 +226,14 @@ public void setDestForClause(String clause, ASTNode ast) { nameToDest.put(clause, ast); } + public void addSourceForDest(String clause, String source) { + List sources = destToSources.get(clause); + if (sources == null) { + destToSources.put(clause, sources = new ArrayList()); + } + sources.add(source.toLowerCase()); + } + /** * Set the Cluster By AST for the clause. * @@ -558,6 +568,14 @@ public tableSpec getTableSpec() { return destToLateralView; } + public HashMap> getDestToSources() { + return destToSources; + } + + public List getSourcesForDest(String dest) { + return destToSources.get(dest); + } + protected static enum ClauseType { CLUSTER_BY_CLAUSE, DISTRIBUTE_BY_CLAUSE, diff --git ql/src/java/org/apache/hadoop/hive/ql/parse/QBSubQuery.java ql/src/java/org/apache/hadoop/hive/ql/parse/QBSubQuery.java index d398c88..62cc012 100644 --- ql/src/java/org/apache/hadoop/hive/ql/parse/QBSubQuery.java +++ ql/src/java/org/apache/hadoop/hive/ql/parse/QBSubQuery.java @@ -513,7 +513,7 @@ void validateAndRewriteAST(RowResolver outerQueryRR, String outerQueryAlias, Set outerQryAliases) throws SemanticException { - ASTNode selectClause = (ASTNode) subQueryAST.getChild(1).getChild(1); + ASTNode selectClause = (ASTNode) subQueryAST.getChild(0).getChild(1); int selectExprStart = 0; if ( selectClause.getChild(0).getType() == HiveParser.TOK_HINTLIST ) { @@ -567,7 +567,7 @@ void validateAndRewriteAST(RowResolver outerQueryRR, selectClause.getChildCount() - selectExprStart > 1 ) { subQueryAST.setOrigin(originalSQASTOrigin); throw new SemanticException(ErrorMsg.INVALID_SUBQUERY_EXPRESSION.getMsg( - subQueryAST, "SubQuery can contain only 1 item in Select List.")); + subQueryAST.getChild(1), "SubQuery can contain only 1 item in Select List.")); } containsAggregationExprs = false; @@ -597,7 +597,7 @@ void validateAndRewriteAST(RowResolver outerQueryRR, containsAggregationExprs && groupbyAddedToSQ ) { throw new SemanticException(ErrorMsg.INVALID_SUBQUERY_EXPRESSION.getMsg( - subQueryAST, + subQueryAST.getChild(1), "An Exists predicate on SubQuery with implicit Aggregation(no Group By clause) " + "cannot be rewritten. (predicate will always return true).")); } @@ -605,7 +605,7 @@ void validateAndRewriteAST(RowResolver outerQueryRR, containsAggregationExprs && groupbyAddedToSQ ) { throw new SemanticException(ErrorMsg.INVALID_SUBQUERY_EXPRESSION.getMsg( - subQueryAST, + subQueryAST.getChild(1), "A Not Exists predicate on SubQuery with implicit Aggregation(no Group By clause) " + "cannot be rewritten. (predicate will always return false).")); } @@ -615,7 +615,7 @@ void validateAndRewriteAST(RowResolver outerQueryRR, */ if ( containsWindowing && hasCorrelation ) { throw new SemanticException(ErrorMsg.UNSUPPORTED_SUBQUERY_EXPRESSION.getMsg( - subQueryAST, "Correlated Sub Queries cannot contain Windowing clauses.")); + subQueryAST.getChild(1), "Correlated Sub Queries cannot contain Windowing clauses.")); } /* @@ -626,7 +626,7 @@ void validateAndRewriteAST(RowResolver outerQueryRR, operator.getType() == SubQueryType.NOT_EXISTS ) && !hasCorrelation ) { throw new SemanticException(ErrorMsg.INVALID_SUBQUERY_EXPRESSION.getMsg( - subQueryAST, "For Exists/Not Exists operator SubQuery must be Correlated.")); + subQueryAST.getChild(1), "For Exists/Not Exists operator SubQuery must be Correlated.")); } } @@ -754,7 +754,7 @@ String getNextCorrExprAlias() { private void rewrite(RowResolver parentQueryRR, boolean forHavingClause, String outerQueryAlias) throws SemanticException { - ASTNode selectClause = (ASTNode) subQueryAST.getChild(1).getChild(1); + ASTNode selectClause = (ASTNode) subQueryAST.getChild(0).getChild(1); ASTNode whereClause = SubQueryUtils.subQueryWhere(subQueryAST); if ( whereClause == null ) { @@ -877,8 +877,8 @@ private void rewrite(RowResolver parentQueryRR, */ private ASTNode getSubQueryGroupByAST() { ASTNode groupBy = null; - if ( subQueryAST.getChild(1).getChildCount() > 3 && - subQueryAST.getChild(1).getChild(3).getType() == HiveParser.TOK_GROUPBY ) { + if ( subQueryAST.getChild(0).getChildCount() > 3 && + subQueryAST.getChild(0).getChild(3).getType() == HiveParser.TOK_GROUPBY ) { groupBy = (ASTNode) subQueryAST.getChild(1).getChild(3); } 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 b91b9a2..4328b73 100644 --- ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java +++ ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java @@ -531,7 +531,7 @@ public static String generateErrorMessage(ASTNode ast, String message) { * * @return the alias of the table */ - private String processTable(QB qb, ASTNode tabref) throws SemanticException { + private String processTable(QB qb, ASTNode tabref, String dest) throws SemanticException { // For each table reference get the table name // and the alias (if alias is not present, the table name // is used as an alias) @@ -645,6 +645,7 @@ private String processTable(QB qb, ASTNode tabref) throws SemanticException { qb.addAlias(alias); qb.getParseInfo().setSrcForAlias(alias, tableTree); + qb.getParseInfo().addSourceForDest(dest, alias); unparseTranslator.addTableNameTranslation(tableTree, SessionState.get().getCurrentDatabase()); if (aliasIndex != 0) { @@ -665,7 +666,7 @@ private void assertCombineInputFormat(Tree numerator, String message) throws Sem } } - private String processSubQuery(QB qb, ASTNode subq) throws SemanticException { + private String processSubQuery(QB qb, ASTNode subq, String dest) throws SemanticException { // This is a subquery and must have an alias if (subq.getChildCount() != 2) { @@ -688,6 +689,8 @@ private String processSubQuery(QB qb, ASTNode subq) throws SemanticException { qb.setSubqAlias(alias, qbexpr); qb.addAlias(alias); + qb.getParseInfo().addSourceForDest(dest, alias); + unparseTranslator.addIdentifierTranslation((ASTNode) subq.getChild(1)); return alias; @@ -808,7 +811,7 @@ private boolean isJoinToken(ASTNode node) { * @throws SemanticException */ @SuppressWarnings("nls") - private void processJoin(QB qb, ASTNode join) throws SemanticException { + private String processJoin(QB qb, ASTNode join, String dest) throws SemanticException { int numChildren = join.getChildCount(); if ((numChildren != 2) && (numChildren != 3) && join.getToken().getType() != HiveParser.TOK_UNIQUEJOIN) { @@ -819,12 +822,12 @@ private void processJoin(QB qb, ASTNode join) throws SemanticException { for (int num = 0; num < numChildren; num++) { ASTNode child = (ASTNode) join.getChild(num); if (child.getToken().getType() == HiveParser.TOK_TABREF) { - processTable(qb, child); + processTable(qb, child, dest); } else if (child.getToken().getType() == HiveParser.TOK_SUBQUERY) { - processSubQuery(qb, child); + processSubQuery(qb, child, dest); } else if (child.getToken().getType() == HiveParser.TOK_PTBLFUNCTION) { queryProperties.setHasPTF(true); - processPTF(qb, child); + processPTF(qb, child, dest); PTFInvocationSpec ptfInvocationSpec = qb.getPTFInvocationSpec(child); String inputAlias = ptfInvocationSpec == null ? null : ptfInvocationSpec.getFunction().getAlias();; @@ -842,9 +845,10 @@ private void processJoin(QB qb, ASTNode join) throws SemanticException { throw new SemanticException(ErrorMsg.LATERAL_VIEW_WITH_JOIN .getMsg(join)); } else if (isJoinToken(child)) { - processJoin(qb, child); + processJoin(qb, child, dest); } } + return null; } /** @@ -858,7 +862,7 @@ private void processJoin(QB qb, ASTNode join) throws SemanticException { * @throws SemanticException */ - private String processLateralView(QB qb, ASTNode lateralView) + private String processLateralView(QB qb, ASTNode lateralView, String dest) throws SemanticException { int numChildren = lateralView.getChildCount(); @@ -869,14 +873,14 @@ private String processLateralView(QB qb, ASTNode lateralView) switch (next.getToken().getType()) { case HiveParser.TOK_TABREF: - alias = processTable(qb, next); + alias = processTable(qb, next, dest); break; case HiveParser.TOK_SUBQUERY: - alias = processSubQuery(qb, next); + alias = processSubQuery(qb, next, dest); break; case HiveParser.TOK_LATERAL_VIEW: case HiveParser.TOK_LATERAL_VIEW_OUTER: - alias = processLateralView(qb, next); + alias = processLateralView(qb, next, dest); break; default: throw new SemanticException(ErrorMsg.LATERAL_VIEW_INVALID_CHILD @@ -961,6 +965,7 @@ public boolean doPhase1(ASTNode ast, QB qb, Phase1Ctx ctx_1) break; case HiveParser.TOK_FROM: + case HiveParser.TOK_FROM_BASE: int child_count = ast.getChildCount(); if (child_count != 1) { throw new SemanticException(generateErrorMessage(ast, @@ -969,20 +974,28 @@ public boolean doPhase1(ASTNode ast, QB qb, Phase1Ctx ctx_1) // Check if this is a subquery / lateral view ASTNode frm = (ASTNode) ast.getChild(0); + + String alias = null; if (frm.getToken().getType() == HiveParser.TOK_TABREF) { - processTable(qb, frm); + alias = processTable(qb, frm, ctx_1.dest); } else if (frm.getToken().getType() == HiveParser.TOK_SUBQUERY) { - processSubQuery(qb, frm); + alias = processSubQuery(qb, frm, ctx_1.dest); } else if (frm.getToken().getType() == HiveParser.TOK_LATERAL_VIEW || frm.getToken().getType() == HiveParser.TOK_LATERAL_VIEW_OUTER) { - processLateralView(qb, frm); + alias = processLateralView(qb, frm, ctx_1.dest); } else if (isJoinToken(frm)) { queryProperties.setHasJoin(true); - processJoin(qb, frm); + alias = processJoin(qb, frm, ctx_1.dest); qbp.setJoinExpr(frm); - }else if(frm.getToken().getType() == HiveParser.TOK_PTBLFUNCTION){ + if (qbp.getGroupByForClause(ctx_1.dest) != null) { + queryProperties.setHasJoinFollowedByGroupBy(true); + } + } else if (frm.getToken().getType() == HiveParser.TOK_PTBLFUNCTION) { queryProperties.setHasPTF(true); - processPTF(qb, frm); + alias = processPTF(qb, frm, ctx_1.dest); + } + if (ast.getType() == HiveParser.TOK_FROM_BASE && alias != null) { + qb.setBaseAlias(alias.toLowerCase()); } break; @@ -1041,9 +1054,6 @@ public boolean doPhase1(ASTNode ast, QB qb, Phase1Ctx ctx_1) // Get the groupby aliases - these are aliased to the entries in the // select list queryProperties.setHasGroupBy(true); - if (qbp.getJoinExpr() != null) { - queryProperties.setHasJoinFollowedByGroupBy(true); - } if (qbp.getSelForClause(ctx_1.dest).getToken().getType() == HiveParser.TOK_SELECTDI) { throw new SemanticException(generateErrorMessage(ast, ErrorMsg.SELECT_DISTINCT_WITH_GROUPBY.getMsg())); @@ -2261,7 +2271,7 @@ private Operator genFilterPlan(ASTNode searchCond, QB qb, Operator input, sqRR.getColumnInfos().size() - subQuery.getNumOfCorrelationExprsAddedToSQSelect() > 1 ) { throw new SemanticException(ErrorMsg.INVALID_SUBQUERY_EXPRESSION.getMsg( - subQueryAST, "SubQuery can contain only 1 item in Select List.")); + subQueryAST.getChild(1), "SubQuery can contain only 1 item in Select List.")); } /* @@ -7910,7 +7920,7 @@ private Operator insertSelectAllPlanForGroupBy(Operator input) // Return the common distinct expression // There should be more than 1 destination, with group bys in all of them. - private List getCommonDistinctExprs(QB qb, Operator input) { + private List getCommonDistinctExprs(QB qb, Map> inputs) { QBParseInfo qbp = qb.getParseInfo(); // If a grouping set aggregation is present, common processing is not possible if (!qbp.getDestCubes().isEmpty() || !qbp.getDestRollups().isEmpty() @@ -7918,6 +7928,16 @@ private Operator insertSelectAllPlanForGroupBy(Operator input) return null; } + // confirm single operator sourced (todo) + Operator input = null; + for (Map.Entry> entry : inputs.entrySet()) { + if (input == null) { + input = entry.getValue(); + } else if (input != entry.getValue()) { + return null; + } + } + RowResolver inputRR = opParseCtx.get(input).getRowResolver(); TreeSet ks = new TreeSet(); ks.addAll(qbp.getClauseNames()); @@ -7930,7 +7950,8 @@ private Operator insertSelectAllPlanForGroupBy(Operator input) List oldList = null; List oldASTList = null; - for (String dest : ks) { + for (Map.Entry> entry : inputs.entrySet()) { + String dest = entry.getKey(); // If a filter is present, common processing is not possible if (qbp.getWhrForClause(dest) != null) { return null; @@ -7975,10 +7996,8 @@ private Operator insertSelectAllPlanForGroupBy(Operator input) return oldASTList; } - private Operator createCommonReduceSink(QB qb, Operator input) + private Operator createCommonReduceSink(QB qb, List distExprs, Operator input) throws SemanticException { - // Go over all the tables and extract the common distinct key - List distExprs = getCommonDistinctExprs(qb, input); QBParseInfo qbp = qb.getParseInfo(); TreeSet ks = new TreeSet(); @@ -8071,7 +8090,7 @@ private Operator createCommonReduceSink(QB qb, Operator input) // group by and distinct keys and no clause appears in more than one list. Returns a list of the // lists of clauses. private List> getCommonGroupByDestGroups(QB qb, - Map> inputs) throws SemanticException { + Map> inputs) throws SemanticException { QBParseInfo qbp = qb.getParseInfo(); @@ -8238,16 +8257,14 @@ private boolean distinctExprsExists(QB qb) { } @SuppressWarnings("nls") - private Operator genBodyPlan(QB qb, Operator input, Map aliasToOpInfo) - throws SemanticException { + private Operator genBodyPlan(QB qb, Map> inputs, + Map aliasToOpInfo) throws SemanticException { QBParseInfo qbp = qb.getParseInfo(); - TreeSet ks = new TreeSet(qbp.getClauseNames()); - Map> inputs = createInputForDests(qb, input, ks); // For multi-group by with the same distinct, we ignore all user hints // currently. It doesnt matter whether he has asked to do // map-side aggregation or not. Map side aggregation is turned off - List commonDistinctExprs = getCommonDistinctExprs(qb, input); + List commonDistinctExprs = getCommonDistinctExprs(qb, inputs); // Consider a query like: // @@ -8263,22 +8280,21 @@ private Operator genBodyPlan(QB qb, Operator input, Map aliasT boolean optimizeMultiGroupBy = commonDistinctExprs != null && conf.getBoolVar(HiveConf.ConfVars.HIVE_OPTIMIZE_MULTI_GROUPBY_COMMON_DISTINCTS); - Operator curr = input; - // if there is a single distinct, optimize that. Spray initially by the // distinct key, // no computation at the mapper. Have multiple group by operators at the // reducer - and then // proceed if (optimizeMultiGroupBy) { - curr = createCommonReduceSink(qb, input); + Operator curr = inputs.values().iterator().next(); + curr = createCommonReduceSink(qb, commonDistinctExprs, curr); RowResolver currRR = opParseCtx.get(curr).getRowResolver(); // create a forward operator - input = putOpInsertMap(OperatorFactory.getAndMakeChild(new ForwardDesc(), + Operator input = putOpInsertMap(OperatorFactory.getAndMakeChild(new ForwardDesc(), new RowSchema(currRR.getColumnInfos()), curr), currRR); - for (String dest : ks) { + for (String dest : inputs.keySet()) { curr = input; curr = genGroupByPlan2MRMultiGroupBy(dest, qb, curr); curr = genSelectPlan(dest, qb, curr); @@ -8289,86 +8305,89 @@ private Operator genBodyPlan(QB qb, Operator input, Map aliasT } curr = genFileSinkPlan(dest, qb, curr); } - } else { - List> commonGroupByDestGroups = null; + return curr; + } - // If we can put multiple group bys in a single reducer, determine suitable groups of - // expressions, otherwise treat all the expressions as a single group - if (conf.getBoolVar(HiveConf.ConfVars.HIVEMULTIGROUPBYSINGLEREDUCER)) { - try { - commonGroupByDestGroups = getCommonGroupByDestGroups(qb, inputs); - } catch (SemanticException e) { - LOG.error("Failed to group clauses by common spray keys.", e); - } - } + List> commonGroupByDestGroups = null; - if (commonGroupByDestGroups == null) { - commonGroupByDestGroups = new ArrayList>(); - commonGroupByDestGroups.add(new ArrayList(ks)); + // If we can put multiple group bys in a single reducer, determine suitable groups of + // expressions, otherwise treat all the expressions as a single group + if (conf.getBoolVar(HiveConf.ConfVars.HIVEMULTIGROUPBYSINGLEREDUCER)) { + try { + commonGroupByDestGroups = getCommonGroupByDestGroups(qb, inputs); + } catch (SemanticException e) { + LOG.error("Failed to group clauses by common spray keys.", e); } + } - if (!commonGroupByDestGroups.isEmpty()) { + if (commonGroupByDestGroups == null) { + commonGroupByDestGroups = new ArrayList>(); + commonGroupByDestGroups.add(new ArrayList(inputs.keySet())); + } - // Iterate over each group of subqueries with the same group by/distinct keys - for (List commonGroupByDestGroup : commonGroupByDestGroups) { - if (commonGroupByDestGroup.isEmpty()) { - continue; - } + if (commonGroupByDestGroups.isEmpty()) { + return null; + } + + Operator curr = null; + // Iterate over each group of subqueries with the same group by/distinct keys + for (List commonGroupByDestGroup : commonGroupByDestGroups) { + if (commonGroupByDestGroup.isEmpty()) { + continue; + } - String firstDest = commonGroupByDestGroup.get(0); - input = inputs.get(firstDest); - - // Constructs a standard group by plan if: - // There is no other subquery with the same group by/distinct keys or - // (There are no aggregations in a representative query for the group and - // There is no group by in that representative query) or - // The data is skewed or - // The conf variable used to control combining group bys into a single reducer is false - if (commonGroupByDestGroup.size() == 1 || - (qbp.getAggregationExprsForClause(firstDest).size() == 0 && + String firstDest = commonGroupByDestGroup.get(0); + + // Constructs a standard group by plan if: + // There is no other subquery with the same group by/distinct keys or + // (There are no aggregations in a representative query for the group and + // There is no group by in that representative query) or + // The data is skewed or + // The conf variable used to control combining group bys into a single reducer is false + if (commonGroupByDestGroup.size() == 1 || + (qbp.getAggregationExprsForClause(firstDest).size() == 0 && getGroupByForClause(qbp, firstDest).size() == 0) || - conf.getBoolVar(HiveConf.ConfVars.HIVEGROUPBYSKEW) || - !conf.getBoolVar(HiveConf.ConfVars.HIVEMULTIGROUPBYSINGLEREDUCER)) { + conf.getBoolVar(HiveConf.ConfVars.HIVEGROUPBYSKEW) || + !conf.getBoolVar(HiveConf.ConfVars.HIVEMULTIGROUPBYSINGLEREDUCER)) { - // Go over all the destination tables - for (String dest : commonGroupByDestGroup) { - curr = inputs.get(dest); + // Go over all the destination tables + for (String dest : commonGroupByDestGroup) { + curr = inputs.get(dest); - if (qbp.getWhrForClause(dest) != null) { - ASTNode whereExpr = qb.getParseInfo().getWhrForClause(dest); - curr = genFilterPlan((ASTNode) whereExpr.getChild(0), qb, curr, aliasToOpInfo, false); - } + if (qbp.getWhrForClause(dest) != null) { + ASTNode whereExpr = qb.getParseInfo().getWhrForClause(dest); + curr = genFilterPlan((ASTNode) whereExpr.getChild(0), qb, curr, aliasToOpInfo, false); + } - if (qbp.getAggregationExprsForClause(dest).size() != 0 - || getGroupByForClause(qbp, dest).size() > 0) { - // multiple distincts is not supported with skew in data - if (conf.getBoolVar(HiveConf.ConfVars.HIVEGROUPBYSKEW) && - qbp.getDistinctFuncExprsForClause(dest).size() > 1) { - throw new SemanticException(ErrorMsg.UNSUPPORTED_MULTIPLE_DISTINCTS. - getMsg()); - } - // insert a select operator here used by the ColumnPruner to reduce - // the data to shuffle - curr = insertSelectAllPlanForGroupBy(curr); - if (conf.getBoolVar(HiveConf.ConfVars.HIVEMAPSIDEAGGREGATE)) { - if (!conf.getBoolVar(HiveConf.ConfVars.HIVEGROUPBYSKEW)) { - curr = genGroupByPlanMapAggrNoSkew(dest, qb, curr); - } else { - curr = genGroupByPlanMapAggr2MR(dest, qb, curr); - } - } else if (conf.getBoolVar(HiveConf.ConfVars.HIVEGROUPBYSKEW)) { - curr = genGroupByPlan2MR(dest, qb, curr); - } else { - curr = genGroupByPlan1MR(dest, qb, curr); - } + if (qbp.getAggregationExprsForClause(dest).size() != 0 + || getGroupByForClause(qbp, dest).size() > 0) { + // multiple distincts is not supported with skew in data + if (conf.getBoolVar(HiveConf.ConfVars.HIVEGROUPBYSKEW) && + qbp.getDistinctFuncExprsForClause(dest).size() > 1) { + throw new SemanticException(ErrorMsg.UNSUPPORTED_MULTIPLE_DISTINCTS. + getMsg()); + } + // insert a select operator here used by the ColumnPruner to reduce + // the data to shuffle + curr = insertSelectAllPlanForGroupBy(curr); + if (conf.getBoolVar(HiveConf.ConfVars.HIVEMAPSIDEAGGREGATE)) { + if (!conf.getBoolVar(HiveConf.ConfVars.HIVEGROUPBYSKEW)) { + curr = genGroupByPlanMapAggrNoSkew(dest, qb, curr); + } else { + curr = genGroupByPlanMapAggr2MR(dest, qb, curr); } - - curr = genPostGroupByBodyPlan(curr, dest, qb, aliasToOpInfo); + } else if (conf.getBoolVar(HiveConf.ConfVars.HIVEGROUPBYSKEW)) { + curr = genGroupByPlan2MR(dest, qb, curr); + } else { + curr = genGroupByPlan1MR(dest, qb, curr); } - } else { - curr = genGroupByPlan1ReduceMultiGBY(commonGroupByDestGroup, qb, input, aliasToOpInfo); } + + curr = genPostGroupByBodyPlan(curr, dest, qb, aliasToOpInfo); } + } else { + curr = inputs.get(firstDest); + curr = genGroupByPlan1ReduceMultiGBY(commonGroupByDestGroup, qb, curr, aliasToOpInfo); } } @@ -9078,13 +9097,14 @@ private void setupStats(TableScanDesc tsDesc, QBParseInfo qbp, Table tab, String } } - private Operator genPlan(QBExpr qbexpr) throws SemanticException { + private Operator genPlan(QBExpr qbexpr, String baseAlias, Operator baseOp) + throws SemanticException { if (qbexpr.getOpcode() == QBExpr.Opcode.NULLOP) { - return genPlan(qbexpr.getQB()); + return genPlan(qbexpr.getQB(), baseAlias, baseOp); } if (qbexpr.getOpcode() == QBExpr.Opcode.UNION) { - Operator qbexpr1Ops = genPlan(qbexpr.getQBExpr1()); - Operator qbexpr2Ops = genPlan(qbexpr.getQBExpr2()); + Operator qbexpr1Ops = genPlan(qbexpr.getQBExpr1(), baseAlias, baseOp); + Operator qbexpr2Ops = genPlan(qbexpr.getQBExpr2(), baseAlias, baseOp); return genUnionPlan(qbexpr.getAlias(), qbexpr.getQBExpr1().getAlias(), qbexpr1Ops, qbexpr.getQBExpr2().getAlias(), qbexpr2Ops); @@ -9094,32 +9114,49 @@ private Operator genPlan(QBExpr qbexpr) throws SemanticException { @SuppressWarnings("nls") public Operator genPlan(QB qb) throws SemanticException { + return genPlan(qb, null, null); + } + + @SuppressWarnings("nls") + public Operator genPlan(QB qb, String baseAlias, Operator baseOp) throws SemanticException { + + if (qb.getBaseAlias() != null) { + baseAlias = qb.getBaseAlias(); + QBExpr qbexpr = qb.getSubqForAlias(baseAlias); + String tabName = qb.getTabNameForAlias(baseAlias); + if (qbexpr != null) { + baseOp = genPlan(qbexpr, null, null); + qbexpr.setAlias(baseAlias); + } else { + baseOp = genTablePlan(baseAlias, qb); + } + } // First generate all the opInfos for the elements in the from clause Map aliasToOpInfo = new HashMap(); + if (baseAlias != null) { + aliasToOpInfo.put(baseAlias, baseOp); + } // Recurse over the subqueries to fill the subquery part of the plan for (String alias : qb.getSubqAliases()) { + if (alias.equals(qb.getBaseAlias())) { + continue; + } QBExpr qbexpr = qb.getSubqForAlias(alias); - aliasToOpInfo.put(alias, genPlan(qbexpr)); + aliasToOpInfo.put(alias, genPlan(qbexpr, baseAlias, baseOp)); qbexpr.setAlias(alias); } // Recurse over all the source tables for (String alias : qb.getTabAliases()) { + if (alias.equals(qb.getBaseAlias())) { + continue; + } Operator op = genTablePlan(alias, qb); aliasToOpInfo.put(alias, op); } - if (aliasToOpInfo.isEmpty()) { - qb.getMetaData().setSrcForAlias(DUMMY_TABLE, getDummyTable()); - TableScanOperator op = (TableScanOperator) genTablePlan(DUMMY_TABLE, qb); - op.getConf().setRowLimit(1); - qb.addAlias(DUMMY_TABLE); - qb.setTabAlias(DUMMY_TABLE, DUMMY_TABLE); - aliasToOpInfo.put(DUMMY_TABLE, op); - } - Operator srcOpInfo = null; Operator lastPTFOp = null; @@ -9185,15 +9222,36 @@ public Operator genPlan(QB qb) throws SemanticException { pushJoinFilters(qb, qb.getQbJoinTree(), aliasToOpInfo); srcOpInfo = genJoinPlan(qb, aliasToOpInfo); } else { - // Now if there are more than 1 sources then we have a join case - // later we can extend this to the union all case as well - srcOpInfo = aliasToOpInfo.values().iterator().next(); // with ptfs, there maybe more (note for PTFChains: // 1 ptf invocation may entail multiple PTF operators) srcOpInfo = lastPTFOp != null ? lastPTFOp : srcOpInfo; } - Operator bodyOpInfo = genBodyPlan(qb, srcOpInfo, aliasToOpInfo); + QBParseInfo qbp = qb.getParseInfo(); + if (qbp.getClauseNames().isEmpty()) { + assert aliasToOpInfo.size() == 1; + return aliasToOpInfo.values().iterator().next(); + } + + Map> inputs = new LinkedHashMap>(); + for (String dest : new TreeSet(qbp.getClauseNames())) { + List sources = qbp.getSourcesForDest(dest); + Operator sourceOp = srcOpInfo; + if (sourceOp == null) { + if (sources == null || sources.isEmpty()) { + sourceOp = baseOp; + } else if (sources.size() == 1) { + sourceOp = aliasToOpInfo.get(sources.get(0)); + } + } + if (sourceOp != null) { + sourceOp = genLateralViewPlanForDest(dest, qb, sourceOp); + } else { + sourceOp = createDummyOp(qb); + } + inputs.put(dest, sourceOp); + } + Operator bodyOpInfo = genBodyPlan(qb, inputs, aliasToOpInfo); if (LOG.isDebugEnabled()) { LOG.debug("Created Plan for Query Block " + qb.getId()); @@ -9203,6 +9261,15 @@ public Operator genPlan(QB qb) throws SemanticException { return bodyOpInfo; } + private Operator createDummyOp(QB qb) throws SemanticException { + qb.getMetaData().setSrcForAlias(DUMMY_TABLE, getDummyTable()); + TableScanOperator op = (TableScanOperator) genTablePlan(DUMMY_TABLE, qb); + op.getConf().setRowLimit(1); + qb.addAlias(DUMMY_TABLE); + qb.setTabAlias(DUMMY_TABLE, DUMMY_TABLE); + return op; + } + private Table getDummyTable() throws SemanticException { Path dummyPath = createDummyFile(); Table desc = new Table(DUMMY_DATABASE, DUMMY_TABLE); @@ -9586,7 +9653,7 @@ private void saveViewDefinition() throws SemanticException { int derivedColCount = derivedSchema.size(); if (explicitColCount != derivedColCount) { throw new SemanticException(generateErrorMessage( - viewSelect, + (ASTNode) viewSelect.getChild(1), ErrorMsg.VIEW_COL_MISMATCH.getMsg())); } } @@ -10607,7 +10674,7 @@ public void setQB(QB qb) { * - For a SubQuery: set the source to the alias returned by processSubQuery * - For a PTF invocation: recursively call processPTFChain. */ - private PTFInputSpec processPTFSource(QB qb, ASTNode inputNode) throws SemanticException{ + private PTFInputSpec processPTFSource(QB qb, ASTNode inputNode, String dest) throws SemanticException{ PTFInputSpec qInSpec = null; int type = inputNode.getType(); @@ -10615,19 +10682,19 @@ private PTFInputSpec processPTFSource(QB qb, ASTNode inputNode) throws SemanticE switch(type) { case HiveParser.TOK_TABREF: - alias = processTable(qb, inputNode); + alias = processTable(qb, inputNode, dest); qInSpec = new PTFQueryInputSpec(); ((PTFQueryInputSpec)qInSpec).setType(PTFQueryInputType.TABLE); ((PTFQueryInputSpec)qInSpec).setSource(alias); break; case HiveParser.TOK_SUBQUERY: - alias = processSubQuery(qb, inputNode); + alias = processSubQuery(qb, inputNode, dest); qInSpec = new PTFQueryInputSpec(); ((PTFQueryInputSpec)qInSpec).setType(PTFQueryInputType.SUBQUERY); ((PTFQueryInputSpec)qInSpec).setSource(alias); break; case HiveParser.TOK_PTBLFUNCTION: - qInSpec = processPTFChain(qb, inputNode); + qInSpec = processPTFChain(qb, inputNode, dest); break; default: throw new SemanticException(generateErrorMessage(inputNode, @@ -10645,7 +10712,7 @@ private PTFInputSpec processPTFSource(QB qb, ASTNode inputNode) throws SemanticE * - a partitionTableFunctionSource can be a tableReference, a SubQuery or another * PTF invocation. */ - private PartitionedTableFunctionSpec processPTFChain(QB qb, ASTNode ptf) + private PartitionedTableFunctionSpec processPTFChain(QB qb, ASTNode ptf, String dest) throws SemanticException{ int child_count = ptf.getChildCount(); if (child_count < 2) { @@ -10677,7 +10744,9 @@ private PartitionedTableFunctionSpec processPTFChain(QB qb, ASTNode ptf) * input */ ASTNode inputNode = (ASTNode) ptf.getChild(inputIdx); - ptfSpec.setInput(processPTFSource(qb, inputNode)); + PTFInputSpec input = processPTFSource(qb, inputNode, dest); + qb.getParseInfo().addSourceForDest(dest, input.getQueryInputName()); + ptfSpec.setInput(input); int argStartIdx = inputIdx + 1; @@ -10710,9 +10779,9 @@ private PartitionedTableFunctionSpec processPTFChain(QB qb, ASTNode ptf) * ^(TOK_PTBLFUNCTION name partitionTableFunctionSource partitioningSpec? arguments*) * - setup a PTFInvocationSpec for this top level PTF invocation. */ - private void processPTF(QB qb, ASTNode ptf) throws SemanticException{ + private String processPTF(QB qb, ASTNode ptf, String dest) throws SemanticException{ - PartitionedTableFunctionSpec ptfSpec = processPTFChain(qb, ptf); + PartitionedTableFunctionSpec ptfSpec = processPTFChain(qb, ptf, dest); if ( ptfSpec.getAlias() != null ) { qb.addAlias(ptfSpec.getAlias()); @@ -10721,6 +10790,8 @@ private void processPTF(QB qb, ASTNode ptf) throws SemanticException{ PTFInvocationSpec spec = new PTFInvocationSpec(); spec.setFunction(ptfSpec); qb.addPTFNodeToSpec(ptf, spec); + + return null; } private void handleQueryWindowClauses(QB qb, Phase1Ctx ctx_1, ASTNode node) diff --git ql/src/java/org/apache/hadoop/hive/ql/parse/SubQueryDiagnostic.java ql/src/java/org/apache/hadoop/hive/ql/parse/SubQueryDiagnostic.java index 57f9432..3483077 100644 --- ql/src/java/org/apache/hadoop/hive/ql/parse/SubQueryDiagnostic.java +++ ql/src/java/org/apache/hadoop/hive/ql/parse/SubQueryDiagnostic.java @@ -76,7 +76,7 @@ public String getRewrittenQuery() { ASTNode sqAST = subQuery.getSubQueryAST(); if (whereClause != null) { - ASTNode whereAST = (ASTNode) sqAST.getChild(1).getChild(2); + ASTNode whereAST = (ASTNode) sqAST.getChild(0).getChild(2); stream.replace(subQuery.getAlias(), whereAST.getTokenStartIndex(), whereAST.getTokenStopIndex(), @@ -84,14 +84,14 @@ public String getRewrittenQuery() { } if (selectClauseAdditions != null) { - ASTNode selectClause = (ASTNode) sqAST.getChild(1).getChild(1); + ASTNode selectClause = (ASTNode) sqAST.getChild(0).getChild(1); stream.insertAfter(subQuery.getAlias(), selectClause.getTokenStopIndex(), selectClauseAdditions); } if (gByClauseAdditions != null) { if (!addGroupByClause) { - ASTNode groupBy = (ASTNode) sqAST.getChild(1).getChild(3); + ASTNode groupBy = (ASTNode) sqAST.getChild(0).getChild(3); stream.insertAfter(subQuery.getAlias(), groupBy.getTokenStopIndex(), gByClauseAdditions); } diff --git ql/src/java/org/apache/hadoop/hive/ql/parse/SubQueryUtils.java ql/src/java/org/apache/hadoop/hive/ql/parse/SubQueryUtils.java index 089ad78..8af978a 100644 --- ql/src/java/org/apache/hadoop/hive/ql/parse/SubQueryUtils.java +++ ql/src/java/org/apache/hadoop/hive/ql/parse/SubQueryUtils.java @@ -273,7 +273,7 @@ static int checkAggOrWindowing(ASTNode expressionTree) throws SemanticException static List getTableAliasesInSubQuery(QBSubQuery sq) { List aliases = new ArrayList(); - ASTNode joinAST = (ASTNode) sq.getSubQueryAST().getChild(0); + ASTNode joinAST = (ASTNode) sq.getSubQueryAST().getChild(1); getTableAliasesInSubQuery((ASTNode) joinAST.getChild(0), aliases); return aliases; } @@ -319,9 +319,9 @@ else if ( type == HiveParser.TOK_TABLE_OR_COL ) { } static ASTNode subQueryWhere(ASTNode subQueryAST) { - if ( subQueryAST.getChild(1).getChildCount() > 2 && - subQueryAST.getChild(1).getChild(2).getType() == HiveParser.TOK_WHERE ) { - return (ASTNode) subQueryAST.getChild(1).getChild(2); + if ( subQueryAST.getChild(0).getChildCount() > 2 && + subQueryAST.getChild(0).getChild(2).getType() == HiveParser.TOK_WHERE ) { + return (ASTNode) subQueryAST.getChild(0).getChild(2); } return null; } @@ -468,21 +468,21 @@ static void setOriginDeep(ASTNode node, ASTNodeOrigin origin) { * The AST tree for this is: * * ^(TOK_QUERY - * ^(TOK FROM - * ^(TOK_SUBQUERY - * {the input SubQuery, with correlation removed} - * subQueryAlias - * ) - * ) * ^(TOK_INSERT * ^(TOK_DESTINATION...) * ^(TOK_SELECT * ^(TOK_SELECTEXPR {ast tree for count *} * ) * ^(TOK_WHERE - * {is null check for joining column} + * {is null check for joining column} * ) * ) + * ^(TOK FROM + * ^(TOK_SUBQUERY + * {the input SubQuery, with correlation removed} + * subQueryAlias + * ) + * ) * ) */ static ASTNode buildNotInNullCheckQuery(ASTNode subQueryAST, @@ -494,14 +494,15 @@ static ASTNode buildNotInNullCheckQuery(ASTNode subQueryAST, subQueryAST = (ASTNode) ParseDriver.adaptor.dupTree(subQueryAST); ASTNode qry = (ASTNode) ParseDriver.adaptor.create(HiveParser.TOK_QUERY, "TOK_QUERY"); - - qry.addChild(buildNotInNullCheckFrom(subQueryAST, subQueryAlias)); + ASTNode insertAST = buildNotInNullCheckInsert(); qry.addChild(insertAST); insertAST.addChild(buildNotInNullCheckSelect(cntAlias)); - insertAST.addChild(buildNotInNullCheckWhere(subQueryAST, + insertAST.addChild(buildNotInNullCheckWhere(subQueryAST, subQueryAlias, corrExprs, sqRR)); - + + qry.addChild(buildNotInNullCheckFrom(subQueryAST, subQueryAlias)); + return qry; } @@ -581,7 +582,7 @@ static ASTNode buildNotInNullCheckWhere(ASTNode subQueryAST, List corrExprs, RowResolver sqRR) { - ASTNode sqSelect = (ASTNode) subQueryAST.getChild(1).getChild(1); + ASTNode sqSelect = (ASTNode) subQueryAST.getChild(0).getChild(1); ASTNode selExpr = (ASTNode) sqSelect.getChild(0); String colAlias = null; diff --git ql/src/java/org/apache/hadoop/hive/ql/parse/TypeCheckProcFactory.java ql/src/java/org/apache/hadoop/hive/ql/parse/TypeCheckProcFactory.java index e44f5ae..aa62148 100644 --- ql/src/java/org/apache/hadoop/hive/ql/parse/TypeCheckProcFactory.java +++ ql/src/java/org/apache/hadoop/hive/ql/parse/TypeCheckProcFactory.java @@ -1174,7 +1174,7 @@ public Object process(Node nd, Stack stack, NodeProcessorCtx procCtx, } ASTNode expr = (ASTNode) nd; - ASTNode sqNode = (ASTNode) expr.getParent().getChild(1); + ASTNode sqNode = (ASTNode) expr.getParent().getChild(0); /* * Restriction.1.h :: SubQueries only supported in the SQL Where Clause. */ diff --git ql/src/test/org/apache/hadoop/hive/ql/parse/TestQBSubQuery.java ql/src/test/org/apache/hadoop/hive/ql/parse/TestQBSubQuery.java index 8b36f21..64b109f 100644 --- ql/src/test/org/apache/hadoop/hive/ql/parse/TestQBSubQuery.java +++ ql/src/test/org/apache/hadoop/hive/ql/parse/TestQBSubQuery.java @@ -70,9 +70,9 @@ public void testExtractSubQueries() throws Exception { Assert.assertEquals(sqs.size(), 1); ASTNode sq = sqs.get(0); - Assert.assertEquals(sq.toStringTree(), - "(TOK_SUBQUERY_EXPR (TOK_SUBQUERY_OP in) (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src) s1)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL key))) (TOK_WHERE (and (> (. (TOK_TABLE_OR_COL s1) key) '9') (> (. (TOK_TABLE_OR_COL s1) value) '9'))))) (. (TOK_TABLE_OR_COL src) key))" - ); + Assert.assertEquals( + "(TOK_SUBQUERY_EXPR (TOK_SUBQUERY_OP in) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL key))) (TOK_WHERE (and (> (. (TOK_TABLE_OR_COL s1) key) '9') (> (. (TOK_TABLE_OR_COL s1) value) '9')))) (TOK_FROM (TOK_TABREF (TOK_TABNAME src) s1))) (. (TOK_TABLE_OR_COL src) key))", + sq.toStringTree()); } @Test @@ -88,8 +88,8 @@ public void testExtractConjuncts() throws Exception { SubQueryUtils.extractConjuncts((ASTNode) sqWhere.getChild(0), conjuncts); Assert.assertEquals(conjuncts.size(), 2); - Assert.assertEquals(conjuncts.get(0).toStringTree(), "(> (. (TOK_TABLE_OR_COL s1) key) '9')"); - Assert.assertEquals(conjuncts.get(1).toStringTree(), "(> (. (TOK_TABLE_OR_COL s1) value) '9')"); + Assert.assertEquals("(> (. (TOK_TABLE_OR_COL s1) key) '9')", conjuncts.get(0).toStringTree()); + Assert.assertEquals("(> (. (TOK_TABLE_OR_COL s1) value) '9')", conjuncts.get(1).toStringTree()); } @Test @@ -100,7 +100,7 @@ public void testRewriteOuterQueryWhere() throws Exception { ASTNode sq = sqs.get(0); ASTNode newWhere = SubQueryUtils.rewriteParentQueryWhere((ASTNode) where.getChild(0), sq); - Assert.assertEquals(newWhere.toStringTree(), "(= 1 1)"); + Assert.assertEquals("(= 1 1)", newWhere.toStringTree()); } @Test @@ -111,7 +111,7 @@ public void testRewriteOuterQueryWhere2() throws Exception { ASTNode sq = sqs.get(0); ASTNode newWhere = SubQueryUtils.rewriteParentQueryWhere((ASTNode) where.getChild(0), sq); - Assert.assertEquals(newWhere.toStringTree(), "(> (TOK_TABLE_OR_COL value) '9')"); + Assert.assertEquals("(> (TOK_TABLE_OR_COL value) '9')", newWhere.toStringTree()); } @Test @@ -125,11 +125,11 @@ public void testCheckAggOrWindowing() throws Exception { } private ASTNode where(ASTNode qry) { - return (ASTNode) qry.getChild(1).getChild(2); + return (ASTNode) qry.getChild(0).getChild(2); } private ASTNode select(ASTNode qry) { - return (ASTNode) qry.getChild(1).getChild(1); + return (ASTNode) qry.getChild(0).getChild(1); } } diff --git ql/src/test/queries/clientpositive/multi_insert_subquery.q ql/src/test/queries/clientpositive/multi_insert_subquery.q new file mode 100644 index 0000000..0af1307 --- /dev/null +++ ql/src/test/queries/clientpositive/multi_insert_subquery.q @@ -0,0 +1,16 @@ +create table src_10 as select * from src tablesample(10 rows); + +create table src_lv1 (key string, value string); +create table src_lv2 (key string, value string); + +explain extended +from src_10 +insert overwrite table src_lv1 select * from (select key, C lateral view explode(array(key+1, key+2)) A as C) X1 order by key desc, C +insert overwrite table src_lv2 select * from (select key, C lateral view explode(array(key+3, key+4)) A as C) X2 order by key asc, C; + +from src_10 +insert overwrite table src_lv1 select * from (select key, C lateral view explode(array(key+1, key+2)) A as C) X1 order by key desc, C +insert overwrite table src_lv2 select * from (select key, C lateral view explode(array(key+3, key+4)) A as C) X2 order by key asc, C; + +select * from src_lv1; +select * from src_lv2; diff --git ql/src/test/results/clientnegative/create_view_failure3.q.out ql/src/test/results/clientnegative/create_view_failure3.q.out index 5ddbdb6..a2fd0b4 100644 --- ql/src/test/results/clientnegative/create_view_failure3.q.out +++ ql/src/test/results/clientnegative/create_view_failure3.q.out @@ -2,4 +2,4 @@ PREHOOK: query: DROP VIEW xxx13 PREHOOK: type: DROPVIEW POSTHOOK: query: DROP VIEW xxx13 POSTHOOK: type: DROPVIEW -FAILED: SemanticException 5:16 The number of columns produced by the SELECT clause does not match the number of column names specified by CREATE VIEW. Error encountered near token 'key' +FAILED: SemanticException 5:16 The number of columns produced by the SELECT clause does not match the number of column names specified by CREATE VIEW. Error encountered near token 'src' diff --git ql/src/test/results/clientnegative/subquery_exists_implicit_gby.q.out ql/src/test/results/clientnegative/subquery_exists_implicit_gby.q.out index 4830c00..faecb63 100644 --- ql/src/test/results/clientnegative/subquery_exists_implicit_gby.q.out +++ ql/src/test/results/clientnegative/subquery_exists_implicit_gby.q.out @@ -1,4 +1,4 @@ -FAILED: SemanticException Line 7:7 Invalid SubQuery expression 'key' in definition of SubQuery sq_1 [ +FAILED: SemanticException Line 7:7 Invalid SubQuery expression 'a' in definition of SubQuery sq_1 [ exists (select count(*) from src a diff --git ql/src/test/results/clientnegative/subquery_in_groupby.q.out ql/src/test/results/clientnegative/subquery_in_groupby.q.out index 809bb0a..44d69c6 100644 --- ql/src/test/results/clientnegative/subquery_in_groupby.q.out +++ ql/src/test/results/clientnegative/subquery_in_groupby.q.out @@ -1 +1 @@ -FAILED: SemanticException [Error 10249]: Line 5:37 Unsupported SubQuery Expression ''9'': Currently SubQuery expressions are only allowed as Where Clause predicates +FAILED: SemanticException [Error 10249]: Line 5:17 Unsupported SubQuery Expression 'in': Currently SubQuery expressions are only allowed as Where Clause predicates diff --git ql/src/test/results/clientnegative/subquery_in_select.q.out ql/src/test/results/clientnegative/subquery_in_select.q.out index 3d74132..c345dee 100644 --- ql/src/test/results/clientnegative/subquery_in_select.q.out +++ ql/src/test/results/clientnegative/subquery_in_select.q.out @@ -1 +1 @@ -FAILED: SemanticException [Error 10249]: Line 4:35 Unsupported SubQuery Expression ''9'': Currently SubQuery expressions are only allowed as Where Clause predicates +FAILED: SemanticException [Error 10249]: Line 4:15 Unsupported SubQuery Expression 'in': Currently SubQuery expressions are only allowed as Where Clause predicates diff --git ql/src/test/results/clientnegative/subquery_multiple_cols_in_select.q.out ql/src/test/results/clientnegative/subquery_multiple_cols_in_select.q.out index 7a16bae..86a9f1b 100644 --- ql/src/test/results/clientnegative/subquery_multiple_cols_in_select.q.out +++ ql/src/test/results/clientnegative/subquery_multiple_cols_in_select.q.out @@ -1 +1,3 @@ -FAILED: SemanticException [Error 10250]: Line 6:14 Invalid SubQuery expression 'key': SubQuery can contain only 1 item in Select List. +FAILED: SemanticException Line 0:-1 Invalid SubQuery expression 's1' in definition of SubQuery sq_1 [ +src.key in (select * from src s1 where s1.key > '9') +] used as sq_1 at Line 6:14: SubQuery can contain only 1 item in Select List. diff --git ql/src/test/results/clientnegative/subquery_nested_subquery.q.out ql/src/test/results/clientnegative/subquery_nested_subquery.q.out index 4950ec9..0a70ec6 100644 --- ql/src/test/results/clientnegative/subquery_nested_subquery.q.out +++ ql/src/test/results/clientnegative/subquery_nested_subquery.q.out @@ -25,6 +25,6 @@ POSTHOOK: query: CREATE TABLE part( POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@part -FAILED: SemanticException Line 5:53 Unsupported SubQuery Expression 'p_name' in definition of SubQuery sq_1 [ +FAILED: SemanticException Line 5:53 Unsupported SubQuery Expression 'z' in definition of SubQuery sq_1 [ x.p_name in (select y.p_name from part y where exists (select z.p_name from part z where y.p_name = z.p_name)) ] used as sq_1 at Line 5:15: Nested SubQuery expressions are not supported. diff --git ql/src/test/results/clientnegative/subquery_notexists_implicit_gby.q.out ql/src/test/results/clientnegative/subquery_notexists_implicit_gby.q.out index 74422af..ad00267 100644 --- ql/src/test/results/clientnegative/subquery_notexists_implicit_gby.q.out +++ ql/src/test/results/clientnegative/subquery_notexists_implicit_gby.q.out @@ -1,4 +1,4 @@ -FAILED: SemanticException Line 7:7 Invalid SubQuery expression 'key' in definition of SubQuery sq_1 [ +FAILED: SemanticException Line 7:7 Invalid SubQuery expression 'a' in definition of SubQuery sq_1 [ exists (select sum(1) from src a diff --git ql/src/test/results/clientnegative/subquery_subquery_chain.q.out ql/src/test/results/clientnegative/subquery_subquery_chain.q.out index 448bfb2..8c62a4d 100644 --- ql/src/test/results/clientnegative/subquery_subquery_chain.q.out +++ ql/src/test/results/clientnegative/subquery_subquery_chain.q.out @@ -1 +1 @@ -FAILED: SemanticException [Error 10249]: Line 5:59 Unsupported SubQuery Expression 'key': Only 1 SubQuery expression is supported. +FAILED: SemanticException Line 0:-1 Unsupported SubQuery Expression 'src': Only 1 SubQuery expression is supported. diff --git ql/src/test/results/clientnegative/subquery_windowing_corr.q.out ql/src/test/results/clientnegative/subquery_windowing_corr.q.out index d45f8f1..de72570 100644 --- ql/src/test/results/clientnegative/subquery_windowing_corr.q.out +++ ql/src/test/results/clientnegative/subquery_windowing_corr.q.out @@ -39,7 +39,7 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwri POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@part -FAILED: SemanticException Line 9:8 Unsupported SubQuery Expression '1' in definition of SubQuery sq_1 [ +FAILED: SemanticException Line 9:8 Unsupported SubQuery Expression 'b' in definition of SubQuery sq_1 [ a.p_size in (select first_value(p_size) over(partition by p_mfgr order by p_size) from part b diff --git ql/src/test/results/clientnegative/uniquejoin3.q.out ql/src/test/results/clientnegative/uniquejoin3.q.out index e10a47b..f2bdc18 100644 --- ql/src/test/results/clientnegative/uniquejoin3.q.out +++ ql/src/test/results/clientnegative/uniquejoin3.q.out @@ -1 +1 @@ -FAILED: ParseException line 1:54 required (...)+ loop did not match anything at input 'JOIN' in statement +FAILED: ParseException line 1:54 cannot recognize input near 'JOIN' 'src' 'c' in statement diff --git ql/src/test/results/clientpositive/alter_partition_coltype.q.out ql/src/test/results/clientpositive/alter_partition_coltype.q.out index e86cc06..8990ebc 100644 --- ql/src/test/results/clientpositive/alter_partition_coltype.q.out +++ ql/src/test/results/clientpositive/alter_partition_coltype.q.out @@ -91,10 +91,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alter_coltype TOK_INSERT TOK_DESTINATION TOK_DIR @@ -108,6 +104,10 @@ TOK_QUERY TOK_TABLE_OR_COL dt '100' + TOK_FROM + TOK_TABREF + TOK_TABNAME + alter_coltype STAGE DEPENDENCIES: @@ -319,10 +319,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alter_coltype TOK_INSERT TOK_DESTINATION TOK_DIR @@ -336,6 +332,10 @@ TOK_QUERY TOK_TABLE_OR_COL ts '6.30' + TOK_FROM + TOK_TABREF + TOK_TABNAME + alter_coltype STAGE DEPENDENCIES: @@ -474,10 +474,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alter_coltype TOK_INSERT TOK_DESTINATION TOK_DIR @@ -496,6 +492,10 @@ TOK_QUERY TOK_TABLE_OR_COL dt 100 + TOK_FROM + TOK_TABREF + TOK_TABNAME + alter_coltype STAGE DEPENDENCIES: @@ -683,10 +683,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alter_coltype TOK_INSERT TOK_DESTINATION TOK_DIR @@ -709,6 +705,10 @@ TOK_QUERY TOK_ISNOTNULL TOK_TABLE_OR_COL dt + TOK_FROM + TOK_TABREF + TOK_TABNAME + alter_coltype STAGE DEPENDENCIES: @@ -983,10 +983,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alterdynamic_part_table TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1005,6 +1001,10 @@ TOK_QUERY TOK_TABLE_OR_COL partcol2 '1' + TOK_FROM + TOK_TABREF + TOK_TABNAME + alterdynamic_part_table STAGE DEPENDENCIES: @@ -1109,10 +1109,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alterdynamic_part_table TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1141,6 +1137,10 @@ TOK_QUERY TOK_TABLE_OR_COL partcol2 '__HIVE_DEFAULT_PARTITION__' + TOK_FROM + TOK_TABREF + TOK_TABNAME + alterdynamic_part_table STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/analyze_table_null_partition.q.out ql/src/test/results/clientpositive/analyze_table_null_partition.q.out index a811f81..51df8ad 100644 --- ql/src/test/results/clientpositive/analyze_table_null_partition.q.out +++ ql/src/test/results/clientpositive/analyze_table_null_partition.q.out @@ -93,10 +93,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - test2 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -104,6 +100,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + test2 STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/annotate_stats_filter.q.out ql/src/test/results/clientpositive/annotate_stats_filter.q.out index c7d58f6..e0247b0 100644 --- ql/src/test/results/clientpositive/annotate_stats_filter.q.out +++ ql/src/test/results/clientpositive/annotate_stats_filter.q.out @@ -59,10 +59,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -70,6 +66,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -101,10 +101,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -117,6 +113,10 @@ TOK_QUERY TOK_TABLE_OR_COL state 'OH' + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -237,10 +237,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -253,6 +249,10 @@ TOK_QUERY TOK_TABLE_OR_COL state 'OH' + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -365,10 +365,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -381,6 +377,10 @@ TOK_QUERY TOK_TABLE_OR_COL state 'OH' + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -489,10 +489,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -505,6 +501,10 @@ TOK_QUERY TOK_TABLE_OR_COL state 'OH' + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -617,10 +617,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -633,6 +629,10 @@ TOK_QUERY TOK_ISNULL TOK_TABLE_OR_COL zip + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -743,10 +743,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -760,6 +756,10 @@ TOK_QUERY TOK_ISNOTNULL TOK_TABLE_OR_COL zip + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -872,10 +872,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -888,6 +884,10 @@ TOK_QUERY TOK_ISNOTNULL TOK_TABLE_OR_COL zip + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -998,10 +998,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1015,6 +1011,10 @@ TOK_QUERY TOK_ISNULL TOK_TABLE_OR_COL zip + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -1127,10 +1127,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1141,6 +1137,10 @@ TOK_QUERY TOK_WHERE ! false + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -1251,10 +1251,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1265,6 +1261,10 @@ TOK_QUERY TOK_WHERE ! true + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -1377,10 +1377,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1398,6 +1394,10 @@ TOK_QUERY TOK_TABLE_OR_COL state 'CA' + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -1510,10 +1510,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1531,6 +1527,10 @@ TOK_QUERY TOK_ISNULL TOK_TABLE_OR_COL year + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -1641,10 +1641,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1667,6 +1663,10 @@ TOK_QUERY TOK_TABLE_OR_COL state 'FL' + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -1779,10 +1779,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1805,6 +1801,10 @@ TOK_QUERY TOK_TABLE_OR_COL state 'CA' + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -1917,10 +1917,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1943,6 +1939,10 @@ TOK_QUERY TOK_TABLE_OR_COL state 'CA' + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -2055,10 +2055,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -2071,6 +2067,10 @@ TOK_QUERY TOK_TABLE_OR_COL locid 30 + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -2179,10 +2179,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -2195,6 +2191,10 @@ TOK_QUERY TOK_TABLE_OR_COL locid 30 + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -2303,10 +2303,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -2319,6 +2315,10 @@ TOK_QUERY TOK_TABLE_OR_COL locid 30 + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -2427,10 +2427,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -2443,6 +2439,10 @@ TOK_QUERY TOK_TABLE_OR_COL locid 30 + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/annotate_stats_groupby.q.out ql/src/test/results/clientpositive/annotate_stats_groupby.q.out index 6f72964..073db15 100644 --- ql/src/test/results/clientpositive/annotate_stats_groupby.q.out +++ ql/src/test/results/clientpositive/annotate_stats_groupby.q.out @@ -59,10 +59,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -70,6 +66,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -121,13 +121,30 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_TABLE_OR_COL + a + TOK_SELEXPR + TOK_TABLE_OR_COL + c + TOK_SELEXPR + TOK_FUNCTION + min + TOK_TABLE_OR_COL + b + TOK_GROUPBY + TOK_TABLE_OR_COL + a + TOK_TABLE_OR_COL + c TOK_FROM TOK_SUBQUERY TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -150,28 +167,11 @@ TOK_QUERY state TOK_TABLE_OR_COL locid + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc sq1 - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_TABLE_OR_COL - a - TOK_SELEXPR - TOK_TABLE_OR_COL - c - TOK_SELEXPR - TOK_FUNCTION - min - TOK_TABLE_OR_COL - b - TOK_GROUPBY - TOK_TABLE_OR_COL - a - TOK_TABLE_OR_COL - c STAGE DEPENDENCIES: @@ -389,10 +389,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -404,6 +400,10 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL year + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -534,10 +534,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -554,6 +550,10 @@ TOK_QUERY state TOK_TABLE_OR_COL locid + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -682,10 +682,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -702,6 +698,10 @@ TOK_QUERY state TOK_TABLE_OR_COL locid + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -830,10 +830,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -850,6 +846,10 @@ TOK_QUERY state TOK_TABLE_OR_COL locid + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -978,10 +978,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1001,6 +997,10 @@ TOK_QUERY TOK_GROUPING_SETS_EXPRESSION TOK_TABLE_OR_COL state + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -1129,10 +1129,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1155,6 +1151,10 @@ TOK_QUERY TOK_GROUPING_SETS_EXPRESSION TOK_TABLE_OR_COL locid + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -1283,10 +1283,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1310,6 +1306,10 @@ TOK_QUERY TOK_TABLE_OR_COL locid TOK_GROUPING_SETS_EXPRESSION + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -1438,10 +1438,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1470,6 +1466,10 @@ TOK_QUERY TOK_TABLE_OR_COL locid TOK_GROUPING_SETS_EXPRESSION + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -1600,10 +1600,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1615,6 +1611,10 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL year + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -1743,10 +1743,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1763,6 +1759,10 @@ TOK_QUERY state TOK_TABLE_OR_COL locid + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/annotate_stats_join.q.out ql/src/test/results/clientpositive/annotate_stats_join.q.out index cc816c8..a7c7ecb 100644 --- ql/src/test/results/clientpositive/annotate_stats_join.q.out +++ ql/src/test/results/clientpositive/annotate_stats_join.q.out @@ -203,6 +203,13 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_ALLCOLREF TOK_FROM TOK_JOIN TOK_TABREF @@ -222,13 +229,6 @@ TOK_QUERY TOK_TABLE_OR_COL d deptid - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_ALLCOLREF STAGE DEPENDENCIES: @@ -422,6 +422,13 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_ALLCOLREF TOK_FROM TOK_JOIN TOK_JOIN @@ -455,13 +462,6 @@ TOK_QUERY TOK_TABLE_OR_COL e1 deptid - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_ALLCOLREF STAGE DEPENDENCIES: @@ -670,6 +670,13 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_ALLCOLREF TOK_FROM TOK_JOIN TOK_JOIN @@ -703,13 +710,6 @@ TOK_QUERY TOK_TABLE_OR_COL l locid - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_ALLCOLREF STAGE DEPENDENCIES: @@ -967,6 +967,13 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_ALLCOLREF TOK_FROM TOK_JOIN TOK_JOIN @@ -1000,13 +1007,6 @@ TOK_QUERY TOK_TABLE_OR_COL l state - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_ALLCOLREF STAGE DEPENDENCIES: @@ -1264,6 +1264,13 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_ALLCOLREF TOK_FROM TOK_JOIN TOK_TABREF @@ -1293,13 +1300,6 @@ TOK_QUERY TOK_TABLE_OR_COL d deptname - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_ALLCOLREF STAGE DEPENDENCIES: @@ -1491,6 +1491,13 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_ALLCOLREF TOK_FROM TOK_JOIN TOK_JOIN @@ -1544,13 +1551,6 @@ TOK_QUERY TOK_TABLE_OR_COL l state - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_ALLCOLREF STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/annotate_stats_limit.q.out ql/src/test/results/clientpositive/annotate_stats_limit.q.out index 5c150f4..233df22 100644 --- ql/src/test/results/clientpositive/annotate_stats_limit.q.out +++ ql/src/test/results/clientpositive/annotate_stats_limit.q.out @@ -67,10 +67,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -78,6 +74,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -107,10 +107,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -120,6 +116,10 @@ TOK_QUERY TOK_ALLCOLREF TOK_LIMIT 4 + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -154,10 +154,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -167,6 +163,10 @@ TOK_QUERY TOK_ALLCOLREF TOK_LIMIT 16 + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -199,10 +199,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -212,6 +208,10 @@ TOK_QUERY TOK_ALLCOLREF TOK_LIMIT 0 + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/annotate_stats_part.q.out ql/src/test/results/clientpositive/annotate_stats_part.q.out index a0b4602..f09c504 100644 --- ql/src/test/results/clientpositive/annotate_stats_part.q.out +++ ql/src/test/results/clientpositive/annotate_stats_part.q.out @@ -47,10 +47,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -58,6 +54,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -106,10 +106,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -117,6 +113,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -247,10 +247,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -263,6 +259,10 @@ TOK_QUERY TOK_TABLE_OR_COL year '__HIVE_DEFAULT_PARTITION__' + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -336,10 +336,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -347,6 +343,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -463,10 +463,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -479,6 +475,10 @@ TOK_QUERY TOK_TABLE_OR_COL year '2001' + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -570,10 +570,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -586,6 +582,10 @@ TOK_QUERY TOK_TABLE_OR_COL year '__HIVE_DEFAULT_PARTITION__' + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -659,10 +659,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -670,6 +666,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -786,10 +786,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -807,6 +803,10 @@ TOK_QUERY TOK_TABLE_OR_COL year '__HIVE_DEFAULT_PARTITION__' + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -925,10 +925,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -946,6 +942,10 @@ TOK_QUERY TOK_TABLE_OR_COL year '__HIVE_DEFAULT_PARTITION__' + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -991,10 +991,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1003,6 +999,10 @@ TOK_QUERY TOK_SELEXPR TOK_TABLE_OR_COL zip + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -1154,10 +1154,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1166,6 +1162,10 @@ TOK_QUERY TOK_SELEXPR TOK_TABLE_OR_COL state + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -1319,10 +1319,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1334,6 +1330,10 @@ TOK_QUERY TOK_SELEXPR TOK_TABLE_OR_COL locid + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -1485,10 +1485,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1505,6 +1501,10 @@ TOK_QUERY TOK_TABLE_OR_COL year '2001' + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -1610,10 +1610,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1630,6 +1626,10 @@ TOK_QUERY TOK_TABLE_OR_COL year '2001' + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -1735,10 +1735,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1746,6 +1742,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -1864,10 +1864,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1886,6 +1882,10 @@ TOK_QUERY TOK_TABLE_OR_COL year '2001' + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -1993,10 +1993,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -2018,6 +2014,10 @@ TOK_QUERY TOK_TABLE_OR_COL year '2001' + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -2125,25 +2125,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_SUBQUERY - TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_TABLE_OR_COL - locid - TOK_SELEXPR - TOK_TABLE_OR_COL - year - test TOK_INSERT TOK_DESTINATION TOK_DIR @@ -2161,6 +2142,25 @@ TOK_QUERY TOK_TABLE_OR_COL year '2001' + TOK_FROM + TOK_SUBQUERY + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_TABLE_OR_COL + locid + TOK_SELEXPR + TOK_TABLE_OR_COL + year + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc + test STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/annotate_stats_select.q.out ql/src/test/results/clientpositive/annotate_stats_select.q.out index 97e9473..303926e 100644 --- ql/src/test/results/clientpositive/annotate_stats_select.q.out +++ ql/src/test/results/clientpositive/annotate_stats_select.q.out @@ -96,10 +96,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -107,6 +103,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -146,10 +146,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -157,6 +153,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -186,10 +186,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -198,6 +194,10 @@ TOK_QUERY TOK_SELEXPR TOK_TABLE_OR_COL bo1 + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -310,10 +310,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -323,6 +319,10 @@ TOK_QUERY TOK_TABLE_OR_COL i1 int1 + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -433,10 +433,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -445,6 +441,10 @@ TOK_QUERY TOK_SELEXPR TOK_TABLE_OR_COL s1 + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -557,10 +557,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -569,6 +565,10 @@ TOK_QUERY TOK_SELEXPR TOK_TABLE_OR_COL m1 + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -679,10 +679,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -712,6 +708,10 @@ TOK_QUERY TOK_SELEXPR TOK_TABLE_OR_COL s1 + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -822,10 +822,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -833,6 +829,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_NULL + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -943,10 +943,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -954,6 +950,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR 11 + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -1064,10 +1064,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1075,6 +1071,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR 11L + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -1185,10 +1185,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1196,6 +1192,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR 11.0 + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -1306,10 +1306,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1317,6 +1313,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR "hello" + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -1425,10 +1425,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1439,6 +1435,10 @@ TOK_QUERY TOK_CHAR 5 "hello" + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -1547,10 +1547,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1561,6 +1557,10 @@ TOK_QUERY TOK_VARCHAR 5 "hello" + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -1671,10 +1671,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1684,6 +1680,10 @@ TOK_QUERY TOK_FUNCTION unbase64 "0xe23" + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -1794,10 +1794,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1811,6 +1807,10 @@ TOK_QUERY TOK_FUNCTION TOK_SMALLINT "20" + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -1921,10 +1921,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1934,6 +1930,10 @@ TOK_QUERY TOK_FUNCTION TOK_TIMESTAMP "1970-12-31 15:59:58.174" + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -2044,10 +2044,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -2057,6 +2053,10 @@ TOK_QUERY TOK_FUNCTION TOK_DATE "1970-12-31 15:59:58.174" + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -2167,10 +2167,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -2180,6 +2176,10 @@ TOK_QUERY TOK_FUNCTION TOK_DECIMAL "58.174" + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -2290,10 +2290,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -2305,6 +2301,10 @@ TOK_QUERY 1 2 3 + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -2415,10 +2415,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -2430,6 +2426,10 @@ TOK_QUERY "a=1 b=2 c=3" " " "=" + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -2540,10 +2540,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -2556,6 +2552,10 @@ TOK_QUERY 11 "b" 11 + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -2666,10 +2666,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -2680,6 +2676,10 @@ TOK_QUERY CREATE_UNION 0 "hello" + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -2792,10 +2792,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -2804,6 +2800,10 @@ TOK_QUERY TOK_SELEXPR TOK_FUNCTIONSTAR count + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -2935,10 +2935,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -2948,6 +2944,10 @@ TOK_QUERY TOK_FUNCTION count 1 + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -3079,10 +3079,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -3092,6 +3088,10 @@ TOK_QUERY TOK_ALLCOLREF TOK_SELEXPR 11 + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -3206,13 +3206,17 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_TABLE_OR_COL + i1 TOK_FROM TOK_SUBQUERY TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -3223,15 +3227,11 @@ TOK_QUERY i1 TOK_LIMIT 10 + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc temp - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_TABLE_OR_COL - i1 STAGE DEPENDENCIES: @@ -3365,13 +3365,17 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_TABLE_OR_COL + i1 TOK_FROM TOK_SUBQUERY TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -3384,15 +3388,11 @@ TOK_QUERY 11 TOK_LIMIT 10 + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc temp - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_TABLE_OR_COL - i1 STAGE DEPENDENCIES: @@ -3526,13 +3526,19 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_TABLE_OR_COL + i1 + TOK_SELEXPR + "hello" TOK_FROM TOK_SUBQUERY TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -3545,17 +3551,11 @@ TOK_QUERY 11 TOK_LIMIT 10 + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc temp - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_TABLE_OR_COL - i1 - TOK_SELEXPR - "hello" STAGE DEPENDENCIES: @@ -3689,13 +3689,17 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_TABLE_OR_COL + x TOK_FROM TOK_SUBQUERY TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -3709,15 +3713,11 @@ TOK_QUERY x TOK_LIMIT 10 + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc temp - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_TABLE_OR_COL - x STAGE DEPENDENCIES: @@ -3851,13 +3851,19 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_TABLE_OR_COL + x + TOK_SELEXPR + "hello" TOK_FROM TOK_SUBQUERY TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -3874,17 +3880,11 @@ TOK_QUERY ub TOK_LIMIT 10 + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc temp - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_TABLE_OR_COL - x - TOK_SELEXPR - "hello" STAGE DEPENDENCIES: @@ -4020,16 +4020,33 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_TABLE_OR_COL + h + TOK_SELEXPR + 11.0 TOK_FROM TOK_SUBQUERY TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_TABLE_OR_COL + hell + h + TOK_LIMIT + 10 TOK_FROM TOK_SUBQUERY TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -4043,29 +4060,12 @@ TOK_QUERY hell TOK_LIMIT 10 + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc in1 - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_TABLE_OR_COL - hell - h - TOK_LIMIT - 10 in2 - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_TABLE_OR_COL - h - TOK_SELEXPR - 11.0 STAGE DEPENDENCIES: @@ -4269,10 +4269,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -4284,6 +4280,10 @@ TOK_QUERY TOK_WHERE TOK_TABLE_OR_COL bo1 + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -4398,10 +4398,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -4414,6 +4410,10 @@ TOK_QUERY ! TOK_TABLE_OR_COL bo1 + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/annotate_stats_table.q.out ql/src/test/results/clientpositive/annotate_stats_table.q.out index bb2d18c..d039e89 100644 --- ql/src/test/results/clientpositive/annotate_stats_table.q.out +++ ql/src/test/results/clientpositive/annotate_stats_table.q.out @@ -35,10 +35,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - emp_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -46,6 +42,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + emp_orc STAGE DEPENDENCIES: @@ -97,10 +97,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - emp_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -108,6 +104,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + emp_orc STAGE DEPENDENCIES: @@ -147,10 +147,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - emp_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -158,6 +154,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + emp_orc STAGE DEPENDENCIES: @@ -197,10 +197,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - emp_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -208,6 +204,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + emp_orc STAGE DEPENDENCIES: @@ -239,10 +239,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - emp_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -251,6 +247,10 @@ TOK_QUERY TOK_SELEXPR TOK_TABLE_OR_COL deptid + TOK_FROM + TOK_TABREF + TOK_TABNAME + emp_orc STAGE DEPENDENCIES: @@ -367,10 +367,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - emp_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -378,6 +374,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + emp_orc STAGE DEPENDENCIES: @@ -407,10 +407,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - emp_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -419,6 +415,10 @@ TOK_QUERY TOK_SELEXPR TOK_TABLE_OR_COL lastname + TOK_FROM + TOK_TABREF + TOK_TABNAME + emp_orc STAGE DEPENDENCIES: @@ -525,10 +525,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - emp_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -537,6 +533,10 @@ TOK_QUERY TOK_SELEXPR TOK_TABLE_OR_COL deptid + TOK_FROM + TOK_TABREF + TOK_TABNAME + emp_orc STAGE DEPENDENCIES: @@ -643,10 +643,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - emp_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -658,6 +654,10 @@ TOK_QUERY TOK_SELEXPR TOK_TABLE_OR_COL deptid + TOK_FROM + TOK_TABREF + TOK_TABNAME + emp_orc STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/annotate_stats_union.q.out ql/src/test/results/clientpositive/annotate_stats_union.q.out index 6d179b6..2836e95 100644 --- ql/src/test/results/clientpositive/annotate_stats_union.q.out +++ ql/src/test/results/clientpositive/annotate_stats_union.q.out @@ -67,10 +67,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -79,6 +75,10 @@ TOK_QUERY TOK_SELEXPR TOK_TABLE_OR_COL state + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -185,14 +185,17 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_ALLCOLREF TOK_FROM TOK_SUBQUERY TOK_UNION TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -201,11 +204,11 @@ TOK_QUERY TOK_SELEXPR TOK_TABLE_OR_COL state - TOK_QUERY TOK_FROM TOK_TABREF TOK_TABNAME loc_orc + TOK_QUERY TOK_INSERT TOK_DESTINATION TOK_DIR @@ -214,14 +217,11 @@ TOK_QUERY TOK_SELEXPR TOK_TABLE_OR_COL state + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc tmp - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_ALLCOLREF STAGE DEPENDENCIES: @@ -369,10 +369,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -380,6 +376,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -409,14 +409,17 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_ALLCOLREF TOK_FROM TOK_SUBQUERY TOK_UNION TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -424,11 +427,11 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF - TOK_QUERY TOK_FROM TOK_TABREF TOK_TABNAME loc_orc + TOK_QUERY TOK_INSERT TOK_DESTINATION TOK_DIR @@ -436,14 +439,11 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc tmp - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_ALLCOLREF STAGE DEPENDENCIES: @@ -675,15 +675,17 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_ALLCOLREF TOK_FROM TOK_SUBQUERY TOK_UNION TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - default - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -692,12 +694,12 @@ TOK_QUERY TOK_SELEXPR TOK_TABLE_OR_COL state - TOK_QUERY TOK_FROM TOK_TABREF TOK_TABNAME - test + default loc_orc + TOK_QUERY TOK_INSERT TOK_DESTINATION TOK_DIR @@ -706,14 +708,12 @@ TOK_QUERY TOK_SELEXPR TOK_TABLE_OR_COL state + TOK_FROM + TOK_TABREF + TOK_TABNAME + test + loc_orc temp - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_ALLCOLREF STAGE DEPENDENCIES: @@ -908,15 +908,17 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_ALLCOLREF TOK_FROM TOK_SUBQUERY TOK_UNION TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - test - loc_staging TOK_INSERT TOK_DESTINATION TOK_DIR @@ -925,12 +927,12 @@ TOK_QUERY TOK_SELEXPR TOK_TABLE_OR_COL state - TOK_QUERY TOK_FROM TOK_TABREF TOK_TABNAME test - loc_orc + loc_staging + TOK_QUERY TOK_INSERT TOK_DESTINATION TOK_DIR @@ -939,14 +941,12 @@ TOK_QUERY TOK_SELEXPR TOK_TABLE_OR_COL state + TOK_FROM + TOK_TABREF + TOK_TABNAME + test + loc_orc temp - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_ALLCOLREF STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/auto_join_reordering_values.q.out ql/src/test/results/clientpositive/auto_join_reordering_values.q.out index 3f4f902..38bf922 100644 --- ql/src/test/results/clientpositive/auto_join_reordering_values.q.out +++ ql/src/test/results/clientpositive/auto_join_reordering_values.q.out @@ -84,6 +84,23 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + . + TOK_TABLE_OR_COL + dim_pay_date + date + TOK_SELEXPR + . + TOK_TABLE_OR_COL + deal + dealid + TOK_LIMIT + 5 TOK_FROM TOK_JOIN TOK_JOIN @@ -145,23 +162,6 @@ TOK_QUERY TOK_TABLE_OR_COL orderpayment userid - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - . - TOK_TABLE_OR_COL - dim_pay_date - date - TOK_SELEXPR - . - TOK_TABLE_OR_COL - deal - dealid - TOK_LIMIT - 5 STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/auto_sortmerge_join_1.q.out ql/src/test/results/clientpositive/auto_sortmerge_join_1.q.out index 72640df..ba5268e 100644 --- ql/src/test/results/clientpositive/auto_sortmerge_join_1.q.out +++ ql/src/test/results/clientpositive/auto_sortmerge_join_1.q.out @@ -110,6 +110,14 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -129,14 +137,6 @@ TOK_QUERY TOK_TABLE_OR_COL b key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: @@ -336,6 +336,14 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -355,14 +363,6 @@ TOK_QUERY TOK_TABLE_OR_COL b key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: @@ -562,6 +562,14 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -581,14 +589,6 @@ TOK_QUERY TOK_TABLE_OR_COL b key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/auto_sortmerge_join_11.q.out ql/src/test/results/clientpositive/auto_sortmerge_join_11.q.out index c660cd0..12e261c 100644 --- ql/src/test/results/clientpositive/auto_sortmerge_join_11.q.out +++ ql/src/test/results/clientpositive/auto_sortmerge_join_11.q.out @@ -106,6 +106,14 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -125,14 +133,6 @@ TOK_QUERY TOK_TABLE_OR_COL b key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: @@ -467,6 +467,14 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -486,14 +494,6 @@ TOK_QUERY TOK_TABLE_OR_COL b key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: @@ -822,6 +822,19 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + a + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -841,19 +854,6 @@ TOK_QUERY TOK_TABLE_OR_COL b key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - a - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: @@ -1142,6 +1142,20 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + a + b + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_JOIN @@ -1175,20 +1189,6 @@ TOK_QUERY TOK_TABLE_OR_COL c key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - a - b - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out index 4abda32..ca0d0e6 100644 --- ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out +++ ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out @@ -143,6 +143,14 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_JOIN @@ -190,14 +198,6 @@ TOK_QUERY TOK_TABLE_OR_COL b key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/auto_sortmerge_join_2.q.out ql/src/test/results/clientpositive/auto_sortmerge_join_2.q.out index 52a3194..8bc8043 100644 --- ql/src/test/results/clientpositive/auto_sortmerge_join_2.q.out +++ ql/src/test/results/clientpositive/auto_sortmerge_join_2.q.out @@ -90,6 +90,14 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -109,14 +117,6 @@ TOK_QUERY TOK_TABLE_OR_COL b key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: @@ -318,6 +318,14 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -337,14 +345,6 @@ TOK_QUERY TOK_TABLE_OR_COL b key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/auto_sortmerge_join_3.q.out ql/src/test/results/clientpositive/auto_sortmerge_join_3.q.out index d807791..295bde2 100644 --- ql/src/test/results/clientpositive/auto_sortmerge_join_3.q.out +++ ql/src/test/results/clientpositive/auto_sortmerge_join_3.q.out @@ -90,6 +90,14 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -109,14 +117,6 @@ TOK_QUERY TOK_TABLE_OR_COL b key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: @@ -267,6 +267,14 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -286,14 +294,6 @@ TOK_QUERY TOK_TABLE_OR_COL b key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: @@ -444,6 +444,14 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -463,14 +471,6 @@ TOK_QUERY TOK_TABLE_OR_COL b key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/auto_sortmerge_join_4.q.out ql/src/test/results/clientpositive/auto_sortmerge_join_4.q.out index 35e0a30..2ccfc6e 100644 --- ql/src/test/results/clientpositive/auto_sortmerge_join_4.q.out +++ ql/src/test/results/clientpositive/auto_sortmerge_join_4.q.out @@ -106,6 +106,14 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -125,14 +133,6 @@ TOK_QUERY TOK_TABLE_OR_COL b key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: @@ -283,6 +283,14 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -302,14 +310,6 @@ TOK_QUERY TOK_TABLE_OR_COL b key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: @@ -460,6 +460,14 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -479,14 +487,6 @@ TOK_QUERY TOK_TABLE_OR_COL b key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/auto_sortmerge_join_5.q.out ql/src/test/results/clientpositive/auto_sortmerge_join_5.q.out index af3d9d6..522e9e9 100644 --- ql/src/test/results/clientpositive/auto_sortmerge_join_5.q.out +++ ql/src/test/results/clientpositive/auto_sortmerge_join_5.q.out @@ -71,6 +71,14 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -90,14 +98,6 @@ TOK_QUERY TOK_TABLE_OR_COL b key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: @@ -242,6 +242,14 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -261,14 +269,6 @@ TOK_QUERY TOK_TABLE_OR_COL b key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: @@ -413,6 +413,14 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -432,14 +440,6 @@ TOK_QUERY TOK_TABLE_OR_COL b key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/auto_sortmerge_join_7.q.out ql/src/test/results/clientpositive/auto_sortmerge_join_7.q.out index 05ef5d8..a161ea7 100644 --- ql/src/test/results/clientpositive/auto_sortmerge_join_7.q.out +++ ql/src/test/results/clientpositive/auto_sortmerge_join_7.q.out @@ -123,6 +123,14 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -142,14 +150,6 @@ TOK_QUERY TOK_TABLE_OR_COL b key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: @@ -351,6 +351,14 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -370,14 +378,6 @@ TOK_QUERY TOK_TABLE_OR_COL b key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: @@ -579,6 +579,14 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -598,14 +606,6 @@ TOK_QUERY TOK_TABLE_OR_COL b key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/auto_sortmerge_join_8.q.out ql/src/test/results/clientpositive/auto_sortmerge_join_8.q.out index e423d14..25a23b2 100644 --- ql/src/test/results/clientpositive/auto_sortmerge_join_8.q.out +++ ql/src/test/results/clientpositive/auto_sortmerge_join_8.q.out @@ -123,6 +123,14 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -142,14 +150,6 @@ TOK_QUERY TOK_TABLE_OR_COL b key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: @@ -351,6 +351,14 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -370,14 +378,6 @@ TOK_QUERY TOK_TABLE_OR_COL b key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: @@ -581,6 +581,14 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -600,14 +608,6 @@ TOK_QUERY TOK_TABLE_OR_COL b key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/binary_output_format.q.out ql/src/test/results/clientpositive/binary_output_format.q.out index 294aabb..7ee289f 100644 --- ql/src/test/results/clientpositive/binary_output_format.q.out +++ ql/src/test/results/clientpositive/binary_output_format.q.out @@ -54,10 +54,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_TAB @@ -85,6 +81,10 @@ TOK_QUERY TOK_TABCOL mydata TOK_STRING + TOK_FROM + TOK_TABREF + TOK_TABNAME + src STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/bucket1.q.out ql/src/test/results/clientpositive/bucket1.q.out index f3eb15c..5b1b4ff 100644 --- ql/src/test/results/clientpositive/bucket1.q.out +++ ql/src/test/results/clientpositive/bucket1.q.out @@ -20,10 +20,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_TAB @@ -32,6 +28,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + src STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/bucket2.q.out ql/src/test/results/clientpositive/bucket2.q.out index 9a22160..6518693 100644 --- ql/src/test/results/clientpositive/bucket2.q.out +++ ql/src/test/results/clientpositive/bucket2.q.out @@ -20,10 +20,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_TAB @@ -32,6 +28,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + src STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/bucket3.q.out ql/src/test/results/clientpositive/bucket3.q.out index 8fa9c7b..07ad376 100644 --- ql/src/test/results/clientpositive/bucket3.q.out +++ ql/src/test/results/clientpositive/bucket3.q.out @@ -20,10 +20,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_TAB @@ -36,6 +32,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + src STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/bucket4.q.out ql/src/test/results/clientpositive/bucket4.q.out index 032272b..2a13e8f 100644 --- ql/src/test/results/clientpositive/bucket4.q.out +++ ql/src/test/results/clientpositive/bucket4.q.out @@ -16,10 +16,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_TAB @@ -28,6 +24,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + src STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/bucket5.q.out ql/src/test/results/clientpositive/bucket5.q.out index d19fbe5..af1e36c 100644 --- ql/src/test/results/clientpositive/bucket5.q.out +++ ql/src/test/results/clientpositive/bucket5.q.out @@ -31,37 +31,39 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM + TOK_FROM_BASE TOK_TABREF TOK_TABNAME src - TOK_INSERT - TOK_DESTINATION - TOK_TAB - TOK_TABNAME - bucketed_table - TOK_SELECT - TOK_SELEXPR + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_TAB + TOK_TABNAME + bucketed_table + TOK_SELECT + TOK_SELEXPR + TOK_TABLE_OR_COL + key + TOK_SELEXPR + TOK_TABLE_OR_COL + value + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_TAB + TOK_TABNAME + unbucketed_table + TOK_SELECT + TOK_SELEXPR + TOK_TABLE_OR_COL + key + TOK_SELEXPR + TOK_TABLE_OR_COL + value + TOK_CLUSTERBY TOK_TABLE_OR_COL key - TOK_SELEXPR - TOK_TABLE_OR_COL - value - TOK_INSERT - TOK_DESTINATION - TOK_TAB - TOK_TABNAME - unbucketed_table - TOK_SELECT - TOK_SELEXPR - TOK_TABLE_OR_COL - key - TOK_SELEXPR - TOK_TABLE_OR_COL - value - TOK_CLUSTERBY - TOK_TABLE_OR_COL - key STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/bucket_map_join_1.q.out ql/src/test/results/clientpositive/bucket_map_join_1.q.out index 8674a6c..80c042c 100644 --- ql/src/test/results/clientpositive/bucket_map_join_1.q.out +++ ql/src/test/results/clientpositive/bucket_map_join_1.q.out @@ -57,6 +57,19 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + b + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -86,19 +99,6 @@ TOK_QUERY TOK_TABLE_OR_COL b value - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - b - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/bucket_map_join_2.q.out ql/src/test/results/clientpositive/bucket_map_join_2.q.out index 8a5984d..ab81521 100644 --- ql/src/test/results/clientpositive/bucket_map_join_2.q.out +++ ql/src/test/results/clientpositive/bucket_map_join_2.q.out @@ -57,6 +57,19 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + b + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -86,19 +99,6 @@ TOK_QUERY TOK_TABLE_OR_COL b value - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - b - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/bucketcontext_1.q.out ql/src/test/results/clientpositive/bucketcontext_1.q.out index 1513515..7a637b2 100644 --- ql/src/test/results/clientpositive/bucketcontext_1.q.out +++ ql/src/test/results/clientpositive/bucketcontext_1.q.out @@ -104,6 +104,19 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + a + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -123,19 +136,6 @@ TOK_QUERY TOK_TABLE_OR_COL b key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - a - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: @@ -425,6 +425,19 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + a + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -444,19 +457,6 @@ TOK_QUERY TOK_TABLE_OR_COL b key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - a - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/bucketcontext_2.q.out ql/src/test/results/clientpositive/bucketcontext_2.q.out index d18a9be..f3f68c1 100644 --- ql/src/test/results/clientpositive/bucketcontext_2.q.out +++ ql/src/test/results/clientpositive/bucketcontext_2.q.out @@ -88,6 +88,19 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + a + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -107,19 +120,6 @@ TOK_QUERY TOK_TABLE_OR_COL b key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - a - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: @@ -409,6 +409,19 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + a + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -428,19 +441,6 @@ TOK_QUERY TOK_TABLE_OR_COL b key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - a - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/bucketcontext_3.q.out ql/src/test/results/clientpositive/bucketcontext_3.q.out index e12c155..e7e79c5 100644 --- ql/src/test/results/clientpositive/bucketcontext_3.q.out +++ ql/src/test/results/clientpositive/bucketcontext_3.q.out @@ -88,6 +88,19 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + a + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -107,19 +120,6 @@ TOK_QUERY TOK_TABLE_OR_COL b key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - a - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: @@ -406,6 +406,19 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + a + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -425,19 +438,6 @@ TOK_QUERY TOK_TABLE_OR_COL b key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - a - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/bucketcontext_4.q.out ql/src/test/results/clientpositive/bucketcontext_4.q.out index 77b4882..072035e 100644 --- ql/src/test/results/clientpositive/bucketcontext_4.q.out +++ ql/src/test/results/clientpositive/bucketcontext_4.q.out @@ -104,6 +104,19 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + a + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -123,19 +136,6 @@ TOK_QUERY TOK_TABLE_OR_COL b key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - a - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: @@ -422,6 +422,19 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + a + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -441,19 +454,6 @@ TOK_QUERY TOK_TABLE_OR_COL b key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - a - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/bucketcontext_5.q.out ql/src/test/results/clientpositive/bucketcontext_5.q.out index fa1cfc5..52bcff7 100644 --- ql/src/test/results/clientpositive/bucketcontext_5.q.out +++ ql/src/test/results/clientpositive/bucketcontext_5.q.out @@ -69,6 +69,19 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + a + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -88,19 +101,6 @@ TOK_QUERY TOK_TABLE_OR_COL b key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - a - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: @@ -288,6 +288,19 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + a + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -307,19 +320,6 @@ TOK_QUERY TOK_TABLE_OR_COL b key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - a - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/bucketcontext_6.q.out ql/src/test/results/clientpositive/bucketcontext_6.q.out index aac66f8..152d858 100644 --- ql/src/test/results/clientpositive/bucketcontext_6.q.out +++ ql/src/test/results/clientpositive/bucketcontext_6.q.out @@ -87,6 +87,19 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + a + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -106,19 +119,6 @@ TOK_QUERY TOK_TABLE_OR_COL b key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - a - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: @@ -359,6 +359,19 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + a + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -378,19 +391,6 @@ TOK_QUERY TOK_TABLE_OR_COL b key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - a - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/bucketcontext_7.q.out ql/src/test/results/clientpositive/bucketcontext_7.q.out index 78c4f94..0dfb612 100644 --- ql/src/test/results/clientpositive/bucketcontext_7.q.out +++ ql/src/test/results/clientpositive/bucketcontext_7.q.out @@ -121,6 +121,19 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + a + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -140,19 +153,6 @@ TOK_QUERY TOK_TABLE_OR_COL b key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - a - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: @@ -490,6 +490,19 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + a + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -509,19 +522,6 @@ TOK_QUERY TOK_TABLE_OR_COL b key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - a - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/bucketcontext_8.q.out ql/src/test/results/clientpositive/bucketcontext_8.q.out index ad7fec9..2511da5 100644 --- ql/src/test/results/clientpositive/bucketcontext_8.q.out +++ ql/src/test/results/clientpositive/bucketcontext_8.q.out @@ -121,6 +121,19 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + a + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -140,19 +153,6 @@ TOK_QUERY TOK_TABLE_OR_COL b key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - a - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: @@ -490,6 +490,19 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + a + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -509,19 +522,6 @@ TOK_QUERY TOK_TABLE_OR_COL b key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - a - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/bucketmapjoin1.q.out ql/src/test/results/clientpositive/bucketmapjoin1.q.out index 10f1af4..38a8891 100644 --- ql/src/test/results/clientpositive/bucketmapjoin1.q.out +++ ql/src/test/results/clientpositive/bucketmapjoin1.q.out @@ -34,25 +34,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_JOIN - TOK_TABREF - TOK_TABNAME - srcbucket_mapjoin_part - a - TOK_TABREF - TOK_TABNAME - srcbucket_mapjoin_part_2 - b - = - . - TOK_TABLE_OR_COL - a - key - . - TOK_TABLE_OR_COL - b - key TOK_INSERT TOK_DESTINATION TOK_DIR @@ -85,6 +66,25 @@ TOK_QUERY b ds "2008-04-08" + TOK_FROM + TOK_JOIN + TOK_TABREF + TOK_TABNAME + srcbucket_mapjoin_part + a + TOK_TABREF + TOK_TABNAME + srcbucket_mapjoin_part_2 + b + = + . + TOK_TABLE_OR_COL + a + key + . + TOK_TABLE_OR_COL + b + key STAGE DEPENDENCIES: @@ -161,25 +161,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_JOIN - TOK_TABREF - TOK_TABNAME - srcbucket_mapjoin_part - a - TOK_TABREF - TOK_TABNAME - srcbucket_mapjoin_part_2 - b - = - . - TOK_TABLE_OR_COL - a - key - . - TOK_TABLE_OR_COL - b - key TOK_INSERT TOK_DESTINATION TOK_DIR @@ -212,6 +193,25 @@ TOK_QUERY b ds "2008-04-08" + TOK_FROM + TOK_JOIN + TOK_TABREF + TOK_TABNAME + srcbucket_mapjoin_part + a + TOK_TABREF + TOK_TABNAME + srcbucket_mapjoin_part_2 + b + = + . + TOK_TABLE_OR_COL + a + key + . + TOK_TABLE_OR_COL + b + key STAGE DEPENDENCIES: @@ -377,25 +377,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_JOIN - TOK_TABREF - TOK_TABNAME - srcbucket_mapjoin - a - TOK_TABREF - TOK_TABNAME - srcbucket_mapjoin_part - b - = - . - TOK_TABLE_OR_COL - a - key - . - TOK_TABLE_OR_COL - b - key TOK_INSERT TOK_DESTINATION TOK_TAB @@ -429,6 +410,25 @@ TOK_QUERY b ds "2008-04-08" + TOK_FROM + TOK_JOIN + TOK_TABREF + TOK_TABNAME + srcbucket_mapjoin + a + TOK_TABREF + TOK_TABNAME + srcbucket_mapjoin_part + b + = + . + TOK_TABLE_OR_COL + a + key + . + TOK_TABLE_OR_COL + b + key STAGE DEPENDENCIES: @@ -924,25 +924,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_JOIN - TOK_TABREF - TOK_TABNAME - srcbucket_mapjoin - a - TOK_TABREF - TOK_TABNAME - srcbucket_mapjoin_part - b - = - . - TOK_TABLE_OR_COL - a - key - . - TOK_TABLE_OR_COL - b - key TOK_INSERT TOK_DESTINATION TOK_TAB @@ -976,6 +957,25 @@ TOK_QUERY b ds "2008-04-08" + TOK_FROM + TOK_JOIN + TOK_TABREF + TOK_TABNAME + srcbucket_mapjoin + a + TOK_TABREF + TOK_TABNAME + srcbucket_mapjoin_part + b + = + . + TOK_TABLE_OR_COL + a + key + . + TOK_TABLE_OR_COL + b + key STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/bucketmapjoin10.q.out ql/src/test/results/clientpositive/bucketmapjoin10.q.out index 88ecf40..798004b 100644 --- ql/src/test/results/clientpositive/bucketmapjoin10.q.out +++ ql/src/test/results/clientpositive/bucketmapjoin10.q.out @@ -141,6 +141,19 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + b + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -174,19 +187,6 @@ TOK_QUERY TOK_TABLE_OR_COL b part - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - b - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/bucketmapjoin11.q.out ql/src/test/results/clientpositive/bucketmapjoin11.q.out index 4ee1fa0..5f92ba9 100644 --- ql/src/test/results/clientpositive/bucketmapjoin11.q.out +++ ql/src/test/results/clientpositive/bucketmapjoin11.q.out @@ -151,6 +151,19 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + b + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -184,19 +197,6 @@ TOK_QUERY TOK_TABLE_OR_COL b part - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - b - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: @@ -540,6 +540,19 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + b + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -583,19 +596,6 @@ TOK_QUERY TOK_TABLE_OR_COL b part - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - b - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/bucketmapjoin12.q.out ql/src/test/results/clientpositive/bucketmapjoin12.q.out index 9253f4a..c252e73 100644 --- ql/src/test/results/clientpositive/bucketmapjoin12.q.out +++ ql/src/test/results/clientpositive/bucketmapjoin12.q.out @@ -109,6 +109,19 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + b + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -142,19 +155,6 @@ TOK_QUERY b part '1' - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - b - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: @@ -404,6 +404,19 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + b + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -437,19 +450,6 @@ TOK_QUERY b part '1' - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - b - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/bucketmapjoin13.q.out ql/src/test/results/clientpositive/bucketmapjoin13.q.out index b380fab..51a8ee5 100644 --- ql/src/test/results/clientpositive/bucketmapjoin13.q.out +++ ql/src/test/results/clientpositive/bucketmapjoin13.q.out @@ -83,6 +83,19 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + b + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -102,19 +115,6 @@ TOK_QUERY TOK_TABLE_OR_COL b key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - b - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: @@ -407,6 +407,19 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + b + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -433,19 +446,6 @@ TOK_QUERY a part '2' - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - b - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: @@ -704,6 +704,19 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + b + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -723,19 +736,6 @@ TOK_QUERY TOK_TABLE_OR_COL b key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - b - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: @@ -996,6 +996,19 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + b + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -1015,19 +1028,6 @@ TOK_QUERY TOK_TABLE_OR_COL b key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - b - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/bucketmapjoin2.q.out ql/src/test/results/clientpositive/bucketmapjoin2.q.out index 297412f..8197b9a 100644 --- ql/src/test/results/clientpositive/bucketmapjoin2.q.out +++ ql/src/test/results/clientpositive/bucketmapjoin2.q.out @@ -98,32 +98,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_JOIN - TOK_TABREF - TOK_TABNAME - srcbucket_mapjoin_part - a - TOK_TABREF - TOK_TABNAME - srcbucket_mapjoin_part_2 - b - and - = - . - TOK_TABLE_OR_COL - a - key - . - TOK_TABLE_OR_COL - b - key - = - . - TOK_TABLE_OR_COL - b - ds - "2008-04-08" TOK_INSERT TOK_DESTINATION TOK_TAB @@ -150,6 +124,32 @@ TOK_QUERY TOK_TABLE_OR_COL b value + TOK_FROM + TOK_JOIN + TOK_TABREF + TOK_TABNAME + srcbucket_mapjoin_part + a + TOK_TABREF + TOK_TABNAME + srcbucket_mapjoin_part_2 + b + and + = + . + TOK_TABLE_OR_COL + a + key + . + TOK_TABLE_OR_COL + b + key + = + . + TOK_TABLE_OR_COL + b + ds + "2008-04-08" STAGE DEPENDENCIES: @@ -650,32 +650,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_JOIN - TOK_TABREF - TOK_TABNAME - srcbucket_mapjoin_part - a - TOK_TABREF - TOK_TABNAME - srcbucket_mapjoin_part_2 - b - and - = - . - TOK_TABLE_OR_COL - a - key - . - TOK_TABLE_OR_COL - b - key - = - . - TOK_TABLE_OR_COL - b - ds - "2008-04-08" TOK_INSERT TOK_DESTINATION TOK_TAB @@ -702,6 +676,32 @@ TOK_QUERY TOK_TABLE_OR_COL b value + TOK_FROM + TOK_JOIN + TOK_TABREF + TOK_TABNAME + srcbucket_mapjoin_part + a + TOK_TABREF + TOK_TABNAME + srcbucket_mapjoin_part_2 + b + and + = + . + TOK_TABLE_OR_COL + a + key + . + TOK_TABLE_OR_COL + b + key + = + . + TOK_TABLE_OR_COL + b + ds + "2008-04-08" STAGE DEPENDENCIES: @@ -1261,25 +1261,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_JOIN - TOK_TABREF - TOK_TABNAME - srcbucket_mapjoin_part - a - TOK_TABREF - TOK_TABNAME - srcbucket_mapjoin_part_2 - b - = - . - TOK_TABLE_OR_COL - a - key - . - TOK_TABLE_OR_COL - b - key TOK_INSERT TOK_DESTINATION TOK_TAB @@ -1306,6 +1287,25 @@ TOK_QUERY TOK_TABLE_OR_COL b value + TOK_FROM + TOK_JOIN + TOK_TABREF + TOK_TABNAME + srcbucket_mapjoin_part + a + TOK_TABREF + TOK_TABNAME + srcbucket_mapjoin_part_2 + b + = + . + TOK_TABLE_OR_COL + a + key + . + TOK_TABLE_OR_COL + b + key STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/bucketmapjoin3.q.out ql/src/test/results/clientpositive/bucketmapjoin3.q.out index 7f307a0..4d97f2e 100644 --- ql/src/test/results/clientpositive/bucketmapjoin3.q.out +++ ql/src/test/results/clientpositive/bucketmapjoin3.q.out @@ -121,6 +121,32 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_TAB + TOK_TABNAME + bucketmapjoin_tmp_result + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + b + TOK_SELEXPR + . + TOK_TABLE_OR_COL + a + key + TOK_SELEXPR + . + TOK_TABLE_OR_COL + a + value + TOK_SELEXPR + . + TOK_TABLE_OR_COL + b + value TOK_FROM TOK_JOIN TOK_TABREF @@ -154,32 +180,6 @@ TOK_QUERY a ds "2008-04-08" - TOK_INSERT - TOK_DESTINATION - TOK_TAB - TOK_TABNAME - bucketmapjoin_tmp_result - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - b - TOK_SELEXPR - . - TOK_TABLE_OR_COL - a - key - TOK_SELEXPR - . - TOK_TABLE_OR_COL - a - value - TOK_SELEXPR - . - TOK_TABLE_OR_COL - b - value STAGE DEPENDENCIES: @@ -680,6 +680,32 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_TAB + TOK_TABNAME + bucketmapjoin_tmp_result + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + a + TOK_SELEXPR + . + TOK_TABLE_OR_COL + a + key + TOK_SELEXPR + . + TOK_TABLE_OR_COL + a + value + TOK_SELEXPR + . + TOK_TABLE_OR_COL + b + value TOK_FROM TOK_JOIN TOK_TABREF @@ -713,32 +739,6 @@ TOK_QUERY a ds "2008-04-08" - TOK_INSERT - TOK_DESTINATION - TOK_TAB - TOK_TABNAME - bucketmapjoin_tmp_result - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - a - TOK_SELEXPR - . - TOK_TABLE_OR_COL - a - key - TOK_SELEXPR - . - TOK_TABLE_OR_COL - a - value - TOK_SELEXPR - . - TOK_TABLE_OR_COL - b - value STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/bucketmapjoin4.q.out ql/src/test/results/clientpositive/bucketmapjoin4.q.out index f0f9aee..71bcb84 100644 --- ql/src/test/results/clientpositive/bucketmapjoin4.q.out +++ ql/src/test/results/clientpositive/bucketmapjoin4.q.out @@ -121,25 +121,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_JOIN - TOK_TABREF - TOK_TABNAME - srcbucket_mapjoin - a - TOK_TABREF - TOK_TABNAME - srcbucket_mapjoin - b - = - . - TOK_TABLE_OR_COL - a - key - . - TOK_TABLE_OR_COL - b - key TOK_INSERT TOK_DESTINATION TOK_TAB @@ -166,6 +147,25 @@ TOK_QUERY TOK_TABLE_OR_COL b value + TOK_FROM + TOK_JOIN + TOK_TABREF + TOK_TABNAME + srcbucket_mapjoin + a + TOK_TABREF + TOK_TABNAME + srcbucket_mapjoin + b + = + . + TOK_TABLE_OR_COL + a + key + . + TOK_TABLE_OR_COL + b + key STAGE DEPENDENCIES: @@ -607,25 +607,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_JOIN - TOK_TABREF - TOK_TABNAME - srcbucket_mapjoin - a - TOK_TABREF - TOK_TABNAME - srcbucket_mapjoin - b - = - . - TOK_TABLE_OR_COL - a - key - . - TOK_TABLE_OR_COL - b - key TOK_INSERT TOK_DESTINATION TOK_TAB @@ -652,6 +633,25 @@ TOK_QUERY TOK_TABLE_OR_COL b value + TOK_FROM + TOK_JOIN + TOK_TABREF + TOK_TABNAME + srcbucket_mapjoin + a + TOK_TABREF + TOK_TABNAME + srcbucket_mapjoin + b + = + . + TOK_TABLE_OR_COL + a + key + . + TOK_TABLE_OR_COL + b + key STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/bucketmapjoin5.q.out ql/src/test/results/clientpositive/bucketmapjoin5.q.out index 79e1c3d..3618862 100644 --- ql/src/test/results/clientpositive/bucketmapjoin5.q.out +++ ql/src/test/results/clientpositive/bucketmapjoin5.q.out @@ -171,25 +171,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_JOIN - TOK_TABREF - TOK_TABNAME - srcbucket_mapjoin - a - TOK_TABREF - TOK_TABNAME - srcbucket_mapjoin_part - b - = - . - TOK_TABLE_OR_COL - a - key - . - TOK_TABLE_OR_COL - b - key TOK_INSERT TOK_DESTINATION TOK_TAB @@ -216,6 +197,25 @@ TOK_QUERY TOK_TABLE_OR_COL b value + TOK_FROM + TOK_JOIN + TOK_TABREF + TOK_TABNAME + srcbucket_mapjoin + a + TOK_TABREF + TOK_TABNAME + srcbucket_mapjoin_part + b + = + . + TOK_TABLE_OR_COL + a + key + . + TOK_TABLE_OR_COL + b + key STAGE DEPENDENCIES: @@ -718,25 +718,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_JOIN - TOK_TABREF - TOK_TABNAME - srcbucket_mapjoin - a - TOK_TABREF - TOK_TABNAME - srcbucket_mapjoin_part_2 - b - = - . - TOK_TABLE_OR_COL - a - key - . - TOK_TABLE_OR_COL - b - key TOK_INSERT TOK_DESTINATION TOK_TAB @@ -763,6 +744,25 @@ TOK_QUERY TOK_TABLE_OR_COL b value + TOK_FROM + TOK_JOIN + TOK_TABREF + TOK_TABNAME + srcbucket_mapjoin + a + TOK_TABREF + TOK_TABNAME + srcbucket_mapjoin_part_2 + b + = + . + TOK_TABLE_OR_COL + a + key + . + TOK_TABLE_OR_COL + b + key STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/bucketmapjoin7.q.out ql/src/test/results/clientpositive/bucketmapjoin7.q.out index 76baf50..045de3c 100644 --- ql/src/test/results/clientpositive/bucketmapjoin7.q.out +++ ql/src/test/results/clientpositive/bucketmapjoin7.q.out @@ -67,6 +67,28 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + b + TOK_SELEXPR + . + TOK_TABLE_OR_COL + a + key + TOK_SELEXPR + . + TOK_TABLE_OR_COL + b + value + TOK_LIMIT + 1 TOK_FROM TOK_JOIN TOK_TABREF @@ -100,28 +122,6 @@ TOK_QUERY b ds '2008-04-08' - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - b - TOK_SELEXPR - . - TOK_TABLE_OR_COL - a - key - TOK_SELEXPR - . - TOK_TABLE_OR_COL - b - value - TOK_LIMIT - 1 STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/bucketmapjoin8.q.out ql/src/test/results/clientpositive/bucketmapjoin8.q.out index 94fdbde..2007ef6 100644 --- ql/src/test/results/clientpositive/bucketmapjoin8.q.out +++ ql/src/test/results/clientpositive/bucketmapjoin8.q.out @@ -75,6 +75,19 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + b + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -108,19 +121,6 @@ TOK_QUERY b part '1' - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - b - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: @@ -379,6 +379,19 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + b + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -412,19 +425,6 @@ TOK_QUERY b part '1' - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - b - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/bucketmapjoin9.q.out ql/src/test/results/clientpositive/bucketmapjoin9.q.out index c9f4c17..52d0f66 100644 --- ql/src/test/results/clientpositive/bucketmapjoin9.q.out +++ ql/src/test/results/clientpositive/bucketmapjoin9.q.out @@ -83,6 +83,19 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + b + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -116,19 +129,6 @@ TOK_QUERY b part '1' - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - b - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: @@ -412,6 +412,19 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + b + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -445,19 +458,6 @@ TOK_QUERY b part '1' - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - b - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out index 751e32f..af345ae 100644 --- ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out +++ ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out @@ -75,25 +75,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_JOIN - TOK_TABREF - TOK_TABNAME - srcbucket_mapjoin - a - TOK_TABREF - TOK_TABNAME - srcbucket_mapjoin_part - b - = - . - TOK_TABLE_OR_COL - a - key - . - TOK_TABLE_OR_COL - b - key TOK_INSERT TOK_DESTINATION TOK_TAB @@ -127,6 +108,25 @@ TOK_QUERY b ds "2008-04-08" + TOK_FROM + TOK_JOIN + TOK_TABREF + TOK_TABNAME + srcbucket_mapjoin + a + TOK_TABREF + TOK_TABNAME + srcbucket_mapjoin_part + b + = + . + TOK_TABLE_OR_COL + a + key + . + TOK_TABLE_OR_COL + b + key STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/bucketmapjoin_negative2.q.out ql/src/test/results/clientpositive/bucketmapjoin_negative2.q.out index 3eb70d1..3ba80e3 100644 --- ql/src/test/results/clientpositive/bucketmapjoin_negative2.q.out +++ ql/src/test/results/clientpositive/bucketmapjoin_negative2.q.out @@ -84,25 +84,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_JOIN - TOK_TABREF - TOK_TABNAME - srcbucket_mapjoin - a - TOK_TABREF - TOK_TABNAME - srcbucket_mapjoin_part_2 - b - = - . - TOK_TABLE_OR_COL - a - key - . - TOK_TABLE_OR_COL - b - key TOK_INSERT TOK_DESTINATION TOK_TAB @@ -129,6 +110,25 @@ TOK_QUERY TOK_TABLE_OR_COL b value + TOK_FROM + TOK_JOIN + TOK_TABREF + TOK_TABNAME + srcbucket_mapjoin + a + TOK_TABREF + TOK_TABNAME + srcbucket_mapjoin_part_2 + b + = + . + TOK_TABLE_OR_COL + a + key + . + TOK_TABLE_OR_COL + b + key STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/bucketmapjoin_negative3.q.out ql/src/test/results/clientpositive/bucketmapjoin_negative3.q.out index 34abe4f..7bfecf1 100644 --- ql/src/test/results/clientpositive/bucketmapjoin_negative3.q.out +++ ql/src/test/results/clientpositive/bucketmapjoin_negative3.q.out @@ -147,6 +147,18 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + R + TOK_SELEXPR + TOK_ALLCOLREF TOK_FROM TOK_JOIN TOK_TABREF @@ -176,18 +188,6 @@ TOK_QUERY TOK_TABLE_OR_COL R value - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - R - TOK_SELEXPR - TOK_ALLCOLREF STAGE DEPENDENCIES: @@ -346,6 +346,18 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + R + TOK_SELEXPR + TOK_ALLCOLREF TOK_FROM TOK_JOIN TOK_TABREF @@ -375,18 +387,6 @@ TOK_QUERY TOK_TABLE_OR_COL R value - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - R - TOK_SELEXPR - TOK_ALLCOLREF STAGE DEPENDENCIES: @@ -547,6 +547,18 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + R + TOK_SELEXPR + TOK_ALLCOLREF TOK_FROM TOK_JOIN TOK_TABREF @@ -571,18 +583,6 @@ TOK_QUERY TOK_TABLE_OR_COL R key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - R - TOK_SELEXPR - TOK_ALLCOLREF STAGE DEPENDENCIES: @@ -733,6 +733,18 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + R + TOK_SELEXPR + TOK_ALLCOLREF TOK_FROM TOK_JOIN TOK_TABREF @@ -762,18 +774,6 @@ TOK_QUERY TOK_TABLE_OR_COL R value - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - R - TOK_SELEXPR - TOK_ALLCOLREF STAGE DEPENDENCIES: @@ -924,6 +924,18 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + R + TOK_SELEXPR + TOK_ALLCOLREF TOK_FROM TOK_JOIN TOK_TABREF @@ -953,18 +965,6 @@ TOK_QUERY TOK_TABLE_OR_COL R value - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - R - TOK_SELEXPR - TOK_ALLCOLREF STAGE DEPENDENCIES: @@ -1115,6 +1115,18 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + R + TOK_SELEXPR + TOK_ALLCOLREF TOK_FROM TOK_JOIN TOK_TABREF @@ -1144,18 +1156,6 @@ TOK_QUERY TOK_TABLE_OR_COL R value - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - R - TOK_SELEXPR - TOK_ALLCOLREF STAGE DEPENDENCIES: @@ -1306,6 +1306,18 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + R + TOK_SELEXPR + TOK_ALLCOLREF TOK_FROM TOK_JOIN TOK_TABREF @@ -1335,18 +1347,6 @@ TOK_QUERY TOK_TABLE_OR_COL R value - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - R - TOK_SELEXPR - TOK_ALLCOLREF STAGE DEPENDENCIES: @@ -1497,6 +1497,18 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + R + TOK_SELEXPR + TOK_ALLCOLREF TOK_FROM TOK_JOIN TOK_TABREF @@ -1526,18 +1538,6 @@ TOK_QUERY TOK_TABLE_OR_COL R value - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - R - TOK_SELEXPR - TOK_ALLCOLREF STAGE DEPENDENCIES: @@ -1688,6 +1688,18 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + R + TOK_SELEXPR + TOK_ALLCOLREF TOK_FROM TOK_JOIN TOK_TABREF @@ -1717,18 +1729,6 @@ TOK_QUERY TOK_TABLE_OR_COL R value - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - R - TOK_SELEXPR - TOK_ALLCOLREF STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/combine2.q.out ql/src/test/results/clientpositive/combine2.q.out index 39e9363..f9609ed 100644 --- ql/src/test/results/clientpositive/combine2.q.out +++ ql/src/test/results/clientpositive/combine2.q.out @@ -164,10 +164,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - combine2 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -182,6 +178,10 @@ TOK_QUERY TOK_ISNOTNULL TOK_TABLE_OR_COL value + TOK_FROM + TOK_TABREF + TOK_TABNAME + combine2 STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/combine2_hadoop20.q.out ql/src/test/results/clientpositive/combine2_hadoop20.q.out index e9947d9..b267cf1 100644 --- ql/src/test/results/clientpositive/combine2_hadoop20.q.out +++ ql/src/test/results/clientpositive/combine2_hadoop20.q.out @@ -164,10 +164,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - combine2 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -182,6 +178,10 @@ TOK_QUERY TOK_ISNOTNULL TOK_TABLE_OR_COL value + TOK_FROM + TOK_TABREF + TOK_TABNAME + combine2 STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/ctas.q.out ql/src/test/results/clientpositive/ctas.q.out index 0040f3c..729ff71 100644 --- ql/src/test/results/clientpositive/ctas.q.out +++ ql/src/test/results/clientpositive/ctas.q.out @@ -679,10 +679,6 @@ TOK_CREATETABLE '\012' TOK_TBLTEXTFILE TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_DIR @@ -703,6 +699,10 @@ TOK_CREATETABLE value TOK_LIMIT 10 + TOK_FROM + TOK_TABREF + TOK_TABNAME + src STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/ctas_hadoop20.q.out ql/src/test/results/clientpositive/ctas_hadoop20.q.out index 63428b5..d1a8492 100644 --- ql/src/test/results/clientpositive/ctas_hadoop20.q.out +++ ql/src/test/results/clientpositive/ctas_hadoop20.q.out @@ -679,10 +679,6 @@ TOK_CREATETABLE '\012' TOK_TBLTEXTFILE TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_DIR @@ -703,6 +699,10 @@ TOK_CREATETABLE value TOK_LIMIT 10 + TOK_FROM + TOK_TABREF + TOK_TABNAME + src STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/disable_merge_for_bucketing.q.out ql/src/test/results/clientpositive/disable_merge_for_bucketing.q.out index 4f9bb94..692ac7b 100644 --- ql/src/test/results/clientpositive/disable_merge_for_bucketing.q.out +++ ql/src/test/results/clientpositive/disable_merge_for_bucketing.q.out @@ -16,10 +16,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_TAB @@ -28,6 +24,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + src STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/dynamic_partition_skip_default.q.out ql/src/test/results/clientpositive/dynamic_partition_skip_default.q.out index 61a7599..c955d4f 100644 --- ql/src/test/results/clientpositive/dynamic_partition_skip_default.q.out +++ ql/src/test/results/clientpositive/dynamic_partition_skip_default.q.out @@ -48,10 +48,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - dynamic_part_table TOK_INSERT TOK_DESTINATION TOK_DIR @@ -70,6 +66,10 @@ TOK_QUERY TOK_TABLE_OR_COL partcol2 '1' + TOK_FROM + TOK_TABREF + TOK_TABNAME + dynamic_part_table STAGE DEPENDENCIES: @@ -174,10 +174,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - dynamic_part_table TOK_INSERT TOK_DESTINATION TOK_DIR @@ -196,6 +192,10 @@ TOK_QUERY TOK_TABLE_OR_COL partcol2 '1' + TOK_FROM + TOK_TABREF + TOK_TABNAME + dynamic_part_table STAGE DEPENDENCIES: @@ -300,10 +300,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - dynamic_part_table TOK_INSERT TOK_DESTINATION TOK_DIR @@ -332,6 +328,10 @@ TOK_QUERY TOK_TABLE_OR_COL partcol2 '__HIVE_DEFAULT_PARTITION__' + TOK_FROM + TOK_TABREF + TOK_TABNAME + dynamic_part_table STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/explain_logical.q.out ql/src/test/results/clientpositive/explain_logical.q.out index bb26e8c..01bf43c 100644 --- ql/src/test/results/clientpositive/explain_logical.q.out +++ ql/src/test/results/clientpositive/explain_logical.q.out @@ -61,10 +61,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcpart TOK_INSERT TOK_DESTINATION TOK_DIR @@ -85,6 +81,10 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL key + TOK_FROM + TOK_TABREF + TOK_TABNAME + srcpart LOGICAL PLAN: @@ -135,25 +135,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_SUBQUERY - TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_TABLE_OR_COL - key - TOK_SELEXPR - TOK_TABLE_OR_COL - value - subq1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -169,6 +150,25 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL key + TOK_FROM + TOK_SUBQUERY + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_TABLE_OR_COL + key + TOK_SELEXPR + TOK_TABLE_OR_COL + value + TOK_FROM + TOK_TABREF + TOK_TABNAME + src + subq1 LOGICAL PLAN: @@ -223,14 +223,17 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_ALLCOLREF TOK_FROM TOK_SUBQUERY TOK_UNION TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_DIR @@ -242,11 +245,11 @@ TOK_QUERY TOK_SELEXPR TOK_TABLE_OR_COL value - TOK_QUERY TOK_FROM TOK_TABREF TOK_TABNAME - srcpart + src + TOK_QUERY TOK_INSERT TOK_DESTINATION TOK_DIR @@ -263,14 +266,11 @@ TOK_QUERY TOK_ISNOTNULL TOK_TABLE_OR_COL ds + TOK_FROM + TOK_TABREF + TOK_TABNAME + srcpart S1 - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_ALLCOLREF LOGICAL PLAN: @@ -315,25 +315,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_JOIN - TOK_TABREF - TOK_TABNAME - src - S1 - TOK_TABREF - TOK_TABNAME - srcpart - S2 - = - . - TOK_TABLE_OR_COL - S1 - key - . - TOK_TABLE_OR_COL - S2 - key TOK_INSERT TOK_DESTINATION TOK_DIR @@ -354,6 +335,25 @@ TOK_QUERY TOK_ISNOTNULL TOK_TABLE_OR_COL ds + TOK_FROM + TOK_JOIN + TOK_TABREF + TOK_TABNAME + src + S1 + TOK_TABREF + TOK_TABNAME + srcpart + S2 + = + . + TOK_TABLE_OR_COL + S1 + key + . + TOK_TABLE_OR_COL + S2 + key LOGICAL PLAN: @@ -419,10 +419,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - V1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -430,6 +426,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + V1 LOGICAL PLAN: @@ -456,10 +456,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - V2 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -467,6 +463,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + V2 LOGICAL PLAN: @@ -493,10 +493,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - V3 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -504,6 +500,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + V3 LOGICAL PLAN: @@ -571,10 +571,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - V4 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -582,6 +578,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + V4 LOGICAL PLAN: @@ -691,10 +691,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - V5 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -702,6 +698,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + V5 LOGICAL PLAN: @@ -731,14 +731,36 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + . + TOK_TABLE_OR_COL + s1 + key + TOK_SELEXPR + . + TOK_TABLE_OR_COL + s1 + cnt + TOK_SELEXPR + . + TOK_TABLE_OR_COL + s2 + value + TOK_ORDERBY + TOK_TABSORTCOLNAMEASC + . + TOK_TABLE_OR_COL + s1 + key TOK_FROM TOK_JOIN TOK_SUBQUERY TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_DIR @@ -756,6 +778,10 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL key + TOK_FROM + TOK_TABREF + TOK_TABNAME + src s1 TOK_TABREF TOK_TABNAME @@ -770,32 +796,6 @@ TOK_QUERY TOK_TABLE_OR_COL s2 key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - . - TOK_TABLE_OR_COL - s1 - key - TOK_SELEXPR - . - TOK_TABLE_OR_COL - s1 - cnt - TOK_SELEXPR - . - TOK_TABLE_OR_COL - s2 - value - TOK_ORDERBY - TOK_TABSORTCOLNAMEASC - . - TOK_TABLE_OR_COL - s1 - key LOGICAL PLAN: diff --git ql/src/test/results/clientpositive/filter_join_breaktask.q.out ql/src/test/results/clientpositive/filter_join_breaktask.q.out index d46e30a..4adebb0 100644 --- ql/src/test/results/clientpositive/filter_join_breaktask.q.out +++ ql/src/test/results/clientpositive/filter_join_breaktask.q.out @@ -30,6 +30,21 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + . + TOK_TABLE_OR_COL + f + key + TOK_SELEXPR + . + TOK_TABLE_OR_COL + g + value TOK_FROM TOK_JOIN TOK_JOIN @@ -112,21 +127,6 @@ TOK_QUERY m value '' - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - . - TOK_TABLE_OR_COL - f - key - TOK_SELEXPR - . - TOK_TABLE_OR_COL - g - value STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/groupby_map_ppr.q.out ql/src/test/results/clientpositive/groupby_map_ppr.q.out index c7ca521..c40700f 100644 --- ql/src/test/results/clientpositive/groupby_map_ppr.q.out +++ ql/src/test/results/clientpositive/groupby_map_ppr.q.out @@ -26,39 +26,19 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM + TOK_FROM_BASE TOK_TABREF TOK_TABNAME srcpart src - TOK_INSERT - TOK_DESTINATION - TOK_TAB - TOK_TABNAME - dest1 - TOK_SELECT - TOK_SELEXPR - TOK_FUNCTION - substr - . - TOK_TABLE_OR_COL - src - key - 1 - 1 - TOK_SELEXPR - TOK_FUNCTIONDI - count - TOK_FUNCTION - substr - . - TOK_TABLE_OR_COL - src - value - 5 - TOK_SELEXPR - TOK_FUNCTION - concat + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_TAB + TOK_TABNAME + dest1 + TOK_SELECT + TOK_SELEXPR TOK_FUNCTION substr . @@ -67,8 +47,9 @@ TOK_QUERY key 1 1 - TOK_FUNCTION - sum + TOK_SELEXPR + TOK_FUNCTIONDI + count TOK_FUNCTION substr . @@ -76,22 +57,42 @@ TOK_QUERY src value 5 - TOK_WHERE - = - . - TOK_TABLE_OR_COL - src - ds - '2008-04-08' - TOK_GROUPBY - TOK_FUNCTION - substr - . - TOK_TABLE_OR_COL - src - key - 1 - 1 + TOK_SELEXPR + TOK_FUNCTION + concat + TOK_FUNCTION + substr + . + TOK_TABLE_OR_COL + src + key + 1 + 1 + TOK_FUNCTION + sum + TOK_FUNCTION + substr + . + TOK_TABLE_OR_COL + src + value + 5 + TOK_WHERE + = + . + TOK_TABLE_OR_COL + src + ds + '2008-04-08' + TOK_GROUPBY + TOK_FUNCTION + substr + . + TOK_TABLE_OR_COL + src + key + 1 + 1 STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/groupby_map_ppr_multi_distinct.q.out ql/src/test/results/clientpositive/groupby_map_ppr_multi_distinct.q.out index 00e2b6d..a129776 100644 --- ql/src/test/results/clientpositive/groupby_map_ppr_multi_distinct.q.out +++ ql/src/test/results/clientpositive/groupby_map_ppr_multi_distinct.q.out @@ -26,39 +26,19 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM + TOK_FROM_BASE TOK_TABREF TOK_TABNAME srcpart src - TOK_INSERT - TOK_DESTINATION - TOK_TAB - TOK_TABNAME - dest1 - TOK_SELECT - TOK_SELEXPR - TOK_FUNCTION - substr - . - TOK_TABLE_OR_COL - src - key - 1 - 1 - TOK_SELEXPR - TOK_FUNCTIONDI - count - TOK_FUNCTION - substr - . - TOK_TABLE_OR_COL - src - value - 5 - TOK_SELEXPR - TOK_FUNCTION - concat + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_TAB + TOK_TABNAME + dest1 + TOK_SELECT + TOK_SELEXPR TOK_FUNCTION substr . @@ -67,7 +47,38 @@ TOK_QUERY key 1 1 + TOK_SELEXPR + TOK_FUNCTIONDI + count + TOK_FUNCTION + substr + . + TOK_TABLE_OR_COL + src + value + 5 + TOK_SELEXPR TOK_FUNCTION + concat + TOK_FUNCTION + substr + . + TOK_TABLE_OR_COL + src + key + 1 + 1 + TOK_FUNCTION + sum + TOK_FUNCTION + substr + . + TOK_TABLE_OR_COL + src + value + 5 + TOK_SELEXPR + TOK_FUNCTIONDI sum TOK_FUNCTION substr @@ -76,39 +87,29 @@ TOK_QUERY src value 5 - TOK_SELEXPR - TOK_FUNCTIONDI - sum - TOK_FUNCTION - substr + TOK_SELEXPR + TOK_FUNCTIONDI + count . TOK_TABLE_OR_COL src value - 5 - TOK_SELEXPR - TOK_FUNCTIONDI - count + TOK_WHERE + = . TOK_TABLE_OR_COL src - value - TOK_WHERE - = - . - TOK_TABLE_OR_COL - src - ds - '2008-04-08' - TOK_GROUPBY - TOK_FUNCTION - substr - . - TOK_TABLE_OR_COL - src - key - 1 - 1 + ds + '2008-04-08' + TOK_GROUPBY + TOK_FUNCTION + substr + . + TOK_TABLE_OR_COL + src + key + 1 + 1 STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/groupby_ppr.q.out ql/src/test/results/clientpositive/groupby_ppr.q.out index 57e886d..19e9644 100644 --- ql/src/test/results/clientpositive/groupby_ppr.q.out +++ ql/src/test/results/clientpositive/groupby_ppr.q.out @@ -22,39 +22,19 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM + TOK_FROM_BASE TOK_TABREF TOK_TABNAME srcpart src - TOK_INSERT - TOK_DESTINATION - TOK_TAB - TOK_TABNAME - dest1 - TOK_SELECT - TOK_SELEXPR - TOK_FUNCTION - substr - . - TOK_TABLE_OR_COL - src - key - 1 - 1 - TOK_SELEXPR - TOK_FUNCTIONDI - count - TOK_FUNCTION - substr - . - TOK_TABLE_OR_COL - src - value - 5 - TOK_SELEXPR - TOK_FUNCTION - concat + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_TAB + TOK_TABNAME + dest1 + TOK_SELECT + TOK_SELEXPR TOK_FUNCTION substr . @@ -63,8 +43,9 @@ TOK_QUERY key 1 1 - TOK_FUNCTION - sum + TOK_SELEXPR + TOK_FUNCTIONDI + count TOK_FUNCTION substr . @@ -72,22 +53,42 @@ TOK_QUERY src value 5 - TOK_WHERE - = - . - TOK_TABLE_OR_COL - src - ds - '2008-04-08' - TOK_GROUPBY - TOK_FUNCTION - substr - . - TOK_TABLE_OR_COL - src - key - 1 - 1 + TOK_SELEXPR + TOK_FUNCTION + concat + TOK_FUNCTION + substr + . + TOK_TABLE_OR_COL + src + key + 1 + 1 + TOK_FUNCTION + sum + TOK_FUNCTION + substr + . + TOK_TABLE_OR_COL + src + value + 5 + TOK_WHERE + = + . + TOK_TABLE_OR_COL + src + ds + '2008-04-08' + TOK_GROUPBY + TOK_FUNCTION + substr + . + TOK_TABLE_OR_COL + src + key + 1 + 1 STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/groupby_ppr_multi_distinct.q.out ql/src/test/results/clientpositive/groupby_ppr_multi_distinct.q.out index f8073ff..5ac2e00 100644 --- ql/src/test/results/clientpositive/groupby_ppr_multi_distinct.q.out +++ ql/src/test/results/clientpositive/groupby_ppr_multi_distinct.q.out @@ -22,39 +22,19 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM + TOK_FROM_BASE TOK_TABREF TOK_TABNAME srcpart src - TOK_INSERT - TOK_DESTINATION - TOK_TAB - TOK_TABNAME - dest1 - TOK_SELECT - TOK_SELEXPR - TOK_FUNCTION - substr - . - TOK_TABLE_OR_COL - src - key - 1 - 1 - TOK_SELEXPR - TOK_FUNCTIONDI - count - TOK_FUNCTION - substr - . - TOK_TABLE_OR_COL - src - value - 5 - TOK_SELEXPR - TOK_FUNCTION - concat + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_TAB + TOK_TABNAME + dest1 + TOK_SELECT + TOK_SELEXPR TOK_FUNCTION substr . @@ -63,7 +43,38 @@ TOK_QUERY key 1 1 + TOK_SELEXPR + TOK_FUNCTIONDI + count + TOK_FUNCTION + substr + . + TOK_TABLE_OR_COL + src + value + 5 + TOK_SELEXPR TOK_FUNCTION + concat + TOK_FUNCTION + substr + . + TOK_TABLE_OR_COL + src + key + 1 + 1 + TOK_FUNCTION + sum + TOK_FUNCTION + substr + . + TOK_TABLE_OR_COL + src + value + 5 + TOK_SELEXPR + TOK_FUNCTIONDI sum TOK_FUNCTION substr @@ -72,39 +83,29 @@ TOK_QUERY src value 5 - TOK_SELEXPR - TOK_FUNCTIONDI - sum - TOK_FUNCTION - substr + TOK_SELEXPR + TOK_FUNCTIONDI + count . TOK_TABLE_OR_COL src value - 5 - TOK_SELEXPR - TOK_FUNCTIONDI - count + TOK_WHERE + = . TOK_TABLE_OR_COL src - value - TOK_WHERE - = - . - TOK_TABLE_OR_COL - src - ds - '2008-04-08' - TOK_GROUPBY - TOK_FUNCTION - substr - . - TOK_TABLE_OR_COL - src - key - 1 - 1 + ds + '2008-04-08' + TOK_GROUPBY + TOK_FUNCTION + substr + . + TOK_TABLE_OR_COL + src + key + 1 + 1 STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/groupby_sort_1_23.q.out ql/src/test/results/clientpositive/groupby_sort_1_23.q.out index 38a0678..bf97b5c 100644 --- ql/src/test/results/clientpositive/groupby_sort_1_23.q.out +++ ql/src/test/results/clientpositive/groupby_sort_1_23.q.out @@ -55,10 +55,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T1 TOK_INSERT TOK_DESTINATION TOK_TAB @@ -75,6 +71,10 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL key + TOK_FROM + TOK_TABREF + TOK_TABNAME + T1 STAGE DEPENDENCIES: @@ -413,10 +413,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T1 TOK_INSERT TOK_DESTINATION TOK_TAB @@ -438,6 +434,10 @@ TOK_QUERY key TOK_TABLE_OR_COL val + TOK_FROM + TOK_TABREF + TOK_TABNAME + T1 STAGE DEPENDENCIES: @@ -628,25 +628,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_SUBQUERY - TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T1 - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_TABLE_OR_COL - key - TOK_SELEXPR - TOK_TABLE_OR_COL - val - subq1 TOK_INSERT TOK_DESTINATION TOK_TAB @@ -663,6 +644,25 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL key + TOK_FROM + TOK_SUBQUERY + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_TABLE_OR_COL + key + TOK_SELEXPR + TOK_TABLE_OR_COL + val + TOK_FROM + TOK_TABREF + TOK_TABNAME + T1 + subq1 STAGE DEPENDENCIES: @@ -1034,13 +1034,25 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_TAB + TOK_TABNAME + outputTbl1 + TOK_SELECT + TOK_SELEXPR + TOK_TABLE_OR_COL + k + TOK_SELEXPR + TOK_FUNCTION + count + 1 + TOK_GROUPBY + TOK_TABLE_OR_COL + k TOK_FROM TOK_SUBQUERY TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1054,23 +1066,11 @@ TOK_QUERY TOK_TABLE_OR_COL val v + TOK_FROM + TOK_TABREF + TOK_TABNAME + T1 subq1 - TOK_INSERT - TOK_DESTINATION - TOK_TAB - TOK_TABNAME - outputTbl1 - TOK_SELECT - TOK_SELEXPR - TOK_TABLE_OR_COL - k - TOK_SELEXPR - TOK_FUNCTION - count - 1 - TOK_GROUPBY - TOK_TABLE_OR_COL - k STAGE DEPENDENCIES: @@ -1451,10 +1451,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T1 TOK_INSERT TOK_DESTINATION TOK_TAB @@ -1474,6 +1470,10 @@ TOK_QUERY 1 TOK_TABLE_OR_COL key + TOK_FROM + TOK_TABREF + TOK_TABNAME + T1 STAGE DEPENDENCIES: @@ -1813,10 +1813,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T1 TOK_INSERT TOK_DESTINATION TOK_TAB @@ -1841,6 +1837,10 @@ TOK_QUERY 1 TOK_TABLE_OR_COL val + TOK_FROM + TOK_TABREF + TOK_TABNAME + T1 STAGE DEPENDENCIES: @@ -2032,10 +2032,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T1 TOK_INSERT TOK_DESTINATION TOK_TAB @@ -2061,6 +2057,10 @@ TOK_QUERY TOK_TABLE_OR_COL key 1 + TOK_FROM + TOK_TABREF + TOK_TABNAME + T1 STAGE DEPENDENCIES: @@ -2270,30 +2270,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_SUBQUERY - TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T1 - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_TABLE_OR_COL - key - TOK_SELEXPR - TOK_FUNCTION - count - 1 - cnt - TOK_GROUPBY - TOK_TABLE_OR_COL - key - subq1 TOK_INSERT TOK_DESTINATION TOK_TAB @@ -2317,6 +2293,30 @@ TOK_QUERY key TOK_TABLE_OR_COL key + TOK_FROM + TOK_SUBQUERY + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_TABLE_OR_COL + key + TOK_SELEXPR + TOK_FUNCTION + count + 1 + cnt + TOK_GROUPBY + TOK_TABLE_OR_COL + key + TOK_FROM + TOK_TABREF + TOK_TABNAME + T1 + subq1 STAGE DEPENDENCIES: @@ -2537,14 +2537,18 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_TAB + TOK_TABNAME + outputTbl1 + TOK_SELECT + TOK_SELEXPR + TOK_ALLCOLREF TOK_FROM TOK_SUBQUERY TOK_UNION TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -2560,11 +2564,11 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL key - TOK_QUERY TOK_FROM TOK_TABREF TOK_TABNAME T1 + TOK_QUERY TOK_INSERT TOK_DESTINATION TOK_DIR @@ -2580,15 +2584,11 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL key + TOK_FROM + TOK_TABREF + TOK_TABNAME + T1 subq1 - TOK_INSERT - TOK_DESTINATION - TOK_TAB - TOK_TABNAME - outputTbl1 - TOK_SELECT - TOK_SELEXPR - TOK_ALLCOLREF STAGE DEPENDENCIES: @@ -3042,14 +3042,18 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_TAB + TOK_TABNAME + outputTbl1 + TOK_SELECT + TOK_SELEXPR + TOK_ALLCOLREF TOK_FROM TOK_SUBQUERY TOK_UNION TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -3065,11 +3069,11 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL key - TOK_QUERY TOK_FROM TOK_TABREF TOK_TABNAME T1 + TOK_QUERY TOK_INSERT TOK_DESTINATION TOK_DIR @@ -3092,15 +3096,11 @@ TOK_QUERY key TOK_TABLE_OR_COL key + TOK_FROM + TOK_TABREF + TOK_TABNAME + T1 subq1 - TOK_INSERT - TOK_DESTINATION - TOK_TAB - TOK_TABNAME - outputTbl1 - TOK_SELECT - TOK_SELEXPR - TOK_ALLCOLREF STAGE DEPENDENCIES: @@ -3667,14 +3667,31 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_TAB + TOK_TABNAME + outputTbl1 + TOK_SELECT + TOK_SELEXPR + . + TOK_TABLE_OR_COL + subq1 + key + TOK_SELEXPR + + + . + TOK_TABLE_OR_COL + subq1 + cnt + . + TOK_TABLE_OR_COL + subq2 + cnt TOK_FROM TOK_JOIN TOK_SUBQUERY TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -3691,13 +3708,13 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL key - subq1 - TOK_SUBQUERY - TOK_QUERY TOK_FROM TOK_TABREF TOK_TABNAME T1 + subq1 + TOK_SUBQUERY + TOK_QUERY TOK_INSERT TOK_DESTINATION TOK_DIR @@ -3714,6 +3731,10 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL key + TOK_FROM + TOK_TABREF + TOK_TABNAME + T1 subq2 = . @@ -3724,27 +3745,6 @@ TOK_QUERY TOK_TABLE_OR_COL subq2 key - TOK_INSERT - TOK_DESTINATION - TOK_TAB - TOK_TABNAME - outputTbl1 - TOK_SELECT - TOK_SELEXPR - . - TOK_TABLE_OR_COL - subq1 - key - TOK_SELEXPR - + - . - TOK_TABLE_OR_COL - subq1 - cnt - . - TOK_TABLE_OR_COL - subq2 - cnt STAGE DEPENDENCIES: @@ -3996,14 +3996,17 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_ALLCOLREF TOK_FROM TOK_JOIN TOK_SUBQUERY TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -4019,13 +4022,13 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL key - subq1 - TOK_SUBQUERY - TOK_QUERY TOK_FROM TOK_TABREF TOK_TABNAME T1 + subq1 + TOK_SUBQUERY + TOK_QUERY TOK_INSERT TOK_DESTINATION TOK_DIR @@ -4046,6 +4049,10 @@ TOK_QUERY key TOK_TABLE_OR_COL val + TOK_FROM + TOK_TABREF + TOK_TABNAME + T1 subq2 = . @@ -4056,13 +4063,6 @@ TOK_QUERY TOK_TABLE_OR_COL subq2 key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_ALLCOLREF STAGE DEPENDENCIES: @@ -4373,10 +4373,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T2 TOK_INSERT TOK_DESTINATION TOK_TAB @@ -4393,6 +4389,10 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL key + TOK_FROM + TOK_TABREF + TOK_TABNAME + T2 STAGE DEPENDENCIES: @@ -4594,10 +4594,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T2 TOK_INSERT TOK_DESTINATION TOK_TAB @@ -4622,6 +4618,10 @@ TOK_QUERY 1 TOK_TABLE_OR_COL val + TOK_FROM + TOK_TABREF + TOK_TABNAME + T2 STAGE DEPENDENCIES: @@ -5005,10 +5005,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T2 TOK_INSERT TOK_DESTINATION TOK_TAB @@ -5036,6 +5032,10 @@ TOK_QUERY TOK_TABLE_OR_COL val 2 + TOK_FROM + TOK_TABREF + TOK_TABNAME + T2 STAGE DEPENDENCIES: @@ -5377,28 +5377,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_SUBQUERY - TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T2 - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_TABLE_OR_COL - key - TOK_SELEXPR - 1 - constant - TOK_SELEXPR - TOK_TABLE_OR_COL - val - subq TOK_INSERT TOK_DESTINATION TOK_TAB @@ -5425,6 +5403,28 @@ TOK_QUERY constant TOK_TABLE_OR_COL val + TOK_FROM + TOK_SUBQUERY + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_TABLE_OR_COL + key + TOK_SELEXPR + 1 + constant + TOK_SELEXPR + TOK_TABLE_OR_COL + val + TOK_FROM + TOK_TABREF + TOK_TABNAME + T2 + subq STAGE DEPENDENCIES: @@ -5813,50 +5813,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_SUBQUERY - TOK_QUERY - TOK_FROM - TOK_SUBQUERY - TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T2 - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_TABLE_OR_COL - key - TOK_SELEXPR - 1 - constant - TOK_SELEXPR - TOK_TABLE_OR_COL - val - subq - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_TABLE_OR_COL - key - TOK_SELEXPR - TOK_TABLE_OR_COL - constant - constant2 - TOK_SELEXPR - TOK_TABLE_OR_COL - val - TOK_SELEXPR - 2 - constant3 - subq2 TOK_INSERT TOK_DESTINATION TOK_TAB @@ -5883,6 +5839,50 @@ TOK_QUERY constant3 TOK_TABLE_OR_COL val + TOK_FROM + TOK_SUBQUERY + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_TABLE_OR_COL + key + TOK_SELEXPR + TOK_TABLE_OR_COL + constant + constant2 + TOK_SELEXPR + TOK_TABLE_OR_COL + val + TOK_SELEXPR + 2 + constant3 + TOK_FROM + TOK_SUBQUERY + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_TABLE_OR_COL + key + TOK_SELEXPR + 1 + constant + TOK_SELEXPR + TOK_TABLE_OR_COL + val + TOK_FROM + TOK_TABREF + TOK_TABNAME + T2 + subq + subq2 STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/groupby_sort_6.q.out ql/src/test/results/clientpositive/groupby_sort_6.q.out index ca5ad8f..ac147d2 100644 --- ql/src/test/results/clientpositive/groupby_sort_6.q.out +++ ql/src/test/results/clientpositive/groupby_sort_6.q.out @@ -29,10 +29,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T1 TOK_INSERT TOK_DESTINATION TOK_TAB @@ -54,6 +50,10 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL key + TOK_FROM + TOK_TABREF + TOK_TABNAME + T1 STAGE DEPENDENCIES: @@ -171,10 +171,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T1 TOK_INSERT TOK_DESTINATION TOK_TAB @@ -196,6 +192,10 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL key + TOK_FROM + TOK_TABREF + TOK_TABNAME + T1 STAGE DEPENDENCIES: @@ -316,10 +316,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T1 TOK_INSERT TOK_DESTINATION TOK_TAB @@ -341,6 +337,10 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL key + TOK_FROM + TOK_TABREF + TOK_TABNAME + T1 STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out index ac54e7d..ed55bff 100644 --- ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out +++ ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out @@ -55,10 +55,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T1 TOK_INSERT TOK_DESTINATION TOK_TAB @@ -75,6 +71,10 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL key + TOK_FROM + TOK_TABREF + TOK_TABNAME + T1 STAGE DEPENDENCIES: @@ -413,10 +413,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T1 TOK_INSERT TOK_DESTINATION TOK_TAB @@ -438,6 +434,10 @@ TOK_QUERY key TOK_TABLE_OR_COL val + TOK_FROM + TOK_TABREF + TOK_TABNAME + T1 STAGE DEPENDENCIES: @@ -692,25 +692,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_SUBQUERY - TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T1 - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_TABLE_OR_COL - key - TOK_SELEXPR - TOK_TABLE_OR_COL - val - subq1 TOK_INSERT TOK_DESTINATION TOK_TAB @@ -727,6 +708,25 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL key + TOK_FROM + TOK_SUBQUERY + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_TABLE_OR_COL + key + TOK_SELEXPR + TOK_TABLE_OR_COL + val + TOK_FROM + TOK_TABREF + TOK_TABNAME + T1 + subq1 STAGE DEPENDENCIES: @@ -1098,13 +1098,25 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_TAB + TOK_TABNAME + outputTbl1 + TOK_SELECT + TOK_SELEXPR + TOK_TABLE_OR_COL + k + TOK_SELEXPR + TOK_FUNCTION + count + 1 + TOK_GROUPBY + TOK_TABLE_OR_COL + k TOK_FROM TOK_SUBQUERY TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1118,23 +1130,11 @@ TOK_QUERY TOK_TABLE_OR_COL val v + TOK_FROM + TOK_TABREF + TOK_TABNAME + T1 subq1 - TOK_INSERT - TOK_DESTINATION - TOK_TAB - TOK_TABNAME - outputTbl1 - TOK_SELECT - TOK_SELEXPR - TOK_TABLE_OR_COL - k - TOK_SELEXPR - TOK_FUNCTION - count - 1 - TOK_GROUPBY - TOK_TABLE_OR_COL - k STAGE DEPENDENCIES: @@ -1515,10 +1515,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T1 TOK_INSERT TOK_DESTINATION TOK_TAB @@ -1538,6 +1534,10 @@ TOK_QUERY 1 TOK_TABLE_OR_COL key + TOK_FROM + TOK_TABREF + TOK_TABNAME + T1 STAGE DEPENDENCIES: @@ -1877,10 +1877,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T1 TOK_INSERT TOK_DESTINATION TOK_TAB @@ -1905,6 +1901,10 @@ TOK_QUERY 1 TOK_TABLE_OR_COL val + TOK_FROM + TOK_TABREF + TOK_TABNAME + T1 STAGE DEPENDENCIES: @@ -2160,10 +2160,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T1 TOK_INSERT TOK_DESTINATION TOK_TAB @@ -2189,6 +2185,10 @@ TOK_QUERY TOK_TABLE_OR_COL key 1 + TOK_FROM + TOK_TABREF + TOK_TABNAME + T1 STAGE DEPENDENCIES: @@ -2462,30 +2462,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_SUBQUERY - TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T1 - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_TABLE_OR_COL - key - TOK_SELEXPR - TOK_FUNCTION - count - 1 - cnt - TOK_GROUPBY - TOK_TABLE_OR_COL - key - subq1 TOK_INSERT TOK_DESTINATION TOK_TAB @@ -2509,6 +2485,30 @@ TOK_QUERY key TOK_TABLE_OR_COL key + TOK_FROM + TOK_SUBQUERY + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_TABLE_OR_COL + key + TOK_SELEXPR + TOK_FUNCTION + count + 1 + cnt + TOK_GROUPBY + TOK_TABLE_OR_COL + key + TOK_FROM + TOK_TABREF + TOK_TABNAME + T1 + subq1 STAGE DEPENDENCIES: @@ -2793,14 +2793,18 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_TAB + TOK_TABNAME + outputTbl1 + TOK_SELECT + TOK_SELEXPR + TOK_ALLCOLREF TOK_FROM TOK_SUBQUERY TOK_UNION TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -2816,11 +2820,11 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL key - TOK_QUERY TOK_FROM TOK_TABREF TOK_TABNAME T1 + TOK_QUERY TOK_INSERT TOK_DESTINATION TOK_DIR @@ -2836,15 +2840,11 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL key + TOK_FROM + TOK_TABREF + TOK_TABNAME + T1 subq1 - TOK_INSERT - TOK_DESTINATION - TOK_TAB - TOK_TABNAME - outputTbl1 - TOK_SELECT - TOK_SELEXPR - TOK_ALLCOLREF STAGE DEPENDENCIES: @@ -3298,14 +3298,18 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_TAB + TOK_TABNAME + outputTbl1 + TOK_SELECT + TOK_SELEXPR + TOK_ALLCOLREF TOK_FROM TOK_SUBQUERY TOK_UNION TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -3321,11 +3325,11 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL key - TOK_QUERY TOK_FROM TOK_TABREF TOK_TABNAME T1 + TOK_QUERY TOK_INSERT TOK_DESTINATION TOK_DIR @@ -3348,15 +3352,11 @@ TOK_QUERY key TOK_TABLE_OR_COL key + TOK_FROM + TOK_TABREF + TOK_TABNAME + T1 subq1 - TOK_INSERT - TOK_DESTINATION - TOK_TAB - TOK_TABNAME - outputTbl1 - TOK_SELECT - TOK_SELEXPR - TOK_ALLCOLREF STAGE DEPENDENCIES: @@ -3987,14 +3987,31 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_TAB + TOK_TABNAME + outputTbl1 + TOK_SELECT + TOK_SELEXPR + . + TOK_TABLE_OR_COL + subq1 + key + TOK_SELEXPR + + + . + TOK_TABLE_OR_COL + subq1 + cnt + . + TOK_TABLE_OR_COL + subq2 + cnt TOK_FROM TOK_JOIN TOK_SUBQUERY TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -4011,13 +4028,13 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL key - subq1 - TOK_SUBQUERY - TOK_QUERY TOK_FROM TOK_TABREF TOK_TABNAME T1 + subq1 + TOK_SUBQUERY + TOK_QUERY TOK_INSERT TOK_DESTINATION TOK_DIR @@ -4034,6 +4051,10 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL key + TOK_FROM + TOK_TABREF + TOK_TABNAME + T1 subq2 = . @@ -4044,27 +4065,6 @@ TOK_QUERY TOK_TABLE_OR_COL subq2 key - TOK_INSERT - TOK_DESTINATION - TOK_TAB - TOK_TABNAME - outputTbl1 - TOK_SELECT - TOK_SELEXPR - . - TOK_TABLE_OR_COL - subq1 - key - TOK_SELEXPR - + - . - TOK_TABLE_OR_COL - subq1 - cnt - . - TOK_TABLE_OR_COL - subq2 - cnt STAGE DEPENDENCIES: @@ -4316,14 +4316,17 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_ALLCOLREF TOK_FROM TOK_JOIN TOK_SUBQUERY TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -4339,13 +4342,13 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL key - subq1 - TOK_SUBQUERY - TOK_QUERY TOK_FROM TOK_TABREF TOK_TABNAME T1 + subq1 + TOK_SUBQUERY + TOK_QUERY TOK_INSERT TOK_DESTINATION TOK_DIR @@ -4366,6 +4369,10 @@ TOK_QUERY key TOK_TABLE_OR_COL val + TOK_FROM + TOK_TABREF + TOK_TABNAME + T1 subq2 = . @@ -4376,13 +4383,6 @@ TOK_QUERY TOK_TABLE_OR_COL subq2 key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_ALLCOLREF STAGE DEPENDENCIES: @@ -4757,10 +4757,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T2 TOK_INSERT TOK_DESTINATION TOK_TAB @@ -4777,6 +4773,10 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL key + TOK_FROM + TOK_TABREF + TOK_TABNAME + T2 STAGE DEPENDENCIES: @@ -5042,10 +5042,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T2 TOK_INSERT TOK_DESTINATION TOK_TAB @@ -5070,6 +5066,10 @@ TOK_QUERY 1 TOK_TABLE_OR_COL val + TOK_FROM + TOK_TABREF + TOK_TABNAME + T2 STAGE DEPENDENCIES: @@ -5453,10 +5453,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T2 TOK_INSERT TOK_DESTINATION TOK_TAB @@ -5484,6 +5480,10 @@ TOK_QUERY TOK_TABLE_OR_COL val 2 + TOK_FROM + TOK_TABREF + TOK_TABNAME + T2 STAGE DEPENDENCIES: @@ -5825,28 +5825,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_SUBQUERY - TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T2 - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_TABLE_OR_COL - key - TOK_SELEXPR - 1 - constant - TOK_SELEXPR - TOK_TABLE_OR_COL - val - subq TOK_INSERT TOK_DESTINATION TOK_TAB @@ -5873,6 +5851,28 @@ TOK_QUERY constant TOK_TABLE_OR_COL val + TOK_FROM + TOK_SUBQUERY + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_TABLE_OR_COL + key + TOK_SELEXPR + 1 + constant + TOK_SELEXPR + TOK_TABLE_OR_COL + val + TOK_FROM + TOK_TABREF + TOK_TABNAME + T2 + subq STAGE DEPENDENCIES: @@ -6261,50 +6261,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_SUBQUERY - TOK_QUERY - TOK_FROM - TOK_SUBQUERY - TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T2 - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_TABLE_OR_COL - key - TOK_SELEXPR - 1 - constant - TOK_SELEXPR - TOK_TABLE_OR_COL - val - subq - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_TABLE_OR_COL - key - TOK_SELEXPR - TOK_TABLE_OR_COL - constant - constant2 - TOK_SELEXPR - TOK_TABLE_OR_COL - val - TOK_SELEXPR - 2 - constant3 - subq2 TOK_INSERT TOK_DESTINATION TOK_TAB @@ -6331,6 +6287,50 @@ TOK_QUERY constant3 TOK_TABLE_OR_COL val + TOK_FROM + TOK_SUBQUERY + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_TABLE_OR_COL + key + TOK_SELEXPR + TOK_TABLE_OR_COL + constant + constant2 + TOK_SELEXPR + TOK_TABLE_OR_COL + val + TOK_SELEXPR + 2 + constant3 + TOK_FROM + TOK_SUBQUERY + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_TABLE_OR_COL + key + TOK_SELEXPR + 1 + constant + TOK_SELEXPR + TOK_TABLE_OR_COL + val + TOK_FROM + TOK_TABREF + TOK_TABNAME + T2 + subq + subq2 STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/input23.q.out ql/src/test/results/clientpositive/input23.q.out index 1891aae..fae38a5 100644 --- ql/src/test/results/clientpositive/input23.q.out +++ ql/src/test/results/clientpositive/input23.q.out @@ -8,16 +8,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_JOIN - TOK_TABREF - TOK_TABNAME - srcpart - a - TOK_TABREF - TOK_TABNAME - srcpart - b TOK_INSERT TOK_DESTINATION TOK_DIR @@ -55,6 +45,16 @@ TOK_QUERY '14' TOK_LIMIT 5 + TOK_FROM + TOK_JOIN + TOK_TABREF + TOK_TABNAME + srcpart + a + TOK_TABREF + TOK_TABNAME + srcpart + b STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/input42.q.out ql/src/test/results/clientpositive/input42.q.out index 8f52610..1e9455e 100644 --- ql/src/test/results/clientpositive/input42.q.out +++ ql/src/test/results/clientpositive/input42.q.out @@ -11,11 +11,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcpart - a TOK_INSERT TOK_DESTINATION TOK_DIR @@ -30,6 +25,11 @@ TOK_QUERY a ds '2008-04-08' + TOK_FROM + TOK_TABREF + TOK_TABNAME + srcpart + a STAGE DEPENDENCIES: @@ -1160,11 +1160,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcpart - a TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1184,6 +1179,11 @@ TOK_QUERY TOK_TABLE_OR_COL key 200 + TOK_FROM + TOK_TABREF + TOK_TABNAME + srcpart + a STAGE DEPENDENCIES: @@ -1731,11 +1731,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcpart - a TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1756,6 +1751,11 @@ TOK_QUERY rand 100 0.1 + TOK_FROM + TOK_TABREF + TOK_TABNAME + srcpart + a STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/input_part1.q.out ql/src/test/results/clientpositive/input_part1.q.out index 22191f1..9157d20 100644 --- ql/src/test/results/clientpositive/input_part1.q.out +++ ql/src/test/results/clientpositive/input_part1.q.out @@ -16,57 +16,58 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM + TOK_FROM_BASE TOK_TABREF TOK_TABNAME srcpart - TOK_INSERT - TOK_DESTINATION - TOK_TAB - TOK_TABNAME - dest1 - TOK_SELECT - TOK_SELEXPR - . - TOK_TABLE_OR_COL - srcpart - key - TOK_SELEXPR - . - TOK_TABLE_OR_COL - srcpart - value - TOK_SELEXPR - . - TOK_TABLE_OR_COL - srcpart - hr - TOK_SELEXPR - . - TOK_TABLE_OR_COL - srcpart - ds - TOK_WHERE - and + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_TAB + TOK_TABNAME + dest1 + TOK_SELECT + TOK_SELEXPR + . + TOK_TABLE_OR_COL + srcpart + key + TOK_SELEXPR + . + TOK_TABLE_OR_COL + srcpart + value + TOK_SELEXPR + . + TOK_TABLE_OR_COL + srcpart + hr + TOK_SELEXPR + . + TOK_TABLE_OR_COL + srcpart + ds + TOK_WHERE and - < - . - TOK_TABLE_OR_COL - srcpart - key - 100 + and + < + . + TOK_TABLE_OR_COL + srcpart + key + 100 + = + . + TOK_TABLE_OR_COL + srcpart + ds + '2008-04-08' = . TOK_TABLE_OR_COL srcpart - ds - '2008-04-08' - = - . - TOK_TABLE_OR_COL - srcpart - hr - '12' + hr + '12' STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/input_part2.q.out ql/src/test/results/clientpositive/input_part2.q.out index 9987769..275914c 100644 --- ql/src/test/results/clientpositive/input_part2.q.out +++ ql/src/test/results/clientpositive/input_part2.q.out @@ -25,104 +25,106 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM + TOK_FROM_BASE TOK_TABREF TOK_TABNAME srcpart - TOK_INSERT - TOK_DESTINATION - TOK_TAB - TOK_TABNAME - dest1 - TOK_SELECT - TOK_SELEXPR - . - TOK_TABLE_OR_COL - srcpart - key - TOK_SELEXPR - . - TOK_TABLE_OR_COL - srcpart - value - TOK_SELEXPR - . - TOK_TABLE_OR_COL - srcpart - hr - TOK_SELEXPR - . - TOK_TABLE_OR_COL - srcpart - ds - TOK_WHERE - and + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_TAB + TOK_TABNAME + dest1 + TOK_SELECT + TOK_SELEXPR + . + TOK_TABLE_OR_COL + srcpart + key + TOK_SELEXPR + . + TOK_TABLE_OR_COL + srcpart + value + TOK_SELEXPR + . + TOK_TABLE_OR_COL + srcpart + hr + TOK_SELEXPR + . + TOK_TABLE_OR_COL + srcpart + ds + TOK_WHERE and - < - . - TOK_TABLE_OR_COL - srcpart - key - 100 + and + < + . + TOK_TABLE_OR_COL + srcpart + key + 100 + = + . + TOK_TABLE_OR_COL + srcpart + ds + '2008-04-08' = . TOK_TABLE_OR_COL srcpart - ds - '2008-04-08' - = + hr + '12' + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_TAB + TOK_TABNAME + dest2 + TOK_SELECT + TOK_SELEXPR + . + TOK_TABLE_OR_COL + srcpart + key + TOK_SELEXPR + . + TOK_TABLE_OR_COL + srcpart + value + TOK_SELEXPR . TOK_TABLE_OR_COL srcpart hr - '12' - TOK_INSERT - TOK_DESTINATION - TOK_TAB - TOK_TABNAME - dest2 - TOK_SELECT - TOK_SELEXPR - . - TOK_TABLE_OR_COL - srcpart - key - TOK_SELEXPR - . - TOK_TABLE_OR_COL - srcpart - value - TOK_SELEXPR - . - TOK_TABLE_OR_COL - srcpart - hr - TOK_SELEXPR - . - TOK_TABLE_OR_COL - srcpart - ds - TOK_WHERE - and + TOK_SELEXPR + . + TOK_TABLE_OR_COL + srcpart + ds + TOK_WHERE and - < - . - TOK_TABLE_OR_COL - srcpart - key - 100 + and + < + . + TOK_TABLE_OR_COL + srcpart + key + 100 + = + . + TOK_TABLE_OR_COL + srcpart + ds + '2008-04-09' = . TOK_TABLE_OR_COL srcpart - ds - '2008-04-09' - = - . - TOK_TABLE_OR_COL - srcpart - hr - '12' + hr + '12' STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/input_part7.q.out ql/src/test/results/clientpositive/input_part7.q.out index 19985d6..d25c824 100644 --- ql/src/test/results/clientpositive/input_part7.q.out +++ ql/src/test/results/clientpositive/input_part7.q.out @@ -17,15 +17,38 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_ALLCOLREF + TOK_SORTBY + TOK_TABSORTCOLNAMEASC + . + TOK_TABLE_OR_COL + A + key + TOK_TABSORTCOLNAMEASC + . + TOK_TABLE_OR_COL + A + value + TOK_TABSORTCOLNAMEASC + . + TOK_TABLE_OR_COL + A + ds + TOK_TABSORTCOLNAMEASC + . + TOK_TABLE_OR_COL + A + hr TOK_FROM TOK_SUBQUERY TOK_UNION TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - SRCPART - X TOK_INSERT TOK_DESTINATION TOK_DIR @@ -49,12 +72,12 @@ TOK_QUERY X key 100 - TOK_QUERY TOK_FROM TOK_TABREF TOK_TABNAME SRCPART - Y + X + TOK_QUERY TOK_INSERT TOK_DESTINATION TOK_DIR @@ -78,35 +101,12 @@ TOK_QUERY Y key 100 + TOK_FROM + TOK_TABREF + TOK_TABNAME + SRCPART + Y A - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_ALLCOLREF - TOK_SORTBY - TOK_TABSORTCOLNAMEASC - . - TOK_TABLE_OR_COL - A - key - TOK_TABSORTCOLNAMEASC - . - TOK_TABLE_OR_COL - A - value - TOK_TABSORTCOLNAMEASC - . - TOK_TABLE_OR_COL - A - ds - TOK_TABSORTCOLNAMEASC - . - TOK_TABLE_OR_COL - A - hr STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/input_part9.q.out ql/src/test/results/clientpositive/input_part9.q.out index 7ef66b0..92725f1 100644 --- ql/src/test/results/clientpositive/input_part9.q.out +++ ql/src/test/results/clientpositive/input_part9.q.out @@ -11,11 +11,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - SRCPART - x TOK_INSERT TOK_DESTINATION TOK_DIR @@ -35,6 +30,11 @@ TOK_QUERY TOK_TABLE_OR_COL ds '2008-04-08' + TOK_FROM + TOK_TABREF + TOK_TABNAME + SRCPART + x STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/join17.q.out ql/src/test/results/clientpositive/join17.q.out index 76741bb..54f972a 100644 --- ql/src/test/results/clientpositive/join17.q.out +++ ql/src/test/results/clientpositive/join17.q.out @@ -16,7 +16,7 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM + TOK_FROM_BASE TOK_JOIN TOK_TABREF TOK_TABNAME @@ -35,20 +35,21 @@ TOK_QUERY TOK_TABLE_OR_COL src2 key - TOK_INSERT - TOK_DESTINATION - TOK_TAB - TOK_TABNAME - dest1 - TOK_SELECT - TOK_SELEXPR - TOK_ALLCOLREF - TOK_TABNAME - src1 - TOK_SELEXPR - TOK_ALLCOLREF + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_TAB TOK_TABNAME - src2 + dest1 + TOK_SELECT + TOK_SELEXPR + TOK_ALLCOLREF + TOK_TABNAME + src1 + TOK_SELEXPR + TOK_ALLCOLREF + TOK_TABNAME + src2 STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/join26.q.out ql/src/test/results/clientpositive/join26.q.out index bf8cf57..92aa7d4 100644 --- ql/src/test/results/clientpositive/join26.q.out +++ ql/src/test/results/clientpositive/join26.q.out @@ -24,6 +24,33 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_TAB + TOK_TABNAME + dest_j1 + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + x + y + TOK_SELEXPR + . + TOK_TABLE_OR_COL + x + key + TOK_SELEXPR + . + TOK_TABLE_OR_COL + z + value + TOK_SELEXPR + . + TOK_TABLE_OR_COL + y + value TOK_FROM TOK_JOIN TOK_JOIN @@ -71,33 +98,6 @@ TOK_QUERY z hr 11 - TOK_INSERT - TOK_DESTINATION - TOK_TAB - TOK_TABNAME - dest_j1 - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - x - y - TOK_SELEXPR - . - TOK_TABLE_OR_COL - x - key - TOK_SELEXPR - . - TOK_TABLE_OR_COL - z - value - TOK_SELEXPR - . - TOK_TABLE_OR_COL - y - value STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/join32.q.out ql/src/test/results/clientpositive/join32.q.out index ff0d7cc..7018445 100644 --- ql/src/test/results/clientpositive/join32.q.out +++ ql/src/test/results/clientpositive/join32.q.out @@ -28,6 +28,27 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_TAB + TOK_TABNAME + dest_j1 + TOK_SELECT + TOK_SELEXPR + . + TOK_TABLE_OR_COL + x + key + TOK_SELEXPR + . + TOK_TABLE_OR_COL + z + value + TOK_SELEXPR + . + TOK_TABLE_OR_COL + y + value TOK_FROM TOK_JOIN TOK_JOIN @@ -75,27 +96,6 @@ TOK_QUERY z hr 11 - TOK_INSERT - TOK_DESTINATION - TOK_TAB - TOK_TABNAME - dest_j1 - TOK_SELECT - TOK_SELEXPR - . - TOK_TABLE_OR_COL - x - key - TOK_SELEXPR - . - TOK_TABLE_OR_COL - z - value - TOK_SELEXPR - . - TOK_TABLE_OR_COL - y - value STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/join32_lessSize.q.out ql/src/test/results/clientpositive/join32_lessSize.q.out index 04ed6b2..4612fc7 100644 --- ql/src/test/results/clientpositive/join32_lessSize.q.out +++ ql/src/test/results/clientpositive/join32_lessSize.q.out @@ -35,6 +35,27 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_TAB + TOK_TABNAME + dest_j1 + TOK_SELECT + TOK_SELEXPR + . + TOK_TABLE_OR_COL + x + key + TOK_SELEXPR + . + TOK_TABLE_OR_COL + z + value + TOK_SELEXPR + . + TOK_TABLE_OR_COL + y + value TOK_FROM TOK_JOIN TOK_JOIN @@ -82,27 +103,6 @@ TOK_QUERY z hr 11 - TOK_INSERT - TOK_DESTINATION - TOK_TAB - TOK_TABNAME - dest_j1 - TOK_SELECT - TOK_SELEXPR - . - TOK_TABLE_OR_COL - x - key - TOK_SELEXPR - . - TOK_TABLE_OR_COL - z - value - TOK_SELEXPR - . - TOK_TABLE_OR_COL - y - value STAGE DEPENDENCIES: @@ -626,6 +626,27 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_TAB + TOK_TABNAME + dest_j1 + TOK_SELECT + TOK_SELEXPR + . + TOK_TABLE_OR_COL + x + key + TOK_SELEXPR + . + TOK_TABLE_OR_COL + z + value + TOK_SELEXPR + . + TOK_TABLE_OR_COL + y + value TOK_FROM TOK_JOIN TOK_JOIN @@ -673,27 +694,6 @@ TOK_QUERY TOK_TABLE_OR_COL z key - TOK_INSERT - TOK_DESTINATION - TOK_TAB - TOK_TABNAME - dest_j1 - TOK_SELECT - TOK_SELEXPR - . - TOK_TABLE_OR_COL - x - key - TOK_SELEXPR - . - TOK_TABLE_OR_COL - z - value - TOK_SELEXPR - . - TOK_TABLE_OR_COL - y - value STAGE DEPENDENCIES: @@ -1878,10 +1878,46 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_TAB + TOK_TABNAME + dest_j2 + TOK_SELECT + TOK_SELEXPR + . + TOK_TABLE_OR_COL + res + key + TOK_SELEXPR + . + TOK_TABLE_OR_COL + z + value + TOK_SELEXPR + . + TOK_TABLE_OR_COL + res + value TOK_FROM TOK_JOIN TOK_SUBQUERY TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + . + TOK_TABLE_OR_COL + x + key + TOK_SELEXPR + . + TOK_TABLE_OR_COL + x + value TOK_FROM TOK_JOIN TOK_TABREF @@ -1901,21 +1937,6 @@ TOK_QUERY TOK_TABLE_OR_COL y key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - . - TOK_TABLE_OR_COL - x - key - TOK_SELEXPR - . - TOK_TABLE_OR_COL - x - value res TOK_TABREF TOK_TABNAME @@ -1944,27 +1965,6 @@ TOK_QUERY z hr 11 - TOK_INSERT - TOK_DESTINATION - TOK_TAB - TOK_TABNAME - dest_j2 - TOK_SELECT - TOK_SELEXPR - . - TOK_TABLE_OR_COL - res - key - TOK_SELEXPR - . - TOK_TABLE_OR_COL - z - value - TOK_SELEXPR - . - TOK_TABLE_OR_COL - res - value STAGE DEPENDENCIES: @@ -2490,10 +2490,46 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_TAB + TOK_TABNAME + dest_j2 + TOK_SELECT + TOK_SELEXPR + . + TOK_TABLE_OR_COL + res + key + TOK_SELEXPR + . + TOK_TABLE_OR_COL + z + value + TOK_SELEXPR + . + TOK_TABLE_OR_COL + res + value TOK_FROM TOK_JOIN TOK_SUBQUERY TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + . + TOK_TABLE_OR_COL + x + key + TOK_SELEXPR + . + TOK_TABLE_OR_COL + x + value TOK_FROM TOK_LEFTOUTERJOIN TOK_TABREF @@ -2513,21 +2549,6 @@ TOK_QUERY TOK_TABLE_OR_COL y key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - . - TOK_TABLE_OR_COL - x - key - TOK_SELEXPR - . - TOK_TABLE_OR_COL - x - value res TOK_TABREF TOK_TABNAME @@ -2556,27 +2577,6 @@ TOK_QUERY z hr 11 - TOK_INSERT - TOK_DESTINATION - TOK_TAB - TOK_TABNAME - dest_j2 - TOK_SELECT - TOK_SELEXPR - . - TOK_TABLE_OR_COL - res - key - TOK_SELEXPR - . - TOK_TABLE_OR_COL - z - value - TOK_SELEXPR - . - TOK_TABLE_OR_COL - res - value STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/join33.q.out ql/src/test/results/clientpositive/join33.q.out index ff0d7cc..7018445 100644 --- ql/src/test/results/clientpositive/join33.q.out +++ ql/src/test/results/clientpositive/join33.q.out @@ -28,6 +28,27 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_TAB + TOK_TABNAME + dest_j1 + TOK_SELECT + TOK_SELEXPR + . + TOK_TABLE_OR_COL + x + key + TOK_SELEXPR + . + TOK_TABLE_OR_COL + z + value + TOK_SELEXPR + . + TOK_TABLE_OR_COL + y + value TOK_FROM TOK_JOIN TOK_JOIN @@ -75,27 +96,6 @@ TOK_QUERY z hr 11 - TOK_INSERT - TOK_DESTINATION - TOK_TAB - TOK_TABNAME - dest_j1 - TOK_SELECT - TOK_SELEXPR - . - TOK_TABLE_OR_COL - x - key - TOK_SELEXPR - . - TOK_TABLE_OR_COL - z - value - TOK_SELEXPR - . - TOK_TABLE_OR_COL - y - value STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/join34.q.out ql/src/test/results/clientpositive/join34.q.out index b52777a..d19ae75 100644 --- ql/src/test/results/clientpositive/join34.q.out +++ ql/src/test/results/clientpositive/join34.q.out @@ -36,16 +36,32 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_TAB + TOK_TABNAME + dest_j1 + TOK_SELECT + TOK_SELEXPR + . + TOK_TABLE_OR_COL + x + key + TOK_SELEXPR + . + TOK_TABLE_OR_COL + x + value + TOK_SELEXPR + . + TOK_TABLE_OR_COL + subq1 + value TOK_FROM TOK_JOIN TOK_SUBQUERY TOK_UNION TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src - x TOK_INSERT TOK_DESTINATION TOK_DIR @@ -70,12 +86,12 @@ TOK_QUERY x key 20 - TOK_QUERY TOK_FROM TOK_TABREF TOK_TABNAME src - x1 + x + TOK_QUERY TOK_INSERT TOK_DESTINATION TOK_DIR @@ -100,6 +116,11 @@ TOK_QUERY x1 key 100 + TOK_FROM + TOK_TABREF + TOK_TABNAME + src + x1 subq1 TOK_TABREF TOK_TABNAME @@ -114,27 +135,6 @@ TOK_QUERY TOK_TABLE_OR_COL subq1 key - TOK_INSERT - TOK_DESTINATION - TOK_TAB - TOK_TABNAME - dest_j1 - TOK_SELECT - TOK_SELEXPR - . - TOK_TABLE_OR_COL - x - key - TOK_SELEXPR - . - TOK_TABLE_OR_COL - x - value - TOK_SELEXPR - . - TOK_TABLE_OR_COL - subq1 - value STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/join35.q.out ql/src/test/results/clientpositive/join35.q.out index 3053af7..c3e4e0f 100644 --- ql/src/test/results/clientpositive/join35.q.out +++ ql/src/test/results/clientpositive/join35.q.out @@ -36,16 +36,32 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_TAB + TOK_TABNAME + dest_j1 + TOK_SELECT + TOK_SELEXPR + . + TOK_TABLE_OR_COL + x + key + TOK_SELEXPR + . + TOK_TABLE_OR_COL + x + value + TOK_SELEXPR + . + TOK_TABLE_OR_COL + subq1 + cnt TOK_FROM TOK_JOIN TOK_SUBQUERY TOK_UNION TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src - x TOK_INSERT TOK_DESTINATION TOK_DIR @@ -74,12 +90,12 @@ TOK_QUERY TOK_TABLE_OR_COL x key - TOK_QUERY TOK_FROM TOK_TABREF TOK_TABNAME src - x1 + x + TOK_QUERY TOK_INSERT TOK_DESTINATION TOK_DIR @@ -108,6 +124,11 @@ TOK_QUERY TOK_TABLE_OR_COL x1 key + TOK_FROM + TOK_TABREF + TOK_TABNAME + src + x1 subq1 TOK_TABREF TOK_TABNAME @@ -122,27 +143,6 @@ TOK_QUERY TOK_TABLE_OR_COL subq1 key - TOK_INSERT - TOK_DESTINATION - TOK_TAB - TOK_TABNAME - dest_j1 - TOK_SELECT - TOK_SELEXPR - . - TOK_TABLE_OR_COL - x - key - TOK_SELEXPR - . - TOK_TABLE_OR_COL - x - value - TOK_SELEXPR - . - TOK_TABLE_OR_COL - subq1 - cnt STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/join9.q.out ql/src/test/results/clientpositive/join9.q.out index 16ce5a2..2567ed4 100644 --- ql/src/test/results/clientpositive/join9.q.out +++ ql/src/test/results/clientpositive/join9.q.out @@ -16,7 +16,7 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM + TOK_FROM_BASE TOK_JOIN TOK_TABREF TOK_TABNAME @@ -35,36 +35,37 @@ TOK_QUERY TOK_TABLE_OR_COL src2 key - TOK_INSERT - TOK_DESTINATION - TOK_TAB - TOK_TABNAME - dest1 - TOK_SELECT - TOK_SELEXPR - . - TOK_TABLE_OR_COL - src1 - key - TOK_SELEXPR - . - TOK_TABLE_OR_COL - src2 - value - TOK_WHERE - and - = + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_TAB + TOK_TABNAME + dest1 + TOK_SELECT + TOK_SELEXPR . TOK_TABLE_OR_COL src1 - ds - '2008-04-08' - = + key + TOK_SELEXPR . TOK_TABLE_OR_COL - src1 - hr - '12' + src2 + value + TOK_WHERE + and + = + . + TOK_TABLE_OR_COL + src1 + ds + '2008-04-08' + = + . + TOK_TABLE_OR_COL + src1 + hr + '12' STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/join_filters_overlap.q.out ql/src/test/results/clientpositive/join_filters_overlap.q.out index 94ca28e..2a2d5cf 100644 --- ql/src/test/results/clientpositive/join_filters_overlap.q.out +++ ql/src/test/results/clientpositive/join_filters_overlap.q.out @@ -20,6 +20,13 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_ALLCOLREF TOK_FROM TOK_LEFTOUTERJOIN TOK_LEFTOUTERJOIN @@ -80,13 +87,6 @@ TOK_QUERY c value 60 - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_ALLCOLREF STAGE DEPENDENCIES: @@ -268,6 +268,13 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_ALLCOLREF TOK_FROM TOK_LEFTOUTERJOIN TOK_RIGHTOUTERJOIN @@ -328,13 +335,6 @@ TOK_QUERY c value 60 - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_ALLCOLREF STAGE DEPENDENCIES: @@ -516,6 +516,13 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_ALLCOLREF TOK_FROM TOK_LEFTOUTERJOIN TOK_RIGHTOUTERJOIN @@ -590,13 +597,6 @@ TOK_QUERY c value 60 - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_ALLCOLREF STAGE DEPENDENCIES: @@ -778,6 +778,13 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_ALLCOLREF TOK_FROM TOK_LEFTOUTERJOIN TOK_LEFTOUTERJOIN @@ -866,13 +873,6 @@ TOK_QUERY d value 40 - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_ALLCOLREF STAGE DEPENDENCIES: @@ -1060,6 +1060,13 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_ALLCOLREF TOK_FROM TOK_LEFTOUTERJOIN TOK_LEFTOUTERJOIN @@ -1148,13 +1155,6 @@ TOK_QUERY d value 40 - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_ALLCOLREF STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/join_map_ppr.q.out ql/src/test/results/clientpositive/join_map_ppr.q.out index 51fb6c6..abcbbf4 100644 --- ql/src/test/results/clientpositive/join_map_ppr.q.out +++ ql/src/test/results/clientpositive/join_map_ppr.q.out @@ -26,39 +26,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_JOIN - TOK_JOIN - TOK_TABREF - TOK_TABNAME - src1 - x - TOK_TABREF - TOK_TABNAME - src - y - = - . - TOK_TABLE_OR_COL - x - key - . - TOK_TABLE_OR_COL - y - key - TOK_TABREF - TOK_TABNAME - srcpart - z - = - . - TOK_TABLE_OR_COL - x - key - . - TOK_TABLE_OR_COL - z - key TOK_INSERT TOK_DESTINATION TOK_TAB @@ -100,6 +67,39 @@ TOK_QUERY z hr 11 + TOK_FROM + TOK_JOIN + TOK_JOIN + TOK_TABREF + TOK_TABNAME + src1 + x + TOK_TABREF + TOK_TABNAME + src + y + = + . + TOK_TABLE_OR_COL + x + key + . + TOK_TABLE_OR_COL + y + key + TOK_TABREF + TOK_TABNAME + srcpart + z + = + . + TOK_TABLE_OR_COL + x + key + . + TOK_TABLE_OR_COL + z + key STAGE DEPENDENCIES: @@ -643,39 +643,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_JOIN - TOK_JOIN - TOK_TABREF - TOK_TABNAME - src1_copy - x - TOK_TABREF - TOK_TABNAME - src_copy - y - = - . - TOK_TABLE_OR_COL - x - key - . - TOK_TABLE_OR_COL - y - key - TOK_TABREF - TOK_TABNAME - srcpart - z - = - . - TOK_TABLE_OR_COL - x - key - . - TOK_TABLE_OR_COL - z - key TOK_INSERT TOK_DESTINATION TOK_TAB @@ -717,6 +684,39 @@ TOK_QUERY z hr 11 + TOK_FROM + TOK_JOIN + TOK_JOIN + TOK_TABREF + TOK_TABNAME + src1_copy + x + TOK_TABREF + TOK_TABNAME + src_copy + y + = + . + TOK_TABLE_OR_COL + x + key + . + TOK_TABLE_OR_COL + y + key + TOK_TABREF + TOK_TABNAME + srcpart + z + = + . + TOK_TABLE_OR_COL + x + key + . + TOK_TABLE_OR_COL + z + key STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/list_bucket_dml_1.q.out ql/src/test/results/clientpositive/list_bucket_dml_1.q.out index b48c36a..7111caf 100644 --- ql/src/test/results/clientpositive/list_bucket_dml_1.q.out +++ ql/src/test/results/clientpositive/list_bucket_dml_1.q.out @@ -32,10 +32,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcpart TOK_INSERT TOK_DESTINATION TOK_TAB @@ -62,6 +58,10 @@ TOK_QUERY TOK_TABLE_OR_COL ds '2008-04-08' + TOK_FROM + TOK_TABREF + TOK_TABNAME + srcpart STAGE DEPENDENCIES: @@ -399,10 +399,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - list_bucketing_dynamic_part TOK_INSERT TOK_DESTINATION TOK_DIR @@ -429,6 +425,10 @@ TOK_QUERY TOK_TABLE_OR_COL key "484" + TOK_FROM + TOK_TABREF + TOK_TABNAME + list_bucketing_dynamic_part STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/list_bucket_dml_10.q.out ql/src/test/results/clientpositive/list_bucket_dml_10.q.out index 5bfe938..964871a 100644 --- ql/src/test/results/clientpositive/list_bucket_dml_10.q.out +++ ql/src/test/results/clientpositive/list_bucket_dml_10.q.out @@ -54,10 +54,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_TAB @@ -77,6 +73,10 @@ TOK_QUERY TOK_SELEXPR TOK_TABLE_OR_COL value + TOK_FROM + TOK_TABREF + TOK_TABNAME + src STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/list_bucket_dml_11.q.out ql/src/test/results/clientpositive/list_bucket_dml_11.q.out index acf80aa..2ed57d4 100644 --- ql/src/test/results/clientpositive/list_bucket_dml_11.q.out +++ ql/src/test/results/clientpositive/list_bucket_dml_11.q.out @@ -40,10 +40,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_TAB @@ -63,6 +59,10 @@ TOK_QUERY TOK_SELEXPR TOK_TABLE_OR_COL value + TOK_FROM + TOK_TABREF + TOK_TABNAME + src STAGE DEPENDENCIES: @@ -269,10 +269,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - list_bucketing_static_part TOK_INSERT TOK_DESTINATION TOK_DIR @@ -299,6 +295,10 @@ TOK_QUERY TOK_TABLE_OR_COL value "val_466" + TOK_FROM + TOK_TABREF + TOK_TABNAME + list_bucketing_static_part STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/list_bucket_dml_12.q.out ql/src/test/results/clientpositive/list_bucket_dml_12.q.out index fa5bc92..e9694bc 100644 --- ql/src/test/results/clientpositive/list_bucket_dml_12.q.out +++ ql/src/test/results/clientpositive/list_bucket_dml_12.q.out @@ -38,10 +38,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_TAB @@ -67,6 +63,10 @@ TOK_QUERY value TOK_SELEXPR 1 + TOK_FROM + TOK_TABREF + TOK_TABNAME + src STAGE DEPENDENCIES: @@ -281,10 +281,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - list_bucketing_mul_col TOK_INSERT TOK_DESTINATION TOK_DIR @@ -312,6 +308,10 @@ TOK_QUERY TOK_TABLE_OR_COL col4 "val_466" + TOK_FROM + TOK_TABREF + TOK_TABNAME + list_bucketing_mul_col STAGE DEPENDENCIES: @@ -439,10 +439,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - list_bucketing_mul_col TOK_INSERT TOK_DESTINATION TOK_DIR @@ -470,6 +466,10 @@ TOK_QUERY TOK_TABLE_OR_COL col4 "val_382" + TOK_FROM + TOK_TABREF + TOK_TABNAME + list_bucketing_mul_col STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/list_bucket_dml_13.q.out ql/src/test/results/clientpositive/list_bucket_dml_13.q.out index a5813a6..33d8bcc 100644 --- ql/src/test/results/clientpositive/list_bucket_dml_13.q.out +++ ql/src/test/results/clientpositive/list_bucket_dml_13.q.out @@ -38,10 +38,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_TAB @@ -67,6 +63,10 @@ TOK_QUERY value TOK_SELEXPR 1 + TOK_FROM + TOK_TABREF + TOK_TABNAME + src STAGE DEPENDENCIES: @@ -281,10 +281,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - list_bucketing_mul_col TOK_INSERT TOK_DESTINATION TOK_DIR @@ -312,6 +308,10 @@ TOK_QUERY TOK_TABLE_OR_COL col4 "val_466" + TOK_FROM + TOK_TABREF + TOK_TABNAME + list_bucketing_mul_col STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/list_bucket_dml_14.q.out ql/src/test/results/clientpositive/list_bucket_dml_14.q.out index 730fa9e..4bb677a 100644 --- ql/src/test/results/clientpositive/list_bucket_dml_14.q.out +++ ql/src/test/results/clientpositive/list_bucket_dml_14.q.out @@ -30,10 +30,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_TAB @@ -42,6 +38,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + src STAGE DEPENDENCIES: @@ -252,10 +252,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - list_bucketing TOK_INSERT TOK_DESTINATION TOK_DIR @@ -272,6 +268,10 @@ TOK_QUERY TOK_TABLE_OR_COL key "484" + TOK_FROM + TOK_TABREF + TOK_TABNAME + list_bucketing STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/list_bucket_dml_2.q.out ql/src/test/results/clientpositive/list_bucket_dml_2.q.out index 5462629..6b516cd 100644 --- ql/src/test/results/clientpositive/list_bucket_dml_2.q.out +++ ql/src/test/results/clientpositive/list_bucket_dml_2.q.out @@ -56,10 +56,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcpart TOK_INSERT TOK_DESTINATION TOK_TAB @@ -84,6 +80,10 @@ TOK_QUERY TOK_TABLE_OR_COL ds '2008-04-08' + TOK_FROM + TOK_TABREF + TOK_TABNAME + srcpart STAGE DEPENDENCIES: @@ -367,10 +367,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - list_bucketing_static_part TOK_INSERT TOK_DESTINATION TOK_DIR @@ -398,6 +394,10 @@ TOK_QUERY TOK_TABLE_OR_COL value 'val_484' + TOK_FROM + TOK_TABREF + TOK_TABNAME + list_bucketing_static_part STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/list_bucket_dml_3.q.out ql/src/test/results/clientpositive/list_bucket_dml_3.q.out index b786fc8..7801229 100644 --- ql/src/test/results/clientpositive/list_bucket_dml_3.q.out +++ ql/src/test/results/clientpositive/list_bucket_dml_3.q.out @@ -26,10 +26,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcpart TOK_INSERT TOK_DESTINATION TOK_TAB @@ -54,6 +50,10 @@ TOK_QUERY TOK_TABLE_OR_COL ds '2008-04-08' + TOK_FROM + TOK_TABREF + TOK_TABNAME + srcpart STAGE DEPENDENCIES: @@ -339,10 +339,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - list_bucketing_static_part TOK_INSERT TOK_DESTINATION TOK_DIR @@ -369,6 +365,10 @@ TOK_QUERY TOK_TABLE_OR_COL key "484" + TOK_FROM + TOK_TABREF + TOK_TABNAME + list_bucketing_static_part STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/list_bucket_dml_4.q.out ql/src/test/results/clientpositive/list_bucket_dml_4.q.out index 083568a..32d0f87 100644 --- ql/src/test/results/clientpositive/list_bucket_dml_4.q.out +++ ql/src/test/results/clientpositive/list_bucket_dml_4.q.out @@ -64,10 +64,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcpart TOK_INSERT TOK_DESTINATION TOK_TAB @@ -92,6 +88,10 @@ TOK_QUERY TOK_TABLE_OR_COL ds '2008-04-08' + TOK_FROM + TOK_TABREF + TOK_TABNAME + srcpart STAGE DEPENDENCIES: @@ -355,10 +355,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcpart TOK_INSERT TOK_DESTINATION TOK_TAB @@ -383,6 +379,10 @@ TOK_QUERY TOK_TABLE_OR_COL ds '2008-04-08' + TOK_FROM + TOK_TABREF + TOK_TABNAME + srcpart STAGE DEPENDENCIES: @@ -770,10 +770,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - list_bucketing_static_part TOK_INSERT TOK_DESTINATION TOK_DIR @@ -801,6 +797,10 @@ TOK_QUERY TOK_TABLE_OR_COL value 'val_484' + TOK_FROM + TOK_TABREF + TOK_TABNAME + list_bucketing_static_part STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/list_bucket_dml_5.q.out ql/src/test/results/clientpositive/list_bucket_dml_5.q.out index 2db238e..e4a72c4 100644 --- ql/src/test/results/clientpositive/list_bucket_dml_5.q.out +++ ql/src/test/results/clientpositive/list_bucket_dml_5.q.out @@ -34,10 +34,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcpart TOK_INSERT TOK_DESTINATION TOK_TAB @@ -64,6 +60,10 @@ TOK_QUERY TOK_TABLE_OR_COL ds '2008-04-08' + TOK_FROM + TOK_TABREF + TOK_TABNAME + srcpart STAGE DEPENDENCIES: @@ -406,10 +406,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - list_bucketing_dynamic_part TOK_INSERT TOK_DESTINATION TOK_DIR @@ -442,6 +438,10 @@ TOK_QUERY TOK_TABLE_OR_COL value "val_103" + TOK_FROM + TOK_TABREF + TOK_TABNAME + list_bucketing_dynamic_part STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/list_bucket_dml_6.q.out ql/src/test/results/clientpositive/list_bucket_dml_6.q.out index c1ababc..ae766ed 100644 --- ql/src/test/results/clientpositive/list_bucket_dml_6.q.out +++ ql/src/test/results/clientpositive/list_bucket_dml_6.q.out @@ -110,10 +110,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcpart TOK_INSERT TOK_DESTINATION TOK_TAB @@ -148,6 +144,10 @@ TOK_QUERY TOK_TABLE_OR_COL ds '2008-04-08' + TOK_FROM + TOK_TABREF + TOK_TABNAME + srcpart STAGE DEPENDENCIES: @@ -460,10 +460,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcpart TOK_INSERT TOK_DESTINATION TOK_TAB @@ -498,6 +494,10 @@ TOK_QUERY TOK_TABLE_OR_COL ds '2008-04-08' + TOK_FROM + TOK_TABREF + TOK_TABNAME + srcpart STAGE DEPENDENCIES: @@ -942,10 +942,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - list_bucketing_dynamic_part TOK_INSERT TOK_DESTINATION TOK_DIR @@ -963,6 +959,10 @@ TOK_QUERY TOK_TABLE_OR_COL value 'val_484' + TOK_FROM + TOK_TABREF + TOK_TABNAME + list_bucketing_dynamic_part STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/list_bucket_dml_7.q.out ql/src/test/results/clientpositive/list_bucket_dml_7.q.out index 4c905e9..558c7ea 100644 --- ql/src/test/results/clientpositive/list_bucket_dml_7.q.out +++ ql/src/test/results/clientpositive/list_bucket_dml_7.q.out @@ -58,10 +58,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcpart TOK_INSERT TOK_DESTINATION TOK_TAB @@ -96,6 +92,10 @@ TOK_QUERY TOK_TABLE_OR_COL ds '2008-04-08' + TOK_FROM + TOK_TABREF + TOK_TABNAME + srcpart STAGE DEPENDENCIES: @@ -408,10 +408,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcpart TOK_INSERT TOK_DESTINATION TOK_TAB @@ -446,6 +442,10 @@ TOK_QUERY TOK_TABLE_OR_COL ds '2008-04-08' + TOK_FROM + TOK_TABREF + TOK_TABNAME + srcpart STAGE DEPENDENCIES: @@ -890,10 +890,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - list_bucketing_dynamic_part TOK_INSERT TOK_DESTINATION TOK_DIR @@ -911,6 +907,10 @@ TOK_QUERY TOK_TABLE_OR_COL value 'val_484' + TOK_FROM + TOK_TABREF + TOK_TABNAME + list_bucketing_dynamic_part STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/list_bucket_dml_8.q.out ql/src/test/results/clientpositive/list_bucket_dml_8.q.out index ff94687..49c3157 100644 --- ql/src/test/results/clientpositive/list_bucket_dml_8.q.out +++ ql/src/test/results/clientpositive/list_bucket_dml_8.q.out @@ -112,10 +112,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcpart TOK_INSERT TOK_DESTINATION TOK_TAB @@ -150,6 +146,10 @@ TOK_QUERY TOK_TABLE_OR_COL ds '2008-04-08' + TOK_FROM + TOK_TABREF + TOK_TABNAME + srcpart STAGE DEPENDENCIES: @@ -541,10 +541,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - list_bucketing_dynamic_part TOK_INSERT TOK_DESTINATION TOK_DIR @@ -562,6 +558,10 @@ TOK_QUERY TOK_TABLE_OR_COL value 'val_484' + TOK_FROM + TOK_TABREF + TOK_TABNAME + list_bucketing_dynamic_part STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/list_bucket_dml_9.q.out ql/src/test/results/clientpositive/list_bucket_dml_9.q.out index 41872d7..d9fe212 100644 --- ql/src/test/results/clientpositive/list_bucket_dml_9.q.out +++ ql/src/test/results/clientpositive/list_bucket_dml_9.q.out @@ -64,10 +64,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcpart TOK_INSERT TOK_DESTINATION TOK_TAB @@ -92,6 +88,10 @@ TOK_QUERY TOK_TABLE_OR_COL ds '2008-04-08' + TOK_FROM + TOK_TABREF + TOK_TABNAME + srcpart STAGE DEPENDENCIES: @@ -355,10 +355,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcpart TOK_INSERT TOK_DESTINATION TOK_TAB @@ -383,6 +379,10 @@ TOK_QUERY TOK_TABLE_OR_COL ds '2008-04-08' + TOK_FROM + TOK_TABREF + TOK_TABNAME + srcpart STAGE DEPENDENCIES: @@ -770,10 +770,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - list_bucketing_static_part TOK_INSERT TOK_DESTINATION TOK_DIR @@ -801,6 +797,10 @@ TOK_QUERY TOK_TABLE_OR_COL value 'val_484' + TOK_FROM + TOK_TABREF + TOK_TABNAME + list_bucketing_static_part STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/list_bucket_query_multiskew_1.q.out ql/src/test/results/clientpositive/list_bucket_query_multiskew_1.q.out index 81c519e..a34a9dd 100644 --- ql/src/test/results/clientpositive/list_bucket_query_multiskew_1.q.out +++ ql/src/test/results/clientpositive/list_bucket_query_multiskew_1.q.out @@ -120,10 +120,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - fact_daily TOK_INSERT TOK_DESTINATION TOK_DIR @@ -152,6 +148,10 @@ TOK_QUERY TOK_TABLE_OR_COL value 'val_484' + TOK_FROM + TOK_TABREF + TOK_TABNAME + fact_daily STAGE DEPENDENCIES: @@ -277,10 +277,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - fact_daily TOK_INSERT TOK_DESTINATION TOK_DIR @@ -312,6 +308,10 @@ TOK_QUERY TOK_TABLE_OR_COL value 'val_238' + TOK_FROM + TOK_TABREF + TOK_TABNAME + fact_daily STAGE DEPENDENCIES: @@ -438,10 +438,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - fact_daily TOK_INSERT TOK_DESTINATION TOK_DIR @@ -465,6 +461,10 @@ TOK_QUERY TOK_TABLE_OR_COL value "3" + TOK_FROM + TOK_TABREF + TOK_TABNAME + fact_daily STAGE DEPENDENCIES: @@ -589,10 +589,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - fact_daily TOK_INSERT TOK_DESTINATION TOK_DIR @@ -619,6 +615,10 @@ TOK_QUERY TOK_TABLE_OR_COL key '495' + TOK_FROM + TOK_TABREF + TOK_TABNAME + fact_daily STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/list_bucket_query_multiskew_2.q.out ql/src/test/results/clientpositive/list_bucket_query_multiskew_2.q.out index 9caaece..5ee736a 100644 --- ql/src/test/results/clientpositive/list_bucket_query_multiskew_2.q.out +++ ql/src/test/results/clientpositive/list_bucket_query_multiskew_2.q.out @@ -120,10 +120,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - fact_daily TOK_INSERT TOK_DESTINATION TOK_DIR @@ -150,6 +146,10 @@ TOK_QUERY TOK_TABLE_OR_COL value 'val_484' + TOK_FROM + TOK_TABREF + TOK_TABNAME + fact_daily STAGE DEPENDENCIES: @@ -322,10 +322,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - fact_daily TOK_INSERT TOK_DESTINATION TOK_DIR @@ -349,6 +345,10 @@ TOK_QUERY TOK_TABLE_OR_COL key '406' + TOK_FROM + TOK_TABREF + TOK_TABNAME + fact_daily STAGE DEPENDENCIES: @@ -477,10 +477,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - fact_daily TOK_INSERT TOK_DESTINATION TOK_DIR @@ -522,6 +518,10 @@ TOK_QUERY TOK_TABLE_OR_COL value 'val_238' + TOK_FROM + TOK_TABREF + TOK_TABNAME + fact_daily STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/list_bucket_query_multiskew_3.q.out ql/src/test/results/clientpositive/list_bucket_query_multiskew_3.q.out index d4f833b..f73b74b 100644 --- ql/src/test/results/clientpositive/list_bucket_query_multiskew_3.q.out +++ ql/src/test/results/clientpositive/list_bucket_query_multiskew_3.q.out @@ -242,10 +242,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - fact_daily TOK_INSERT TOK_DESTINATION TOK_DIR @@ -268,6 +264,10 @@ TOK_QUERY TOK_TABLE_OR_COL key '145' + TOK_FROM + TOK_TABREF + TOK_TABNAME + fact_daily STAGE DEPENDENCIES: @@ -389,10 +389,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - fact_daily TOK_INSERT TOK_DESTINATION TOK_DIR @@ -411,6 +407,10 @@ TOK_QUERY TOK_TABLE_OR_COL hr '1' + TOK_FROM + TOK_TABREF + TOK_TABNAME + fact_daily STAGE DEPENDENCIES: @@ -549,10 +549,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - fact_daily TOK_INSERT TOK_DESTINATION TOK_DIR @@ -580,6 +576,10 @@ TOK_QUERY TOK_TABLE_OR_COL value 'val_484' + TOK_FROM + TOK_TABREF + TOK_TABNAME + fact_daily STAGE DEPENDENCIES: @@ -703,10 +703,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - fact_daily TOK_INSERT TOK_DESTINATION TOK_DIR @@ -734,6 +730,10 @@ TOK_QUERY TOK_TABLE_OR_COL value 'val_327' + TOK_FROM + TOK_TABREF + TOK_TABNAME + fact_daily STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/list_bucket_query_oneskew_1.q.out ql/src/test/results/clientpositive/list_bucket_query_oneskew_1.q.out index 69b14fe..e7c6d7a 100644 --- ql/src/test/results/clientpositive/list_bucket_query_oneskew_1.q.out +++ ql/src/test/results/clientpositive/list_bucket_query_oneskew_1.q.out @@ -182,10 +182,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - fact_daily TOK_INSERT TOK_DESTINATION TOK_DIR @@ -204,6 +200,10 @@ TOK_QUERY TOK_TABLE_OR_COL x 484 + TOK_FROM + TOK_TABREF + TOK_TABNAME + fact_daily STAGE DEPENDENCIES: @@ -329,10 +329,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - fact_daily TOK_INSERT TOK_DESTINATION TOK_DIR @@ -351,6 +347,10 @@ TOK_QUERY TOK_TABLE_OR_COL x 495 + TOK_FROM + TOK_TABREF + TOK_TABNAME + fact_daily STAGE DEPENDENCIES: @@ -472,10 +472,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - fact_daily TOK_INSERT TOK_DESTINATION TOK_DIR @@ -494,6 +490,10 @@ TOK_QUERY TOK_TABLE_OR_COL x 1 + TOK_FROM + TOK_TABREF + TOK_TABNAME + fact_daily STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/list_bucket_query_oneskew_2.q.out ql/src/test/results/clientpositive/list_bucket_query_oneskew_2.q.out index 21fac22..4e735a1 100644 --- ql/src/test/results/clientpositive/list_bucket_query_oneskew_2.q.out +++ ql/src/test/results/clientpositive/list_bucket_query_oneskew_2.q.out @@ -187,13 +187,22 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_TABLE_OR_COL + x + TOK_WHERE + = + TOK_TABLE_OR_COL + x + 484 TOK_FROM TOK_SUBQUERY TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - fact_daily TOK_INSERT TOK_DESTINATION TOK_DIR @@ -207,20 +216,11 @@ TOK_QUERY TOK_TABLE_OR_COL ds '1' + TOK_FROM + TOK_TABREF + TOK_TABNAME + fact_daily subq - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_TABLE_OR_COL - x - TOK_WHERE - = - TOK_TABLE_OR_COL - x - 484 STAGE DEPENDENCIES: @@ -346,13 +346,25 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_TABLE_OR_COL + x1 + TOK_SELEXPR + TOK_TABLE_OR_COL + y1 + TOK_WHERE + = + TOK_TABLE_OR_COL + x1 + 484 TOK_FROM TOK_SUBQUERY TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - fact_daily TOK_INSERT TOK_DESTINATION TOK_DIR @@ -371,23 +383,11 @@ TOK_QUERY TOK_TABLE_OR_COL ds '1' + TOK_FROM + TOK_TABREF + TOK_TABNAME + fact_daily subq - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_TABLE_OR_COL - x1 - TOK_SELEXPR - TOK_TABLE_OR_COL - y1 - TOK_WHERE - = - TOK_TABLE_OR_COL - x1 - 484 STAGE DEPENDENCIES: @@ -513,10 +513,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - fact_daily TOK_INSERT TOK_DESTINATION TOK_DIR @@ -542,6 +538,10 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL y + TOK_FROM + TOK_TABREF + TOK_TABNAME + fact_daily STAGE DEPENDENCIES: @@ -692,13 +692,25 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_TABLE_OR_COL + x + TOK_SELEXPR + TOK_TABLE_OR_COL + c + TOK_WHERE + = + TOK_TABLE_OR_COL + x + 484 TOK_FROM TOK_SUBQUERY TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - fact_daily TOK_INSERT TOK_DESTINATION TOK_DIR @@ -720,23 +732,11 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL x + TOK_FROM + TOK_TABREF + TOK_TABNAME + fact_daily subq - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_TABLE_OR_COL - x - TOK_SELEXPR - TOK_TABLE_OR_COL - c - TOK_WHERE - = - TOK_TABLE_OR_COL - x - 484 STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/list_bucket_query_oneskew_3.q.out ql/src/test/results/clientpositive/list_bucket_query_oneskew_3.q.out index 01a8081..ada688f 100644 --- ql/src/test/results/clientpositive/list_bucket_query_oneskew_3.q.out +++ ql/src/test/results/clientpositive/list_bucket_query_oneskew_3.q.out @@ -209,10 +209,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - fact_daily TOK_INSERT TOK_DESTINATION TOK_DIR @@ -232,6 +228,10 @@ TOK_QUERY TOK_TABLE_OR_COL x 86 + TOK_FROM + TOK_TABREF + TOK_TABNAME + fact_daily STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/load_dyn_part8.q.out ql/src/test/results/clientpositive/load_dyn_part8.q.out index 2299667..baee424 100644 --- ql/src/test/results/clientpositive/load_dyn_part8.q.out +++ ql/src/test/results/clientpositive/load_dyn_part8.q.out @@ -50,64 +50,66 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM + TOK_FROM_BASE TOK_TABREF TOK_TABNAME srcpart - TOK_INSERT - TOK_DESTINATION - TOK_TAB - TOK_TABNAME - nzhang_part8 - TOK_PARTSPEC - TOK_PARTVAL + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_TAB + TOK_TABNAME + nzhang_part8 + TOK_PARTSPEC + TOK_PARTVAL + ds + TOK_PARTVAL + hr + TOK_SELECT + TOK_SELEXPR + TOK_TABLE_OR_COL + key + TOK_SELEXPR + TOK_TABLE_OR_COL + value + TOK_SELEXPR + TOK_TABLE_OR_COL ds - TOK_PARTVAL + TOK_SELEXPR + TOK_TABLE_OR_COL hr - TOK_SELECT - TOK_SELEXPR - TOK_TABLE_OR_COL - key - TOK_SELEXPR - TOK_TABLE_OR_COL - value - TOK_SELEXPR - TOK_TABLE_OR_COL - ds - TOK_SELEXPR - TOK_TABLE_OR_COL - hr - TOK_WHERE - <= - TOK_TABLE_OR_COL - ds - '2008-04-08' - TOK_INSERT - TOK_DESTINATION - TOK_TAB - TOK_TABNAME - nzhang_part8 - TOK_PARTSPEC - TOK_PARTVAL + TOK_WHERE + <= + TOK_TABLE_OR_COL ds - '2008-12-31' - TOK_PARTVAL + '2008-04-08' + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_TAB + TOK_TABNAME + nzhang_part8 + TOK_PARTSPEC + TOK_PARTVAL + ds + '2008-12-31' + TOK_PARTVAL + hr + TOK_SELECT + TOK_SELEXPR + TOK_TABLE_OR_COL + key + TOK_SELEXPR + TOK_TABLE_OR_COL + value + TOK_SELEXPR + TOK_TABLE_OR_COL hr - TOK_SELECT - TOK_SELEXPR - TOK_TABLE_OR_COL - key - TOK_SELEXPR - TOK_TABLE_OR_COL - value - TOK_SELEXPR - TOK_TABLE_OR_COL - hr - TOK_WHERE - > - TOK_TABLE_OR_COL - ds - '2008-04-08' + TOK_WHERE + > + TOK_TABLE_OR_COL + ds + '2008-04-08' STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/louter_join_ppr.q.out ql/src/test/results/clientpositive/louter_join_ppr.q.out index 3dec6a6..15e3558 100644 --- ql/src/test/results/clientpositive/louter_join_ppr.q.out +++ ql/src/test/results/clientpositive/louter_join_ppr.q.out @@ -19,7 +19,7 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM + TOK_FROM_BASE TOK_LEFTOUTERJOIN TOK_TABREF TOK_TABNAME @@ -45,59 +45,60 @@ TOK_QUERY b ds '2008-04-08' - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - . - TOK_TABLE_OR_COL - a - key - TOK_SELEXPR - . - TOK_TABLE_OR_COL - a - value - TOK_SELEXPR - . - TOK_TABLE_OR_COL - b - key - TOK_SELEXPR - . - TOK_TABLE_OR_COL - b - value - TOK_WHERE - AND + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + . + TOK_TABLE_OR_COL + a + key + TOK_SELEXPR + . + TOK_TABLE_OR_COL + a + value + TOK_SELEXPR + . + TOK_TABLE_OR_COL + b + key + TOK_SELEXPR + . + TOK_TABLE_OR_COL + b + value + TOK_WHERE AND AND + AND + > + . + TOK_TABLE_OR_COL + a + key + 10 + < + . + TOK_TABLE_OR_COL + a + key + 20 > . TOK_TABLE_OR_COL - a - key - 10 - < - . - TOK_TABLE_OR_COL - a + b key - 20 - > + 15 + < . TOK_TABLE_OR_COL b key - 15 - < - . - TOK_TABLE_OR_COL - b - key - 25 + 25 STAGE DEPENDENCIES: @@ -386,7 +387,7 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM + TOK_FROM_BASE TOK_LEFTOUTERJOIN TOK_TABREF TOK_TABNAME @@ -412,59 +413,60 @@ TOK_QUERY a ds '2008-04-08' - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - . - TOK_TABLE_OR_COL - a - key - TOK_SELEXPR - . - TOK_TABLE_OR_COL - a - value - TOK_SELEXPR - . - TOK_TABLE_OR_COL - b - key - TOK_SELEXPR - . - TOK_TABLE_OR_COL - b - value - TOK_WHERE - AND + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + . + TOK_TABLE_OR_COL + a + key + TOK_SELEXPR + . + TOK_TABLE_OR_COL + a + value + TOK_SELEXPR + . + TOK_TABLE_OR_COL + b + key + TOK_SELEXPR + . + TOK_TABLE_OR_COL + b + value + TOK_WHERE AND AND + AND + > + . + TOK_TABLE_OR_COL + a + key + 10 + < + . + TOK_TABLE_OR_COL + a + key + 20 > . TOK_TABLE_OR_COL - a - key - 10 - < - . - TOK_TABLE_OR_COL - a + b key - 20 - > + 15 + < . TOK_TABLE_OR_COL b key - 15 - < - . - TOK_TABLE_OR_COL - b - key - 25 + 25 STAGE DEPENDENCIES: @@ -856,7 +858,7 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM + TOK_FROM_BASE TOK_LEFTOUTERJOIN TOK_TABREF TOK_TABNAME @@ -875,66 +877,67 @@ TOK_QUERY TOK_TABLE_OR_COL b key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - . - TOK_TABLE_OR_COL - a - key - TOK_SELEXPR - . - TOK_TABLE_OR_COL - a - value - TOK_SELEXPR - . - TOK_TABLE_OR_COL - b - key - TOK_SELEXPR - . - TOK_TABLE_OR_COL - b - value - TOK_WHERE - AND + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + . + TOK_TABLE_OR_COL + a + key + TOK_SELEXPR + . + TOK_TABLE_OR_COL + a + value + TOK_SELEXPR + . + TOK_TABLE_OR_COL + b + key + TOK_SELEXPR + . + TOK_TABLE_OR_COL + b + value + TOK_WHERE AND AND AND + AND + > + . + TOK_TABLE_OR_COL + a + key + 10 + < + . + TOK_TABLE_OR_COL + a + key + 20 > . TOK_TABLE_OR_COL - a - key - 10 - < - . - TOK_TABLE_OR_COL - a + b key - 20 - > + 15 + < . TOK_TABLE_OR_COL b key - 15 - < + 25 + = . TOK_TABLE_OR_COL b - key - 25 - = - . - TOK_TABLE_OR_COL - b - ds - '2008-04-08' + ds + '2008-04-08' STAGE DEPENDENCIES: @@ -1321,7 +1324,7 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM + TOK_FROM_BASE TOK_LEFTOUTERJOIN TOK_TABREF TOK_TABNAME @@ -1340,66 +1343,67 @@ TOK_QUERY TOK_TABLE_OR_COL b key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - . - TOK_TABLE_OR_COL - a - key - TOK_SELEXPR - . - TOK_TABLE_OR_COL - a - value - TOK_SELEXPR - . - TOK_TABLE_OR_COL - b - key - TOK_SELEXPR - . - TOK_TABLE_OR_COL - b - value - TOK_WHERE - AND + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + . + TOK_TABLE_OR_COL + a + key + TOK_SELEXPR + . + TOK_TABLE_OR_COL + a + value + TOK_SELEXPR + . + TOK_TABLE_OR_COL + b + key + TOK_SELEXPR + . + TOK_TABLE_OR_COL + b + value + TOK_WHERE AND AND AND + AND + > + . + TOK_TABLE_OR_COL + a + key + 10 + < + . + TOK_TABLE_OR_COL + a + key + 20 > . TOK_TABLE_OR_COL - a + b key - 10 - < - . - TOK_TABLE_OR_COL - a - key - 20 - > + 15 + < . TOK_TABLE_OR_COL b key - 15 - < + 25 + = . TOK_TABLE_OR_COL - b - key - 25 - = - . - TOK_TABLE_OR_COL - a - ds - '2008-04-08' + a + ds + '2008-04-08' STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/macro.q.out ql/src/test/results/clientpositive/macro.q.out index dc046ba..38d2ab8 100644 --- ql/src/test/results/clientpositive/macro.q.out +++ ql/src/test/results/clientpositive/macro.q.out @@ -44,10 +44,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_DIR @@ -59,6 +55,10 @@ TOK_QUERY 2 TOK_LIMIT 1 + TOK_FROM + TOK_TABREF + TOK_TABNAME + src STAGE DEPENDENCIES: @@ -134,10 +134,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_DIR @@ -150,6 +146,10 @@ TOK_QUERY 1 TOK_LIMIT 1 + TOK_FROM + TOK_TABREF + TOK_TABNAME + src STAGE DEPENDENCIES: @@ -252,10 +252,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_DIR @@ -268,6 +264,10 @@ TOK_QUERY 9 TOK_LIMIT 1 + TOK_FROM + TOK_TABREF + TOK_TABNAME + src STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/merge3.q.out ql/src/test/results/clientpositive/merge3.q.out index 96f675d..5212504 100644 --- ql/src/test/results/clientpositive/merge3.q.out +++ ql/src/test/results/clientpositive/merge3.q.out @@ -62,10 +62,6 @@ TOK_CREATETABLE merge_src2 TOK_LIKETABLE TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - merge_src TOK_INSERT TOK_DESTINATION TOK_DIR @@ -77,6 +73,10 @@ TOK_CREATETABLE TOK_SELEXPR TOK_TABLE_OR_COL value + TOK_FROM + TOK_TABREF + TOK_TABNAME + merge_src STAGE DEPENDENCIES: @@ -2387,10 +2387,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - merge_src_part TOK_INSERT TOK_DESTINATION TOK_TAB @@ -2414,6 +2410,10 @@ TOK_QUERY TOK_ISNOTNULL TOK_TABLE_OR_COL ds + TOK_FROM + TOK_TABREF + TOK_TABNAME + merge_src_part STAGE DEPENDENCIES: @@ -4838,13 +4838,9 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM + TOK_FROM_BASE TOK_SUBQUERY TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - merge_src_part TOK_INSERT TOK_DESTINATION TOK_DIR @@ -4860,25 +4856,30 @@ TOK_QUERY TOK_DISTRIBUTEBY TOK_TABLE_OR_COL ds + TOK_FROM + TOK_TABREF + TOK_TABNAME + merge_src_part s - TOK_INSERT - TOK_DESTINATION - TOK_TAB - TOK_TABNAME - merge_src_part2 - TOK_PARTSPEC - TOK_PARTVAL + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_TAB + TOK_TABNAME + merge_src_part2 + TOK_PARTSPEC + TOK_PARTVAL + ds + TOK_SELECT + TOK_SELEXPR + TOK_TABLE_OR_COL + key + TOK_SELEXPR + TOK_TABLE_OR_COL + value + TOK_SELEXPR + TOK_TABLE_OR_COL ds - TOK_SELECT - TOK_SELEXPR - TOK_TABLE_OR_COL - key - TOK_SELEXPR - TOK_TABLE_OR_COL - value - TOK_SELEXPR - TOK_TABLE_OR_COL - ds STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/metadataonly1.q.out ql/src/test/results/clientpositive/metadataonly1.q.out index f08ef9e..fed2447 100644 --- ql/src/test/results/clientpositive/metadataonly1.q.out +++ ql/src/test/results/clientpositive/metadataonly1.q.out @@ -12,10 +12,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - TEST1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -26,6 +22,10 @@ TOK_QUERY max TOK_TABLE_OR_COL ds + TOK_FROM + TOK_TABREF + TOK_TABNAME + TEST1 STAGE DEPENDENCIES: @@ -97,10 +97,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - TEST1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -111,6 +107,10 @@ TOK_QUERY max TOK_TABLE_OR_COL ds + TOK_FROM + TOK_TABREF + TOK_TABNAME + TEST1 STAGE DEPENDENCIES: @@ -241,10 +241,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - TEST1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -255,6 +251,10 @@ TOK_QUERY count TOK_TABLE_OR_COL ds + TOK_FROM + TOK_TABREF + TOK_TABNAME + TEST1 STAGE DEPENDENCIES: @@ -386,10 +386,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - TEST1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -400,6 +396,10 @@ TOK_QUERY count TOK_TABLE_OR_COL ds + TOK_FROM + TOK_TABREF + TOK_TABNAME + TEST1 STAGE DEPENDENCIES: @@ -539,6 +539,14 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -547,10 +555,6 @@ TOK_QUERY a2 TOK_SUBQUERY TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - TEST1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -562,6 +566,10 @@ TOK_QUERY TOK_TABLE_OR_COL ds m + TOK_FROM + TOK_TABREF + TOK_TABNAME + TEST1 b = . @@ -572,14 +580,6 @@ TOK_QUERY TOK_TABLE_OR_COL b m - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: @@ -1014,10 +1014,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - TEST2 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1034,6 +1030,10 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL ds + TOK_FROM + TOK_TABREF + TOK_TABNAME + TEST2 STAGE DEPENDENCIES: @@ -1258,10 +1258,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - TEST2 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1278,6 +1274,10 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL ds + TOK_FROM + TOK_TABREF + TOK_TABNAME + TEST2 STAGE DEPENDENCIES: @@ -1500,10 +1500,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - TEST1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1514,6 +1510,10 @@ TOK_QUERY max TOK_TABLE_OR_COL ds + TOK_FROM + TOK_TABREF + TOK_TABNAME + TEST1 STAGE DEPENDENCIES: @@ -1739,10 +1739,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - TEST2 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1759,6 +1755,10 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL ds + TOK_FROM + TOK_TABREF + TOK_TABNAME + TEST2 STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/multi_insert_subquery.q.out ql/src/test/results/clientpositive/multi_insert_subquery.q.out new file mode 100644 index 0000000..376a1b1 --- /dev/null +++ ql/src/test/results/clientpositive/multi_insert_subquery.q.out @@ -0,0 +1,528 @@ +PREHOOK: query: create table src_10 as select * from src tablesample(10 rows) +PREHOOK: type: CREATETABLE_AS_SELECT +PREHOOK: Input: default@src +POSTHOOK: query: create table src_10 as select * from src tablesample(10 rows) +POSTHOOK: type: CREATETABLE_AS_SELECT +POSTHOOK: Input: default@src +POSTHOOK: Output: default@src_10 +PREHOOK: query: create table src_lv1 (key string, value string) +PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default +POSTHOOK: query: create table src_lv1 (key string, value string) +POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default +POSTHOOK: Output: default@src_lv1 +PREHOOK: query: create table src_lv2 (key string, value string) +PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default +POSTHOOK: query: create table src_lv2 (key string, value string) +POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default +POSTHOOK: Output: default@src_lv2 +PREHOOK: query: explain extended +from src_10 +insert overwrite table src_lv1 select * from (select key, C lateral view explode(array(key+1, key+2)) A as C) X1 order by key desc, C +insert overwrite table src_lv2 select * from (select key, C lateral view explode(array(key+3, key+4)) A as C) X2 order by key asc, C +PREHOOK: type: QUERY +POSTHOOK: query: explain extended +from src_10 +insert overwrite table src_lv1 select * from (select key, C lateral view explode(array(key+1, key+2)) A as C) X1 order by key desc, C +insert overwrite table src_lv2 select * from (select key, C lateral view explode(array(key+3, key+4)) A as C) X2 order by key asc, C +POSTHOOK: type: QUERY +ABSTRACT SYNTAX TREE: + +TOK_QUERY + TOK_FROM_BASE + TOK_TABREF + TOK_TABNAME + src_10 + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_TAB + TOK_TABNAME + src_lv1 + TOK_SELECT + TOK_SELEXPR + TOK_ALLCOLREF + TOK_ORDERBY + TOK_TABSORTCOLNAMEDESC + TOK_TABLE_OR_COL + key + TOK_TABSORTCOLNAMEASC + TOK_TABLE_OR_COL + C + TOK_FROM + TOK_SUBQUERY + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_TABLE_OR_COL + key + TOK_SELEXPR + TOK_TABLE_OR_COL + C + TOK_LATERAL_VIEW + TOK_SELECT + TOK_SELEXPR + TOK_FUNCTION + explode + TOK_FUNCTION + array + + + TOK_TABLE_OR_COL + key + 1 + + + TOK_TABLE_OR_COL + key + 2 + C + TOK_TABALIAS + A + X1 + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_TAB + TOK_TABNAME + src_lv2 + TOK_SELECT + TOK_SELEXPR + TOK_ALLCOLREF + TOK_ORDERBY + TOK_TABSORTCOLNAMEASC + TOK_TABLE_OR_COL + key + TOK_TABSORTCOLNAMEASC + TOK_TABLE_OR_COL + C + TOK_FROM + TOK_SUBQUERY + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_TABLE_OR_COL + key + TOK_SELEXPR + TOK_TABLE_OR_COL + C + TOK_LATERAL_VIEW + TOK_SELECT + TOK_SELEXPR + TOK_FUNCTION + explode + TOK_FUNCTION + array + + + TOK_TABLE_OR_COL + key + 3 + + + TOK_TABLE_OR_COL + key + 4 + C + TOK_TABALIAS + A + X2 + + +STAGE DEPENDENCIES: + Stage-2 is a root stage + Stage-1 depends on stages: Stage-2 + Stage-3 depends on stages: Stage-1 + Stage-4 depends on stages: Stage-2 + Stage-0 depends on stages: Stage-4 + Stage-5 depends on stages: Stage-0 + +STAGE PLANS: + Stage: Stage-2 + Map Reduce + Map Operator Tree: + TableScan + alias: src_10 + Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE + GatherStats: false + Lateral View Forward + Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE + Select Operator + expressions: key (type: string) + outputColumnNames: key + Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE + Lateral View Join Operator + outputColumnNames: _col0, _col4 + Statistics: Num rows: 20 Data size: 208 Basic stats: COMPLETE Column stats: NONE + Select Operator + expressions: _col0 (type: string), _col4 (type: double) + outputColumnNames: _col0, _col1 + Statistics: Num rows: 20 Data size: 208 Basic stats: COMPLETE Column stats: NONE + Reduce Output Operator + key expressions: _col0 (type: string), _col1 (type: double) + sort order: ++ + Statistics: Num rows: 20 Data size: 208 Basic stats: COMPLETE Column stats: NONE + tag: -1 + Select Operator + expressions: array((key + 3),(key + 4)) (type: array) + outputColumnNames: _col0 + Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE + UDTF Operator + Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE + function name: explode + Lateral View Join Operator + outputColumnNames: _col0, _col4 + Statistics: Num rows: 20 Data size: 208 Basic stats: COMPLETE Column stats: NONE + Select Operator + expressions: _col0 (type: string), _col4 (type: double) + outputColumnNames: _col0, _col1 + Statistics: Num rows: 20 Data size: 208 Basic stats: COMPLETE Column stats: NONE + Reduce Output Operator + key expressions: _col0 (type: string), _col1 (type: double) + sort order: ++ + Statistics: Num rows: 20 Data size: 208 Basic stats: COMPLETE Column stats: NONE + tag: -1 + Lateral View Forward + Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE + Select Operator + expressions: key (type: string) + outputColumnNames: key + Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE + Lateral View Join Operator + outputColumnNames: _col0, _col4 + Statistics: Num rows: 20 Data size: 208 Basic stats: COMPLETE Column stats: NONE + Select Operator + expressions: _col0 (type: string), _col4 (type: double) + outputColumnNames: _col0, _col1 + Statistics: Num rows: 20 Data size: 208 Basic stats: COMPLETE Column stats: NONE + File Output Operator + compressed: false + GlobalTableId: 0 +#### A masked pattern was here #### + NumFilesPerFileSink: 1 + table: + input format: org.apache.hadoop.mapred.SequenceFileInputFormat + output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat + properties: + columns _col0,_col1 + columns.types string,double + escape.delim \ + serialization.lib org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe + serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe + TotalFiles: 1 + GatherStats: false + MultiFileSpray: false + Select Operator + expressions: array((key + 1),(key + 2)) (type: array) + outputColumnNames: _col0 + Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE + UDTF Operator + Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE + function name: explode + Lateral View Join Operator + outputColumnNames: _col0, _col4 + Statistics: Num rows: 20 Data size: 208 Basic stats: COMPLETE Column stats: NONE + Select Operator + expressions: _col0 (type: string), _col4 (type: double) + outputColumnNames: _col0, _col1 + Statistics: Num rows: 20 Data size: 208 Basic stats: COMPLETE Column stats: NONE + File Output Operator + compressed: false + GlobalTableId: 0 +#### A masked pattern was here #### + NumFilesPerFileSink: 1 + table: + input format: org.apache.hadoop.mapred.SequenceFileInputFormat + output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat + properties: + columns _col0,_col1 + columns.types string,double + escape.delim \ + serialization.lib org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe + serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe + TotalFiles: 1 + GatherStats: false + MultiFileSpray: false + Path -> Alias: +#### A masked pattern was here #### + Path -> Partition: +#### A masked pattern was here #### + Partition + base file name: src_10 + input format: org.apache.hadoop.mapred.TextInputFormat + output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + properties: + COLUMN_STATS_ACCURATE true + bucket_count -1 + columns key,value + columns.comments + columns.types string:string +#### A masked pattern was here #### + name default.src_10 + numFiles 1 + numRows 10 + rawDataSize 104 + serialization.ddl struct src_10 { string key, string value} + serialization.format 1 + serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + totalSize 114 +#### A masked pattern was here #### + serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + input format: org.apache.hadoop.mapred.TextInputFormat + output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + properties: + COLUMN_STATS_ACCURATE true + bucket_count -1 + columns key,value + columns.comments + columns.types string:string +#### A masked pattern was here #### + name default.src_10 + numFiles 1 + numRows 10 + rawDataSize 104 + serialization.ddl struct src_10 { string key, string value} + serialization.format 1 + serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + totalSize 114 +#### A masked pattern was here #### + serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + name: default.src_10 + name: default.src_10 + Truncated Path -> Alias: + /src_10 [src_10] + Needs Tagging: false + Reduce Operator Tree: + Select Operator + expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 (type: double) + outputColumnNames: _col0, _col1 + Statistics: Num rows: 20 Data size: 208 Basic stats: COMPLETE Column stats: NONE + File Output Operator + compressed: false + GlobalTableId: 2 +#### A masked pattern was here #### + NumFilesPerFileSink: 1 + Statistics: Num rows: 20 Data size: 208 Basic stats: COMPLETE Column stats: NONE +#### A masked pattern was here #### + table: + input format: org.apache.hadoop.mapred.TextInputFormat + output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + properties: + bucket_count -1 + columns key,value + columns.comments + columns.types string:string +#### A masked pattern was here #### + name default.src_lv2 + serialization.ddl struct src_lv2 { string key, string value} + serialization.format 1 + serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe +#### A masked pattern was here #### + serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + name: default.src_lv2 + TotalFiles: 1 + GatherStats: true + MultiFileSpray: false + + Stage: Stage-1 + Move Operator + tables: + replace: true +#### A masked pattern was here #### + table: + input format: org.apache.hadoop.mapred.TextInputFormat + output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + properties: + bucket_count -1 + columns key,value + columns.comments + columns.types string:string +#### A masked pattern was here #### + name default.src_lv2 + serialization.ddl struct src_lv2 { string key, string value} + serialization.format 1 + serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe +#### A masked pattern was here #### + serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + name: default.src_lv2 + + Stage: Stage-3 + Stats-Aggr Operator +#### A masked pattern was here #### + + Stage: Stage-4 + Map Reduce + Map Operator Tree: + TableScan + GatherStats: false + Reduce Output Operator + key expressions: _col0 (type: string), _col1 (type: double) + sort order: -+ + Statistics: Num rows: 20 Data size: 208 Basic stats: COMPLETE Column stats: NONE + tag: -1 + Path -> Alias: +#### A masked pattern was here #### + Path -> Partition: +#### A masked pattern was here #### + Partition + base file name: -mr-10002 + input format: org.apache.hadoop.mapred.SequenceFileInputFormat + output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat + properties: + columns _col0,_col1 + columns.types string,double + escape.delim \ + serialization.lib org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe + serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe + + input format: org.apache.hadoop.mapred.SequenceFileInputFormat + output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat + properties: + columns _col0,_col1 + columns.types string,double + escape.delim \ + serialization.lib org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe + serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe + Truncated Path -> Alias: +#### A masked pattern was here #### + Needs Tagging: false + Reduce Operator Tree: + Select Operator + expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 (type: double) + outputColumnNames: _col0, _col1 + Statistics: Num rows: 20 Data size: 208 Basic stats: COMPLETE Column stats: NONE + File Output Operator + compressed: false + GlobalTableId: 1 +#### A masked pattern was here #### + NumFilesPerFileSink: 1 + Statistics: Num rows: 20 Data size: 208 Basic stats: COMPLETE Column stats: NONE +#### A masked pattern was here #### + table: + input format: org.apache.hadoop.mapred.TextInputFormat + output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + properties: + bucket_count -1 + columns key,value + columns.comments + columns.types string:string +#### A masked pattern was here #### + name default.src_lv1 + serialization.ddl struct src_lv1 { string key, string value} + serialization.format 1 + serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe +#### A masked pattern was here #### + serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + name: default.src_lv1 + TotalFiles: 1 + GatherStats: true + MultiFileSpray: false + + Stage: Stage-0 + Move Operator + tables: + replace: true +#### A masked pattern was here #### + table: + input format: org.apache.hadoop.mapred.TextInputFormat + output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + properties: + bucket_count -1 + columns key,value + columns.comments + columns.types string:string +#### A masked pattern was here #### + name default.src_lv1 + serialization.ddl struct src_lv1 { string key, string value} + serialization.format 1 + serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe +#### A masked pattern was here #### + serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + name: default.src_lv1 + + Stage: Stage-5 + Stats-Aggr Operator +#### A masked pattern was here #### + +PREHOOK: query: from src_10 +insert overwrite table src_lv1 select * from (select key, C lateral view explode(array(key+1, key+2)) A as C) X1 order by key desc, C +insert overwrite table src_lv2 select * from (select key, C lateral view explode(array(key+3, key+4)) A as C) X2 order by key asc, C +PREHOOK: type: QUERY +PREHOOK: Input: default@src_10 +PREHOOK: Output: default@src_lv1 +PREHOOK: Output: default@src_lv2 +POSTHOOK: query: from src_10 +insert overwrite table src_lv1 select * from (select key, C lateral view explode(array(key+1, key+2)) A as C) X1 order by key desc, C +insert overwrite table src_lv2 select * from (select key, C lateral view explode(array(key+3, key+4)) A as C) X2 order by key asc, C +POSTHOOK: type: QUERY +POSTHOOK: Input: default@src_10 +POSTHOOK: Output: default@src_lv1 +POSTHOOK: Output: default@src_lv2 +POSTHOOK: Lineage: src_lv1.key SCRIPT [(src_10)src_10.FieldSchema(name:key, type:string, comment:null), ] +POSTHOOK: Lineage: src_lv1.value SIMPLE [(src_10)src_10.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ] +POSTHOOK: Lineage: src_lv2.key SCRIPT [(src_10)src_10.FieldSchema(name:key, type:string, comment:null), ] +POSTHOOK: Lineage: src_lv2.value SIMPLE [(src_10)src_10.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ] +PREHOOK: query: select * from src_lv1 +PREHOOK: type: QUERY +PREHOOK: Input: default@src_lv1 +#### A masked pattern was here #### +POSTHOOK: query: select * from src_lv1 +POSTHOOK: type: QUERY +POSTHOOK: Input: default@src_lv1 +#### A masked pattern was here #### +98 99.0 +98 100.0 +86 87.0 +86 88.0 +484 485.0 +484 486.0 +409 410.0 +409 411.0 +311 312.0 +311 313.0 +278 279.0 +278 280.0 +27 28.0 +27 29.0 +255 256.0 +255 257.0 +238 239.0 +238 240.0 +165 166.0 +165 167.0 +PREHOOK: query: select * from src_lv2 +PREHOOK: type: QUERY +PREHOOK: Input: default@src_lv2 +#### A masked pattern was here #### +POSTHOOK: query: select * from src_lv2 +POSTHOOK: type: QUERY +POSTHOOK: Input: default@src_lv2 +#### A masked pattern was here #### +165 168.0 +165 169.0 +238 241.0 +238 242.0 +255 258.0 +255 259.0 +27 30.0 +27 31.0 +278 281.0 +278 282.0 +311 314.0 +311 315.0 +409 412.0 +409 413.0 +484 487.0 +484 488.0 +86 89.0 +86 90.0 +98 101.0 +98 102.0 diff --git ql/src/test/results/clientpositive/outer_join_ppr.q.out ql/src/test/results/clientpositive/outer_join_ppr.q.out index c9e3fbc..2128eaf 100644 --- ql/src/test/results/clientpositive/outer_join_ppr.q.out +++ ql/src/test/results/clientpositive/outer_join_ppr.q.out @@ -19,7 +19,7 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM + TOK_FROM_BASE TOK_FULLOUTERJOIN TOK_TABREF TOK_TABNAME @@ -45,59 +45,60 @@ TOK_QUERY b ds '2008-04-08' - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - . - TOK_TABLE_OR_COL - a - key - TOK_SELEXPR - . - TOK_TABLE_OR_COL - a - value - TOK_SELEXPR - . - TOK_TABLE_OR_COL - b - key - TOK_SELEXPR - . - TOK_TABLE_OR_COL - b - value - TOK_WHERE - AND + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + . + TOK_TABLE_OR_COL + a + key + TOK_SELEXPR + . + TOK_TABLE_OR_COL + a + value + TOK_SELEXPR + . + TOK_TABLE_OR_COL + b + key + TOK_SELEXPR + . + TOK_TABLE_OR_COL + b + value + TOK_WHERE AND AND + AND + > + . + TOK_TABLE_OR_COL + a + key + 10 + < + . + TOK_TABLE_OR_COL + a + key + 20 > . TOK_TABLE_OR_COL - a - key - 10 - < - . - TOK_TABLE_OR_COL - a + b key - 20 - > + 15 + < . TOK_TABLE_OR_COL b key - 15 - < - . - TOK_TABLE_OR_COL - b - key - 25 + 25 STAGE DEPENDENCIES: @@ -481,7 +482,7 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM + TOK_FROM_BASE TOK_FULLOUTERJOIN TOK_TABREF TOK_TABNAME @@ -500,66 +501,67 @@ TOK_QUERY TOK_TABLE_OR_COL b key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - . - TOK_TABLE_OR_COL - a - key - TOK_SELEXPR - . - TOK_TABLE_OR_COL - a - value - TOK_SELEXPR - . - TOK_TABLE_OR_COL - b - key - TOK_SELEXPR - . - TOK_TABLE_OR_COL - b - value - TOK_WHERE - AND + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + . + TOK_TABLE_OR_COL + a + key + TOK_SELEXPR + . + TOK_TABLE_OR_COL + a + value + TOK_SELEXPR + . + TOK_TABLE_OR_COL + b + key + TOK_SELEXPR + . + TOK_TABLE_OR_COL + b + value + TOK_WHERE AND AND AND + AND + > + . + TOK_TABLE_OR_COL + a + key + 10 + < + . + TOK_TABLE_OR_COL + a + key + 20 > . TOK_TABLE_OR_COL - a + b key - 10 - < - . - TOK_TABLE_OR_COL - a - key - 20 - > + 15 + < . TOK_TABLE_OR_COL b key - 15 - < + 25 + = . TOK_TABLE_OR_COL b - key - 25 - = - . - TOK_TABLE_OR_COL - b - ds - '2008-04-08' + ds + '2008-04-08' STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/pcr.q.out ql/src/test/results/clientpositive/pcr.q.out index b74dfbf..bd20114 100644 --- ql/src/test/results/clientpositive/pcr.q.out +++ ql/src/test/results/clientpositive/pcr.q.out @@ -54,10 +54,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - pcr_t1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -89,6 +85,10 @@ TOK_QUERY TOK_TABSORTCOLNAMEASC TOK_TABLE_OR_COL ds + TOK_FROM + TOK_TABREF + TOK_TABNAME + pcr_t1 STAGE DEPENDENCIES: @@ -276,10 +276,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - pcr_t1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -305,6 +301,10 @@ TOK_QUERY TOK_TABSORTCOLNAMEASC TOK_TABLE_OR_COL key + TOK_FROM + TOK_TABREF + TOK_TABNAME + pcr_t1 STAGE DEPENDENCIES: @@ -575,10 +575,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - pcr_t1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -615,6 +611,10 @@ TOK_QUERY TOK_TABSORTCOLNAMEASC TOK_TABLE_OR_COL ds + TOK_FROM + TOK_TABREF + TOK_TABNAME + pcr_t1 STAGE DEPENDENCIES: @@ -804,10 +804,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - pcr_t1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -849,6 +845,10 @@ TOK_QUERY TOK_TABSORTCOLNAMEASC TOK_TABLE_OR_COL ds + TOK_FROM + TOK_TABREF + TOK_TABNAME + pcr_t1 STAGE DEPENDENCIES: @@ -1040,10 +1040,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - pcr_t1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1085,6 +1081,10 @@ TOK_QUERY TOK_TABSORTCOLNAMEASC TOK_TABLE_OR_COL ds + TOK_FROM + TOK_TABREF + TOK_TABNAME + pcr_t1 STAGE DEPENDENCIES: @@ -1332,10 +1332,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - pcr_t1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1377,6 +1373,10 @@ TOK_QUERY TOK_TABSORTCOLNAMEASC TOK_TABLE_OR_COL ds + TOK_FROM + TOK_TABREF + TOK_TABNAME + pcr_t1 STAGE DEPENDENCIES: @@ -1632,10 +1632,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - pcr_t1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1669,6 +1665,10 @@ TOK_QUERY TOK_TABSORTCOLNAMEASC TOK_TABLE_OR_COL value + TOK_FROM + TOK_TABREF + TOK_TABNAME + pcr_t1 STAGE DEPENDENCIES: @@ -1845,10 +1845,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - pcr_t1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1877,6 +1873,10 @@ TOK_QUERY TOK_TABSORTCOLNAMEASC TOK_TABLE_OR_COL value + TOK_FROM + TOK_TABREF + TOK_TABNAME + pcr_t1 STAGE DEPENDENCIES: @@ -2089,10 +2089,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - pcr_t1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -2121,6 +2117,10 @@ TOK_QUERY TOK_TABSORTCOLNAMEASC TOK_TABLE_OR_COL value + TOK_FROM + TOK_TABREF + TOK_TABNAME + pcr_t1 STAGE DEPENDENCIES: @@ -2401,10 +2401,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - pcr_t1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -2449,6 +2445,10 @@ TOK_QUERY TOK_TABSORTCOLNAMEASC TOK_TABLE_OR_COL ds + TOK_FROM + TOK_TABREF + TOK_TABNAME + pcr_t1 STAGE DEPENDENCIES: @@ -2626,6 +2626,19 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_ALLCOLREF + TOK_ORDERBY + TOK_TABSORTCOLNAMEASC + . + TOK_TABLE_OR_COL + t1 + key TOK_FROM TOK_JOIN TOK_TABREF @@ -2659,19 +2672,6 @@ TOK_QUERY t2 ds '2000-04-08' - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_ALLCOLREF - TOK_ORDERBY - TOK_TABSORTCOLNAMEASC - . - TOK_TABLE_OR_COL - t1 - key STAGE DEPENDENCIES: @@ -2920,6 +2920,19 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_ALLCOLREF + TOK_ORDERBY + TOK_TABSORTCOLNAMEASC + . + TOK_TABLE_OR_COL + t1 + key TOK_FROM TOK_JOIN TOK_TABREF @@ -2953,19 +2966,6 @@ TOK_QUERY t2 ds '2000-04-09' - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_ALLCOLREF - TOK_ORDERBY - TOK_TABSORTCOLNAMEASC - . - TOK_TABLE_OR_COL - t1 - key STAGE DEPENDENCIES: @@ -3272,10 +3272,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - pcr_t1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -3325,6 +3321,10 @@ TOK_QUERY TOK_TABSORTCOLNAMEASC TOK_TABLE_OR_COL ds + TOK_FROM + TOK_TABREF + TOK_TABNAME + pcr_t1 STAGE DEPENDENCIES: @@ -3639,10 +3639,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - pcr_t1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -3687,6 +3683,10 @@ TOK_QUERY TOK_TABSORTCOLNAMEASC TOK_TABLE_OR_COL ds + TOK_FROM + TOK_TABREF + TOK_TABNAME + pcr_t1 STAGE DEPENDENCIES: @@ -3972,44 +3972,46 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM + TOK_FROM_BASE TOK_TABREF TOK_TABNAME pcr_t1 - TOK_INSERT - TOK_DESTINATION - TOK_TAB - TOK_TABNAME - pcr_t2 - TOK_SELECT - TOK_SELEXPR - TOK_TABLE_OR_COL - key - TOK_SELEXPR - TOK_TABLE_OR_COL - value - TOK_WHERE - = - TOK_TABLE_OR_COL - ds - '2000-04-08' - TOK_INSERT - TOK_DESTINATION - TOK_TAB - TOK_TABNAME - pcr_t3 - TOK_SELECT - TOK_SELEXPR - TOK_TABLE_OR_COL - key - TOK_SELEXPR - TOK_TABLE_OR_COL - value - TOK_WHERE - = - TOK_TABLE_OR_COL - ds - '2000-04-08' + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_TAB + TOK_TABNAME + pcr_t2 + TOK_SELECT + TOK_SELEXPR + TOK_TABLE_OR_COL + key + TOK_SELEXPR + TOK_TABLE_OR_COL + value + TOK_WHERE + = + TOK_TABLE_OR_COL + ds + '2000-04-08' + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_TAB + TOK_TABNAME + pcr_t3 + TOK_SELECT + TOK_SELEXPR + TOK_TABLE_OR_COL + key + TOK_SELEXPR + TOK_TABLE_OR_COL + value + TOK_WHERE + = + TOK_TABLE_OR_COL + ds + '2000-04-08' STAGE DEPENDENCIES: @@ -4539,54 +4541,56 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM + TOK_FROM_BASE TOK_TABREF TOK_TABNAME pcr_t1 - TOK_INSERT - TOK_DESTINATION - TOK_TAB - TOK_TABNAME - pcr_t2 - TOK_SELECT - TOK_SELEXPR - TOK_TABLE_OR_COL - key - TOK_SELEXPR - TOK_TABLE_OR_COL - value - TOK_WHERE - and - = - TOK_TABLE_OR_COL - ds - '2000-04-08' - = + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_TAB + TOK_TABNAME + pcr_t2 + TOK_SELECT + TOK_SELEXPR TOK_TABLE_OR_COL key - 2 - TOK_INSERT - TOK_DESTINATION - TOK_TAB - TOK_TABNAME - pcr_t3 - TOK_SELECT - TOK_SELEXPR - TOK_TABLE_OR_COL - key - TOK_SELEXPR - TOK_TABLE_OR_COL - value - TOK_WHERE - and - = + TOK_SELEXPR TOK_TABLE_OR_COL - ds - '2000-04-08' - = + value + TOK_WHERE + and + = + TOK_TABLE_OR_COL + ds + '2000-04-08' + = + TOK_TABLE_OR_COL + key + 2 + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_TAB + TOK_TABNAME + pcr_t3 + TOK_SELECT + TOK_SELEXPR TOK_TABLE_OR_COL key - 3 + TOK_SELEXPR + TOK_TABLE_OR_COL + value + TOK_WHERE + and + = + TOK_TABLE_OR_COL + ds + '2000-04-08' + = + TOK_TABLE_OR_COL + key + 3 STAGE DEPENDENCIES: @@ -5198,10 +5202,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcpart TOK_INSERT TOK_DESTINATION TOK_DIR @@ -5229,6 +5229,10 @@ TOK_QUERY key TOK_LIMIT 10 + TOK_FROM + TOK_TABREF + TOK_TABNAME + srcpart STAGE DEPENDENCIES: @@ -5356,10 +5360,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcpart TOK_INSERT TOK_DESTINATION TOK_DIR @@ -5407,6 +5407,10 @@ TOK_QUERY TOK_TABSORTCOLNAMEASC TOK_TABLE_OR_COL hr + TOK_FROM + TOK_TABREF + TOK_TABNAME + srcpart STAGE DEPENDENCIES: @@ -5588,10 +5592,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcpart TOK_INSERT TOK_DESTINATION TOK_DIR @@ -5629,6 +5629,10 @@ TOK_QUERY TOK_TABSORTCOLNAMEASC TOK_TABLE_OR_COL hr + TOK_FROM + TOK_TABREF + TOK_TABNAME + srcpart STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/ppd_join_filter.q.out ql/src/test/results/clientpositive/ppd_join_filter.q.out index aa3af74..b206b83 100644 --- ql/src/test/results/clientpositive/ppd_join_filter.q.out +++ ql/src/test/results/clientpositive/ppd_join_filter.q.out @@ -27,6 +27,26 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + . + TOK_TABLE_OR_COL + a + key + TOK_SELEXPR + . + TOK_TABLE_OR_COL + b + k2 + TOK_SELEXPR + . + TOK_TABLE_OR_COL + b + k3 TOK_FROM TOK_JOIN TOK_TABREF @@ -35,10 +55,6 @@ TOK_QUERY a TOK_SUBQUERY TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_DIR @@ -80,6 +96,10 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL key + TOK_FROM + TOK_TABREF + TOK_TABNAME + src b and = @@ -97,26 +117,6 @@ TOK_QUERY b k1 5 - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - . - TOK_TABLE_OR_COL - a - key - TOK_SELEXPR - . - TOK_TABLE_OR_COL - b - k2 - TOK_SELEXPR - . - TOK_TABLE_OR_COL - b - k3 STAGE DEPENDENCIES: @@ -437,6 +437,26 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + . + TOK_TABLE_OR_COL + a + key + TOK_SELEXPR + . + TOK_TABLE_OR_COL + b + k2 + TOK_SELEXPR + . + TOK_TABLE_OR_COL + b + k3 TOK_FROM TOK_JOIN TOK_TABREF @@ -445,10 +465,6 @@ TOK_QUERY a TOK_SUBQUERY TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_DIR @@ -490,6 +506,10 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL key + TOK_FROM + TOK_TABREF + TOK_TABNAME + src b and = @@ -507,26 +527,6 @@ TOK_QUERY b k1 5 - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - . - TOK_TABLE_OR_COL - a - key - TOK_SELEXPR - . - TOK_TABLE_OR_COL - b - k2 - TOK_SELEXPR - . - TOK_TABLE_OR_COL - b - k3 STAGE DEPENDENCIES: @@ -847,6 +847,26 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + . + TOK_TABLE_OR_COL + a + key + TOK_SELEXPR + . + TOK_TABLE_OR_COL + b + k2 + TOK_SELEXPR + . + TOK_TABLE_OR_COL + b + k3 TOK_FROM TOK_JOIN TOK_TABREF @@ -855,10 +875,6 @@ TOK_QUERY a TOK_SUBQUERY TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_DIR @@ -900,6 +916,10 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL key + TOK_FROM + TOK_TABREF + TOK_TABNAME + src b and = @@ -917,26 +937,6 @@ TOK_QUERY b k1 5 - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - . - TOK_TABLE_OR_COL - a - key - TOK_SELEXPR - . - TOK_TABLE_OR_COL - b - k2 - TOK_SELEXPR - . - TOK_TABLE_OR_COL - b - k3 STAGE DEPENDENCIES: @@ -1253,6 +1253,26 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + . + TOK_TABLE_OR_COL + a + key + TOK_SELEXPR + . + TOK_TABLE_OR_COL + b + k2 + TOK_SELEXPR + . + TOK_TABLE_OR_COL + b + k3 TOK_FROM TOK_JOIN TOK_TABREF @@ -1261,10 +1281,6 @@ TOK_QUERY a TOK_SUBQUERY TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1306,6 +1322,10 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL key + TOK_FROM + TOK_TABREF + TOK_TABNAME + src b and = @@ -1323,26 +1343,6 @@ TOK_QUERY b k1 5 - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - . - TOK_TABLE_OR_COL - a - key - TOK_SELEXPR - . - TOK_TABLE_OR_COL - b - k2 - TOK_SELEXPR - . - TOK_TABLE_OR_COL - b - k3 STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/ppd_union_view.q.out ql/src/test/results/clientpositive/ppd_union_view.q.out index 82406be..09888d5 100644 --- ql/src/test/results/clientpositive/ppd_union_view.q.out +++ ql/src/test/results/clientpositive/ppd_union_view.q.out @@ -135,10 +135,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - t1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -151,6 +147,10 @@ TOK_QUERY TOK_TABLE_OR_COL ds '2011-10-13' + TOK_FROM + TOK_TABREF + TOK_TABNAME + t1 STAGE DEPENDENCIES: @@ -431,10 +431,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - t1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -447,6 +443,10 @@ TOK_QUERY TOK_TABLE_OR_COL ds '2011-10-15' + TOK_FROM + TOK_TABREF + TOK_TABNAME + t1 STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/ppd_vc.q.out ql/src/test/results/clientpositive/ppd_vc.q.out index 928986f..4d96da5 100644 --- ql/src/test/results/clientpositive/ppd_vc.q.out +++ ql/src/test/results/clientpositive/ppd_vc.q.out @@ -11,10 +11,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcpart TOK_INSERT TOK_DESTINATION TOK_DIR @@ -27,6 +23,10 @@ TOK_QUERY TOK_TABLE_OR_COL BLOCK__OFFSET__INSIDE__FILE 100 + TOK_FROM + TOK_TABREF + TOK_TABNAME + srcpart STAGE DEPENDENCIES: @@ -334,6 +334,25 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_ALLCOLREF + TOK_TABNAME + b + TOK_ORDERBY + TOK_TABSORTCOLNAMEASC + TOK_TABLE_OR_COL + ds + TOK_TABSORTCOLNAMEASC + TOK_TABLE_OR_COL + hr + TOK_TABSORTCOLNAMEASC + TOK_TABLE_OR_COL + BLOCK__OFFSET__INSIDE__FILE TOK_FROM TOK_JOIN TOK_TABREF @@ -342,10 +361,6 @@ TOK_QUERY a TOK_SUBQUERY TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcpart TOK_INSERT TOK_DESTINATION TOK_DIR @@ -361,6 +376,10 @@ TOK_QUERY TOK_TABLE_OR_COL BLOCK__OFFSET__INSIDE__FILE 100 + TOK_FROM + TOK_TABREF + TOK_TABNAME + srcpart b AND = @@ -378,25 +397,6 @@ TOK_QUERY b BLOCK__OFFSET__INSIDE__FILE 50 - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_ALLCOLREF - TOK_TABNAME - b - TOK_ORDERBY - TOK_TABSORTCOLNAMEASC - TOK_TABLE_OR_COL - ds - TOK_TABSORTCOLNAMEASC - TOK_TABLE_OR_COL - hr - TOK_TABSORTCOLNAMEASC - TOK_TABLE_OR_COL - BLOCK__OFFSET__INSIDE__FILE STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/ppr_allchildsarenull.q.out ql/src/test/results/clientpositive/ppr_allchildsarenull.q.out index 632fd4b..fa5b85d 100644 --- ql/src/test/results/clientpositive/ppr_allchildsarenull.q.out +++ ql/src/test/results/clientpositive/ppr_allchildsarenull.q.out @@ -19,10 +19,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcpart TOK_INSERT TOK_DESTINATION TOK_DIR @@ -58,6 +54,10 @@ TOK_QUERY 1 0 0 + TOK_FROM + TOK_TABREF + TOK_TABNAME + srcpart STAGE DEPENDENCIES: @@ -251,10 +251,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcpart TOK_INSERT TOK_DESTINATION TOK_DIR @@ -290,6 +286,10 @@ TOK_QUERY 1 0 0 + TOK_FROM + TOK_TABREF + TOK_TABNAME + srcpart STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/push_or.q.out ql/src/test/results/clientpositive/push_or.q.out index 132a160..26959d1 100644 --- ql/src/test/results/clientpositive/push_or.q.out +++ ql/src/test/results/clientpositive/push_or.q.out @@ -36,10 +36,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - push_or TOK_INSERT TOK_DESTINATION TOK_DIR @@ -71,6 +67,10 @@ TOK_QUERY TOK_TABSORTCOLNAMEASC TOK_TABLE_OR_COL ds + TOK_FROM + TOK_TABREF + TOK_TABNAME + push_or STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/rand_partitionpruner1.q.out ql/src/test/results/clientpositive/rand_partitionpruner1.q.out index 1c49a25..5959c6e 100644 --- ql/src/test/results/clientpositive/rand_partitionpruner1.q.out +++ ql/src/test/results/clientpositive/rand_partitionpruner1.q.out @@ -7,10 +7,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_DIR @@ -24,6 +20,10 @@ TOK_QUERY rand 1 0.1 + TOK_FROM + TOK_TABREF + TOK_TABNAME + src STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/rand_partitionpruner2.q.out ql/src/test/results/clientpositive/rand_partitionpruner2.q.out index 557dd9d..fbfc59c 100644 --- ql/src/test/results/clientpositive/rand_partitionpruner2.q.out +++ ql/src/test/results/clientpositive/rand_partitionpruner2.q.out @@ -20,11 +20,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcpart - a TOK_INSERT TOK_DESTINATION TOK_TAB @@ -48,6 +43,11 @@ TOK_QUERY a ds '2008-04-08' + TOK_FROM + TOK_TABREF + TOK_TABNAME + srcpart + a STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/rand_partitionpruner3.q.out ql/src/test/results/clientpositive/rand_partitionpruner3.q.out index 93df215..ad58177 100644 --- ql/src/test/results/clientpositive/rand_partitionpruner3.q.out +++ ql/src/test/results/clientpositive/rand_partitionpruner3.q.out @@ -9,11 +9,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcpart - a TOK_INSERT TOK_DESTINATION TOK_DIR @@ -54,6 +49,11 @@ TOK_QUERY a hr '%2' + TOK_FROM + TOK_TABREF + TOK_TABNAME + srcpart + a STAGE DEPENDENCIES: @@ -179,11 +179,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcpart - a TOK_INSERT TOK_DESTINATION TOK_DIR @@ -218,6 +213,11 @@ TOK_QUERY a hr '%2' + TOK_FROM + TOK_TABREF + TOK_TABNAME + srcpart + a STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/reduce_deduplicate.q.out ql/src/test/results/clientpositive/reduce_deduplicate.q.out index cab7215..208ce75 100644 --- ql/src/test/results/clientpositive/reduce_deduplicate.q.out +++ ql/src/test/results/clientpositive/reduce_deduplicate.q.out @@ -16,10 +16,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_TAB @@ -31,6 +27,10 @@ TOK_QUERY TOK_CLUSTERBY TOK_TABLE_OR_COL key + TOK_FROM + TOK_TABREF + TOK_TABNAME + src STAGE DEPENDENCIES: @@ -246,16 +246,75 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_TAB + TOK_TABNAME + complex_tbl_1 + TOK_PARTSPEC + TOK_PARTVAL + ds + '2010-03-29' + TOK_SELECT + TOK_SELEXPR + TOK_ALLCOLREF + TOK_TABNAME + s2 TOK_FROM TOK_SUBQUERY TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_TRANSFORM + TOK_EXPLIST + TOK_TABLE_OR_COL + aid + TOK_TABLE_OR_COL + bid + TOK_TABLE_OR_COL + t + TOK_TABLE_OR_COL + ctime + TOK_TABLE_OR_COL + etime + TOK_TABLE_OR_COL + l + TOK_TABLE_OR_COL + et + TOK_SERDE + TOK_RECORDWRITER + 'cat' + TOK_SERDE + TOK_RECORDREADER + TOK_TABCOLLIST + TOK_TABCOL + aid + TOK_STRING + TOK_TABCOL + bid + TOK_STRING + TOK_TABCOL + t + TOK_INT + TOK_TABCOL + ctime + TOK_STRING + TOK_TABCOL + etime + TOK_BIGINT + TOK_TABCOL + l + TOK_STRING + TOK_TABCOL + et + TOK_STRING TOK_FROM TOK_SUBQUERY TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - complex_tbl_2 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -303,71 +362,12 @@ TOK_QUERY TOK_CLUSTERBY TOK_TABLE_OR_COL bid + TOK_FROM + TOK_TABREF + TOK_TABNAME + complex_tbl_2 s - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_TRANSFORM - TOK_EXPLIST - TOK_TABLE_OR_COL - aid - TOK_TABLE_OR_COL - bid - TOK_TABLE_OR_COL - t - TOK_TABLE_OR_COL - ctime - TOK_TABLE_OR_COL - etime - TOK_TABLE_OR_COL - l - TOK_TABLE_OR_COL - et - TOK_SERDE - TOK_RECORDWRITER - 'cat' - TOK_SERDE - TOK_RECORDREADER - TOK_TABCOLLIST - TOK_TABCOL - aid - TOK_STRING - TOK_TABCOL - bid - TOK_STRING - TOK_TABCOL - t - TOK_INT - TOK_TABCOL - ctime - TOK_STRING - TOK_TABCOL - etime - TOK_BIGINT - TOK_TABCOL - l - TOK_STRING - TOK_TABCOL - et - TOK_STRING s2 - TOK_INSERT - TOK_DESTINATION - TOK_TAB - TOK_TABNAME - complex_tbl_1 - TOK_PARTSPEC - TOK_PARTVAL - ds - '2010-03-29' - TOK_SELECT - TOK_SELEXPR - TOK_ALLCOLREF - TOK_TABNAME - s2 STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/regexp_extract.q.out ql/src/test/results/clientpositive/regexp_extract.q.out index 6218e77..24673cd 100644 --- ql/src/test/results/clientpositive/regexp_extract.q.out +++ ql/src/test/results/clientpositive/regexp_extract.q.out @@ -19,70 +19,72 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM + TOK_FROM_BASE TOK_SUBQUERY TOK_QUERY - TOK_FROM + TOK_FROM_BASE TOK_TABREF TOK_TABNAME src - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_TRANSFORM - TOK_EXPLIST - . - TOK_TABLE_OR_COL - src - key - . - TOK_TABLE_OR_COL - src - value - + - 1 - 2 - + - 3 - 4 - TOK_SERDE - TOK_RECORDWRITER - 'cat' - TOK_SERDE - TOK_RECORDREADER - TOK_CLUSTERBY - TOK_TABLE_OR_COL - key + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_TRANSFORM + TOK_EXPLIST + . + TOK_TABLE_OR_COL + src + key + . + TOK_TABLE_OR_COL + src + value + + + 1 + 2 + + + 3 + 4 + TOK_SERDE + TOK_RECORDWRITER + 'cat' + TOK_SERDE + TOK_RECORDREADER + TOK_CLUSTERBY + TOK_TABLE_OR_COL + key tmap - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - . - TOK_TABLE_OR_COL - tmap - key - TOK_SELEXPR - TOK_FUNCTION - regexp_extract + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + . + TOK_TABLE_OR_COL + tmap + key + TOK_SELEXPR + TOK_FUNCTION + regexp_extract + . + TOK_TABLE_OR_COL + tmap + value + 'val_(\\d+\\t\\d+)' + 1 + TOK_WHERE + < . TOK_TABLE_OR_COL tmap - value - 'val_(\\d+\\t\\d+)' - 1 - TOK_WHERE - < - . - TOK_TABLE_OR_COL - tmap - key - 100 + key + 100 STAGE DEPENDENCIES: @@ -334,69 +336,71 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM + TOK_FROM_BASE TOK_SUBQUERY TOK_QUERY - TOK_FROM + TOK_FROM_BASE TOK_TABREF TOK_TABNAME src - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_TRANSFORM - TOK_EXPLIST - . - TOK_TABLE_OR_COL - src - key - . - TOK_TABLE_OR_COL - src - value - + - 1 - 2 - + - 3 - 4 - TOK_SERDE - TOK_RECORDWRITER - 'cat' - TOK_SERDE - TOK_RECORDREADER - TOK_CLUSTERBY - TOK_TABLE_OR_COL - key + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_TRANSFORM + TOK_EXPLIST + . + TOK_TABLE_OR_COL + src + key + . + TOK_TABLE_OR_COL + src + value + + + 1 + 2 + + + 3 + 4 + TOK_SERDE + TOK_RECORDWRITER + 'cat' + TOK_SERDE + TOK_RECORDREADER + TOK_CLUSTERBY + TOK_TABLE_OR_COL + key tmap - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - . - TOK_TABLE_OR_COL - tmap - key - TOK_SELEXPR - TOK_FUNCTION - regexp_extract + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + . + TOK_TABLE_OR_COL + tmap + key + TOK_SELEXPR + TOK_FUNCTION + regexp_extract + . + TOK_TABLE_OR_COL + tmap + value + 'val_(\\d+\\t\\d+)' + TOK_WHERE + < . TOK_TABLE_OR_COL tmap - value - 'val_(\\d+\\t\\d+)' - TOK_WHERE - < - . - TOK_TABLE_OR_COL - tmap - key - 100 + key + 100 STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/router_join_ppr.q.out ql/src/test/results/clientpositive/router_join_ppr.q.out index aa2789f..3ed8045 100644 --- ql/src/test/results/clientpositive/router_join_ppr.q.out +++ ql/src/test/results/clientpositive/router_join_ppr.q.out @@ -19,7 +19,7 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM + TOK_FROM_BASE TOK_RIGHTOUTERJOIN TOK_TABREF TOK_TABNAME @@ -45,59 +45,60 @@ TOK_QUERY b ds '2008-04-08' - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - . - TOK_TABLE_OR_COL - a - key - TOK_SELEXPR - . - TOK_TABLE_OR_COL - a - value - TOK_SELEXPR - . - TOK_TABLE_OR_COL - b - key - TOK_SELEXPR - . - TOK_TABLE_OR_COL - b - value - TOK_WHERE - AND + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + . + TOK_TABLE_OR_COL + a + key + TOK_SELEXPR + . + TOK_TABLE_OR_COL + a + value + TOK_SELEXPR + . + TOK_TABLE_OR_COL + b + key + TOK_SELEXPR + . + TOK_TABLE_OR_COL + b + value + TOK_WHERE AND AND + AND + > + . + TOK_TABLE_OR_COL + a + key + 10 + < + . + TOK_TABLE_OR_COL + a + key + 20 > . TOK_TABLE_OR_COL - a - key - 10 - < - . - TOK_TABLE_OR_COL - a + b key - 20 - > + 15 + < . TOK_TABLE_OR_COL b key - 15 - < - . - TOK_TABLE_OR_COL - b - key - 25 + 25 STAGE DEPENDENCIES: @@ -489,7 +490,7 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM + TOK_FROM_BASE TOK_RIGHTOUTERJOIN TOK_TABREF TOK_TABNAME @@ -515,59 +516,60 @@ TOK_QUERY a ds '2008-04-08' - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - . - TOK_TABLE_OR_COL - a - key - TOK_SELEXPR - . - TOK_TABLE_OR_COL - a - value - TOK_SELEXPR - . - TOK_TABLE_OR_COL - b - key - TOK_SELEXPR - . - TOK_TABLE_OR_COL - b - value - TOK_WHERE - AND + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + . + TOK_TABLE_OR_COL + a + key + TOK_SELEXPR + . + TOK_TABLE_OR_COL + a + value + TOK_SELEXPR + . + TOK_TABLE_OR_COL + b + key + TOK_SELEXPR + . + TOK_TABLE_OR_COL + b + value + TOK_WHERE AND AND + AND + > + . + TOK_TABLE_OR_COL + a + key + 10 + < + . + TOK_TABLE_OR_COL + a + key + 20 > . TOK_TABLE_OR_COL - a - key - 10 - < - . - TOK_TABLE_OR_COL - a + b key - 20 - > + 15 + < . TOK_TABLE_OR_COL b key - 15 - < - . - TOK_TABLE_OR_COL - b - key - 25 + 25 STAGE DEPENDENCIES: @@ -856,7 +858,7 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM + TOK_FROM_BASE TOK_RIGHTOUTERJOIN TOK_TABREF TOK_TABNAME @@ -875,66 +877,67 @@ TOK_QUERY TOK_TABLE_OR_COL b key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - . - TOK_TABLE_OR_COL - a - key - TOK_SELEXPR - . - TOK_TABLE_OR_COL - a - value - TOK_SELEXPR - . - TOK_TABLE_OR_COL - b - key - TOK_SELEXPR - . - TOK_TABLE_OR_COL - b - value - TOK_WHERE - AND + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + . + TOK_TABLE_OR_COL + a + key + TOK_SELEXPR + . + TOK_TABLE_OR_COL + a + value + TOK_SELEXPR + . + TOK_TABLE_OR_COL + b + key + TOK_SELEXPR + . + TOK_TABLE_OR_COL + b + value + TOK_WHERE AND AND AND + AND + > + . + TOK_TABLE_OR_COL + a + key + 10 + < + . + TOK_TABLE_OR_COL + a + key + 20 > . TOK_TABLE_OR_COL - a - key - 10 - < - . - TOK_TABLE_OR_COL - a + b key - 20 - > + 15 + < . TOK_TABLE_OR_COL b key - 15 - < + 25 + = . TOK_TABLE_OR_COL b - key - 25 - = - . - TOK_TABLE_OR_COL - b - ds - '2008-04-08' + ds + '2008-04-08' STAGE DEPENDENCIES: @@ -1223,7 +1226,7 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM + TOK_FROM_BASE TOK_RIGHTOUTERJOIN TOK_TABREF TOK_TABNAME @@ -1242,66 +1245,67 @@ TOK_QUERY TOK_TABLE_OR_COL b key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - . - TOK_TABLE_OR_COL - a - key - TOK_SELEXPR - . - TOK_TABLE_OR_COL - a - value - TOK_SELEXPR - . - TOK_TABLE_OR_COL - b - key - TOK_SELEXPR - . - TOK_TABLE_OR_COL - b - value - TOK_WHERE - AND + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + . + TOK_TABLE_OR_COL + a + key + TOK_SELEXPR + . + TOK_TABLE_OR_COL + a + value + TOK_SELEXPR + . + TOK_TABLE_OR_COL + b + key + TOK_SELEXPR + . + TOK_TABLE_OR_COL + b + value + TOK_WHERE AND AND AND + AND + > + . + TOK_TABLE_OR_COL + a + key + 10 + < + . + TOK_TABLE_OR_COL + a + key + 20 > . TOK_TABLE_OR_COL - a + b key - 10 - < - . - TOK_TABLE_OR_COL - a - key - 20 - > + 15 + < . TOK_TABLE_OR_COL b key - 15 - < + 25 + = . TOK_TABLE_OR_COL - b - key - 25 - = - . - TOK_TABLE_OR_COL - a - ds - '2008-04-08' + a + ds + '2008-04-08' STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/sample1.q.out ql/src/test/results/clientpositive/sample1.q.out index e6adac9..363b85a 100644 --- ql/src/test/results/clientpositive/sample1.q.out +++ ql/src/test/results/clientpositive/sample1.q.out @@ -20,16 +20,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcpart - TOK_TABLEBUCKETSAMPLE - 1 - 1 - TOK_FUNCTION - rand - s TOK_INSERT TOK_DESTINATION TOK_TAB @@ -54,6 +44,16 @@ TOK_QUERY s hr '11' + TOK_FROM + TOK_TABREF + TOK_TABNAME + srcpart + TOK_TABLEBUCKETSAMPLE + 1 + 1 + TOK_FUNCTION + rand + s STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/sample10.q.out ql/src/test/results/clientpositive/sample10.q.out index f72d35e..8cda2d0 100644 --- ql/src/test/results/clientpositive/sample10.q.out +++ ql/src/test/results/clientpositive/sample10.q.out @@ -45,15 +45,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcpartbucket - TOK_TABLEBUCKETSAMPLE - 1 - 4 - TOK_TABLE_OR_COL - key TOK_INSERT TOK_DESTINATION TOK_DIR @@ -78,6 +69,15 @@ TOK_QUERY TOK_TABSORTCOLNAMEASC TOK_TABLE_OR_COL ds + TOK_FROM + TOK_TABREF + TOK_TABNAME + srcpartbucket + TOK_TABLEBUCKETSAMPLE + 1 + 4 + TOK_TABLE_OR_COL + key STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/sample2.q.out ql/src/test/results/clientpositive/sample2.q.out index 3f8a4cc..5d696dc 100644 --- ql/src/test/results/clientpositive/sample2.q.out +++ ql/src/test/results/clientpositive/sample2.q.out @@ -20,14 +20,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcbucket - TOK_TABLEBUCKETSAMPLE - 1 - 2 - s TOK_INSERT TOK_DESTINATION TOK_TAB @@ -38,6 +30,14 @@ TOK_QUERY TOK_ALLCOLREF TOK_TABNAME s + TOK_FROM + TOK_TABREF + TOK_TABNAME + srcbucket + TOK_TABLEBUCKETSAMPLE + 1 + 2 + s STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/sample4.q.out ql/src/test/results/clientpositive/sample4.q.out index e6ee033..35a7397 100644 --- ql/src/test/results/clientpositive/sample4.q.out +++ ql/src/test/results/clientpositive/sample4.q.out @@ -20,16 +20,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcbucket - TOK_TABLEBUCKETSAMPLE - 1 - 2 - TOK_TABLE_OR_COL - key - s TOK_INSERT TOK_DESTINATION TOK_TAB @@ -40,6 +30,16 @@ TOK_QUERY TOK_ALLCOLREF TOK_TABNAME s + TOK_FROM + TOK_TABREF + TOK_TABNAME + srcbucket + TOK_TABLEBUCKETSAMPLE + 1 + 2 + TOK_TABLE_OR_COL + key + s STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/sample5.q.out ql/src/test/results/clientpositive/sample5.q.out index 57accb3..cd6e57c 100644 --- ql/src/test/results/clientpositive/sample5.q.out +++ ql/src/test/results/clientpositive/sample5.q.out @@ -18,16 +18,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcbucket - TOK_TABLEBUCKETSAMPLE - 1 - 5 - TOK_TABLE_OR_COL - key - s TOK_INSERT TOK_DESTINATION TOK_TAB @@ -38,6 +28,16 @@ TOK_QUERY TOK_ALLCOLREF TOK_TABNAME s + TOK_FROM + TOK_TABREF + TOK_TABNAME + srcbucket + TOK_TABLEBUCKETSAMPLE + 1 + 5 + TOK_TABLE_OR_COL + key + s STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/sample6.q.out ql/src/test/results/clientpositive/sample6.q.out index 45d355f..4bb214a 100644 --- ql/src/test/results/clientpositive/sample6.q.out +++ ql/src/test/results/clientpositive/sample6.q.out @@ -18,16 +18,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcbucket - TOK_TABLEBUCKETSAMPLE - 1 - 4 - TOK_TABLE_OR_COL - key - s TOK_INSERT TOK_DESTINATION TOK_TAB @@ -38,6 +28,16 @@ TOK_QUERY TOK_ALLCOLREF TOK_TABNAME s + TOK_FROM + TOK_TABREF + TOK_TABNAME + srcbucket + TOK_TABLEBUCKETSAMPLE + 1 + 4 + TOK_TABLE_OR_COL + key + s STAGE DEPENDENCIES: @@ -601,16 +601,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcbucket - TOK_TABLEBUCKETSAMPLE - 4 - 4 - TOK_TABLE_OR_COL - key - s TOK_INSERT TOK_DESTINATION TOK_DIR @@ -627,6 +617,16 @@ TOK_QUERY TOK_TABSORTCOLNAMEASC TOK_TABLE_OR_COL value + TOK_FROM + TOK_TABREF + TOK_TABNAME + srcbucket + TOK_TABLEBUCKETSAMPLE + 4 + 4 + TOK_TABLE_OR_COL + key + s STAGE DEPENDENCIES: @@ -997,16 +997,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcbucket - TOK_TABLEBUCKETSAMPLE - 1 - 2 - TOK_TABLE_OR_COL - key - s TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1023,6 +1013,16 @@ TOK_QUERY TOK_TABSORTCOLNAMEASC TOK_TABLE_OR_COL value + TOK_FROM + TOK_TABREF + TOK_TABNAME + srcbucket + TOK_TABLEBUCKETSAMPLE + 1 + 2 + TOK_TABLE_OR_COL + key + s STAGE DEPENDENCIES: @@ -1647,16 +1647,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcbucket - TOK_TABLEBUCKETSAMPLE - 1 - 3 - TOK_TABLE_OR_COL - key - s TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1673,6 +1663,16 @@ TOK_QUERY TOK_TABSORTCOLNAMEASC TOK_TABLE_OR_COL value + TOK_FROM + TOK_TABREF + TOK_TABNAME + srcbucket + TOK_TABLEBUCKETSAMPLE + 1 + 3 + TOK_TABLE_OR_COL + key + s STAGE DEPENDENCIES: @@ -2140,16 +2140,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcbucket - TOK_TABLEBUCKETSAMPLE - 2 - 3 - TOK_TABLE_OR_COL - key - s TOK_INSERT TOK_DESTINATION TOK_DIR @@ -2166,6 +2156,16 @@ TOK_QUERY TOK_TABSORTCOLNAMEASC TOK_TABLE_OR_COL value + TOK_FROM + TOK_TABREF + TOK_TABNAME + srcbucket + TOK_TABLEBUCKETSAMPLE + 2 + 3 + TOK_TABLE_OR_COL + key + s STAGE DEPENDENCIES: @@ -2619,16 +2619,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcbucket2 - TOK_TABLEBUCKETSAMPLE - 1 - 2 - TOK_TABLE_OR_COL - key - s TOK_INSERT TOK_DESTINATION TOK_DIR @@ -2645,6 +2635,16 @@ TOK_QUERY TOK_TABSORTCOLNAMEASC TOK_TABLE_OR_COL value + TOK_FROM + TOK_TABREF + TOK_TABNAME + srcbucket2 + TOK_TABLEBUCKETSAMPLE + 1 + 2 + TOK_TABLE_OR_COL + key + s STAGE DEPENDENCIES: @@ -2945,16 +2945,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcbucket2 - TOK_TABLEBUCKETSAMPLE - 2 - 4 - TOK_TABLE_OR_COL - key - s TOK_INSERT TOK_DESTINATION TOK_DIR @@ -2971,6 +2961,16 @@ TOK_QUERY TOK_TABSORTCOLNAMEASC TOK_TABLE_OR_COL value + TOK_FROM + TOK_TABREF + TOK_TABNAME + srcbucket2 + TOK_TABLEBUCKETSAMPLE + 2 + 4 + TOK_TABLE_OR_COL + key + s STAGE DEPENDENCIES: @@ -3147,16 +3147,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - empty_bucket - TOK_TABLEBUCKETSAMPLE - 1 - 2 - TOK_TABLE_OR_COL - key - s TOK_INSERT TOK_DESTINATION TOK_DIR @@ -3173,6 +3163,16 @@ TOK_QUERY TOK_TABSORTCOLNAMEASC TOK_TABLE_OR_COL value + TOK_FROM + TOK_TABREF + TOK_TABNAME + empty_bucket + TOK_TABLEBUCKETSAMPLE + 1 + 2 + TOK_TABLE_OR_COL + key + s STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/sample7.q.out ql/src/test/results/clientpositive/sample7.q.out index bc5a023..79e3cbd 100644 --- ql/src/test/results/clientpositive/sample7.q.out +++ ql/src/test/results/clientpositive/sample7.q.out @@ -20,16 +20,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcbucket - TOK_TABLEBUCKETSAMPLE - 1 - 4 - TOK_TABLE_OR_COL - key - s TOK_INSERT TOK_DESTINATION TOK_TAB @@ -47,6 +37,16 @@ TOK_QUERY s key 100 + TOK_FROM + TOK_TABREF + TOK_TABNAME + srcbucket + TOK_TABLEBUCKETSAMPLE + 1 + 4 + TOK_TABLE_OR_COL + key + s STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/sample8.q.out ql/src/test/results/clientpositive/sample8.q.out index ddd81c2..012fd64 100644 --- ql/src/test/results/clientpositive/sample8.q.out +++ ql/src/test/results/clientpositive/sample8.q.out @@ -19,26 +19,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_JOIN - TOK_TABREF - TOK_TABNAME - srcpart - TOK_TABLEBUCKETSAMPLE - 1 - 1 - TOK_TABLE_OR_COL - key - s - TOK_TABREF - TOK_TABNAME - srcpart - TOK_TABLEBUCKETSAMPLE - 1 - 10 - TOK_TABLE_OR_COL - key - t TOK_INSERT TOK_DESTINATION TOK_DIR @@ -82,6 +62,26 @@ TOK_QUERY s hr '11' + TOK_FROM + TOK_JOIN + TOK_TABREF + TOK_TABNAME + srcpart + TOK_TABLEBUCKETSAMPLE + 1 + 1 + TOK_TABLE_OR_COL + key + s + TOK_TABREF + TOK_TABNAME + srcpart + TOK_TABLEBUCKETSAMPLE + 1 + 10 + TOK_TABLE_OR_COL + key + t STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/sample9.q.out ql/src/test/results/clientpositive/sample9.q.out index 1dba5e1..d3efdcc 100644 --- ql/src/test/results/clientpositive/sample9.q.out +++ ql/src/test/results/clientpositive/sample9.q.out @@ -9,9 +9,27 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_ALLCOLREF + TOK_TABNAME + s TOK_FROM TOK_SUBQUERY TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_ALLCOLREF + TOK_TABNAME + a TOK_FROM TOK_TABREF TOK_TABNAME @@ -22,25 +40,7 @@ TOK_QUERY TOK_TABLE_OR_COL key a - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_ALLCOLREF - TOK_TABNAME - a s - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_ALLCOLREF - TOK_TABNAME - s STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/serde_user_properties.q.out ql/src/test/results/clientpositive/serde_user_properties.q.out index 8022177..2574365 100644 --- ql/src/test/results/clientpositive/serde_user_properties.q.out +++ ql/src/test/results/clientpositive/serde_user_properties.q.out @@ -9,10 +9,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_DIR @@ -21,6 +17,10 @@ TOK_QUERY TOK_SELEXPR TOK_TABLE_OR_COL key + TOK_FROM + TOK_TABREF + TOK_TABNAME + src STAGE DEPENDENCIES: @@ -123,11 +123,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src - a TOK_INSERT TOK_DESTINATION TOK_DIR @@ -138,6 +133,11 @@ TOK_QUERY TOK_TABLE_OR_COL a key + TOK_FROM + TOK_TABREF + TOK_TABNAME + src + a STAGE DEPENDENCIES: @@ -240,14 +240,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src - TOK_TABLESPLITSAMPLE - TOK_PERCENT - 1 - a TOK_INSERT TOK_DESTINATION TOK_DIR @@ -258,6 +250,14 @@ TOK_QUERY TOK_TABLE_OR_COL a key + TOK_FROM + TOK_TABREF + TOK_TABNAME + src + TOK_TABLESPLITSAMPLE + TOK_PERCENT + 1 + a STAGE DEPENDENCIES: @@ -364,6 +364,14 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_TABLE_OR_COL + key TOK_FROM TOK_TABREF TOK_TABNAME @@ -373,14 +381,6 @@ TOK_QUERY TOK_TABLEPROPERTY 'user.defined.key' 'some.value' - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_TABLE_OR_COL - key STAGE DEPENDENCIES: @@ -485,6 +485,14 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_TABLE_OR_COL + key TOK_FROM TOK_TABREF TOK_TABNAME @@ -497,14 +505,6 @@ TOK_QUERY TOK_TABLESPLITSAMPLE TOK_PERCENT 1 - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_TABLE_OR_COL - key STAGE DEPENDENCIES: @@ -613,16 +613,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src - TOK_TABLEPROPERTIES - TOK_TABLEPROPLIST - TOK_TABLEPROPERTY - 'user.defined.key' - 'some.value' - a TOK_INSERT TOK_DESTINATION TOK_DIR @@ -633,6 +623,16 @@ TOK_QUERY TOK_TABLE_OR_COL a key + TOK_FROM + TOK_TABREF + TOK_TABNAME + src + TOK_TABLEPROPERTIES + TOK_TABLEPROPLIST + TOK_TABLEPROPERTY + 'user.defined.key' + 'some.value' + a STAGE DEPENDENCIES: @@ -737,6 +737,16 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + . + TOK_TABLE_OR_COL + a + key TOK_FROM TOK_TABREF TOK_TABNAME @@ -750,16 +760,6 @@ TOK_QUERY TOK_PERCENT 1 a - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - . - TOK_TABLE_OR_COL - a - key STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/smb_mapjoin9.q.out ql/src/test/results/clientpositive/smb_mapjoin9.q.out index f0ab703..37de952 100644 --- ql/src/test/results/clientpositive/smb_mapjoin9.q.out +++ ql/src/test/results/clientpositive/smb_mapjoin9.q.out @@ -29,25 +29,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_JOIN - TOK_TABREF - TOK_TABNAME - hive_test_smb_bucket1 - a - TOK_TABREF - TOK_TABNAME - hive_test_smb_bucket2 - b - = - . - TOK_TABLE_OR_COL - a - key - . - TOK_TABLE_OR_COL - b - key TOK_INSERT TOK_DESTINATION TOK_DIR @@ -101,6 +82,25 @@ TOK_QUERY TOK_TABLE_OR_COL b key + TOK_FROM + TOK_JOIN + TOK_TABREF + TOK_TABNAME + hive_test_smb_bucket1 + a + TOK_TABREF + TOK_TABNAME + hive_test_smb_bucket2 + b + = + . + TOK_TABLE_OR_COL + a + key + . + TOK_TABLE_OR_COL + b + key STAGE DEPENDENCIES: @@ -148,25 +148,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_JOIN - TOK_TABREF - TOK_TABNAME - hive_test_smb_bucket1 - a - TOK_TABREF - TOK_TABNAME - hive_test_smb_bucket2 - b - = - . - TOK_TABLE_OR_COL - a - key - . - TOK_TABLE_OR_COL - b - key TOK_INSERT TOK_DESTINATION TOK_DIR @@ -220,6 +201,25 @@ TOK_QUERY TOK_TABLE_OR_COL b key + TOK_FROM + TOK_JOIN + TOK_TABREF + TOK_TABNAME + hive_test_smb_bucket1 + a + TOK_TABREF + TOK_TABNAME + hive_test_smb_bucket2 + b + = + . + TOK_TABLE_OR_COL + a + key + . + TOK_TABLE_OR_COL + b + key STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/smb_mapjoin_11.q.out ql/src/test/results/clientpositive/smb_mapjoin_11.q.out index d59b801..7abfa56 100644 --- ql/src/test/results/clientpositive/smb_mapjoin_11.q.out +++ ql/src/test/results/clientpositive/smb_mapjoin_11.q.out @@ -56,6 +56,31 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_TAB + TOK_TABNAME + test_table3 + TOK_PARTSPEC + TOK_PARTVAL + ds + '1' + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + b + TOK_SELEXPR + . + TOK_TABLE_OR_COL + a + key + TOK_SELEXPR + . + TOK_TABLE_OR_COL + b + value TOK_FROM TOK_JOIN TOK_TABREF @@ -89,31 +114,6 @@ TOK_QUERY b ds '1' - TOK_INSERT - TOK_DESTINATION - TOK_TAB - TOK_TABNAME - test_table3 - TOK_PARTSPEC - TOK_PARTVAL - ds - '1' - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - b - TOK_SELEXPR - . - TOK_TABLE_OR_COL - a - key - TOK_SELEXPR - . - TOK_TABLE_OR_COL - b - value STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/smb_mapjoin_12.q.out ql/src/test/results/clientpositive/smb_mapjoin_12.q.out index ab3f93f..ce12e0b 100644 --- ql/src/test/results/clientpositive/smb_mapjoin_12.q.out +++ ql/src/test/results/clientpositive/smb_mapjoin_12.q.out @@ -68,6 +68,31 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_TAB + TOK_TABNAME + test_table3 + TOK_PARTSPEC + TOK_PARTVAL + ds + '1' + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + b + TOK_SELEXPR + . + TOK_TABLE_OR_COL + a + key + TOK_SELEXPR + . + TOK_TABLE_OR_COL + b + value TOK_FROM TOK_JOIN TOK_TABREF @@ -101,31 +126,6 @@ TOK_QUERY b ds '1' - TOK_INSERT - TOK_DESTINATION - TOK_TAB - TOK_TABNAME - test_table3 - TOK_PARTSPEC - TOK_PARTVAL - ds - '1' - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - b - TOK_SELEXPR - . - TOK_TABLE_OR_COL - a - key - TOK_SELEXPR - . - TOK_TABLE_OR_COL - b - value STAGE DEPENDENCIES: @@ -325,6 +325,37 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_TAB + TOK_TABNAME + test_table3 + TOK_PARTSPEC + TOK_PARTVAL + ds + '2' + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + b + TOK_SELEXPR + . + TOK_TABLE_OR_COL + a + key + TOK_SELEXPR + TOK_FUNCTION + concat + . + TOK_TABLE_OR_COL + a + value + . + TOK_TABLE_OR_COL + b + value TOK_FROM TOK_JOIN TOK_TABREF @@ -358,37 +389,6 @@ TOK_QUERY b ds '1' - TOK_INSERT - TOK_DESTINATION - TOK_TAB - TOK_TABNAME - test_table3 - TOK_PARTSPEC - TOK_PARTVAL - ds - '2' - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - b - TOK_SELEXPR - . - TOK_TABLE_OR_COL - a - key - TOK_SELEXPR - TOK_FUNCTION - concat - . - TOK_TABLE_OR_COL - a - value - . - TOK_TABLE_OR_COL - b - value STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/smb_mapjoin_13.q.out ql/src/test/results/clientpositive/smb_mapjoin_13.q.out index e033da1..b0f8bce 100644 --- ql/src/test/results/clientpositive/smb_mapjoin_13.q.out +++ ql/src/test/results/clientpositive/smb_mapjoin_13.q.out @@ -75,25 +75,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_JOIN - TOK_TABREF - TOK_TABNAME - test_table1 - a - TOK_TABREF - TOK_TABNAME - test_table2 - b - = - . - TOK_TABLE_OR_COL - a - key - . - TOK_TABLE_OR_COL - b - value TOK_INSERT TOK_DESTINATION TOK_DIR @@ -114,6 +95,25 @@ TOK_QUERY key TOK_LIMIT 10 + TOK_FROM + TOK_JOIN + TOK_TABREF + TOK_TABNAME + test_table1 + a + TOK_TABREF + TOK_TABNAME + test_table2 + b + = + . + TOK_TABLE_OR_COL + a + key + . + TOK_TABLE_OR_COL + b + value STAGE DEPENDENCIES: @@ -271,25 +271,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_JOIN - TOK_TABREF - TOK_TABNAME - test_table3 - a - TOK_TABREF - TOK_TABNAME - test_table4 - b - = - . - TOK_TABLE_OR_COL - a - key - . - TOK_TABLE_OR_COL - b - value TOK_INSERT TOK_DESTINATION TOK_DIR @@ -310,6 +291,25 @@ TOK_QUERY key TOK_LIMIT 10 + TOK_FROM + TOK_JOIN + TOK_TABREF + TOK_TABNAME + test_table3 + a + TOK_TABREF + TOK_TABNAME + test_table4 + b + = + . + TOK_TABLE_OR_COL + a + key + . + TOK_TABLE_OR_COL + b + value STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/smb_mapjoin_15.q.out ql/src/test/results/clientpositive/smb_mapjoin_15.q.out index 2a4bc28..0d35597 100644 --- ql/src/test/results/clientpositive/smb_mapjoin_15.q.out +++ ql/src/test/results/clientpositive/smb_mapjoin_15.q.out @@ -49,25 +49,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_JOIN - TOK_TABREF - TOK_TABNAME - test_table1 - a - TOK_TABREF - TOK_TABNAME - test_table2 - b - = - . - TOK_TABLE_OR_COL - a - key - . - TOK_TABLE_OR_COL - b - key TOK_INSERT TOK_DESTINATION TOK_DIR @@ -88,6 +69,25 @@ TOK_QUERY key TOK_LIMIT 10 + TOK_FROM + TOK_JOIN + TOK_TABREF + TOK_TABNAME + test_table1 + a + TOK_TABREF + TOK_TABNAME + test_table2 + b + = + . + TOK_TABLE_OR_COL + a + key + . + TOK_TABLE_OR_COL + b + key STAGE DEPENDENCIES: @@ -295,6 +295,26 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + b + TOK_SELEXPR + TOK_ALLCOLREF + TOK_ORDERBY + TOK_TABSORTCOLNAMEASC + . + TOK_TABLE_OR_COL + a + key + TOK_LIMIT + 10 TOK_FROM TOK_JOIN TOK_TABREF @@ -324,26 +344,6 @@ TOK_QUERY TOK_TABLE_OR_COL b key2 - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - b - TOK_SELEXPR - TOK_ALLCOLREF - TOK_ORDERBY - TOK_TABSORTCOLNAMEASC - . - TOK_TABLE_OR_COL - a - key - TOK_LIMIT - 10 STAGE DEPENDENCIES: @@ -501,6 +501,26 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + b + TOK_SELEXPR + TOK_ALLCOLREF + TOK_ORDERBY + TOK_TABSORTCOLNAMEASC + . + TOK_TABLE_OR_COL + a + key + TOK_LIMIT + 10 TOK_FROM TOK_JOIN TOK_TABREF @@ -530,26 +550,6 @@ TOK_QUERY TOK_TABLE_OR_COL b key - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - b - TOK_SELEXPR - TOK_ALLCOLREF - TOK_ORDERBY - TOK_TABSORTCOLNAMEASC - . - TOK_TABLE_OR_COL - a - key - TOK_LIMIT - 10 STAGE DEPENDENCIES: @@ -707,6 +707,26 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + b + TOK_SELEXPR + TOK_ALLCOLREF + TOK_ORDERBY + TOK_TABSORTCOLNAMEASC + . + TOK_TABLE_OR_COL + a + key + TOK_LIMIT + 10 TOK_FROM TOK_JOIN TOK_TABREF @@ -736,26 +756,6 @@ TOK_QUERY TOK_TABLE_OR_COL b value - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - b - TOK_SELEXPR - TOK_ALLCOLREF - TOK_ORDERBY - TOK_TABSORTCOLNAMEASC - . - TOK_TABLE_OR_COL - a - key - TOK_LIMIT - 10 STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/sort_merge_join_desc_5.q.out ql/src/test/results/clientpositive/sort_merge_join_desc_5.q.out index 5ff45d9..c8ba8ce 100644 --- ql/src/test/results/clientpositive/sort_merge_join_desc_5.q.out +++ ql/src/test/results/clientpositive/sort_merge_join_desc_5.q.out @@ -61,6 +61,19 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + b + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -94,19 +107,6 @@ TOK_QUERY b part '1' - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - b - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/sort_merge_join_desc_6.q.out ql/src/test/results/clientpositive/sort_merge_join_desc_6.q.out index 6fdf738..a4b2e81 100644 --- ql/src/test/results/clientpositive/sort_merge_join_desc_6.q.out +++ ql/src/test/results/clientpositive/sort_merge_join_desc_6.q.out @@ -61,6 +61,19 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + b + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -94,19 +107,6 @@ TOK_QUERY b part '1' - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - b - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/sort_merge_join_desc_7.q.out ql/src/test/results/clientpositive/sort_merge_join_desc_7.q.out index 08b9d1e..7ee25df 100644 --- ql/src/test/results/clientpositive/sort_merge_join_desc_7.q.out +++ ql/src/test/results/clientpositive/sort_merge_join_desc_7.q.out @@ -97,6 +97,19 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_HINTLIST + TOK_HINT + TOK_MAPJOIN + TOK_HINTARGLIST + b + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -130,19 +143,6 @@ TOK_QUERY TOK_TABLE_OR_COL b part - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_HINTLIST - TOK_HINT - TOK_MAPJOIN - TOK_HINTARGLIST - b - TOK_SELEXPR - TOK_FUNCTIONSTAR - count STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/stats0.q.out ql/src/test/results/clientpositive/stats0.q.out index 712a474..0f69080 100644 --- ql/src/test/results/clientpositive/stats0.q.out +++ ql/src/test/results/clientpositive/stats0.q.out @@ -16,10 +16,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_TAB @@ -28,6 +24,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + src STAGE DEPENDENCIES: @@ -1329,10 +1329,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_TAB @@ -1341,6 +1337,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + src STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/stats11.q.out ql/src/test/results/clientpositive/stats11.q.out index c5531c5..6273c02 100644 --- ql/src/test/results/clientpositive/stats11.q.out +++ ql/src/test/results/clientpositive/stats11.q.out @@ -311,25 +311,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_JOIN - TOK_TABREF - TOK_TABNAME - srcbucket_mapjoin - a - TOK_TABREF - TOK_TABNAME - srcbucket_mapjoin_part - b - = - . - TOK_TABLE_OR_COL - a - key - . - TOK_TABLE_OR_COL - b - key TOK_INSERT TOK_DESTINATION TOK_TAB @@ -363,6 +344,25 @@ TOK_QUERY b ds "2008-04-08" + TOK_FROM + TOK_JOIN + TOK_TABREF + TOK_TABNAME + srcbucket_mapjoin + a + TOK_TABREF + TOK_TABNAME + srcbucket_mapjoin_part + b + = + . + TOK_TABLE_OR_COL + a + key + . + TOK_TABLE_OR_COL + b + key STAGE DEPENDENCIES: @@ -858,25 +858,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_JOIN - TOK_TABREF - TOK_TABNAME - srcbucket_mapjoin - a - TOK_TABREF - TOK_TABNAME - srcbucket_mapjoin_part - b - = - . - TOK_TABLE_OR_COL - a - key - . - TOK_TABLE_OR_COL - b - key TOK_INSERT TOK_DESTINATION TOK_TAB @@ -910,6 +891,25 @@ TOK_QUERY b ds "2008-04-08" + TOK_FROM + TOK_JOIN + TOK_TABREF + TOK_TABNAME + srcbucket_mapjoin + a + TOK_TABREF + TOK_TABNAME + srcbucket_mapjoin_part + b + = + . + TOK_TABLE_OR_COL + a + key + . + TOK_TABLE_OR_COL + b + key STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/subquery_in_having.q.out ql/src/test/results/clientpositive/subquery_in_having.q.out index b88d717..f488fa0 100644 --- ql/src/test/results/clientpositive/subquery_in_having.q.out +++ ql/src/test/results/clientpositive/subquery_in_having.q.out @@ -368,33 +368,33 @@ STAGE PLANS: predicate: ((key > '9') and value is not null) (type: boolean) Statistics: Num rows: 5 Data size: 1002 Basic stats: COMPLETE Column stats: NONE Select Operator - expressions: value (type: string), key (type: string) - outputColumnNames: value, key + expressions: value (type: string) + outputColumnNames: value Statistics: Num rows: 5 Data size: 1002 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: count() - keys: value (type: string), key (type: string) + keys: value (type: string) mode: hash - outputColumnNames: _col0, _col1, _col2 + outputColumnNames: _col0, _col1 Statistics: Num rows: 5 Data size: 1002 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator - key expressions: _col0 (type: string), _col1 (type: string) - sort order: ++ - Map-reduce partition columns: _col0 (type: string), _col1 (type: string) + key expressions: _col0 (type: string) + sort order: + + Map-reduce partition columns: _col0 (type: string) Statistics: Num rows: 5 Data size: 1002 Basic stats: COMPLETE Column stats: NONE - value expressions: _col2 (type: bigint) + value expressions: _col1 (type: bigint) Reduce Operator Tree: Group By Operator aggregations: count(VALUE._col0) - keys: KEY._col0 (type: string), KEY._col1 (type: string) + keys: KEY._col0 (type: string) mode: mergepartial - outputColumnNames: _col0, _col1, _col2 + outputColumnNames: _col0, _col1 Statistics: Num rows: 2 Data size: 400 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: _col2 is not null (type: boolean) + predicate: _col1 is not null (type: boolean) Statistics: Num rows: 2 Data size: 400 Basic stats: COMPLETE Column stats: NONE Select Operator - expressions: _col2 (type: bigint), _col0 (type: string) + expressions: _col1 (type: bigint), _col0 (type: string) outputColumnNames: _col0, _col1 Statistics: Num rows: 2 Data size: 400 Basic stats: COMPLETE Column stats: NONE Group By Operator diff --git ql/src/test/results/clientpositive/subquery_unqualcolumnrefs.q.out ql/src/test/results/clientpositive/subquery_unqualcolumnrefs.q.out index c835562..12f5eea 100644 --- ql/src/test/results/clientpositive/subquery_unqualcolumnrefs.q.out +++ ql/src/test/results/clientpositive/subquery_unqualcolumnrefs.q.out @@ -743,33 +743,33 @@ STAGE PLANS: predicate: ((key > '9') and value is not null) (type: boolean) Statistics: Num rows: 5 Data size: 1002 Basic stats: COMPLETE Column stats: NONE Select Operator - expressions: value (type: string), key (type: string) - outputColumnNames: value, key + expressions: value (type: string) + outputColumnNames: value Statistics: Num rows: 5 Data size: 1002 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: count() - keys: value (type: string), key (type: string) + keys: value (type: string) mode: hash - outputColumnNames: _col0, _col1, _col2 + outputColumnNames: _col0, _col1 Statistics: Num rows: 5 Data size: 1002 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator - key expressions: _col0 (type: string), _col1 (type: string) - sort order: ++ - Map-reduce partition columns: _col0 (type: string), _col1 (type: string) + key expressions: _col0 (type: string) + sort order: + + Map-reduce partition columns: _col0 (type: string) Statistics: Num rows: 5 Data size: 1002 Basic stats: COMPLETE Column stats: NONE - value expressions: _col2 (type: bigint) + value expressions: _col1 (type: bigint) Reduce Operator Tree: Group By Operator aggregations: count(VALUE._col0) - keys: KEY._col0 (type: string), KEY._col1 (type: string) + keys: KEY._col0 (type: string) mode: mergepartial - outputColumnNames: _col0, _col1, _col2 + outputColumnNames: _col0, _col1 Statistics: Num rows: 2 Data size: 400 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: _col2 is not null (type: boolean) + predicate: _col1 is not null (type: boolean) Statistics: Num rows: 2 Data size: 400 Basic stats: COMPLETE Column stats: NONE Select Operator - expressions: _col2 (type: bigint), _col0 (type: string) + expressions: _col1 (type: bigint), _col0 (type: string) outputColumnNames: _col0, _col1 Statistics: Num rows: 2 Data size: 400 Basic stats: COMPLETE Column stats: NONE Group By Operator diff --git ql/src/test/results/clientpositive/tez/bucket2.q.out ql/src/test/results/clientpositive/tez/bucket2.q.out index 3e7746f..6ce54db 100644 --- ql/src/test/results/clientpositive/tez/bucket2.q.out +++ ql/src/test/results/clientpositive/tez/bucket2.q.out @@ -20,10 +20,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_TAB @@ -32,6 +28,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + src STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/tez/bucket3.q.out ql/src/test/results/clientpositive/tez/bucket3.q.out index cabf30a..858aa6f 100644 --- ql/src/test/results/clientpositive/tez/bucket3.q.out +++ ql/src/test/results/clientpositive/tez/bucket3.q.out @@ -20,10 +20,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_TAB @@ -36,6 +32,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + src STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/tez/bucket4.q.out ql/src/test/results/clientpositive/tez/bucket4.q.out index 9d1e843..6218a16 100644 --- ql/src/test/results/clientpositive/tez/bucket4.q.out +++ ql/src/test/results/clientpositive/tez/bucket4.q.out @@ -16,10 +16,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_TAB @@ -28,6 +24,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + src STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/tez/ctas.q.out ql/src/test/results/clientpositive/tez/ctas.q.out index a58e166..d96f1e2 100644 --- ql/src/test/results/clientpositive/tez/ctas.q.out +++ ql/src/test/results/clientpositive/tez/ctas.q.out @@ -679,10 +679,6 @@ TOK_CREATETABLE '\012' TOK_TBLTEXTFILE TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_DIR @@ -703,6 +699,10 @@ TOK_CREATETABLE value TOK_LIMIT 10 + TOK_FROM + TOK_TABREF + TOK_TABNAME + src STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/tez/disable_merge_for_bucketing.q.out ql/src/test/results/clientpositive/tez/disable_merge_for_bucketing.q.out index 0001443..b6dfb4d 100644 --- ql/src/test/results/clientpositive/tez/disable_merge_for_bucketing.q.out +++ ql/src/test/results/clientpositive/tez/disable_merge_for_bucketing.q.out @@ -16,10 +16,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_TAB @@ -28,6 +24,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + src STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/tez/filter_join_breaktask.q.out ql/src/test/results/clientpositive/tez/filter_join_breaktask.q.out index 494e1fb..dbbbb12 100644 --- ql/src/test/results/clientpositive/tez/filter_join_breaktask.q.out +++ ql/src/test/results/clientpositive/tez/filter_join_breaktask.q.out @@ -30,6 +30,21 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + . + TOK_TABLE_OR_COL + f + key + TOK_SELEXPR + . + TOK_TABLE_OR_COL + g + value TOK_FROM TOK_JOIN TOK_JOIN @@ -112,21 +127,6 @@ TOK_QUERY m value '' - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - . - TOK_TABLE_OR_COL - f - key - TOK_SELEXPR - . - TOK_TABLE_OR_COL - g - value STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/tez/sample1.q.out ql/src/test/results/clientpositive/tez/sample1.q.out index 6f8dfe9..869fc60 100644 --- ql/src/test/results/clientpositive/tez/sample1.q.out +++ ql/src/test/results/clientpositive/tez/sample1.q.out @@ -20,16 +20,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcpart - TOK_TABLEBUCKETSAMPLE - 1 - 1 - TOK_FUNCTION - rand - s TOK_INSERT TOK_DESTINATION TOK_TAB @@ -54,6 +44,16 @@ TOK_QUERY s hr '11' + TOK_FROM + TOK_TABREF + TOK_TABNAME + srcpart + TOK_TABLEBUCKETSAMPLE + 1 + 1 + TOK_FUNCTION + rand + s STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/tez/transform_ppr1.q.out ql/src/test/results/clientpositive/tez/transform_ppr1.q.out index 719ae5b..925add1 100644 --- ql/src/test/results/clientpositive/tez/transform_ppr1.q.out +++ ql/src/test/results/clientpositive/tez/transform_ppr1.q.out @@ -19,76 +19,78 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM + TOK_FROM_BASE TOK_SUBQUERY TOK_QUERY - TOK_FROM + TOK_FROM_BASE TOK_TABREF TOK_TABNAME srcpart src - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_TRANSFORM - TOK_EXPLIST - . - TOK_TABLE_OR_COL - src + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_TRANSFORM + TOK_EXPLIST + . + TOK_TABLE_OR_COL + src + ds + . + TOK_TABLE_OR_COL + src + key + . + TOK_TABLE_OR_COL + src + value + TOK_SERDE + TOK_RECORDWRITER + 'cat' + TOK_SERDE + TOK_RECORDREADER + TOK_ALIASLIST ds - . - TOK_TABLE_OR_COL - src - key - . - TOK_TABLE_OR_COL - src - value - TOK_SERDE - TOK_RECORDWRITER - 'cat' - TOK_SERDE - TOK_RECORDREADER - TOK_ALIASLIST - ds - tkey - tvalue - TOK_CLUSTERBY - TOK_TABLE_OR_COL - tkey + tkey + tvalue + TOK_CLUSTERBY + TOK_TABLE_OR_COL + tkey tmap - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - . - TOK_TABLE_OR_COL - tmap - tkey - TOK_SELEXPR - . - TOK_TABLE_OR_COL - tmap - tvalue - TOK_WHERE - AND - < + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR . TOK_TABLE_OR_COL tmap tkey - 100 - = + TOK_SELEXPR . TOK_TABLE_OR_COL tmap - ds - '2008-04-08' + tvalue + TOK_WHERE + AND + < + . + TOK_TABLE_OR_COL + tmap + tkey + 100 + = + . + TOK_TABLE_OR_COL + tmap + ds + '2008-04-08' STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/tez/transform_ppr2.q.out ql/src/test/results/clientpositive/tez/transform_ppr2.q.out index c82137c..4362b96 100644 --- ql/src/test/results/clientpositive/tez/transform_ppr2.q.out +++ ql/src/test/results/clientpositive/tez/transform_ppr2.q.out @@ -21,76 +21,78 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM + TOK_FROM_BASE TOK_SUBQUERY TOK_QUERY - TOK_FROM + TOK_FROM_BASE TOK_TABREF TOK_TABNAME srcpart src - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_TRANSFORM - TOK_EXPLIST - . - TOK_TABLE_OR_COL - src + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_TRANSFORM + TOK_EXPLIST + . + TOK_TABLE_OR_COL + src + ds + . + TOK_TABLE_OR_COL + src + key + . + TOK_TABLE_OR_COL + src + value + TOK_SERDE + TOK_RECORDWRITER + 'cat' + TOK_SERDE + TOK_RECORDREADER + TOK_ALIASLIST ds - . - TOK_TABLE_OR_COL - src - key - . - TOK_TABLE_OR_COL - src - value - TOK_SERDE - TOK_RECORDWRITER - 'cat' - TOK_SERDE - TOK_RECORDREADER - TOK_ALIASLIST + tkey + tvalue + TOK_WHERE + = + . + TOK_TABLE_OR_COL + src ds - tkey - tvalue - TOK_WHERE - = - . - TOK_TABLE_OR_COL - src - ds - '2008-04-08' - TOK_CLUSTERBY - TOK_TABLE_OR_COL - tkey + '2008-04-08' + TOK_CLUSTERBY + TOK_TABLE_OR_COL + tkey tmap - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - . - TOK_TABLE_OR_COL - tmap - tkey - TOK_SELEXPR - . - TOK_TABLE_OR_COL - tmap - tvalue - TOK_WHERE - < - . - TOK_TABLE_OR_COL - tmap - tkey - 100 + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + . + TOK_TABLE_OR_COL + tmap + tkey + TOK_SELEXPR + . + TOK_TABLE_OR_COL + tmap + tvalue + TOK_WHERE + < + . + TOK_TABLE_OR_COL + tmap + tkey + 100 STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/transform_ppr1.q.out ql/src/test/results/clientpositive/transform_ppr1.q.out index 88baa2c..0db0e53 100644 --- ql/src/test/results/clientpositive/transform_ppr1.q.out +++ ql/src/test/results/clientpositive/transform_ppr1.q.out @@ -19,76 +19,78 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM + TOK_FROM_BASE TOK_SUBQUERY TOK_QUERY - TOK_FROM + TOK_FROM_BASE TOK_TABREF TOK_TABNAME srcpart src - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_TRANSFORM - TOK_EXPLIST - . - TOK_TABLE_OR_COL - src + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_TRANSFORM + TOK_EXPLIST + . + TOK_TABLE_OR_COL + src + ds + . + TOK_TABLE_OR_COL + src + key + . + TOK_TABLE_OR_COL + src + value + TOK_SERDE + TOK_RECORDWRITER + 'cat' + TOK_SERDE + TOK_RECORDREADER + TOK_ALIASLIST ds - . - TOK_TABLE_OR_COL - src - key - . - TOK_TABLE_OR_COL - src - value - TOK_SERDE - TOK_RECORDWRITER - 'cat' - TOK_SERDE - TOK_RECORDREADER - TOK_ALIASLIST - ds - tkey - tvalue - TOK_CLUSTERBY - TOK_TABLE_OR_COL - tkey + tkey + tvalue + TOK_CLUSTERBY + TOK_TABLE_OR_COL + tkey tmap - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - . - TOK_TABLE_OR_COL - tmap - tkey - TOK_SELEXPR - . - TOK_TABLE_OR_COL - tmap - tvalue - TOK_WHERE - AND - < + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR . TOK_TABLE_OR_COL tmap tkey - 100 - = + TOK_SELEXPR . TOK_TABLE_OR_COL tmap - ds - '2008-04-08' + tvalue + TOK_WHERE + AND + < + . + TOK_TABLE_OR_COL + tmap + tkey + 100 + = + . + TOK_TABLE_OR_COL + tmap + ds + '2008-04-08' STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/transform_ppr2.q.out ql/src/test/results/clientpositive/transform_ppr2.q.out index ec52c91..edd08ff 100644 --- ql/src/test/results/clientpositive/transform_ppr2.q.out +++ ql/src/test/results/clientpositive/transform_ppr2.q.out @@ -21,76 +21,78 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM + TOK_FROM_BASE TOK_SUBQUERY TOK_QUERY - TOK_FROM + TOK_FROM_BASE TOK_TABREF TOK_TABNAME srcpart src - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_TRANSFORM - TOK_EXPLIST - . - TOK_TABLE_OR_COL - src + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_TRANSFORM + TOK_EXPLIST + . + TOK_TABLE_OR_COL + src + ds + . + TOK_TABLE_OR_COL + src + key + . + TOK_TABLE_OR_COL + src + value + TOK_SERDE + TOK_RECORDWRITER + 'cat' + TOK_SERDE + TOK_RECORDREADER + TOK_ALIASLIST ds - . - TOK_TABLE_OR_COL - src - key - . - TOK_TABLE_OR_COL - src - value - TOK_SERDE - TOK_RECORDWRITER - 'cat' - TOK_SERDE - TOK_RECORDREADER - TOK_ALIASLIST + tkey + tvalue + TOK_WHERE + = + . + TOK_TABLE_OR_COL + src ds - tkey - tvalue - TOK_WHERE - = - . - TOK_TABLE_OR_COL - src - ds - '2008-04-08' - TOK_CLUSTERBY - TOK_TABLE_OR_COL - tkey + '2008-04-08' + TOK_CLUSTERBY + TOK_TABLE_OR_COL + tkey tmap - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - . - TOK_TABLE_OR_COL - tmap - tkey - TOK_SELEXPR - . - TOK_TABLE_OR_COL - tmap - tvalue - TOK_WHERE - < - . - TOK_TABLE_OR_COL - tmap - tkey - 100 + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + . + TOK_TABLE_OR_COL + tmap + tkey + TOK_SELEXPR + . + TOK_TABLE_OR_COL + tmap + tvalue + TOK_WHERE + < + . + TOK_TABLE_OR_COL + tmap + tkey + 100 STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/truncate_column_list_bucket.q.out ql/src/test/results/clientpositive/truncate_column_list_bucket.q.out index be8fafc..98731d2 100644 --- ql/src/test/results/clientpositive/truncate_column_list_bucket.q.out +++ ql/src/test/results/clientpositive/truncate_column_list_bucket.q.out @@ -69,10 +69,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - test_tab TOK_INSERT TOK_DESTINATION TOK_DIR @@ -90,6 +86,10 @@ TOK_QUERY TOK_TABLE_OR_COL key '484' + TOK_FROM + TOK_TABREF + TOK_TABNAME + test_tab STAGE DEPENDENCIES: @@ -208,10 +208,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - test_tab TOK_INSERT TOK_DESTINATION TOK_DIR @@ -229,6 +225,10 @@ TOK_QUERY TOK_TABLE_OR_COL key '0' + TOK_FROM + TOK_TABREF + TOK_TABNAME + test_tab STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/udf_explode.q.out ql/src/test/results/clientpositive/udf_explode.q.out index 4eeedeb..3d3a084 100644 --- ql/src/test/results/clientpositive/udf_explode.q.out +++ ql/src/test/results/clientpositive/udf_explode.q.out @@ -15,13 +15,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src - TOK_TABLESPLITSAMPLE - TOK_ROWCOUNT - 1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -36,6 +29,13 @@ TOK_QUERY 2 3 myCol + TOK_FROM + TOK_TABREF + TOK_TABNAME + src + TOK_TABLESPLITSAMPLE + TOK_ROWCOUNT + 1 STAGE DEPENDENCIES: @@ -142,31 +142,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_SUBQUERY - TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src - TOK_TABLESPLITSAMPLE - TOK_ROWCOUNT - 1 - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_FUNCTION - explode - TOK_FUNCTION - array - 1 - 2 - 3 - myCol - a TOK_INSERT TOK_DESTINATION TOK_DIR @@ -186,6 +161,31 @@ TOK_QUERY TOK_TABLE_OR_COL a myCol + TOK_FROM + TOK_SUBQUERY + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_FUNCTION + explode + TOK_FUNCTION + array + 1 + 2 + 3 + myCol + TOK_FROM + TOK_TABREF + TOK_TABNAME + src + TOK_TABLESPLITSAMPLE + TOK_ROWCOUNT + 1 + a STAGE DEPENDENCIES: @@ -354,13 +354,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src - TOK_TABLESPLITSAMPLE - TOK_ROWCOUNT - 1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -379,6 +372,13 @@ TOK_QUERY 'three' key val + TOK_FROM + TOK_TABREF + TOK_TABNAME + src + TOK_TABLESPLITSAMPLE + TOK_ROWCOUNT + 1 STAGE DEPENDENCIES: @@ -485,35 +485,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_SUBQUERY - TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src - TOK_TABLESPLITSAMPLE - TOK_ROWCOUNT - 1 - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_FUNCTION - explode - TOK_FUNCTION - map - 1 - 'one' - 2 - 'two' - 3 - 'three' - key - val - a TOK_INSERT TOK_DESTINATION TOK_DIR @@ -542,6 +513,35 @@ TOK_QUERY TOK_TABLE_OR_COL a val + TOK_FROM + TOK_SUBQUERY + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_FUNCTION + explode + TOK_FUNCTION + map + 1 + 'one' + 2 + 'two' + 3 + 'three' + key + val + TOK_FROM + TOK_TABREF + TOK_TABNAME + src + TOK_TABLESPLITSAMPLE + TOK_ROWCOUNT + 1 + a STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/udf_java_method.q.out ql/src/test/results/clientpositive/udf_java_method.q.out index a38ab76..2151d27 100644 --- ql/src/test/results/clientpositive/udf_java_method.q.out +++ ql/src/test/results/clientpositive/udf_java_method.q.out @@ -38,13 +38,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src - TOK_TABLESPLITSAMPLE - TOK_ROWCOUNT - 1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -96,6 +89,13 @@ TOK_QUERY "java.lang.Math" "floor" 1.9 + TOK_FROM + TOK_TABREF + TOK_TABNAME + src + TOK_TABLESPLITSAMPLE + TOK_ROWCOUNT + 1 STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/udf_reflect.q.out ql/src/test/results/clientpositive/udf_reflect.q.out index 63d67cb..c3dc532 100644 --- ql/src/test/results/clientpositive/udf_reflect.q.out +++ ql/src/test/results/clientpositive/udf_reflect.q.out @@ -36,13 +36,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src - TOK_TABLESPLITSAMPLE - TOK_ROWCOUNT - 1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -102,6 +95,13 @@ TOK_QUERY TOK_TABLE_OR_COL key 16 + TOK_FROM + TOK_TABREF + TOK_TABNAME + src + TOK_TABLESPLITSAMPLE + TOK_ROWCOUNT + 1 STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/udf_reflect2.q.out ql/src/test/results/clientpositive/udf_reflect2.q.out index 6b19277..778fe30 100644 --- ql/src/test/results/clientpositive/udf_reflect2.q.out +++ ql/src/test/results/clientpositive/udf_reflect2.q.out @@ -81,33 +81,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_SUBQUERY - TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_FUNCTION - TOK_INT - TOK_TABLE_OR_COL - key - key - TOK_SELEXPR - TOK_TABLE_OR_COL - value - TOK_SELEXPR - TOK_FUNCTION - TOK_TIMESTAMP - '2013-02-15 19:41:20' - ts - a TOK_INSERT TOK_DESTINATION TOK_DIR @@ -305,6 +278,33 @@ TOK_QUERY "getTime" TOK_LIMIT 5 + TOK_FROM + TOK_SUBQUERY + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_FUNCTION + TOK_INT + TOK_TABLE_OR_COL + key + key + TOK_SELEXPR + TOK_TABLE_OR_COL + value + TOK_SELEXPR + TOK_FUNCTION + TOK_TIMESTAMP + '2013-02-15 19:41:20' + ts + TOK_FROM + TOK_TABREF + TOK_TABNAME + src + a STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/udtf_explode.q.out ql/src/test/results/clientpositive/udtf_explode.q.out index ae95907..046b851 100644 --- ql/src/test/results/clientpositive/udtf_explode.q.out +++ ql/src/test/results/clientpositive/udtf_explode.q.out @@ -15,10 +15,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_DIR @@ -35,6 +31,10 @@ TOK_QUERY myCol TOK_LIMIT 3 + TOK_FROM + TOK_TABREF + TOK_TABNAME + src STAGE DEPENDENCIES: @@ -143,13 +143,28 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + . + TOK_TABLE_OR_COL + a + myCol + TOK_SELEXPR + TOK_FUNCTION + count + 1 + TOK_GROUPBY + . + TOK_TABLE_OR_COL + a + myCol TOK_FROM TOK_SUBQUERY TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_DIR @@ -166,26 +181,11 @@ TOK_QUERY myCol TOK_LIMIT 3 + TOK_FROM + TOK_TABREF + TOK_TABNAME + src a - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - . - TOK_TABLE_OR_COL - a - myCol - TOK_SELEXPR - TOK_FUNCTION - count - 1 - TOK_GROUPBY - . - TOK_TABLE_OR_COL - a - myCol STAGE DEPENDENCIES: @@ -458,34 +458,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_SUBQUERY - TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_FUNCTION - explode - TOK_FUNCTION - map - 1 - 'one' - 2 - 'two' - 3 - 'three' - myKey - myVal - TOK_LIMIT - 3 - a TOK_INSERT TOK_DESTINATION TOK_DIR @@ -514,6 +486,34 @@ TOK_QUERY TOK_TABLE_OR_COL a myVal + TOK_FROM + TOK_SUBQUERY + TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_FUNCTION + explode + TOK_FUNCTION + map + 1 + 'one' + 2 + 'two' + 3 + 'three' + myKey + myVal + TOK_LIMIT + 3 + TOK_FROM + TOK_TABREF + TOK_TABNAME + src + a STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/union22.q.out ql/src/test/results/clientpositive/union22.q.out index 4422e71..ad2face 100644 --- ql/src/test/results/clientpositive/union22.q.out +++ ql/src/test/results/clientpositive/union22.q.out @@ -79,14 +79,22 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_TAB + TOK_TABNAME + dst_union22 + TOK_PARTSPEC + TOK_PARTVAL + ds + '2' + TOK_SELECT + TOK_SELEXPR + TOK_ALLCOLREF TOK_FROM TOK_SUBQUERY TOK_UNION TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - dst_union22_delta TOK_INSERT TOK_DESTINATION TOK_DIR @@ -118,7 +126,47 @@ TOK_QUERY TOK_TABLE_OR_COL k0 50 + TOK_FROM + TOK_TABREF + TOK_TABNAME + dst_union22_delta TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + . + TOK_TABLE_OR_COL + a + k1 + k1 + TOK_SELEXPR + . + TOK_TABLE_OR_COL + a + k2 + k2 + TOK_SELEXPR + . + TOK_TABLE_OR_COL + b + k3 + k3 + TOK_SELEXPR + . + TOK_TABLE_OR_COL + b + k4 + k4 + TOK_WHERE + > + . + TOK_TABLE_OR_COL + a + k1 + 20 TOK_FROM TOK_LEFTOUTERJOIN TOK_TABREF @@ -127,10 +175,6 @@ TOK_QUERY a TOK_SUBQUERY TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - dst_union22_delta TOK_INSERT TOK_DESTINATION TOK_DIR @@ -148,6 +192,10 @@ TOK_QUERY TOK_TABLE_OR_COL k0 50 + TOK_FROM + TOK_TABREF + TOK_TABNAME + dst_union22_delta b and = @@ -165,55 +213,7 @@ TOK_QUERY a ds '1' - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - . - TOK_TABLE_OR_COL - a - k1 - k1 - TOK_SELEXPR - . - TOK_TABLE_OR_COL - a - k2 - k2 - TOK_SELEXPR - . - TOK_TABLE_OR_COL - b - k3 - k3 - TOK_SELEXPR - . - TOK_TABLE_OR_COL - b - k4 - k4 - TOK_WHERE - > - . - TOK_TABLE_OR_COL - a - k1 - 20 subq - TOK_INSERT - TOK_DESTINATION - TOK_TAB - TOK_TABNAME - dst_union22 - TOK_PARTSPEC - TOK_PARTVAL - ds - '2' - TOK_SELECT - TOK_SELEXPR - TOK_ALLCOLREF STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/union24.q.out ql/src/test/results/clientpositive/union24.q.out index dda55ca..4d67ad0 100644 --- ql/src/test/results/clientpositive/union24.q.out +++ ql/src/test/results/clientpositive/union24.q.out @@ -55,16 +55,27 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + . + TOK_TABLE_OR_COL + s + key + TOK_SELEXPR + . + TOK_TABLE_OR_COL + s + count TOK_FROM TOK_SUBQUERY TOK_UNION TOK_UNION TOK_UNION TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src2 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -81,11 +92,11 @@ TOK_QUERY TOK_TABLE_OR_COL key 10 - TOK_QUERY TOK_FROM TOK_TABREF TOK_TABNAME - src3 + src2 + TOK_QUERY TOK_INSERT TOK_DESTINATION TOK_DIR @@ -102,11 +113,11 @@ TOK_QUERY TOK_TABLE_OR_COL key 10 + TOK_FROM + TOK_TABREF + TOK_TABNAME + src3 TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src4 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -123,11 +134,11 @@ TOK_QUERY TOK_TABLE_OR_COL key 10 + TOK_FROM + TOK_TABREF + TOK_TABNAME + src4 TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src5 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -149,22 +160,11 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL key + TOK_FROM + TOK_TABREF + TOK_TABNAME + src5 s - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - . - TOK_TABLE_OR_COL - s - key - TOK_SELEXPR - . - TOK_TABLE_OR_COL - s - count STAGE DEPENDENCIES: @@ -671,15 +671,26 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + . + TOK_TABLE_OR_COL + s + key + TOK_SELEXPR + . + TOK_TABLE_OR_COL + s + count TOK_FROM TOK_SUBQUERY TOK_UNION TOK_UNION TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src2 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -696,11 +707,11 @@ TOK_QUERY TOK_TABLE_OR_COL key 10 - TOK_QUERY TOK_FROM TOK_TABREF TOK_TABNAME - src3 + src2 + TOK_QUERY TOK_INSERT TOK_DESTINATION TOK_DIR @@ -717,26 +728,11 @@ TOK_QUERY TOK_TABLE_OR_COL key 10 - TOK_QUERY - TOK_FROM - TOK_JOIN - TOK_TABREF - TOK_TABNAME - src4 - a + TOK_FROM TOK_TABREF TOK_TABNAME - src5 - b - = - . - TOK_TABLE_OR_COL - a - key - . - TOK_TABLE_OR_COL - b - key + src3 + TOK_QUERY TOK_INSERT TOK_DESTINATION TOK_DIR @@ -761,22 +757,26 @@ TOK_QUERY a key 10 + TOK_FROM + TOK_JOIN + TOK_TABREF + TOK_TABNAME + src4 + a + TOK_TABREF + TOK_TABNAME + src5 + b + = + . + TOK_TABLE_OR_COL + a + key + . + TOK_TABLE_OR_COL + b + key s - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - . - TOK_TABLE_OR_COL - s - key - TOK_SELEXPR - . - TOK_TABLE_OR_COL - s - count STAGE DEPENDENCIES: @@ -1240,15 +1240,26 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + . + TOK_TABLE_OR_COL + s + key + TOK_SELEXPR + . + TOK_TABLE_OR_COL + s + count TOK_FROM TOK_SUBQUERY TOK_UNION TOK_UNION TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src2 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1265,11 +1276,11 @@ TOK_QUERY TOK_TABLE_OR_COL key 10 - TOK_QUERY TOK_FROM TOK_TABREF TOK_TABNAME - src3 + src2 + TOK_QUERY TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1286,26 +1297,11 @@ TOK_QUERY TOK_TABLE_OR_COL key 10 - TOK_QUERY - TOK_FROM - TOK_JOIN - TOK_TABREF - TOK_TABNAME - src4 - a + TOK_FROM TOK_TABREF TOK_TABNAME - src5 - b - = - . - TOK_TABLE_OR_COL - a - key - . - TOK_TABLE_OR_COL - b - key + src3 + TOK_QUERY TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1334,22 +1330,26 @@ TOK_QUERY TOK_TABLE_OR_COL a key + TOK_FROM + TOK_JOIN + TOK_TABREF + TOK_TABNAME + src4 + a + TOK_TABREF + TOK_TABNAME + src5 + b + = + . + TOK_TABLE_OR_COL + a + key + . + TOK_TABLE_OR_COL + b + key s - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - . - TOK_TABLE_OR_COL - s - key - TOK_SELEXPR - . - TOK_TABLE_OR_COL - s - count STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/union_ppr.q.out ql/src/test/results/clientpositive/union_ppr.q.out index 3016b61..d9abb77 100644 --- ql/src/test/results/clientpositive/union_ppr.q.out +++ ql/src/test/results/clientpositive/union_ppr.q.out @@ -19,15 +19,45 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY + TOK_INSERT + TOK_DESTINATION + TOK_DIR + TOK_TMP_FILE + TOK_SELECT + TOK_SELEXPR + TOK_ALLCOLREF + TOK_WHERE + = + . + TOK_TABLE_OR_COL + A + ds + '2008-04-08' + TOK_SORTBY + TOK_TABSORTCOLNAMEASC + . + TOK_TABLE_OR_COL + A + key + TOK_TABSORTCOLNAMEASC + . + TOK_TABLE_OR_COL + A + value + TOK_TABSORTCOLNAMEASC + . + TOK_TABLE_OR_COL + A + ds + TOK_TABSORTCOLNAMEASC + . + TOK_TABLE_OR_COL + A + hr TOK_FROM TOK_SUBQUERY TOK_UNION TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - SRCPART - X TOK_INSERT TOK_DESTINATION TOK_DIR @@ -44,12 +74,12 @@ TOK_QUERY X key 100 - TOK_QUERY TOK_FROM TOK_TABREF TOK_TABNAME SRCPART - Y + X + TOK_QUERY TOK_INSERT TOK_DESTINATION TOK_DIR @@ -66,42 +96,12 @@ TOK_QUERY Y key 100 + TOK_FROM + TOK_TABREF + TOK_TABNAME + SRCPART + Y A - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_ALLCOLREF - TOK_WHERE - = - . - TOK_TABLE_OR_COL - A - ds - '2008-04-08' - TOK_SORTBY - TOK_TABSORTCOLNAMEASC - . - TOK_TABLE_OR_COL - A - key - TOK_TABSORTCOLNAMEASC - . - TOK_TABLE_OR_COL - A - value - TOK_TABSORTCOLNAMEASC - . - TOK_TABLE_OR_COL - A - ds - TOK_TABSORTCOLNAMEASC - . - TOK_TABLE_OR_COL - A - hr STAGE DEPENDENCIES: diff --git ql/src/test/results/compiler/parse/case_sensitivity.q.out ql/src/test/results/compiler/parse/case_sensitivity.q.out index c14fb1a..67d8714 100644 --- ql/src/test/results/compiler/parse/case_sensitivity.q.out +++ ql/src/test/results/compiler/parse/case_sensitivity.q.out @@ -1 +1 @@ -(TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME SRC_THRIFT))) (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest1))) (TOK_SELECT (TOK_SELEXPR ([ (. (TOK_TABLE_OR_COL src_Thrift) LINT) 1)) (TOK_SELEXPR (. ([ (. (TOK_TABLE_OR_COL src_thrift) lintstring) 0) MYSTRING))) (TOK_WHERE (> ([ (. (TOK_TABLE_OR_COL src_thrift) liNT) 0) 0)))) \ No newline at end of file +(TOK_QUERY (TOK_FROM_BASE (TOK_TABREF (TOK_TABNAME SRC_THRIFT))) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest1))) (TOK_SELECT (TOK_SELEXPR ([ (. (TOK_TABLE_OR_COL src_Thrift) LINT) 1)) (TOK_SELEXPR (. ([ (. (TOK_TABLE_OR_COL src_thrift) lintstring) 0) MYSTRING))) (TOK_WHERE (> ([ (. (TOK_TABLE_OR_COL src_thrift) liNT) 0) 0))))) \ No newline at end of file diff --git ql/src/test/results/compiler/parse/cast1.q.out ql/src/test/results/compiler/parse/cast1.q.out index 5d37c9d..f7591a1 100644 --- ql/src/test/results/compiler/parse/cast1.q.out +++ ql/src/test/results/compiler/parse/cast1.q.out @@ -1 +1 @@ -(TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (+ 3 2)) (TOK_SELEXPR (+ 3.0 2)) (TOK_SELEXPR (+ 3 2.0)) (TOK_SELEXPR (+ 3.0 2.0)) (TOK_SELEXPR (+ 3 (TOK_FUNCTION TOK_INT 2.0))) (TOK_SELEXPR (TOK_FUNCTION TOK_BOOLEAN 1)) (TOK_SELEXPR (TOK_FUNCTION TOK_INT TRUE))) (TOK_WHERE (= (. (TOK_TABLE_OR_COL src) key) 86)))) \ No newline at end of file +(TOK_QUERY (TOK_FROM_BASE (TOK_TABREF (TOK_TABNAME src))) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (+ 3 2)) (TOK_SELEXPR (+ 3.0 2)) (TOK_SELEXPR (+ 3 2.0)) (TOK_SELEXPR (+ 3.0 2.0)) (TOK_SELEXPR (+ 3 (TOK_FUNCTION TOK_INT 2.0))) (TOK_SELEXPR (TOK_FUNCTION TOK_BOOLEAN 1)) (TOK_SELEXPR (TOK_FUNCTION TOK_INT TRUE))) (TOK_WHERE (= (. (TOK_TABLE_OR_COL src) key) 86))))) \ No newline at end of file diff --git ql/src/test/results/compiler/parse/groupby1.q.out ql/src/test/results/compiler/parse/groupby1.q.out index 1aa680c..f6f8004 100755 --- ql/src/test/results/compiler/parse/groupby1.q.out +++ ql/src/test/results/compiler/parse/groupby1.q.out @@ -1 +1 @@ -(TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest1))) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src) key)) (TOK_SELEXPR (TOK_FUNCTION sum (TOK_FUNCTION substr (. (TOK_TABLE_OR_COL src) value) 5)))) (TOK_GROUPBY (. (TOK_TABLE_OR_COL src) key)))) \ No newline at end of file +(TOK_QUERY (TOK_FROM_BASE (TOK_TABREF (TOK_TABNAME src))) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest1))) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src) key)) (TOK_SELEXPR (TOK_FUNCTION sum (TOK_FUNCTION substr (. (TOK_TABLE_OR_COL src) value) 5)))) (TOK_GROUPBY (. (TOK_TABLE_OR_COL src) key))))) \ No newline at end of file diff --git ql/src/test/results/compiler/parse/groupby2.q.out ql/src/test/results/compiler/parse/groupby2.q.out index 2c70804..c1e6e30 100755 --- ql/src/test/results/compiler/parse/groupby2.q.out +++ ql/src/test/results/compiler/parse/groupby2.q.out @@ -1 +1 @@ -(TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_FUNCTION substr (. (TOK_TABLE_OR_COL src) key) 1 1)) (TOK_SELEXPR (TOK_FUNCTIONDI count (TOK_FUNCTION substr (. (TOK_TABLE_OR_COL src) value) 5))) (TOK_SELEXPR (TOK_FUNCTION concat (TOK_FUNCTION substr (. (TOK_TABLE_OR_COL src) key) 1 1) (TOK_FUNCTION sum (TOK_FUNCTION substr (. (TOK_TABLE_OR_COL src) value) 5))))) (TOK_GROUPBY (TOK_FUNCTION substr (. (TOK_TABLE_OR_COL src) key) 1 1)))) \ No newline at end of file +(TOK_QUERY (TOK_FROM_BASE (TOK_TABREF (TOK_TABNAME src))) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_FUNCTION substr (. (TOK_TABLE_OR_COL src) key) 1 1)) (TOK_SELEXPR (TOK_FUNCTIONDI count (TOK_FUNCTION substr (. (TOK_TABLE_OR_COL src) value) 5))) (TOK_SELEXPR (TOK_FUNCTION concat (TOK_FUNCTION substr (. (TOK_TABLE_OR_COL src) key) 1 1) (TOK_FUNCTION sum (TOK_FUNCTION substr (. (TOK_TABLE_OR_COL src) value) 5))))) (TOK_GROUPBY (TOK_FUNCTION substr (. (TOK_TABLE_OR_COL src) key) 1 1))))) \ No newline at end of file diff --git ql/src/test/results/compiler/parse/groupby3.q.out ql/src/test/results/compiler/parse/groupby3.q.out index 057c101..1e73ae0 100644 --- ql/src/test/results/compiler/parse/groupby3.q.out +++ ql/src/test/results/compiler/parse/groupby3.q.out @@ -1 +1 @@ -(TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_FUNCTION sum (TOK_FUNCTION substr (. (TOK_TABLE_OR_COL src) value) 5))) (TOK_SELEXPR (TOK_FUNCTION avg (TOK_FUNCTION substr (. (TOK_TABLE_OR_COL src) value) 5))) (TOK_SELEXPR (TOK_FUNCTIONDI avg (TOK_FUNCTION substr (. (TOK_TABLE_OR_COL src) value) 5))) (TOK_SELEXPR (TOK_FUNCTION max (TOK_FUNCTION substr (. (TOK_TABLE_OR_COL src) value) 5))) (TOK_SELEXPR (TOK_FUNCTION min (TOK_FUNCTION substr (. (TOK_TABLE_OR_COL src) value) 5)))))) \ No newline at end of file +(TOK_QUERY (TOK_FROM_BASE (TOK_TABREF (TOK_TABNAME src))) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_FUNCTION sum (TOK_FUNCTION substr (. (TOK_TABLE_OR_COL src) value) 5))) (TOK_SELEXPR (TOK_FUNCTION avg (TOK_FUNCTION substr (. (TOK_TABLE_OR_COL src) value) 5))) (TOK_SELEXPR (TOK_FUNCTIONDI avg (TOK_FUNCTION substr (. (TOK_TABLE_OR_COL src) value) 5))) (TOK_SELEXPR (TOK_FUNCTION max (TOK_FUNCTION substr (. (TOK_TABLE_OR_COL src) value) 5))) (TOK_SELEXPR (TOK_FUNCTION min (TOK_FUNCTION substr (. (TOK_TABLE_OR_COL src) value) 5))))))) \ No newline at end of file diff --git ql/src/test/results/compiler/parse/groupby4.q.out ql/src/test/results/compiler/parse/groupby4.q.out index d555d20..626be6c 100644 --- ql/src/test/results/compiler/parse/groupby4.q.out +++ ql/src/test/results/compiler/parse/groupby4.q.out @@ -1 +1 @@ -(TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_FUNCTION substr (. (TOK_TABLE_OR_COL src) key) 1 1))) (TOK_GROUPBY (TOK_FUNCTION substr (. (TOK_TABLE_OR_COL src) key) 1 1)))) \ No newline at end of file +(TOK_QUERY (TOK_FROM_BASE (TOK_TABREF (TOK_TABNAME src))) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_FUNCTION substr (. (TOK_TABLE_OR_COL src) key) 1 1))) (TOK_GROUPBY (TOK_FUNCTION substr (. (TOK_TABLE_OR_COL src) key) 1 1))))) \ No newline at end of file diff --git ql/src/test/results/compiler/parse/groupby5.q.out ql/src/test/results/compiler/parse/groupby5.q.out index 0aa6914..d5b44dd 100644 --- ql/src/test/results/compiler/parse/groupby5.q.out +++ ql/src/test/results/compiler/parse/groupby5.q.out @@ -1 +1 @@ -(TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src) key)) (TOK_SELEXPR (TOK_FUNCTION sum (TOK_FUNCTION substr (. (TOK_TABLE_OR_COL src) value) 5)))) (TOK_GROUPBY (. (TOK_TABLE_OR_COL src) key)))) \ No newline at end of file +(TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src) key)) (TOK_SELEXPR (TOK_FUNCTION sum (TOK_FUNCTION substr (. (TOK_TABLE_OR_COL src) value) 5)))) (TOK_GROUPBY (. (TOK_TABLE_OR_COL src) key))) (TOK_FROM (TOK_TABREF (TOK_TABNAME src)))) \ No newline at end of file diff --git ql/src/test/results/compiler/parse/groupby6.q.out ql/src/test/results/compiler/parse/groupby6.q.out index 52fa9b4..889a9c3 100644 --- ql/src/test/results/compiler/parse/groupby6.q.out +++ ql/src/test/results/compiler/parse/groupby6.q.out @@ -1 +1 @@ -(TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECTDI (TOK_SELEXPR (TOK_FUNCTION substr (. (TOK_TABLE_OR_COL src) value) 5 1))))) \ No newline at end of file +(TOK_QUERY (TOK_FROM_BASE (TOK_TABREF (TOK_TABNAME src))) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECTDI (TOK_SELEXPR (TOK_FUNCTION substr (. (TOK_TABLE_OR_COL src) value) 5 1)))))) \ No newline at end of file diff --git ql/src/test/results/compiler/parse/input1.q.out ql/src/test/results/compiler/parse/input1.q.out index fa3613e..03ff5f5 100755 --- ql/src/test/results/compiler/parse/input1.q.out +++ ql/src/test/results/compiler/parse/input1.q.out @@ -1 +1 @@ -(TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest1))) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src) key)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src) value))) (TOK_WHERE (< (. (TOK_TABLE_OR_COL src) key) 100)))) \ No newline at end of file +(TOK_QUERY (TOK_FROM_BASE (TOK_TABREF (TOK_TABNAME src))) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest1))) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src) key)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src) value))) (TOK_WHERE (< (. (TOK_TABLE_OR_COL src) key) 100))))) \ No newline at end of file diff --git ql/src/test/results/compiler/parse/input2.q.out ql/src/test/results/compiler/parse/input2.q.out index 153f517..87d5ae1 100755 --- ql/src/test/results/compiler/parse/input2.q.out +++ ql/src/test/results/compiler/parse/input2.q.out @@ -1 +1 @@ -(TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest1))) (TOK_SELECT (TOK_SELEXPR (TOK_ALLCOLREF (TOK_TABNAME src)))) (TOK_WHERE (< (. (TOK_TABLE_OR_COL src) key) 100))) (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest2))) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src) key)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src) value))) (TOK_WHERE (and (>= (. (TOK_TABLE_OR_COL src) key) 100) (< (. (TOK_TABLE_OR_COL src) key) 200)))) (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest3) (TOK_PARTSPEC (TOK_PARTVAL ds '2008-04-08') (TOK_PARTVAL hr '12')))) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src) key)) (TOK_SELEXPR 2)) (TOK_WHERE (>= (. (TOK_TABLE_OR_COL src) key) 200)))) \ No newline at end of file +(TOK_QUERY (TOK_FROM_BASE (TOK_TABREF (TOK_TABNAME src))) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest1))) (TOK_SELECT (TOK_SELEXPR (TOK_ALLCOLREF (TOK_TABNAME src)))) (TOK_WHERE (< (. (TOK_TABLE_OR_COL src) key) 100)))) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest2))) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src) key)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src) value))) (TOK_WHERE (and (>= (. (TOK_TABLE_OR_COL src) key) 100) (< (. (TOK_TABLE_OR_COL src) key) 200))))) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest3) (TOK_PARTSPEC (TOK_PARTVAL ds '2008-04-08') (TOK_PARTVAL hr '12')))) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src) key)) (TOK_SELEXPR 2)) (TOK_WHERE (>= (. (TOK_TABLE_OR_COL src) key) 200))))) \ No newline at end of file diff --git ql/src/test/results/compiler/parse/input20.q.out ql/src/test/results/compiler/parse/input20.q.out index da4c1af..791199f 100644 --- ql/src/test/results/compiler/parse/input20.q.out +++ ql/src/test/results/compiler/parse/input20.q.out @@ -1 +1 @@ -(TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TRANSFORM (TOK_EXPLIST (% (. (TOK_TABLE_OR_COL src) key) 2) (% (. (TOK_TABLE_OR_COL src) key) 5)) TOK_SERDE TOK_RECORDWRITER 'cat' TOK_SERDE TOK_RECORDREADER))) (TOK_CLUSTERBY (TOK_TABLE_OR_COL key)))) tmap)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TRANSFORM (TOK_EXPLIST (. (TOK_TABLE_OR_COL tmap) key) (. (TOK_TABLE_OR_COL tmap) value)) TOK_SERDE TOK_RECORDWRITER 'uniq -c | sed "s@^ *@@" | sed "s@\t@_@" | sed "s@ @\t@"' TOK_SERDE TOK_RECORDREADER (TOK_ALIASLIST key value)))))) \ No newline at end of file +(TOK_QUERY (TOK_FROM_BASE (TOK_SUBQUERY (TOK_QUERY (TOK_FROM_BASE (TOK_TABREF (TOK_TABNAME src))) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TRANSFORM (TOK_EXPLIST (% (. (TOK_TABLE_OR_COL src) key) 2) (% (. (TOK_TABLE_OR_COL src) key) 5)) TOK_SERDE TOK_RECORDWRITER 'cat' TOK_SERDE TOK_RECORDREADER))) (TOK_CLUSTERBY (TOK_TABLE_OR_COL key))))) tmap)) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TRANSFORM (TOK_EXPLIST (. (TOK_TABLE_OR_COL tmap) key) (. (TOK_TABLE_OR_COL tmap) value)) TOK_SERDE TOK_RECORDWRITER 'uniq -c | sed "s@^ *@@" | sed "s@\t@_@" | sed "s@ @\t@"' TOK_SERDE TOK_RECORDREADER (TOK_ALIASLIST key value))))))) \ No newline at end of file diff --git ql/src/test/results/compiler/parse/input3.q.out ql/src/test/results/compiler/parse/input3.q.out index b033f3a..9216ff3 100755 --- ql/src/test/results/compiler/parse/input3.q.out +++ ql/src/test/results/compiler/parse/input3.q.out @@ -1 +1 @@ -(TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest1))) (TOK_SELECT (TOK_SELEXPR (TOK_ALLCOLREF (TOK_TABNAME src)))) (TOK_WHERE (< (. (TOK_TABLE_OR_COL src) key) 100))) (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest2))) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src) key)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src) value))) (TOK_WHERE (and (>= (. (TOK_TABLE_OR_COL src) key) 100) (< (. (TOK_TABLE_OR_COL src) key) 200)))) (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest3) (TOK_PARTSPEC (TOK_PARTVAL ds '2008-04-08') (TOK_PARTVAL hr '12')))) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src) key)) (TOK_SELEXPR 2)) (TOK_WHERE (and (>= (. (TOK_TABLE_OR_COL src) key) 200) (< (. (TOK_TABLE_OR_COL src) key) 300)))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR '../../../../build/contrib/hive/ql/test/data/warehouse/dest4.out')) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src) value))) (TOK_WHERE (>= (. (TOK_TABLE_OR_COL src) key) 300)))) \ No newline at end of file +(TOK_QUERY (TOK_FROM_BASE (TOK_TABREF (TOK_TABNAME src))) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest1))) (TOK_SELECT (TOK_SELEXPR (TOK_ALLCOLREF (TOK_TABNAME src)))) (TOK_WHERE (< (. (TOK_TABLE_OR_COL src) key) 100)))) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest2))) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src) key)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src) value))) (TOK_WHERE (and (>= (. (TOK_TABLE_OR_COL src) key) 100) (< (. (TOK_TABLE_OR_COL src) key) 200))))) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest3) (TOK_PARTSPEC (TOK_PARTVAL ds '2008-04-08') (TOK_PARTVAL hr '12')))) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src) key)) (TOK_SELEXPR 2)) (TOK_WHERE (and (>= (. (TOK_TABLE_OR_COL src) key) 200) (< (. (TOK_TABLE_OR_COL src) key) 300))))) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_DIR '../../../../build/contrib/hive/ql/test/data/warehouse/dest4.out')) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src) value))) (TOK_WHERE (>= (. (TOK_TABLE_OR_COL src) key) 300))))) \ No newline at end of file diff --git ql/src/test/results/compiler/parse/input4.q.out ql/src/test/results/compiler/parse/input4.q.out index c1425e7..2c23884 100755 --- ql/src/test/results/compiler/parse/input4.q.out +++ ql/src/test/results/compiler/parse/input4.q.out @@ -1 +1 @@ -(TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TRANSFORM (TOK_EXPLIST (. (TOK_TABLE_OR_COL src) key) (. (TOK_TABLE_OR_COL src) value)) TOK_SERDE TOK_RECORDWRITER '/bin/cat' TOK_SERDE TOK_RECORDREADER (TOK_ALIASLIST tkey tvalue)))) (TOK_CLUSTERBY (TOK_TABLE_OR_COL tkey)))) tmap)) (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest1))) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL tmap) tkey)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL tmap) tvalue))) (TOK_WHERE (< (. (TOK_TABLE_OR_COL tmap) tkey) 100)))) \ No newline at end of file +(TOK_QUERY (TOK_FROM_BASE (TOK_SUBQUERY (TOK_QUERY (TOK_FROM_BASE (TOK_TABREF (TOK_TABNAME src))) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TRANSFORM (TOK_EXPLIST (. (TOK_TABLE_OR_COL src) key) (. (TOK_TABLE_OR_COL src) value)) TOK_SERDE TOK_RECORDWRITER '/bin/cat' TOK_SERDE TOK_RECORDREADER (TOK_ALIASLIST tkey tvalue)))) (TOK_CLUSTERBY (TOK_TABLE_OR_COL tkey))))) tmap)) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest1))) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL tmap) tkey)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL tmap) tvalue))) (TOK_WHERE (< (. (TOK_TABLE_OR_COL tmap) tkey) 100))))) \ No newline at end of file diff --git ql/src/test/results/compiler/parse/input5.q.out ql/src/test/results/compiler/parse/input5.q.out index 854907b..638f3bf 100644 --- ql/src/test/results/compiler/parse/input5.q.out +++ ql/src/test/results/compiler/parse/input5.q.out @@ -1 +1 @@ -(TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src_thrift))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TRANSFORM (TOK_EXPLIST (. (TOK_TABLE_OR_COL src_thrift) lint) (. (TOK_TABLE_OR_COL src_thrift) lintstring)) TOK_SERDE TOK_RECORDWRITER '/bin/cat' TOK_SERDE TOK_RECORDREADER (TOK_ALIASLIST tkey tvalue)))) (TOK_CLUSTERBY (TOK_TABLE_OR_COL tkey)))) tmap)) (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest1))) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL tmap) tkey)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL tmap) tvalue))))) \ No newline at end of file +(TOK_QUERY (TOK_FROM_BASE (TOK_SUBQUERY (TOK_QUERY (TOK_FROM_BASE (TOK_TABREF (TOK_TABNAME src_thrift))) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TRANSFORM (TOK_EXPLIST (. (TOK_TABLE_OR_COL src_thrift) lint) (. (TOK_TABLE_OR_COL src_thrift) lintstring)) TOK_SERDE TOK_RECORDWRITER '/bin/cat' TOK_SERDE TOK_RECORDREADER (TOK_ALIASLIST tkey tvalue)))) (TOK_CLUSTERBY (TOK_TABLE_OR_COL tkey))))) tmap)) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest1))) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL tmap) tkey)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL tmap) tvalue)))))) \ No newline at end of file diff --git ql/src/test/results/compiler/parse/input6.q.out ql/src/test/results/compiler/parse/input6.q.out index 35f73a6..aab7305 100644 --- ql/src/test/results/compiler/parse/input6.q.out +++ ql/src/test/results/compiler/parse/input6.q.out @@ -1 +1 @@ -(TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src1))) (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest1))) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src1) key)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src1) value))) (TOK_WHERE (TOK_FUNCTION TOK_ISNULL (. (TOK_TABLE_OR_COL src1) key))))) \ No newline at end of file +(TOK_QUERY (TOK_FROM_BASE (TOK_TABREF (TOK_TABNAME src1))) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest1))) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src1) key)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src1) value))) (TOK_WHERE (TOK_FUNCTION TOK_ISNULL (. (TOK_TABLE_OR_COL src1) key)))))) \ No newline at end of file diff --git ql/src/test/results/compiler/parse/input7.q.out ql/src/test/results/compiler/parse/input7.q.out index a26964d..e13c818 100644 --- ql/src/test/results/compiler/parse/input7.q.out +++ ql/src/test/results/compiler/parse/input7.q.out @@ -1 +1 @@ -(TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src1))) (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest1))) (TOK_SELECT (TOK_SELEXPR TOK_NULL) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src1) key))))) \ No newline at end of file +(TOK_QUERY (TOK_FROM_BASE (TOK_TABREF (TOK_TABNAME src1))) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest1))) (TOK_SELECT (TOK_SELEXPR TOK_NULL) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src1) key)))))) \ No newline at end of file diff --git ql/src/test/results/compiler/parse/input8.q.out ql/src/test/results/compiler/parse/input8.q.out index a9a3bd1..c7a6157 100644 --- ql/src/test/results/compiler/parse/input8.q.out +++ ql/src/test/results/compiler/parse/input8.q.out @@ -1 +1 @@ -(TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src1))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (+ 4 TOK_NULL)) (TOK_SELEXPR (- (. (TOK_TABLE_OR_COL src1) key) TOK_NULL)) (TOK_SELEXPR (+ TOK_NULL TOK_NULL))))) \ No newline at end of file +(TOK_QUERY (TOK_FROM_BASE (TOK_TABREF (TOK_TABNAME src1))) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (+ 4 TOK_NULL)) (TOK_SELEXPR (- (. (TOK_TABLE_OR_COL src1) key) TOK_NULL)) (TOK_SELEXPR (+ TOK_NULL TOK_NULL)))))) \ No newline at end of file diff --git ql/src/test/results/compiler/parse/input9.q.out ql/src/test/results/compiler/parse/input9.q.out index b24ef54..6d1a5ab 100644 --- ql/src/test/results/compiler/parse/input9.q.out +++ ql/src/test/results/compiler/parse/input9.q.out @@ -1 +1 @@ -(TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src1))) (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest1))) (TOK_SELECT (TOK_SELEXPR TOK_NULL) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src1) key))) (TOK_WHERE (= TOK_NULL TOK_NULL)))) \ No newline at end of file +(TOK_QUERY (TOK_FROM_BASE (TOK_TABREF (TOK_TABNAME src1))) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest1))) (TOK_SELECT (TOK_SELEXPR TOK_NULL) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src1) key))) (TOK_WHERE (= TOK_NULL TOK_NULL))))) \ No newline at end of file diff --git ql/src/test/results/compiler/parse/input_part1.q.out ql/src/test/results/compiler/parse/input_part1.q.out index 880e0f8..ffbc5d6 100644 --- ql/src/test/results/compiler/parse/input_part1.q.out +++ ql/src/test/results/compiler/parse/input_part1.q.out @@ -1 +1 @@ -(TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME srcpart))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL srcpart) key)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL srcpart) value)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL srcpart) hr)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL srcpart) ds))) (TOK_WHERE (and (and (< (. (TOK_TABLE_OR_COL srcpart) key) 100) (= (. (TOK_TABLE_OR_COL srcpart) ds) '2008-04-08')) (= (. (TOK_TABLE_OR_COL srcpart) hr) '12'))))) \ No newline at end of file +(TOK_QUERY (TOK_FROM_BASE (TOK_TABREF (TOK_TABNAME srcpart))) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL srcpart) key)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL srcpart) value)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL srcpart) hr)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL srcpart) ds))) (TOK_WHERE (and (and (< (. (TOK_TABLE_OR_COL srcpart) key) 100) (= (. (TOK_TABLE_OR_COL srcpart) ds) '2008-04-08')) (= (. (TOK_TABLE_OR_COL srcpart) hr) '12')))))) \ No newline at end of file diff --git ql/src/test/results/compiler/parse/input_testsequencefile.q.out ql/src/test/results/compiler/parse/input_testsequencefile.q.out index 0b80da4..c952b33 100644 --- ql/src/test/results/compiler/parse/input_testsequencefile.q.out +++ ql/src/test/results/compiler/parse/input_testsequencefile.q.out @@ -1 +1 @@ -(TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest4_sequencefile))) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src) key)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src) value))))) \ No newline at end of file +(TOK_QUERY (TOK_FROM_BASE (TOK_TABREF (TOK_TABNAME src))) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest4_sequencefile))) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src) key)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src) value)))))) \ No newline at end of file diff --git ql/src/test/results/compiler/parse/input_testxpath.q.out ql/src/test/results/compiler/parse/input_testxpath.q.out index aeb505b..aa416fa 100644 --- ql/src/test/results/compiler/parse/input_testxpath.q.out +++ ql/src/test/results/compiler/parse/input_testxpath.q.out @@ -1 +1 @@ -(TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src_thrift))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR ([ (. (TOK_TABLE_OR_COL src_thrift) lint) 1)) (TOK_SELEXPR (. ([ (. (TOK_TABLE_OR_COL src_thrift) lintstring) 0) mystring)) (TOK_SELEXPR ([ (. (TOK_TABLE_OR_COL src_thrift) mstringstring) 'key_2'))))) \ No newline at end of file +(TOK_QUERY (TOK_FROM_BASE (TOK_TABREF (TOK_TABNAME src_thrift))) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR ([ (. (TOK_TABLE_OR_COL src_thrift) lint) 1)) (TOK_SELEXPR (. ([ (. (TOK_TABLE_OR_COL src_thrift) lintstring) 0) mystring)) (TOK_SELEXPR ([ (. (TOK_TABLE_OR_COL src_thrift) mstringstring) 'key_2')))))) \ No newline at end of file diff --git ql/src/test/results/compiler/parse/input_testxpath2.q.out ql/src/test/results/compiler/parse/input_testxpath2.q.out index d4c4610..1515387 100644 --- ql/src/test/results/compiler/parse/input_testxpath2.q.out +++ ql/src/test/results/compiler/parse/input_testxpath2.q.out @@ -1 +1 @@ -(TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src_thrift))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_FUNCTION size (. (TOK_TABLE_OR_COL src_thrift) lint))) (TOK_SELEXPR (TOK_FUNCTION size (. (TOK_TABLE_OR_COL src_thrift) lintstring))) (TOK_SELEXPR (TOK_FUNCTION size (. (TOK_TABLE_OR_COL src_thrift) mstringstring)))) (TOK_WHERE (AND (TOK_FUNCTION TOK_ISNOTNULL (. (TOK_TABLE_OR_COL src_thrift) lint)) (NOT (TOK_FUNCTION TOK_ISNULL (. (TOK_TABLE_OR_COL src_thrift) mstringstring))))))) \ No newline at end of file +(TOK_QUERY (TOK_FROM_BASE (TOK_TABREF (TOK_TABNAME src_thrift))) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_FUNCTION size (. (TOK_TABLE_OR_COL src_thrift) lint))) (TOK_SELEXPR (TOK_FUNCTION size (. (TOK_TABLE_OR_COL src_thrift) lintstring))) (TOK_SELEXPR (TOK_FUNCTION size (. (TOK_TABLE_OR_COL src_thrift) mstringstring)))) (TOK_WHERE (AND (TOK_FUNCTION TOK_ISNOTNULL (. (TOK_TABLE_OR_COL src_thrift) lint)) (NOT (TOK_FUNCTION TOK_ISNULL (. (TOK_TABLE_OR_COL src_thrift) mstringstring)))))))) \ No newline at end of file diff --git ql/src/test/results/compiler/parse/join1.q.out ql/src/test/results/compiler/parse/join1.q.out index 1c45f30..58fba7c 100644 --- ql/src/test/results/compiler/parse/join1.q.out +++ ql/src/test/results/compiler/parse/join1.q.out @@ -1 +1 @@ -(TOK_QUERY (TOK_FROM (TOK_JOIN (TOK_TABREF (TOK_TABNAME src) src1) (TOK_TABREF (TOK_TABNAME src) src2) (= (. (TOK_TABLE_OR_COL src1) key) (. (TOK_TABLE_OR_COL src2) key)))) (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest1))) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src1) key)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src2) value))))) \ No newline at end of file +(TOK_QUERY (TOK_FROM_BASE (TOK_JOIN (TOK_TABREF (TOK_TABNAME src) src1) (TOK_TABREF (TOK_TABNAME src) src2) (= (. (TOK_TABLE_OR_COL src1) key) (. (TOK_TABLE_OR_COL src2) key)))) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest1))) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src1) key)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src2) value)))))) \ No newline at end of file diff --git ql/src/test/results/compiler/parse/join2.q.out ql/src/test/results/compiler/parse/join2.q.out index debbac3..7f0691b 100644 --- ql/src/test/results/compiler/parse/join2.q.out +++ ql/src/test/results/compiler/parse/join2.q.out @@ -1 +1 @@ -(TOK_QUERY (TOK_FROM (TOK_JOIN (TOK_JOIN (TOK_TABREF (TOK_TABNAME src) src1) (TOK_TABREF (TOK_TABNAME src) src2) (= (. (TOK_TABLE_OR_COL src1) key) (. (TOK_TABLE_OR_COL src2) key))) (TOK_TABREF (TOK_TABNAME src) src3) (= (+ (. (TOK_TABLE_OR_COL src1) key) (. (TOK_TABLE_OR_COL src2) key)) (. (TOK_TABLE_OR_COL src3) key)))) (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest1))) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src1) key)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src3) value))))) \ No newline at end of file +(TOK_QUERY (TOK_FROM_BASE (TOK_JOIN (TOK_JOIN (TOK_TABREF (TOK_TABNAME src) src1) (TOK_TABREF (TOK_TABNAME src) src2) (= (. (TOK_TABLE_OR_COL src1) key) (. (TOK_TABLE_OR_COL src2) key))) (TOK_TABREF (TOK_TABNAME src) src3) (= (+ (. (TOK_TABLE_OR_COL src1) key) (. (TOK_TABLE_OR_COL src2) key)) (. (TOK_TABLE_OR_COL src3) key)))) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest1))) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src1) key)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src3) value)))))) \ No newline at end of file diff --git ql/src/test/results/compiler/parse/join3.q.out ql/src/test/results/compiler/parse/join3.q.out index 51baa24..bb4f020 100644 --- ql/src/test/results/compiler/parse/join3.q.out +++ ql/src/test/results/compiler/parse/join3.q.out @@ -1 +1 @@ -(TOK_QUERY (TOK_FROM (TOK_JOIN (TOK_JOIN (TOK_TABREF (TOK_TABNAME src) src1) (TOK_TABREF (TOK_TABNAME src) src2) (= (. (TOK_TABLE_OR_COL src1) key) (. (TOK_TABLE_OR_COL src2) key))) (TOK_TABREF (TOK_TABNAME src) src3) (= (. (TOK_TABLE_OR_COL src1) key) (. (TOK_TABLE_OR_COL src3) key)))) (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest1))) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src1) key)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src3) value))))) \ No newline at end of file +(TOK_QUERY (TOK_FROM_BASE (TOK_JOIN (TOK_JOIN (TOK_TABREF (TOK_TABNAME src) src1) (TOK_TABREF (TOK_TABNAME src) src2) (= (. (TOK_TABLE_OR_COL src1) key) (. (TOK_TABLE_OR_COL src2) key))) (TOK_TABREF (TOK_TABNAME src) src3) (= (. (TOK_TABLE_OR_COL src1) key) (. (TOK_TABLE_OR_COL src3) key)))) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest1))) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src1) key)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src3) value)))))) \ No newline at end of file diff --git ql/src/test/results/compiler/parse/join4.q.out ql/src/test/results/compiler/parse/join4.q.out index 77f3486..a403956 100644 --- ql/src/test/results/compiler/parse/join4.q.out +++ ql/src/test/results/compiler/parse/join4.q.out @@ -1 +1 @@ -(TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_LEFTOUTERJOIN (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src) src1)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src1) key) c1) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src1) value) c2)) (TOK_WHERE (and (> (. (TOK_TABLE_OR_COL src1) key) 10) (< (. (TOK_TABLE_OR_COL src1) key) 20))))) a) (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src) src2)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src2) key) c3) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src2) value) c4)) (TOK_WHERE (and (> (. (TOK_TABLE_OR_COL src2) key) 15) (< (. (TOK_TABLE_OR_COL src2) key) 25))))) b) (= (. (TOK_TABLE_OR_COL a) c1) (. (TOK_TABLE_OR_COL b) c3)))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL a) c1) c1) (TOK_SELEXPR (. (TOK_TABLE_OR_COL a) c2) c2) (TOK_SELEXPR (. (TOK_TABLE_OR_COL b) c3) c3) (TOK_SELEXPR (. (TOK_TABLE_OR_COL b) c4) c4)))) c)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c1)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c2)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c3)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c4))))) \ No newline at end of file +(TOK_QUERY (TOK_FROM_BASE (TOK_SUBQUERY (TOK_QUERY (TOK_FROM_BASE (TOK_LEFTOUTERJOIN (TOK_SUBQUERY (TOK_QUERY (TOK_FROM_BASE (TOK_TABREF (TOK_TABNAME src) src1)) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src1) key) c1) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src1) value) c2)) (TOK_WHERE (and (> (. (TOK_TABLE_OR_COL src1) key) 10) (< (. (TOK_TABLE_OR_COL src1) key) 20)))))) a) (TOK_SUBQUERY (TOK_QUERY (TOK_FROM_BASE (TOK_TABREF (TOK_TABNAME src) src2)) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src2) key) c3) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src2) value) c4)) (TOK_WHERE (and (> (. (TOK_TABLE_OR_COL src2) key) 15) (< (. (TOK_TABLE_OR_COL src2) key) 25)))))) b) (= (. (TOK_TABLE_OR_COL a) c1) (. (TOK_TABLE_OR_COL b) c3)))) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL a) c1) c1) (TOK_SELEXPR (. (TOK_TABLE_OR_COL a) c2) c2) (TOK_SELEXPR (. (TOK_TABLE_OR_COL b) c3) c3) (TOK_SELEXPR (. (TOK_TABLE_OR_COL b) c4) c4))))) c)) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c1)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c2)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c3)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c4)))))) \ No newline at end of file diff --git ql/src/test/results/compiler/parse/join5.q.out ql/src/test/results/compiler/parse/join5.q.out index 4db56a4..d299922 100644 --- ql/src/test/results/compiler/parse/join5.q.out +++ ql/src/test/results/compiler/parse/join5.q.out @@ -1 +1 @@ -(TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_RIGHTOUTERJOIN (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src) src1)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src1) key) c1) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src1) value) c2)) (TOK_WHERE (and (> (. (TOK_TABLE_OR_COL src1) key) 10) (< (. (TOK_TABLE_OR_COL src1) key) 20))))) a) (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src) src2)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src2) key) c3) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src2) value) c4)) (TOK_WHERE (and (> (. (TOK_TABLE_OR_COL src2) key) 15) (< (. (TOK_TABLE_OR_COL src2) key) 25))))) b) (= (. (TOK_TABLE_OR_COL a) c1) (. (TOK_TABLE_OR_COL b) c3)))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL a) c1) c1) (TOK_SELEXPR (. (TOK_TABLE_OR_COL a) c2) c2) (TOK_SELEXPR (. (TOK_TABLE_OR_COL b) c3) c3) (TOK_SELEXPR (. (TOK_TABLE_OR_COL b) c4) c4)))) c)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c1)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c2)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c3)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c4))))) \ No newline at end of file +(TOK_QUERY (TOK_FROM_BASE (TOK_SUBQUERY (TOK_QUERY (TOK_FROM_BASE (TOK_RIGHTOUTERJOIN (TOK_SUBQUERY (TOK_QUERY (TOK_FROM_BASE (TOK_TABREF (TOK_TABNAME src) src1)) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src1) key) c1) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src1) value) c2)) (TOK_WHERE (and (> (. (TOK_TABLE_OR_COL src1) key) 10) (< (. (TOK_TABLE_OR_COL src1) key) 20)))))) a) (TOK_SUBQUERY (TOK_QUERY (TOK_FROM_BASE (TOK_TABREF (TOK_TABNAME src) src2)) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src2) key) c3) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src2) value) c4)) (TOK_WHERE (and (> (. (TOK_TABLE_OR_COL src2) key) 15) (< (. (TOK_TABLE_OR_COL src2) key) 25)))))) b) (= (. (TOK_TABLE_OR_COL a) c1) (. (TOK_TABLE_OR_COL b) c3)))) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL a) c1) c1) (TOK_SELEXPR (. (TOK_TABLE_OR_COL a) c2) c2) (TOK_SELEXPR (. (TOK_TABLE_OR_COL b) c3) c3) (TOK_SELEXPR (. (TOK_TABLE_OR_COL b) c4) c4))))) c)) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c1)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c2)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c3)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c4)))))) \ No newline at end of file diff --git ql/src/test/results/compiler/parse/join6.q.out ql/src/test/results/compiler/parse/join6.q.out index 3114d62..ef2e5fc 100644 --- ql/src/test/results/compiler/parse/join6.q.out +++ ql/src/test/results/compiler/parse/join6.q.out @@ -1 +1 @@ -(TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_FULLOUTERJOIN (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src) src1)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src1) key) c1) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src1) value) c2)) (TOK_WHERE (and (> (. (TOK_TABLE_OR_COL src1) key) 10) (< (. (TOK_TABLE_OR_COL src1) key) 20))))) a) (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src) src2)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src2) key) c3) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src2) value) c4)) (TOK_WHERE (and (> (. (TOK_TABLE_OR_COL src2) key) 15) (< (. (TOK_TABLE_OR_COL src2) key) 25))))) b) (= (. (TOK_TABLE_OR_COL a) c1) (. (TOK_TABLE_OR_COL b) c3)))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL a) c1) c1) (TOK_SELEXPR (. (TOK_TABLE_OR_COL a) c2) c2) (TOK_SELEXPR (. (TOK_TABLE_OR_COL b) c3) c3) (TOK_SELEXPR (. (TOK_TABLE_OR_COL b) c4) c4)))) c)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c1)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c2)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c3)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c4))))) \ No newline at end of file +(TOK_QUERY (TOK_FROM_BASE (TOK_SUBQUERY (TOK_QUERY (TOK_FROM_BASE (TOK_FULLOUTERJOIN (TOK_SUBQUERY (TOK_QUERY (TOK_FROM_BASE (TOK_TABREF (TOK_TABNAME src) src1)) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src1) key) c1) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src1) value) c2)) (TOK_WHERE (and (> (. (TOK_TABLE_OR_COL src1) key) 10) (< (. (TOK_TABLE_OR_COL src1) key) 20)))))) a) (TOK_SUBQUERY (TOK_QUERY (TOK_FROM_BASE (TOK_TABREF (TOK_TABNAME src) src2)) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src2) key) c3) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src2) value) c4)) (TOK_WHERE (and (> (. (TOK_TABLE_OR_COL src2) key) 15) (< (. (TOK_TABLE_OR_COL src2) key) 25)))))) b) (= (. (TOK_TABLE_OR_COL a) c1) (. (TOK_TABLE_OR_COL b) c3)))) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL a) c1) c1) (TOK_SELEXPR (. (TOK_TABLE_OR_COL a) c2) c2) (TOK_SELEXPR (. (TOK_TABLE_OR_COL b) c3) c3) (TOK_SELEXPR (. (TOK_TABLE_OR_COL b) c4) c4))))) c)) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c1)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c2)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c3)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c4)))))) \ No newline at end of file diff --git ql/src/test/results/compiler/parse/join7.q.out ql/src/test/results/compiler/parse/join7.q.out index 9b12cec..6d226c1 100644 --- ql/src/test/results/compiler/parse/join7.q.out +++ ql/src/test/results/compiler/parse/join7.q.out @@ -1 +1 @@ -(TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_LEFTOUTERJOIN (TOK_FULLOUTERJOIN (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src) src1)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src1) key) c1) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src1) value) c2)) (TOK_WHERE (and (> (. (TOK_TABLE_OR_COL src1) key) 10) (< (. (TOK_TABLE_OR_COL src1) key) 20))))) a) (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src) src2)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src2) key) c3) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src2) value) c4)) (TOK_WHERE (and (> (. (TOK_TABLE_OR_COL src2) key) 15) (< (. (TOK_TABLE_OR_COL src2) key) 25))))) b) (= (. (TOK_TABLE_OR_COL a) c1) (. (TOK_TABLE_OR_COL b) c3))) (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src) src3)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src3) key) c5) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src3) value) c6)) (TOK_WHERE (and (> (. (TOK_TABLE_OR_COL src3) key) 20) (< (. (TOK_TABLE_OR_COL src3) key) 25))))) c) (= (. (TOK_TABLE_OR_COL a) c1) (. (TOK_TABLE_OR_COL c) c5)))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL a) c1) c1) (TOK_SELEXPR (. (TOK_TABLE_OR_COL a) c2) c2) (TOK_SELEXPR (. (TOK_TABLE_OR_COL b) c3) c3) (TOK_SELEXPR (. (TOK_TABLE_OR_COL b) c4) c4) (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c5) c5) (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c6) c6)))) c)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c1)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c2)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c3)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c4)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c5)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c6))))) \ No newline at end of file +(TOK_QUERY (TOK_FROM_BASE (TOK_SUBQUERY (TOK_QUERY (TOK_FROM_BASE (TOK_LEFTOUTERJOIN (TOK_FULLOUTERJOIN (TOK_SUBQUERY (TOK_QUERY (TOK_FROM_BASE (TOK_TABREF (TOK_TABNAME src) src1)) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src1) key) c1) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src1) value) c2)) (TOK_WHERE (and (> (. (TOK_TABLE_OR_COL src1) key) 10) (< (. (TOK_TABLE_OR_COL src1) key) 20)))))) a) (TOK_SUBQUERY (TOK_QUERY (TOK_FROM_BASE (TOK_TABREF (TOK_TABNAME src) src2)) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src2) key) c3) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src2) value) c4)) (TOK_WHERE (and (> (. (TOK_TABLE_OR_COL src2) key) 15) (< (. (TOK_TABLE_OR_COL src2) key) 25)))))) b) (= (. (TOK_TABLE_OR_COL a) c1) (. (TOK_TABLE_OR_COL b) c3))) (TOK_SUBQUERY (TOK_QUERY (TOK_FROM_BASE (TOK_TABREF (TOK_TABNAME src) src3)) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src3) key) c5) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src3) value) c6)) (TOK_WHERE (and (> (. (TOK_TABLE_OR_COL src3) key) 20) (< (. (TOK_TABLE_OR_COL src3) key) 25)))))) c) (= (. (TOK_TABLE_OR_COL a) c1) (. (TOK_TABLE_OR_COL c) c5)))) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL a) c1) c1) (TOK_SELEXPR (. (TOK_TABLE_OR_COL a) c2) c2) (TOK_SELEXPR (. (TOK_TABLE_OR_COL b) c3) c3) (TOK_SELEXPR (. (TOK_TABLE_OR_COL b) c4) c4) (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c5) c5) (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c6) c6))))) c)) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c1)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c2)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c3)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c4)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c5)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c6)))))) \ No newline at end of file diff --git ql/src/test/results/compiler/parse/join8.q.out ql/src/test/results/compiler/parse/join8.q.out index aa4e64a..e638650 100644 --- ql/src/test/results/compiler/parse/join8.q.out +++ ql/src/test/results/compiler/parse/join8.q.out @@ -1 +1 @@ -(TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_LEFTOUTERJOIN (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src) src1)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src1) key) c1) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src1) value) c2)) (TOK_WHERE (and (> (. (TOK_TABLE_OR_COL src1) key) 10) (< (. (TOK_TABLE_OR_COL src1) key) 20))))) a) (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src) src2)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src2) key) c3) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src2) value) c4)) (TOK_WHERE (and (> (. (TOK_TABLE_OR_COL src2) key) 15) (< (. (TOK_TABLE_OR_COL src2) key) 25))))) b) (= (. (TOK_TABLE_OR_COL a) c1) (. (TOK_TABLE_OR_COL b) c3)))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL a) c1) c1) (TOK_SELEXPR (. (TOK_TABLE_OR_COL a) c2) c2) (TOK_SELEXPR (. (TOK_TABLE_OR_COL b) c3) c3) (TOK_SELEXPR (. (TOK_TABLE_OR_COL b) c4) c4)))) c)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c1)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c2)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c3)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c4))) (TOK_WHERE (AND (TOK_FUNCTION TOK_ISNULL (. (TOK_TABLE_OR_COL c) c3)) (TOK_FUNCTION TOK_ISNOTNULL (. (TOK_TABLE_OR_COL c) c1)))))) \ No newline at end of file +(TOK_QUERY (TOK_FROM_BASE (TOK_SUBQUERY (TOK_QUERY (TOK_FROM_BASE (TOK_LEFTOUTERJOIN (TOK_SUBQUERY (TOK_QUERY (TOK_FROM_BASE (TOK_TABREF (TOK_TABNAME src) src1)) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src1) key) c1) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src1) value) c2)) (TOK_WHERE (and (> (. (TOK_TABLE_OR_COL src1) key) 10) (< (. (TOK_TABLE_OR_COL src1) key) 20)))))) a) (TOK_SUBQUERY (TOK_QUERY (TOK_FROM_BASE (TOK_TABREF (TOK_TABNAME src) src2)) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src2) key) c3) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src2) value) c4)) (TOK_WHERE (and (> (. (TOK_TABLE_OR_COL src2) key) 15) (< (. (TOK_TABLE_OR_COL src2) key) 25)))))) b) (= (. (TOK_TABLE_OR_COL a) c1) (. (TOK_TABLE_OR_COL b) c3)))) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL a) c1) c1) (TOK_SELEXPR (. (TOK_TABLE_OR_COL a) c2) c2) (TOK_SELEXPR (. (TOK_TABLE_OR_COL b) c3) c3) (TOK_SELEXPR (. (TOK_TABLE_OR_COL b) c4) c4))))) c)) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c1)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c2)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c3)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c4))) (TOK_WHERE (AND (TOK_FUNCTION TOK_ISNULL (. (TOK_TABLE_OR_COL c) c3)) (TOK_FUNCTION TOK_ISNOTNULL (. (TOK_TABLE_OR_COL c) c1))))))) \ No newline at end of file diff --git ql/src/test/results/compiler/parse/sample1.q.out ql/src/test/results/compiler/parse/sample1.q.out index 9a493ad..f3fe4b8 100644 --- ql/src/test/results/compiler/parse/sample1.q.out +++ ql/src/test/results/compiler/parse/sample1.q.out @@ -1 +1 @@ -(TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME srcpart) (TOK_TABLEBUCKETSAMPLE 1 1 (TOK_FUNCTION rand)) s)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_ALLCOLREF (TOK_TABNAME s)))) (TOK_WHERE (and (= (. (TOK_TABLE_OR_COL s) ds) '2008-04-08') (= (. (TOK_TABLE_OR_COL s) hr) '11'))))) \ No newline at end of file +(TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_ALLCOLREF (TOK_TABNAME s)))) (TOK_WHERE (and (= (. (TOK_TABLE_OR_COL s) ds) '2008-04-08') (= (. (TOK_TABLE_OR_COL s) hr) '11')))) (TOK_FROM (TOK_TABREF (TOK_TABNAME srcpart) (TOK_TABLEBUCKETSAMPLE 1 1 (TOK_FUNCTION rand)) s))) \ No newline at end of file diff --git ql/src/test/results/compiler/parse/sample2.q.out ql/src/test/results/compiler/parse/sample2.q.out index e67c761..32753b8 100644 --- ql/src/test/results/compiler/parse/sample2.q.out +++ ql/src/test/results/compiler/parse/sample2.q.out @@ -1 +1 @@ -(TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME srcbucket) (TOK_TABLEBUCKETSAMPLE 1 2) s)) (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest1))) (TOK_SELECT (TOK_SELEXPR (TOK_ALLCOLREF (TOK_TABNAME s)))))) \ No newline at end of file +(TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest1))) (TOK_SELECT (TOK_SELEXPR (TOK_ALLCOLREF (TOK_TABNAME s))))) (TOK_FROM (TOK_TABREF (TOK_TABNAME srcbucket) (TOK_TABLEBUCKETSAMPLE 1 2) s))) \ No newline at end of file diff --git ql/src/test/results/compiler/parse/sample3.q.out ql/src/test/results/compiler/parse/sample3.q.out index ad5855b..fe3a3b5 100644 --- ql/src/test/results/compiler/parse/sample3.q.out +++ ql/src/test/results/compiler/parse/sample3.q.out @@ -1 +1 @@ -(TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME srcbucket) (TOK_TABLEBUCKETSAMPLE 1 2 (TOK_TABLE_OR_COL key) (TOK_TABLE_OR_COL value)) s)) (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest1))) (TOK_SELECT (TOK_SELEXPR (TOK_ALLCOLREF (TOK_TABNAME s)))))) \ No newline at end of file +(TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest1))) (TOK_SELECT (TOK_SELEXPR (TOK_ALLCOLREF (TOK_TABNAME s))))) (TOK_FROM (TOK_TABREF (TOK_TABNAME srcbucket) (TOK_TABLEBUCKETSAMPLE 1 2 (TOK_TABLE_OR_COL key) (TOK_TABLE_OR_COL value)) s))) \ No newline at end of file diff --git ql/src/test/results/compiler/parse/sample4.q.out ql/src/test/results/compiler/parse/sample4.q.out index 790b009..eb88375 100644 --- ql/src/test/results/compiler/parse/sample4.q.out +++ ql/src/test/results/compiler/parse/sample4.q.out @@ -1 +1 @@ -(TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME srcbucket) (TOK_TABLEBUCKETSAMPLE 1 2 (TOK_TABLE_OR_COL key)) s)) (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest1))) (TOK_SELECT (TOK_SELEXPR (TOK_ALLCOLREF (TOK_TABNAME s)))))) \ No newline at end of file +(TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest1))) (TOK_SELECT (TOK_SELEXPR (TOK_ALLCOLREF (TOK_TABNAME s))))) (TOK_FROM (TOK_TABREF (TOK_TABNAME srcbucket) (TOK_TABLEBUCKETSAMPLE 1 2 (TOK_TABLE_OR_COL key)) s))) \ No newline at end of file diff --git ql/src/test/results/compiler/parse/sample5.q.out ql/src/test/results/compiler/parse/sample5.q.out index cb55074..b3b6ab7 100644 --- ql/src/test/results/compiler/parse/sample5.q.out +++ ql/src/test/results/compiler/parse/sample5.q.out @@ -1 +1 @@ -(TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME srcbucket) (TOK_TABLEBUCKETSAMPLE 1 5 (TOK_TABLE_OR_COL key)) s)) (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest1))) (TOK_SELECT (TOK_SELEXPR (TOK_ALLCOLREF (TOK_TABNAME s)))))) \ No newline at end of file +(TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest1))) (TOK_SELECT (TOK_SELEXPR (TOK_ALLCOLREF (TOK_TABNAME s))))) (TOK_FROM (TOK_TABREF (TOK_TABNAME srcbucket) (TOK_TABLEBUCKETSAMPLE 1 5 (TOK_TABLE_OR_COL key)) s))) \ No newline at end of file diff --git ql/src/test/results/compiler/parse/sample6.q.out ql/src/test/results/compiler/parse/sample6.q.out index 3562bb8..24e01f4 100644 --- ql/src/test/results/compiler/parse/sample6.q.out +++ ql/src/test/results/compiler/parse/sample6.q.out @@ -1 +1 @@ -(TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME srcbucket) (TOK_TABLEBUCKETSAMPLE 1 4 (TOK_TABLE_OR_COL key)) s)) (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest1))) (TOK_SELECT (TOK_SELEXPR (TOK_ALLCOLREF (TOK_TABNAME s)))))) \ No newline at end of file +(TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest1))) (TOK_SELECT (TOK_SELEXPR (TOK_ALLCOLREF (TOK_TABNAME s))))) (TOK_FROM (TOK_TABREF (TOK_TABNAME srcbucket) (TOK_TABLEBUCKETSAMPLE 1 4 (TOK_TABLE_OR_COL key)) s))) \ No newline at end of file diff --git ql/src/test/results/compiler/parse/sample7.q.out ql/src/test/results/compiler/parse/sample7.q.out index 6bcf840..2a896d9 100644 --- ql/src/test/results/compiler/parse/sample7.q.out +++ ql/src/test/results/compiler/parse/sample7.q.out @@ -1 +1 @@ -(TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME srcbucket) (TOK_TABLEBUCKETSAMPLE 1 4 (TOK_TABLE_OR_COL key)) s)) (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest1))) (TOK_SELECT (TOK_SELEXPR (TOK_ALLCOLREF (TOK_TABNAME s)))) (TOK_WHERE (> (. (TOK_TABLE_OR_COL s) key) 100)))) \ No newline at end of file +(TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest1))) (TOK_SELECT (TOK_SELEXPR (TOK_ALLCOLREF (TOK_TABNAME s)))) (TOK_WHERE (> (. (TOK_TABLE_OR_COL s) key) 100))) (TOK_FROM (TOK_TABREF (TOK_TABNAME srcbucket) (TOK_TABLEBUCKETSAMPLE 1 4 (TOK_TABLE_OR_COL key)) s))) \ No newline at end of file diff --git ql/src/test/results/compiler/parse/subq.q.out ql/src/test/results/compiler/parse/subq.q.out index afdcb57..ef879de 100644 --- ql/src/test/results/compiler/parse/subq.q.out +++ ql/src/test/results/compiler/parse/subq.q.out @@ -1 +1 @@ -(TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_ALLCOLREF (TOK_TABNAME src)))) (TOK_WHERE (< (. (TOK_TABLE_OR_COL src) key) 100)))) unioninput)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR '../build/ql/test/data/warehouse/union.out')) (TOK_SELECT (TOK_SELEXPR (TOK_ALLCOLREF (TOK_TABNAME unioninput)))))) \ No newline at end of file +(TOK_QUERY (TOK_FROM_BASE (TOK_SUBQUERY (TOK_QUERY (TOK_FROM_BASE (TOK_TABREF (TOK_TABNAME src))) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_ALLCOLREF (TOK_TABNAME src)))) (TOK_WHERE (< (. (TOK_TABLE_OR_COL src) key) 100))))) unioninput)) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_DIR '../build/ql/test/data/warehouse/union.out')) (TOK_SELECT (TOK_SELEXPR (TOK_ALLCOLREF (TOK_TABNAME unioninput))))))) \ No newline at end of file diff --git ql/src/test/results/compiler/parse/udf1.q.out ql/src/test/results/compiler/parse/udf1.q.out index a9084e1..fd5e7d5 100644 --- ql/src/test/results/compiler/parse/udf1.q.out +++ ql/src/test/results/compiler/parse/udf1.q.out @@ -1 +1 @@ -(TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (LIKE 'a' '%a%')) (TOK_SELEXPR (LIKE 'b' '%a%')) (TOK_SELEXPR (LIKE 'ab' '%a%')) (TOK_SELEXPR (LIKE 'ab' '%a_')) (TOK_SELEXPR (LIKE '%_' '\%\_')) (TOK_SELEXPR (LIKE 'ab' '\%\_')) (TOK_SELEXPR (LIKE 'ab' '_a%')) (TOK_SELEXPR (LIKE 'ab' 'a')) (TOK_SELEXPR (RLIKE '' '.*')) (TOK_SELEXPR (RLIKE 'a' '[ab]')) (TOK_SELEXPR (RLIKE '' '[ab]')) (TOK_SELEXPR (RLIKE 'hadoop' '[a-z]*')) (TOK_SELEXPR (RLIKE 'hadoop' 'o*')) (TOK_SELEXPR (TOK_FUNCTION REGEXP_REPLACE 'abc' 'b' 'c')) (TOK_SELEXPR (TOK_FUNCTION REGEXP_REPLACE 'abc' 'z' 'a')) (TOK_SELEXPR (TOK_FUNCTION REGEXP_REPLACE 'abbbb' 'bb' 'b')) (TOK_SELEXPR (TOK_FUNCTION REGEXP_REPLACE 'hadoop' '(.)[a-z]*' '$1ive'))) (TOK_WHERE (= (. (TOK_TABLE_OR_COL src) key) 86)))) \ No newline at end of file +(TOK_QUERY (TOK_FROM_BASE (TOK_TABREF (TOK_TABNAME src))) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (LIKE 'a' '%a%')) (TOK_SELEXPR (LIKE 'b' '%a%')) (TOK_SELEXPR (LIKE 'ab' '%a%')) (TOK_SELEXPR (LIKE 'ab' '%a_')) (TOK_SELEXPR (LIKE '%_' '\%\_')) (TOK_SELEXPR (LIKE 'ab' '\%\_')) (TOK_SELEXPR (LIKE 'ab' '_a%')) (TOK_SELEXPR (LIKE 'ab' 'a')) (TOK_SELEXPR (RLIKE '' '.*')) (TOK_SELEXPR (RLIKE 'a' '[ab]')) (TOK_SELEXPR (RLIKE '' '[ab]')) (TOK_SELEXPR (RLIKE 'hadoop' '[a-z]*')) (TOK_SELEXPR (RLIKE 'hadoop' 'o*')) (TOK_SELEXPR (TOK_FUNCTION REGEXP_REPLACE 'abc' 'b' 'c')) (TOK_SELEXPR (TOK_FUNCTION REGEXP_REPLACE 'abc' 'z' 'a')) (TOK_SELEXPR (TOK_FUNCTION REGEXP_REPLACE 'abbbb' 'bb' 'b')) (TOK_SELEXPR (TOK_FUNCTION REGEXP_REPLACE 'hadoop' '(.)[a-z]*' '$1ive'))) (TOK_WHERE (= (. (TOK_TABLE_OR_COL src) key) 86))))) \ No newline at end of file diff --git ql/src/test/results/compiler/parse/udf4.q.out ql/src/test/results/compiler/parse/udf4.q.out index 6065692..d0b318a 100644 --- ql/src/test/results/compiler/parse/udf4.q.out +++ ql/src/test/results/compiler/parse/udf4.q.out @@ -1 +1 @@ -(TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME dest1))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_FUNCTION round 1.0)) (TOK_SELEXPR (TOK_FUNCTION round 1.5)) (TOK_SELEXPR (TOK_FUNCTION round (- 1.5))) (TOK_SELEXPR (TOK_FUNCTION floor 1.0)) (TOK_SELEXPR (TOK_FUNCTION floor 1.5)) (TOK_SELEXPR (TOK_FUNCTION floor (- 1.5))) (TOK_SELEXPR (TOK_FUNCTION sqrt 1.0)) (TOK_SELEXPR (TOK_FUNCTION sqrt (- 1.0))) (TOK_SELEXPR (TOK_FUNCTION sqrt 0.0)) (TOK_SELEXPR (TOK_FUNCTION ceil 1.0)) (TOK_SELEXPR (TOK_FUNCTION ceil 1.5)) (TOK_SELEXPR (TOK_FUNCTION ceil (- 1.5))) (TOK_SELEXPR (TOK_FUNCTION ceiling 1.0)) (TOK_SELEXPR (TOK_FUNCTION rand 3)) (TOK_SELEXPR (+ 3)) (TOK_SELEXPR (- 3)) (TOK_SELEXPR (+ 1 (+ 2))) (TOK_SELEXPR (+ 1 (- 2))) (TOK_SELEXPR (~ 1))))) \ No newline at end of file +(TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_FUNCTION round 1.0)) (TOK_SELEXPR (TOK_FUNCTION round 1.5)) (TOK_SELEXPR (TOK_FUNCTION round (- 1.5))) (TOK_SELEXPR (TOK_FUNCTION floor 1.0)) (TOK_SELEXPR (TOK_FUNCTION floor 1.5)) (TOK_SELEXPR (TOK_FUNCTION floor (- 1.5))) (TOK_SELEXPR (TOK_FUNCTION sqrt 1.0)) (TOK_SELEXPR (TOK_FUNCTION sqrt (- 1.0))) (TOK_SELEXPR (TOK_FUNCTION sqrt 0.0)) (TOK_SELEXPR (TOK_FUNCTION ceil 1.0)) (TOK_SELEXPR (TOK_FUNCTION ceil 1.5)) (TOK_SELEXPR (TOK_FUNCTION ceil (- 1.5))) (TOK_SELEXPR (TOK_FUNCTION ceiling 1.0)) (TOK_SELEXPR (TOK_FUNCTION rand 3)) (TOK_SELEXPR (+ 3)) (TOK_SELEXPR (- 3)) (TOK_SELEXPR (+ 1 (+ 2))) (TOK_SELEXPR (+ 1 (- 2))) (TOK_SELEXPR (~ 1)))) (TOK_FROM (TOK_TABREF (TOK_TABNAME dest1)))) \ No newline at end of file diff --git ql/src/test/results/compiler/parse/udf6.q.out ql/src/test/results/compiler/parse/udf6.q.out index 795216a..b50bd5d 100644 --- ql/src/test/results/compiler/parse/udf6.q.out +++ ql/src/test/results/compiler/parse/udf6.q.out @@ -1 +1 @@ -(TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_FUNCTION CONCAT 'a' 'b')) (TOK_SELEXPR (TOK_FUNCTION IF TRUE 1 2))))) \ No newline at end of file +(TOK_QUERY (TOK_FROM_BASE (TOK_TABREF (TOK_TABNAME src))) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_FUNCTION CONCAT 'a' 'b')) (TOK_SELEXPR (TOK_FUNCTION IF TRUE 1 2)))))) \ No newline at end of file diff --git ql/src/test/results/compiler/parse/udf_case.q.out ql/src/test/results/compiler/parse/udf_case.q.out index f8de5fc..59e7b13 100644 --- ql/src/test/results/compiler/parse/udf_case.q.out +++ ql/src/test/results/compiler/parse/udf_case.q.out @@ -1 +1 @@ -(TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_FUNCTION CASE 1 1 2 3 4 5)) (TOK_SELEXPR (TOK_FUNCTION CASE 11 12 13 14 15))) (TOK_LIMIT 1))) \ No newline at end of file +(TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_FUNCTION CASE 1 1 2 3 4 5)) (TOK_SELEXPR (TOK_FUNCTION CASE 11 12 13 14 15))) (TOK_LIMIT 1)) (TOK_FROM (TOK_TABREF (TOK_TABNAME src)))) \ No newline at end of file diff --git ql/src/test/results/compiler/parse/udf_when.q.out ql/src/test/results/compiler/parse/udf_when.q.out index a527fa4..32c9030 100644 --- ql/src/test/results/compiler/parse/udf_when.q.out +++ ql/src/test/results/compiler/parse/udf_when.q.out @@ -1 +1 @@ -(TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_FUNCTION WHEN (= 1 1) 2 (= 3 5) 4 5)) (TOK_SELEXPR (TOK_FUNCTION WHEN (= 12 11) 13 (= 14 10) 15))) (TOK_LIMIT 1))) \ No newline at end of file +(TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_FUNCTION WHEN (= 1 1) 2 (= 3 5) 4 5)) (TOK_SELEXPR (TOK_FUNCTION WHEN (= 12 11) 13 (= 14 10) 15))) (TOK_LIMIT 1)) (TOK_FROM (TOK_TABREF (TOK_TABNAME src)))) \ No newline at end of file diff --git ql/src/test/results/compiler/parse/union.q.out ql/src/test/results/compiler/parse/union.q.out index d9be739..7872895 100644 --- ql/src/test/results/compiler/parse/union.q.out +++ ql/src/test/results/compiler/parse/union.q.out @@ -1 +1 @@ -(TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_UNION (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src) key)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src) value))) (TOK_WHERE (< (. (TOK_TABLE_OR_COL src) key) 100)))) (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_ALLCOLREF (TOK_TABNAME src)))) (TOK_WHERE (> (. (TOK_TABLE_OR_COL src) key) 100))))) unioninput)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR '../build/ql/test/data/warehouse/union.out')) (TOK_SELECT (TOK_SELEXPR (TOK_ALLCOLREF (TOK_TABNAME unioninput)))))) \ No newline at end of file +(TOK_QUERY (TOK_FROM_BASE (TOK_SUBQUERY (TOK_UNION (TOK_QUERY (TOK_FROM_BASE (TOK_TABREF (TOK_TABNAME src))) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src) key)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src) value))) (TOK_WHERE (< (. (TOK_TABLE_OR_COL src) key) 100))))) (TOK_QUERY (TOK_FROM_BASE (TOK_TABREF (TOK_TABNAME src))) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_ALLCOLREF (TOK_TABNAME src)))) (TOK_WHERE (> (. (TOK_TABLE_OR_COL src) key) 100)))))) unioninput)) (TOK_QUERY (TOK_INSERT (TOK_DESTINATION (TOK_DIR '../build/ql/test/data/warehouse/union.out')) (TOK_SELECT (TOK_SELEXPR (TOK_ALLCOLREF (TOK_TABNAME unioninput))))))) \ No newline at end of file