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 97ce484..5d119dc 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 3f91ec1..3a39cef 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; @@ -1962,37 +1963,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] ; @@ -2003,16 +2009,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} ; @@ -2020,7 +2026,8 @@ regularBody[boolean topLevel] singleSelectStatement : selectClause - fromClause? + fromClause[false]? + lateralView? whereClause? groupByClause? havingClause? @@ -2029,26 +2036,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? @@ -2058,25 +2056,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 a8b436e..b25134f 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. @@ -341,4 +345,14 @@ protected int incrNumSubQueryPredicates() { return ++numSubQueryPredicates; } + 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 a7cec5d..b765f36 100644 --- ql/src/java/org/apache/hadoop/hive/ql/parse/QBParseInfo.java +++ ql/src/java/org/apache/hadoop/hive/ql/parse/QBParseInfo.java @@ -91,6 +91,7 @@ private final HashMap> aliasToLateralViews; private final HashMap destToLateralView; + private final HashMap> destToSources; /* Order by clause */ private final HashMap destToOrderby; @@ -114,6 +115,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(); @@ -225,6 +227,15 @@ public void setDestForClause(String clause, ASTNode ast) { nameToDest.put(clause, ast); } + public void addSourceForDest(String clause, String source) { + System.err.println("[QBParseInfo/addSourceForDest] " + alias + ":" + clause + "=" + 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. * @@ -559,6 +570,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 92ccbea..5bf3d69 100644 --- ql/src/java/org/apache/hadoop/hive/ql/parse/QBSubQuery.java +++ ql/src/java/org/apache/hadoop/hive/ql/parse/QBSubQuery.java @@ -483,7 +483,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 ) { @@ -537,7 +537,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; @@ -567,7 +567,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).")); } @@ -575,7 +575,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).")); } @@ -585,7 +585,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.")); } /* @@ -596,7 +596,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.")); } } @@ -719,7 +719,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 ) { @@ -828,8 +828,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 77388dd..b846d67 100644 --- ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java +++ ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java @@ -518,7 +518,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) @@ -632,6 +632,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) { @@ -650,7 +651,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) { @@ -673,6 +674,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; @@ -793,7 +796,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) { @@ -804,12 +807,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 : ((PartitionedTableFunctionSpec)ptfInvocationSpec.getFunction()).getAlias();; @@ -827,9 +830,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; } /** @@ -843,7 +847,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(); @@ -854,14 +858,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 @@ -946,6 +950,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, @@ -954,20 +959,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).toLowerCase(); } else if (frm.getToken().getType() == HiveParser.TOK_SUBQUERY) { - processSubQuery(qb, frm); + alias = processSubQuery(qb, frm, ctx_1.dest).toLowerCase(); } 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).toLowerCase(); } 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); } break; @@ -1026,9 +1039,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())); @@ -2183,7 +2193,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.")); } /* @@ -7561,7 +7571,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() @@ -7569,6 +7579,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()); @@ -7581,7 +7601,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; @@ -7626,10 +7647,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(); @@ -7722,7 +7741,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(); @@ -7889,16 +7908,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: // @@ -7914,22 +7931,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); @@ -7940,86 +7956,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); } } @@ -8726,13 +8745,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); @@ -8742,32 +8762,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; @@ -8831,15 +8868,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()); @@ -8849,6 +8907,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); @@ -9048,6 +9115,7 @@ public void init() { @Override @SuppressWarnings("nls") public void analyzeInternal(ASTNode ast) throws SemanticException { + System.err.println("[SemanticAnalyzer/analyzeInternal] " + ast.dump()); ASTNode child = ast; this.ast = ast; viewsExpanded = new ArrayList(); @@ -9192,7 +9260,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())); } } @@ -10198,7 +10266,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(); @@ -10206,19 +10274,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, @@ -10236,7 +10304,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) { @@ -10268,7 +10336,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; @@ -10301,9 +10371,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()); @@ -10312,6 +10382,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/SubQueryUtils.java ql/src/java/org/apache/hadoop/hive/ql/parse/SubQueryUtils.java index 8ffbe07..f7b5322 100644 --- ql/src/java/org/apache/hadoop/hive/ql/parse/SubQueryUtils.java +++ ql/src/java/org/apache/hadoop/hive/ql/parse/SubQueryUtils.java @@ -254,7 +254,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; } @@ -300,9 +300,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; } @@ -449,21 +449,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, @@ -475,14 +475,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; } @@ -562,7 +563,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 9a947ec..8282821 100644 --- ql/src/java/org/apache/hadoop/hive/ql/parse/TypeCheckProcFactory.java +++ ql/src/java/org/apache/hadoop/hive/ql/parse/TypeCheckProcFactory.java @@ -1169,7 +1169,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 7e57471..3018f8a 100644 --- ql/src/test/org/apache/hadoop/hive/ql/parse/TestQBSubQuery.java +++ ql/src/test/org/apache/hadoop/hive/ql/parse/TestQBSubQuery.java @@ -52,9 +52,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 @@ -70,8 +70,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 @@ -82,7 +82,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 @@ -93,7 +93,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 @@ -107,11 +107,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_nested_subquery.q.out ql/src/test/results/clientnegative/subquery_nested_subquery.q.out index 68a3a98..6e010b6 100644 --- ql/src/test/results/clientnegative/subquery_nested_subquery.q.out +++ ql/src/test/results/clientnegative/subquery_nested_subquery.q.out @@ -23,6 +23,6 @@ POSTHOOK: query: CREATE TABLE part( ) POSTHOOK: type: CREATETABLE 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 3cc2fa4..3b9c8ba 100644 --- ql/src/test/results/clientnegative/subquery_windowing_corr.q.out +++ ql/src/test/results/clientnegative/subquery_windowing_corr.q.out @@ -35,7 +35,7 @@ PREHOOK: Output: default@part POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part POSTHOOK: type: LOAD 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 49c1051..089f9c7 100644 --- ql/src/test/results/clientpositive/alter_partition_coltype.q.out +++ ql/src/test/results/clientpositive/alter_partition_coltype.q.out @@ -101,10 +101,6 @@ POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=6:30pm).value SIMPLE [(src ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alter_coltype TOK_INSERT TOK_DESTINATION TOK_DIR @@ -118,6 +114,10 @@ TOK_QUERY TOK_TABLE_OR_COL dt '100x' + TOK_FROM + TOK_TABREF + TOK_TABNAME + alter_coltype STAGE DEPENDENCIES: @@ -313,10 +313,6 @@ POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=6:30pm).value SIMPLE [(src ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alter_coltype TOK_INSERT TOK_DESTINATION TOK_DIR @@ -330,6 +326,10 @@ TOK_QUERY TOK_TABLE_OR_COL ts '6:30pm' + TOK_FROM + TOK_TABREF + TOK_TABNAME + alter_coltype STAGE DEPENDENCIES: @@ -478,10 +478,6 @@ POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=6:30pm).value SIMPLE [(src ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alter_coltype TOK_INSERT TOK_DESTINATION TOK_DIR @@ -500,6 +496,10 @@ TOK_QUERY TOK_TABLE_OR_COL dt 10 + TOK_FROM + TOK_TABREF + TOK_TABNAME + alter_coltype STAGE DEPENDENCIES: @@ -810,10 +810,6 @@ POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=6:30pm).value SIMPLE [(src ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alter_coltype TOK_INSERT TOK_DESTINATION TOK_DIR @@ -836,6 +832,10 @@ TOK_QUERY TOK_ISNOTNULL TOK_TABLE_OR_COL dt + TOK_FROM + TOK_TABREF + TOK_TABNAME + alter_coltype STAGE DEPENDENCIES: @@ -1070,10 +1070,6 @@ POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=6:30pm).value SIMPLE [(src ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alter_coltype TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1092,6 +1088,10 @@ TOK_QUERY TOK_TABLE_OR_COL dt '10' + TOK_FROM + TOK_TABREF + TOK_TABNAME + alter_coltype 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 e6eae8a..ea66b14 100644 --- ql/src/test/results/clientpositive/annotate_stats_filter.q.out +++ ql/src/test/results/clientpositive/annotate_stats_filter.q.out @@ -57,10 +57,6 @@ POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -68,6 +64,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -103,10 +103,6 @@ POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -119,6 +115,10 @@ TOK_QUERY TOK_TABLE_OR_COL state 'OH' + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -243,10 +243,6 @@ POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -259,6 +255,10 @@ TOK_QUERY TOK_TABLE_OR_COL state 'OH' + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -371,10 +371,6 @@ POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -387,6 +383,10 @@ TOK_QUERY TOK_TABLE_OR_COL state 'OH' + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -495,10 +495,6 @@ POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -511,6 +507,10 @@ TOK_QUERY TOK_TABLE_OR_COL state 'OH' + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -623,10 +623,6 @@ POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -639,6 +635,10 @@ TOK_QUERY TOK_ISNULL TOK_TABLE_OR_COL zip + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -749,10 +749,6 @@ POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -766,6 +762,10 @@ TOK_QUERY TOK_ISNOTNULL TOK_TABLE_OR_COL zip + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -878,10 +878,6 @@ POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -894,6 +890,10 @@ TOK_QUERY TOK_ISNOTNULL TOK_TABLE_OR_COL zip + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -1004,10 +1004,6 @@ POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1021,6 +1017,10 @@ TOK_QUERY TOK_ISNULL TOK_TABLE_OR_COL zip + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -1133,10 +1133,6 @@ POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1147,6 +1143,10 @@ TOK_QUERY TOK_WHERE ! false + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -1257,10 +1257,6 @@ POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1271,6 +1267,10 @@ TOK_QUERY TOK_WHERE ! true + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -1383,10 +1383,6 @@ POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1404,6 +1400,10 @@ TOK_QUERY TOK_TABLE_OR_COL state 'CA' + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -1516,10 +1516,6 @@ POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1537,6 +1533,10 @@ TOK_QUERY TOK_ISNULL TOK_TABLE_OR_COL year + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -1647,10 +1647,6 @@ POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1673,6 +1669,10 @@ TOK_QUERY TOK_TABLE_OR_COL state 'FL' + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -1785,10 +1785,6 @@ POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1811,6 +1807,10 @@ TOK_QUERY TOK_TABLE_OR_COL state 'CA' + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -1923,10 +1923,6 @@ POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1949,6 +1945,10 @@ TOK_QUERY TOK_TABLE_OR_COL state 'CA' + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -2061,10 +2061,6 @@ POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -2077,6 +2073,10 @@ TOK_QUERY TOK_TABLE_OR_COL locid 30 + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -2185,10 +2185,6 @@ POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -2201,6 +2197,10 @@ TOK_QUERY TOK_TABLE_OR_COL locid 30 + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -2309,10 +2309,6 @@ POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -2325,6 +2321,10 @@ TOK_QUERY TOK_TABLE_OR_COL locid 30 + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -2433,10 +2433,6 @@ POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -2449,6 +2445,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 e55c35b..049b8b6 100644 --- ql/src/test/results/clientpositive/annotate_stats_groupby.q.out +++ ql/src/test/results/clientpositive/annotate_stats_groupby.q.out @@ -57,10 +57,6 @@ POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -68,6 +64,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -127,13 +127,30 @@ POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name 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 @@ -156,28 +173,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: @@ -399,10 +399,6 @@ POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -414,6 +410,10 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL year + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -544,10 +544,6 @@ POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -564,6 +560,10 @@ TOK_QUERY state TOK_TABLE_OR_COL locid + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -692,10 +692,6 @@ POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -712,6 +708,10 @@ TOK_QUERY state TOK_TABLE_OR_COL locid + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -840,10 +840,6 @@ POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -860,6 +856,10 @@ TOK_QUERY state TOK_TABLE_OR_COL locid + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -988,10 +988,6 @@ POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1011,6 +1007,10 @@ TOK_QUERY TOK_GROUPING_SETS_EXPRESSION TOK_TABLE_OR_COL state + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -1139,10 +1139,6 @@ POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1165,6 +1161,10 @@ TOK_QUERY TOK_GROUPING_SETS_EXPRESSION TOK_TABLE_OR_COL locid + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -1293,10 +1293,6 @@ POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1320,6 +1316,10 @@ TOK_QUERY TOK_TABLE_OR_COL locid TOK_GROUPING_SETS_EXPRESSION + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -1448,10 +1448,6 @@ POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1480,6 +1476,10 @@ TOK_QUERY TOK_TABLE_OR_COL locid TOK_GROUPING_SETS_EXPRESSION + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -1610,10 +1610,6 @@ POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1625,6 +1621,10 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL year + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -1753,10 +1753,6 @@ POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1773,6 +1769,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 523d386..57e8e8e 100644 --- ql/src/test/results/clientpositive/annotate_stats_join.q.out +++ ql/src/test/results/clientpositive/annotate_stats_join.q.out @@ -223,6 +223,13 @@ POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name 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 @@ -242,13 +249,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: @@ -436,6 +436,13 @@ POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name 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 @@ -469,13 +476,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: @@ -674,6 +674,13 @@ POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name 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 @@ -707,13 +714,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: @@ -959,6 +959,13 @@ POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name 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 @@ -992,13 +999,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: @@ -1244,6 +1244,13 @@ POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name 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 @@ -1273,13 +1280,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: @@ -1467,6 +1467,13 @@ POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name 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 @@ -1520,13 +1527,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 e6db870..c38984a 100644 --- ql/src/test/results/clientpositive/annotate_stats_limit.q.out +++ ql/src/test/results/clientpositive/annotate_stats_limit.q.out @@ -69,10 +69,6 @@ POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -80,6 +76,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -113,10 +113,6 @@ POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -126,6 +122,10 @@ TOK_QUERY TOK_ALLCOLREF TOK_LIMIT 4 + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -164,10 +164,6 @@ POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -177,6 +173,10 @@ TOK_QUERY TOK_ALLCOLREF TOK_LIMIT 16 + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -213,10 +213,6 @@ POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -226,6 +222,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 2a56d6e..f978639 100644 --- ql/src/test/results/clientpositive/annotate_stats_part.q.out +++ ql/src/test/results/clientpositive/annotate_stats_part.q.out @@ -41,10 +41,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -52,6 +48,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -106,10 +106,6 @@ POSTHOOK: Lineage: loc_orc PARTITION(year=__HIVE_DEFAULT_PARTITION__).zip SIMPLE 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: @@ -251,10 +251,6 @@ POSTHOOK: Lineage: loc_orc PARTITION(year=__HIVE_DEFAULT_PARTITION__).zip SIMPLE ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -267,6 +263,10 @@ TOK_QUERY TOK_TABLE_OR_COL year '__HIVE_DEFAULT_PARTITION__' + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -342,10 +342,6 @@ POSTHOOK: Lineage: loc_orc PARTITION(year=__HIVE_DEFAULT_PARTITION__).zip SIMPLE ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -353,6 +349,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -467,10 +467,6 @@ POSTHOOK: Lineage: loc_orc PARTITION(year=__HIVE_DEFAULT_PARTITION__).zip SIMPLE ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -483,6 +479,10 @@ TOK_QUERY TOK_TABLE_OR_COL year '2001' + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -582,10 +582,6 @@ POSTHOOK: Lineage: loc_orc PARTITION(year=__HIVE_DEFAULT_PARTITION__).zip SIMPLE ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -598,6 +594,10 @@ TOK_QUERY TOK_TABLE_OR_COL year '__HIVE_DEFAULT_PARTITION__' + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -673,10 +673,6 @@ POSTHOOK: Lineage: loc_orc PARTITION(year=__HIVE_DEFAULT_PARTITION__).zip SIMPLE ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -684,6 +680,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -798,10 +798,6 @@ POSTHOOK: Lineage: loc_orc PARTITION(year=__HIVE_DEFAULT_PARTITION__).zip SIMPLE ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -819,6 +815,10 @@ TOK_QUERY TOK_TABLE_OR_COL year '__HIVE_DEFAULT_PARTITION__' + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -935,10 +935,6 @@ POSTHOOK: Lineage: loc_orc PARTITION(year=__HIVE_DEFAULT_PARTITION__).zip SIMPLE ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -956,6 +952,10 @@ TOK_QUERY TOK_TABLE_OR_COL year '__HIVE_DEFAULT_PARTITION__' + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -1013,10 +1013,6 @@ POSTHOOK: Lineage: loc_orc PARTITION(year=__HIVE_DEFAULT_PARTITION__).zip SIMPLE ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1025,6 +1021,10 @@ TOK_QUERY TOK_SELEXPR TOK_TABLE_OR_COL zip + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -1172,10 +1172,6 @@ POSTHOOK: Lineage: loc_orc PARTITION(year=__HIVE_DEFAULT_PARTITION__).zip SIMPLE ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1184,6 +1180,10 @@ TOK_QUERY TOK_SELEXPR TOK_TABLE_OR_COL state + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -1333,10 +1333,6 @@ POSTHOOK: Lineage: loc_orc PARTITION(year=__HIVE_DEFAULT_PARTITION__).zip SIMPLE ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1348,6 +1344,10 @@ TOK_QUERY TOK_SELEXPR TOK_TABLE_OR_COL locid + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -1495,10 +1495,6 @@ POSTHOOK: Lineage: loc_orc PARTITION(year=__HIVE_DEFAULT_PARTITION__).zip SIMPLE ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1515,6 +1511,10 @@ TOK_QUERY TOK_TABLE_OR_COL year '2001' + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -1620,10 +1620,6 @@ POSTHOOK: Lineage: loc_orc PARTITION(year=__HIVE_DEFAULT_PARTITION__).zip SIMPLE ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1640,6 +1636,10 @@ TOK_QUERY TOK_TABLE_OR_COL year '2001' + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -1745,10 +1745,6 @@ POSTHOOK: Lineage: loc_orc PARTITION(year=__HIVE_DEFAULT_PARTITION__).zip SIMPLE ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1756,6 +1752,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -1872,10 +1872,6 @@ POSTHOOK: Lineage: loc_orc PARTITION(year=__HIVE_DEFAULT_PARTITION__).zip SIMPLE ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1894,6 +1890,10 @@ TOK_QUERY TOK_TABLE_OR_COL year '2001' + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -2001,10 +2001,6 @@ POSTHOOK: Lineage: loc_orc PARTITION(year=__HIVE_DEFAULT_PARTITION__).zip SIMPLE ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -2026,6 +2022,10 @@ TOK_QUERY TOK_TABLE_OR_COL year '2001' + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -2133,25 +2133,6 @@ POSTHOOK: Lineage: loc_orc PARTITION(year=__HIVE_DEFAULT_PARTITION__).zip SIMPLE 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 @@ -2169,6 +2150,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 023b1c3..c294445 100644 --- ql/src/test/results/clientpositive/annotate_stats_select.q.out +++ ql/src/test/results/clientpositive/annotate_stats_select.q.out @@ -105,10 +105,6 @@ POSTHOOK: Lineage: alltypes_orc.vc1 SIMPLE [(alltypes)alltypes.FieldSchema(name: ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -116,6 +112,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -185,10 +185,6 @@ POSTHOOK: Lineage: alltypes_orc.vc1 SIMPLE [(alltypes)alltypes.FieldSchema(name: ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -196,6 +192,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -240,10 +240,6 @@ POSTHOOK: Lineage: alltypes_orc.vc1 SIMPLE [(alltypes)alltypes.FieldSchema(name: ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -252,6 +248,10 @@ TOK_QUERY TOK_SELEXPR TOK_TABLE_OR_COL bo1 + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -375,10 +375,6 @@ POSTHOOK: Lineage: alltypes_orc.vc1 SIMPLE [(alltypes)alltypes.FieldSchema(name: ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -388,6 +384,10 @@ TOK_QUERY TOK_TABLE_OR_COL i1 int1 + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -509,10 +509,6 @@ POSTHOOK: Lineage: alltypes_orc.vc1 SIMPLE [(alltypes)alltypes.FieldSchema(name: ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -521,6 +517,10 @@ TOK_QUERY TOK_SELEXPR TOK_TABLE_OR_COL s1 + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -644,10 +644,6 @@ POSTHOOK: Lineage: alltypes_orc.vc1 SIMPLE [(alltypes)alltypes.FieldSchema(name: ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -656,6 +652,10 @@ TOK_QUERY TOK_SELEXPR TOK_TABLE_OR_COL m1 + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -777,10 +777,6 @@ POSTHOOK: Lineage: alltypes_orc.vc1 SIMPLE [(alltypes)alltypes.FieldSchema(name: ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -810,6 +806,10 @@ TOK_QUERY TOK_SELEXPR TOK_TABLE_OR_COL s1 + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -931,10 +931,6 @@ POSTHOOK: Lineage: alltypes_orc.vc1 SIMPLE [(alltypes)alltypes.FieldSchema(name: ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -942,6 +938,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_NULL + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -1063,10 +1063,6 @@ POSTHOOK: Lineage: alltypes_orc.vc1 SIMPLE [(alltypes)alltypes.FieldSchema(name: ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1074,6 +1070,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR 11 + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -1195,10 +1195,6 @@ POSTHOOK: Lineage: alltypes_orc.vc1 SIMPLE [(alltypes)alltypes.FieldSchema(name: ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1206,6 +1202,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR 11L + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -1327,10 +1327,6 @@ POSTHOOK: Lineage: alltypes_orc.vc1 SIMPLE [(alltypes)alltypes.FieldSchema(name: ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1338,6 +1334,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR 11.0 + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -1459,10 +1459,6 @@ POSTHOOK: Lineage: alltypes_orc.vc1 SIMPLE [(alltypes)alltypes.FieldSchema(name: ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1470,6 +1466,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR "hello" + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -1589,10 +1589,6 @@ POSTHOOK: Lineage: alltypes_orc.vc1 SIMPLE [(alltypes)alltypes.FieldSchema(name: ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1603,6 +1599,10 @@ TOK_QUERY TOK_CHAR 5 "hello" + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -1722,10 +1722,6 @@ POSTHOOK: Lineage: alltypes_orc.vc1 SIMPLE [(alltypes)alltypes.FieldSchema(name: ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1736,6 +1732,10 @@ TOK_QUERY TOK_VARCHAR 5 "hello" + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -1857,10 +1857,6 @@ POSTHOOK: Lineage: alltypes_orc.vc1 SIMPLE [(alltypes)alltypes.FieldSchema(name: ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1870,6 +1866,10 @@ TOK_QUERY TOK_FUNCTION unbase64 "0xe23" + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -1991,10 +1991,6 @@ POSTHOOK: Lineage: alltypes_orc.vc1 SIMPLE [(alltypes)alltypes.FieldSchema(name: ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -2008,6 +2004,10 @@ TOK_QUERY TOK_FUNCTION TOK_SMALLINT "20" + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -2129,10 +2129,6 @@ POSTHOOK: Lineage: alltypes_orc.vc1 SIMPLE [(alltypes)alltypes.FieldSchema(name: ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -2142,6 +2138,10 @@ TOK_QUERY TOK_FUNCTION TOK_TIMESTAMP "1970-12-31 15:59:58.174" + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -2263,10 +2263,6 @@ POSTHOOK: Lineage: alltypes_orc.vc1 SIMPLE [(alltypes)alltypes.FieldSchema(name: ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -2276,6 +2272,10 @@ TOK_QUERY TOK_FUNCTION TOK_DATE "1970-12-31 15:59:58.174" + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -2397,10 +2397,6 @@ POSTHOOK: Lineage: alltypes_orc.vc1 SIMPLE [(alltypes)alltypes.FieldSchema(name: ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -2410,6 +2406,10 @@ TOK_QUERY TOK_FUNCTION TOK_DECIMAL "58.174" + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -2531,10 +2531,6 @@ POSTHOOK: Lineage: alltypes_orc.vc1 SIMPLE [(alltypes)alltypes.FieldSchema(name: ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -2546,6 +2542,10 @@ TOK_QUERY 1 2 3 + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -2667,10 +2667,6 @@ POSTHOOK: Lineage: alltypes_orc.vc1 SIMPLE [(alltypes)alltypes.FieldSchema(name: ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -2682,6 +2678,10 @@ TOK_QUERY "a=1 b=2 c=3" " " "=" + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -2803,10 +2803,6 @@ POSTHOOK: Lineage: alltypes_orc.vc1 SIMPLE [(alltypes)alltypes.FieldSchema(name: ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -2819,6 +2815,10 @@ TOK_QUERY 11 "b" 11 + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -2940,10 +2940,6 @@ POSTHOOK: Lineage: alltypes_orc.vc1 SIMPLE [(alltypes)alltypes.FieldSchema(name: ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -2954,6 +2950,10 @@ TOK_QUERY CREATE_UNION 0 "hello" + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -3077,10 +3077,6 @@ POSTHOOK: Lineage: alltypes_orc.vc1 SIMPLE [(alltypes)alltypes.FieldSchema(name: ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -3089,6 +3085,10 @@ TOK_QUERY TOK_SELEXPR TOK_FUNCTIONSTAR count + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -3231,10 +3231,6 @@ POSTHOOK: Lineage: alltypes_orc.vc1 SIMPLE [(alltypes)alltypes.FieldSchema(name: ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -3244,6 +3240,10 @@ TOK_QUERY TOK_FUNCTION count 1 + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -3386,10 +3386,6 @@ POSTHOOK: Lineage: alltypes_orc.vc1 SIMPLE [(alltypes)alltypes.FieldSchema(name: ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -3399,6 +3395,10 @@ TOK_QUERY TOK_ALLCOLREF TOK_SELEXPR 11 + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -3524,13 +3524,17 @@ POSTHOOK: Lineage: alltypes_orc.vc1 SIMPLE [(alltypes)alltypes.FieldSchema(name: 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 @@ -3541,15 +3545,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: @@ -3692,13 +3692,17 @@ POSTHOOK: Lineage: alltypes_orc.vc1 SIMPLE [(alltypes)alltypes.FieldSchema(name: 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 @@ -3711,15 +3715,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: @@ -3862,13 +3862,19 @@ POSTHOOK: Lineage: alltypes_orc.vc1 SIMPLE [(alltypes)alltypes.FieldSchema(name: 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 @@ -3881,17 +3887,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: @@ -4034,13 +4034,17 @@ POSTHOOK: Lineage: alltypes_orc.vc1 SIMPLE [(alltypes)alltypes.FieldSchema(name: 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 @@ -4054,15 +4058,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: @@ -4205,13 +4205,19 @@ POSTHOOK: Lineage: alltypes_orc.vc1 SIMPLE [(alltypes)alltypes.FieldSchema(name: 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 @@ -4228,17 +4234,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: @@ -4383,16 +4383,33 @@ POSTHOOK: Lineage: alltypes_orc.vc1 SIMPLE [(alltypes)alltypes.FieldSchema(name: 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 @@ -4406,29 +4423,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: @@ -4639,10 +4639,6 @@ POSTHOOK: Lineage: alltypes_orc.vc1 SIMPLE [(alltypes)alltypes.FieldSchema(name: ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -4654,6 +4650,10 @@ TOK_QUERY TOK_WHERE TOK_TABLE_OR_COL bo1 + TOK_FROM + TOK_TABREF + TOK_TABNAME + alltypes_orc STAGE DEPENDENCIES: @@ -4779,10 +4779,6 @@ POSTHOOK: Lineage: alltypes_orc.vc1 SIMPLE [(alltypes)alltypes.FieldSchema(name: ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - alltypes_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -4795,6 +4791,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 89fa6b1..abe1aab 100644 --- ql/src/test/results/clientpositive/annotate_stats_table.q.out +++ ql/src/test/results/clientpositive/annotate_stats_table.q.out @@ -31,10 +31,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - emp_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -42,6 +38,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + emp_orc STAGE DEPENDENCIES: @@ -93,10 +93,6 @@ POSTHOOK: Lineage: emp_orc.lastname SIMPLE [(emp_staging)emp_staging.FieldSchema ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - emp_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -104,6 +100,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + emp_orc STAGE DEPENDENCIES: @@ -147,10 +147,6 @@ POSTHOOK: Lineage: emp_orc.lastname SIMPLE [(emp_staging)emp_staging.FieldSchema 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: @@ -201,10 +201,6 @@ POSTHOOK: Lineage: emp_orc.lastname SIMPLE [(emp_staging)emp_staging.FieldSchema ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - emp_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -212,6 +208,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + emp_orc STAGE DEPENDENCIES: @@ -245,10 +245,6 @@ POSTHOOK: Lineage: emp_orc.lastname SIMPLE [(emp_staging)emp_staging.FieldSchema ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - emp_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -257,6 +253,10 @@ TOK_QUERY TOK_SELEXPR TOK_TABLE_OR_COL deptid + TOK_FROM + TOK_TABREF + TOK_TABNAME + emp_orc STAGE DEPENDENCIES: @@ -373,10 +373,6 @@ POSTHOOK: Lineage: emp_orc.lastname SIMPLE [(emp_staging)emp_staging.FieldSchema ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - emp_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -384,6 +380,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + emp_orc STAGE DEPENDENCIES: @@ -415,10 +415,6 @@ POSTHOOK: Lineage: emp_orc.lastname SIMPLE [(emp_staging)emp_staging.FieldSchema ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - emp_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -427,6 +423,10 @@ TOK_QUERY TOK_SELEXPR TOK_TABLE_OR_COL lastname + TOK_FROM + TOK_TABREF + TOK_TABNAME + emp_orc STAGE DEPENDENCIES: @@ -531,10 +531,6 @@ POSTHOOK: Lineage: emp_orc.lastname SIMPLE [(emp_staging)emp_staging.FieldSchema ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - emp_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -543,6 +539,10 @@ TOK_QUERY TOK_SELEXPR TOK_TABLE_OR_COL deptid + TOK_FROM + TOK_TABREF + TOK_TABNAME + emp_orc STAGE DEPENDENCIES: @@ -647,10 +647,6 @@ POSTHOOK: Lineage: emp_orc.lastname SIMPLE [(emp_staging)emp_staging.FieldSchema ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - emp_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -662,6 +658,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 df1e386..4cc6228 100644 --- ql/src/test/results/clientpositive/annotate_stats_union.q.out +++ ql/src/test/results/clientpositive/annotate_stats_union.q.out @@ -69,10 +69,6 @@ POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -81,6 +77,10 @@ TOK_QUERY TOK_SELEXPR TOK_TABLE_OR_COL state + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -187,14 +187,17 @@ POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name 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 @@ -203,11 +206,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 @@ -216,14 +219,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: @@ -371,10 +371,6 @@ POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - loc_orc TOK_INSERT TOK_DESTINATION TOK_DIR @@ -382,6 +378,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + loc_orc STAGE DEPENDENCIES: @@ -415,14 +415,17 @@ POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name 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 @@ -430,11 +433,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 @@ -442,14 +445,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: @@ -731,15 +731,17 @@ POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name 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 @@ -748,12 +750,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 @@ -762,14 +764,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: @@ -966,15 +966,17 @@ POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name 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 @@ -983,12 +985,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 @@ -997,14 +999,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 48ca65f..fd12d4b 100644 --- ql/src/test/results/clientpositive/auto_join_reordering_values.q.out +++ ql/src/test/results/clientpositive/auto_join_reordering_values.q.out @@ -97,6 +97,23 @@ POSTHOOK: Lineage: user_small.userid SIMPLE [(testsrc)testsrc.FieldSchema(name:k 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 @@ -158,23 +175,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 e84e7b2..17affd8 100644 --- ql/src/test/results/clientpositive/auto_sortmerge_join_1.q.out +++ ql/src/test/results/clientpositive/auto_sortmerge_join_1.q.out @@ -86,6 +86,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 @@ -105,14 +113,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: @@ -298,6 +298,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 @@ -317,14 +325,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: @@ -510,6 +510,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 @@ -529,14 +537,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 8ac2c06..b095b95 100644 --- ql/src/test/results/clientpositive/auto_sortmerge_join_11.q.out +++ ql/src/test/results/clientpositive/auto_sortmerge_join_11.q.out @@ -82,6 +82,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 @@ -101,14 +109,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: @@ -405,6 +405,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 @@ -424,14 +432,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: @@ -722,6 +722,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 @@ -741,19 +754,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/auto_sortmerge_join_12.q.out ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out index d462218..f3e84e8 100644 --- ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out +++ ql/src/test/results/clientpositive/auto_sortmerge_join_12.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_JOIN @@ -157,14 +165,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 0488485..0c2609f 100644 --- ql/src/test/results/clientpositive/auto_sortmerge_join_2.q.out +++ ql/src/test/results/clientpositive/auto_sortmerge_join_2.q.out @@ -70,6 +70,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 @@ -89,14 +97,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: @@ -284,6 +284,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 @@ -303,14 +311,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 1537f65..62f25c9 100644 --- ql/src/test/results/clientpositive/auto_sortmerge_join_3.q.out +++ ql/src/test/results/clientpositive/auto_sortmerge_join_3.q.out @@ -70,6 +70,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 @@ -89,14 +97,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: @@ -237,6 +237,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 @@ -256,14 +264,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: @@ -404,6 +404,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 @@ -423,14 +431,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 6dd49c4..f13333b 100644 --- ql/src/test/results/clientpositive/auto_sortmerge_join_4.q.out +++ ql/src/test/results/clientpositive/auto_sortmerge_join_4.q.out @@ -82,6 +82,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 @@ -101,14 +109,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: @@ -249,6 +249,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 @@ -268,14 +276,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: @@ -416,6 +416,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 @@ -435,14 +443,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 0f4f59f..980e57a 100644 --- ql/src/test/results/clientpositive/auto_sortmerge_join_5.q.out +++ ql/src/test/results/clientpositive/auto_sortmerge_join_5.q.out @@ -55,6 +55,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 @@ -74,14 +82,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: @@ -218,6 +218,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 @@ -237,14 +245,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: @@ -381,6 +381,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 @@ -400,14 +408,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 b176c55..6f11fa3 100644 --- ql/src/test/results/clientpositive/auto_sortmerge_join_7.q.out +++ ql/src/test/results/clientpositive/auto_sortmerge_join_7.q.out @@ -95,6 +95,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 @@ -114,14 +122,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: @@ -309,6 +309,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 @@ -328,14 +336,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: @@ -523,6 +523,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 @@ -542,14 +550,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 5d2342c..ed9c885 100644 --- ql/src/test/results/clientpositive/auto_sortmerge_join_8.q.out +++ ql/src/test/results/clientpositive/auto_sortmerge_join_8.q.out @@ -95,6 +95,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 @@ -114,14 +122,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: @@ -309,6 +309,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 @@ -328,14 +336,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: @@ -525,6 +525,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 @@ -544,14 +552,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 bcfb8eb..b493193 100644 --- ql/src/test/results/clientpositive/binary_output_format.q.out +++ ql/src/test/results/clientpositive/binary_output_format.q.out @@ -52,10 +52,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_TAB @@ -83,6 +79,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 5ade5f8..1d5b5f9 100644 --- ql/src/test/results/clientpositive/bucket1.q.out +++ ql/src/test/results/clientpositive/bucket1.q.out @@ -14,10 +14,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_TAB @@ -26,6 +22,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 672903d..3b85446 100644 --- ql/src/test/results/clientpositive/bucket2.q.out +++ ql/src/test/results/clientpositive/bucket2.q.out @@ -14,10 +14,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_TAB @@ -26,6 +22,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 9232f6b..be9e36e 100644 --- ql/src/test/results/clientpositive/bucket3.q.out +++ ql/src/test/results/clientpositive/bucket3.q.out @@ -14,10 +14,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_TAB @@ -30,6 +26,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/bucket_map_join_1.q.out ql/src/test/results/clientpositive/bucket_map_join_1.q.out index 75bcda8..57de7b9 100644 --- ql/src/test/results/clientpositive/bucket_map_join_1.q.out +++ ql/src/test/results/clientpositive/bucket_map_join_1.q.out @@ -49,6 +49,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 @@ -78,19 +91,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 a737f82..38433ef 100644 --- ql/src/test/results/clientpositive/bucket_map_join_2.q.out +++ ql/src/test/results/clientpositive/bucket_map_join_2.q.out @@ -49,6 +49,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 @@ -78,19 +91,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 930be79..3dc1b49 100644 --- ql/src/test/results/clientpositive/bucketcontext_1.q.out +++ ql/src/test/results/clientpositive/bucketcontext_1.q.out @@ -80,6 +80,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 @@ -99,19 +112,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: @@ -367,6 +367,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 @@ -386,19 +399,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 88f747a..9c04e2e 100644 --- ql/src/test/results/clientpositive/bucketcontext_2.q.out +++ ql/src/test/results/clientpositive/bucketcontext_2.q.out @@ -68,6 +68,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 @@ -87,19 +100,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: @@ -355,6 +355,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 @@ -374,19 +387,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 3da1cc9..717d472 100644 --- ql/src/test/results/clientpositive/bucketcontext_3.q.out +++ ql/src/test/results/clientpositive/bucketcontext_3.q.out @@ -68,6 +68,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 @@ -87,19 +100,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: @@ -352,6 +352,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 @@ -371,19 +384,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 33dee62..4944c62 100644 --- ql/src/test/results/clientpositive/bucketcontext_4.q.out +++ ql/src/test/results/clientpositive/bucketcontext_4.q.out @@ -80,6 +80,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 @@ -99,19 +112,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: @@ -364,6 +364,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 @@ -383,19 +396,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 eb751f3..96c47a0 100644 --- ql/src/test/results/clientpositive/bucketcontext_5.q.out +++ ql/src/test/results/clientpositive/bucketcontext_5.q.out @@ -53,6 +53,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 @@ -72,19 +85,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: @@ -248,6 +248,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 @@ -267,19 +280,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 320b8b9..d3e4d75 100644 --- ql/src/test/results/clientpositive/bucketcontext_6.q.out +++ ql/src/test/results/clientpositive/bucketcontext_6.q.out @@ -67,6 +67,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 @@ -86,19 +99,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: @@ -309,6 +309,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 @@ -328,19 +341,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 ef4f295..1a18b64 100644 --- ql/src/test/results/clientpositive/bucketcontext_7.q.out +++ ql/src/test/results/clientpositive/bucketcontext_7.q.out @@ -93,6 +93,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 @@ -112,19 +125,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: @@ -424,6 +424,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 @@ -443,19 +456,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 f9e6835..1d294dc 100644 --- ql/src/test/results/clientpositive/bucketcontext_8.q.out +++ ql/src/test/results/clientpositive/bucketcontext_8.q.out @@ -93,6 +93,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 @@ -112,19 +125,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: @@ -424,6 +424,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 @@ -443,19 +456,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 81ca8a7..e210554 100644 --- ql/src/test/results/clientpositive/bucketmapjoin1.q.out +++ ql/src/test/results/clientpositive/bucketmapjoin1.q.out @@ -28,25 +28,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 @@ -79,6 +60,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: @@ -153,25 +153,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 @@ -204,6 +185,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: @@ -329,25 +329,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 @@ -381,6 +362,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: @@ -896,25 +896,6 @@ POSTHOOK: Lineage: bucketmapjoin_tmp_result.value2 SIMPLE [(srcbucket_mapjoin_pa 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 @@ -948,6 +929,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 60c66ea..8abfaab 100644 --- ql/src/test/results/clientpositive/bucketmapjoin10.q.out +++ ql/src/test/results/clientpositive/bucketmapjoin10.q.out @@ -117,6 +117,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 @@ -150,19 +163,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 2cc2bd4..0bc330a 100644 --- ql/src/test/results/clientpositive/bucketmapjoin11.q.out +++ ql/src/test/results/clientpositive/bucketmapjoin11.q.out @@ -123,6 +123,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 @@ -156,19 +169,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: @@ -474,6 +474,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 @@ -517,19 +530,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 2da135e..a367350 100644 --- ql/src/test/results/clientpositive/bucketmapjoin12.q.out +++ ql/src/test/results/clientpositive/bucketmapjoin12.q.out @@ -91,6 +91,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 @@ -124,19 +137,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: @@ -356,6 +356,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 @@ -389,19 +402,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 e6af5a9..f7181b4 100644 --- ql/src/test/results/clientpositive/bucketmapjoin13.q.out +++ ql/src/test/results/clientpositive/bucketmapjoin13.q.out @@ -97,6 +97,19 @@ POSTHOOK: Lineage: srcbucket_mapjoin_part_2 PARTITION(part=1).value SIMPLE [(src 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 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: @@ -399,6 +399,19 @@ POSTHOOK: Lineage: srcbucket_mapjoin_part_2 PARTITION(part=1).value SIMPLE [(src 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 @@ -425,19 +438,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: @@ -684,6 +684,19 @@ POSTHOOK: Lineage: srcbucket_mapjoin_part_2 PARTITION(part=1).value SIMPLE [(src 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 @@ -703,19 +716,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: @@ -964,6 +964,19 @@ POSTHOOK: Lineage: srcbucket_mapjoin_part_2 PARTITION(part=1).value SIMPLE [(src 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 @@ -983,19 +996,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 7d6dd86..3e48b54 100644 --- ql/src/test/results/clientpositive/bucketmapjoin2.q.out +++ ql/src/test/results/clientpositive/bucketmapjoin2.q.out @@ -76,32 +76,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 @@ -128,6 +102,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: @@ -646,32 +646,6 @@ POSTHOOK: Lineage: bucketmapjoin_tmp_result.value2 SIMPLE [(srcbucket_mapjoin_pa 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 @@ -698,6 +672,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: @@ -1415,25 +1415,6 @@ POSTHOOK: Lineage: bucketmapjoin_tmp_result.value2 SIMPLE [(srcbucket_mapjoin_pa 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 @@ -1460,6 +1441,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 f62ce1d..ed88ce7 100644 --- ql/src/test/results/clientpositive/bucketmapjoin3.q.out +++ ql/src/test/results/clientpositive/bucketmapjoin3.q.out @@ -93,6 +93,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 @@ -126,32 +152,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: @@ -670,6 +670,32 @@ POSTHOOK: Lineage: bucketmapjoin_tmp_result.value2 SIMPLE [(srcbucket_mapjoin_pa 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 @@ -703,32 +729,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 ef980f5..59d6468 100644 --- ql/src/test/results/clientpositive/bucketmapjoin4.q.out +++ ql/src/test/results/clientpositive/bucketmapjoin4.q.out @@ -93,25 +93,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 @@ -138,6 +119,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: @@ -603,25 +603,6 @@ POSTHOOK: Lineage: bucketmapjoin_tmp_result.value2 SIMPLE [(srcbucket_mapjoin)b. 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 @@ -648,6 +629,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 d725c7d..c085568 100644 --- ql/src/test/results/clientpositive/bucketmapjoin5.q.out +++ ql/src/test/results/clientpositive/bucketmapjoin5.q.out @@ -131,25 +131,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 @@ -176,6 +157,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: @@ -696,25 +696,6 @@ POSTHOOK: Lineage: bucketmapjoin_tmp_result.value2 SIMPLE [(srcbucket_mapjoin_pa 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 @@ -741,6 +722,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/bucketmapjoin8.q.out ql/src/test/results/clientpositive/bucketmapjoin8.q.out index 79d4b8e..4fb08cf 100644 --- ql/src/test/results/clientpositive/bucketmapjoin8.q.out +++ ql/src/test/results/clientpositive/bucketmapjoin8.q.out @@ -63,6 +63,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 @@ -96,19 +109,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: @@ -337,6 +337,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 @@ -370,19 +383,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 fd4f9f9..bb4cba2 100644 --- ql/src/test/results/clientpositive/bucketmapjoin9.q.out +++ ql/src/test/results/clientpositive/bucketmapjoin9.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 + b + TOK_SELEXPR + TOK_FUNCTIONSTAR + count TOK_FROM TOK_JOIN TOK_TABREF @@ -102,19 +115,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: @@ -364,6 +364,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 @@ -397,19 +410,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 cfff344..bb1064b 100644 --- ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out +++ ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out @@ -59,25 +59,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 @@ -111,6 +92,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 db9ee36..b76a4a3 100644 --- ql/src/test/results/clientpositive/bucketmapjoin_negative2.q.out +++ ql/src/test/results/clientpositive/bucketmapjoin_negative2.q.out @@ -66,25 +66,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 @@ -111,6 +92,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 b457bc4..b3382f1 100644 --- ql/src/test/results/clientpositive/bucketmapjoin_negative3.q.out +++ ql/src/test/results/clientpositive/bucketmapjoin_negative3.q.out @@ -115,6 +115,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 @@ -144,18 +156,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: @@ -290,6 +290,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 @@ -319,18 +331,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: @@ -467,6 +467,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 @@ -491,18 +503,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: @@ -629,6 +629,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 @@ -658,18 +670,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: @@ -796,6 +796,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 @@ -825,18 +837,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: @@ -963,6 +963,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 @@ -992,18 +1004,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: @@ -1130,6 +1130,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 @@ -1159,18 +1171,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: @@ -1297,6 +1297,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 @@ -1326,18 +1338,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: @@ -1464,6 +1464,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 @@ -1493,18 +1505,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_hadoop20.q.out ql/src/test/results/clientpositive/combine2_hadoop20.q.out index 5ba4f1f..bfa1e05 100644 --- ql/src/test/results/clientpositive/combine2_hadoop20.q.out +++ ql/src/test/results/clientpositive/combine2_hadoop20.q.out @@ -196,10 +196,6 @@ POSTHOOK: Lineage: combine2 PARTITION(value=|).key EXPRESSION [(src)src.FieldSch ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - combine2 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -214,6 +210,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 9668855..c5c0459 100644 --- ql/src/test/results/clientpositive/ctas.q.out +++ ql/src/test/results/clientpositive/ctas.q.out @@ -659,10 +659,6 @@ TOK_CREATETABLE '\012' TOK_TBLTEXTFILE TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_DIR @@ -683,6 +679,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 0ec0af5..5be72b7 100644 --- ql/src/test/results/clientpositive/ctas_hadoop20.q.out +++ ql/src/test/results/clientpositive/ctas_hadoop20.q.out @@ -659,10 +659,6 @@ TOK_CREATETABLE '\012' TOK_TBLTEXTFILE TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_DIR @@ -683,6 +679,10 @@ TOK_CREATETABLE value TOK_LIMIT 10 + 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 545d527..89e1764 100644 --- ql/src/test/results/clientpositive/dynamic_partition_skip_default.q.out +++ ql/src/test/results/clientpositive/dynamic_partition_skip_default.q.out @@ -56,10 +56,6 @@ POSTHOOK: Lineage: dynamic_part_table PARTITION(partcol1=__HIVE_DEFAULT_PARTITIO ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - dynamic_part_table TOK_INSERT TOK_DESTINATION TOK_DIR @@ -78,6 +74,10 @@ TOK_QUERY TOK_TABLE_OR_COL partcol2 '1' + TOK_FROM + TOK_TABREF + TOK_TABNAME + dynamic_part_table STAGE DEPENDENCIES: @@ -180,10 +180,6 @@ POSTHOOK: Lineage: dynamic_part_table PARTITION(partcol1=__HIVE_DEFAULT_PARTITIO ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - dynamic_part_table TOK_INSERT TOK_DESTINATION TOK_DIR @@ -202,6 +198,10 @@ TOK_QUERY TOK_TABLE_OR_COL partcol2 '1' + TOK_FROM + TOK_TABREF + TOK_TABNAME + dynamic_part_table STAGE DEPENDENCIES: @@ -304,10 +304,6 @@ POSTHOOK: Lineage: dynamic_part_table PARTITION(partcol1=__HIVE_DEFAULT_PARTITIO ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - dynamic_part_table TOK_INSERT TOK_DESTINATION TOK_DIR @@ -336,6 +332,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 2092540..60cc294 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: @@ -414,10 +414,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - V1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -425,6 +421,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + V1 LOGICAL PLAN: @@ -451,10 +451,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - V2 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -462,6 +458,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + V2 LOGICAL PLAN: @@ -488,10 +488,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - V3 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -499,6 +495,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + V3 LOGICAL PLAN: @@ -561,10 +561,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - V4 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -572,6 +568,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + V4 LOGICAL PLAN: @@ -673,10 +673,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - V5 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -684,6 +680,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + V5 LOGICAL PLAN: @@ -713,14 +713,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 @@ -738,6 +760,10 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL key + TOK_FROM + TOK_TABREF + TOK_TABNAME + src s1 TOK_TABREF TOK_TABNAME @@ -752,32 +778,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 ff91d35..c60351a 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: Lineage: filter_join_breaktask PARTITION(ds=2008-04-08).value SIMPLE [ 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 89c7299..74f5a22 100644 --- ql/src/test/results/clientpositive/groupby_map_ppr.q.out +++ ql/src/test/results/clientpositive/groupby_map_ppr.q.out @@ -20,39 +20,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 . @@ -61,8 +41,9 @@ TOK_QUERY key 1 1 - TOK_FUNCTION - sum + TOK_SELEXPR + TOK_FUNCTIONDI + count TOK_FUNCTION substr . @@ -70,22 +51,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 12f1fcf..bc1a56c 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 @@ -20,39 +20,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 . @@ -61,7 +41,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 @@ -70,39 +81,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 c8eed7c..168d8d2 100644 --- ql/src/test/results/clientpositive/groupby_ppr.q.out +++ ql/src/test/results/clientpositive/groupby_ppr.q.out @@ -20,39 +20,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 . @@ -61,8 +41,9 @@ TOK_QUERY key 1 1 - TOK_FUNCTION - sum + TOK_SELEXPR + TOK_FUNCTIONDI + count TOK_FUNCTION substr . @@ -70,22 +51,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 31d6dec..615fa54 100644 --- ql/src/test/results/clientpositive/groupby_ppr_multi_distinct.q.out +++ ql/src/test/results/clientpositive/groupby_ppr_multi_distinct.q.out @@ -20,39 +20,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 . @@ -61,7 +41,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 @@ -70,39 +81,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.q.out ql/src/test/results/clientpositive/groupby_sort_1.q.out index b1f7f41..d1fc772 100644 --- ql/src/test/results/clientpositive/groupby_sort_1.q.out +++ ql/src/test/results/clientpositive/groupby_sort_1.q.out @@ -49,10 +49,6 @@ POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comm ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T1 TOK_INSERT TOK_DESTINATION TOK_TAB @@ -69,6 +65,10 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL key + TOK_FROM + TOK_TABREF + TOK_TABNAME + T1 STAGE DEPENDENCIES: @@ -409,10 +409,6 @@ POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comm ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T1 TOK_INSERT TOK_DESTINATION TOK_TAB @@ -434,6 +430,10 @@ TOK_QUERY key TOK_TABLE_OR_COL val + TOK_FROM + TOK_TABREF + TOK_TABNAME + T1 STAGE DEPENDENCIES: @@ -638,25 +638,6 @@ POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comm 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 @@ -673,6 +654,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: @@ -1059,13 +1059,25 @@ POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comm 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 @@ -1079,23 +1091,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: @@ -1506,10 +1506,6 @@ POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comm ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T1 TOK_INSERT TOK_DESTINATION TOK_TAB @@ -1529,6 +1525,10 @@ TOK_QUERY 1 TOK_TABLE_OR_COL key + TOK_FROM + TOK_TABREF + TOK_TABNAME + T1 STAGE DEPENDENCIES: @@ -1909,10 +1909,6 @@ POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comm ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T1 TOK_INSERT TOK_DESTINATION TOK_TAB @@ -1937,6 +1933,10 @@ TOK_QUERY 1 TOK_TABLE_OR_COL val + TOK_FROM + TOK_TABREF + TOK_TABNAME + T1 STAGE DEPENDENCIES: @@ -2174,10 +2174,6 @@ POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comm ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T1 TOK_INSERT TOK_DESTINATION TOK_TAB @@ -2203,6 +2199,10 @@ TOK_QUERY TOK_TABLE_OR_COL key 1 + TOK_FROM + TOK_TABREF + TOK_TABNAME + T1 STAGE DEPENDENCIES: @@ -2468,30 +2468,6 @@ POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comm 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 @@ -2515,6 +2491,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: @@ -2798,14 +2798,18 @@ POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comm 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 @@ -2821,11 +2825,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 @@ -2841,15 +2845,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: @@ -3365,14 +3365,18 @@ POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comm 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 @@ -3388,11 +3392,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 @@ -3415,15 +3419,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: @@ -4056,14 +4056,31 @@ POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comm 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 @@ -4080,13 +4097,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 @@ -4103,6 +4120,10 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL key + TOK_FROM + TOK_TABREF + TOK_TABNAME + T1 subq2 = . @@ -4113,27 +4134,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: @@ -4458,14 +4458,17 @@ POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comm 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 @@ -4481,13 +4484,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 @@ -4508,6 +4511,10 @@ TOK_QUERY key TOK_TABLE_OR_COL val + TOK_FROM + TOK_TABREF + TOK_TABNAME + T1 subq2 = . @@ -4518,13 +4525,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: @@ -4908,10 +4908,6 @@ POSTHOOK: Lineage: t2.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comm ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T2 TOK_INSERT TOK_DESTINATION TOK_TAB @@ -4928,6 +4924,10 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL key + TOK_FROM + TOK_TABREF + TOK_TABNAME + T2 STAGE DEPENDENCIES: @@ -5222,10 +5222,6 @@ POSTHOOK: Lineage: t2.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comm ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T2 TOK_INSERT TOK_DESTINATION TOK_TAB @@ -5250,6 +5246,10 @@ TOK_QUERY 1 TOK_TABLE_OR_COL val + TOK_FROM + TOK_TABREF + TOK_TABNAME + T2 STAGE DEPENDENCIES: @@ -5765,10 +5765,6 @@ POSTHOOK: Lineage: t2.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comm ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T2 TOK_INSERT TOK_DESTINATION TOK_TAB @@ -5796,6 +5792,10 @@ TOK_QUERY TOK_TABLE_OR_COL val 2 + TOK_FROM + TOK_TABREF + TOK_TABNAME + T2 STAGE DEPENDENCIES: @@ -6248,28 +6248,6 @@ POSTHOOK: Lineage: t2.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comm 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 @@ -6296,6 +6274,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: @@ -6808,50 +6808,6 @@ POSTHOOK: Lineage: t2.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comm 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 @@ -6878,6 +6834,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 3362408..5006b52 100644 --- ql/src/test/results/clientpositive/groupby_sort_6.q.out +++ ql/src/test/results/clientpositive/groupby_sort_6.q.out @@ -21,10 +21,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T1 TOK_INSERT TOK_DESTINATION TOK_TAB @@ -46,6 +42,10 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL key + TOK_FROM + TOK_TABREF + TOK_TABNAME + T1 STAGE DEPENDENCIES: @@ -165,10 +165,6 @@ POSTHOOK: Lineage: outputtbl1.key EXPRESSION [(t1)t1.FieldSchema(name:key, type: ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T1 TOK_INSERT TOK_DESTINATION TOK_TAB @@ -190,6 +186,10 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL key + TOK_FROM + TOK_TABREF + TOK_TABNAME + T1 STAGE DEPENDENCIES: @@ -318,10 +318,6 @@ POSTHOOK: Lineage: outputtbl1.key EXPRESSION [(t1)t1.FieldSchema(name:key, type: ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T1 TOK_INSERT TOK_DESTINATION TOK_TAB @@ -343,6 +339,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.q.out ql/src/test/results/clientpositive/groupby_sort_skew_1.q.out index d1937b9..4463af0 100644 --- ql/src/test/results/clientpositive/groupby_sort_skew_1.q.out +++ ql/src/test/results/clientpositive/groupby_sort_skew_1.q.out @@ -49,10 +49,6 @@ POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comm ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T1 TOK_INSERT TOK_DESTINATION TOK_TAB @@ -69,6 +65,10 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL key + TOK_FROM + TOK_TABREF + TOK_TABNAME + T1 STAGE DEPENDENCIES: @@ -409,10 +409,6 @@ POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comm ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T1 TOK_INSERT TOK_DESTINATION TOK_TAB @@ -434,6 +430,10 @@ TOK_QUERY key TOK_TABLE_OR_COL val + TOK_FROM + TOK_TABREF + TOK_TABNAME + T1 STAGE DEPENDENCIES: @@ -702,25 +702,6 @@ POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comm 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 @@ -737,6 +718,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: @@ -1123,13 +1123,25 @@ POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comm 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 @@ -1143,23 +1155,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: @@ -1570,10 +1570,6 @@ POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comm ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T1 TOK_INSERT TOK_DESTINATION TOK_TAB @@ -1593,6 +1589,10 @@ TOK_QUERY 1 TOK_TABLE_OR_COL key + TOK_FROM + TOK_TABREF + TOK_TABNAME + T1 STAGE DEPENDENCIES: @@ -1973,10 +1973,6 @@ POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comm ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T1 TOK_INSERT TOK_DESTINATION TOK_TAB @@ -2001,6 +1997,10 @@ TOK_QUERY 1 TOK_TABLE_OR_COL val + TOK_FROM + TOK_TABREF + TOK_TABNAME + T1 STAGE DEPENDENCIES: @@ -2302,10 +2302,6 @@ POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comm ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T1 TOK_INSERT TOK_DESTINATION TOK_TAB @@ -2331,6 +2327,10 @@ TOK_QUERY TOK_TABLE_OR_COL key 1 + TOK_FROM + TOK_TABREF + TOK_TABNAME + T1 STAGE DEPENDENCIES: @@ -2660,30 +2660,6 @@ POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comm 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 @@ -2707,6 +2683,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: @@ -3054,14 +3054,18 @@ POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comm 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 @@ -3077,11 +3081,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 @@ -3097,15 +3101,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: @@ -3621,14 +3621,18 @@ POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comm 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 @@ -3644,11 +3648,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 @@ -3671,15 +3675,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: @@ -4376,14 +4376,31 @@ POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comm 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 @@ -4400,13 +4417,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 @@ -4423,6 +4440,10 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL key + TOK_FROM + TOK_TABREF + TOK_TABNAME + T1 subq2 = . @@ -4433,27 +4454,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: @@ -4778,14 +4778,17 @@ POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comm 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 @@ -4801,13 +4804,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 @@ -4828,6 +4831,10 @@ TOK_QUERY key TOK_TABLE_OR_COL val + TOK_FROM + TOK_TABREF + TOK_TABNAME + T1 subq2 = . @@ -4838,13 +4845,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: @@ -5292,10 +5292,6 @@ POSTHOOK: Lineage: t2.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comm ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T2 TOK_INSERT TOK_DESTINATION TOK_TAB @@ -5312,6 +5308,10 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL key + TOK_FROM + TOK_TABREF + TOK_TABNAME + T2 STAGE DEPENDENCIES: @@ -5670,10 +5670,6 @@ POSTHOOK: Lineage: t2.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comm ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T2 TOK_INSERT TOK_DESTINATION TOK_TAB @@ -5698,6 +5694,10 @@ TOK_QUERY 1 TOK_TABLE_OR_COL val + TOK_FROM + TOK_TABREF + TOK_TABNAME + T2 STAGE DEPENDENCIES: @@ -6213,10 +6213,6 @@ POSTHOOK: Lineage: t2.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comm ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - T2 TOK_INSERT TOK_DESTINATION TOK_TAB @@ -6244,6 +6240,10 @@ TOK_QUERY TOK_TABLE_OR_COL val 2 + TOK_FROM + TOK_TABREF + TOK_TABNAME + T2 STAGE DEPENDENCIES: @@ -6696,28 +6696,6 @@ POSTHOOK: Lineage: t2.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comm 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 @@ -6744,6 +6722,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: @@ -7256,50 +7256,6 @@ POSTHOOK: Lineage: t2.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comm 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 @@ -7326,6 +7282,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 20bdfaf..011f98d 100644 --- ql/src/test/results/clientpositive/input23.q.out +++ ql/src/test/results/clientpositive/input23.q.out @@ -7,16 +7,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 @@ -54,6 +44,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 4499205..ee0d225 100644 --- ql/src/test/results/clientpositive/input42.q.out +++ ql/src/test/results/clientpositive/input42.q.out @@ -7,11 +7,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcpart - a TOK_INSERT TOK_DESTINATION TOK_DIR @@ -37,6 +32,11 @@ TOK_QUERY TOK_TABLE_OR_COL a hr + TOK_FROM + TOK_TABREF + TOK_TABNAME + srcpart + a STAGE DEPENDENCIES: @@ -1202,11 +1202,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcpart - a TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1237,6 +1232,11 @@ TOK_QUERY TOK_TABLE_OR_COL a hr + TOK_FROM + TOK_TABREF + TOK_TABNAME + srcpart + a STAGE DEPENDENCIES: @@ -1784,11 +1784,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcpart - a TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1820,6 +1815,11 @@ TOK_QUERY TOK_TABLE_OR_COL a hr + 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 4c1d89b..984f1a4 100644 --- ql/src/test/results/clientpositive/input_part1.q.out +++ ql/src/test/results/clientpositive/input_part1.q.out @@ -14,57 +14,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 ea22329..08622fa 100644 --- ql/src/test/results/clientpositive/input_part2.q.out +++ ql/src/test/results/clientpositive/input_part2.q.out @@ -21,104 +21,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 2713fe3..97ed695 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 eb404bd..bd4a592 100644 --- ql/src/test/results/clientpositive/input_part9.q.out +++ ql/src/test/results/clientpositive/input_part9.q.out @@ -7,11 +7,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - SRCPART - x TOK_INSERT TOK_DESTINATION TOK_DIR @@ -42,6 +37,11 @@ TOK_QUERY TOK_TABLE_OR_COL x hr + 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 631ffea..d40536a 100644 --- ql/src/test/results/clientpositive/join17.q.out +++ ql/src/test/results/clientpositive/join17.q.out @@ -14,7 +14,7 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM + TOK_FROM_BASE TOK_JOIN TOK_TABREF TOK_TABNAME @@ -33,20 +33,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 b2e254b..f743a1a 100644 --- ql/src/test/results/clientpositive/join26.q.out +++ ql/src/test/results/clientpositive/join26.q.out @@ -18,6 +18,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 @@ -65,33 +92,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 7a9c173..80fbc9b 100644 --- ql/src/test/results/clientpositive/join32.q.out +++ ql/src/test/results/clientpositive/join32.q.out @@ -22,6 +22,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 @@ -69,27 +90,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 0f1cf0c..1e08963 100644 --- ql/src/test/results/clientpositive/join32_lessSize.q.out +++ ql/src/test/results/clientpositive/join32_lessSize.q.out @@ -27,6 +27,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 @@ -74,27 +95,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: @@ -574,6 +574,27 @@ POSTHOOK: Lineage: dest_j1.value SIMPLE [(srcpart)z.FieldSchema(name:value, type 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 @@ -621,27 +642,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: @@ -1699,10 +1699,46 @@ POSTHOOK: Lineage: dest_j1.value SIMPLE [(src1)z.FieldSchema(name:value, type:st 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 @@ -1722,21 +1758,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 @@ -1765,27 +1786,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: @@ -2285,10 +2285,46 @@ POSTHOOK: Lineage: dest_j2.value SIMPLE [(srcpart)z.FieldSchema(name:value, type 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 @@ -2308,21 +2344,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 @@ -2351,27 +2372,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 7a9c173..80fbc9b 100644 --- ql/src/test/results/clientpositive/join33.q.out +++ ql/src/test/results/clientpositive/join33.q.out @@ -22,6 +22,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 @@ -69,27 +90,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 af04fbd..1379f1b 100644 --- ql/src/test/results/clientpositive/join34.q.out +++ ql/src/test/results/clientpositive/join34.q.out @@ -30,16 +30,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 @@ -64,12 +80,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 @@ -94,6 +110,11 @@ TOK_QUERY x1 key 100 + TOK_FROM + TOK_TABREF + TOK_TABNAME + src + x1 subq1 TOK_TABREF TOK_TABNAME @@ -108,27 +129,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 400e858..1d25fc6 100644 --- ql/src/test/results/clientpositive/join35.q.out +++ ql/src/test/results/clientpositive/join35.q.out @@ -30,16 +30,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 @@ -68,12 +84,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 @@ -102,6 +118,11 @@ TOK_QUERY TOK_TABLE_OR_COL x1 key + TOK_FROM + TOK_TABREF + TOK_TABNAME + src + x1 subq1 TOK_TABREF TOK_TABNAME @@ -116,27 +137,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 c2bf18b..ffe3731 100644 --- ql/src/test/results/clientpositive/join9.q.out +++ ql/src/test/results/clientpositive/join9.q.out @@ -14,7 +14,7 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM + TOK_FROM_BASE TOK_JOIN TOK_TABREF TOK_TABNAME @@ -33,36 +33,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 bdac4b1..e7f5da3 100644 --- ql/src/test/results/clientpositive/join_filters_overlap.q.out +++ ql/src/test/results/clientpositive/join_filters_overlap.q.out @@ -18,6 +18,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 @@ -78,13 +85,6 @@ TOK_QUERY c value 60 - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_ALLCOLREF STAGE DEPENDENCIES: @@ -262,6 +262,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 @@ -322,13 +329,6 @@ TOK_QUERY c value 60 - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_ALLCOLREF STAGE DEPENDENCIES: @@ -506,6 +506,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 @@ -580,13 +587,6 @@ TOK_QUERY c value 60 - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_ALLCOLREF STAGE DEPENDENCIES: @@ -764,6 +764,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 @@ -852,13 +859,6 @@ TOK_QUERY d value 40 - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_ALLCOLREF STAGE DEPENDENCIES: @@ -1042,6 +1042,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 @@ -1130,13 +1137,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 09b9462..b0eb6b0 100644 --- ql/src/test/results/clientpositive/join_map_ppr.q.out +++ ql/src/test/results/clientpositive/join_map_ppr.q.out @@ -20,39 +20,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 @@ -94,6 +61,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: @@ -609,39 +609,6 @@ POSTHOOK: Lineage: src_copy.value SIMPLE [(src)src.FieldSchema(name:value, type: 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 @@ -683,6 +650,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/load_dyn_part8.q.out ql/src/test/results/clientpositive/load_dyn_part8.q.out index 968cef1..c78fc3e 100644 --- ql/src/test/results/clientpositive/load_dyn_part8.q.out +++ ql/src/test/results/clientpositive/load_dyn_part8.q.out @@ -40,64 +40,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 28070f9..4d543e8 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: @@ -374,7 +375,7 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM + TOK_FROM_BASE TOK_LEFTOUTERJOIN TOK_TABREF TOK_TABNAME @@ -400,59 +401,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: @@ -824,7 +826,7 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM + TOK_FROM_BASE TOK_LEFTOUTERJOIN TOK_TABREF TOK_TABNAME @@ -843,66 +845,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: @@ -1269,7 +1272,7 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM + TOK_FROM_BASE TOK_LEFTOUTERJOIN TOK_TABREF TOK_TABNAME @@ -1288,66 +1291,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 c483029..bfde8c2 100644 --- ql/src/test/results/clientpositive/macro.q.out +++ ql/src/test/results/clientpositive/macro.q.out @@ -42,10 +42,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_DIR @@ -57,6 +53,10 @@ TOK_QUERY 2 TOK_LIMIT 1 + TOK_FROM + TOK_TABREF + TOK_TABNAME + src STAGE DEPENDENCIES: @@ -128,10 +128,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_DIR @@ -144,6 +140,10 @@ TOK_QUERY 1 TOK_LIMIT 1 + TOK_FROM + TOK_TABREF + TOK_TABNAME + src STAGE DEPENDENCIES: @@ -236,10 +236,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_DIR @@ -252,6 +248,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 3df75b7..e0eafed 100644 --- ql/src/test/results/clientpositive/merge3.q.out +++ ql/src/test/results/clientpositive/merge3.q.out @@ -60,10 +60,6 @@ TOK_CREATETABLE merge_src2 TOK_LIKETABLE TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - merge_src TOK_INSERT TOK_DESTINATION TOK_DIR @@ -75,6 +71,10 @@ TOK_CREATETABLE TOK_SELEXPR TOK_TABLE_OR_COL value + TOK_FROM + TOK_TABREF + TOK_TABNAME + merge_src STAGE DEPENDENCIES: @@ -2399,10 +2399,6 @@ POSTHOOK: Lineage: merge_src_part PARTITION(ds=2008-04-09).value SIMPLE [(srcpar ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - merge_src_part TOK_INSERT TOK_DESTINATION TOK_TAB @@ -2426,6 +2422,10 @@ TOK_QUERY TOK_ISNOTNULL TOK_TABLE_OR_COL ds + TOK_FROM + TOK_TABREF + TOK_TABNAME + merge_src_part STAGE DEPENDENCIES: @@ -4855,13 +4855,9 @@ POSTHOOK: Lineage: merge_src_part2 PARTITION(ds=2008-04-09).value SIMPLE [(merge 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 @@ -4877,25 +4873,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 fc6e9e5..812995f 100644 --- ql/src/test/results/clientpositive/metadataonly1.q.out +++ ql/src/test/results/clientpositive/metadataonly1.q.out @@ -10,10 +10,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - TEST1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -24,6 +20,10 @@ TOK_QUERY max TOK_TABLE_OR_COL ds + TOK_FROM + TOK_TABREF + TOK_TABNAME + TEST1 STAGE DEPENDENCIES: @@ -93,10 +93,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - TEST1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -107,6 +103,10 @@ TOK_QUERY max TOK_TABLE_OR_COL ds + TOK_FROM + TOK_TABREF + TOK_TABNAME + TEST1 STAGE DEPENDENCIES: @@ -231,10 +231,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - TEST1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -245,6 +241,10 @@ TOK_QUERY count TOK_TABLE_OR_COL ds + TOK_FROM + TOK_TABREF + TOK_TABNAME + TEST1 STAGE DEPENDENCIES: @@ -371,10 +371,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - TEST1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -385,6 +381,10 @@ TOK_QUERY count TOK_TABLE_OR_COL ds + TOK_FROM + TOK_TABREF + TOK_TABNAME + TEST1 STAGE DEPENDENCIES: @@ -518,6 +518,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 @@ -526,10 +534,6 @@ TOK_QUERY a2 TOK_SUBQUERY TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - TEST1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -541,6 +545,10 @@ TOK_QUERY TOK_TABLE_OR_COL ds m + TOK_FROM + TOK_TABREF + TOK_TABNAME + TEST1 b = . @@ -551,14 +559,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: @@ -969,10 +969,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - TEST2 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -989,6 +985,10 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL ds + TOK_FROM + TOK_TABREF + TOK_TABNAME + TEST2 STAGE DEPENDENCIES: @@ -1200,10 +1200,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - TEST2 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1220,6 +1216,10 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL ds + TOK_FROM + TOK_TABREF + TOK_TABNAME + TEST2 STAGE DEPENDENCIES: @@ -1428,10 +1428,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - TEST1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1442,6 +1438,10 @@ TOK_QUERY max TOK_TABLE_OR_COL ds + TOK_FROM + TOK_TABREF + TOK_TABNAME + TEST1 STAGE DEPENDENCIES: @@ -1657,10 +1657,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - TEST2 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1677,6 +1673,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..835728d --- /dev/null +++ ql/src/test/results/clientpositive/multi_insert_subquery.q.out @@ -0,0 +1,525 @@ +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 +POSTHOOK: query: create table src_lv1 (key string, value string) +POSTHOOK: type: CREATETABLE +POSTHOOK: Output: default@src_lv1 +PREHOOK: query: create table src_lv2 (key string, value string) +PREHOOK: type: CREATETABLE +POSTHOOK: query: create table src_lv2 (key string, value string) +POSTHOOK: type: CREATETABLE +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 + value expressions: _col0 (type: string), _col1 (type: double) + 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 + value expressions: _col0 (type: string), _col1 (type: double) + 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.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.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: + Extract + 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.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.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 + value expressions: _col0 (type: string), _col1 (type: double) + 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: + Extract + 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.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.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 #### +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:), ] +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 #### +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:), ] +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 6a65184..8c09130 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: @@ -461,7 +462,7 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM + TOK_FROM_BASE TOK_FULLOUTERJOIN TOK_TABREF TOK_TABNAME @@ -480,66 +481,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 7f216d9..f202959 100644 --- ql/src/test/results/clientpositive/pcr.q.out +++ ql/src/test/results/clientpositive/pcr.q.out @@ -64,10 +64,6 @@ POSTHOOK: Lineage: pcr_t1 PARTITION(ds=2000-04-10).value SIMPLE [(src)src.FieldS ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - pcr_t1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -99,6 +95,10 @@ TOK_QUERY TOK_TABSORTCOLNAMEASC TOK_TABLE_OR_COL ds + TOK_FROM + TOK_TABREF + TOK_TABNAME + pcr_t1 STAGE DEPENDENCIES: @@ -286,10 +286,6 @@ POSTHOOK: Lineage: pcr_t1 PARTITION(ds=2000-04-10).value SIMPLE [(src)src.FieldS ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - pcr_t1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -315,6 +311,10 @@ TOK_QUERY TOK_TABSORTCOLNAMEASC TOK_TABLE_OR_COL key + TOK_FROM + TOK_TABREF + TOK_TABNAME + pcr_t1 STAGE DEPENDENCIES: @@ -581,10 +581,6 @@ POSTHOOK: Lineage: pcr_t1 PARTITION(ds=2000-04-10).value SIMPLE [(src)src.FieldS ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - pcr_t1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -621,6 +617,10 @@ TOK_QUERY TOK_TABSORTCOLNAMEASC TOK_TABLE_OR_COL ds + TOK_FROM + TOK_TABREF + TOK_TABNAME + pcr_t1 STAGE DEPENDENCIES: @@ -810,10 +810,6 @@ POSTHOOK: Lineage: pcr_t1 PARTITION(ds=2000-04-10).value SIMPLE [(src)src.FieldS ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - pcr_t1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -855,6 +851,10 @@ TOK_QUERY TOK_TABSORTCOLNAMEASC TOK_TABLE_OR_COL ds + TOK_FROM + TOK_TABREF + TOK_TABNAME + pcr_t1 STAGE DEPENDENCIES: @@ -1046,10 +1046,6 @@ POSTHOOK: Lineage: pcr_t1 PARTITION(ds=2000-04-10).value SIMPLE [(src)src.FieldS ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - pcr_t1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1091,6 +1087,10 @@ TOK_QUERY TOK_TABSORTCOLNAMEASC TOK_TABLE_OR_COL ds + TOK_FROM + TOK_TABREF + TOK_TABNAME + pcr_t1 STAGE DEPENDENCIES: @@ -1334,10 +1334,6 @@ POSTHOOK: Lineage: pcr_t1 PARTITION(ds=2000-04-10).value SIMPLE [(src)src.FieldS ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - pcr_t1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1379,6 +1375,10 @@ TOK_QUERY TOK_TABSORTCOLNAMEASC TOK_TABLE_OR_COL ds + TOK_FROM + TOK_TABREF + TOK_TABNAME + pcr_t1 STAGE DEPENDENCIES: @@ -1630,10 +1630,6 @@ POSTHOOK: Lineage: pcr_t1 PARTITION(ds=2000-04-10).value SIMPLE [(src)src.FieldS ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - pcr_t1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1667,6 +1663,10 @@ TOK_QUERY TOK_TABSORTCOLNAMEASC TOK_TABLE_OR_COL value + TOK_FROM + TOK_TABREF + TOK_TABNAME + pcr_t1 STAGE DEPENDENCIES: @@ -1844,10 +1844,6 @@ POSTHOOK: Lineage: pcr_t1 PARTITION(ds=2000-04-10).value SIMPLE [(src)src.FieldS ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - pcr_t1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1876,6 +1872,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: Lineage: pcr_t1 PARTITION(ds=2000-04-10).value SIMPLE [(src)src.FieldS 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: @@ -2398,10 +2398,6 @@ POSTHOOK: Lineage: pcr_t1 PARTITION(ds=2000-04-10).value SIMPLE [(src)src.FieldS ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - pcr_t1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -2446,6 +2442,10 @@ TOK_QUERY TOK_TABSORTCOLNAMEASC TOK_TABLE_OR_COL ds + TOK_FROM + TOK_TABREF + TOK_TABNAME + pcr_t1 STAGE DEPENDENCIES: @@ -2624,6 +2624,19 @@ POSTHOOK: Lineage: pcr_t1 PARTITION(ds=2000-04-10).value SIMPLE [(src)src.FieldS 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 @@ -2657,19 +2670,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: @@ -2914,6 +2914,19 @@ POSTHOOK: Lineage: pcr_t1 PARTITION(ds=2000-04-10).value SIMPLE [(src)src.FieldS 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 @@ -2947,19 +2960,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: @@ -3266,10 +3266,6 @@ POSTHOOK: Lineage: pcr_t1 PARTITION(ds=2000-04-11).value SIMPLE [(src)src.FieldS ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - pcr_t1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -3319,6 +3315,10 @@ TOK_QUERY TOK_TABSORTCOLNAMEASC TOK_TABLE_OR_COL ds + TOK_FROM + TOK_TABREF + TOK_TABNAME + pcr_t1 STAGE DEPENDENCIES: @@ -3630,10 +3630,6 @@ POSTHOOK: Lineage: pcr_t1 PARTITION(ds=2000-04-11).value SIMPLE [(src)src.FieldS ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - pcr_t1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -3678,6 +3674,10 @@ TOK_QUERY TOK_TABSORTCOLNAMEASC TOK_TABLE_OR_COL ds + TOK_FROM + TOK_TABREF + TOK_TABNAME + pcr_t1 STAGE DEPENDENCIES: @@ -3976,44 +3976,46 @@ POSTHOOK: Lineage: pcr_t1 PARTITION(ds=2000-04-11).value SIMPLE [(src)src.FieldS 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: @@ -4543,54 +4545,56 @@ POSTHOOK: Lineage: pcr_t3.value SIMPLE [(pcr_t1)pcr_t1.FieldSchema(name:value, t 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: @@ -5210,10 +5214,6 @@ POSTHOOK: Lineage: pcr_t3.value SIMPLE [(pcr_t1)pcr_t1.FieldSchema(name:value, t ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcpart TOK_INSERT TOK_DESTINATION TOK_DIR @@ -5241,6 +5241,10 @@ TOK_QUERY key TOK_LIMIT 10 + TOK_FROM + TOK_TABREF + TOK_TABNAME + srcpart STAGE DEPENDENCIES: @@ -5392,10 +5396,6 @@ POSTHOOK: Lineage: pcr_t3.value SIMPLE [(pcr_t1)pcr_t1.FieldSchema(name:value, t ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcpart TOK_INSERT TOK_DESTINATION TOK_DIR @@ -5443,6 +5443,10 @@ TOK_QUERY TOK_TABSORTCOLNAMEASC TOK_TABLE_OR_COL hr + TOK_FROM + TOK_TABREF + TOK_TABNAME + srcpart STAGE DEPENDENCIES: @@ -5644,10 +5648,6 @@ POSTHOOK: Lineage: pcr_t3.value SIMPLE [(pcr_t1)pcr_t1.FieldSchema(name:value, t ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcpart TOK_INSERT TOK_DESTINATION TOK_DIR @@ -5685,6 +5685,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 09ac35d..4639f61 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: @@ -424,6 +424,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 @@ -432,10 +452,6 @@ TOK_QUERY a TOK_SUBQUERY TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_DIR @@ -477,6 +493,10 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL key + TOK_FROM + TOK_TABREF + TOK_TABNAME + src b and = @@ -494,26 +514,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: @@ -821,6 +821,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 @@ -829,10 +849,6 @@ TOK_QUERY a TOK_SUBQUERY TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_DIR @@ -874,6 +890,10 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL key + TOK_FROM + TOK_TABREF + TOK_TABNAME + src b and = @@ -891,26 +911,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: @@ -1218,6 +1218,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 @@ -1226,10 +1246,6 @@ TOK_QUERY a TOK_SUBQUERY TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_DIR @@ -1271,6 +1287,10 @@ TOK_QUERY TOK_GROUPBY TOK_TABLE_OR_COL key + TOK_FROM + TOK_TABREF + TOK_TABNAME + src b and = @@ -1288,26 +1308,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 41172fd..b5e0f66 100644 --- ql/src/test/results/clientpositive/ppd_union_view.q.out +++ ql/src/test/results/clientpositive/ppd_union_view.q.out @@ -195,10 +195,6 @@ POSTHOOK: Lineage: t1_old PARTITION(ds=2011-10-14).value SIMPLE [] ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - t1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -211,6 +207,10 @@ TOK_QUERY TOK_TABLE_OR_COL ds '2011-10-13' + TOK_FROM + TOK_TABREF + TOK_TABNAME + t1 STAGE DEPENDENCIES: @@ -509,10 +509,6 @@ POSTHOOK: Lineage: t1_old PARTITION(ds=2011-10-14).value SIMPLE [] ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - t1 TOK_INSERT TOK_DESTINATION TOK_DIR @@ -525,6 +521,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 3fd8be8..9625982 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: @@ -316,6 +316,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 @@ -324,10 +343,6 @@ TOK_QUERY a TOK_SUBQUERY TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcpart TOK_INSERT TOK_DESTINATION TOK_DIR @@ -343,6 +358,10 @@ TOK_QUERY TOK_TABLE_OR_COL BLOCK__OFFSET__INSIDE__FILE 100 + TOK_FROM + TOK_TABREF + TOK_TABNAME + srcpart b AND = @@ -360,25 +379,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 3218d99..7e6ba88 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: @@ -241,10 +241,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcpart TOK_INSERT TOK_DESTINATION TOK_DIR @@ -280,6 +276,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 8864ebf..19ba994 100644 --- ql/src/test/results/clientpositive/push_or.q.out +++ ql/src/test/results/clientpositive/push_or.q.out @@ -40,10 +40,6 @@ POSTHOOK: Lineage: push_or PARTITION(ds=2000-04-09).value SIMPLE [(src)src.Field ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - push_or TOK_INSERT TOK_DESTINATION TOK_DIR @@ -75,6 +71,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 ec5540b..daa7d78 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 1b3c962..346323f 100644 --- ql/src/test/results/clientpositive/rand_partitionpruner2.q.out +++ ql/src/test/results/clientpositive/rand_partitionpruner2.q.out @@ -18,11 +18,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcpart - a TOK_INSERT TOK_DESTINATION TOK_TAB @@ -46,6 +41,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 321067e..df59440 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: @@ -173,11 +173,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - srcpart - a TOK_INSERT TOK_DESTINATION TOK_DIR @@ -212,6 +207,11 @@ TOK_QUERY a hr '%2' + TOK_FROM + TOK_TABREF + TOK_TABNAME + srcpart + a STAGE DEPENDENCIES: diff --git ql/src/test/results/clientpositive/regexp_extract.q.out ql/src/test/results/clientpositive/regexp_extract.q.out index 60b6fda..3cfec31 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: @@ -332,69 +334,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 8deb390..bdbc8c4 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: @@ -469,7 +470,7 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM + TOK_FROM_BASE TOK_RIGHTOUTERJOIN TOK_TABREF TOK_TABNAME @@ -495,59 +496,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: @@ -824,7 +826,7 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM + TOK_FROM_BASE TOK_RIGHTOUTERJOIN TOK_TABREF TOK_TABNAME @@ -843,66 +845,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: @@ -1179,7 +1182,7 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM + TOK_FROM_BASE TOK_RIGHTOUTERJOIN TOK_TABREF TOK_TABNAME @@ -1198,66 +1201,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 eb7a552..843b6b1 100644 --- ql/src/test/results/clientpositive/sample1.q.out +++ ql/src/test/results/clientpositive/sample1.q.out @@ -18,16 +18,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 @@ -52,6 +42,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 beca660..976d87e 100644 --- ql/src/test/results/clientpositive/sample10.q.out +++ ql/src/test/results/clientpositive/sample10.q.out @@ -51,15 +51,6 @@ POSTHOOK: Lineage: srcpartbucket PARTITION(ds=2008-04-09,hr=12).value SIMPLE [(s 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 @@ -84,6 +75,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 6282873..6962801 100644 --- ql/src/test/results/clientpositive/sample2.q.out +++ ql/src/test/results/clientpositive/sample2.q.out @@ -18,14 +18,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 @@ -36,6 +28,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 859e0c4..c8ac38c 100644 --- ql/src/test/results/clientpositive/sample4.q.out +++ ql/src/test/results/clientpositive/sample4.q.out @@ -18,16 +18,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 @@ -38,6 +28,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 60855f4..bd7834b 100644 --- ql/src/test/results/clientpositive/sample5.q.out +++ ql/src/test/results/clientpositive/sample5.q.out @@ -16,16 +16,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 @@ -36,6 +26,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 32a1141..5ca90f3 100644 --- ql/src/test/results/clientpositive/sample6.q.out +++ ql/src/test/results/clientpositive/sample6.q.out @@ -16,16 +16,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 @@ -36,6 +26,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: @@ -593,16 +593,6 @@ POSTHOOK: Lineage: dest1.value SIMPLE [(srcbucket)s.FieldSchema(name:value, type 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 @@ -619,6 +609,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: @@ -988,16 +988,6 @@ POSTHOOK: Lineage: dest1.value SIMPLE [(srcbucket)s.FieldSchema(name:value, type 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 @@ -1014,6 +1004,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: @@ -1637,16 +1637,6 @@ POSTHOOK: Lineage: dest1.value SIMPLE [(srcbucket)s.FieldSchema(name:value, type 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 @@ -1663,6 +1653,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: @@ -2129,16 +2129,6 @@ POSTHOOK: Lineage: dest1.value SIMPLE [(srcbucket)s.FieldSchema(name:value, type 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 @@ -2155,6 +2145,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: @@ -2607,16 +2607,6 @@ POSTHOOK: Lineage: dest1.value SIMPLE [(srcbucket)s.FieldSchema(name:value, type 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 @@ -2633,6 +2623,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: @@ -2930,16 +2930,6 @@ POSTHOOK: Lineage: dest1.value SIMPLE [(srcbucket)s.FieldSchema(name:value, type 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 @@ -2956,6 +2946,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: @@ -3131,16 +3131,6 @@ POSTHOOK: Lineage: dest1.value SIMPLE [(srcbucket)s.FieldSchema(name:value, type 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 @@ -3157,6 +3147,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 cf018f5..c7b74e7 100644 --- ql/src/test/results/clientpositive/sample7.q.out +++ ql/src/test/results/clientpositive/sample7.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 @@ -45,6 +35,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 db65ce3..0f75b7f 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 @@ -108,6 +88,26 @@ TOK_QUERY TOK_TABSORTCOLNAMEASC TOK_TABLE_OR_COL value + 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 9e1fb12..c276aea 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 e85cadb..eae42cd 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: @@ -119,11 +119,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src - a TOK_INSERT TOK_DESTINATION TOK_DIR @@ -134,6 +129,11 @@ TOK_QUERY TOK_TABLE_OR_COL a key + TOK_FROM + TOK_TABREF + TOK_TABNAME + src + a STAGE DEPENDENCIES: @@ -232,14 +232,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 @@ -250,6 +242,14 @@ TOK_QUERY TOK_TABLE_OR_COL a key + TOK_FROM + TOK_TABREF + TOK_TABNAME + src + TOK_TABLESPLITSAMPLE + TOK_PERCENT + 1 + a STAGE DEPENDENCIES: @@ -352,6 +352,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 @@ -361,14 +369,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: @@ -469,6 +469,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 @@ -481,14 +489,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: @@ -593,16 +593,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 @@ -613,6 +603,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: @@ -713,6 +713,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 @@ -726,16 +736,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 1b6bec3..99454e4 100644 --- ql/src/test/results/clientpositive/smb_mapjoin9.q.out +++ ql/src/test/results/clientpositive/smb_mapjoin9.q.out @@ -25,25 +25,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 @@ -97,6 +78,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: @@ -142,25 +142,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 @@ -214,6 +195,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 5c7a6db..e3da018 100644 --- ql/src/test/results/clientpositive/smb_mapjoin_11.q.out +++ ql/src/test/results/clientpositive/smb_mapjoin_11.q.out @@ -58,6 +58,31 @@ POSTHOOK: Lineage: test_table2 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchem 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 @@ -91,31 +116,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 0ddbe16..51b50cf 100644 --- ql/src/test/results/clientpositive/smb_mapjoin_12.q.out +++ ql/src/test/results/clientpositive/smb_mapjoin_12.q.out @@ -78,6 +78,31 @@ POSTHOOK: Lineage: test_table2 PARTITION(ds=3).value SIMPLE [(src)src.FieldSchem 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 @@ -111,31 +136,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: @@ -351,6 +351,37 @@ POSTHOOK: Lineage: test_table3 PARTITION(ds=1).value SIMPLE [(test_table2)b.Fiel 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 @@ -384,37 +415,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 efc781d..43f54dd 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: Lineage: test_table4.value SIMPLE [(src)src.FieldSchema(name:value, ty 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: @@ -277,25 +277,6 @@ POSTHOOK: Lineage: test_table4.value SIMPLE [(src)src.FieldSchema(name:value, ty 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 @@ -316,6 +297,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 3392187..a3dce9d 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: Lineage: test_table2.value SIMPLE [(src)src.FieldSchema(name:value, ty 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: @@ -315,6 +315,26 @@ POSTHOOK: Lineage: test_table2.value SIMPLE [(src)src.FieldSchema(name:value, ty 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 @@ -344,26 +364,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: @@ -531,6 +531,26 @@ POSTHOOK: Lineage: test_table2.value SIMPLE [(src)src.FieldSchema(name:value, ty 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 @@ -560,26 +580,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: @@ -747,6 +747,26 @@ POSTHOOK: Lineage: test_table2.value SIMPLE [(src)src.FieldSchema(name:value, ty 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 @@ -776,26 +796,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 9d4d504..83e9a09 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 @@ -69,6 +69,19 @@ POSTHOOK: Lineage: srcbucket_mapjoin_part_2 PARTITION(part=1).value SIMPLE [(src 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 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 6ee7b0a..9e69195 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 @@ -69,6 +69,19 @@ POSTHOOK: Lineage: srcbucket_mapjoin_part_2 PARTITION(part=1).value SIMPLE [(src 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 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 a0c869a..6340cf8 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 @@ -133,6 +133,19 @@ POSTHOOK: Lineage: srcbucket_mapjoin_part_2 PARTITION(part=2).value SIMPLE [(src 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 @@ -166,19 +179,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 15b270f..750adf1 100644 --- ql/src/test/results/clientpositive/stats0.q.out +++ ql/src/test/results/clientpositive/stats0.q.out @@ -14,10 +14,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_TAB @@ -26,6 +22,10 @@ TOK_QUERY TOK_SELECT TOK_SELEXPR TOK_ALLCOLREF + TOK_FROM + TOK_TABREF + TOK_TABNAME + src STAGE DEPENDENCIES: @@ -1353,10 +1353,6 @@ POSTHOOK: Lineage: stats_partitioned PARTITION(ds=1).value SIMPLE [(src)src.Fiel ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_TAB @@ -1365,6 +1361,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 5e65bc5..a32512e 100644 --- ql/src/test/results/clientpositive/stats11.q.out +++ ql/src/test/results/clientpositive/stats11.q.out @@ -280,25 +280,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 @@ -332,6 +313,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: @@ -847,25 +847,6 @@ POSTHOOK: Lineage: bucketmapjoin_tmp_result.value2 SIMPLE [(srcbucket_mapjoin_pa 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 @@ -899,6 +880,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 ef3dc18..a6945c6 100644 --- ql/src/test/results/clientpositive/subquery_in_having.q.out +++ ql/src/test/results/clientpositive/subquery_in_having.q.out @@ -346,30 +346,30 @@ STAGE PLANS: predicate: (key > '9') (type: boolean) Statistics: Num rows: 9 Data size: 1803 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: 9 Data size: 1803 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: 9 Data size: 1803 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: 9 Data size: 1803 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: 4 Data size: 801 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: 4 Data size: 801 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 e661078..de46195 100644 --- ql/src/test/results/clientpositive/tez/bucket2.q.out +++ ql/src/test/results/clientpositive/tez/bucket2.q.out @@ -14,10 +14,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_TAB @@ -26,6 +22,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 fc603b5..64a4a93 100644 --- ql/src/test/results/clientpositive/tez/bucket3.q.out +++ ql/src/test/results/clientpositive/tez/bucket3.q.out @@ -14,10 +14,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_TAB @@ -30,6 +26,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 d9e3ebf..d824daa 100644 --- ql/src/test/results/clientpositive/tez/bucket4.q.out +++ ql/src/test/results/clientpositive/tez/bucket4.q.out @@ -14,10 +14,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_TAB @@ -26,6 +22,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 61bf158..b234967 100644 --- ql/src/test/results/clientpositive/tez/ctas.q.out +++ ql/src/test/results/clientpositive/tez/ctas.q.out @@ -825,10 +825,6 @@ TOK_CREATETABLE '\012' TOK_TBLTEXTFILE TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_DIR @@ -849,6 +845,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 e661078..de46195 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 @@ -14,10 +14,6 @@ POSTHOOK: type: QUERY ABSTRACT SYNTAX TREE: TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src TOK_INSERT TOK_DESTINATION TOK_TAB @@ -26,6 +22,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 b58cdc4..3b20e9f 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: Lineage: filter_join_breaktask PARTITION(ds=2008-04-08).value SIMPLE [ 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 92d031f..d51bd4e 100644 --- ql/src/test/results/clientpositive/tez/sample1.q.out +++ ql/src/test/results/clientpositive/tez/sample1.q.out @@ -18,16 +18,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 @@ -52,6 +42,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/transform_ppr1.q.out ql/src/test/results/clientpositive/transform_ppr1.q.out index 9c537f0..54a69e4 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 4bddc69..3f60aa9 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/udf_explode.q.out ql/src/test/results/clientpositive/udf_explode.q.out index f7b6f2a..e2b9572 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: @@ -138,31 +138,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 @@ -182,6 +157,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: @@ -346,13 +346,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 @@ -371,6 +364,13 @@ TOK_QUERY 'three' key val + TOK_FROM + TOK_TABREF + TOK_TABNAME + src + TOK_TABLESPLITSAMPLE + TOK_ROWCOUNT + 1 STAGE DEPENDENCIES: @@ -473,35 +473,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 @@ -530,6 +501,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 97efa6e..89ac506 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 @@ -93,6 +86,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 44e10ec..9807bcd 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 @@ -99,6 +92,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 c326c0d..1c04ed5 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 5d29f18..7f1af17 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: @@ -139,13 +139,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 @@ -162,26 +177,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: @@ -446,34 +446,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 @@ -502,6 +474,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 eb5ad5c..d4cfc4f 100644 --- ql/src/test/results/clientpositive/union22.q.out +++ ql/src/test/results/clientpositive/union22.q.out @@ -85,14 +85,22 @@ POSTHOOK: Lineage: dst_union22_delta PARTITION(ds=1).k5 SIMPLE [(src)src.FieldSc 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 @@ -124,7 +132,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 @@ -133,10 +181,6 @@ TOK_QUERY a TOK_SUBQUERY TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - dst_union22_delta TOK_INSERT TOK_DESTINATION TOK_DIR @@ -154,6 +198,10 @@ TOK_QUERY TOK_TABLE_OR_COL k0 50 + TOK_FROM + TOK_TABREF + TOK_TABNAME + dst_union22_delta b and = @@ -171,55 +219,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 a88951a..c47af7d 100644 --- ql/src/test/results/clientpositive/union24.q.out +++ ql/src/test/results/clientpositive/union24.q.out @@ -53,16 +53,38 @@ 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_ORDERBY + TOK_TABSORTCOLNAMEASC + . + TOK_TABLE_OR_COL + s + key + TOK_TABSORTCOLNAMEASC + . + 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 @@ -79,11 +101,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 @@ -100,11 +122,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 @@ -121,11 +143,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 @@ -147,33 +169,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 - TOK_ORDERBY - TOK_TABSORTCOLNAMEASC - . - TOK_TABLE_OR_COL - s - key - TOK_TABSORTCOLNAMEASC - . - TOK_TABLE_OR_COL - s - count STAGE DEPENDENCIES: @@ -639,15 +639,37 @@ 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_ORDERBY + TOK_TABSORTCOLNAMEASC + . + TOK_TABLE_OR_COL + s + key + TOK_TABSORTCOLNAMEASC + . + 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 @@ -664,11 +686,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 @@ -685,26 +707,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 @@ -729,33 +736,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 - TOK_ORDERBY - TOK_TABSORTCOLNAMEASC - . - TOK_TABLE_OR_COL - s - key - TOK_TABSORTCOLNAMEASC - . - TOK_TABLE_OR_COL - s - count STAGE DEPENDENCIES: @@ -1194,15 +1194,37 @@ 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_ORDERBY + TOK_TABSORTCOLNAMEASC + . + TOK_TABLE_OR_COL + s + key + TOK_TABSORTCOLNAMEASC + . + 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 @@ -1219,11 +1241,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 @@ -1240,26 +1262,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 @@ -1288,33 +1295,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 - TOK_ORDERBY - TOK_TABSORTCOLNAMEASC - . - TOK_TABLE_OR_COL - s - key - TOK_TABSORTCOLNAMEASC - . - 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 f639960..c881d7e 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