Index: ql/src/java/org/apache/hadoop/hive/ql/optimizer/ColumnPrunerProcFactory.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/optimizer/ColumnPrunerProcFactory.java (revision 924512) +++ ql/src/java/org/apache/hadoop/hive/ql/optimizer/ColumnPrunerProcFactory.java (working copy) @@ -83,13 +83,16 @@ // merge it with the downstream col list cppCtx.getPrunedColLists().put(op, Utilities.mergeUniqElems(cppCtx.genColLists(op), cl)); + + pruneOperator(cppCtx, op, cppCtx.getPrunedColLists().get(op)); + return null; } } /** * Factory method to get the ColumnPrunerFilterProc class. - * + * * @return ColumnPrunerFilterProc */ public static ColumnPrunerFilterProc getFilterProc() { @@ -126,7 +129,7 @@ /** * Factory method to get the ColumnPrunerGroupByProc class. - * + * * @return ColumnPrunerGroupByProc */ public static ColumnPrunerGroupByProc getGroupByProc() { @@ -149,7 +152,7 @@ /** * Factory method to get the ColumnPrunerDefaultProc class. - * + * * @return ColumnPrunerDefaultProc */ public static ColumnPrunerDefaultProc getDefaultProc() { @@ -182,7 +185,7 @@ /** * Factory method to get the ColumnPrunerDefaultProc class. - * + * * @return ColumnPrunerTableScanProc */ public static ColumnPrunerTableScanProc getTableScanProc() { @@ -257,7 +260,7 @@ /** * The Factory method to get ColumnPrunerReduceSinkProc class. - * + * * @return ColumnPrunerReduceSinkProc */ public static ColumnPrunerReduceSinkProc getReduceSinkProc() { @@ -342,7 +345,7 @@ * know that. ReduceSinkOperator may send out every output columns of its * parent select. When the select operator is pruned, its child reduce * sink(direct child) operator should also be pruned. - * + * * @param op * @param retainedSelOutputCols * @throws SemanticException @@ -453,7 +456,7 @@ /** * The Factory method to get the ColumnPrunerSelectProc class. - * + * * @return ColumnPrunerSelectProc */ public static ColumnPrunerSelectProc getSelectProc() { @@ -475,7 +478,7 @@ /** * The Factory method to get ColumnJoinProc class. - * + * * @return ColumnPrunerJoinProc */ public static ColumnPrunerJoinProc getJoinProc() { @@ -495,6 +498,24 @@ } } + private static void pruneOperator(NodeProcessorCtx ctx, + Operator op, + List cols) + throws SemanticException { + ColumnPrunerProcCtx cppCtx = (ColumnPrunerProcCtx) ctx; + ArrayList rs = new ArrayList(); + RowResolver rr = cppCtx.getOpToParseCtxMap().get(op).getRR(); + for (int i = 0; i < cols.size(); i++) { + String internalName = cols.get(i); + String[] nm = rr.reverseLookup(internalName); + ColumnInfo col = rr.get(nm[0], nm[1]); + rs.add(col); + } + if (op.getSchema() != null) { + op.getSchema().setSignature(rs); + } + } + private static void pruneJoinOperator(NodeProcessorCtx ctx, CommonJoinOperator op, JoinDesc conf, Map columnExprMap, @@ -603,7 +624,7 @@ /** * The Factory method to get ColumnMapJoinProc class. - * + * * @return ColumnPrunerMapJoinProc */ public static ColumnPrunerMapJoinProc getMapJoinProc() { Index: ql/src/test/queries/clientpositive/filter_join_breaktask.q =================================================================== --- ql/src/test/queries/clientpositive/filter_join_breaktask.q (revision 0) +++ ql/src/test/queries/clientpositive/filter_join_breaktask.q (revision 0) @@ -0,0 +1,17 @@ +DROP TABLE filter_join_breaktask; +CREATE TABLE filter_join_breaktask(key int, value string) partitioned by (ds string); + +INSERT OVERWRITE TABLE filter_join_breaktask PARTITION(ds='2008-04-08') +SELECT key, value from src1; + + +EXPLAIN EXTENDED +SELECT f.key, g.value +FROM filter_join_breaktask f JOIN filter_join_breaktask m ON( f.key = m.key AND f.ds='2008-04-08' AND m.ds='2008-04-08' AND f.key is not null) +JOIN filter_join_breaktask g ON(g.value = m.value AND g.ds='2008-04-08' AND m.ds='2008-04-08' AND m.value is not null AND m.value !=''); + +SELECT f.key, g.value +FROM filter_join_breaktask f JOIN filter_join_breaktask m ON( f.key = m.key AND f.ds='2008-04-08' AND m.ds='2008-04-08' AND f.key is not null) +JOIN filter_join_breaktask g ON(g.value = m.value AND g.ds='2008-04-08' AND m.ds='2008-04-08' AND m.value is not null AND m.value !=''); + +DROP TABLE filter_join_breaktask; \ No newline at end of file Index: ql/src/test/results/clientpositive/filter_join_breaktask.q.out =================================================================== --- ql/src/test/results/clientpositive/filter_join_breaktask.q.out (revision 0) +++ ql/src/test/results/clientpositive/filter_join_breaktask.q.out (revision 0) @@ -0,0 +1,348 @@ +PREHOOK: query: DROP TABLE filter_join_breaktask +PREHOOK: type: DROPTABLE +POSTHOOK: query: DROP TABLE filter_join_breaktask +POSTHOOK: type: DROPTABLE +PREHOOK: query: CREATE TABLE filter_join_breaktask(key int, value string) partitioned by (ds string) +PREHOOK: type: CREATETABLE +POSTHOOK: query: CREATE TABLE filter_join_breaktask(key int, value string) partitioned by (ds string) +POSTHOOK: type: CREATETABLE +POSTHOOK: Output: default@filter_join_breaktask +PREHOOK: query: INSERT OVERWRITE TABLE filter_join_breaktask PARTITION(ds='2008-04-08') +SELECT key, value from src1 +PREHOOK: type: QUERY +PREHOOK: Input: default@src1 +PREHOOK: Output: default@filter_join_breaktask@ds=2008-04-08 +POSTHOOK: query: INSERT OVERWRITE TABLE filter_join_breaktask PARTITION(ds='2008-04-08') +SELECT key, value from src1 +POSTHOOK: type: QUERY +POSTHOOK: Input: default@src1 +POSTHOOK: Output: default@filter_join_breaktask@ds=2008-04-08 +PREHOOK: query: EXPLAIN EXTENDED +SELECT f.key, g.value +FROM filter_join_breaktask f JOIN filter_join_breaktask m ON( f.key = m.key AND f.ds='2008-04-08' AND m.ds='2008-04-08' AND f.key is not null) +JOIN filter_join_breaktask g ON(g.value = m.value AND g.ds='2008-04-08' AND m.ds='2008-04-08' AND m.value is not null AND m.value !='') +PREHOOK: type: QUERY +POSTHOOK: query: EXPLAIN EXTENDED +SELECT f.key, g.value +FROM filter_join_breaktask f JOIN filter_join_breaktask m ON( f.key = m.key AND f.ds='2008-04-08' AND m.ds='2008-04-08' AND f.key is not null) +JOIN filter_join_breaktask g ON(g.value = m.value AND g.ds='2008-04-08' AND m.ds='2008-04-08' AND m.value is not null AND m.value !='') +POSTHOOK: type: QUERY +ABSTRACT SYNTAX TREE: + (TOK_QUERY (TOK_FROM (TOK_JOIN (TOK_JOIN (TOK_TABREF filter_join_breaktask f) (TOK_TABREF filter_join_breaktask m) (AND (AND (AND (= (. (TOK_TABLE_OR_COL f) key) (. (TOK_TABLE_OR_COL m) key)) (= (. (TOK_TABLE_OR_COL f) ds) '2008-04-08')) (= (. (TOK_TABLE_OR_COL m) ds) '2008-04-08')) (TOK_FUNCTION TOK_ISNOTNULL (. (TOK_TABLE_OR_COL f) key)))) (TOK_TABREF filter_join_breaktask g) (AND (AND (AND (AND (= (. (TOK_TABLE_OR_COL g) value) (. (TOK_TABLE_OR_COL m) value)) (= (. (TOK_TABLE_OR_COL g) ds) '2008-04-08')) (= (. (TOK_TABLE_OR_COL m) ds) '2008-04-08')) (TOK_FUNCTION TOK_ISNOTNULL (. (TOK_TABLE_OR_COL m) value))) (!= (. (TOK_TABLE_OR_COL 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: + Stage-1 is a root stage + Stage-2 depends on stages: Stage-1 + Stage-0 is a root stage + +STAGE PLANS: + Stage: Stage-1 + Map Reduce + Alias -> Map Operator Tree: + f + TableScan + alias: f + Filter Operator + isSamplingPred: false + predicate: + expr: ((ds = '2008-04-08') and key is not null) + type: boolean + Filter Operator + isSamplingPred: false + predicate: + expr: (ds = '2008-04-08') + type: boolean + Filter Operator + isSamplingPred: false + predicate: + expr: key is not null + type: boolean + Reduce Output Operator + key expressions: + expr: key + type: int + sort order: + + Map-reduce partition columns: + expr: key + type: int + tag: 0 + value expressions: + expr: key + type: int + m + TableScan + alias: m + Filter Operator + isSamplingPred: false + predicate: + expr: ((((ds = '2008-04-08') and (ds = '2008-04-08')) and value is not null) and (value <> '')) + type: boolean + Filter Operator + isSamplingPred: false + predicate: + expr: (ds = '2008-04-08') + type: boolean + Reduce Output Operator + key expressions: + expr: key + type: int + sort order: + + Map-reduce partition columns: + expr: key + type: int + tag: 1 + value expressions: + expr: value + type: string + expr: ds + type: string + Needs Tagging: true + Path -> Alias: + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/filter_join_breaktask/ds=2008-04-08 [f, m] + Path -> Partition: + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/filter_join_breaktask/ds=2008-04-08 + Partition + base file name: ds=2008-04-08 + input format: org.apache.hadoop.mapred.TextInputFormat + output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + partition values: + ds 2008-04-08 + properties: + bucket_count -1 + columns key,value + columns.types int:string + file.inputformat org.apache.hadoop.mapred.TextInputFormat + file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + location file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/filter_join_breaktask + name filter_join_breaktask + partition_columns ds + serialization.ddl struct filter_join_breaktask { i32 key, string value} + serialization.format 1 + serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + transient_lastDdlTime 1268931012 + 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: + bucket_count -1 + columns key,value + columns.types int:string + file.inputformat org.apache.hadoop.mapred.TextInputFormat + file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + location file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/filter_join_breaktask + name filter_join_breaktask + partition_columns ds + serialization.ddl struct filter_join_breaktask { i32 key, string value} + serialization.format 1 + serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + transient_lastDdlTime 1268931012 + serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + name: filter_join_breaktask + name: filter_join_breaktask + Reduce Operator Tree: + Join Operator + condition map: + Inner Join 0 to 1 + condition expressions: + 0 {VALUE._col0} + 1 {VALUE._col1} {VALUE._col2} + handleSkewJoin: false + outputColumnNames: _col0, _col4, _col5 + Filter Operator + isSamplingPred: false + predicate: + expr: (_col5 = '2008-04-08') + type: boolean + Filter Operator + isSamplingPred: false + predicate: + expr: _col4 is not null + type: boolean + Filter Operator + isSamplingPred: false + predicate: + expr: (_col4 <> '') + type: boolean + File Output Operator + compressed: false + GlobalTableId: 0 + directory: file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-18_09-50-26_479_724779691836428247/10002 + NumFilesPerFileSink: 1 + table: + input format: org.apache.hadoop.mapred.SequenceFileInputFormat + output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat + properties: + columns _col0,_col4 + columns.types int,string + escape.delim \ + TotalFiles: 1 + MultiFileSpray: false + + Stage: Stage-2 + Map Reduce + Alias -> Map Operator Tree: + $INTNAME + Reduce Output Operator + key expressions: + expr: _col4 + type: string + sort order: + + Map-reduce partition columns: + expr: _col4 + type: string + tag: 0 + value expressions: + expr: _col0 + type: int + g + TableScan + alias: g + Filter Operator + isSamplingPred: false + predicate: + expr: (ds = '2008-04-08') + type: boolean + Filter Operator + isSamplingPred: false + predicate: + expr: (ds = '2008-04-08') + type: boolean + Reduce Output Operator + key expressions: + expr: value + type: string + sort order: + + Map-reduce partition columns: + expr: value + type: string + tag: 1 + value expressions: + expr: value + type: string + Needs Tagging: true + Path -> Alias: + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-18_09-50-26_479_724779691836428247/10002 [$INTNAME] + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/filter_join_breaktask/ds=2008-04-08 [g] + Path -> Partition: + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-18_09-50-26_479_724779691836428247/10002 + Partition + base file name: 10002 + input format: org.apache.hadoop.mapred.SequenceFileInputFormat + output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat + properties: + columns _col0,_col4 + columns.types int,string + escape.delim \ + + input format: org.apache.hadoop.mapred.SequenceFileInputFormat + output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat + properties: + columns _col0,_col4 + columns.types int,string + escape.delim \ + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/filter_join_breaktask/ds=2008-04-08 + Partition + base file name: ds=2008-04-08 + input format: org.apache.hadoop.mapred.TextInputFormat + output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + partition values: + ds 2008-04-08 + properties: + bucket_count -1 + columns key,value + columns.types int:string + file.inputformat org.apache.hadoop.mapred.TextInputFormat + file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + location file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/filter_join_breaktask + name filter_join_breaktask + partition_columns ds + serialization.ddl struct filter_join_breaktask { i32 key, string value} + serialization.format 1 + serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + transient_lastDdlTime 1268931012 + 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: + bucket_count -1 + columns key,value + columns.types int:string + file.inputformat org.apache.hadoop.mapred.TextInputFormat + file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + location file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/filter_join_breaktask + name filter_join_breaktask + partition_columns ds + serialization.ddl struct filter_join_breaktask { i32 key, string value} + serialization.format 1 + serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + transient_lastDdlTime 1268931012 + serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + name: filter_join_breaktask + name: filter_join_breaktask + Reduce Operator Tree: + Join Operator + condition map: + Inner Join 0 to 1 + condition expressions: + 0 {VALUE._col0} + 1 {VALUE._col1} + handleSkewJoin: false + outputColumnNames: _col0, _col7 + Select Operator + expressions: + expr: _col0 + type: int + expr: _col7 + type: string + outputColumnNames: _col0, _col1 + File Output Operator + compressed: false + GlobalTableId: 0 + directory: file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-18_09-50-26_479_724779691836428247/10001 + NumFilesPerFileSink: 1 + table: + input format: org.apache.hadoop.mapred.TextInputFormat + output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + properties: + columns _col0,_col1 + columns.types int:string + serialization.format 1 + TotalFiles: 1 + MultiFileSpray: false + + Stage: Stage-0 + Fetch Operator + limit: -1 + + +PREHOOK: query: SELECT f.key, g.value +FROM filter_join_breaktask f JOIN filter_join_breaktask m ON( f.key = m.key AND f.ds='2008-04-08' AND m.ds='2008-04-08' AND f.key is not null) +JOIN filter_join_breaktask g ON(g.value = m.value AND g.ds='2008-04-08' AND m.ds='2008-04-08' AND m.value is not null AND m.value !='') +PREHOOK: type: QUERY +PREHOOK: Input: default@filter_join_breaktask@ds=2008-04-08 +PREHOOK: Output: file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-18_09-50-27_453_7500070879794525924/10000 +POSTHOOK: query: SELECT f.key, g.value +FROM filter_join_breaktask f JOIN filter_join_breaktask m ON( f.key = m.key AND f.ds='2008-04-08' AND m.ds='2008-04-08' AND f.key is not null) +JOIN filter_join_breaktask g ON(g.value = m.value AND g.ds='2008-04-08' AND m.ds='2008-04-08' AND m.value is not null AND m.value !='') +POSTHOOK: type: QUERY +POSTHOOK: Input: default@filter_join_breaktask@ds=2008-04-08 +POSTHOOK: Output: file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-18_09-50-27_453_7500070879794525924/10000 +146 val_146 +150 val_150 +213 val_213 +238 val_238 +255 val_255 +273 val_273 +278 val_278 +311 val_311 +401 val_401 +406 val_406 +66 val_66 +98 val_98 +PREHOOK: query: DROP TABLE filter_join_breaktask +PREHOOK: type: DROPTABLE +POSTHOOK: query: DROP TABLE filter_join_breaktask +POSTHOOK: type: DROPTABLE +POSTHOOK: Output: default@filter_join_breaktask Index: ql/src/test/results/compiler/plan/case_sensitivity.q.xml =================================================================== --- ql/src/test/results/compiler/plan/case_sensitivity.q.xml (revision 924512) +++ ql/src/test/results/compiler/plan/case_sensitivity.q.xml (working copy) @@ -1,5 +1,5 @@ - + @@ -41,7 +41,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-26_036_1419901073082338249/10002 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-17_798_2050344255230359696/10002 @@ -286,10 +286,10 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-26_036_1419901073082338249/10002 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-17_798_2050344255230359696/10002 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-26_036_1419901073082338249/10002 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-17_798_2050344255230359696/10002 @@ -298,7 +298,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-26_036_1419901073082338249/10002 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-17_798_2050344255230359696/10002 10002 @@ -352,11 +352,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/dest1 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1266455845 + 1268858177 @@ -395,7 +395,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-26_036_1419901073082338249/10000 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-17_798_2050344255230359696/10000 1 @@ -447,7 +447,7 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/dest1 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/dest1 file.outputformat @@ -455,7 +455,7 @@ transient_lastDdlTime - 1266455845 + 1268858177 @@ -596,13 +596,13 @@ true - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-26_036_1419901073082338249/10000 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-17_798_2050344255230359696/10000 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-26_036_1419901073082338249/10001 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-17_798_2050344255230359696/10001 @@ -623,10 +623,10 @@ true - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-26_036_1419901073082338249/10002 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-17_798_2050344255230359696/10002 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-26_036_1419901073082338249/10000 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-17_798_2050344255230359696/10000 @@ -652,7 +652,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-26_036_1419901073082338249/10002 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-17_798_2050344255230359696/10002 @@ -742,11 +742,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src_thrift + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src_thrift transient_lastDdlTime - 1266455845 + 1268858176 @@ -802,7 +802,7 @@ 1 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-26_036_1419901073082338249/10002 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-17_798_2050344255230359696/10002 1 @@ -1166,29 +1166,9 @@ - - - - - aint - - - - - - - - - - astring - - - - - - + - + lint @@ -1198,21 +1178,7 @@ - - - lstring - - - - - - - - - - - - + lintstring @@ -1221,23 +1187,6 @@ - - - - mstringstring - - - - - - - - - - - - - @@ -1350,7 +1299,65 @@ - + + + + + aint + + + + + + + + + + astring + + + + + + + + + + + + + lstring + + + + + + + + + + + + + + + + + mstringstring + + + + + + + + + + + + + + @@ -1408,7 +1415,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src_thrift + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src_thrift src_thrift @@ -1420,7 +1427,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src_thrift + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src_thrift src_thrift @@ -1481,11 +1488,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src_thrift + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src_thrift transient_lastDdlTime - 1266455845 + 1268858176 Index: ql/src/test/results/compiler/plan/cast1.q.xml =================================================================== --- ql/src/test/results/compiler/plan/cast1.q.xml (revision 924512) +++ ql/src/test/results/compiler/plan/cast1.q.xml (working copy) @@ -1,5 +1,5 @@ - + Stage-2 @@ -62,11 +62,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src transient_lastDdlTime - 1266455849 + 1268858181 @@ -119,7 +119,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-30_616_6003167590601136359/10001 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-22_732_3001896678619491726/10001 1 @@ -859,9 +859,9 @@ - + - + key @@ -870,16 +870,6 @@ - - - - value - - - - - - @@ -968,7 +958,21 @@ - + + + + + + + + value + + + + + + + @@ -1023,7 +1027,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src src @@ -1035,7 +1039,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src src @@ -1092,11 +1096,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src transient_lastDdlTime - 1266455849 + 1268858181 Index: ql/src/test/results/compiler/plan/input1.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input1.q.xml (revision 924512) +++ ql/src/test/results/compiler/plan/input1.q.xml (working copy) @@ -1,5 +1,5 @@ - + @@ -41,7 +41,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-54_253_3319913863279876898/10002 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-41_887_8284459572818506365/10002 @@ -286,10 +286,10 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-54_253_3319913863279876898/10002 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-41_887_8284459572818506365/10002 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-54_253_3319913863279876898/10002 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-41_887_8284459572818506365/10002 @@ -298,7 +298,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-54_253_3319913863279876898/10002 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-41_887_8284459572818506365/10002 10002 @@ -352,11 +352,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/dest1 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1266455874 + 1268858201 @@ -395,7 +395,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-54_253_3319913863279876898/10000 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-41_887_8284459572818506365/10000 1 @@ -447,7 +447,7 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/dest1 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/dest1 file.outputformat @@ -455,7 +455,7 @@ transient_lastDdlTime - 1266455874 + 1268858201 @@ -592,13 +592,13 @@ true - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-54_253_3319913863279876898/10000 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-41_887_8284459572818506365/10000 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-54_253_3319913863279876898/10001 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-41_887_8284459572818506365/10001 @@ -619,10 +619,10 @@ true - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-54_253_3319913863279876898/10002 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-41_887_8284459572818506365/10002 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-54_253_3319913863279876898/10000 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-41_887_8284459572818506365/10000 @@ -648,7 +648,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-54_253_3319913863279876898/10002 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-41_887_8284459572818506365/10002 @@ -734,11 +734,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src transient_lastDdlTime - 1266455873 + 1268858201 @@ -794,7 +794,7 @@ 1 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-54_253_3319913863279876898/10002 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-41_887_8284459572818506365/10002 1 @@ -1042,9 +1042,9 @@ - + - + key @@ -1054,7 +1054,7 @@ - + value @@ -1151,7 +1151,14 @@ - + + + + + + + + @@ -1209,7 +1216,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src src @@ -1221,7 +1228,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src src @@ -1278,11 +1285,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src transient_lastDdlTime - 1266455873 + 1268858201 Index: ql/src/test/results/compiler/plan/input2.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input2.q.xml (revision 924512) +++ ql/src/test/results/compiler/plan/input2.q.xml (working copy) @@ -1,5 +1,5 @@ - + @@ -41,7 +41,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-57_394_4059993338119553205/10006 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-44_210_9179241983242656425/10006 @@ -286,10 +286,10 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-57_394_4059993338119553205/10006 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-44_210_9179241983242656425/10006 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-57_394_4059993338119553205/10006 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-44_210_9179241983242656425/10006 @@ -298,7 +298,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-57_394_4059993338119553205/10006 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-44_210_9179241983242656425/10006 10006 @@ -352,11 +352,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/dest1 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1266455877 + 1268858204 @@ -395,7 +395,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-57_394_4059993338119553205/10000 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-44_210_9179241983242656425/10000 1 @@ -447,7 +447,7 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/dest1 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/dest1 file.outputformat @@ -455,7 +455,7 @@ transient_lastDdlTime - 1266455877 + 1268858204 @@ -592,13 +592,13 @@ true - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-57_394_4059993338119553205/10000 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-44_210_9179241983242656425/10000 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-57_394_4059993338119553205/10001 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-44_210_9179241983242656425/10001 @@ -619,10 +619,10 @@ true - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-57_394_4059993338119553205/10006 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-44_210_9179241983242656425/10006 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-57_394_4059993338119553205/10000 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-44_210_9179241983242656425/10000 @@ -648,7 +648,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-57_394_4059993338119553205/10006 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-44_210_9179241983242656425/10006 @@ -709,7 +709,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-57_394_4059993338119553205/10007 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-44_210_9179241983242656425/10007 @@ -946,10 +946,10 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-57_394_4059993338119553205/10007 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-44_210_9179241983242656425/10007 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-57_394_4059993338119553205/10007 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-44_210_9179241983242656425/10007 @@ -958,7 +958,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-57_394_4059993338119553205/10007 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-44_210_9179241983242656425/10007 10007 @@ -1012,11 +1012,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/dest2 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/dest2 transient_lastDdlTime - 1266455877 + 1268858204 @@ -1055,7 +1055,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-57_394_4059993338119553205/10002 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-44_210_9179241983242656425/10002 1 @@ -1107,7 +1107,7 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/dest2 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/dest2 file.outputformat @@ -1115,7 +1115,7 @@ transient_lastDdlTime - 1266455877 + 1268858204 @@ -1252,13 +1252,13 @@ true - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-57_394_4059993338119553205/10002 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-44_210_9179241983242656425/10002 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-57_394_4059993338119553205/10003 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-44_210_9179241983242656425/10003 @@ -1279,10 +1279,10 @@ true - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-57_394_4059993338119553205/10007 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-44_210_9179241983242656425/10007 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-57_394_4059993338119553205/10002 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-44_210_9179241983242656425/10002 @@ -1308,7 +1308,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-57_394_4059993338119553205/10007 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-44_210_9179241983242656425/10007 @@ -1369,7 +1369,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-57_394_4059993338119553205/10008 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-44_210_9179241983242656425/10008 @@ -1606,10 +1606,10 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-57_394_4059993338119553205/10008 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-44_210_9179241983242656425/10008 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-57_394_4059993338119553205/10008 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-44_210_9179241983242656425/10008 @@ -1618,7 +1618,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-57_394_4059993338119553205/10008 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-44_210_9179241983242656425/10008 10008 @@ -1672,11 +1672,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/dest3 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/dest3 transient_lastDdlTime - 1266455877 + 1268858204 @@ -1715,7 +1715,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-57_394_4059993338119553205/10004 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-44_210_9179241983242656425/10004 1 @@ -1771,7 +1771,7 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/dest3 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/dest3 file.outputformat @@ -1779,7 +1779,7 @@ transient_lastDdlTime - 1266455877 + 1268858204 @@ -1929,13 +1929,13 @@ true - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-57_394_4059993338119553205/10004 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-44_210_9179241983242656425/10004 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-57_394_4059993338119553205/10005 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-44_210_9179241983242656425/10005 @@ -1956,10 +1956,10 @@ true - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-57_394_4059993338119553205/10008 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-44_210_9179241983242656425/10008 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-57_394_4059993338119553205/10004 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-44_210_9179241983242656425/10004 @@ -1985,7 +1985,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-57_394_4059993338119553205/10008 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-44_210_9179241983242656425/10008 @@ -2071,11 +2071,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src transient_lastDdlTime - 1266455876 + 1268858203 @@ -2127,7 +2127,7 @@ 1 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-57_394_4059993338119553205/10006 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-44_210_9179241983242656425/10006 1 @@ -2374,9 +2374,9 @@ - + - + key @@ -2386,7 +2386,7 @@ - + value @@ -2417,7 +2417,7 @@ 2 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-57_394_4059993338119553205/10007 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-44_210_9179241983242656425/10007 1 @@ -2728,7 +2728,14 @@ - + + + + + + + + @@ -2750,7 +2757,7 @@ 3 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-17-57_394_4059993338119553205/10008 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-44_210_9179241983242656425/10008 1 @@ -2987,7 +2994,11 @@ - + + + + + @@ -3034,7 +3045,14 @@ - + + + + + + + + @@ -3045,7 +3063,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src src @@ -3057,7 +3075,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src src @@ -3114,11 +3132,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src transient_lastDdlTime - 1266455876 + 1268858203 Index: ql/src/test/results/compiler/plan/input3.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input3.q.xml (revision 924512) +++ ql/src/test/results/compiler/plan/input3.q.xml (working copy) @@ -1,5 +1,5 @@ - + @@ -41,7 +41,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-04_122_640720010082286825/10007 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-49_390_6521035443425216829/10007 @@ -286,10 +286,10 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-04_122_640720010082286825/10007 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-49_390_6521035443425216829/10007 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-04_122_640720010082286825/10007 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-49_390_6521035443425216829/10007 @@ -298,7 +298,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-04_122_640720010082286825/10007 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-49_390_6521035443425216829/10007 10007 @@ -352,11 +352,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/dest1 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1266455883 + 1268858209 @@ -395,7 +395,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-04_122_640720010082286825/10000 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-49_390_6521035443425216829/10000 1 @@ -447,7 +447,7 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/dest1 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/dest1 file.outputformat @@ -455,7 +455,7 @@ transient_lastDdlTime - 1266455883 + 1268858209 @@ -592,13 +592,13 @@ true - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-04_122_640720010082286825/10000 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-49_390_6521035443425216829/10000 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-04_122_640720010082286825/10001 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-49_390_6521035443425216829/10001 @@ -619,10 +619,10 @@ true - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-04_122_640720010082286825/10007 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-49_390_6521035443425216829/10007 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-04_122_640720010082286825/10000 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-49_390_6521035443425216829/10000 @@ -648,7 +648,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-04_122_640720010082286825/10007 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-49_390_6521035443425216829/10007 @@ -709,7 +709,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-04_122_640720010082286825/10008 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-49_390_6521035443425216829/10008 @@ -946,10 +946,10 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-04_122_640720010082286825/10008 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-49_390_6521035443425216829/10008 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-04_122_640720010082286825/10008 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-49_390_6521035443425216829/10008 @@ -958,7 +958,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-04_122_640720010082286825/10008 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-49_390_6521035443425216829/10008 10008 @@ -1012,11 +1012,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/dest2 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/dest2 transient_lastDdlTime - 1266455883 + 1268858209 @@ -1055,7 +1055,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-04_122_640720010082286825/10002 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-49_390_6521035443425216829/10002 1 @@ -1107,7 +1107,7 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/dest2 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/dest2 file.outputformat @@ -1115,7 +1115,7 @@ transient_lastDdlTime - 1266455883 + 1268858209 @@ -1252,13 +1252,13 @@ true - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-04_122_640720010082286825/10002 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-49_390_6521035443425216829/10002 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-04_122_640720010082286825/10003 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-49_390_6521035443425216829/10003 @@ -1279,10 +1279,10 @@ true - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-04_122_640720010082286825/10008 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-49_390_6521035443425216829/10008 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-04_122_640720010082286825/10002 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-49_390_6521035443425216829/10002 @@ -1308,7 +1308,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-04_122_640720010082286825/10008 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-49_390_6521035443425216829/10008 @@ -1369,7 +1369,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-04_122_640720010082286825/10009 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-49_390_6521035443425216829/10009 @@ -1606,10 +1606,10 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-04_122_640720010082286825/10009 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-49_390_6521035443425216829/10009 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-04_122_640720010082286825/10009 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-49_390_6521035443425216829/10009 @@ -1618,7 +1618,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-04_122_640720010082286825/10009 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-49_390_6521035443425216829/10009 10009 @@ -1672,11 +1672,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/dest3 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/dest3 transient_lastDdlTime - 1266455883 + 1268858209 @@ -1715,7 +1715,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-04_122_640720010082286825/10004 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-49_390_6521035443425216829/10004 1 @@ -1771,7 +1771,7 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/dest3 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/dest3 file.outputformat @@ -1779,7 +1779,7 @@ transient_lastDdlTime - 1266455883 + 1268858209 @@ -1929,13 +1929,13 @@ true - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-04_122_640720010082286825/10004 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-49_390_6521035443425216829/10004 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-04_122_640720010082286825/10005 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-49_390_6521035443425216829/10005 @@ -1956,10 +1956,10 @@ true - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-04_122_640720010082286825/10009 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-49_390_6521035443425216829/10009 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-04_122_640720010082286825/10004 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-49_390_6521035443425216829/10004 @@ -1985,7 +1985,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-04_122_640720010082286825/10009 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-49_390_6521035443425216829/10009 @@ -2046,7 +2046,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-04_122_640720010082286825/10010 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-49_390_6521035443425216829/10010 @@ -2257,10 +2257,10 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-04_122_640720010082286825/10010 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-49_390_6521035443425216829/10010 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-04_122_640720010082286825/10010 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-49_390_6521035443425216829/10010 @@ -2269,7 +2269,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-04_122_640720010082286825/10010 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-49_390_6521035443425216829/10010 10010 @@ -2328,7 +2328,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-04_122_640720010082286825/10006 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-49_390_6521035443425216829/10006 1 @@ -2483,7 +2483,7 @@ true - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-04_122_640720010082286825/10006 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-49_390_6521035443425216829/10006 ../../../../build/contrib/hive/ql/test/data/warehouse/dest4.out @@ -2507,10 +2507,10 @@ true - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-04_122_640720010082286825/10010 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-49_390_6521035443425216829/10010 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-04_122_640720010082286825/10006 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-49_390_6521035443425216829/10006 @@ -2536,7 +2536,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-04_122_640720010082286825/10010 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-49_390_6521035443425216829/10010 @@ -2622,11 +2622,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src transient_lastDdlTime - 1266455883 + 1268858208 @@ -2678,7 +2678,7 @@ 1 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-04_122_640720010082286825/10007 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-49_390_6521035443425216829/10007 1 @@ -2925,9 +2925,9 @@ - + - + key @@ -2937,7 +2937,7 @@ - + value @@ -2968,7 +2968,7 @@ 2 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-04_122_640720010082286825/10008 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-49_390_6521035443425216829/10008 1 @@ -3279,7 +3279,14 @@ - + + + + + + + + @@ -3301,7 +3308,7 @@ 3 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-04_122_640720010082286825/10009 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-49_390_6521035443425216829/10009 1 @@ -3609,7 +3616,11 @@ - + + + + + @@ -3631,7 +3642,7 @@ 4 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-04_122_640720010082286825/10010 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-49_390_6521035443425216829/10010 1 @@ -3844,7 +3855,14 @@ - + + + + + + + + @@ -3891,7 +3909,14 @@ - + + + + + + + + @@ -3902,7 +3927,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src src @@ -3914,7 +3939,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src src @@ -3971,11 +3996,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src transient_lastDdlTime - 1266455883 + 1268858208 Index: ql/src/test/results/compiler/plan/input6.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input6.q.xml (revision 924512) +++ ql/src/test/results/compiler/plan/input6.q.xml (working copy) @@ -1,5 +1,5 @@ - + @@ -41,7 +41,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-13_919_7978862993859858958/10002 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-57_101_5610312676943054789/10002 @@ -286,10 +286,10 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-13_919_7978862993859858958/10002 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-57_101_5610312676943054789/10002 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-13_919_7978862993859858958/10002 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-57_101_5610312676943054789/10002 @@ -298,7 +298,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-13_919_7978862993859858958/10002 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-57_101_5610312676943054789/10002 10002 @@ -352,11 +352,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/dest1 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1266455893 + 1268858216 @@ -395,7 +395,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-13_919_7978862993859858958/10000 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-57_101_5610312676943054789/10000 1 @@ -447,7 +447,7 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/dest1 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/dest1 file.outputformat @@ -455,7 +455,7 @@ transient_lastDdlTime - 1266455893 + 1268858216 @@ -592,13 +592,13 @@ true - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-13_919_7978862993859858958/10000 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-57_101_5610312676943054789/10000 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-13_919_7978862993859858958/10001 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-57_101_5610312676943054789/10001 @@ -619,10 +619,10 @@ true - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-13_919_7978862993859858958/10002 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-57_101_5610312676943054789/10002 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-13_919_7978862993859858958/10000 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-57_101_5610312676943054789/10000 @@ -648,7 +648,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-13_919_7978862993859858958/10002 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-57_101_5610312676943054789/10002 @@ -734,11 +734,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src1 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src1 transient_lastDdlTime - 1266455893 + 1268858216 @@ -794,7 +794,7 @@ 1 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-13_919_7978862993859858958/10002 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-36-57_101_5610312676943054789/10002 1 @@ -1018,9 +1018,9 @@ - + - + key @@ -1030,7 +1030,7 @@ - + value @@ -1107,7 +1107,14 @@ - + + + + + + + + @@ -1165,7 +1172,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src1 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src1 src1 @@ -1177,7 +1184,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src1 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src1 src1 @@ -1234,11 +1241,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src1 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src1 transient_lastDdlTime - 1266455893 + 1268858216 Index: ql/src/test/results/compiler/plan/input9.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input9.q.xml (revision 924512) +++ ql/src/test/results/compiler/plan/input9.q.xml (working copy) @@ -1,5 +1,5 @@ - + @@ -41,7 +41,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-23_194_6695331560093120937/10002 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-04_059_6443970408982244525/10002 @@ -286,10 +286,10 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-23_194_6695331560093120937/10002 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-04_059_6443970408982244525/10002 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-23_194_6695331560093120937/10002 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-04_059_6443970408982244525/10002 @@ -298,7 +298,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-23_194_6695331560093120937/10002 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-04_059_6443970408982244525/10002 10002 @@ -352,11 +352,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/dest1 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1266455903 + 1268858223 @@ -395,7 +395,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-23_194_6695331560093120937/10000 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-04_059_6443970408982244525/10000 1 @@ -447,7 +447,7 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/dest1 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/dest1 file.outputformat @@ -455,7 +455,7 @@ transient_lastDdlTime - 1266455903 + 1268858223 @@ -596,13 +596,13 @@ true - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-23_194_6695331560093120937/10000 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-04_059_6443970408982244525/10000 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-23_194_6695331560093120937/10001 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-04_059_6443970408982244525/10001 @@ -623,10 +623,10 @@ true - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-23_194_6695331560093120937/10002 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-04_059_6443970408982244525/10002 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-23_194_6695331560093120937/10000 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-04_059_6443970408982244525/10000 @@ -652,7 +652,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-23_194_6695331560093120937/10002 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-04_059_6443970408982244525/10002 @@ -738,11 +738,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src1 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src1 transient_lastDdlTime - 1266455902 + 1268858223 @@ -798,7 +798,7 @@ 1 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-23_194_6695331560093120937/10002 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-04_059_6443970408982244525/10002 1 @@ -1027,9 +1027,9 @@ - + - + key @@ -1038,16 +1038,6 @@ - - - - value - - - - - - @@ -1127,7 +1117,21 @@ - + + + + + + + + value + + + + + + + @@ -1182,7 +1186,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src1 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src1 src1 @@ -1194,7 +1198,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src1 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src1 src1 @@ -1251,11 +1255,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src1 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src1 transient_lastDdlTime - 1266455902 + 1268858223 Index: ql/src/test/results/compiler/plan/input_part1.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input_part1.q.xml (revision 924512) +++ ql/src/test/results/compiler/plan/input_part1.q.xml (working copy) @@ -1,5 +1,5 @@ - + Stage-2 @@ -75,11 +75,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/srcpart + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/srcpart transient_lastDdlTime - 1266455904 + 1268858224 @@ -132,7 +132,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-26_614_8773783764346917841/10001 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-06_324_6364489866768984396/10001 1 @@ -669,9 +669,9 @@ - + - + key @@ -681,7 +681,7 @@ - + value @@ -691,9 +691,9 @@ - + - ds + hr @@ -701,9 +701,9 @@ - + - hr + ds @@ -940,7 +940,20 @@ - + + + + + + + + + + + + + + @@ -1004,7 +1017,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 srcpart @@ -1016,7 +1029,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 hr=12 @@ -1086,11 +1099,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/srcpart + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/srcpart transient_lastDdlTime - 1266455904 + 1268858224 Index: ql/src/test/results/compiler/plan/input_testxpath2.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input_testxpath2.q.xml (revision 924512) +++ ql/src/test/results/compiler/plan/input_testxpath2.q.xml (working copy) @@ -1,5 +1,5 @@ - + Stage-2 @@ -66,11 +66,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src_thrift + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src_thrift transient_lastDdlTime - 1266455915 + 1268858233 @@ -123,7 +123,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-36_008_8515572615462850896/10001 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-13_900_7539919636038613978/10001 1 @@ -614,29 +614,9 @@ - + - - - aint - - - - - - - - - - astring - - - - - - - - + lint @@ -646,21 +626,7 @@ - - - lstring - - - - - - - - - - - - + lintstring @@ -670,7 +636,7 @@ - + mstringstring @@ -822,7 +788,51 @@ - + + + + + aint + + + + + + + + + + astring + + + + + + + + + + + + + lstring + + + + + + + + + + + + + + + + + @@ -883,7 +893,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src_thrift + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src_thrift src_thrift @@ -895,7 +905,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src_thrift + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src_thrift src_thrift @@ -956,11 +966,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src_thrift + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src_thrift transient_lastDdlTime - 1266455915 + 1268858233 Index: ql/src/test/results/compiler/plan/join4.q.xml =================================================================== --- ql/src/test/results/compiler/plan/join4.q.xml (revision 924512) +++ ql/src/test/results/compiler/plan/join4.q.xml (working copy) @@ -1,5 +1,5 @@ - + Stage-2 @@ -62,11 +62,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src transient_lastDdlTime - 1266455927 + 1268858243 @@ -149,11 +149,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src transient_lastDdlTime - 1266455927 + 1268858243 @@ -673,9 +673,9 @@ - + - + key @@ -685,7 +685,7 @@ - + value @@ -853,7 +853,14 @@ - + + + + + + + + @@ -1386,9 +1393,9 @@ - + - + key @@ -1398,7 +1405,7 @@ - + value @@ -1566,7 +1573,14 @@ - + + + + + + + + @@ -1633,7 +1647,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src c:a:src1 @@ -1648,7 +1662,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src src @@ -1705,11 +1719,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src transient_lastDdlTime - 1266455927 + 1268858243 @@ -1756,7 +1770,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-48_849_8990572096751726545/10001 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-23_952_1215288046645555960/10001 1 Index: ql/src/test/results/compiler/plan/join5.q.xml =================================================================== --- ql/src/test/results/compiler/plan/join5.q.xml (revision 924512) +++ ql/src/test/results/compiler/plan/join5.q.xml (working copy) @@ -1,5 +1,5 @@ - + Stage-2 @@ -62,11 +62,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src transient_lastDdlTime - 1266455931 + 1268858245 @@ -149,11 +149,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src transient_lastDdlTime - 1266455931 + 1268858245 @@ -673,9 +673,9 @@ - + - + key @@ -685,7 +685,7 @@ - + value @@ -853,7 +853,14 @@ - + + + + + + + + @@ -1386,9 +1393,9 @@ - + - + key @@ -1398,7 +1405,7 @@ - + value @@ -1566,7 +1573,14 @@ - + + + + + + + + @@ -1633,7 +1647,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src c:a:src1 @@ -1648,7 +1662,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src src @@ -1705,11 +1719,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src transient_lastDdlTime - 1266455931 + 1268858245 @@ -1756,7 +1770,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-52_147_2631018411851990362/10001 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-26_223_344884625765229415/10001 1 Index: ql/src/test/results/compiler/plan/join6.q.xml =================================================================== --- ql/src/test/results/compiler/plan/join6.q.xml (revision 924512) +++ ql/src/test/results/compiler/plan/join6.q.xml (working copy) @@ -1,5 +1,5 @@ - + Stage-2 @@ -62,11 +62,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src transient_lastDdlTime - 1266455934 + 1268858248 @@ -149,11 +149,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src transient_lastDdlTime - 1266455934 + 1268858248 @@ -673,9 +673,9 @@ - + - + key @@ -685,7 +685,7 @@ - + value @@ -853,7 +853,14 @@ - + + + + + + + + @@ -1386,9 +1393,9 @@ - + - + key @@ -1398,7 +1405,7 @@ - + value @@ -1566,7 +1573,14 @@ - + + + + + + + + @@ -1633,7 +1647,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src c:a:src1 @@ -1648,7 +1662,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src src @@ -1705,11 +1719,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src transient_lastDdlTime - 1266455934 + 1268858248 @@ -1756,7 +1770,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-55_372_6874816084950101713/10001 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-28_563_6173148678412168171/10001 1 Index: ql/src/test/results/compiler/plan/join7.q.xml =================================================================== --- ql/src/test/results/compiler/plan/join7.q.xml (revision 924512) +++ ql/src/test/results/compiler/plan/join7.q.xml (working copy) @@ -1,5 +1,5 @@ - + Stage-2 @@ -62,11 +62,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src transient_lastDdlTime - 1266455937 + 1268858250 @@ -149,11 +149,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src transient_lastDdlTime - 1266455937 + 1268858250 @@ -236,11 +236,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src transient_lastDdlTime - 1266455937 + 1268858250 @@ -760,9 +760,9 @@ - + - + key @@ -772,7 +772,7 @@ - + value @@ -940,7 +940,14 @@ - + + + + + + + + @@ -1473,9 +1480,9 @@ - + - + key @@ -1485,7 +1492,7 @@ - + value @@ -1653,7 +1660,14 @@ - + + + + + + + + @@ -2186,9 +2200,9 @@ - + - + key @@ -2198,7 +2212,7 @@ - + value @@ -2366,7 +2380,14 @@ - + + + + + + + + @@ -2433,7 +2454,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src c:a:src1 @@ -2451,7 +2472,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src src @@ -2508,11 +2529,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src transient_lastDdlTime - 1266455937 + 1268858250 @@ -2559,7 +2580,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-18-58_597_6102594542850393645/10001 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-30_887_8839973426725418491/10001 1 Index: ql/src/test/results/compiler/plan/join8.q.xml =================================================================== --- ql/src/test/results/compiler/plan/join8.q.xml (revision 924512) +++ ql/src/test/results/compiler/plan/join8.q.xml (working copy) @@ -1,5 +1,5 @@ - + Stage-2 @@ -62,11 +62,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src transient_lastDdlTime - 1266455941 + 1268858252 @@ -149,11 +149,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src transient_lastDdlTime - 1266455941 + 1268858252 @@ -673,9 +673,9 @@ - + - + key @@ -685,7 +685,7 @@ - + value @@ -853,7 +853,14 @@ - + + + + + + + + @@ -1386,9 +1393,9 @@ - + - + key @@ -1398,7 +1405,7 @@ - + value @@ -1566,7 +1573,14 @@ - + + + + + + + + @@ -1633,7 +1647,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src c:a:src1 @@ -1648,7 +1662,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src src @@ -1705,11 +1719,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src transient_lastDdlTime - 1266455941 + 1268858252 @@ -1760,7 +1774,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-02_327_8287747871729517073/10001 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-33_495_2760752754228511940/10001 1 @@ -2158,7 +2172,7 @@ - + _col0 @@ -2168,7 +2182,7 @@ - + _col1 @@ -2178,7 +2192,7 @@ - + _col2 @@ -2188,7 +2202,7 @@ - + _col3 @@ -2332,16 +2346,16 @@ - + - + - + - + Index: ql/src/test/results/compiler/plan/sample1.q.xml =================================================================== --- ql/src/test/results/compiler/plan/sample1.q.xml (revision 924512) +++ ql/src/test/results/compiler/plan/sample1.q.xml (working copy) @@ -1,5 +1,5 @@ - + Stage-2 @@ -75,11 +75,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/srcpart + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/srcpart transient_lastDdlTime - 1266455943 + 1268858254 @@ -136,7 +136,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-05_623_4488672071544235803/10001 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-35_998_1806468153291132483/10001 1 @@ -601,9 +601,9 @@ - + - + key @@ -613,7 +613,7 @@ - + value @@ -623,7 +623,7 @@ - + ds @@ -633,7 +633,7 @@ - + hr @@ -801,7 +801,20 @@ - + + + + + + + + + + + + + + @@ -1046,7 +1059,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 s @@ -1058,7 +1071,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 hr=11 @@ -1128,11 +1141,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/srcpart + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/srcpart transient_lastDdlTime - 1266455943 + 1268858254 Index: ql/src/test/results/compiler/plan/sample7.q.xml =================================================================== --- ql/src/test/results/compiler/plan/sample7.q.xml (revision 924512) +++ ql/src/test/results/compiler/plan/sample7.q.xml (working copy) @@ -1,5 +1,5 @@ - + @@ -41,7 +41,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-24_724_2762008853250227074/10002 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-48_704_4828253061022072997/10002 @@ -286,10 +286,10 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-24_724_2762008853250227074/10002 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-48_704_4828253061022072997/10002 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-24_724_2762008853250227074/10002 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-48_704_4828253061022072997/10002 @@ -298,7 +298,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-24_724_2762008853250227074/10002 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-48_704_4828253061022072997/10002 10002 @@ -352,11 +352,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/dest1 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1266455964 + 1268858268 @@ -395,7 +395,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-24_724_2762008853250227074/10000 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-48_704_4828253061022072997/10000 1 @@ -447,7 +447,7 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/dest1 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/dest1 file.outputformat @@ -455,7 +455,7 @@ transient_lastDdlTime - 1266455964 + 1268858268 @@ -596,13 +596,13 @@ true - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-24_724_2762008853250227074/10000 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-48_704_4828253061022072997/10000 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-24_724_2762008853250227074/10001 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-48_704_4828253061022072997/10001 @@ -623,10 +623,10 @@ true - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-24_724_2762008853250227074/10002 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-48_704_4828253061022072997/10002 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-24_724_2762008853250227074/10000 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-48_704_4828253061022072997/10000 @@ -652,7 +652,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-24_724_2762008853250227074/10002 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-48_704_4828253061022072997/10002 @@ -742,11 +742,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/srcbucket + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1266455963 + 1268858267 @@ -806,7 +806,7 @@ 1 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-24_724_2762008853250227074/10002 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-48_704_4828253061022072997/10002 1 @@ -1053,9 +1053,9 @@ - + - + key @@ -1065,7 +1065,7 @@ - + value @@ -1484,7 +1484,14 @@ - + + + + + + + + @@ -1542,7 +1549,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt s @@ -1554,7 +1561,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt srcbucket0.txt @@ -1615,11 +1622,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/srcbucket + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1266455963 + 1268858267 Index: ql/src/test/results/compiler/plan/subq.q.xml =================================================================== --- ql/src/test/results/compiler/plan/subq.q.xml (revision 924512) +++ ql/src/test/results/compiler/plan/subq.q.xml (working copy) @@ -1,5 +1,5 @@ - + @@ -41,7 +41,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-27_830_1079118588618985740/10001 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-50_915_3283756193597972413/10001 @@ -286,10 +286,10 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-27_830_1079118588618985740/10001 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-50_915_3283756193597972413/10001 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-27_830_1079118588618985740/10001 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-50_915_3283756193597972413/10001 @@ -298,7 +298,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-27_830_1079118588618985740/10001 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-50_915_3283756193597972413/10001 10001 @@ -357,7 +357,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-27_830_1079118588618985740/10000 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-50_915_3283756193597972413/10000 1 @@ -522,7 +522,7 @@ true - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-27_830_1079118588618985740/10000 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-50_915_3283756193597972413/10000 ../build/ql/test/data/warehouse/union.out @@ -546,10 +546,10 @@ true - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-27_830_1079118588618985740/10001 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-50_915_3283756193597972413/10001 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-27_830_1079118588618985740/10000 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-50_915_3283756193597972413/10000 @@ -575,7 +575,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-27_830_1079118588618985740/10001 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-50_915_3283756193597972413/10001 @@ -661,11 +661,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src transient_lastDdlTime - 1266455967 + 1268858270 @@ -725,7 +725,7 @@ 1 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-27_830_1079118588618985740/10001 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-50_915_3283756193597972413/10001 1 @@ -1099,9 +1099,9 @@ - + - + key @@ -1111,7 +1111,7 @@ - + value @@ -1208,7 +1208,14 @@ - + + + + + + + + @@ -1266,7 +1273,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src unioninput:src @@ -1278,7 +1285,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src src @@ -1335,11 +1342,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src transient_lastDdlTime - 1266455967 + 1268858270 Index: ql/src/test/results/compiler/plan/udf1.q.xml =================================================================== --- ql/src/test/results/compiler/plan/udf1.q.xml (revision 924512) +++ ql/src/test/results/compiler/plan/udf1.q.xml (working copy) @@ -1,5 +1,5 @@ - + Stage-2 @@ -62,11 +62,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src transient_lastDdlTime - 1266455970 + 1268858272 @@ -119,7 +119,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-30_929_3336844444655306252/10001 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-37-53_218_968039224977034805/10001 1 @@ -1628,9 +1628,9 @@ - + - + key @@ -1639,16 +1639,6 @@ - - - - value - - - - - - @@ -1737,7 +1727,21 @@ - + + + + + + + + value + + + + + + + @@ -1792,7 +1796,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src src @@ -1804,7 +1808,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src src @@ -1861,11 +1865,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src transient_lastDdlTime - 1266455970 + 1268858272 Index: ql/src/test/results/compiler/plan/union.q.xml =================================================================== --- ql/src/test/results/compiler/plan/union.q.xml (revision 924512) +++ ql/src/test/results/compiler/plan/union.q.xml (working copy) @@ -1,5 +1,5 @@ - + @@ -41,7 +41,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-46_118_7376675618070016606/10001 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-38-03_630_5963252343479840058/10001 @@ -286,10 +286,10 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-46_118_7376675618070016606/10001 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-38-03_630_5963252343479840058/10001 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-46_118_7376675618070016606/10001 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-38-03_630_5963252343479840058/10001 @@ -298,7 +298,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-46_118_7376675618070016606/10001 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-38-03_630_5963252343479840058/10001 10001 @@ -357,7 +357,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-46_118_7376675618070016606/10000 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-38-03_630_5963252343479840058/10000 1 @@ -522,7 +522,7 @@ true - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-46_118_7376675618070016606/10000 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-38-03_630_5963252343479840058/10000 ../build/ql/test/data/warehouse/union.out @@ -546,10 +546,10 @@ true - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-46_118_7376675618070016606/10001 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-38-03_630_5963252343479840058/10001 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-46_118_7376675618070016606/10000 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-38-03_630_5963252343479840058/10000 @@ -575,7 +575,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-46_118_7376675618070016606/10001 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-38-03_630_5963252343479840058/10001 @@ -661,11 +661,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src transient_lastDdlTime - 1266455985 + 1268858283 @@ -748,11 +748,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src transient_lastDdlTime - 1266455985 + 1268858283 @@ -816,7 +816,7 @@ 1 - file:/data/users/njain/hive1/hive1/build/ql/scratchdir/hive_2010-02-17_17-19-46_118_7376675618070016606/10001 + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/scratchdir/hive_2010-03-17_13-38-03_630_5963252343479840058/10001 1 @@ -1321,7 +1321,7 @@ - + key @@ -1331,7 +1331,7 @@ - + value @@ -1362,7 +1362,14 @@ - + + + + + + + + @@ -1407,7 +1414,7 @@ - + _col0 @@ -1417,7 +1424,7 @@ - + _col1 @@ -1521,10 +1528,10 @@ - + - + @@ -1614,9 +1621,9 @@ - + - + key @@ -1626,7 +1633,7 @@ - + value @@ -1723,7 +1730,14 @@ - + + + + + + + + @@ -1785,7 +1799,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src null-subquery1:unioninput-subquery1:src @@ -1800,7 +1814,7 @@ - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src src @@ -1857,11 +1871,11 @@ location - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/Users/heyongqiang/Documents/workspace/Hive-Test/build/ql/test/data/warehouse/src transient_lastDdlTime - 1266455985 + 1268858283