Index: common/src/java/org/apache/hadoop/hive/conf/HiveConf.java =================================================================== --- common/src/java/org/apache/hadoop/hive/conf/HiveConf.java (revision 796808) +++ common/src/java/org/apache/hadoop/hive/conf/HiveConf.java (working copy) @@ -154,7 +154,6 @@ HIVEOPTCP("hive.optimize.cp", true), // column pruner HIVEOPTPPD("hive.optimize.ppd", true); // predicate pushdown - public final String varname; public final String defaultVal; public final int defaultIntVal; Index: ql/src/test/results/clientnegative/script_error.q.out =================================================================== --- ql/src/test/results/clientnegative/script_error.q.out (revision 796808) +++ ql/src/test/results/clientnegative/script_error.q.out (working copy) @@ -13,6 +13,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: key @@ -39,5 +41,5 @@ query: SELECT TRANSFORM(src.key, src.value) USING '../data/scripts/error_script' AS (tkey, tvalue) FROM src Input: default/src -Output: file:/Users/char/Documents/workspace/Hive-Clean/build/ql/tmp/1352070559/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2030722781/10000 FAILED: Execution Error, return code 2 from org.apache.hadoop.hive.ql.exec.MapRedTask Index: ql/src/test/results/clientpositive/order.q.out =================================================================== --- ql/src/test/results/clientpositive/order.q.out (revision 796808) +++ ql/src/test/results/clientpositive/order.q.out (working copy) @@ -12,6 +12,8 @@ Map Reduce Alias -> Map Operator Tree: x + TableScan + alias: x Select Operator expressions: expr: key @@ -46,7 +48,7 @@ query: SELECT x.* FROM SRC x ORDER BY key limit 10 Input: default/src -Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/931476963/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2143231051/10000 0 val_0 0 val_0 0 val_0 @@ -71,6 +73,8 @@ Map Reduce Alias -> Map Operator Tree: x + TableScan + alias: x Select Operator expressions: expr: key @@ -105,7 +109,7 @@ query: SELECT x.* FROM SRC x ORDER BY key desc limit 10 Input: default/src -Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1878611335/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1697982809/10000 98 val_98 98 val_98 97 val_97 Index: ql/src/test/results/clientpositive/no_hooks.q.out =================================================================== --- ql/src/test/results/clientpositive/no_hooks.q.out (revision 796808) +++ ql/src/test/results/clientpositive/no_hooks.q.out (working copy) @@ -11,6 +11,8 @@ Map Reduce Alias -> Map Operator Tree: src2 + TableScan + alias: src2 Filter Operator predicate: expr: (UDFToDouble(key) < UDFToDouble(10)) @@ -24,6 +26,8 @@ expr: value type: string src1 + TableScan + alias: src1 Filter Operator predicate: expr: (UDFToDouble(key) < UDFToDouble(10)) @@ -67,7 +71,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/792304338/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1651417576/10002 Reduce Output Operator key expressions: expr: _col0 Index: ql/src/test/results/clientpositive/udf_hash.q.out =================================================================== --- ql/src/test/results/clientpositive/udf_hash.q.out (revision 796808) +++ ql/src/test/results/clientpositive/udf_hash.q.out (working copy) @@ -17,6 +17,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: hash(UDFToByte(1)) @@ -61,5 +63,5 @@ hash(1, 2, 3) FROM src LIMIT 1 Input: default/src -Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1354544735/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1198225315/10000 1 2 3 -1097262584 1067450368 1076887552 51508 96354 1 0 1026 Index: ql/src/test/results/clientpositive/ppd_join3.q.out =================================================================== --- ql/src/test/results/clientpositive/ppd_join3.q.out (revision 796808) +++ ql/src/test/results/clientpositive/ppd_join3.q.out (working copy) @@ -21,6 +21,8 @@ Map Reduce Alias -> Map Operator Tree: src2:src + TableScan + alias: src Filter Operator predicate: expr: ((key <> '12') and (key <> '4')) @@ -50,6 +52,8 @@ expr: _col1 type: string src1:src + TableScan + alias: src Filter Operator predicate: expr: (((key <> '11') and (key < '400')) and ((key > '0') and ((value <> 'val_500') or (key > '1')))) @@ -83,6 +87,8 @@ expr: _col1 type: string src3:src + TableScan + alias: src Filter Operator predicate: expr: ((key <> '13') and (key <> '1')) @@ -149,7 +155,7 @@ ON src1.c1 = src3.c5 WHERE src1.c1 > '0' and (src1.c2 <> 'val_500' or src1.c1 > '1') and (src2.c3 > '10' or src1.c1 <> '10') and (src2.c3 <> '4') and (src3.c5 <> '1') Input: default/src -Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1296260582/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/784025378/10000 100 val_100 100 val_100 100 val_100 Index: ql/src/test/results/clientpositive/join6.q.out =================================================================== --- ql/src/test/results/clientpositive/join6.q.out (revision 796808) +++ ql/src/test/results/clientpositive/join6.q.out (working copy) @@ -25,6 +25,8 @@ Map Reduce Alias -> Map Operator Tree: c:a:src1 + TableScan + alias: src1 Filter Operator predicate: expr: ((UDFToDouble(key) > UDFToDouble(10)) and (UDFToDouble(key) < UDFToDouble(20))) @@ -54,6 +56,8 @@ expr: _col1 type: string c:b:src2 + TableScan + alias: src2 Filter Operator predicate: expr: ((UDFToDouble(key) > UDFToDouble(15)) and (UDFToDouble(key) < UDFToDouble(25))) @@ -156,7 +160,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/1110594034/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/954466961/10000 11 val_11 NULL NULL 12 val_12 NULL NULL 12 val_12 NULL NULL Index: ql/src/test/results/clientpositive/union11.q.out =================================================================== --- ql/src/test/results/clientpositive/union11.q.out (revision 796808) +++ ql/src/test/results/clientpositive/union11.q.out (working copy) @@ -23,6 +23,8 @@ Map Reduce Alias -> Map Operator Tree: null-subquery1-subquery1:unionsrc-subquery1-subquery1:s1 + TableScan + alias: s1 Select Operator Group By Operator aggregations: @@ -55,7 +57,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/615733629/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2052135394/10002 Union Select Operator expressions: @@ -80,7 +82,7 @@ value expressions: expr: _col1 type: bigint - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/615733629/10003 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2052135394/10003 Union Select Operator expressions: @@ -105,7 +107,7 @@ value expressions: expr: _col1 type: bigint - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/615733629/10004 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2052135394/10004 Union Select Operator expressions: @@ -155,6 +157,8 @@ Map Reduce Alias -> Map Operator Tree: null-subquery1-subquery2:unionsrc-subquery1-subquery2:s2 + TableScan + alias: s2 Select Operator Group By Operator aggregations: @@ -188,6 +192,8 @@ Map Reduce Alias -> Map Operator Tree: null-subquery2:unionsrc-subquery2:s3 + TableScan + alias: s3 Select Operator Group By Operator aggregations: @@ -228,7 +234,7 @@ UNION ALL select 'tst3' as key, count(1) as value from src s3) unionsrc group by unionsrc.key Input: default/src -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/498602862/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2137063521/10000 tst1 1 tst2 1 tst3 1 Index: ql/src/test/results/clientpositive/ppd_union.q.out =================================================================== --- ql/src/test/results/clientpositive/ppd_union.q.out (revision 796808) +++ ql/src/test/results/clientpositive/ppd_union.q.out (working copy) @@ -18,6 +18,8 @@ Map Reduce Alias -> Map Operator Tree: null-subquery1:unioned_query-subquery1:src + TableScan + alias: src Filter Operator predicate: expr: ((key < '100') and ((key > '4') and (value > 'val_4'))) @@ -50,6 +52,8 @@ input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat null-subquery2:unioned_query-subquery2:src + TableScan + alias: src Filter Operator predicate: expr: ((key > '150') and ((key > '4') and (value > 'val_4'))) @@ -95,7 +99,7 @@ SELECT unioned_query.* WHERE key > '4' and value > 'val_4' Input: default/src -Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1558389023/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2011242914/10000 86 val_86 409 val_409 98 val_98 Index: ql/src/test/results/clientpositive/udf1.q.out =================================================================== --- ql/src/test/results/clientpositive/udf1.q.out (revision 796808) +++ ql/src/test/results/clientpositive/udf1.q.out (working copy) @@ -24,6 +24,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Filter Operator predicate: expr: (UDFToDouble(key) = UDFToDouble(86)) @@ -89,10 +91,10 @@ Move Operator files: hdfs directory: true - destination: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/734075252/10000 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1683789317/10000 Map Reduce Alias -> Map Operator Tree: - file:/data/users/pchakka/workspace/oshive/build/ql/tmp/816992741/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1020431013/10002 Reduce Output Operator sort order: Map-reduce partition columns: @@ -173,5 +175,5 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/674207509/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/254753043/10000 true false true true true false false false true true false true false acc abc abb hive hadoop AaAbAcA false Index: ql/src/test/results/clientpositive/join12.q.out =================================================================== --- ql/src/test/results/clientpositive/join12.q.out (revision 796808) +++ ql/src/test/results/clientpositive/join12.q.out (working copy) @@ -20,6 +20,8 @@ Map Reduce Alias -> Map Operator Tree: src2:src + TableScan + alias: src Select Operator expressions: expr: key @@ -39,6 +41,8 @@ expr: _col1 type: string src1:src + TableScan + alias: src Filter Operator predicate: expr: (UDFToDouble(key) < UDFToDouble(100)) @@ -64,6 +68,8 @@ expr: _col0 type: string src3:src + TableScan + alias: src Filter Operator predicate: expr: (UDFToDouble(key) < UDFToDouble(80)) @@ -122,7 +128,7 @@ (SELECT src.key as c5, src.value as c6 from src) src3 ON src1.c1 = src3.c5 AND src3.c5 < 80 Input: default/src -Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1217946262/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1046822018/10000 0 val_0 0 val_0 0 val_0 Index: ql/src/test/results/clientpositive/union19.q.out =================================================================== --- ql/src/test/results/clientpositive/union19.q.out (revision 796808) +++ ql/src/test/results/clientpositive/union19.q.out (working copy) @@ -28,6 +28,8 @@ Map Reduce Alias -> Map Operator Tree: null-subquery1:unionsrc-subquery1:s1 + TableScan + alias: s1 Select Operator Group By Operator aggregations: @@ -60,7 +62,7 @@ Stage: Stage-3 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1000894455/10004 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/335884032/10004 Union Select Operator expressions: @@ -103,7 +105,7 @@ output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest2 - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1000894455/10005 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/335884032/10005 Union Select Operator expressions: @@ -193,6 +195,8 @@ Map Reduce Alias -> Map Operator Tree: null-subquery2:unionsrc-subquery2:s2 + TableScan + alias: s2 Select Operator expressions: expr: key @@ -206,7 +210,6 @@ input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat - query: FROM (select 'tst1' as key, cast(count(1) as string) as value from src s1 UNION ALL select s2.key as key, s2.value as value from src s2) unionsrc @@ -217,7 +220,7 @@ Output: default/dest2 query: SELECT DEST1.* FROM DEST1 SORT BY DEST1.key, DEST1.value Input: default/dest1 -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1842108854/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1289334523/10000 0 3 10 1 100 2 @@ -530,7 +533,7 @@ tst1 1 query: SELECT DEST2.* FROM DEST2 SORT BY DEST2.key, DEST2.val1, DEST2.val2 Input: default/dest2 -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1264340998/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/242347380/10000 0 val_0 val_0 0 val_0 val_0 0 val_0 val_0 Index: ql/src/test/results/clientpositive/input32.q.out =================================================================== --- ql/src/test/results/clientpositive/input32.q.out (revision 796808) +++ ql/src/test/results/clientpositive/input32.q.out (working copy) @@ -17,6 +17,8 @@ Map Reduce Alias -> Map Operator Tree: srcbucket + TableScan + alias: srcbucket Select Operator Group By Operator aggregations: @@ -67,7 +69,7 @@ Output: default/tst_dest32 query: select * from tst_dest32 Input: default/tst_dest32 -Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/1901806276/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/635221363/10000 1000 query: drop table tst_dest32 query: drop table dest32 Index: ql/src/test/results/clientpositive/udf9.q.out =================================================================== --- ql/src/test/results/clientpositive/udf9.q.out (revision 796808) +++ ql/src/test/results/clientpositive/udf9.q.out (working copy) @@ -20,6 +20,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Filter Operator predicate: expr: (UDFToDouble(key) = UDFToDouble(86)) @@ -84,5 +86,5 @@ DATE_SUB('2007-02-28', 365), DATE_SUB('2007-02-28 01:12:34', 730) FROM src WHERE src.key = 86 Input: default/src -Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/126482949/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1419863436/10000 -1 2 32 -1 2009-01-01 2009-12-31 2008-03-01 2009-03-02 2008-02-28 2009-02-27 2008-12-31 2008-01-02 2008-02-28 2009-02-27 2006-02-28 2005-02-28 Index: ql/src/test/results/clientpositive/join35.q.out =================================================================== --- ql/src/test/results/clientpositive/join35.q.out (revision 796808) +++ ql/src/test/results/clientpositive/join35.q.out (working copy) @@ -27,11 +27,15 @@ Map Reduce Alias -> Map Operator Tree: null-subquery1:subq1-subquery1:x + TableScan + alias: x Filter Operator + isSamplingPred: false predicate: expr: (UDFToDouble(key) < UDFToDouble(20)) type: boolean Filter Operator + isSamplingPred: false predicate: expr: (UDFToDouble(key) < UDFToDouble(20)) type: boolean @@ -60,9 +64,9 @@ type: bigint Needs Tagging: false Path -> Alias: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src Path -> Partition: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src Partition input format: org.apache.hadoop.mapred.TextInputFormat @@ -77,7 +81,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: src Reduce Operator Tree: @@ -97,7 +101,7 @@ File Output Operator compressed: false GlobalTableId: 0 - directory: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/8604588/10002 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/273505987/10002 table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -109,7 +113,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/8604588/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/273505987/10002 Union Common Join Operator condition map: @@ -148,7 +152,7 @@ File Output Operator compressed: false GlobalTableId: 1 - directory: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/8604588/10003 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/273505987/10003 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -162,10 +166,10 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/dest_j1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest_j1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest_j1 - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/8604588/10004 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/273505987/10004 Union Common Join Operator condition map: @@ -204,7 +208,7 @@ File Output Operator compressed: false GlobalTableId: 1 - directory: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/8604588/10003 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/273505987/10003 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -218,7 +222,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/dest_j1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest_j1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest_j1 Local Work: @@ -229,6 +233,8 @@ limit: -1 Alias -> Map Local Operator Tree: x + TableScan + alias: x Common Join Operator condition map: Inner Join 0 to 1 @@ -266,7 +272,7 @@ File Output Operator compressed: false GlobalTableId: 1 - directory: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/8604588/10003 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/273505987/10003 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -280,15 +286,15 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/dest_j1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest_j1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest_j1 Needs Tagging: false Path -> Alias: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/8604588/10002 - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/8604588/10004 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/273505987/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/273505987/10004 Path -> Partition: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/8604588/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/273505987/10002 Partition input format: org.apache.hadoop.mapred.SequenceFileInputFormat @@ -297,7 +303,7 @@ columns _col0,_col1 columns.types string,bigint escape.delim \ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/8604588/10004 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/273505987/10004 Partition input format: org.apache.hadoop.mapred.SequenceFileInputFormat @@ -313,11 +319,11 @@ Move Operator files: hdfs directory: true - source: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/8604588/10003 - destination: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1122040404/10000 + source: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/273505987/10003 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1882737324/10000 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/8604588/10003 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/273505987/10003 Reduce Output Operator sort order: Map-reduce partition columns: @@ -333,9 +339,9 @@ type: int Needs Tagging: false Path -> Alias: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/8604588/10003 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/273505987/10003 Path -> Partition: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/8604588/10003 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/273505987/10003 Partition input format: org.apache.hadoop.mapred.TextInputFormat @@ -350,7 +356,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/dest_j1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest_j1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest_j1 Reduce Operator Tree: @@ -358,7 +364,7 @@ File Output Operator compressed: false GlobalTableId: 0 - directory: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1122040404/10000 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1882737324/10000 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -371,8 +377,8 @@ bucket_count -1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest_j1 file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/dest_j1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest_j1 @@ -380,7 +386,7 @@ Move Operator tables: replace: true - source: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1122040404/10000 + source: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1882737324/10000 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -394,20 +400,24 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/dest_j1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest_j1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest_j1 - tmp directory: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1122040404/10001 + tmp directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1882737324/10001 Stage: Stage-6 Map Reduce Alias -> Map Operator Tree: null-subquery2:subq1-subquery2:x1 + TableScan + alias: x1 Filter Operator + isSamplingPred: false predicate: expr: (UDFToDouble(key) > UDFToDouble(100)) type: boolean Filter Operator + isSamplingPred: false predicate: expr: (UDFToDouble(key) > UDFToDouble(100)) type: boolean @@ -436,9 +446,9 @@ type: bigint Needs Tagging: false Path -> Alias: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src Path -> Partition: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src Partition input format: org.apache.hadoop.mapred.TextInputFormat @@ -453,7 +463,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: src Reduce Operator Tree: @@ -473,7 +483,7 @@ File Output Operator compressed: false GlobalTableId: 0 - directory: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/8604588/10004 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/273505987/10004 table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -496,7 +506,7 @@ Output: default/dest_j1 query: select * from dest_j1 x order by x.key Input: default/dest_j1 -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/140307786/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1822695082/10000 128 3 146 val_146 2 150 val_150 1 Index: ql/src/test/results/clientpositive/input17.q.out =================================================================== --- ql/src/test/results/clientpositive/input17.q.out (revision 796808) +++ ql/src/test/results/clientpositive/input17.q.out (working copy) @@ -19,6 +19,8 @@ Map Reduce Alias -> Map Operator Tree: tmap:src_thrift + TableScan + alias: src_thrift Select Operator expressions: expr: (aint + lint[0]) @@ -89,7 +91,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/zshao/tools/553-trunk-apache-hive/build/ql/tmp/667771200/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1137477682/10000 NULL null -1461153966 {"myint":49,"mystring":"343","underscore_int":7} -1952710705 {"myint":25,"mystring":"125","underscore_int":5} Index: ql/src/test/results/clientpositive/groupby1.q.out =================================================================== --- ql/src/test/results/clientpositive/groupby1.q.out (revision 796808) +++ ql/src/test/results/clientpositive/groupby1.q.out (working copy) @@ -14,6 +14,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: key @@ -50,7 +52,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - invalidscheme:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/698528309/10002 + invalidscheme:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/341293025/10002 Reduce Output Operator key expressions: expr: _col0 @@ -108,7 +110,7 @@ Output: default/dest_g1 query: SELECT dest_g1.* FROM dest_g1 Input: default/dest_g1 -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1819734290/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1691467039/10000 0 0.0 10 10.0 100 200.0 Index: ql/src/test/results/clientpositive/udf_case.q.out =================================================================== --- ql/src/test/results/clientpositive/udf_case.q.out (revision 796808) +++ ql/src/test/results/clientpositive/udf_case.q.out (working copy) @@ -37,6 +37,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: CASE (1) WHEN (1) THEN (2) WHEN (3) THEN (4) ELSE (5) END @@ -91,5 +93,5 @@ END FROM src LIMIT 1 Input: default/src -Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1131510224/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1844132697/10000 2 5 15 NULL 20 24 Index: ql/src/test/results/clientpositive/union4.q.out =================================================================== --- ql/src/test/results/clientpositive/union4.q.out (revision 796808) +++ ql/src/test/results/clientpositive/union4.q.out (working copy) @@ -25,6 +25,8 @@ Map Reduce Alias -> Map Operator Tree: null-subquery1:unionsrc-subquery1:s1 + TableScan + alias: s1 Select Operator Group By Operator aggregations: @@ -57,7 +59,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/800954913/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1779080848/10002 Union Select Operator expressions: @@ -79,7 +81,7 @@ output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: tmptable - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/800954913/10004 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1779080848/10004 Union Select Operator expressions: @@ -108,10 +110,10 @@ Move Operator files: hdfs directory: true - destination: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/97307442/10000 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/232992045/10000 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/800954913/10003 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1779080848/10003 Reduce Output Operator sort order: Map-reduce partition columns: @@ -148,6 +150,8 @@ Map Reduce Alias -> Map Operator Tree: null-subquery2:unionsrc-subquery2:s2 + TableScan + alias: s2 Select Operator Group By Operator aggregations: @@ -186,7 +190,7 @@ Output: default/tmptable query: select * from tmptable x sort by x.key Input: default/tmptable -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1062910028/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/501561591/10000 tst1 500 tst2 500 query: drop table tmptable Index: ql/src/test/results/clientpositive/ppd_clusterby.q.out =================================================================== --- ql/src/test/results/clientpositive/ppd_clusterby.q.out (revision 796808) +++ ql/src/test/results/clientpositive/ppd_clusterby.q.out (working copy) @@ -12,6 +12,8 @@ Map Reduce Alias -> Map Operator Tree: x + TableScan + alias: x Filter Operator predicate: expr: (UDFToDouble(key) = UDFToDouble(10)) @@ -56,7 +58,7 @@ query: SELECT * FROM SRC x where x.key = 10 CLUSTER BY x.key Input: default/src -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1968231476/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/239178662/10000 10 val_10 query: EXPLAIN SELECT x.key, x.value as v1, y.key FROM SRC x JOIN SRC y ON (x.key = y.key) where x.key = 20 CLUSTER BY v1 @@ -73,6 +75,8 @@ Map Reduce Alias -> Map Operator Tree: y + TableScan + alias: y Reduce Output Operator key expressions: expr: key @@ -86,6 +90,8 @@ expr: key type: string x + TableScan + alias: x Filter Operator predicate: expr: (UDFToDouble(key) = UDFToDouble(20)) @@ -133,7 +139,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/955520378/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/598745626/10002 Reduce Output Operator key expressions: expr: _col1 @@ -166,5 +172,5 @@ query: SELECT x.key, x.value as v1, y.key FROM SRC x JOIN SRC y ON (x.key = y.key) where x.key = 20 CLUSTER BY v1 Input: default/src -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1619244792/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2114252653/10000 20 val_20 20 Index: ql/src/test/results/clientpositive/groupby9.q.out =================================================================== --- ql/src/test/results/clientpositive/groupby9.q.out (revision 796808) +++ ql/src/test/results/clientpositive/groupby9.q.out (working copy) @@ -21,6 +21,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Reduce Output Operator key expressions: expr: substr(value, 5) @@ -69,7 +71,7 @@ Stage: Stage-3 Map Reduce Alias -> Map Operator Tree: - file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/.ptest_2/build/ql/tmp/768622902/10004 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1631450902/10004 Reduce Output Operator key expressions: expr: _col0 @@ -124,7 +126,7 @@ Stage: Stage-4 Map Reduce Alias -> Map Operator Tree: - file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/.ptest_2/build/ql/tmp/768622902/10005 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1631450902/10005 Reduce Output Operator key expressions: expr: _col0 @@ -195,7 +197,7 @@ Output: default/dest2 query: SELECT DEST1.* FROM DEST1 Input: default/dest1 -Output: file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/.ptest_2/build/ql/tmp/712785376/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/377760918/10000 0 1 10 1 100 1 @@ -507,7 +509,7 @@ 98 1 query: SELECT DEST2.* FROM DEST2 Input: default/dest2 -Output: file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/.ptest_2/build/ql/tmp/55172954/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/416778051/10000 0 val_0 1 10 val_10 1 100 val_100 1 Index: ql/src/test/results/clientpositive/groupby11.q.out =================================================================== --- ql/src/test/results/clientpositive/groupby11.q.out (revision 796808) +++ ql/src/test/results/clientpositive/groupby11.q.out (working copy) @@ -23,6 +23,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Reduce Output Operator key expressions: expr: key @@ -71,7 +73,7 @@ Stage: Stage-3 Map Reduce Alias -> Map Operator Tree: - file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/build/ql/tmp/978450176/10004 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/53181894/10004 Reduce Output Operator key expressions: expr: _col0 @@ -135,7 +137,7 @@ Stage: Stage-4 Map Reduce Alias -> Map Operator Tree: - file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/build/ql/tmp/978450176/10005 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/53181894/10005 Reduce Output Operator key expressions: expr: _col0 @@ -207,7 +209,7 @@ Output: default/dest2/ds=111 query: SELECT * from dest1 Input: default/dest1/ds=111 -Output: file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/build/ql/tmp/622832911/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1374534800/10000 val_0 3 1 111 val_10 1 1 111 val_100 2 1 111 @@ -519,7 +521,7 @@ val_98 2 1 111 query: SELECT * from dest2 Input: default/dest2/ds=111 -Output: file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/build/ql/tmp/1068916581/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1060581618/10000 0 3 1 111 10 1 1 111 100 2 1 111 Index: ql/src/test/results/clientpositive/union20.q.out =================================================================== --- ql/src/test/results/clientpositive/union20.q.out (revision 796808) +++ ql/src/test/results/clientpositive/union20.q.out (working copy) @@ -31,6 +31,8 @@ Map Reduce Alias -> Map Operator Tree: null-subquery1:unionsrc2-subquery1:s3 + TableScan + alias: s3 Select Operator Group By Operator aggregations: @@ -63,7 +65,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/2117443883/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1175927409/10002 Union Reduce Output Operator key expressions: @@ -79,7 +81,7 @@ type: string expr: _col1 type: string - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/2117443883/10003 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1175927409/10003 Union Reduce Output Operator key expressions: @@ -138,6 +140,8 @@ Map Reduce Alias -> Map Operator Tree: null-subquery2:unionsrc2-subquery2:s4 + TableScan + alias: s4 Filter Operator predicate: expr: (UDFToDouble(key) < UDFToDouble(10)) @@ -163,6 +167,8 @@ Map Reduce Alias -> Map Operator Tree: null-subquery2:unionsrc1-subquery2:s2 + TableScan + alias: s2 Filter Operator predicate: expr: (UDFToDouble(key) < UDFToDouble(10)) @@ -187,7 +193,7 @@ Stage: Stage-5 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/2117443883/10004 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1175927409/10004 Union File Output Operator compressed: false @@ -195,7 +201,7 @@ table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/2117443883/10006 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1175927409/10006 Union File Output Operator compressed: false @@ -208,6 +214,8 @@ Map Reduce Alias -> Map Operator Tree: null-subquery1:unionsrc1-subquery1:s1 + TableScan + alias: s1 Select Operator Group By Operator aggregations: @@ -252,7 +260,7 @@ select s4.key as key, s4.value as value from src s4 where s4.key < 10) unionsrc2 ON (unionsrc1.key = unionsrc2.key) Input: default/src -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/2027041799/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1845643610/10000 0 val_0 0 val_0 0 val_0 0 val_0 0 val_0 0 val_0 Index: ql/src/test/results/clientpositive/mapreduce7.q.out =================================================================== --- ql/src/test/results/clientpositive/mapreduce7.q.out (revision 796808) +++ ql/src/test/results/clientpositive/mapreduce7.q.out (working copy) @@ -17,6 +17,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: key @@ -102,7 +104,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/222952583/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1229505124/10000 0 val_0 0 0 0 val_0 0 val_0 0 0 0 val_0 0 val_0 0 0 0 val_0 Index: ql/src/test/results/clientpositive/udf_when.q.out =================================================================== --- ql/src/test/results/clientpositive/udf_when.q.out (revision 796808) +++ ql/src/test/results/clientpositive/udf_when.q.out (working copy) @@ -37,6 +37,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: CASE WHEN ((1 = 1)) THEN (2) WHEN ((1 = 3)) THEN (4) ELSE (5) END @@ -91,5 +93,5 @@ END FROM src LIMIT 1 Input: default/src -Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/855982416/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/56293614/10000 2 9 14 NULL 24 NULL Index: ql/src/test/results/clientpositive/ppd_outer_join2.q.out =================================================================== --- ql/src/test/results/clientpositive/ppd_outer_join2.q.out (revision 796808) +++ ql/src/test/results/clientpositive/ppd_outer_join2.q.out (working copy) @@ -18,6 +18,8 @@ Map Reduce Alias -> Map Operator Tree: b + TableScan + alias: b Filter Operator predicate: expr: ((key > '15') and (key < '25')) @@ -37,6 +39,8 @@ expr: value type: string a + TableScan + alias: a Reduce Output Operator key expressions: expr: key @@ -92,7 +96,7 @@ SELECT a.key, a.value, b.key, b.value WHERE a.key > '10' AND a.key < '20' AND b.key > '15' AND b.key < '25' Input: default/src -Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/11935500/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1177070194/10000 150 val_150 150 val_150 152 val_152 152 val_152 152 val_152 152 val_152 Index: ql/src/test/results/clientpositive/join21.q.out =================================================================== --- ql/src/test/results/clientpositive/join21.q.out (revision 796808) +++ ql/src/test/results/clientpositive/join21.q.out (working copy) @@ -13,6 +13,8 @@ Map Reduce Alias -> Map Operator Tree: src2 + TableScan + alias: src2 Filter Operator predicate: expr: (UDFToDouble(key) > UDFToDouble(10)) @@ -36,6 +38,8 @@ expr: value type: string src3 + TableScan + alias: src3 Filter Operator predicate: expr: (UDFToDouble(key) < UDFToDouble(10)) @@ -59,6 +63,8 @@ expr: value type: string src1 + TableScan + alias: src1 Filter Operator predicate: expr: (UDFToDouble(key) < UDFToDouble(10)) @@ -114,7 +120,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/348166588/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1595611609/10002 Reduce Output Operator key expressions: expr: _col0 @@ -160,7 +166,7 @@ query: SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value Input: default/src -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/63858627/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1685415855/10000 NULL NULL NULL NULL 0 val_0 NULL NULL NULL NULL 0 val_0 NULL NULL NULL NULL 0 val_0 Index: ql/src/test/results/clientpositive/groupby2_map.q.out =================================================================== --- ql/src/test/results/clientpositive/groupby2_map.q.out (revision 796808) +++ ql/src/test/results/clientpositive/groupby2_map.q.out (working copy) @@ -14,6 +14,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: key @@ -97,7 +99,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/704787782/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/427094457/10000 0 1 00.0 1 71 116414.0 2 69 225571.0 Index: ql/src/test/results/clientpositive/input26.q.out =================================================================== --- ql/src/test/results/clientpositive/input26.q.out (revision 796808) +++ ql/src/test/results/clientpositive/input26.q.out (working copy) @@ -19,6 +19,8 @@ Map Reduce Alias -> Map Operator Tree: null-subquery1:subq-subquery1:a + TableScan + alias: a Filter Operator predicate: expr: ((ds = '2008-04-08') and (hr = '11')) @@ -65,7 +67,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1656753029/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/683127843/10002 Union Select Operator expressions: @@ -83,7 +85,7 @@ table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1656753029/10003 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/683127843/10003 Union Select Operator expressions: @@ -106,6 +108,8 @@ Map Reduce Alias -> Map Operator Tree: null-subquery2:subq-subquery2:b + TableScan + alias: b Filter Operator predicate: expr: ((ds = '2008-04-08') and (hr = '14')) @@ -158,7 +162,7 @@ select * from srcpart b where b.ds = '2008-04-08' and b.hr = '14' limit 5 )subq Input: default/srcpart/ds=2008-04-08/hr=11 -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1769087452/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/552205019/10000 0 val_0 2008-04-08 11 0 val_0 2008-04-08 11 0 val_0 2008-04-08 11 Index: ql/src/test/results/clientpositive/sample8.q.out =================================================================== --- ql/src/test/results/clientpositive/sample8.q.out (revision 796808) +++ ql/src/test/results/clientpositive/sample8.q.out (working copy) @@ -19,11 +19,15 @@ Map Reduce Alias -> Map Operator Tree: t + TableScan + alias: t Filter Operator + isSamplingPred: false predicate: expr: (((hash(key) & 2147483647) % 10) = 0) type: boolean Filter Operator + isSamplingPred: true predicate: expr: (((hash(key) & 2147483647) % 10) = 0) type: boolean @@ -36,11 +40,15 @@ expr: value type: string s + TableScan + alias: s Filter Operator + isSamplingPred: false predicate: expr: (((((((hash(key) & 2147483647) % 1) = 0) and (ds = '2008-04-08')) and (hr = '11')) and (ds = '2008-04-08')) and (hr = '11')) type: boolean Filter Operator + isSamplingPred: true predicate: expr: (((hash(key) & 2147483647) % 1) = 0) type: boolean @@ -58,12 +66,12 @@ type: string Needs Tagging: true Path -> Alias: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/srcpart/ds=2008-04-09/hr=11 - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/srcpart/ds=2008-04-09/hr=12 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart/ds=2008-04-09/hr=11 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart/ds=2008-04-09/hr=12 Path -> Partition: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 Partition partition values: ds 2008-04-08 @@ -82,10 +90,10 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/srcpart + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: srcpart - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 Partition partition values: ds 2008-04-08 @@ -104,10 +112,10 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/srcpart + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: srcpart - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/srcpart/ds=2008-04-09/hr=11 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart/ds=2008-04-09/hr=11 Partition partition values: ds 2008-04-09 @@ -126,10 +134,10 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/srcpart + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: srcpart - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/srcpart/ds=2008-04-09/hr=12 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart/ds=2008-04-09/hr=12 Partition partition values: ds 2008-04-09 @@ -148,7 +156,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/srcpart + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: srcpart Reduce Operator Tree: @@ -159,6 +167,7 @@ 0 {VALUE._col0} {VALUE._col1} {VALUE._col2} {VALUE._col3} 1 {VALUE._col0} {VALUE._col1} Filter Operator + isSamplingPred: false predicate: expr: ((((((_col4 = _col0) and (_col5 = _col1)) and (_col2 = '2008-04-08')) and (_col3 = '11')) and (_col2 = '2008-04-08')) and (_col3 = '11')) type: boolean @@ -175,7 +184,7 @@ File Output Operator compressed: false GlobalTableId: 0 - directory: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/90130211/10002 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/159516558/10002 table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -187,7 +196,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/90130211/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/159516558/10002 Reduce Output Operator key expressions: expr: _col0 @@ -212,9 +221,9 @@ type: string Needs Tagging: false Path -> Alias: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/90130211/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/159516558/10002 Path -> Partition: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/90130211/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/159516558/10002 Partition input format: org.apache.hadoop.mapred.SequenceFileInputFormat @@ -228,7 +237,7 @@ File Output Operator compressed: false GlobalTableId: 0 - directory: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/90130211/10001 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/159516558/10001 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -252,7 +261,7 @@ Input: default/srcpart/ds=2008-04-08/hr=12 Input: default/srcpart/ds=2008-04-09/hr=11 Input: default/srcpart/ds=2008-04-09/hr=12 -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/320178544/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/186723774/10000 0 val_0 0 val_0 0 val_0 Index: ql/src/test/results/clientpositive/join29.q.out =================================================================== --- ql/src/test/results/clientpositive/join29.q.out (revision 796808) +++ ql/src/test/results/clientpositive/join29.q.out (working copy) @@ -23,6 +23,8 @@ Map Reduce Alias -> Map Operator Tree: subq2:y + TableScan + alias: y Select Operator expressions: expr: key @@ -70,7 +72,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1458390395/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/359066598/10002 Common Join Operator condition map: Inner Join 0 to 1 @@ -116,11 +118,11 @@ Local Work: Map Reduce Local Work Alias -> Map Local Tables: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1458390395/10004 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/359066598/10004 Fetch Operator limit: -1 Alias -> Map Local Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1458390395/10004 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/359066598/10004 Common Join Operator condition map: Inner Join 0 to 1 @@ -170,10 +172,10 @@ Move Operator files: hdfs directory: true - destination: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/633726078/10000 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/118488825/10000 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1458390395/10003 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/359066598/10003 Reduce Output Operator sort order: Map-reduce partition columns: @@ -212,6 +214,8 @@ Map Reduce Alias -> Map Operator Tree: subq1:x + TableScan + alias: x Select Operator expressions: expr: key @@ -266,7 +270,7 @@ Output: default/dest_j1 query: select * from dest_j1 x order by x.key Input: default/dest_j1 -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/275397946/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/955185129/10000 128 1 3 146 1 2 150 1 1 Index: ql/src/test/results/clientpositive/notable_alias1.q.out =================================================================== --- ql/src/test/results/clientpositive/notable_alias1.q.out (revision 796808) +++ ql/src/test/results/clientpositive/notable_alias1.q.out (working copy) @@ -14,6 +14,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Filter Operator predicate: expr: (UDFToDouble(key) < UDFToDouble(100)) @@ -95,7 +97,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/839206894/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1169329818/10000 1234 0 3.0 1234 10 1.0 1234 11 1.0 Index: ql/src/test/results/clientpositive/join1.q.out =================================================================== --- ql/src/test/results/clientpositive/join1.q.out (revision 796808) +++ ql/src/test/results/clientpositive/join1.q.out (working copy) @@ -14,6 +14,8 @@ Map Reduce Alias -> Map Operator Tree: src2 + TableScan + alias: src2 Reduce Output Operator key expressions: expr: key @@ -27,6 +29,8 @@ expr: value type: string src1 + TableScan + alias: src1 Reduce Output Operator key expressions: expr: key @@ -84,7 +88,7 @@ Output: default/dest_j1 query: SELECT dest_j1.* FROM dest_j1 Input: default/dest_j1 -Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1850221773/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2099308840/10000 0 val_0 0 val_0 0 val_0 Index: ql/src/test/results/clientpositive/ppd_multi_insert.q.out =================================================================== --- ql/src/test/results/clientpositive/ppd_multi_insert.q.out (revision 796808) +++ ql/src/test/results/clientpositive/ppd_multi_insert.q.out (working copy) @@ -25,6 +25,8 @@ Map Reduce Alias -> Map Operator Tree: b + TableScan + alias: b Reduce Output Operator key expressions: expr: key @@ -35,6 +37,8 @@ type: string tag: 1 a + TableScan + alias: a Reduce Output Operator key expressions: expr: key @@ -191,7 +195,7 @@ Output: ../build/ql/test/data/warehouse/mi4.out query: SELECT mi1.* FROM mi1 Input: default/mi1 -Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1556379466/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/298303159/10000 0 val_0 0 val_0 0 val_0 @@ -342,7 +346,7 @@ 98 val_98 query: SELECT mi2.* FROM mi2 Input: default/mi2 -Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1335038556/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1899124271/10000 100 val_100 100 val_100 100 val_100 @@ -556,7 +560,7 @@ 199 val_199 query: SELECT mi3.* FROM mi3 Input: default/mi3/ds=2008-04-08/hr=12 -Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/584372656/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/420168064/10000 200 2008-04-08 12 200 2008-04-08 12 200 2008-04-08 12 Index: ql/src/test/results/clientpositive/input6.q.out =================================================================== --- ql/src/test/results/clientpositive/input6.q.out (revision 796808) +++ ql/src/test/results/clientpositive/input6.q.out (working copy) @@ -15,6 +15,8 @@ Map Reduce Alias -> Map Operator Tree: src1 + TableScan + alias: src1 Filter Operator predicate: expr: key is null @@ -44,10 +46,10 @@ Move Operator files: hdfs directory: true - destination: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/1872864364/10000 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/885523704/10000 Map Reduce Alias -> Map Operator Tree: - file:/data/users/pchakka/workspace/oshive/build/ql/tmp/1713625230/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/321434525/10002 Reduce Output Operator sort order: Map-reduce partition columns: @@ -87,4 +89,4 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/1551041536/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/643349639/10000 Index: ql/src/test/results/clientpositive/join9.q.out =================================================================== --- ql/src/test/results/clientpositive/join9.q.out (revision 796808) +++ ql/src/test/results/clientpositive/join9.q.out (working copy) @@ -14,6 +14,8 @@ Map Reduce Alias -> Map Operator Tree: src2 + TableScan + alias: src2 Reduce Output Operator key expressions: expr: key @@ -27,7 +29,10 @@ expr: value type: string src1 + TableScan + alias: src1 Filter Operator + isSamplingPred: false predicate: expr: ((ds = '2008-04-08') and (hr = '12')) type: boolean @@ -49,10 +54,10 @@ type: string Needs Tagging: true Path -> Alias: - file:/Users/char/Documents/workspace/Hive-460/build/ql/test/data/warehouse/src - file:/Users/char/Documents/workspace/Hive-460/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 Path -> Partition: - file:/Users/char/Documents/workspace/Hive-460/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src Partition input format: org.apache.hadoop.mapred.TextInputFormat @@ -67,10 +72,10 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/Users/char/Documents/workspace/Hive-460/build/ql/test/data/warehouse/src + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: src - file:/Users/char/Documents/workspace/Hive-460/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 Partition partition values: ds 2008-04-08 @@ -89,7 +94,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/Users/char/Documents/workspace/Hive-460/build/ql/test/data/warehouse/srcpart + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: srcpart Reduce Operator Tree: @@ -100,6 +105,7 @@ 0 {VALUE._col0} {VALUE._col2} {VALUE._col3} 1 {VALUE._col1} Filter Operator + isSamplingPred: false predicate: expr: ((_col2 = '2008-04-08') and (_col3 = '12')) type: boolean @@ -118,7 +124,7 @@ File Output Operator compressed: false GlobalTableId: 1 - directory: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/856054437/10000 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1401001929/10000 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -132,7 +138,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/Users/char/Documents/workspace/Hive-460/build/ql/test/data/warehouse/dest1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest1 @@ -140,7 +146,7 @@ Move Operator tables: replace: true - source: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/856054437/10000 + source: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1401001929/10000 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -154,10 +160,10 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/Users/char/Documents/workspace/Hive-460/build/ql/test/data/warehouse/dest1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest1 - tmp directory: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/856054437/10001 + tmp directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1401001929/10001 query: FROM srcpart src1 JOIN src src2 ON (src1.key = src2.key) @@ -167,7 +173,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/2105971410/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1868345057/10000 0 val_0 0 val_0 0 val_0 Index: ql/src/test/results/clientpositive/udf_split.q.out =================================================================== --- ql/src/test/results/clientpositive/udf_split.q.out (revision 796808) +++ ql/src/test/results/clientpositive/udf_split.q.out (working copy) @@ -15,6 +15,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: SPLIT('a b c', ' ') @@ -42,5 +44,5 @@ split('', '.') FROM src LIMIT 1 Input: default/src -Output: file:/data/users/emil/hive1/hive1/build/ql/tmp/6715761/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1198612781/10000 ["a","b","c"] ["one","two","three"] [] Index: ql/src/test/results/clientpositive/rand_partitionpruner2.q.out =================================================================== --- ql/src/test/results/clientpositive/rand_partitionpruner2.q.out (revision 796808) +++ ql/src/test/results/clientpositive/rand_partitionpruner2.q.out (working copy) @@ -17,7 +17,10 @@ Map Reduce Alias -> Map Operator Tree: a + TableScan + alias: a Filter Operator + isSamplingPred: false predicate: expr: ((rand(UDFToLong(1)) < 0.1) and (ds = '2008-04-08')) type: boolean @@ -34,7 +37,7 @@ File Output Operator compressed: false GlobalTableId: 1 - directory: file:/data/users/njain/hive4/hive4/build/ql/tmp/1442257033/10002 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/487080999/10002 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -48,15 +51,15 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/njain/hive4/hive4/build/ql/test/data/warehouse/tmptable + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/tmptable serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: tmptable Needs Tagging: false Path -> Alias: - file:/data/users/njain/hive4/hive4/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 - file:/data/users/njain/hive4/hive4/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 Path -> Partition: - file:/data/users/njain/hive4/hive4/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 Partition partition values: ds 2008-04-08 @@ -75,10 +78,10 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/njain/hive4/hive4/build/ql/test/data/warehouse/srcpart + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: srcpart - file:/data/users/njain/hive4/hive4/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 Partition partition values: ds 2008-04-08 @@ -97,7 +100,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/njain/hive4/hive4/build/ql/test/data/warehouse/srcpart + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: srcpart @@ -107,11 +110,11 @@ Move Operator files: hdfs directory: true - source: file:/data/users/njain/hive4/hive4/build/ql/tmp/1442257033/10002 - destination: file:/data/users/njain/hive4/hive4/build/ql/tmp/221347159/10000 + source: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/487080999/10002 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1372291803/10000 Map Reduce Alias -> Map Operator Tree: - file:/data/users/njain/hive4/hive4/build/ql/tmp/1442257033/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/487080999/10002 Reduce Output Operator sort order: Map-reduce partition columns: @@ -129,9 +132,9 @@ type: string Needs Tagging: false Path -> Alias: - file:/data/users/njain/hive4/hive4/build/ql/tmp/1442257033/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/487080999/10002 Path -> Partition: - file:/data/users/njain/hive4/hive4/build/ql/tmp/1442257033/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/487080999/10002 Partition input format: org.apache.hadoop.mapred.TextInputFormat @@ -146,7 +149,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/njain/hive4/hive4/build/ql/test/data/warehouse/tmptable + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/tmptable serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: tmptable Reduce Operator Tree: @@ -154,7 +157,7 @@ File Output Operator compressed: false GlobalTableId: 0 - directory: file:/data/users/njain/hive4/hive4/build/ql/tmp/221347159/10000 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1372291803/10000 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -168,7 +171,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/njain/hive4/hive4/build/ql/test/data/warehouse/tmptable + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/tmptable serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: tmptable @@ -176,7 +179,7 @@ Move Operator tables: replace: true - source: file:/data/users/njain/hive4/hive4/build/ql/tmp/221347159/10000 + source: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1372291803/10000 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -190,10 +193,10 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/njain/hive4/hive4/build/ql/test/data/warehouse/tmptable + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/tmptable serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: tmptable - tmp directory: file:/data/users/njain/hive4/hive4/build/ql/tmp/221347159/10001 + tmp directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1372291803/10001 query: insert overwrite table tmptable @@ -203,7 +206,7 @@ Output: default/tmptable query: select * from tmptable x sort by x.key,x.value,x.ds,x.hr Input: default/tmptable -Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/554052416/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1900239104/10000 103 val_103 2008-04-08 11 103 val_103 2008-04-08 12 133 val_133 2008-04-08 11 Index: ql/src/test/results/clientpositive/union14.q.out =================================================================== --- ql/src/test/results/clientpositive/union14.q.out (revision 796808) +++ ql/src/test/results/clientpositive/union14.q.out (working copy) @@ -20,6 +20,8 @@ Map Reduce Alias -> Map Operator Tree: null-subquery1:unionsrc-subquery1:s2 + TableScan + alias: s2 Select Operator expressions: expr: key @@ -36,7 +38,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1103651888/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/181888554/10002 Union Select Operator expressions: @@ -61,7 +63,7 @@ value expressions: expr: _col1 type: bigint - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1103651888/10003 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/181888554/10003 Union Select Operator expressions: @@ -111,6 +113,8 @@ Map Reduce Alias -> Map Operator Tree: null-subquery2:unionsrc-subquery2:s1 + TableScan + alias: s1 Select Operator Group By Operator aggregations: @@ -151,7 +155,7 @@ unionsrc group by unionsrc.key Input: default/src1 Input: default/src -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/452775957/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/62069757/10000 10 128 1 146 1 Index: ql/src/test/results/clientpositive/binarysortable_1.q.out =================================================================== --- ql/src/test/results/clientpositive/binarysortable_1.q.out (revision 796808) +++ ql/src/test/results/clientpositive/binarysortable_1.q.out (working copy) @@ -22,6 +22,8 @@ Map Reduce Alias -> Map Operator Tree: a:mytable + TableScan + alias: mytable Select Operator expressions: expr: key @@ -86,7 +88,7 @@ GROUP BY key ) a Input: default/mytable -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1653276173/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1471346960/10000 ^@^@^@ 7.0 ^@^A^@ 9.0 ^@test^@ 2.0 Index: ql/src/test/results/clientpositive/groupby4_noskew.q.out =================================================================== --- ql/src/test/results/clientpositive/groupby4_noskew.q.out (revision 796808) +++ ql/src/test/results/clientpositive/groupby4_noskew.q.out (working copy) @@ -14,6 +14,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: key @@ -63,7 +65,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/598700554/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2125282267/10000 0 1 2 Index: ql/src/test/results/clientpositive/udf4.q.out =================================================================== --- ql/src/test/results/clientpositive/udf4.q.out (revision 796808) +++ ql/src/test/results/clientpositive/udf4.q.out (working copy) @@ -16,6 +16,8 @@ Map Reduce Alias -> Map Operator Tree: dest1 + TableScan + alias: dest1 Select Operator expressions: expr: round(1.0) @@ -70,5 +72,5 @@ query: SELECT round(1.0), round(1.5), round(-1.5), floor(1.0), floor(1.5), floor(-1.5), sqrt(1.0), sqrt(-1.0), sqrt(0.0), ceil(1.0), ceil(1.5), ceil(-1.5), ceiling(1.0), rand(3), +3, -3, 1++2, 1+-2, ~1 FROM dest1 Input: default/dest1 -Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1468603599/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/121712717/10000 1 2 -2 1 1 -2 1.0 NULL 0.0 1 2 -1 1 0.731057369148862 3 -3 3 -1 -2 Index: ql/src/test/results/clientpositive/input12.q.out =================================================================== --- ql/src/test/results/clientpositive/input12.q.out (revision 796808) +++ ql/src/test/results/clientpositive/input12.q.out (working copy) @@ -23,6 +23,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Filter Operator predicate: expr: (UDFToDouble(key) < UDFToDouble(100)) @@ -98,10 +100,10 @@ Move Operator files: hdfs directory: true - destination: file:/data/users/njain/hive4/hive4/build/ql/tmp/1470202531/10000 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1346088120/10000 Map Reduce Alias -> Map Operator Tree: - file:/data/users/njain/hive4/hive4/build/ql/tmp/2111408191/10006 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/598213837/10006 Reduce Output Operator sort order: Map-reduce partition columns: @@ -140,10 +142,10 @@ Move Operator files: hdfs directory: true - destination: file:/data/users/njain/hive4/hive4/build/ql/tmp/1470202531/10002 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1346088120/10002 Map Reduce Alias -> Map Operator Tree: - file:/data/users/njain/hive4/hive4/build/ql/tmp/2111408191/10007 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/598213837/10007 Reduce Output Operator sort order: Map-reduce partition columns: @@ -182,10 +184,10 @@ Move Operator files: hdfs directory: true - destination: file:/data/users/njain/hive4/hive4/build/ql/tmp/1470202531/10004 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1346088120/10004 Map Reduce Alias -> Map Operator Tree: - file:/data/users/njain/hive4/hive4/build/ql/tmp/2111408191/10008 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/598213837/10008 Reduce Output Operator sort order: Map-reduce partition columns: @@ -230,7 +232,7 @@ Output: default/dest3/ds=2008-04-08/hr=12 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/81911559/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1547919836/10000 86 val_86 27 val_27 98 val_98 @@ -317,7 +319,7 @@ 97 val_97 query: SELECT dest2.* FROM dest2 Input: default/dest2 -Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/249035470/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1020236871/10000 165 val_165 193 val_193 150 val_150 @@ -425,7 +427,7 @@ 169 val_169 query: SELECT dest3.* FROM dest3 Input: default/dest3/ds=2008-04-08/hr=12 -Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/157820708/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/948579562/10000 238 2008-04-08 12 311 2008-04-08 12 409 2008-04-08 12 Index: ql/src/test/results/clientpositive/join30.q.out =================================================================== --- ql/src/test/results/clientpositive/join30.q.out (revision 796808) +++ ql/src/test/results/clientpositive/join30.q.out (working copy) @@ -16,6 +16,8 @@ Map Reduce Alias -> Map Operator Tree: y + TableScan + alias: y Common Join Operator condition map: Inner Join 0 to 1 @@ -40,6 +42,8 @@ limit: -1 Alias -> Map Local Operator Tree: x + TableScan + alias: x Common Join Operator condition map: Inner Join 0 to 1 @@ -60,7 +64,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1483061275/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2089694964/10002 Select Operator expressions: expr: _col0 @@ -135,7 +139,7 @@ Output: default/dest_j1 query: select * from dest_j1 x order by x.key Input: default/dest_j1 -Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1361140895/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/742811255/10000 66 1 98 2 128 3 Index: ql/src/test/results/clientpositive/join15.q.out =================================================================== --- ql/src/test/results/clientpositive/join15.q.out (revision 796808) +++ ql/src/test/results/clientpositive/join15.q.out (working copy) @@ -13,6 +13,8 @@ Map Reduce Alias -> Map Operator Tree: src2 + TableScan + alias: src2 Reduce Output Operator key expressions: expr: key @@ -28,6 +30,8 @@ expr: value type: string src1 + TableScan + alias: src1 Reduce Output Operator key expressions: expr: key @@ -69,7 +73,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/737821530/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/164069911/10002 Reduce Output Operator key expressions: expr: _col0 @@ -107,7 +111,7 @@ query: SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key) SORT BY src1.key, src1.value, src2.key, src2.value Input: default/src -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1955953451/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1242541031/10000 0 val_0 0 val_0 0 val_0 0 val_0 0 val_0 0 val_0 Index: ql/src/test/results/clientpositive/udf_size.q.out =================================================================== --- ql/src/test/results/clientpositive/udf_size.q.out (revision 796808) +++ ql/src/test/results/clientpositive/udf_size.q.out (working copy) @@ -18,6 +18,8 @@ Map Reduce Alias -> Map Operator Tree: src_thrift + TableScan + alias: src_thrift Filter Operator predicate: expr: (lint is not null and not mstringstring is null) @@ -57,5 +59,5 @@ WHERE src_thrift.lint IS NOT NULL AND NOT (src_thrift.mstringstring IS NULL) LIMIT 1 Input: default/src_thrift -Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/774936511/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1790270948/10000 3 1 1 -1 Index: ql/src/test/results/clientpositive/udf_isnull_isnotnull.q.out =================================================================== --- ql/src/test/results/clientpositive/udf_isnull_isnotnull.q.out (revision 796808) +++ ql/src/test/results/clientpositive/udf_isnull_isnotnull.q.out (working copy) @@ -16,6 +16,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Filter Operator predicate: expr: true is not null @@ -51,7 +53,7 @@ FROM src WHERE true IS NOT NULL LIMIT 1 Input: default/src -Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/1433540979/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1197324321/10000 true true true query: EXPLAIN FROM src_thrift @@ -72,6 +74,8 @@ Map Reduce Alias -> Map Operator Tree: src_thrift + TableScan + alias: src_thrift Filter Operator predicate: expr: (lint is not null and not mstringstring is null) @@ -108,5 +112,5 @@ WHERE src_thrift.lint IS NOT NULL AND NOT (src_thrift.mstringstring IS NULL) LIMIT 1 Input: default/src_thrift -Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/63009813/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/658238398/10000 true true true Index: ql/src/test/results/clientpositive/groupby4.q.out =================================================================== --- ql/src/test/results/clientpositive/groupby4.q.out (revision 796808) +++ ql/src/test/results/clientpositive/groupby4.q.out (working copy) @@ -15,6 +15,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: key @@ -44,7 +46,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/238763710/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1763644153/10002 Reduce Output Operator key expressions: expr: _col0 @@ -90,7 +92,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/705798724/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/930118864/10000 0 1 2 Index: ql/src/test/results/clientpositive/input_part7.q.out =================================================================== --- ql/src/test/results/clientpositive/input_part7.q.out (revision 796808) +++ ql/src/test/results/clientpositive/input_part7.q.out (working copy) @@ -17,11 +17,15 @@ Map Reduce Alias -> Map Operator Tree: null-subquery1:a-subquery1:x + TableScan + alias: x Filter Operator + isSamplingPred: false predicate: expr: ((ds = '2008-04-08') and (UDFToDouble(key) < UDFToDouble(100))) type: boolean Filter Operator + isSamplingPred: false predicate: expr: ((ds = '2008-04-08') and (UDFToDouble(key) < UDFToDouble(100))) type: boolean @@ -62,11 +66,15 @@ expr: _col3 type: string null-subquery2:a-subquery2:y + TableScan + alias: y Filter Operator + isSamplingPred: false predicate: expr: ((ds = '2008-04-08') and (UDFToDouble(key) < UDFToDouble(100))) type: boolean Filter Operator + isSamplingPred: false predicate: expr: ((ds = '2008-04-08') and (UDFToDouble(key) < UDFToDouble(100))) type: boolean @@ -108,10 +116,10 @@ type: string Needs Tagging: false Path -> Alias: - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 Path -> Partition: - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 Partition partition values: ds 2008-04-08 @@ -130,10 +138,10 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/srcpart + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: srcpart - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 Partition partition values: ds 2008-04-08 @@ -152,7 +160,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/srcpart + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: srcpart Reduce Operator Tree: @@ -160,7 +168,7 @@ File Output Operator compressed: false GlobalTableId: 0 - directory: file:/data/users/njain/hive1/hive1/build/ql/tmp/734706041/10001 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/733805114/10001 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -182,7 +190,7 @@ SORT BY A.key Input: default/srcpart/ds=2008-04-08/hr=11 Input: default/srcpart/ds=2008-04-08/hr=12 -Output: file:/data/users/njain/hive1/hive1/build/ql/tmp/2065508017/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1724645590/10000 0 val_0 2008-04-08 11 0 val_0 2008-04-08 11 0 val_0 2008-04-08 11 Index: ql/src/test/results/clientpositive/union7.q.out =================================================================== --- ql/src/test/results/clientpositive/union7.q.out (revision 796808) +++ ql/src/test/results/clientpositive/union7.q.out (working copy) @@ -19,6 +19,8 @@ Map Reduce Alias -> Map Operator Tree: null-subquery1:unionsrc-subquery1:s1 + TableScan + alias: s1 Select Operator Group By Operator aggregations: @@ -51,7 +53,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/694246953/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2059685249/10002 Union Select Operator expressions: @@ -76,7 +78,7 @@ value expressions: expr: _col1 type: bigint - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/694246953/10003 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2059685249/10003 Union Select Operator expressions: @@ -126,6 +128,8 @@ Map Reduce Alias -> Map Operator Tree: null-subquery2:unionsrc-subquery2:s2 + TableScan + alias: s2 Select Operator expressions: expr: key @@ -149,7 +153,7 @@ select s2.key as key, s2.value as value from src1 s2) unionsrc group by unionsrc.key Input: default/src Input: default/src1 -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/615776607/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/48906423/10000 10 128 1 146 1 Index: ql/src/test/results/clientpositive/input3_limit.q.out =================================================================== --- ql/src/test/results/clientpositive/input3_limit.q.out (revision 796808) +++ ql/src/test/results/clientpositive/input3_limit.q.out (working copy) @@ -19,6 +19,8 @@ Map Reduce Alias -> Map Operator Tree: t:t1 + TableScan + alias: t1 Select Operator expressions: expr: key @@ -60,7 +62,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1327788868/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/810934980/10002 Reduce Output Operator sort order: tag: -1 @@ -97,7 +99,7 @@ Output: default/t2 query: SELECT * FROM T2 SORT BY key, value Input: default/t2 -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1102190511/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1402649402/10000 0 val_0 0 val_0 0 val_0 Index: ql/src/test/results/clientpositive/udf_lower.q.out =================================================================== --- ql/src/test/results/clientpositive/udf_lower.q.out (revision 796808) +++ ql/src/test/results/clientpositive/udf_lower.q.out (working copy) @@ -12,6 +12,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Filter Operator predicate: expr: (UDFToDouble(key) = UDFToDouble(86)) @@ -40,5 +42,5 @@ query: SELECT lower('AbC 123'), upper('AbC 123') FROM src WHERE key = 86 Input: default/src -Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/894848839/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1991367378/10000 abc 123 ABC 123 Index: ql/src/test/results/clientpositive/mapreduce2.q.out =================================================================== --- ql/src/test/results/clientpositive/mapreduce2.q.out (revision 796808) +++ ql/src/test/results/clientpositive/mapreduce2.q.out (working copy) @@ -17,6 +17,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: key @@ -90,7 +92,7 @@ Output: default/dest1 query: SELECT * FROM (SELECT dest1.* FROM dest1 DISTRIBUTE BY key SORT BY key, ten, one, value) T Input: default/dest1 -Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/330342098/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/176776924/10000 0 0 0 val_0 0 0 0 val_0 0 0 0 val_0 Index: ql/src/test/results/clientpositive/nullgroup.q.out =================================================================== --- ql/src/test/results/clientpositive/nullgroup.q.out (revision 796808) +++ ql/src/test/results/clientpositive/nullgroup.q.out (working copy) @@ -12,6 +12,8 @@ Map Reduce Alias -> Map Operator Tree: x + TableScan + alias: x Filter Operator predicate: expr: (UDFToDouble(key) > UDFToDouble(9999)) @@ -54,7 +56,7 @@ query: select count(1) from src x where x.key > 9999 Input: default/src -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1008591078/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/957852674/10000 0 query: explain select count(1) from src x where x.key > 9999 @@ -70,6 +72,8 @@ Map Reduce Alias -> Map Operator Tree: x + TableScan + alias: x Filter Operator predicate: expr: (UDFToDouble(key) > UDFToDouble(9999)) @@ -112,7 +116,7 @@ query: select count(1) from src x where x.key > 9999 Input: default/src -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/2013896638/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1585063774/10000 0 query: explain select count(1) from src x where x.key > 9999 @@ -129,6 +133,8 @@ Map Reduce Alias -> Map Operator Tree: x + TableScan + alias: x Filter Operator predicate: expr: (UDFToDouble(key) > UDFToDouble(9999)) @@ -162,7 +168,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1522558889/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/500947693/10002 Reduce Output Operator sort order: tag: -1 @@ -192,7 +198,7 @@ query: select count(1) from src x where x.key > 9999 Input: default/src -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1698315525/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1489463655/10000 0 query: explain select count(1) from src x where x.key > 9999 @@ -208,6 +214,8 @@ Map Reduce Alias -> Map Operator Tree: x + TableScan + alias: x Filter Operator predicate: expr: (UDFToDouble(key) > UDFToDouble(9999)) @@ -246,5 +254,5 @@ query: select count(1) from src x where x.key > 9999 Input: default/src -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1010160157/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/622486369/10000 0 Index: ql/src/test/results/clientpositive/input21.q.out =================================================================== --- ql/src/test/results/clientpositive/input21.q.out (revision 796808) +++ ql/src/test/results/clientpositive/input21.q.out (working copy) @@ -14,6 +14,8 @@ Map Reduce Alias -> Map Operator Tree: src_null + TableScan + alias: src_null Select Operator expressions: expr: a @@ -58,7 +60,7 @@ query: SELECT * FROM src_null DISTRIBUTE BY c SORT BY d Input: default/src_null -Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/828690607/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/831753725/10000 1.0 1 same 0 1.0 1 same 1 1.0 1 same 2 Index: ql/src/test/results/clientpositive/sample3.q.out =================================================================== --- ql/src/test/results/clientpositive/sample3.q.out (revision 796808) +++ ql/src/test/results/clientpositive/sample3.q.out (working copy) @@ -14,6 +14,8 @@ Map Reduce Alias -> Map Operator Tree: s + TableScan + alias: s Filter Operator predicate: expr: (((hash(key) & 2147483647) % 5) = 0) @@ -41,7 +43,7 @@ query: SELECT s.key FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 5 on key) s SORT BY key Input: default/srcbucket -Output: file:/Users/rmurthy/workspace/hive/build/ql/tmp/98452558/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/236556747/10000 0 0 0 Index: ql/src/test/results/clientpositive/groupby2_limit.q.out =================================================================== --- ql/src/test/results/clientpositive/groupby2_limit.q.out (revision 796808) +++ ql/src/test/results/clientpositive/groupby2_limit.q.out (working copy) @@ -12,6 +12,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: key @@ -66,7 +68,7 @@ query: SELECT src.key, sum(substr(src.value,5)) FROM src GROUP BY src.key LIMIT 5 Input: default/src -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/116834924/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/541825758/10000 0 0.0 10 10.0 100 200.0 Index: ql/src/test/results/clientpositive/groupby7_map.q.out =================================================================== --- ql/src/test/results/clientpositive/groupby7_map.q.out (revision 796808) +++ ql/src/test/results/clientpositive/groupby7_map.q.out (working copy) @@ -18,6 +18,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: key @@ -104,7 +106,7 @@ Stage: Stage-3 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/183709519/10004 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/464071059/10004 Reduce Output Operator key expressions: expr: _col0 @@ -165,7 +167,7 @@ Output: default/dest2 query: SELECT DEST1.* FROM DEST1 Input: default/dest1 -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1600502847/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/512897748/10000 0 0.0 10 10.0 100 200.0 @@ -477,7 +479,7 @@ 98 196.0 query: SELECT DEST2.* FROM DEST2 Input: default/dest2 -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1252175276/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/782299998/10000 0 0.0 10 10.0 100 200.0 Index: ql/src/test/results/clientpositive/input_lazyserde.q.out =================================================================== --- ql/src/test/results/clientpositive/input_lazyserde.q.out (revision 796808) +++ ql/src/test/results/clientpositive/input_lazyserde.q.out (working copy) @@ -20,6 +20,8 @@ Map Reduce Alias -> Map Operator Tree: src_thrift + TableScan + alias: src_thrift Select Operator expressions: expr: lint @@ -77,7 +79,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 DISTRIBUTE BY 1 Input: default/dest1 -Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/106661482/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/263175439/10000 [0,0,0] ["0","0","0"] {"key_0":"value_0"} 1712634731 record_0 [1,2,3] ["10","100","1000"] {"key_1":"value_1"} 465985200 record_1 [2,4,6] ["20","200","2000"] {"key_2":"value_2"} -751827638 record_2 @@ -91,7 +93,7 @@ null null null 0 NULL query: SELECT dest1.a[0], dest1.b[0], dest1.c['key2'], dest1.d, dest1.e FROM dest1 DISTRIBUTE BY 1 Input: default/dest1 -Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/1493135425/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/309526870/10000 0 0 NULL 1712634731 record_0 1 10 NULL 465985200 record_1 2 20 NULL -751827638 record_2 Index: ql/src/test/results/clientpositive/cluster.q.out =================================================================== --- ql/src/test/results/clientpositive/cluster.q.out (revision 796808) +++ ql/src/test/results/clientpositive/cluster.q.out (working copy) @@ -12,6 +12,8 @@ Map Reduce Alias -> Map Operator Tree: x + TableScan + alias: x Filter Operator predicate: expr: (UDFToDouble(key) = UDFToDouble(10)) @@ -56,7 +58,7 @@ query: SELECT * FROM SRC x where x.key = 10 CLUSTER BY x.key Input: default/src -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1336816777/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/716009609/10000 10 val_10 query: EXPLAIN SELECT * FROM SRC x where x.key = 20 CLUSTER BY key @@ -72,6 +74,8 @@ Map Reduce Alias -> Map Operator Tree: x + TableScan + alias: x Filter Operator predicate: expr: (UDFToDouble(key) = UDFToDouble(20)) @@ -116,7 +120,7 @@ query: SELECT * FROM SRC x where x.key = 20 CLUSTER BY key Input: default/src -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1206369948/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2027713669/10000 20 val_20 query: EXPLAIN SELECT x.* FROM SRC x where x.key = 20 CLUSTER BY key @@ -132,6 +136,8 @@ Map Reduce Alias -> Map Operator Tree: x + TableScan + alias: x Filter Operator predicate: expr: (UDFToDouble(key) = UDFToDouble(20)) @@ -176,7 +182,7 @@ query: SELECT x.* FROM SRC x where x.key = 20 CLUSTER BY key Input: default/src -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/713208689/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/979207947/10000 20 val_20 query: EXPLAIN SELECT x.* FROM SRC x where x.key = 20 CLUSTER BY x.key @@ -192,6 +198,8 @@ Map Reduce Alias -> Map Operator Tree: x + TableScan + alias: x Filter Operator predicate: expr: (UDFToDouble(key) = UDFToDouble(20)) @@ -236,7 +244,7 @@ query: SELECT x.* FROM SRC x where x.key = 20 CLUSTER BY x.key Input: default/src -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1437391240/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2059429973/10000 20 val_20 query: EXPLAIN SELECT x.key, x.value as v1 FROM SRC x where x.key = 20 CLUSTER BY key @@ -252,6 +260,8 @@ Map Reduce Alias -> Map Operator Tree: x + TableScan + alias: x Filter Operator predicate: expr: (UDFToDouble(key) = UDFToDouble(20)) @@ -296,7 +306,7 @@ query: SELECT x.key, x.value as v1 FROM SRC x where x.key = 20 CLUSTER BY key Input: default/src -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1307359164/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1344610963/10000 20 val_20 query: EXPLAIN SELECT x.key, x.value as v1 FROM SRC x where x.key = 20 CLUSTER BY x.key @@ -312,6 +322,8 @@ Map Reduce Alias -> Map Operator Tree: x + TableScan + alias: x Filter Operator predicate: expr: (UDFToDouble(key) = UDFToDouble(20)) @@ -356,7 +368,7 @@ query: SELECT x.key, x.value as v1 FROM SRC x where x.key = 20 CLUSTER BY x.key Input: default/src -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/947798612/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/489550395/10000 20 val_20 query: EXPLAIN SELECT x.key, x.value as v1 FROM SRC x where x.key = 20 CLUSTER BY v1 @@ -372,6 +384,8 @@ Map Reduce Alias -> Map Operator Tree: x + TableScan + alias: x Filter Operator predicate: expr: (UDFToDouble(key) = UDFToDouble(20)) @@ -416,7 +430,7 @@ query: SELECT x.key, x.value as v1 FROM SRC x where x.key = 20 CLUSTER BY v1 Input: default/src -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1402063423/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/111570777/10000 20 val_20 query: EXPLAIN SELECT y.* from (SELECT x.* FROM SRC x CLUSTER BY x.key) y where y.key = 20 @@ -432,6 +446,8 @@ Map Reduce Alias -> Map Operator Tree: y:x + TableScan + alias: x Select Operator expressions: expr: key @@ -478,7 +494,7 @@ query: SELECT y.* from (SELECT x.* FROM SRC x CLUSTER BY x.key) y where y.key = 20 Input: default/src -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1233375226/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2140354483/10000 20 val_20 query: EXPLAIN SELECT x.key, x.value as v1, y.key FROM SRC x JOIN SRC y ON (x.key = y.key) where x.key = 20 CLUSTER BY v1 @@ -495,6 +511,8 @@ Map Reduce Alias -> Map Operator Tree: y + TableScan + alias: y Reduce Output Operator key expressions: expr: key @@ -508,6 +526,8 @@ expr: key type: string x + TableScan + alias: x Filter Operator predicate: expr: (UDFToDouble(key) = UDFToDouble(20)) @@ -555,7 +575,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/16836039/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/725681406/10002 Reduce Output Operator key expressions: expr: _col1 @@ -588,7 +608,7 @@ query: SELECT x.key, x.value as v1, y.key FROM SRC x JOIN SRC y ON (x.key = y.key) where x.key = 20 CLUSTER BY v1 Input: default/src -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/660526747/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1629904339/10000 20 val_20 20 query: EXPLAIN SELECT x.key, x.value as v1, y.* FROM SRC x JOIN SRC y ON (x.key = y.key) where x.key = 20 CLUSTER BY v1 @@ -605,6 +625,8 @@ Map Reduce Alias -> Map Operator Tree: y + TableScan + alias: y Reduce Output Operator key expressions: expr: key @@ -620,6 +642,8 @@ expr: value type: string x + TableScan + alias: x Filter Operator predicate: expr: (UDFToDouble(key) = UDFToDouble(20)) @@ -669,7 +693,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/175821501/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/361676339/10002 Reduce Output Operator key expressions: expr: _col1 @@ -704,7 +728,7 @@ query: SELECT x.key, x.value as v1, y.* FROM SRC x JOIN SRC y ON (x.key = y.key) where x.key = 20 CLUSTER BY v1 Input: default/src -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/184483146/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1630302004/10000 20 val_20 20 val_20 query: EXPLAIN SELECT x.key, x.value as v1, y.* FROM SRC x JOIN SRC y ON (x.key = y.key) where x.key = 20 CLUSTER BY x.key @@ -721,6 +745,8 @@ Map Reduce Alias -> Map Operator Tree: y + TableScan + alias: y Reduce Output Operator key expressions: expr: key @@ -736,6 +762,8 @@ expr: value type: string x + TableScan + alias: x Filter Operator predicate: expr: (UDFToDouble(key) = UDFToDouble(20)) @@ -785,7 +813,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/2009257788/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/895915036/10002 Reduce Output Operator key expressions: expr: _col0 @@ -820,7 +848,7 @@ query: SELECT x.key, x.value as v1, y.* FROM SRC x JOIN SRC y ON (x.key = y.key) where x.key = 20 CLUSTER BY x.key Input: default/src -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/42096747/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/99691041/10000 20 val_20 20 val_20 query: EXPLAIN SELECT x.key, x.value as v1, y.key as yk FROM SRC x JOIN SRC y ON (x.key = y.key) where x.key = 20 CLUSTER BY key @@ -837,6 +865,8 @@ Map Reduce Alias -> Map Operator Tree: y + TableScan + alias: y Reduce Output Operator key expressions: expr: key @@ -850,6 +880,8 @@ expr: key type: string x + TableScan + alias: x Filter Operator predicate: expr: (UDFToDouble(key) = UDFToDouble(20)) @@ -897,7 +929,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1536031199/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/538868349/10002 Reduce Output Operator key expressions: expr: _col0 @@ -930,7 +962,7 @@ query: SELECT x.key, x.value as v1, y.key as yk FROM SRC x JOIN SRC y ON (x.key = y.key) where x.key = 20 CLUSTER BY key Input: default/src -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/2048031998/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/833082864/10000 20 val_20 20 query: EXPLAIN SELECT unioninput.* @@ -952,6 +984,8 @@ Map Reduce Alias -> Map Operator Tree: null-subquery1:unioninput-subquery1:src + TableScan + alias: src Filter Operator predicate: expr: (UDFToDouble(key) < UDFToDouble(100)) @@ -988,6 +1022,8 @@ expr: _col1 type: string null-subquery2:unioninput-subquery2:src + TableScan + alias: src Filter Operator predicate: expr: (UDFToDouble(key) > UDFToDouble(100)) @@ -1036,7 +1072,6 @@ Fetch Operator limit: -1 - query: SELECT unioninput.* FROM ( FROM src select src.key, src.value WHERE src.key < 100 @@ -1045,7 +1080,7 @@ ) unioninput CLUSTER BY unioninput.key Input: default/src -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1573169134/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1209518069/10000 0 val_0 0 val_0 0 val_0 Index: ql/src/test/results/clientpositive/join4.q.out =================================================================== --- ql/src/test/results/clientpositive/join4.q.out (revision 796808) +++ ql/src/test/results/clientpositive/join4.q.out (working copy) @@ -25,6 +25,8 @@ Map Reduce Alias -> Map Operator Tree: c:a:src1 + TableScan + alias: src1 Filter Operator predicate: expr: ((UDFToDouble(key) > UDFToDouble(10)) and (UDFToDouble(key) < UDFToDouble(20))) @@ -54,6 +56,8 @@ expr: _col1 type: string c:b:src2 + TableScan + alias: src2 Filter Operator predicate: expr: ((UDFToDouble(key) > UDFToDouble(15)) and (UDFToDouble(key) < UDFToDouble(25))) @@ -156,7 +160,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/1249751241/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1481069683/10000 11 val_11 NULL NULL 12 val_12 NULL NULL 12 val_12 NULL NULL Index: ql/src/test/results/clientpositive/input_testxpath3.q.out =================================================================== --- ql/src/test/results/clientpositive/input_testxpath3.q.out (revision 796808) +++ ql/src/test/results/clientpositive/input_testxpath3.q.out (working copy) @@ -13,6 +13,8 @@ Map Reduce Alias -> Map Operator Tree: src_thrift + TableScan + alias: src_thrift Select Operator expressions: expr: mstringstring['key_9'] @@ -34,7 +36,7 @@ query: FROM src_thrift SELECT src_thrift.mstringstring['key_9'], src_thrift.lintstring.myint Input: default/src_thrift -Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/91336275/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/95774113/10000 NULL [0] NULL [1] NULL [4] Index: ql/src/test/results/clientpositive/input_dynamicserde.q.out =================================================================== --- ql/src/test/results/clientpositive/input_dynamicserde.q.out (revision 796808) +++ ql/src/test/results/clientpositive/input_dynamicserde.q.out (working copy) @@ -21,6 +21,8 @@ Map Reduce Alias -> Map Operator Tree: src_thrift + TableScan + alias: src_thrift Select Operator expressions: expr: lint @@ -48,10 +50,10 @@ Move Operator files: hdfs directory: true - destination: file:/data/users/njain/hive4/hive4/build/ql/tmp/37598850/10000 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/968191726/10000 Map Reduce Alias -> Map Operator Tree: - file:/data/users/njain/hive4/hive4/build/ql/tmp/781176832/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1962568978/10002 Reduce Output Operator sort order: Map-reduce partition columns: @@ -97,7 +99,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/1344796114/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/399697181/10000 [0,0,0] ["0","0","0"] {"key_0":"value_0"} 1712634731 record_0 [1,2,3] ["10","100","1000"] {"key_1":"value_1"} 465985200 record_1 [2,4,6] ["20","200","2000"] {"key_2":"value_2"} -751827638 record_2 @@ -111,7 +113,7 @@ null null null 0 NULL query: SELECT dest1.a[0], dest1.b[0], dest1.c['key2'], dest1.d, dest1.e FROM dest1 Input: default/dest1 -Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/1508414099/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/630011187/10000 0 0 NULL 1712634731 record_0 1 10 NULL 465985200 record_1 2 20 NULL -751827638 record_2 Index: ql/src/test/results/clientpositive/input9.q.out =================================================================== --- ql/src/test/results/clientpositive/input9.q.out (revision 796808) +++ ql/src/test/results/clientpositive/input9.q.out (working copy) @@ -15,6 +15,8 @@ Map Reduce Alias -> Map Operator Tree: src1 + TableScan + alias: src1 Filter Operator predicate: expr: (null = null) @@ -50,10 +52,10 @@ Move Operator files: hdfs directory: true - destination: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/1990045485/10000 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1094291853/10000 Map Reduce Alias -> Map Operator Tree: - file:/data/users/pchakka/workspace/oshive/build/ql/tmp/120431399/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/652070848/10002 Reduce Output Operator sort order: Map-reduce partition columns: @@ -93,4 +95,4 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/843563761/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/500505633/10000 Index: ql/src/test/results/clientpositive/union17.q.out =================================================================== --- ql/src/test/results/clientpositive/union17.q.out (revision 796808) +++ ql/src/test/results/clientpositive/union17.q.out (working copy) @@ -32,6 +32,8 @@ Map Reduce Alias -> Map Operator Tree: null-subquery1:unionsrc-subquery1:s1 + TableScan + alias: s1 Select Operator Group By Operator aggregations: @@ -64,7 +66,7 @@ Stage: Stage-3 Map Reduce Alias -> Map Operator Tree: - file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/build/ql/tmp/575000555/10004 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/318648352/10004 Union Reduce Output Operator key expressions: @@ -80,7 +82,7 @@ type: string expr: _col1 type: string - file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/build/ql/tmp/575000555/10007 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/318648352/10007 Union Reduce Output Operator key expressions: @@ -130,7 +132,7 @@ Stage: Stage-4 Map Reduce Alias -> Map Operator Tree: - file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/build/ql/tmp/575000555/10005 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/318648352/10005 Reduce Output Operator key expressions: expr: _col0 @@ -179,7 +181,7 @@ Stage: Stage-5 Map Reduce Alias -> Map Operator Tree: - file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/build/ql/tmp/575000555/10006 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/318648352/10006 Reduce Output Operator key expressions: expr: _col0 @@ -237,6 +239,8 @@ Map Reduce Alias -> Map Operator Tree: null-subquery2:unionsrc-subquery2:s2 + TableScan + alias: s2 Select Operator expressions: expr: key @@ -261,7 +265,7 @@ Output: default/dest2 query: SELECT DEST1.* FROM DEST1 Input: default/dest1 -Output: file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/build/ql/tmp/401548488/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1776954528/10000 0 1 10 1 100 1 @@ -574,7 +578,7 @@ tst1 1 query: SELECT DEST2.* FROM DEST2 Input: default/dest2 -Output: file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/build/ql/tmp/1820185235/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1726677858/10000 0 val_0 1 10 val_10 1 100 val_100 1 Index: ql/src/test/results/clientpositive/join10.q.out =================================================================== --- ql/src/test/results/clientpositive/join10.q.out (revision 796808) +++ ql/src/test/results/clientpositive/join10.q.out (working copy) @@ -16,6 +16,8 @@ Map Reduce Alias -> Map Operator Tree: x:src + TableScan + alias: src Select Operator expressions: expr: key @@ -30,6 +32,8 @@ type: string tag: 0 y:src + TableScan + alias: src Select Operator expressions: expr: key @@ -82,7 +86,7 @@ ON (x.key = Y.key) SELECT Y.* Input: default/src -Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/576477959/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/248008326/10000 0 val_0 0 val_0 0 val_0 Index: ql/src/test/results/clientpositive/input30.q.out =================================================================== --- ql/src/test/results/clientpositive/input30.q.out (revision 796808) +++ ql/src/test/results/clientpositive/input30.q.out (working copy) @@ -17,6 +17,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Filter Operator predicate: expr: (((hash(rand(UDFToLong(460476415))) & 2147483647) % 32) = 0) @@ -71,7 +73,7 @@ Output: default/tst_dest30 query: select * from tst_dest30 Input: default/tst_dest30 -Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/1511106156/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/36498263/10000 18 query: drop table tst_dest30 query: drop table dest30 Index: ql/src/test/results/clientpositive/join33.q.out =================================================================== --- ql/src/test/results/clientpositive/join33.q.out (revision 796808) +++ ql/src/test/results/clientpositive/join33.q.out (working copy) @@ -17,6 +17,8 @@ Map Reduce Alias -> Map Operator Tree: y + TableScan + alias: y Common Join Operator condition map: Inner Join 0 to 1 @@ -30,7 +32,7 @@ File Output Operator compressed: false GlobalTableId: 0 - directory: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1966985224/10002 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1562783808/10002 table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -46,6 +48,8 @@ limit: -1 Alias -> Map Local Operator Tree: x + TableScan + alias: x Common Join Operator condition map: Inner Join 0 to 1 @@ -59,7 +63,7 @@ File Output Operator compressed: false GlobalTableId: 0 - directory: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1966985224/10002 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1562783808/10002 table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -69,9 +73,9 @@ escape.delim \ Needs Tagging: false Path -> Alias: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src Path -> Partition: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src Partition input format: org.apache.hadoop.mapred.TextInputFormat @@ -86,7 +90,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: src @@ -94,15 +98,20 @@ Map Reduce Alias -> Map Operator Tree: z + TableScan + alias: z Filter Operator + isSamplingPred: false predicate: expr: ((ds = '2008-04-08') and (UDFToDouble(hr) = UDFToDouble(11))) type: boolean Filter Operator + isSamplingPred: false predicate: expr: (ds = '2008-04-08') type: boolean Filter Operator + isSamplingPred: false predicate: expr: (UDFToDouble(hr) = UDFToDouble(11)) type: boolean @@ -118,7 +127,7 @@ value expressions: expr: value type: string - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1966985224/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1562783808/10002 Select Operator expressions: expr: _col0 @@ -143,10 +152,10 @@ type: string Needs Tagging: true Path -> Alias: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1966985224/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1562783808/10002 Path -> Partition: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 Partition partition values: ds 2008-04-08 @@ -165,10 +174,10 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/srcpart + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: srcpart - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1966985224/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1562783808/10002 Partition input format: org.apache.hadoop.mapred.SequenceFileInputFormat @@ -195,7 +204,7 @@ File Output Operator compressed: false GlobalTableId: 1 - directory: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/775185405/10000 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1180777922/10000 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -209,7 +218,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/dest_j1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest_j1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest_j1 @@ -217,7 +226,7 @@ Move Operator tables: replace: true - source: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/775185405/10000 + source: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1180777922/10000 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -231,10 +240,10 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/dest_j1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest_j1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest_j1 - tmp directory: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/775185405/10001 + tmp directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1180777922/10001 query: INSERT OVERWRITE TABLE dest_j1 @@ -247,7 +256,7 @@ Output: default/dest_j1 query: select * from dest_j1 x order by x.key Input: default/dest_j1 -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/406645989/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/896369189/10000 146 val_146 val_146 146 val_146 val_146 146 val_146 val_146 Index: ql/src/test/results/clientpositive/udf7.q.out =================================================================== --- ql/src/test/results/clientpositive/udf7.q.out (revision 796808) +++ ql/src/test/results/clientpositive/udf7.q.out (working copy) @@ -21,6 +21,8 @@ Map Reduce Alias -> Map Operator Tree: dest1 + TableScan + alias: dest1 Select Operator expressions: expr: round(ln(3.0), 12) @@ -92,5 +94,5 @@ POW(2,3), POWER(2,3), POWER(2,-3), POWER(0.5, -3), POWER(4, 0.5), POWER(-1, 0.5), POWER(-1, 2) FROM dest1 Input: default/dest1 -Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/987082819/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/975562559/10000 1.098612288668 NULL NULL 1.098612288668 NULL NULL 1.584962500721 NULL NULL 0.47712125472 NULL NULL 1.584962500721 NULL NULL NULL -1.0 7.389056098931 8.0 8.0 0.125 8.0 2.0 NaN 1.0 Index: ql/src/test/results/clientpositive/udf_locate.q.out =================================================================== --- ql/src/test/results/clientpositive/udf_locate.q.out (revision 796808) +++ ql/src/test/results/clientpositive/udf_locate.q.out (working copy) @@ -29,6 +29,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: locate('abc''abcd') @@ -97,5 +99,5 @@ locate('abc', 'abcd', 'invalid number') FROM src LIMIT 1 Input: default/src -Output: file:/home/zhoumin/hive-trunk/build/ql/tmp/398113161/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1980549946/10000 1 0 2 2 4 4 0 0 2 3 4 2 3 NULL NULL 0 0 Index: ql/src/test/results/clientpositive/input_part2.q.out =================================================================== --- ql/src/test/results/clientpositive/input_part2.q.out (revision 796808) +++ ql/src/test/results/clientpositive/input_part2.q.out (working copy) @@ -19,7 +19,10 @@ Map Reduce Alias -> Map Operator Tree: srcpart + TableScan + alias: srcpart Filter Operator + isSamplingPred: false predicate: expr: (((UDFToDouble(key) < UDFToDouble(100)) and (ds = '2008-04-08')) and (hr = '12')) type: boolean @@ -46,7 +49,7 @@ File Output Operator compressed: false GlobalTableId: 1 - directory: file:/data/users/njain/hive4/hive4/build/ql/tmp/2030218658/10004 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/745571891/10004 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -60,10 +63,11 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/njain/hive4/hive4/build/ql/test/data/warehouse/dest1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest1 Filter Operator + isSamplingPred: false predicate: expr: (((UDFToDouble(key) < UDFToDouble(100)) and (ds = '2008-04-09')) and (hr = '12')) type: boolean @@ -90,7 +94,7 @@ File Output Operator compressed: false GlobalTableId: 2 - directory: file:/data/users/njain/hive4/hive4/build/ql/tmp/2030218658/10005 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/745571891/10005 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -104,15 +108,15 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/njain/hive4/hive4/build/ql/test/data/warehouse/dest2 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest2 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest2 Needs Tagging: false Path -> Alias: - file:/data/users/njain/hive4/hive4/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 - file:/data/users/njain/hive4/hive4/build/ql/test/data/warehouse/srcpart/ds=2008-04-09/hr=12 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart/ds=2008-04-09/hr=12 Path -> Partition: - file:/data/users/njain/hive4/hive4/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 Partition partition values: ds 2008-04-08 @@ -131,10 +135,10 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/njain/hive4/hive4/build/ql/test/data/warehouse/srcpart + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: srcpart - file:/data/users/njain/hive4/hive4/build/ql/test/data/warehouse/srcpart/ds=2008-04-09/hr=12 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart/ds=2008-04-09/hr=12 Partition partition values: ds 2008-04-09 @@ -153,7 +157,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/njain/hive4/hive4/build/ql/test/data/warehouse/srcpart + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: srcpart @@ -163,11 +167,11 @@ Move Operator files: hdfs directory: true - source: file:/data/users/njain/hive4/hive4/build/ql/tmp/2030218658/10004 - destination: file:/data/users/njain/hive4/hive4/build/ql/tmp/1357680318/10000 + source: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/745571891/10004 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2002980606/10000 Map Reduce Alias -> Map Operator Tree: - file:/data/users/njain/hive4/hive4/build/ql/tmp/2030218658/10004 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/745571891/10004 Reduce Output Operator sort order: Map-reduce partition columns: @@ -185,9 +189,9 @@ type: string Needs Tagging: false Path -> Alias: - file:/data/users/njain/hive4/hive4/build/ql/tmp/2030218658/10004 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/745571891/10004 Path -> Partition: - file:/data/users/njain/hive4/hive4/build/ql/tmp/2030218658/10004 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/745571891/10004 Partition input format: org.apache.hadoop.mapred.TextInputFormat @@ -202,7 +206,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/njain/hive4/hive4/build/ql/test/data/warehouse/dest1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest1 Reduce Operator Tree: @@ -210,7 +214,7 @@ File Output Operator compressed: false GlobalTableId: 0 - directory: file:/data/users/njain/hive4/hive4/build/ql/tmp/1357680318/10000 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2002980606/10000 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -224,7 +228,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/njain/hive4/hive4/build/ql/test/data/warehouse/dest1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest1 @@ -232,7 +236,7 @@ Move Operator tables: replace: true - source: file:/data/users/njain/hive4/hive4/build/ql/tmp/1357680318/10000 + source: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2002980606/10000 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -246,10 +250,10 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/njain/hive4/hive4/build/ql/test/data/warehouse/dest1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest1 - tmp directory: file:/data/users/njain/hive4/hive4/build/ql/tmp/1357680318/10001 + tmp directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2002980606/10001 Stage: Stage-8 Conditional Operator @@ -257,11 +261,11 @@ Move Operator files: hdfs directory: true - source: file:/data/users/njain/hive4/hive4/build/ql/tmp/2030218658/10005 - destination: file:/data/users/njain/hive4/hive4/build/ql/tmp/1357680318/10002 + source: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/745571891/10005 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2002980606/10002 Map Reduce Alias -> Map Operator Tree: - file:/data/users/njain/hive4/hive4/build/ql/tmp/2030218658/10005 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/745571891/10005 Reduce Output Operator sort order: Map-reduce partition columns: @@ -279,9 +283,9 @@ type: string Needs Tagging: false Path -> Alias: - file:/data/users/njain/hive4/hive4/build/ql/tmp/2030218658/10005 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/745571891/10005 Path -> Partition: - file:/data/users/njain/hive4/hive4/build/ql/tmp/2030218658/10005 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/745571891/10005 Partition input format: org.apache.hadoop.mapred.TextInputFormat @@ -296,7 +300,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/njain/hive4/hive4/build/ql/test/data/warehouse/dest2 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest2 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest2 Reduce Operator Tree: @@ -304,7 +308,7 @@ File Output Operator compressed: false GlobalTableId: 0 - directory: file:/data/users/njain/hive4/hive4/build/ql/tmp/1357680318/10002 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2002980606/10002 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -318,7 +322,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/njain/hive4/hive4/build/ql/test/data/warehouse/dest2 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest2 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest2 @@ -326,7 +330,7 @@ Move Operator tables: replace: true - source: file:/data/users/njain/hive4/hive4/build/ql/tmp/1357680318/10002 + source: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2002980606/10002 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -340,10 +344,10 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/njain/hive4/hive4/build/ql/test/data/warehouse/dest2 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest2 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest2 - tmp directory: file:/data/users/njain/hive4/hive4/build/ql/tmp/1357680318/10003 + tmp directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2002980606/10003 query: FROM srcpart @@ -355,7 +359,7 @@ Output: default/dest2 query: SELECT dest1.* FROM dest1 sort by key,value,ds,hr Input: default/dest1 -Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/208039155/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/245105907/10000 0 val_0 12 2008-04-08 0 val_0 12 2008-04-08 0 val_0 12 2008-04-08 @@ -442,7 +446,7 @@ 98 val_98 12 2008-04-08 query: SELECT dest2.* FROM dest2 sort by key,value,ds,hr Input: default/dest2 -Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/1604591687/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/613046685/10000 0 val_0 12 2008-04-09 0 val_0 12 2008-04-09 0 val_0 12 2008-04-09 Index: ql/src/test/results/clientpositive/join18.q.out =================================================================== --- ql/src/test/results/clientpositive/join18.q.out (revision 796808) +++ ql/src/test/results/clientpositive/join18.q.out (working copy) @@ -25,6 +25,8 @@ Map Reduce Alias -> Map Operator Tree: b:src2 + TableScan + alias: src2 Select Operator expressions: expr: key @@ -136,6 +138,8 @@ Map Reduce Alias -> Map Operator Tree: a:src1 + TableScan + alias: src1 Select Operator expressions: expr: key @@ -200,7 +204,7 @@ ON (a.key = b.key) Input: default/src1 Input: default/src -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/838858920/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2068890153/10000 NULL NULL 7 0 3 NULL NULL 10 1 NULL NULL Index: ql/src/test/results/clientpositive/union2.q.out =================================================================== --- ql/src/test/results/clientpositive/union2.q.out (revision 796808) +++ ql/src/test/results/clientpositive/union2.q.out (working copy) @@ -15,6 +15,8 @@ Map Reduce Alias -> Map Operator Tree: null-subquery1:unionsrc-subquery1:s1 + TableScan + alias: s1 Select Operator expressions: expr: key @@ -34,6 +36,8 @@ expr: _col0 type: bigint null-subquery2:unionsrc-subquery2:s2 + TableScan + alias: s2 Select Operator expressions: expr: key @@ -76,5 +80,5 @@ query: select count(1) FROM (select s1.key as key, s1.value as value from src s1 UNION ALL select s2.key as key, s2.value as value from src s2) unionsrc Input: default/src -Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/332757438/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1301636976/10000 1000 Index: ql/src/test/results/clientpositive/nullgroup4.q.out =================================================================== --- ql/src/test/results/clientpositive/nullgroup4.q.out (revision 796808) +++ ql/src/test/results/clientpositive/nullgroup4.q.out (working copy) @@ -13,6 +13,8 @@ Map Reduce Alias -> Map Operator Tree: x + TableScan + alias: x Filter Operator predicate: expr: (UDFToDouble(key) = UDFToDouble(9999)) @@ -63,7 +65,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1530804093/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/778785983/10002 Reduce Output Operator sort order: tag: -1 @@ -98,7 +100,7 @@ query: select count(1), count(distinct x.value) from src x where x.key = 9999 Input: default/src -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/429769664/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1151027315/10000 0 0 query: explain select count(1), count(distinct x.value) from src x where x.key = 9999 @@ -114,6 +116,8 @@ Map Reduce Alias -> Map Operator Tree: x + TableScan + alias: x Filter Operator predicate: expr: (UDFToDouble(key) = UDFToDouble(9999)) @@ -171,7 +175,7 @@ query: select count(1), count(distinct x.value) from src x where x.key = 9999 Input: default/src -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1474714748/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1306536032/10000 0 0 query: explain select count(1), count(distinct x.value) from src x where x.key = 9999 @@ -188,6 +192,8 @@ Map Reduce Alias -> Map Operator Tree: x + TableScan + alias: x Filter Operator predicate: expr: (UDFToDouble(key) = UDFToDouble(9999)) @@ -228,7 +234,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1775276557/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/648410491/10002 Reduce Output Operator sort order: tag: -1 @@ -263,7 +269,7 @@ query: select count(1), count(distinct x.value) from src x where x.key = 9999 Input: default/src -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/559124922/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1599369552/10000 0 0 query: explain select count(1), count(distinct x.value) from src x where x.key = 9999 @@ -279,6 +285,8 @@ Map Reduce Alias -> Map Operator Tree: x + TableScan + alias: x Filter Operator predicate: expr: (UDFToDouble(key) = UDFToDouble(9999)) @@ -326,5 +334,5 @@ query: select count(1), count(distinct x.value) from src x where x.key = 9999 Input: default/src -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/2134992556/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1967222176/10000 0 0 Index: ql/src/test/results/clientpositive/ppd_transform.q.out =================================================================== --- ql/src/test/results/clientpositive/ppd_transform.q.out (revision 796808) +++ ql/src/test/results/clientpositive/ppd_transform.q.out (working copy) @@ -18,6 +18,8 @@ Map Reduce Alias -> Map Operator Tree: tmap:src + TableScan + alias: src Select Operator expressions: expr: key @@ -75,7 +77,7 @@ ) tmap SELECT tmap.tkey, tmap.tvalue WHERE tmap.tkey < 100 Input: default/src -Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/882148885/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/365836491/10000 0 val_0 0 val_0 0 val_0 Index: ql/src/test/results/clientpositive/mapreduce5.q.out =================================================================== --- ql/src/test/results/clientpositive/mapreduce5.q.out (revision 796808) +++ ql/src/test/results/clientpositive/mapreduce5.q.out (working copy) @@ -17,6 +17,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: key @@ -90,7 +92,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/1868021425/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1615657982/10000 490 49 0 val_490 491 49 1 val_491 492 49 2 val_492 Index: ql/src/test/results/clientpositive/subq2.q.out =================================================================== --- ql/src/test/results/clientpositive/subq2.q.out (revision 796808) +++ ql/src/test/results/clientpositive/subq2.q.out (working copy) @@ -14,6 +14,8 @@ Map Reduce Alias -> Map Operator Tree: a:b + TableScan + alias: b Filter Operator predicate: expr: (UDFToDouble(key) >= UDFToDouble(90)) @@ -81,7 +83,7 @@ FROM (SELECT b.key as k, count(1) as c FROM src b GROUP BY b.key) a WHERE a.k >= 90 Input: default/src -Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/259421857/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/321041064/10000 100 2 103 2 104 2 Index: ql/src/test/results/clientpositive/udf_instr.q.out =================================================================== --- ql/src/test/results/clientpositive/udf_instr.q.out (revision 796808) +++ ql/src/test/results/clientpositive/udf_instr.q.out (working copy) @@ -25,6 +25,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: instr('abcd''abc') @@ -81,5 +83,5 @@ instr('abcd', null) FROM src LIMIT 1 Input: default/src -Output: file:/home/test/hive-trunk/build/ql/tmp/1662937560/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/505594516/10000 1 0 2 2 0 0 2 3 4 2 3 NULL NULL Index: ql/src/test/results/clientpositive/groupby3_noskew.q.out =================================================================== --- ql/src/test/results/clientpositive/groupby3_noskew.q.out (revision 796808) +++ ql/src/test/results/clientpositive/groupby3_noskew.q.out (working copy) @@ -14,6 +14,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: value @@ -83,5 +85,5 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1412035042/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1148140043/10000 130091.0 260.182 256.10355987055016 98.0 0.0 Index: ql/src/test/results/clientpositive/ppd1.q.out =================================================================== --- ql/src/test/results/clientpositive/ppd1.q.out (revision 796808) +++ ql/src/test/results/clientpositive/ppd1.q.out (working copy) @@ -12,6 +12,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Filter Operator predicate: expr: (key > '2') @@ -38,7 +40,7 @@ query: SELECT src.key as c3 from src where src.key > '2' Input: default/src -Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/529404035/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1907456947/10000 238 86 311 Index: ql/src/test/results/clientpositive/input24.q.out =================================================================== --- ql/src/test/results/clientpositive/input24.q.out (revision 796808) +++ ql/src/test/results/clientpositive/input24.q.out (working copy) @@ -15,6 +15,8 @@ Map Reduce Alias -> Map Operator Tree: x + TableScan + alias: x Filter Operator predicate: expr: (d = '2009-01-01') @@ -57,6 +59,6 @@ query: select count(1) from tst x where x.d='2009-01-01' Input: default/tst/d=2009-01-01 -Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/1480756599/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1417043373/10000 0 query: drop table tst Index: ql/src/test/results/clientpositive/groupby8_map_skew.q.out =================================================================== --- ql/src/test/results/clientpositive/groupby8_map_skew.q.out (revision 796808) +++ ql/src/test/results/clientpositive/groupby8_map_skew.q.out (working copy) @@ -19,6 +19,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Reduce Output Operator key expressions: expr: substr(value, 5) @@ -63,7 +65,7 @@ Stage: Stage-3 Map Reduce Alias -> Map Operator Tree: - file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/build/ql/tmp/2105051611/10004 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1764357625/10004 Reduce Output Operator key expressions: expr: _col0 @@ -118,7 +120,7 @@ Stage: Stage-4 Map Reduce Alias -> Map Operator Tree: - file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/build/ql/tmp/2105051611/10005 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1764357625/10005 Reduce Output Operator key expressions: expr: _col0 @@ -179,7 +181,7 @@ Output: default/dest2 query: SELECT DEST1.* FROM DEST1 Input: default/dest1 -Output: file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/build/ql/tmp/1046151185/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/434581602/10000 0 1 10 1 100 1 @@ -491,7 +493,7 @@ 98 1 query: SELECT DEST2.* FROM DEST2 Input: default/dest2 -Output: file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/build/ql/tmp/236348894/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/147304840/10000 0 1 10 1 100 1 Index: ql/src/test/results/clientpositive/implicit_cast1.q.out =================================================================== --- ql/src/test/results/clientpositive/implicit_cast1.q.out (revision 796808) +++ ql/src/test/results/clientpositive/implicit_cast1.q.out (working copy) @@ -15,6 +15,8 @@ Map Reduce Alias -> Map Operator Tree: implicit_test1 + TableScan + alias: implicit_test1 Filter Operator predicate: expr: (UDFToDouble(a) <> UDFToDouble(0)) @@ -45,5 +47,5 @@ FROM implicit_test1 WHERE implicit_test1.a <> 0 Input: default/implicit_test1 -Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/351758098/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/192469539/10000 query: DROP TABLE implicit_test1 Index: ql/src/test/results/clientpositive/sample6.q.out =================================================================== --- ql/src/test/results/clientpositive/sample6.q.out (revision 796808) +++ ql/src/test/results/clientpositive/sample6.q.out (working copy) @@ -16,11 +16,15 @@ Map Reduce Alias -> Map Operator Tree: s + TableScan + alias: s Filter Operator + isSamplingPred: false predicate: expr: (((hash(key) & 2147483647) % 4) = 0) type: boolean Filter Operator + isSamplingPred: true predicate: expr: (((hash(key) & 2147483647) % 4) = 0) type: boolean @@ -33,7 +37,7 @@ File Output Operator compressed: false GlobalTableId: 1 - directory: file:/Users/rmurthy/workspace/hive/build/ql/tmp/173941422/10002 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1595752877/10002 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -47,14 +51,14 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/Users/rmurthy/workspace/hive/build/ql/test/data/warehouse/dest1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest1 Needs Tagging: false Path -> Alias: - file:/Users/rmurthy/workspace/hive/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt Path -> Partition: - file:/Users/rmurthy/workspace/hive/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt Partition input format: org.apache.hadoop.mapred.TextInputFormat @@ -70,7 +74,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/Users/rmurthy/workspace/hive/build/ql/test/data/warehouse/srcbucket + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcbucket serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: srcbucket @@ -80,11 +84,11 @@ Move Operator files: hdfs directory: true - source: file:/Users/rmurthy/workspace/hive/build/ql/tmp/173941422/10002 - destination: file:/Users/rmurthy/workspace/hive/build/ql/tmp/1903663728/10000 + source: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1595752877/10002 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1668697874/10000 Map Reduce Alias -> Map Operator Tree: - file:/Users/rmurthy/workspace/hive/build/ql/tmp/173941422/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1595752877/10002 Reduce Output Operator sort order: Map-reduce partition columns: @@ -98,9 +102,9 @@ type: string Needs Tagging: false Path -> Alias: - file:/Users/rmurthy/workspace/hive/build/ql/tmp/173941422/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1595752877/10002 Path -> Partition: - file:/Users/rmurthy/workspace/hive/build/ql/tmp/173941422/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1595752877/10002 Partition input format: org.apache.hadoop.mapred.TextInputFormat @@ -115,7 +119,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/Users/rmurthy/workspace/hive/build/ql/test/data/warehouse/dest1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest1 Reduce Operator Tree: @@ -123,7 +127,7 @@ File Output Operator compressed: false GlobalTableId: 0 - directory: file:/Users/rmurthy/workspace/hive/build/ql/tmp/1903663728/10000 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1668697874/10000 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -136,8 +140,8 @@ bucket_count -1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/Users/rmurthy/workspace/hive/build/ql/test/data/warehouse/dest1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest1 @@ -145,7 +149,7 @@ Move Operator tables: replace: true - source: file:/Users/rmurthy/workspace/hive/build/ql/tmp/1903663728/10000 + source: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1668697874/10000 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -159,10 +163,10 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/Users/rmurthy/workspace/hive/build/ql/test/data/warehouse/dest1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest1 - tmp directory: file:/Users/rmurthy/workspace/hive/build/ql/tmp/1903663728/10001 + tmp directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1668697874/10001 query: INSERT OVERWRITE TABLE dest1 SELECT s.* @@ -171,7 +175,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/Users/rmurthy/workspace/hive/build/ql/tmp/607325452/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1475320890/10000 468 val_469 272 val_273 448 val_449 Index: ql/src/test/results/clientpositive/join_hive_626.q.out =================================================================== --- ql/src/test/results/clientpositive/join_hive_626.q.out (revision 796808) +++ ql/src/test/results/clientpositive/join_hive_626.q.out (working copy) @@ -28,6 +28,8 @@ Map Reduce Alias -> Map Operator Tree: hive_foo + TableScan + alias: hive_foo Reduce Output Operator key expressions: expr: foo_id @@ -41,6 +43,8 @@ expr: foo_name type: string hive_bar + TableScan + alias: hive_bar Reduce Output Operator key expressions: expr: foo_id @@ -88,6 +92,8 @@ expr: _col10 type: string hive_count + TableScan + alias: hive_count Reduce Output Operator key expressions: expr: bar_id @@ -132,7 +138,7 @@ Input: default/hive_foo Input: default/hive_count Input: default/hive_bar -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/677923597/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1282804060/10000 foo1 bar10 2 query: drop table hive_foo query: drop table hive_bar Index: ql/src/test/results/clientpositive/groupby4_map.q.out =================================================================== --- ql/src/test/results/clientpositive/groupby4_map.q.out (revision 796808) +++ ql/src/test/results/clientpositive/groupby4_map.q.out (working copy) @@ -13,6 +13,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator Group By Operator aggregations: @@ -62,5 +64,5 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/1296021327/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/415588183/10000 500 Index: ql/src/test/results/clientpositive/join27.q.out =================================================================== --- ql/src/test/results/clientpositive/join27.q.out (revision 796808) +++ ql/src/test/results/clientpositive/join27.q.out (working copy) @@ -17,6 +17,8 @@ Map Reduce Alias -> Map Operator Tree: y + TableScan + alias: y Common Join Operator condition map: Inner Join 0 to 1 @@ -67,6 +69,8 @@ limit: -1 Alias -> Map Local Operator Tree: x + TableScan + alias: x Common Join Operator condition map: Inner Join 0 to 1 @@ -116,10 +120,10 @@ Move Operator files: hdfs directory: true - destination: file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1256637782/10000 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/540868067/10000 Map Reduce Alias -> Map Operator Tree: - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1722272427/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1165916299/10002 Reduce Output Operator sort order: Map-reduce partition columns: @@ -163,7 +167,7 @@ Output: default/dest_j1 query: select * from dest_j1 x order by x.key, x.value Input: default/dest_j1 -Output: file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/6969413/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/57786158/10000 NULL val_165 val_165 NULL val_165 val_165 NULL val_193 val_193 Index: ql/src/test/results/clientpositive/udf_coalesce.q.out =================================================================== --- ql/src/test/results/clientpositive/udf_coalesce.q.out (revision 796808) +++ ql/src/test/results/clientpositive/udf_coalesce.q.out (working copy) @@ -30,6 +30,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: COALESCE(1) @@ -101,7 +103,7 @@ COALESCE(IF(TRUE, NULL, 0), NULL) FROM src LIMIT 1 Input: default/src -Output: file:/data/users/zshao/tools/549-trunk-apache-hive/build/ql/tmp/981408434/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1536083937/10000 1 1 2 1 3 4 1 1 2 1 3 4 1.0 1.0 2.0 2.0 2.0 NULL query: EXPLAIN SELECT COALESCE(src_thrift.lint[1], 999), @@ -120,6 +122,8 @@ Map Reduce Alias -> Map Operator Tree: src_thrift + TableScan + alias: src_thrift Select Operator expressions: expr: COALESCE(lint[1],999) @@ -145,7 +149,7 @@ COALESCE(src_thrift.mstringstring['key_2'], '999') FROM src_thrift Input: default/src_thrift -Output: file:/data/users/zshao/tools/549-trunk-apache-hive/build/ql/tmp/1429922481/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/510263520/10000 0 0 999 2 1 999 4 8 value_2 Index: ql/src/test/results/clientpositive/udf_length.q.out =================================================================== --- ql/src/test/results/clientpositive/udf_length.q.out (revision 796808) +++ ql/src/test/results/clientpositive/udf_length.q.out (working copy) @@ -13,6 +13,8 @@ Map Reduce Alias -> Map Operator Tree: src1 + TableScan + alias: src1 Select Operator expressions: expr: length(value) @@ -32,10 +34,10 @@ Move Operator files: hdfs directory: true - destination: file:/data/users/emil/hive1/hive1/build/ql/tmp/891633093/10000 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1053497155/10000 Map Reduce Alias -> Map Operator Tree: - file:/data/users/emil/hive1/hive1/build/ql/tmp/988560065/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1463394896/10002 Reduce Output Operator sort order: Map-reduce partition columns: @@ -72,7 +74,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/emil/hive1/hive1/build/ql/tmp/469108904/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/634146762/10000 7 0 7 @@ -115,6 +117,8 @@ Map Reduce Alias -> Map Operator Tree: dest1 + TableScan + alias: dest1 Select Operator expressions: expr: length(name) @@ -133,6 +137,6 @@ query: SELECT length(dest1.name) FROM dest1 Input: default/dest1 -Output: file:/data/users/emil/hive1/hive1/build/ql/tmp/1552330536/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/797831565/10000 2 query: DROP TABLE dest1 Index: ql/src/test/results/clientpositive/ppd_random.q.out =================================================================== --- ql/src/test/results/clientpositive/ppd_random.q.out (revision 796808) +++ ql/src/test/results/clientpositive/ppd_random.q.out (working copy) @@ -18,6 +18,8 @@ Map Reduce Alias -> Map Operator Tree: src2:src + TableScan + alias: src Filter Operator predicate: expr: (key > '2') @@ -45,6 +47,8 @@ expr: _col1 type: string src1:src + TableScan + alias: src Select Operator expressions: expr: key Index: ql/src/test/results/clientpositive/join7.q.out =================================================================== --- ql/src/test/results/clientpositive/join7.q.out (revision 796808) +++ ql/src/test/results/clientpositive/join7.q.out (working copy) @@ -30,6 +30,8 @@ Map Reduce Alias -> Map Operator Tree: c:a:src1 + TableScan + alias: src1 Filter Operator predicate: expr: ((UDFToDouble(key) > UDFToDouble(10)) and (UDFToDouble(key) < UDFToDouble(20))) @@ -59,6 +61,8 @@ expr: _col1 type: string c:b:src2 + TableScan + alias: src2 Filter Operator predicate: expr: ((UDFToDouble(key) > UDFToDouble(15)) and (UDFToDouble(key) < UDFToDouble(25))) @@ -88,6 +92,8 @@ expr: _col1 type: string c:c:src3 + TableScan + alias: src3 Filter Operator predicate: expr: ((UDFToDouble(key) > UDFToDouble(20)) and (UDFToDouble(key) < UDFToDouble(25))) @@ -209,7 +215,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/2080427053/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/850739047/10000 11 val_11 NULL NULL NULL NULL 12 val_12 NULL NULL NULL NULL 12 val_12 NULL NULL NULL NULL Index: ql/src/test/results/clientpositive/union12.q.out =================================================================== --- ql/src/test/results/clientpositive/union12.q.out (revision 796808) +++ ql/src/test/results/clientpositive/union12.q.out (working copy) @@ -31,6 +31,8 @@ Map Reduce Alias -> Map Operator Tree: null-subquery1-subquery1:unionsrc-subquery1-subquery1:s1 + TableScan + alias: s1 Select Operator Group By Operator aggregations: @@ -63,7 +65,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/96530042/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/340437292/10002 Union Select Operator expressions: @@ -85,7 +87,7 @@ output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: tmptable - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/96530042/10004 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/340437292/10004 Union Select Operator expressions: @@ -107,7 +109,7 @@ output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: tmptable - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/96530042/10005 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/340437292/10005 Union Select Operator expressions: @@ -136,10 +138,10 @@ Move Operator files: hdfs directory: true - destination: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/981352387/10000 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1278427471/10000 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/96530042/10003 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/340437292/10003 Reduce Output Operator sort order: Map-reduce partition columns: @@ -176,6 +178,8 @@ Map Reduce Alias -> Map Operator Tree: null-subquery1-subquery2:unionsrc-subquery1-subquery2:s2 + TableScan + alias: s2 Select Operator Group By Operator aggregations: @@ -209,6 +213,8 @@ Map Reduce Alias -> Map Operator Tree: null-subquery2:unionsrc-subquery2:s3 + TableScan + alias: s3 Select Operator Group By Operator aggregations: @@ -251,7 +257,7 @@ Output: default/tmptable query: select * from tmptable x sort by x.key Input: default/tmptable -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/251427651/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1224636392/10000 tst1 500 tst2 25 tst3 1000 Index: ql/src/test/results/clientpositive/groupby1_map_nomap.q.out =================================================================== --- ql/src/test/results/clientpositive/groupby1_map_nomap.q.out (revision 796808) +++ ql/src/test/results/clientpositive/groupby1_map_nomap.q.out (working copy) @@ -13,6 +13,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: key @@ -83,7 +85,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/2041437713/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/208043483/10000 0 0.0 10 10.0 100 200.0 Index: ql/src/test/results/clientpositive/udf2.q.out =================================================================== --- ql/src/test/results/clientpositive/udf2.q.out (revision 796808) +++ ql/src/test/results/clientpositive/udf2.q.out (working copy) @@ -16,6 +16,8 @@ Map Reduce Alias -> Map Operator Tree: dest1 + TableScan + alias: dest1 Select Operator expressions: expr: '|' @@ -46,5 +48,5 @@ query: SELECT '|', trim(dest1.c1), '|', rtrim(dest1.c1), '|', ltrim(dest1.c1), '|' FROM dest1 Input: default/dest1 -Output: /data/users/athusoo/commits/hive_trunk_ws8/ql/../build/ql/tmp/143850894/869136508.10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1219306454/10000 | abc | abc | abc | Index: ql/src/test/results/clientpositive/join13.q.out =================================================================== --- ql/src/test/results/clientpositive/join13.q.out (revision 796808) +++ ql/src/test/results/clientpositive/join13.q.out (working copy) @@ -21,6 +21,8 @@ Map Reduce Alias -> Map Operator Tree: src2:src + TableScan + alias: src Select Operator expressions: expr: key @@ -42,6 +44,8 @@ expr: _col1 type: string src1:src + TableScan + alias: src Filter Operator predicate: expr: (UDFToDouble(key) < UDFToDouble(100)) @@ -99,6 +103,8 @@ expr: _col0 type: string src3:src + TableScan + alias: src Filter Operator predicate: expr: (UDFToDouble(key) < UDFToDouble(200)) @@ -155,7 +161,7 @@ (SELECT src.key as c5, src.value as c6 from src) src3 ON src1.c1 + src2.c3 = src3.c5 AND src3.c5 < 200 Input: default/src -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1668670433/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1755487438/10000 0 val_0 0 val_0 0 val_0 Index: ql/src/test/results/clientpositive/groupby7_map_skew.q.out =================================================================== --- ql/src/test/results/clientpositive/groupby7_map_skew.q.out (revision 796808) +++ ql/src/test/results/clientpositive/groupby7_map_skew.q.out (working copy) @@ -20,6 +20,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: key @@ -82,7 +84,7 @@ Stage: Stage-3 Map Reduce Alias -> Map Operator Tree: - file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/build/ql/tmp/1032894007/10004 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1626864073/10004 Reduce Output Operator key expressions: expr: _col0 @@ -137,7 +139,7 @@ Stage: Stage-4 Map Reduce Alias -> Map Operator Tree: - file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/build/ql/tmp/1032894007/10005 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1626864073/10005 Reduce Output Operator key expressions: expr: _col0 @@ -168,7 +170,7 @@ Stage: Stage-5 Map Reduce Alias -> Map Operator Tree: - file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/build/ql/tmp/1032894007/10006 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1626864073/10006 Reduce Output Operator key expressions: expr: _col0 @@ -229,7 +231,7 @@ Output: default/dest2 query: SELECT DEST1.* FROM DEST1 Input: default/dest1 -Output: file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/build/ql/tmp/887854569/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/257618557/10000 0 0.0 10 10.0 100 200.0 @@ -541,7 +543,7 @@ 98 196.0 query: SELECT DEST2.* FROM DEST2 Input: default/dest2 -Output: file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/build/ql/tmp/2090687715/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/130642855/10000 0 0.0 10 10.0 100 200.0 Index: ql/src/test/results/clientpositive/groupby8_noskew.q.out =================================================================== --- ql/src/test/results/clientpositive/groupby8_noskew.q.out (revision 796808) +++ ql/src/test/results/clientpositive/groupby8_noskew.q.out (working copy) @@ -19,6 +19,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Reduce Output Operator key expressions: expr: substr(value, 5) @@ -63,7 +65,7 @@ Stage: Stage-3 Map Reduce Alias -> Map Operator Tree: - file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/.ptest_0/build/ql/tmp/1185580131/10004 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1810043076/10004 Reduce Output Operator key expressions: expr: _col0 @@ -118,7 +120,7 @@ Stage: Stage-4 Map Reduce Alias -> Map Operator Tree: - file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/.ptest_0/build/ql/tmp/1185580131/10005 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1810043076/10005 Reduce Output Operator key expressions: expr: _col0 @@ -179,7 +181,7 @@ Output: default/dest2 query: SELECT DEST1.* FROM DEST1 Input: default/dest1 -Output: file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/.ptest_0/build/ql/tmp/1286370575/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1744710149/10000 0 1 10 1 100 1 @@ -491,7 +493,7 @@ 98 1 query: SELECT DEST2.* FROM DEST2 Input: default/dest2 -Output: file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/.ptest_0/build/ql/tmp/1750991450/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1097203608/10000 0 1 10 1 100 1 Index: ql/src/test/results/clientpositive/input18.q.out =================================================================== --- ql/src/test/results/clientpositive/input18.q.out (revision 796808) +++ ql/src/test/results/clientpositive/input18.q.out (working copy) @@ -19,6 +19,8 @@ Map Reduce Alias -> Map Operator Tree: tmap:src + TableScan + alias: src Select Operator expressions: expr: key @@ -97,7 +99,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/500274419/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1845336766/10000 0 val_0+3+7 0 val_0+3+7 0 val_0+3+7 Index: ql/src/test/results/clientpositive/join36.q.out =================================================================== --- ql/src/test/results/clientpositive/join36.q.out (revision 796808) +++ ql/src/test/results/clientpositive/join36.q.out (working copy) @@ -29,6 +29,8 @@ Map Reduce Alias -> Map Operator Tree: y + TableScan + alias: y Common Join Operator condition map: Inner Join 0 to 1 @@ -71,6 +73,8 @@ limit: -1 Alias -> Map Local Operator Tree: x + TableScan + alias: x Common Join Operator condition map: Inner Join 0 to 1 @@ -112,10 +116,10 @@ Move Operator files: hdfs directory: true - destination: file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/36504795/10000 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1758383352/10000 Map Reduce Alias -> Map Operator Tree: - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/774338933/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1865649328/10002 Reduce Output Operator sort order: Map-reduce partition columns: @@ -159,7 +163,7 @@ Output: default/dest_j1 query: select * from dest_j1 x order by x.key Input: default/dest_j1 -Output: file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1723513123/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/973240328/10000 0 3 3 2 1 1 4 1 1 Index: ql/src/test/results/clientpositive/groupby2.q.out =================================================================== --- ql/src/test/results/clientpositive/groupby2.q.out (revision 796808) +++ ql/src/test/results/clientpositive/groupby2.q.out (working copy) @@ -15,6 +15,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: key @@ -53,7 +55,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1492046410/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1351140698/10002 Reduce Output Operator key expressions: expr: _col0 @@ -119,7 +121,7 @@ Output: default/dest_g2 query: SELECT dest_g2.* FROM dest_g2 Input: default/dest_g2 -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/556869673/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1265796754/10000 0 1 00.0 1 71 116414.0 2 69 225571.0 Index: ql/src/test/results/clientpositive/input_part5.q.out =================================================================== --- ql/src/test/results/clientpositive/input_part5.q.out (revision 796808) +++ ql/src/test/results/clientpositive/input_part5.q.out (working copy) @@ -16,6 +16,8 @@ Map Reduce Alias -> Map Operator Tree: x + TableScan + alias: x Filter Operator predicate: expr: ((ds = '2008-04-08') and (UDFToDouble(key) < UDFToDouble(100))) @@ -49,10 +51,10 @@ Move Operator files: hdfs directory: true - destination: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/1706524431/10000 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1750577120/10000 Map Reduce Alias -> Map Operator Tree: - file:/data/users/pchakka/workspace/oshive/build/ql/tmp/183636127/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/384485439/10002 Reduce Output Operator sort order: Map-reduce partition columns: @@ -97,7 +99,7 @@ Output: default/tmptable query: select * from tmptable x sort by x.key,x.value,x.ds,x.hr Input: default/tmptable -Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/936899817/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/813344287/10000 0 val_0 2008-04-08 11 0 val_0 2008-04-08 11 0 val_0 2008-04-08 11 Index: ql/src/test/results/clientpositive/union5.q.out =================================================================== --- ql/src/test/results/clientpositive/union5.q.out (revision 796808) +++ ql/src/test/results/clientpositive/union5.q.out (working copy) @@ -19,6 +19,8 @@ Map Reduce Alias -> Map Operator Tree: null-subquery1:unionsrc-subquery1:s1 + TableScan + alias: s1 Select Operator Group By Operator aggregations: @@ -51,7 +53,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/991394606/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/826682849/10002 Union Select Operator expressions: @@ -76,7 +78,7 @@ value expressions: expr: _col1 type: bigint - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/991394606/10003 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/826682849/10003 Union Select Operator expressions: @@ -126,6 +128,8 @@ Map Reduce Alias -> Map Operator Tree: null-subquery2:unionsrc-subquery2:s2 + TableScan + alias: s2 Select Operator Group By Operator aggregations: @@ -164,6 +168,6 @@ UNION ALL select 'tst2' as key, count(1) as value from src s2) unionsrc group by unionsrc.key Input: default/src -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/625257949/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/425566008/10000 tst1 1 tst2 1 Index: ql/src/test/results/clientpositive/input2_limit.q.out =================================================================== --- ql/src/test/results/clientpositive/input2_limit.q.out (revision 796808) +++ ql/src/test/results/clientpositive/input2_limit.q.out (working copy) @@ -12,6 +12,8 @@ Map Reduce Alias -> Map Operator Tree: x + TableScan + alias: x Filter Operator predicate: expr: (UDFToDouble(key) < UDFToDouble(300)) @@ -41,7 +43,7 @@ query: SELECT x.* FROM SRC x WHERE x.key < 300 LIMIT 5 Input: default/src -Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/455953501/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1442448553/10000 238 val_238 86 val_86 27 val_27 Index: ql/src/test/results/clientpositive/union21.q.out =================================================================== --- ql/src/test/results/clientpositive/union21.q.out (revision 796808) +++ ql/src/test/results/clientpositive/union21.q.out (working copy) @@ -26,6 +26,8 @@ Map Reduce Alias -> Map Operator Tree: null-subquery1-subquery2:union_output-subquery1-subquery2:src_thrift + TableScan + alias: src_thrift Select Operator expressions: expr: astring @@ -55,6 +57,8 @@ expr: _col1 type: bigint null-subquery1-subquery1-subquery2:union_output-subquery1-subquery1-subquery2:src + TableScan + alias: src Select Operator expressions: expr: key @@ -84,6 +88,8 @@ expr: _col1 type: bigint null-subquery1-subquery1-subquery1-subquery1:union_output-subquery1-subquery1-subquery1-subquery1:src + TableScan + alias: src Select Operator expressions: expr: '1' @@ -113,6 +119,8 @@ expr: _col1 type: bigint null-subquery2:union_output-subquery2:src_thrift + TableScan + alias: src_thrift Select Operator expressions: expr: lstring[0] @@ -142,6 +150,8 @@ expr: _col1 type: bigint null-subquery1-subquery1-subquery1-subquery2:union_output-subquery1-subquery1-subquery1-subquery2:src + TableScan + alias: src Select Operator expressions: expr: reverse(key) @@ -211,7 +221,7 @@ GROUP BY key Input: default/src_thrift Input: default/src -Output: file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/tmp/386816239/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1614647480/10000 NULL 2 0 7 001 2 Index: ql/src/test/results/clientpositive/mapreduce8.q.out =================================================================== --- ql/src/test/results/clientpositive/mapreduce8.q.out (revision 796808) +++ ql/src/test/results/clientpositive/mapreduce8.q.out (working copy) @@ -18,6 +18,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: key @@ -107,7 +109,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/1055686084/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1278671888/10000 0 val_0 0 0 0 val_0 0 val_0 0 0 0 val_0 0 val_0 0 0 0 val_0 Index: ql/src/test/results/clientpositive/sample1.q.out =================================================================== --- ql/src/test/results/clientpositive/sample1.q.out (revision 796808) +++ ql/src/test/results/clientpositive/sample1.q.out (working copy) @@ -17,11 +17,15 @@ Map Reduce Alias -> Map Operator Tree: s + TableScan + alias: s Filter Operator + isSamplingPred: true predicate: expr: (((hash(rand()) & 2147483647) % 1) = 0) type: boolean Filter Operator + isSamplingPred: false predicate: expr: ((ds = '2008-04-08') and (hr = '11')) type: boolean @@ -48,7 +52,7 @@ File Output Operator compressed: false GlobalTableId: 1 - directory: file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/42658590/10002 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/972212061/10002 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -62,14 +66,14 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/dest1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest1 Needs Tagging: false Path -> Alias: - file:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 Path -> Partition: - file:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 Partition partition values: ds 2008-04-08 @@ -88,7 +92,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/srcpart + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: srcpart @@ -98,11 +102,11 @@ Move Operator files: hdfs directory: true - source: file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/42658590/10002 - destination: file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/729662936/10000 + source: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/972212061/10002 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1017558614/10000 Map Reduce Alias -> Map Operator Tree: - file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/42658590/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/972212061/10002 Reduce Output Operator sort order: Map-reduce partition columns: @@ -120,9 +124,9 @@ type: string Needs Tagging: false Path -> Alias: - file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/42658590/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/972212061/10002 Path -> Partition: - file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/42658590/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/972212061/10002 Partition input format: org.apache.hadoop.mapred.TextInputFormat @@ -137,7 +141,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/dest1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest1 Reduce Operator Tree: @@ -145,7 +149,7 @@ File Output Operator compressed: false GlobalTableId: 0 - directory: file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/729662936/10000 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1017558614/10000 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -158,8 +162,8 @@ bucket_count -1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/dest1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest1 @@ -167,7 +171,7 @@ Move Operator tables: replace: true - source: file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/729662936/10000 + source: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1017558614/10000 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -181,10 +185,10 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/dest1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest1 - tmp directory: file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/729662936/10001 + tmp directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1017558614/10001 query: INSERT OVERWRITE TABLE dest1 SELECT s.* @@ -194,7 +198,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/169981750/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1079799161/10000 238 val_238 2008-04-08 11 86 val_86 2008-04-08 11 311 val_311 2008-04-08 11 @@ -697,5 +701,5 @@ 97 val_97 2008-04-08 11 query: select count(1) from srcbucket Input: default/srcbucket -Output: file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/1669892494/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1115267818/10000 1000 Index: ql/src/test/results/clientpositive/ppd_outer_join3.q.out =================================================================== --- ql/src/test/results/clientpositive/ppd_outer_join3.q.out (revision 796808) +++ ql/src/test/results/clientpositive/ppd_outer_join3.q.out (working copy) @@ -18,6 +18,8 @@ Map Reduce Alias -> Map Operator Tree: b + TableScan + alias: b Reduce Output Operator key expressions: expr: key @@ -33,6 +35,8 @@ expr: value type: string a + TableScan + alias: a Reduce Output Operator key expressions: expr: key @@ -88,7 +92,7 @@ SELECT a.key, a.value, b.key, b.value WHERE a.key > '10' AND a.key < '20' AND b.key > '15' AND b.key < '25' Input: default/src -Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1943171207/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/221001608/10000 150 val_150 150 val_150 152 val_152 152 val_152 152 val_152 152 val_152 Index: ql/src/test/results/clientpositive/groupby6_map_skew.q.out =================================================================== --- ql/src/test/results/clientpositive/groupby6_map_skew.q.out (revision 796808) +++ ql/src/test/results/clientpositive/groupby6_map_skew.q.out (working copy) @@ -15,6 +15,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: value @@ -49,7 +51,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/745628298/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1221562439/10002 Reduce Output Operator key expressions: expr: _col0 @@ -95,7 +97,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/6016821/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1124429798/10000 0 1 2 Index: ql/src/test/results/clientpositive/join22.q.out =================================================================== --- ql/src/test/results/clientpositive/join22.q.out (revision 796808) +++ ql/src/test/results/clientpositive/join22.q.out (working copy) @@ -13,6 +13,8 @@ Map Reduce Alias -> Map Operator Tree: src5:src3:src2 + TableScan + alias: src2 Reduce Output Operator key expressions: expr: key @@ -23,6 +25,8 @@ type: string tag: 1 src5:src3:src1 + TableScan + alias: src1 Reduce Output Operator key expressions: expr: key @@ -74,6 +78,8 @@ expr: _col3 type: string src5:src4 + TableScan + alias: src4 Reduce Output Operator key expressions: expr: key Index: ql/src/test/results/clientpositive/groupby1_map.q.out =================================================================== --- ql/src/test/results/clientpositive/groupby1_map.q.out (revision 796808) +++ ql/src/test/results/clientpositive/groupby1_map.q.out (working copy) @@ -13,6 +13,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: key @@ -83,7 +85,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1024925906/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/428185679/10000 0 0.0 10 10.0 100 200.0 Index: ql/src/test/results/clientpositive/groupby1_limit.q.out =================================================================== --- ql/src/test/results/clientpositive/groupby1_limit.q.out (revision 796808) +++ ql/src/test/results/clientpositive/groupby1_limit.q.out (working copy) @@ -14,6 +14,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: key @@ -64,7 +66,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1098840726/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/242863582/10002 Reduce Output Operator sort order: tag: -1 @@ -101,12 +103,13 @@ serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest1 + query: FROM src INSERT OVERWRITE TABLE dest1 SELECT src.key, sum(substr(src.value,5)) GROUP BY src.key LIMIT 5 Input: default/src Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/844502247/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1739039017/10000 0 0.0 10 10.0 100 200.0 Index: ql/src/test/results/clientpositive/sample9.q.out =================================================================== --- ql/src/test/results/clientpositive/sample9.q.out (revision 796808) +++ ql/src/test/results/clientpositive/sample9.q.out (working copy) @@ -13,11 +13,15 @@ Map Reduce Alias -> Map Operator Tree: s:a + TableScan + alias: a Filter Operator + isSamplingPred: false predicate: expr: (((hash(key) & 2147483647) % 2) = 0) type: boolean Filter Operator + isSamplingPred: true predicate: expr: (((hash(key) & 2147483647) % 2) = 0) type: boolean @@ -36,7 +40,7 @@ File Output Operator compressed: false GlobalTableId: 0 - directory: file:/Users/rmurthy/workspace/hive/build/ql/tmp/404346748/10001 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1241778887/10001 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -46,9 +50,9 @@ columns.types int:string Needs Tagging: false Path -> Alias: - file:/Users/rmurthy/workspace/hive/build/ql/test/data/warehouse/srcbucket + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcbucket Path -> Partition: - file:/Users/rmurthy/workspace/hive/build/ql/test/data/warehouse/srcbucket + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcbucket Partition input format: org.apache.hadoop.mapred.TextInputFormat @@ -64,7 +68,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/Users/rmurthy/workspace/hive/build/ql/test/data/warehouse/srcbucket + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcbucket serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: srcbucket @@ -76,7 +80,7 @@ query: SELECT s.* FROM (SELECT a.* FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 2 on key) a) s Input: default/srcbucket -Output: file:/Users/rmurthy/workspace/hive/build/ql/tmp/831191978/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1849489649/10000 474 val_475 62 val_63 468 val_469 Index: ql/src/test/results/clientpositive/cast1.q.out =================================================================== --- ql/src/test/results/clientpositive/cast1.q.out (revision 796808) +++ ql/src/test/results/clientpositive/cast1.q.out (working copy) @@ -14,6 +14,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Filter Operator predicate: expr: (UDFToDouble(key) = UDFToDouble(86)) @@ -53,10 +55,10 @@ Move Operator files: hdfs directory: true - destination: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/949972588/10000 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/798699276/10000 Map Reduce Alias -> Map Operator Tree: - file:/data/users/pchakka/workspace/oshive/build/ql/tmp/348197295/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1267946602/10002 Reduce Output Operator sort order: Map-reduce partition columns: @@ -99,11 +101,10 @@ serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest1 - query: FROM src INSERT OVERWRITE TABLE dest1 SELECT 3 + 2, 3.0 + 2, 3 + 2.0, 3.0 + 2.0, 3 + CAST(2.0 AS INT) + CAST(CAST(0 AS SMALLINT) AS INT), CAST(1 AS BOOLEAN), CAST(TRUE AS INT) WHERE src.key = 86 Input: default/src Output: default/dest1 query: select dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/360541335/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1398319254/10000 5 5.0 5.0 5.0 5 true 1 Index: ql/src/test/results/clientpositive/quote1.q.out =================================================================== --- ql/src/test/results/clientpositive/quote1.q.out (revision 796808) +++ ql/src/test/results/clientpositive/quote1.q.out (working copy) @@ -15,6 +15,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Filter Operator predicate: expr: ((UDFToDouble(key) >= UDFToDouble(200)) and (UDFToDouble(key) < UDFToDouble(300))) @@ -50,10 +52,10 @@ Move Operator files: hdfs directory: true - destination: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/657063000/10000 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1598504738/10000 Map Reduce Alias -> Map Operator Tree: - file:/data/users/pchakka/workspace/oshive/build/ql/tmp/547720568/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/85854130/10002 Reduce Output Operator sort order: Map-reduce partition columns: @@ -103,6 +105,8 @@ Map Reduce Alias -> Map Operator Tree: int + TableScan + alias: int Filter Operator predicate: expr: (table = '2008-04-08') @@ -137,7 +141,7 @@ Output: default/dest1/table=2008-04-08 query: SELECT `int`.`location`, `int`.`type`, `int`.`table` FROM dest1 `int` WHERE `int`.`table` = '2008-04-08' Input: default/dest1/table=2008-04-08 -Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/1782208476/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1045195197/10000 238 val_238 2008-04-08 255 val_255 2008-04-08 278 val_278 2008-04-08 Index: ql/src/test/results/clientpositive/notable_alias2.q.out =================================================================== --- ql/src/test/results/clientpositive/notable_alias2.q.out (revision 796808) +++ ql/src/test/results/clientpositive/notable_alias2.q.out (working copy) @@ -14,6 +14,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Filter Operator predicate: expr: (UDFToDouble(key) < UDFToDouble(100)) @@ -95,7 +97,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/1248005657/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1828136793/10000 1234 0 3.0 1234 10 1.0 1234 11 1.0 Index: ql/src/test/results/clientpositive/join2.q.out =================================================================== --- ql/src/test/results/clientpositive/join2.q.out (revision 796808) +++ ql/src/test/results/clientpositive/join2.q.out (working copy) @@ -15,6 +15,8 @@ Map Reduce Alias -> Map Operator Tree: src2 + TableScan + alias: src2 Reduce Output Operator key expressions: expr: key @@ -28,6 +30,8 @@ expr: key type: string src1 + TableScan + alias: src1 Reduce Output Operator key expressions: expr: key @@ -71,6 +75,8 @@ expr: _col0 type: string src3 + TableScan + alias: src3 Reduce Output Operator key expressions: expr: UDFToDouble(key) @@ -128,7 +134,7 @@ Output: default/dest_j2 query: SELECT dest_j2.* FROM dest_j2 Input: default/dest_j2 -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1158599181/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1272424599/10000 0 val_0 0 val_0 0 val_0 Index: ql/src/test/results/clientpositive/columnarserde_create_shortcut.q.out =================================================================== --- ql/src/test/results/clientpositive/columnarserde_create_shortcut.q.out (revision 796808) +++ ql/src/test/results/clientpositive/columnarserde_create_shortcut.q.out (working copy) @@ -15,6 +15,8 @@ Map Reduce Alias -> Map Operator Tree: src_thrift + TableScan + alias: src_thrift Select Operator expressions: expr: lint @@ -72,7 +74,7 @@ Output: default/columnarserde_create_shortcut query: SELECT columnarserde_create_shortcut.* FROM columnarserde_create_shortcut DISTRIBUTE BY 1 Input: default/columnarserde_create_shortcut -Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/349949332/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/536539800/10000 [0,0,0] ["0","0","0"] {"key_0":"value_0"} 1712634731 record_0 [1,2,3] ["10","100","1000"] {"key_1":"value_1"} 465985200 record_1 [2,4,6] ["20","200","2000"] {"key_2":"value_2"} -751827638 record_2 @@ -86,7 +88,7 @@ null null {} 0 NULL query: SELECT columnarserde_create_shortcut.a[0], columnarserde_create_shortcut.b[0], columnarserde_create_shortcut.c['key2'], columnarserde_create_shortcut.d, columnarserde_create_shortcut.e FROM columnarserde_create_shortcut DISTRIBUTE BY 1 Input: default/columnarserde_create_shortcut -Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/1377698797/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1466256773/10000 0 0 NULL 1712634731 record_0 1 10 NULL 465985200 record_1 2 20 NULL -751827638 record_2 @@ -110,7 +112,7 @@ value string from deserializer query: SELECT columnShortcutTable.* FROM columnShortcutTable Input: default/columnshortcuttable -Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/770049104/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/222263562/10000 238 val_238 86 val_86 311 val_311 @@ -124,7 +126,7 @@ query: ALTER TABLE columnShortcutTable ADD COLUMNS (c string) query: SELECT columnShortcutTable.* FROM columnShortcutTable Input: default/columnshortcuttable -Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/1057979880/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1795733683/10000 238 val_238 NULL 86 val_86 NULL 311 val_311 NULL @@ -138,7 +140,7 @@ query: ALTER TABLE columnShortcutTable REPLACE COLUMNS (key int) query: SELECT columnShortcutTable.* FROM columnShortcutTable Input: default/columnshortcuttable -Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/1389619372/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1734519959/10000 238 86 311 Index: ql/src/test/results/clientpositive/input7.q.out =================================================================== --- ql/src/test/results/clientpositive/input7.q.out (revision 796808) +++ ql/src/test/results/clientpositive/input7.q.out (working copy) @@ -15,6 +15,8 @@ Map Reduce Alias -> Map Operator Tree: src1 + TableScan + alias: src1 Select Operator expressions: expr: null @@ -42,10 +44,10 @@ Move Operator files: hdfs directory: true - destination: file:/data/users/njain/hive4/hive4/build/ql/tmp/1294518682/10000 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1942094727/10000 Map Reduce Alias -> Map Operator Tree: - file:/data/users/njain/hive4/hive4/build/ql/tmp/745913308/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1287194632/10002 Reduce Output Operator sort order: Map-reduce partition columns: @@ -85,7 +87,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/986171770/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2121042590/10000 NULL 238 NULL NULL NULL 311 Index: ql/src/test/results/clientpositive/ppd_constant_expr.q.out =================================================================== --- ql/src/test/results/clientpositive/ppd_constant_expr.q.out (revision 796808) +++ ql/src/test/results/clientpositive/ppd_constant_expr.q.out (working copy) @@ -15,6 +15,8 @@ Map Reduce Alias -> Map Operator Tree: src1 + TableScan + alias: src1 Select Operator expressions: expr: (UDFToDouble(4) + null) @@ -46,10 +48,10 @@ Move Operator files: hdfs directory: true - destination: file:/data/users/njain/hive4/hive4/build/ql/tmp/1953683192/10000 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/182631958/10000 Map Reduce Alias -> Map Operator Tree: - file:/data/users/njain/hive4/hive4/build/ql/tmp/734263802/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1188558279/10002 Reduce Output Operator sort order: Map-reduce partition columns: @@ -91,7 +93,7 @@ Output: default/ppd_constant_expr query: SELECT ppd_constant_expr.* FROM ppd_constant_expr Input: default/ppd_constant_expr -Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/413785403/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/28574341/10000 NULL NULL NULL NULL NULL NULL NULL NULL NULL Index: ql/src/test/results/clientpositive/rand_partitionpruner3.q.out =================================================================== --- ql/src/test/results/clientpositive/rand_partitionpruner3.q.out (revision 796808) +++ ql/src/test/results/clientpositive/rand_partitionpruner3.q.out (working copy) @@ -13,7 +13,10 @@ Map Reduce Alias -> Map Operator Tree: a + TableScan + alias: a Filter Operator + isSamplingPred: false predicate: expr: ((((rand(UDFToLong(1)) < 0.1) and (ds = '2008-04-08')) and not ((UDFToDouble(key) > UDFToDouble(50)) or (UDFToDouble(key) < UDFToDouble(10)))) and (hr like '%2')) type: boolean @@ -30,7 +33,7 @@ File Output Operator compressed: false GlobalTableId: 0 - directory: file:/data/users/njain/hive1/hive1/build/ql/tmp/199516785/10001 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1298247397/10001 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -40,9 +43,9 @@ columns.types string:string:string:string Needs Tagging: false Path -> Alias: - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 Path -> Partition: - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 Partition partition values: ds 2008-04-08 @@ -61,7 +64,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/srcpart + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: srcpart @@ -72,7 +75,7 @@ query: select a.* from srcpart a where rand(1) < 0.1 and a.ds = '2008-04-08' and not(key > 50 or key < 10) and a.hr like '%2' Input: default/srcpart/ds=2008-04-08/hr=12 -Output: file:/data/users/njain/hive1/hive1/build/ql/tmp/206596522/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2132058797/10000 42 val_42 2008-04-08 12 44 val_44 2008-04-08 12 26 val_26 2008-04-08 12 @@ -92,11 +95,15 @@ Map Reduce Alias -> Map Operator Tree: a + TableScan + alias: a Filter Operator + isSamplingPred: false predicate: expr: (((ds = '2008-04-08') and not ((UDFToDouble(key) > UDFToDouble(50)) or (UDFToDouble(key) < UDFToDouble(10)))) and (hr like '%2')) type: boolean Filter Operator + isSamplingPred: false predicate: expr: (((ds = '2008-04-08') and not ((UDFToDouble(key) > UDFToDouble(50)) or (UDFToDouble(key) < UDFToDouble(10)))) and (hr like '%2')) type: boolean @@ -113,7 +120,7 @@ File Output Operator compressed: false GlobalTableId: 0 - directory: file:/data/users/njain/hive1/hive1/build/ql/tmp/2011784836/10001 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/40870725/10001 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -123,9 +130,9 @@ columns.types string:string:string:string Needs Tagging: false Path -> Alias: - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 Path -> Partition: - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 Partition partition values: ds 2008-04-08 @@ -144,7 +151,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/srcpart + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: srcpart @@ -155,7 +162,7 @@ query: select a.* from srcpart a where a.ds = '2008-04-08' and not(key > 50 or key < 10) and a.hr like '%2' Input: default/srcpart/ds=2008-04-08/hr=12 -Output: file:/data/users/njain/hive1/hive1/build/ql/tmp/1689821052/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/238117287/10000 27 val_27 2008-04-08 12 37 val_37 2008-04-08 12 15 val_15 2008-04-08 12 Index: ql/src/test/results/clientpositive/union15.q.out =================================================================== --- ql/src/test/results/clientpositive/union15.q.out (revision 796808) +++ ql/src/test/results/clientpositive/union15.q.out (working copy) @@ -23,6 +23,8 @@ Map Reduce Alias -> Map Operator Tree: null-subquery1-subquery1:unionsrc-subquery1-subquery1:s1 + TableScan + alias: s1 Select Operator Group By Operator aggregations: @@ -55,7 +57,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/44626625/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1051678050/10002 Union Select Operator expressions: @@ -80,7 +82,7 @@ value expressions: expr: _col1 type: bigint - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/44626625/10003 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1051678050/10003 Union Select Operator expressions: @@ -105,7 +107,7 @@ value expressions: expr: _col1 type: bigint - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/44626625/10004 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1051678050/10004 Union Select Operator expressions: @@ -155,6 +157,8 @@ Map Reduce Alias -> Map Operator Tree: null-subquery1-subquery2:unionsrc-subquery1-subquery2:s2 + TableScan + alias: s2 Select Operator expressions: expr: key @@ -172,6 +176,8 @@ Map Reduce Alias -> Map Operator Tree: null-subquery2:unionsrc-subquery2:s3 + TableScan + alias: s3 Select Operator expressions: expr: key @@ -197,7 +203,7 @@ select s3.key as key, s3.value as value from src1 s3) unionsrc group by unionsrc.key Input: default/src Input: default/src1 -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1736666761/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/534545243/10000 20 128 2 146 2 Index: ql/src/test/results/clientpositive/groupby2_noskew.q.out =================================================================== --- ql/src/test/results/clientpositive/groupby2_noskew.q.out (revision 796808) +++ ql/src/test/results/clientpositive/groupby2_noskew.q.out (working copy) @@ -14,6 +14,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: key @@ -82,7 +84,7 @@ Output: default/dest_g2 query: SELECT dest_g2.* FROM dest_g2 Input: default/dest_g2 -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1664983269/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1790879281/10000 0 1 00.0 1 71 116414.0 2 69 225571.0 Index: ql/src/test/results/clientpositive/groupby5_map_skew.q.out =================================================================== --- ql/src/test/results/clientpositive/groupby5_map_skew.q.out (revision 796808) +++ ql/src/test/results/clientpositive/groupby5_map_skew.q.out (working copy) @@ -13,6 +13,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: key @@ -65,5 +67,5 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/535679117/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1159871997/10000 130091 Index: ql/src/test/results/clientpositive/join31.q.out =================================================================== --- ql/src/test/results/clientpositive/join31.q.out (revision 796808) +++ ql/src/test/results/clientpositive/join31.q.out (working copy) @@ -24,6 +24,8 @@ Map Reduce Alias -> Map Operator Tree: subq2:y + TableScan + alias: y Select Operator expressions: expr: key @@ -69,7 +71,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/570921339/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1822496642/10002 Common Join Operator condition map: Inner Join 0 to 1 @@ -89,11 +91,11 @@ Local Work: Map Reduce Local Work Alias -> Map Local Tables: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/570921339/10004 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1822496642/10004 Fetch Operator limit: -1 Alias -> Map Local Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/570921339/10004 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1822496642/10004 Common Join Operator condition map: Inner Join 0 to 1 @@ -114,7 +116,7 @@ Stage: Stage-3 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/570921339/10003 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1822496642/10003 Select Operator expressions: expr: _col0 @@ -185,6 +187,8 @@ Map Reduce Alias -> Map Operator Tree: subq1:x + TableScan + alias: x Select Operator expressions: expr: key @@ -238,7 +242,7 @@ Output: default/dest_j1 query: select * from dest_j1 x order by x.key Input: default/dest_j1 -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/944474467/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/121973111/10000 128 1 146 1 150 1 Index: ql/src/test/results/clientpositive/udf5.q.out =================================================================== --- ql/src/test/results/clientpositive/udf5.q.out (revision 796808) +++ ql/src/test/results/clientpositive/udf5.q.out (working copy) @@ -16,6 +16,8 @@ Map Reduce Alias -> Map Operator Tree: dest1 + TableScan + alias: dest1 Select Operator expressions: expr: from_unixtime(1226446340) @@ -48,5 +50,5 @@ query: SELECT from_unixtime(1226446340), to_date(from_unixtime(1226446340)), day('2008-11-01'), month('2008-11-01'), year('2008-11-01'), day('2008-11-01 15:32:20'), month('2008-11-01 15:32:20'), year('2008-11-01 15:32:20') FROM dest1 Input: default/dest1 -Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/467850962/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/31538400/10000 2008-11-11 15:32:20 2008-11-11 1 11 2008 1 11 2008 Index: ql/src/test/results/clientpositive/input13.q.out =================================================================== --- ql/src/test/results/clientpositive/input13.q.out (revision 796808) +++ ql/src/test/results/clientpositive/input13.q.out (working copy) @@ -26,6 +26,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Filter Operator predicate: expr: (UDFToDouble(key) < UDFToDouble(100)) @@ -115,10 +117,10 @@ Move Operator files: hdfs directory: true - destination: file:/data/users/njain/hive4/hive4/build/ql/tmp/2138701978/10000 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/361086771/10000 Map Reduce Alias -> Map Operator Tree: - file:/data/users/njain/hive4/hive4/build/ql/tmp/71960699/10007 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/36084384/10007 Reduce Output Operator sort order: Map-reduce partition columns: @@ -157,10 +159,10 @@ Move Operator files: hdfs directory: true - destination: file:/data/users/njain/hive4/hive4/build/ql/tmp/2138701978/10002 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/361086771/10002 Map Reduce Alias -> Map Operator Tree: - file:/data/users/njain/hive4/hive4/build/ql/tmp/71960699/10008 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/36084384/10008 Reduce Output Operator sort order: Map-reduce partition columns: @@ -199,10 +201,10 @@ Move Operator files: hdfs directory: true - destination: file:/data/users/njain/hive4/hive4/build/ql/tmp/2138701978/10004 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/361086771/10004 Map Reduce Alias -> Map Operator Tree: - file:/data/users/njain/hive4/hive4/build/ql/tmp/71960699/10009 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/36084384/10009 Reduce Output Operator sort order: Map-reduce partition columns: @@ -242,10 +244,10 @@ Move Operator files: hdfs directory: true - destination: file:/data/users/njain/hive4/hive4/build/ql/tmp/2138701978/10006 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/361086771/10006 Map Reduce Alias -> Map Operator Tree: - file:/data/users/njain/hive4/hive4/build/ql/tmp/71960699/10010 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/36084384/10010 Reduce Output Operator sort order: Map-reduce partition columns: @@ -283,7 +285,7 @@ Output: ../build/ql/test/data/warehouse/dest4.out query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/2115682643/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/284534564/10000 86 val_86 27 val_27 98 val_98 @@ -370,7 +372,7 @@ 97 val_97 query: SELECT dest2.* FROM dest2 Input: default/dest2 -Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/1820622588/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/504830626/10000 165 val_165 193 val_193 150 val_150 @@ -478,7 +480,7 @@ 169 val_169 query: SELECT dest3.* FROM dest3 Input: default/dest3/ds=2008-04-08/hr=12 -Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/1688181016/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/940384257/10000 238 2008-04-08 12 255 2008-04-08 12 278 2008-04-08 12 Index: ql/src/test/results/clientpositive/join16.q.out =================================================================== --- ql/src/test/results/clientpositive/join16.q.out (revision 796808) +++ ql/src/test/results/clientpositive/join16.q.out (working copy) @@ -11,6 +11,8 @@ Map Reduce Alias -> Map Operator Tree: subq:a + TableScan + alias: a Filter Operator predicate: expr: ((UDFToDouble(key) > UDFToDouble(10)) and (UDFToDouble(key) > UDFToDouble(20))) @@ -46,6 +48,8 @@ expr: _col0 type: string tab + TableScan + alias: tab Filter Operator predicate: expr: (UDFToDouble(value) < UDFToDouble(200)) Index: ql/src/test/results/clientpositive/nullgroup2.q.out =================================================================== --- ql/src/test/results/clientpositive/nullgroup2.q.out (revision 796808) +++ ql/src/test/results/clientpositive/nullgroup2.q.out (working copy) @@ -13,6 +13,8 @@ Map Reduce Alias -> Map Operator Tree: x + TableScan + alias: x Filter Operator predicate: expr: (UDFToDouble(key) > UDFToDouble(9999)) @@ -62,7 +64,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/994469608/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/426913101/10002 Reduce Output Operator key expressions: expr: _col0 @@ -100,9 +102,10 @@ Fetch Operator limit: -1 + query: select x.key, count(1) from src x where x.key > 9999 group by x.key Input: default/src -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/307851852/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1765412207/10000 query: explain select x.key, count(1) from src x where x.key > 9999 group by x.key ABSTRACT SYNTAX TREE: @@ -117,6 +120,8 @@ Map Reduce Alias -> Map Operator Tree: x + TableScan + alias: x Filter Operator predicate: expr: (UDFToDouble(key) > UDFToDouble(9999)) @@ -176,7 +181,7 @@ query: select x.key, count(1) from src x where x.key > 9999 group by x.key Input: default/src -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1608573572/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1030115855/10000 query: explain select x.key, count(1) from src x where x.key > 9999 group by x.key ABSTRACT SYNTAX TREE: @@ -192,6 +197,8 @@ Map Reduce Alias -> Map Operator Tree: x + TableScan + alias: x Filter Operator predicate: expr: (UDFToDouble(key) > UDFToDouble(9999)) @@ -234,7 +241,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/360265532/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1460260746/10002 Reduce Output Operator key expressions: expr: _col0 @@ -275,7 +282,7 @@ query: select x.key, count(1) from src x where x.key > 9999 group by x.key Input: default/src -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/208705197/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1790949184/10000 query: explain select x.key, count(1) from src x where x.key > 9999 group by x.key ABSTRACT SYNTAX TREE: @@ -290,6 +297,8 @@ Map Reduce Alias -> Map Operator Tree: x + TableScan + alias: x Filter Operator predicate: expr: (UDFToDouble(key) > UDFToDouble(9999)) @@ -342,4 +351,4 @@ query: select x.key, count(1) from src x where x.key > 9999 group by x.key Input: default/src -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1575645808/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/760819629/10000 Index: ql/src/test/results/clientpositive/groupby5.q.out =================================================================== --- ql/src/test/results/clientpositive/groupby5.q.out (revision 796808) +++ ql/src/test/results/clientpositive/groupby5.q.out (working copy) @@ -17,6 +17,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: key @@ -53,7 +55,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1023721383/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/812181103/10002 Reduce Output Operator key expressions: expr: _col0 @@ -114,7 +116,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1858809382/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1933269805/10000 0 0.0 10 10.0 100 200.0 Index: ql/src/test/results/clientpositive/union8.q.out =================================================================== --- ql/src/test/results/clientpositive/union8.q.out (revision 796808) +++ ql/src/test/results/clientpositive/union8.q.out (working copy) @@ -16,6 +16,8 @@ Map Reduce Alias -> Map Operator Tree: null-subquery1-subquery1:unionsrc-subquery1-subquery1:s1 + TableScan + alias: s1 Select Operator expressions: expr: key @@ -36,6 +38,8 @@ input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat null-subquery1-subquery2:unionsrc-subquery1-subquery2:s2 + TableScan + alias: s2 Select Operator expressions: expr: key @@ -56,6 +60,8 @@ input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat null-subquery2:unionsrc-subquery2:s3 + TableScan + alias: s3 Select Operator expressions: expr: key @@ -85,7 +91,7 @@ select s2.key as key, s2.value as value from src s2 UNION ALL select s3.key as key, s3.value as value from src s3) unionsrc Input: default/src -Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1857756775/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/162674525/10000 238 val_238 238 val_238 238 val_238 Index: ql/src/test/results/clientpositive/mapreduce3.q.out =================================================================== --- ql/src/test/results/clientpositive/mapreduce3.q.out (revision 796808) +++ ql/src/test/results/clientpositive/mapreduce3.q.out (working copy) @@ -17,6 +17,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: key @@ -90,7 +92,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/1070435913/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1388748234/10000 0 0 0 val_0 0 0 0 val_0 0 0 0 val_0 Index: ql/src/test/results/clientpositive/order2.q.out =================================================================== --- ql/src/test/results/clientpositive/order2.q.out (revision 796808) +++ ql/src/test/results/clientpositive/order2.q.out (working copy) @@ -14,6 +14,8 @@ Map Reduce Alias -> Map Operator Tree: subq:x + TableScan + alias: x Select Operator expressions: expr: key @@ -60,7 +62,7 @@ (SELECT x.* FROM SRC x ORDER BY key limit 10) subq where subq.key < 10 Input: default/src -Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1232262908/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/130815098/10000 0 val_0 0 val_0 0 val_0 Index: ql/src/test/results/clientpositive/input11_limit.q.out =================================================================== --- ql/src/test/results/clientpositive/input11_limit.q.out (revision 796808) +++ ql/src/test/results/clientpositive/input11_limit.q.out (working copy) @@ -14,6 +14,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Filter Operator predicate: expr: (UDFToDouble(key) < UDFToDouble(100)) @@ -72,7 +74,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/600180376/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1891894785/10000 86 val_86 27 val_27 98 val_98 Index: ql/src/test/results/clientpositive/groupby4_map_skew.q.out =================================================================== --- ql/src/test/results/clientpositive/groupby4_map_skew.q.out (revision 796808) +++ ql/src/test/results/clientpositive/groupby4_map_skew.q.out (working copy) @@ -13,6 +13,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator Group By Operator aggregations: @@ -62,5 +64,5 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/1874471594/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/31765734/10000 500 Index: ql/src/test/results/clientpositive/ppd_join.q.out =================================================================== --- ql/src/test/results/clientpositive/ppd_join.q.out (revision 796808) +++ ql/src/test/results/clientpositive/ppd_join.q.out (working copy) @@ -18,6 +18,8 @@ Map Reduce Alias -> Map Operator Tree: src2:src + TableScan + alias: src Filter Operator predicate: expr: ((key > '2') and (key <> '4')) @@ -47,6 +49,8 @@ expr: _col1 type: string src1:src + TableScan + alias: src Filter Operator predicate: expr: (((key > '1') and (key < '400')) and ((key > '20') and ((value < 'val_50') or (key > '2')))) @@ -116,7 +120,7 @@ ON src1.c1 = src2.c3 AND src1.c1 < '400' WHERE src1.c1 > '20' and (src1.c2 < 'val_50' or src1.c1 > '2') and (src2.c3 > '50' or src1.c1 < '50') and (src2.c3 <> '4') Input: default/src -Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1288234128/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1776687608/10000 200 val_200 200 val_200 200 val_200 Index: ql/src/test/results/clientpositive/input22.q.out =================================================================== --- ql/src/test/results/clientpositive/input22.q.out (revision 796808) +++ ql/src/test/results/clientpositive/input22.q.out (working copy) @@ -17,6 +17,8 @@ Map Reduce Alias -> Map Operator Tree: a:input4 + TableScan + alias: input4 Select Operator expressions: expr: key @@ -54,7 +56,7 @@ FROM INPUT4) a ORDER BY KEY2 LIMIT 10 Input: default/input4 -Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1252571176/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/522533559/10000 0 0 0 Index: ql/src/test/results/clientpositive/groupby7_noskew.q.out =================================================================== --- ql/src/test/results/clientpositive/groupby7_noskew.q.out (revision 796808) +++ ql/src/test/results/clientpositive/groupby7_noskew.q.out (working copy) @@ -18,6 +18,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: key @@ -90,7 +92,7 @@ Stage: Stage-3 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1533892009/10004 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1775184761/10004 Reduce Output Operator key expressions: expr: key @@ -151,7 +153,7 @@ Output: default/dest2 query: SELECT DEST1.* FROM DEST1 Input: default/dest1 -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1595159754/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/763741383/10000 0 0.0 10 10.0 100 200.0 @@ -463,7 +465,7 @@ 98 196.0 query: SELECT DEST2.* FROM DEST2 Input: default/dest2 -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/25705563/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2099409841/10000 0 0.0 10 10.0 100 200.0 Index: ql/src/test/results/clientpositive/sample4.q.out =================================================================== --- ql/src/test/results/clientpositive/sample4.q.out (revision 796808) +++ ql/src/test/results/clientpositive/sample4.q.out (working copy) @@ -17,11 +17,15 @@ Map Reduce Alias -> Map Operator Tree: s + TableScan + alias: s Filter Operator + isSamplingPred: false predicate: expr: (((hash(key) & 2147483647) % 2) = 0) type: boolean Filter Operator + isSamplingPred: true predicate: expr: (((hash(key) & 2147483647) % 2) = 0) type: boolean @@ -34,7 +38,7 @@ File Output Operator compressed: false GlobalTableId: 1 - directory: file:/Users/rmurthy/workspace/hive/build/ql/tmp/1686700906/10002 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1952404119/10002 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -48,14 +52,14 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/Users/rmurthy/workspace/hive/build/ql/test/data/warehouse/dest1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest1 Needs Tagging: false Path -> Alias: - file:/Users/rmurthy/workspace/hive/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt Path -> Partition: - file:/Users/rmurthy/workspace/hive/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt Partition input format: org.apache.hadoop.mapred.TextInputFormat @@ -71,7 +75,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/Users/rmurthy/workspace/hive/build/ql/test/data/warehouse/srcbucket + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcbucket serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: srcbucket @@ -81,11 +85,11 @@ Move Operator files: hdfs directory: true - source: file:/Users/rmurthy/workspace/hive/build/ql/tmp/1686700906/10002 - destination: file:/Users/rmurthy/workspace/hive/build/ql/tmp/948268915/10000 + source: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1952404119/10002 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1454590354/10000 Map Reduce Alias -> Map Operator Tree: - file:/Users/rmurthy/workspace/hive/build/ql/tmp/1686700906/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1952404119/10002 Reduce Output Operator sort order: Map-reduce partition columns: @@ -99,9 +103,9 @@ type: string Needs Tagging: false Path -> Alias: - file:/Users/rmurthy/workspace/hive/build/ql/tmp/1686700906/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1952404119/10002 Path -> Partition: - file:/Users/rmurthy/workspace/hive/build/ql/tmp/1686700906/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1952404119/10002 Partition input format: org.apache.hadoop.mapred.TextInputFormat @@ -116,7 +120,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/Users/rmurthy/workspace/hive/build/ql/test/data/warehouse/dest1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest1 Reduce Operator Tree: @@ -124,7 +128,7 @@ File Output Operator compressed: false GlobalTableId: 0 - directory: file:/Users/rmurthy/workspace/hive/build/ql/tmp/948268915/10000 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1454590354/10000 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -137,8 +141,8 @@ bucket_count -1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/Users/rmurthy/workspace/hive/build/ql/test/data/warehouse/dest1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest1 @@ -146,7 +150,7 @@ Move Operator tables: replace: true - source: file:/Users/rmurthy/workspace/hive/build/ql/tmp/948268915/10000 + source: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1454590354/10000 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -160,10 +164,10 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/Users/rmurthy/workspace/hive/build/ql/test/data/warehouse/dest1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest1 - tmp directory: file:/Users/rmurthy/workspace/hive/build/ql/tmp/948268915/10001 + tmp directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1454590354/10001 query: INSERT OVERWRITE TABLE dest1 SELECT s.* @@ -172,7 +176,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/Users/rmurthy/workspace/hive/build/ql/tmp/1828173581/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/638797678/10000 474 val_475 62 val_63 468 val_469 Index: ql/src/test/results/clientpositive/join25.q.out =================================================================== --- ql/src/test/results/clientpositive/join25.q.out (revision 796808) +++ ql/src/test/results/clientpositive/join25.q.out (working copy) @@ -17,6 +17,8 @@ Map Reduce Alias -> Map Operator Tree: y + TableScan + alias: y Common Join Operator condition map: Inner Join 0 to 1 @@ -67,6 +69,8 @@ limit: -1 Alias -> Map Local Operator Tree: x + TableScan + alias: x Common Join Operator condition map: Inner Join 0 to 1 @@ -116,10 +120,10 @@ Move Operator files: hdfs directory: true - destination: file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/69785752/10000 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1323654906/10000 Map Reduce Alias -> Map Operator Tree: - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/527658600/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/192872772/10002 Reduce Output Operator sort order: Map-reduce partition columns: @@ -163,7 +167,7 @@ Output: default/dest_j1 query: select * from dest_j1 x order by x.key Input: default/dest_j1 -Output: file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/998760334/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1604766322/10000 66 val_66 val_66 98 val_98 val_98 98 val_98 val_98 Index: ql/src/test/results/clientpositive/groupby6_map.q.out =================================================================== --- ql/src/test/results/clientpositive/groupby6_map.q.out (revision 796808) +++ ql/src/test/results/clientpositive/groupby6_map.q.out (working copy) @@ -14,6 +14,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: value @@ -68,7 +70,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/425797502/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1568235253/10000 0 1 2 Index: ql/src/test/results/clientpositive/udf_like.q.out =================================================================== --- ql/src/test/results/clientpositive/udf_like.q.out (revision 796808) +++ ql/src/test/results/clientpositive/udf_like.q.out (working copy) @@ -15,6 +15,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Filter Operator predicate: expr: (UDFToDouble(key) = UDFToDouble(86)) @@ -66,5 +68,5 @@ '%_' LIKE '\%\_', 'ab' LIKE '\%\_', 'ab' LIKE '_a%', 'ab' LIKE 'a' FROM src WHERE src.key = 86 Input: default/src -Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/551411911/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/624348016/10000 true false true true false false false false true false false false Index: ql/src/test/results/clientpositive/ppd_gby.q.out =================================================================== --- ql/src/test/results/clientpositive/ppd_gby.q.out (revision 796808) +++ ql/src/test/results/clientpositive/ppd_gby.q.out (working copy) @@ -15,6 +15,8 @@ Map Reduce Alias -> Map Operator Tree: src1:src + TableScan + alias: src Filter Operator predicate: expr: ((value > 'val_10') and (value > 'val_200')) @@ -87,7 +89,7 @@ (SELECT src.value as c1, count(src.key) as c2 from src where src.value > 'val_10' group by src.value) src1 WHERE src1.c1 > 'val_200' and (src1.c2 > 30 or src1.c1 < 'val_400') Input: default/src -Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1156603404/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1128249855/10000 val_201 val_202 val_203 Index: ql/src/test/results/clientpositive/ppd_join2.q.out =================================================================== --- ql/src/test/results/clientpositive/ppd_join2.q.out (revision 796808) +++ ql/src/test/results/clientpositive/ppd_join2.q.out (working copy) @@ -22,6 +22,8 @@ Map Reduce Alias -> Map Operator Tree: src2:src + TableScan + alias: src Filter Operator predicate: expr: ((key <> '305') and (key <> '14')) @@ -51,6 +53,8 @@ expr: _col1 type: string src1:src + TableScan + alias: src Filter Operator predicate: expr: (((key <> '302') and (key < '400')) and ((key <> '311') and ((value <> 'val_50') or (key > '1')))) @@ -120,6 +124,8 @@ expr: _col1 type: string src3:src + TableScan + alias: src Filter Operator predicate: expr: ((key <> '306') and (sqrt(UDFToDouble(key)) <> UDFToDouble(13))) @@ -186,7 +192,7 @@ ON src1.c2 = src3.c6 WHERE src1.c1 <> '311' and (src1.c2 <> 'val_50' or src1.c1 > '1') and (src2.c3 <> '10' or src1.c1 <> '10') and (src2.c3 <> '14') and (sqrt(src3.c5) <> 13) Input: default/src -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1593170677/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1923802795/10000 0 val_0 0 val_0 0 val_0 Index: ql/src/test/results/clientpositive/join5.q.out =================================================================== --- ql/src/test/results/clientpositive/join5.q.out (revision 796808) +++ ql/src/test/results/clientpositive/join5.q.out (working copy) @@ -25,6 +25,8 @@ Map Reduce Alias -> Map Operator Tree: c:a:src1 + TableScan + alias: src1 Filter Operator predicate: expr: ((UDFToDouble(key) > UDFToDouble(10)) and (UDFToDouble(key) < UDFToDouble(20))) @@ -54,6 +56,8 @@ expr: _col1 type: string c:b:src2 + TableScan + alias: src2 Filter Operator predicate: expr: ((UDFToDouble(key) > UDFToDouble(15)) and (UDFToDouble(key) < UDFToDouble(25))) @@ -156,7 +160,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/644095103/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2109561876/10000 17 val_17 17 val_17 18 val_18 18 val_18 18 val_18 18 val_18 Index: ql/src/test/results/clientpositive/input_testxpath4.q.out =================================================================== --- ql/src/test/results/clientpositive/input_testxpath4.q.out (revision 796808) +++ ql/src/test/results/clientpositive/input_testxpath4.q.out (working copy) @@ -16,6 +16,8 @@ Map Reduce Alias -> Map Operator Tree: src_thrift + TableScan + alias: src_thrift Filter Operator predicate: expr: ((mstringstring['key_9'] is not null and lintstring.myint is not null) and lintstring is not null) @@ -44,7 +46,7 @@ OR lintstring.myint IS NOT NULL OR lintstring IS NOT NULL Input: default/src_thrift -Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/691052389/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1702915255/10000 NULL [0] NULL [1] NULL [4] @@ -73,6 +75,8 @@ Map Reduce Alias -> Map Operator Tree: src_thrift + TableScan + alias: src_thrift Filter Operator predicate: expr: ((mstringstring['key_9'] is not null and lintstring.myint is not null) and lintstring is not null) @@ -105,7 +109,7 @@ OR lintstring.myint IS NOT NULL OR lintstring IS NOT NULL Input: default/src_thrift -Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/390073057/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1821187442/10000 NULL [0] NULL [1] NULL [4] Index: ql/src/test/results/clientpositive/union10.q.out =================================================================== --- ql/src/test/results/clientpositive/union10.q.out (revision 796808) +++ ql/src/test/results/clientpositive/union10.q.out (working copy) @@ -31,6 +31,8 @@ Map Reduce Alias -> Map Operator Tree: null-subquery1-subquery1:unionsrc-subquery1-subquery1:s1 + TableScan + alias: s1 Select Operator Group By Operator aggregations: @@ -63,7 +65,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/663445085/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/206581887/10002 Union Select Operator expressions: @@ -85,7 +87,7 @@ output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: tmptable - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/663445085/10004 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/206581887/10004 Union Select Operator expressions: @@ -107,7 +109,7 @@ output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: tmptable - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/663445085/10005 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/206581887/10005 Union Select Operator expressions: @@ -136,10 +138,10 @@ Move Operator files: hdfs directory: true - destination: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1900390672/10000 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/707387580/10000 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/663445085/10003 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/206581887/10003 Reduce Output Operator sort order: Map-reduce partition columns: @@ -176,6 +178,8 @@ Map Reduce Alias -> Map Operator Tree: null-subquery1-subquery2:unionsrc-subquery1-subquery2:s2 + TableScan + alias: s2 Select Operator Group By Operator aggregations: @@ -209,6 +213,8 @@ Map Reduce Alias -> Map Operator Tree: null-subquery2:unionsrc-subquery2:s3 + TableScan + alias: s3 Select Operator Group By Operator aggregations: @@ -249,7 +255,7 @@ Output: default/tmptable query: select * from tmptable x sort by x.key Input: default/tmptable -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1983301805/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/152817638/10000 tst1 500 tst2 500 tst3 500 Index: ql/src/test/results/clientpositive/udf_case_thrift.q.out =================================================================== --- ql/src/test/results/clientpositive/udf_case_thrift.q.out (revision 796808) +++ ql/src/test/results/clientpositive/udf_case_thrift.q.out (working copy) @@ -27,6 +27,8 @@ Map Reduce Alias -> Map Operator Tree: src_thrift + TableScan + alias: src_thrift Select Operator expressions: expr: CASE (lint[0]) WHEN (0) THEN ((lint[0] + 1)) WHEN (1) THEN ((lint[0] + 2)) WHEN (2) THEN (100) ELSE (5) END @@ -65,7 +67,7 @@ END)[0] FROM src_thrift LIMIT 3 Input: default/src_thrift -Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1872084071/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1322230298/10000 1 zero 0 3 10 is ten NULL 100 default NULL Index: ql/src/test/results/clientpositive/groupby3_map_skew.q.out =================================================================== --- ql/src/test/results/clientpositive/groupby3_map_skew.q.out (revision 796808) +++ ql/src/test/results/clientpositive/groupby3_map_skew.q.out (working copy) @@ -15,6 +15,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: value @@ -69,7 +71,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1038557328/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/275382340/10002 Reduce Output Operator sort order: tag: -1 @@ -143,5 +145,5 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/419092325/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1721426392/10000 130091.0 260.182 256.10355987055016 98.0 0.0 Index: ql/src/test/results/clientpositive/join11.q.out =================================================================== --- ql/src/test/results/clientpositive/join11.q.out (revision 796808) +++ ql/src/test/results/clientpositive/join11.q.out (working copy) @@ -17,6 +17,8 @@ Map Reduce Alias -> Map Operator Tree: src2:src + TableScan + alias: src Select Operator expressions: expr: key @@ -36,6 +38,8 @@ expr: _col1 type: string src1:src + TableScan + alias: src Filter Operator predicate: expr: (UDFToDouble(key) < UDFToDouble(100)) @@ -92,7 +96,7 @@ (SELECT src.key as c3, src.value as c4 from src) src2 ON src1.c1 = src2.c3 AND src1.c1 < 100 Input: default/src -Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/774077443/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/513571128/10000 0 val_0 0 val_0 0 val_0 Index: ql/src/test/results/clientpositive/union18.q.out =================================================================== --- ql/src/test/results/clientpositive/union18.q.out (revision 796808) +++ ql/src/test/results/clientpositive/union18.q.out (working copy) @@ -32,6 +32,8 @@ Map Reduce Alias -> Map Operator Tree: null-subquery1:unionsrc-subquery1:s1 + TableScan + alias: s1 Select Operator Group By Operator aggregations: @@ -64,7 +66,7 @@ Stage: Stage-3 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1677640228/10004 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/596602253/10004 Union Select Operator expressions: @@ -96,7 +98,7 @@ output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest2 - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1677640228/10007 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/596602253/10007 Union Select Operator expressions: @@ -135,10 +137,10 @@ Move Operator files: hdfs directory: true - destination: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1791034081/10000 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1202670343/10000 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1677640228/10005 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/596602253/10005 Reduce Output Operator sort order: Map-reduce partition columns: @@ -177,10 +179,10 @@ Move Operator files: hdfs directory: true - destination: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1791034081/10002 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1202670343/10002 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1677640228/10006 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/596602253/10006 Reduce Output Operator sort order: Map-reduce partition columns: @@ -219,6 +221,8 @@ Map Reduce Alias -> Map Operator Tree: null-subquery2:unionsrc-subquery2:s2 + TableScan + alias: s2 Select Operator expressions: expr: key @@ -243,7 +247,7 @@ Output: default/dest2 query: SELECT DEST1.* FROM DEST1 SORT BY DEST1.key, DEST1.value Input: default/dest1 -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/481629855/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1945805316/10000 0 val_0 0 val_0 0 val_0 @@ -747,7 +751,7 @@ tst1 500 query: SELECT DEST2.* FROM DEST2 SORT BY DEST2.key, DEST2.val1, DEST2.val2 Input: default/dest2 -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1239038760/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/271603174/10000 0 val_0 val_0 0 val_0 val_0 0 val_0 val_0 Index: ql/src/test/results/clientpositive/input31.q.out =================================================================== --- ql/src/test/results/clientpositive/input31.q.out (revision 796808) +++ ql/src/test/results/clientpositive/input31.q.out (working copy) @@ -17,6 +17,8 @@ Map Reduce Alias -> Map Operator Tree: srcbucket + TableScan + alias: srcbucket Select Operator Group By Operator aggregations: @@ -67,7 +69,7 @@ Output: default/tst_dest31 query: select * from tst_dest31 Input: default/tst_dest31 -Output: file:/Users/rmurthy/workspace/hive/build/ql/tmp/1005816917/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/870301294/10000 493 query: drop table tst_dest31 query: drop table dest31 Index: ql/src/test/results/clientpositive/join34.q.out =================================================================== --- ql/src/test/results/clientpositive/join34.q.out (revision 796808) +++ ql/src/test/results/clientpositive/join34.q.out (working copy) @@ -22,11 +22,15 @@ Map Reduce Alias -> Map Operator Tree: null-subquery1:subq1-subquery1:x + TableScan + alias: x Filter Operator + isSamplingPred: false predicate: expr: (UDFToDouble(key) < UDFToDouble(20)) type: boolean Filter Operator + isSamplingPred: false predicate: expr: (UDFToDouble(key) < UDFToDouble(20)) type: boolean @@ -66,7 +70,7 @@ File Output Operator compressed: false GlobalTableId: 1 - directory: file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/695584002/10002 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/883234264/10002 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -80,15 +84,19 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest_j1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest_j1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest_j1 null-subquery2:subq1-subquery2:x1 + TableScan + alias: x1 Filter Operator + isSamplingPred: false predicate: expr: (UDFToDouble(key) > UDFToDouble(100)) type: boolean Filter Operator + isSamplingPred: false predicate: expr: (UDFToDouble(key) > UDFToDouble(100)) type: boolean @@ -128,7 +136,7 @@ File Output Operator compressed: false GlobalTableId: 1 - directory: file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/695584002/10002 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/883234264/10002 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -142,7 +150,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest_j1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest_j1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest_j1 Local Work: @@ -153,6 +161,8 @@ limit: -1 Alias -> Map Local Operator Tree: x + TableScan + alias: x Common Join Operator condition map: Inner Join 0 to 1 @@ -182,7 +192,7 @@ File Output Operator compressed: false GlobalTableId: 1 - directory: file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/695584002/10002 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/883234264/10002 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -196,14 +206,14 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest_j1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest_j1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest_j1 Needs Tagging: false Path -> Alias: - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src Path -> Partition: - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src Partition input format: org.apache.hadoop.mapred.TextInputFormat @@ -218,7 +228,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: src @@ -228,11 +238,11 @@ Move Operator files: hdfs directory: true - source: file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/695584002/10002 - destination: file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/2146015907/10000 + source: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/883234264/10002 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1373693961/10000 Map Reduce Alias -> Map Operator Tree: - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/695584002/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/883234264/10002 Reduce Output Operator sort order: Map-reduce partition columns: @@ -248,9 +258,9 @@ type: string Needs Tagging: false Path -> Alias: - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/695584002/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/883234264/10002 Path -> Partition: - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/695584002/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/883234264/10002 Partition input format: org.apache.hadoop.mapred.TextInputFormat @@ -265,7 +275,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest_j1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest_j1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest_j1 Reduce Operator Tree: @@ -273,7 +283,7 @@ File Output Operator compressed: false GlobalTableId: 0 - directory: file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/2146015907/10000 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1373693961/10000 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -287,7 +297,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest_j1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest_j1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest_j1 @@ -295,7 +305,7 @@ Move Operator tables: replace: true - source: file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/2146015907/10000 + source: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1373693961/10000 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -309,10 +319,10 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest_j1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest_j1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest_j1 - tmp directory: file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/2146015907/10001 + tmp directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1373693961/10001 query: INSERT OVERWRITE TABLE dest_j1 @@ -328,7 +338,7 @@ Output: default/dest_j1 query: select * from dest_j1 x order by x.key Input: default/dest_j1 -Output: file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/171089455/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1503439816/10000 128 val_128 128 val_128 128 val_128 Index: ql/src/test/results/clientpositive/udf8.q.out =================================================================== --- ql/src/test/results/clientpositive/udf8.q.out (revision 796808) +++ ql/src/test/results/clientpositive/udf8.q.out (working copy) @@ -19,6 +19,8 @@ Map Reduce Alias -> Map Operator Tree: dest1 + TableScan + alias: dest1 Select Operator expressions: expr: c1 @@ -68,5 +70,5 @@ query: SELECT avg(c1), sum(c1), count(c1) FROM dest1 Input: default/dest1 -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/148949332/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/638671072/10000 1.0 1.0 1 Index: ql/src/test/results/clientpositive/udf_json.q.out =================================================================== --- ql/src/test/results/clientpositive/udf_json.q.out (revision 796808) +++ ql/src/test/results/clientpositive/udf_json.q.out (working copy) @@ -16,6 +16,8 @@ Map Reduce Alias -> Map Operator Tree: src_json + TableScan + alias: src_json Select Operator expressions: expr: get_json_object(json, '$.owner') @@ -34,33 +36,33 @@ query: SELECT get_json_object(src_json.json, '$') FROM src_json Input: default/src_json -Output: /data/users/athusoo/commits/hive_trunk_ws8/ql/../build/ql/tmp/1066710159/435699718.10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/314601374/10000 {"store":{"fruit":[{"weight":8,"type":"apple"},{"weight":9,"type":"pear"}],"book":[{"author":"Nigel Rees","category":"reference","title":"Sayings of the Century","price":8.95},{"author":"Herman Melville","category":"fiction","title":"Moby Dick","price":8.99,"isbn":"0-553-21311-3"},{"author":"J. R. R. Tolkien","category":"fiction","title":"The Lord of the Rings","price":22.99,"reader":[{"name":"bob","age":25},{"name":"jack","age":26}],"isbn":"0-395-19395-8"}],"basket":[[1,2,{"b":"y","a":"x"}],[3,4],[5,6]],"bicycle":{"price":19.95,"color":"red"}},"email":"amy@only_for_json_udf_test.net","owner":"amy"} query: SELECT get_json_object(src_json.json, '$.owner'), get_json_object(src_json.json, '$.store') FROM src_json Input: default/src_json -Output: /data/users/athusoo/commits/hive_trunk_ws8/ql/../build/ql/tmp/31197388/1153397495.10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/166909255/10000 amy {"fruit":[{"weight":8,"type":"apple"},{"weight":9,"type":"pear"}],"book":[{"author":"Nigel Rees","category":"reference","title":"Sayings of the Century","price":8.95},{"author":"Herman Melville","category":"fiction","title":"Moby Dick","price":8.99,"isbn":"0-553-21311-3"},{"author":"J. R. R. Tolkien","category":"fiction","title":"The Lord of the Rings","price":22.99,"reader":[{"name":"bob","age":25},{"name":"jack","age":26}],"isbn":"0-395-19395-8"}],"basket":[[1,2,{"b":"y","a":"x"}],[3,4],[5,6]],"bicycle":{"price":19.95,"color":"red"}} query: SELECT get_json_object(src_json.json, '$.store.bicycle'), get_json_object(src_json.json, '$.store.book') FROM src_json Input: default/src_json -Output: /data/users/athusoo/commits/hive_trunk_ws8/ql/../build/ql/tmp/162773739/733079622.10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/78790420/10000 {"price":19.95,"color":"red"} [{"author":"Nigel Rees","category":"reference","title":"Sayings of the Century","price":8.95},{"author":"Herman Melville","category":"fiction","title":"Moby Dick","price":8.99,"isbn":"0-553-21311-3"},{"author":"J. R. R. Tolkien","category":"fiction","title":"The Lord of the Rings","price":22.99,"reader":[{"name":"bob","age":25},{"name":"jack","age":26}],"isbn":"0-395-19395-8"}] query: SELECT get_json_object(src_json.json, '$.store.book[0]'), get_json_object(src_json.json, '$.store.book[*]') FROM src_json Input: default/src_json -Output: /data/users/athusoo/commits/hive_trunk_ws8/ql/../build/ql/tmp/633718736/911502089.10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/476173885/10000 {"author":"Nigel Rees","category":"reference","title":"Sayings of the Century","price":8.95} [{"author":"Nigel Rees","category":"reference","title":"Sayings of the Century","price":8.95},{"author":"Herman Melville","category":"fiction","title":"Moby Dick","price":8.99,"isbn":"0-553-21311-3"},{"author":"J. R. R. Tolkien","category":"fiction","title":"The Lord of the Rings","price":22.99,"reader":[{"name":"bob","age":25},{"name":"jack","age":26}],"isbn":"0-395-19395-8"}] query: SELECT get_json_object(src_json.json, '$.store.book[0].category'), get_json_object(src_json.json, '$.store.book[*].category'), get_json_object(src_json.json, '$.store.book[*].isbn'), get_json_object(src_json.json, '$.store.book[*].reader') FROM src_json Input: default/src_json -Output: /data/users/athusoo/commits/hive_trunk_ws8/ql/../build/ql/tmp/90955553/557294128.10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1926891678/10000 reference ["reference","fiction","fiction"] ["0-553-21311-3","0-395-19395-8"] [{"name":"bob","age":25},{"name":"jack","age":26}] query: SELECT get_json_object(src_json.json, '$.store.book[*].reader[0].age'), get_json_object(src_json.json, '$.store.book[*].reader[*].age') FROM src_json Input: default/src_json -Output: /data/users/athusoo/commits/hive_trunk_ws8/ql/../build/ql/tmp/263152246/150130665.10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1776873332/10000 25 [25,26] query: SELECT get_json_object(src_json.json, '$.store.basket[0][1]'), get_json_object(src_json.json, '$.store.basket[*]'), get_json_object(src_json.json, '$.store.basket[*][0]'), get_json_object(src_json.json, '$.store.basket[0][*]'), get_json_object(src_json.json, '$.store.basket[*][*]'), get_json_object(src_json.json, '$.store.basket[0][2].b'), get_json_object(src_json.json, '$.store.basket[0][*].b') FROM src_json Input: default/src_json -Output: /data/users/athusoo/commits/hive_trunk_ws8/ql/../build/ql/tmp/488276435/564751935.10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2121821208/10000 2 [[1,2,{"b":"y","a":"x"}],[3,4],[5,6]] 1 [1,2,{"b":"y","a":"x"}] [1,2,{"b":"y","a":"x"},3,4,5,6] y ["y"] query: SELECT get_json_object(src_json.json, '$.non_exist_key'), get_json_object(src_json.json, '$..no_recursive'), get_json_object(src_json.json, '$.store.book[10]'), get_json_object(src_json.json, '$.store.book[0].non_exist_key'), get_json_object(src_json.json, '$.store.basket[*].non_exist_key'), get_json_object(src_json.json, '$.store.basket[0][*].non_exist_key') FROM src_json Input: default/src_json -Output: /data/users/athusoo/commits/hive_trunk_ws8/ql/../build/ql/tmp/5749808/162815016.10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/434325110/10000 NULL NULL NULL NULL NULL NULL Index: ql/src/test/results/clientpositive/udf_reverse.q.out =================================================================== --- ql/src/test/results/clientpositive/udf_reverse.q.out (revision 796808) +++ ql/src/test/results/clientpositive/udf_reverse.q.out (working copy) @@ -13,6 +13,8 @@ Map Reduce Alias -> Map Operator Tree: src1 + TableScan + alias: src1 Select Operator expressions: expr: reverse(value) @@ -32,10 +34,10 @@ Move Operator files: hdfs directory: true - destination: file:/data/users/emil/hive1/hive1/build/ql/tmp/1959443599/10000 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1189035386/10000 Map Reduce Alias -> Map Operator Tree: - file:/data/users/emil/hive1/hive1/build/ql/tmp/267748880/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/358763720/10002 Reduce Output Operator sort order: Map-reduce partition columns: @@ -72,7 +74,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/emil/hive1/hive1/build/ql/tmp/1650627948/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1865968505/10000 832_lav 113_lav @@ -106,6 +108,6 @@ query: LOAD DATA LOCAL INPATH '../data/files/kv4.txt' INTO TABLE dest1 query: SELECT count(1) FROM dest1 WHERE reverse(dest1.name) = _UTF-8 0xE993AEE982B5 Input: default/dest1 -Output: file:/data/users/emil/hive1/hive1/build/ql/tmp/617908822/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1768599545/10000 1 query: DROP TABLE dest1 Index: ql/src/test/results/clientpositive/join19.q.out =================================================================== --- ql/src/test/results/clientpositive/join19.q.out (revision 796808) +++ ql/src/test/results/clientpositive/join19.q.out (working copy) @@ -69,6 +69,8 @@ Map Reduce Alias -> Map Operator Tree: t22:t2 + TableScan + alias: t2 Filter Operator predicate: expr: (predicate = 'http://sofa.semanticweb.org/sofa/v1.0/system#__LABEL_REL') @@ -96,6 +98,8 @@ expr: _col1 type: string t33:t3 + TableScan + alias: t3 Filter Operator predicate: expr: (predicate = 'http://www.ontosearch.com/2007/12/ontosofa-ns#_from') @@ -123,6 +127,8 @@ expr: _col0 type: string t11:t1 + TableScan + alias: t1 Filter Operator predicate: expr: ((predicate = 'http://sofa.semanticweb.org/sofa/v1.0/system#__INSTANCEOF_REL') and (object = 'http://ontos/OntosMiner/Common.English/ontology#Citation')) @@ -184,6 +190,8 @@ expr: _col2 type: string t55:t5 + TableScan + alias: t5 Filter Operator predicate: expr: (predicate = 'http://www.ontosearch.com/2007/12/ontosofa-ns#_to') @@ -211,6 +219,8 @@ expr: _col1 type: string t44:t4 + TableScan + alias: t4 Filter Operator predicate: expr: ((predicate = 'http://sofa.semanticweb.org/sofa/v1.0/system#__INSTANCEOF_REL') and (object = 'http://ontos/OntosMiner/Common.English/ontology#Author')) @@ -252,6 +262,8 @@ Map Reduce Alias -> Map Operator Tree: t66:t6 + TableScan + alias: t6 Filter Operator predicate: expr: (predicate = 'http://sofa.semanticweb.org/sofa/v1.0/system#__LABEL_REL') Index: ql/src/test/results/clientpositive/union3.q.out =================================================================== --- ql/src/test/results/clientpositive/union3.q.out (revision 796808) +++ ql/src/test/results/clientpositive/union3.q.out (working copy) @@ -36,6 +36,8 @@ Map Reduce Alias -> Map Operator Tree: null-subquery2:a-subquery2:s2:src + TableScan + alias: src Select Operator expressions: expr: key @@ -68,7 +70,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1599706373/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1249446914/10002 Union Select Operator expressions: @@ -80,7 +82,7 @@ table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1599706373/10003 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1249446914/10003 Union Select Operator expressions: @@ -92,7 +94,7 @@ table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1599706373/10005 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1249446914/10005 Union Select Operator expressions: @@ -104,7 +106,7 @@ table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1599706373/10007 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1249446914/10007 Union Select Operator expressions: @@ -121,6 +123,8 @@ Map Reduce Alias -> Map Operator Tree: null-subquery1-subquery2:a-subquery1-subquery2:s2:src + TableScan + alias: src Select Operator expressions: expr: key @@ -154,6 +158,8 @@ Map Reduce Alias -> Map Operator Tree: null-subquery1-subquery1-subquery1:a-subquery1-subquery1-subquery1:s1:src + TableScan + alias: src Select Operator expressions: expr: key @@ -186,7 +192,7 @@ Stage: Stage-5 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1599706373/10004 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1249446914/10004 Reduce Output Operator key expressions: expr: _col0 @@ -212,6 +218,8 @@ Map Reduce Alias -> Map Operator Tree: null-subquery1-subquery1-subquery2:a-subquery1-subquery1-subquery2:s1:src + TableScan + alias: src Select Operator expressions: expr: key @@ -244,7 +252,7 @@ Stage: Stage-7 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1599706373/10006 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1249446914/10006 Reduce Output Operator key expressions: expr: _col0 @@ -294,7 +302,7 @@ Output: default/union_out query: select * from union_out cluster by id Input: default/union_out -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1772585743/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/908977959/10000 1 2 3 Index: ql/src/test/results/clientpositive/input1_limit.q.out =================================================================== --- ql/src/test/results/clientpositive/input1_limit.q.out (revision 796808) +++ ql/src/test/results/clientpositive/input1_limit.q.out (working copy) @@ -18,6 +18,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Filter Operator predicate: expr: (UDFToDouble(key) < UDFToDouble(100)) @@ -85,7 +87,7 @@ Stage: Stage-3 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/190339835/10004 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/425844630/10004 Reduce Output Operator sort order: tag: -1 @@ -131,7 +133,7 @@ Output: default/dest2 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1258757679/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1439065801/10000 86 val_86 27 val_27 98 val_98 @@ -144,7 +146,7 @@ 57 val_57 query: SELECT dest2.* FROM dest2 Input: default/dest2 -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1544848437/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2049568410/10000 86 val_86 27 val_27 98 val_98 Index: ql/src/test/results/clientpositive/groupby8.q.out =================================================================== --- ql/src/test/results/clientpositive/groupby8.q.out (revision 796808) +++ ql/src/test/results/clientpositive/groupby8.q.out (working copy) @@ -19,6 +19,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Reduce Output Operator key expressions: expr: substr(value, 5) @@ -63,7 +65,7 @@ Stage: Stage-3 Map Reduce Alias -> Map Operator Tree: - file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/build/ql/tmp/776334911/10004 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1124130522/10004 Reduce Output Operator key expressions: expr: _col0 @@ -118,7 +120,7 @@ Stage: Stage-4 Map Reduce Alias -> Map Operator Tree: - file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/build/ql/tmp/776334911/10005 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1124130522/10005 Reduce Output Operator key expressions: expr: _col0 @@ -179,7 +181,7 @@ Output: default/dest2 query: SELECT DEST1.* FROM DEST1 Input: default/dest1 -Output: file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/build/ql/tmp/2000052180/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1045969389/10000 0 1 10 1 100 1 @@ -491,7 +493,7 @@ 98 1 query: SELECT DEST2.* FROM DEST2 Input: default/dest2 -Output: file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/build/ql/tmp/1118671866/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1062846545/10000 0 1 10 1 100 1 Index: ql/src/test/results/clientpositive/input_columnarserde.q.out =================================================================== --- ql/src/test/results/clientpositive/input_columnarserde.q.out (revision 796808) +++ ql/src/test/results/clientpositive/input_columnarserde.q.out (working copy) @@ -20,6 +20,8 @@ Map Reduce Alias -> Map Operator Tree: src_thrift + TableScan + alias: src_thrift Select Operator expressions: expr: lint @@ -77,7 +79,7 @@ Output: default/input_columnarserde query: SELECT input_columnarserde.* FROM input_columnarserde DISTRIBUTE BY 1 Input: default/input_columnarserde -Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/1094577778/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1243495678/10000 [0,0,0] ["0","0","0"] {"key_0":"value_0"} 1712634731 record_0 [1,2,3] ["10","100","1000"] {"key_1":"value_1"} 465985200 record_1 [2,4,6] ["20","200","2000"] {"key_2":"value_2"} -751827638 record_2 @@ -91,7 +93,7 @@ null null {} 0 NULL query: SELECT input_columnarserde.a[0], input_columnarserde.b[0], input_columnarserde.c['key2'], input_columnarserde.d, input_columnarserde.e FROM input_columnarserde DISTRIBUTE BY 1 Input: default/input_columnarserde -Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/1785325429/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/870028022/10000 0 0 NULL 1712634731 record_0 1 10 NULL 465985200 record_1 2 20 NULL -751827638 record_2 Index: ql/src/test/results/clientpositive/case_sensitivity.q.out =================================================================== --- ql/src/test/results/clientpositive/case_sensitivity.q.out (revision 796808) +++ ql/src/test/results/clientpositive/case_sensitivity.q.out (working copy) @@ -15,6 +15,8 @@ Map Reduce Alias -> Map Operator Tree: src_thrift + TableScan + alias: src_thrift Filter Operator predicate: expr: (lint[0] > 0) @@ -44,10 +46,10 @@ Move Operator files: hdfs directory: true - destination: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/1902470066/10000 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1608233016/10000 Map Reduce Alias -> Map Operator Tree: - file:/data/users/pchakka/workspace/oshive/build/ql/tmp/2096411960/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1477309728/10002 Reduce Output Operator sort order: Map-reduce partition columns: @@ -87,7 +89,7 @@ Output: default/dest1 query: SELECT DEST1.* FROM Dest1 Input: default/dest1 -Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/287581142/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/833665285/10000 2 1 4 8 6 27 Index: ql/src/test/results/clientpositive/groupby10.q.out =================================================================== --- ql/src/test/results/clientpositive/groupby10.q.out (revision 796808) +++ ql/src/test/results/clientpositive/groupby10.q.out (working copy) @@ -24,6 +24,8 @@ Map Reduce Alias -> Map Operator Tree: input + TableScan + alias: input Reduce Output Operator key expressions: expr: substr(value, 5) @@ -70,7 +72,7 @@ Stage: Stage-3 Map Reduce Alias -> Map Operator Tree: - file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/build/ql/tmp/942735723/10004 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/707965918/10004 Reduce Output Operator key expressions: expr: _col0 @@ -132,7 +134,7 @@ Stage: Stage-4 Map Reduce Alias -> Map Operator Tree: - file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/build/ql/tmp/942735723/10005 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/707965918/10005 Reduce Output Operator key expressions: expr: _col0 @@ -200,7 +202,7 @@ Output: default/dest2 query: SELECT * from dest1 Input: default/dest1 -Output: file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/build/ql/tmp/2076536817/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/217152242/10000 27 1 1 66 1 1 86 1 1 @@ -223,7 +225,7 @@ 484 1 1 query: SELECT * from dest2 Input: default/dest2 -Output: file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/build/ql/tmp/719905297/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/476976154/10000 27 27 27 66 66 66 86 86 86 Index: ql/src/test/results/clientpositive/mapreduce6.q.out =================================================================== --- ql/src/test/results/clientpositive/mapreduce6.q.out (revision 796808) +++ ql/src/test/results/clientpositive/mapreduce6.q.out (working copy) @@ -17,6 +17,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: key @@ -90,7 +92,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/1682992868/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/311143855/10000 490 49 0 val_490 491 49 1 val_491 492 49 2 val_492 Index: ql/src/test/results/clientpositive/udf_if.q.out =================================================================== --- ql/src/test/results/clientpositive/udf_if.q.out (revision 796808) +++ ql/src/test/results/clientpositive/udf_if.q.out (working copy) @@ -18,6 +18,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: if(true, 1, 2) @@ -53,7 +55,7 @@ IF(IF(TRUE, NULL, FALSE), 1, 2) AS COL6 FROM src LIMIT 1 Input: default/src -Output: file:/data/users/zshao/tools/553-trunk-apache-hive/build/ql/tmp/1566088912/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/464815693/10000 1 1 1 1 NULL 2 query: -- Type conversions EXPLAIN @@ -74,6 +76,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: if(true, UDFToShort(128), UDFToByte(1)) @@ -103,5 +107,5 @@ IF(FALSE, 'ABC', 12.3) AS COL4 FROM src LIMIT 1 Input: default/src -Output: file:/data/users/zshao/tools/553-trunk-apache-hive/build/ql/tmp/911381670/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1444954079/10000 128 1.1 ABC 12.3 Index: ql/src/test/results/clientpositive/groupby1_noskew.q.out =================================================================== --- ql/src/test/results/clientpositive/groupby1_noskew.q.out (revision 796808) +++ ql/src/test/results/clientpositive/groupby1_noskew.q.out (working copy) @@ -13,6 +13,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: key @@ -76,7 +78,7 @@ Output: default/dest_g1 query: SELECT dest_g1.* FROM dest_g1 Input: default/dest_g1 -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/850220067/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1632379716/10000 0 0.0 10 10.0 100 200.0 Index: ql/src/test/results/clientpositive/groupby2_map_skew.q.out =================================================================== --- ql/src/test/results/clientpositive/groupby2_map_skew.q.out (revision 796808) +++ ql/src/test/results/clientpositive/groupby2_map_skew.q.out (working copy) @@ -15,6 +15,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: key @@ -68,7 +70,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1932947221/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1383974641/10002 Reduce Output Operator key expressions: expr: _col0 @@ -134,7 +136,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1637903963/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/724437043/10000 0 1 00.0 1 71 116414.0 2 69 225571.0 Index: ql/src/test/results/clientpositive/join20.q.out =================================================================== --- ql/src/test/results/clientpositive/join20.q.out (revision 796808) +++ ql/src/test/results/clientpositive/join20.q.out (working copy) @@ -14,6 +14,8 @@ Map Reduce Alias -> Map Operator Tree: src2 + TableScan + alias: src2 Reduce Output Operator key expressions: expr: key @@ -29,6 +31,8 @@ expr: value type: string src3 + TableScan + alias: src3 Filter Operator predicate: expr: (UDFToDouble(key) < UDFToDouble(20)) @@ -52,6 +56,8 @@ expr: value type: string src1 + TableScan + alias: src1 Filter Operator predicate: expr: (UDFToDouble(key) < UDFToDouble(10)) @@ -107,7 +113,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/644565255/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1271354637/10002 Reduce Output Operator key expressions: expr: _col0 @@ -154,7 +160,7 @@ query: SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10) RIGHT OUTER JOIN src src3 ON (src1.key = src3.key AND src3.key < 20) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value Input: default/src -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/2039570057/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/909095294/10000 NULL NULL NULL NULL 10 val_10 NULL NULL NULL NULL 11 val_11 NULL NULL NULL NULL 12 val_12 @@ -239,6 +245,8 @@ Map Reduce Alias -> Map Operator Tree: src2 + TableScan + alias: src2 Filter Operator predicate: expr: (UDFToDouble(key) < UDFToDouble(15)) @@ -262,6 +270,8 @@ expr: value type: string src3 + TableScan + alias: src3 Filter Operator predicate: expr: (UDFToDouble(key) < UDFToDouble(20)) @@ -285,6 +295,8 @@ expr: value type: string src1 + TableScan + alias: src1 Filter Operator predicate: expr: (UDFToDouble(key) < UDFToDouble(10)) @@ -340,7 +352,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/256148947/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/635607298/10002 Reduce Output Operator key expressions: expr: _col0 @@ -387,7 +399,7 @@ query: SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key < 15) RIGHT OUTER JOIN src src3 ON (src1.key = src3.key AND src3.key < 20) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value Input: default/src -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1492340440/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1115298666/10000 NULL NULL NULL NULL 10 val_10 NULL NULL NULL NULL 11 val_11 NULL NULL NULL NULL 12 val_12 Index: ql/src/test/results/clientpositive/ppd_outer_join1.q.out =================================================================== --- ql/src/test/results/clientpositive/ppd_outer_join1.q.out (revision 796808) +++ ql/src/test/results/clientpositive/ppd_outer_join1.q.out (working copy) @@ -18,6 +18,8 @@ Map Reduce Alias -> Map Operator Tree: b + TableScan + alias: b Reduce Output Operator key expressions: expr: key @@ -33,6 +35,8 @@ expr: value type: string a + TableScan + alias: a Filter Operator predicate: expr: ((UDFToDouble(key) > UDFToDouble(10)) and (UDFToDouble(key) < UDFToDouble(20))) @@ -92,7 +96,7 @@ SELECT a.key, a.value, b.key, b.value WHERE a.key > 10 AND a.key < 20 AND b.key > 15 AND b.key < 25 Input: default/src -Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1519468277/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/607979100/10000 17 val_17 17 val_17 18 val_18 18 val_18 18 val_18 18 val_18 Index: ql/src/test/results/clientpositive/input25.q.out =================================================================== --- ql/src/test/results/clientpositive/input25.q.out (revision 796808) +++ ql/src/test/results/clientpositive/input25.q.out (working copy) @@ -23,6 +23,8 @@ Map Reduce Alias -> Map Operator Tree: null-subquery1:subq-subquery1:x + TableScan + alias: x Filter Operator predicate: expr: (d = '2009-01-01') @@ -63,7 +65,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1576345941/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2001262468/10002 Union Select Operator expressions: @@ -79,7 +81,7 @@ table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1576345941/10003 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2001262468/10003 Union Select Operator expressions: @@ -100,6 +102,8 @@ Map Reduce Alias -> Map Operator Tree: null-subquery2:subq-subquery2:x + TableScan + alias: x Filter Operator predicate: expr: (d = '2009-02-02') @@ -149,5 +153,5 @@ ) subq Input: default/tst/d=2009-01-01 Input: default/tst/d=2009-02-02 -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1172948551/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1875448008/10000 query: drop table tst Index: ql/src/test/results/clientpositive/groupby3_map.q.out =================================================================== --- ql/src/test/results/clientpositive/groupby3_map.q.out (revision 796808) +++ ql/src/test/results/clientpositive/groupby3_map.q.out (working copy) @@ -14,6 +14,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: value @@ -105,5 +107,5 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1972965188/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1999888822/10000 130091.0 260.182 256.10355987055016 98.0 0.0 Index: ql/src/test/results/clientpositive/sample7.q.out =================================================================== --- ql/src/test/results/clientpositive/sample7.q.out (revision 796808) +++ ql/src/test/results/clientpositive/sample7.q.out (working copy) @@ -17,15 +17,20 @@ Map Reduce Alias -> Map Operator Tree: s + TableScan + alias: s Filter Operator + isSamplingPred: false predicate: expr: ((((hash(key) & 2147483647) % 4) = 0) and (key > 100)) type: boolean Filter Operator + isSamplingPred: true predicate: expr: (((hash(key) & 2147483647) % 4) = 0) type: boolean Filter Operator + isSamplingPred: false predicate: expr: (key > 100) type: boolean @@ -38,7 +43,7 @@ File Output Operator compressed: false GlobalTableId: 1 - directory: file:/Users/rmurthy/workspace/hive/build/ql/tmp/733482180/10002 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1045201408/10002 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -52,14 +57,14 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/Users/rmurthy/workspace/hive/build/ql/test/data/warehouse/dest1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest1 Needs Tagging: false Path -> Alias: - file:/Users/rmurthy/workspace/hive/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt Path -> Partition: - file:/Users/rmurthy/workspace/hive/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt Partition input format: org.apache.hadoop.mapred.TextInputFormat @@ -75,7 +80,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/Users/rmurthy/workspace/hive/build/ql/test/data/warehouse/srcbucket + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcbucket serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: srcbucket @@ -85,11 +90,11 @@ Move Operator files: hdfs directory: true - source: file:/Users/rmurthy/workspace/hive/build/ql/tmp/733482180/10002 - destination: file:/Users/rmurthy/workspace/hive/build/ql/tmp/569755481/10000 + source: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1045201408/10002 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/996209633/10000 Map Reduce Alias -> Map Operator Tree: - file:/Users/rmurthy/workspace/hive/build/ql/tmp/733482180/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1045201408/10002 Reduce Output Operator sort order: Map-reduce partition columns: @@ -103,9 +108,9 @@ type: string Needs Tagging: false Path -> Alias: - file:/Users/rmurthy/workspace/hive/build/ql/tmp/733482180/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1045201408/10002 Path -> Partition: - file:/Users/rmurthy/workspace/hive/build/ql/tmp/733482180/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1045201408/10002 Partition input format: org.apache.hadoop.mapred.TextInputFormat @@ -120,7 +125,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/Users/rmurthy/workspace/hive/build/ql/test/data/warehouse/dest1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest1 Reduce Operator Tree: @@ -128,7 +133,7 @@ File Output Operator compressed: false GlobalTableId: 0 - directory: file:/Users/rmurthy/workspace/hive/build/ql/tmp/569755481/10000 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/996209633/10000 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -141,8 +146,8 @@ bucket_count -1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/Users/rmurthy/workspace/hive/build/ql/test/data/warehouse/dest1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest1 @@ -150,7 +155,7 @@ Move Operator tables: replace: true - source: file:/Users/rmurthy/workspace/hive/build/ql/tmp/569755481/10000 + source: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/996209633/10000 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -164,10 +169,10 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/Users/rmurthy/workspace/hive/build/ql/test/data/warehouse/dest1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest1 - tmp directory: file:/Users/rmurthy/workspace/hive/build/ql/tmp/569755481/10001 + tmp directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/996209633/10001 query: INSERT OVERWRITE TABLE dest1 SELECT s.* @@ -177,7 +182,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/Users/rmurthy/workspace/hive/build/ql/tmp/503845125/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1976415224/10000 468 val_469 272 val_273 448 val_449 Index: ql/src/test/results/clientpositive/join28.q.out =================================================================== --- ql/src/test/results/clientpositive/join28.q.out (revision 796808) +++ ql/src/test/results/clientpositive/join28.q.out (working copy) @@ -21,6 +21,8 @@ Map Reduce Alias -> Map Operator Tree: subq:y + TableScan + alias: y Common Join Operator condition map: Inner Join 0 to 1 @@ -45,6 +47,8 @@ limit: -1 Alias -> Map Local Operator Tree: subq:x + TableScan + alias: x Common Join Operator condition map: Inner Join 0 to 1 @@ -65,7 +69,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1238929189/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1982344811/10002 Select Operator expressions: expr: _col0 @@ -112,6 +116,8 @@ limit: -1 Alias -> Map Local Operator Tree: z + TableScan + alias: z Filter Operator predicate: expr: ((ds = '2008-04-08') and (UDFToDouble(hr) = UDFToDouble(11))) @@ -161,10 +167,10 @@ Move Operator files: hdfs directory: true - destination: file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/2043029458/10000 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1444027597/10000 Map Reduce Alias -> Map Operator Tree: - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1238929189/10003 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1982344811/10003 Reduce Output Operator sort order: Map-reduce partition columns: @@ -210,7 +216,7 @@ Output: default/dest_j1 query: select * from dest_j1 x order by x.key Input: default/dest_j1 -Output: file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/981515436/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/69485641/10000 128 val_128 128 val_128 128 val_128 Index: ql/src/test/results/clientpositive/type_cast_1.q.out =================================================================== --- ql/src/test/results/clientpositive/type_cast_1.q.out (revision 796808) +++ ql/src/test/results/clientpositive/type_cast_1.q.out (working copy) @@ -12,6 +12,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: (if(false, 1, UDFToShort(2)) + 3) @@ -31,5 +33,5 @@ query: SELECT IF(false, 1, cast(2 as smallint)) + 3 FROM src LIMIT 1 Input: default/src -Output: file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/tmp/1077571356/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/394093582/10000 5 Index: ql/src/test/results/clientpositive/ppd_udf_case.q.out =================================================================== --- ql/src/test/results/clientpositive/ppd_udf_case.q.out (revision 796808) +++ ql/src/test/results/clientpositive/ppd_udf_case.q.out (working copy) @@ -23,6 +23,8 @@ Map Reduce Alias -> Map Operator Tree: b + TableScan + alias: b Filter Operator predicate: expr: (ds = '2008-04-08') @@ -46,6 +48,8 @@ expr: hr type: string a + TableScan + alias: a Filter Operator predicate: expr: ((ds = '2008-04-08') and CASE (key) WHEN ('27') THEN (true) WHEN ('38') THEN (false) ELSE (null) END) @@ -107,7 +111,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1412459815/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1112816707/10002 Reduce Output Operator key expressions: expr: _col0 @@ -172,7 +176,7 @@ ORDER BY a.key, a.value, a.ds, a.hr, b.key, b.value, b.ds, b.hr Input: default/srcpart/ds=2008-04-08/hr=11 Input: default/srcpart/ds=2008-04-08/hr=12 -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/2131288754/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1396853344/10000 27 val_27 2008-04-08 11 27 val_27 2008-04-08 11 27 val_27 2008-04-08 11 27 val_27 2008-04-08 12 27 val_27 2008-04-08 12 27 val_27 2008-04-08 11 Index: ql/src/test/results/clientpositive/join0.q.out =================================================================== --- ql/src/test/results/clientpositive/join0.q.out (revision 796808) +++ ql/src/test/results/clientpositive/join0.q.out (working copy) @@ -18,6 +18,8 @@ Map Reduce Alias -> Map Operator Tree: src2:src + TableScan + alias: src Filter Operator predicate: expr: (UDFToDouble(key) < UDFToDouble(10)) @@ -41,6 +43,8 @@ expr: _col1 type: string src1:src + TableScan + alias: src Filter Operator predicate: expr: (UDFToDouble(key) < UDFToDouble(10)) @@ -90,7 +94,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/760579710/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/965373100/10002 Reduce Output Operator key expressions: expr: _col0 @@ -133,7 +137,7 @@ (SELECT * FROM src WHERE src.key < 10) src2 SORT BY k1, v1, k2, v2 Input: default/src -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1911587693/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1931949388/10000 0 val_0 0 val_0 0 val_0 0 val_0 0 val_0 0 val_0 Index: ql/src/test/results/clientpositive/join_rc.q.out =================================================================== --- ql/src/test/results/clientpositive/join_rc.q.out (revision 796808) +++ ql/src/test/results/clientpositive/join_rc.q.out (working copy) @@ -23,6 +23,8 @@ Map Reduce Alias -> Map Operator Tree: join_rc2 + TableScan + alias: join_rc2 Reduce Output Operator key expressions: expr: key @@ -36,6 +38,8 @@ expr: value type: string join_rc1 + TableScan + alias: join_rc1 Reduce Output Operator key expressions: expr: key @@ -77,7 +81,7 @@ FROM join_rc1 JOIN join_rc2 ON join_rc1.key = join_rc2.key Input: default/join_rc2 Input: default/join_rc1 -Output: file:/Users/char/Documents/workspace/Hive-Clean/build/ql/tmp/323356091/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2027210642/10000 0 val_0 0 val_0 0 val_0 Index: ql/src/test/results/clientpositive/regexp_extract.q.out =================================================================== --- ql/src/test/results/clientpositive/regexp_extract.q.out (revision 796808) +++ ql/src/test/results/clientpositive/regexp_extract.q.out (working copy) @@ -18,6 +18,8 @@ Map Reduce Alias -> Map Operator Tree: tmap:src + TableScan + alias: src Select Operator expressions: expr: key @@ -53,9 +55,9 @@ type: string Needs Tagging: false Path -> Alias: - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src Path -> Partition: - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src Partition input format: org.apache.hadoop.mapred.TextInputFormat @@ -70,12 +72,13 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: src Reduce Operator Tree: Extract Filter Operator + isSamplingPred: false predicate: expr: (UDFToDouble(_col0) < UDFToDouble(100)) type: boolean @@ -88,7 +91,7 @@ File Output Operator compressed: false GlobalTableId: 0 - directory: file:/data/users/njain/hive1/hive1/build/ql/tmp/73993756/10001 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/861609192/10001 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -110,7 +113,7 @@ ) tmap SELECT tmap.key, regexp_extract(tmap.value, 'val_(\\d+\\t\\d+)',1) WHERE tmap.key < 100 Input: default/src -Output: file:/data/users/njain/hive1/hive1/build/ql/tmp/395306564/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2044827115/10000 0 0 3 0 0 3 0 0 3 @@ -215,6 +218,8 @@ Map Reduce Alias -> Map Operator Tree: tmap:src + TableScan + alias: src Select Operator expressions: expr: key @@ -250,9 +255,9 @@ type: string Needs Tagging: false Path -> Alias: - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src Path -> Partition: - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src Partition input format: org.apache.hadoop.mapred.TextInputFormat @@ -267,12 +272,13 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: src Reduce Operator Tree: Extract Filter Operator + isSamplingPred: false predicate: expr: (UDFToDouble(_col0) < UDFToDouble(100)) type: boolean @@ -285,7 +291,7 @@ File Output Operator compressed: false GlobalTableId: 0 - directory: file:/data/users/njain/hive1/hive1/build/ql/tmp/1617035180/10001 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/821158337/10001 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -307,7 +313,7 @@ ) tmap SELECT tmap.key, regexp_extract(tmap.value, 'val_(\\d+\\t\\d+)') WHERE tmap.key < 100 Input: default/src -Output: file:/data/users/njain/hive1/hive1/build/ql/tmp/1810791707/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/308790164/10000 0 0 3 0 0 3 0 0 3 Index: ql/src/test/results/clientpositive/input5.q.out =================================================================== --- ql/src/test/results/clientpositive/input5.q.out (revision 796808) +++ ql/src/test/results/clientpositive/input5.q.out (working copy) @@ -19,6 +19,8 @@ Map Reduce Alias -> Map Operator Tree: tmap:src_thrift + TableScan + alias: src_thrift Select Operator expressions: expr: lint @@ -83,7 +85,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/534092272/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/84420544/10000 [0,0,0] [{"myint":0,"mystring":"0","underscore_int":0}] [1,2,3] [{"myint":1,"mystring":"1","underscore_int":1}] [2,4,6] [{"myint":4,"mystring":"8","underscore_int":2}] Index: ql/src/test/results/clientpositive/join8.q.out =================================================================== --- ql/src/test/results/clientpositive/join8.q.out (revision 796808) +++ ql/src/test/results/clientpositive/join8.q.out (working copy) @@ -25,6 +25,8 @@ Map Reduce Alias -> Map Operator Tree: c:a:src1 + TableScan + alias: src1 Filter Operator predicate: expr: ((UDFToDouble(key) > UDFToDouble(10)) and (UDFToDouble(key) < UDFToDouble(20))) @@ -54,6 +56,8 @@ expr: _col1 type: string c:b:src2 + TableScan + alias: src2 Filter Operator predicate: expr: ((UDFToDouble(key) > UDFToDouble(15)) and (UDFToDouble(key) < UDFToDouble(25))) @@ -160,7 +164,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/1672797204/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/932921393/10000 11 val_11 NULL NULL 12 val_12 NULL NULL 12 val_12 NULL NULL Index: ql/src/test/results/clientpositive/input_testsequencefile.q.out =================================================================== --- ql/src/test/results/clientpositive/input_testsequencefile.q.out (revision 796808) +++ ql/src/test/results/clientpositive/input_testsequencefile.q.out (working copy) @@ -15,6 +15,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: key @@ -42,10 +44,10 @@ Move Operator files: hdfs directory: true - destination: file:/data/users/njain/hive4/hive4/build/ql/tmp/830567240/10000 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1365385446/10000 Map Reduce Alias -> Map Operator Tree: - file:/data/users/njain/hive4/hive4/build/ql/tmp/218710063/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/591750513/10002 Reduce Output Operator sort order: Map-reduce partition columns: @@ -85,7 +87,7 @@ Output: default/dest4_sequencefile query: SELECT dest4_sequencefile.* FROM dest4_sequencefile Input: default/dest4_sequencefile -Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/2001342467/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1466602643/10000 238 val_238 86 val_86 311 val_311 Index: ql/src/test/results/clientpositive/udf_case_column_pruning.q.out =================================================================== --- ql/src/test/results/clientpositive/udf_case_column_pruning.q.out (revision 796808) +++ ql/src/test/results/clientpositive/udf_case_column_pruning.q.out (working copy) @@ -20,6 +20,8 @@ Map Reduce Alias -> Map Operator Tree: b + TableScan + alias: b Reduce Output Operator key expressions: expr: key @@ -30,6 +32,8 @@ type: string tag: 1 a + TableScan + alias: a Reduce Output Operator key expressions: expr: key @@ -63,7 +67,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/881693184/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/659473214/10002 Reduce Output Operator key expressions: expr: _col0 @@ -97,7 +101,7 @@ ON a.key = b.key ORDER BY key LIMIT 10 Input: default/src -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1098336610/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/606985537/10000 5 5 5 Index: ql/src/test/results/clientpositive/rand_partitionpruner1.q.out =================================================================== --- ql/src/test/results/clientpositive/rand_partitionpruner1.q.out (revision 796808) +++ ql/src/test/results/clientpositive/rand_partitionpruner1.q.out (working copy) @@ -12,7 +12,10 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Filter Operator + isSamplingPred: false predicate: expr: (rand(UDFToLong(1)) < 0.1) type: boolean @@ -25,7 +28,7 @@ File Output Operator compressed: false GlobalTableId: 0 - directory: file:/data/users/njain/hive1/hive1/build/ql/tmp/1772270999/10001 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/600216077/10001 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -35,9 +38,9 @@ columns.types string:string Needs Tagging: false Path -> Alias: - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src Path -> Partition: - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src Partition input format: org.apache.hadoop.mapred.TextInputFormat @@ -52,7 +55,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/src + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: src @@ -63,7 +66,7 @@ query: select * from src where rand(1) < 0.1 Input: default/src -Output: file:/data/users/njain/hive1/hive1/build/ql/tmp/1857203962/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/908918980/10000 409 val_409 429 val_429 209 val_209 Index: ql/src/test/results/clientpositive/union13.q.out =================================================================== --- ql/src/test/results/clientpositive/union13.q.out (revision 796808) +++ ql/src/test/results/clientpositive/union13.q.out (working copy) @@ -15,6 +15,8 @@ Map Reduce Alias -> Map Operator Tree: null-subquery1:unionsrc-subquery1:s1 + TableScan + alias: s1 Select Operator expressions: expr: key @@ -35,6 +37,8 @@ input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat null-subquery2:unionsrc-subquery2:s2 + TableScan + alias: s2 Select Operator expressions: expr: key @@ -63,7 +67,7 @@ query: select unionsrc.key, unionsrc.value FROM (select s1.key as key, s1.value as value from src s1 UNION ALL select s2.key as key, s2.value as value from src s2) unionsrc Input: default/src -Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/302836026/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1192132108/10000 238 val_238 238 val_238 86 val_86 Index: ql/src/test/results/clientpositive/groupby1_map_skew.q.out =================================================================== --- ql/src/test/results/clientpositive/groupby1_map_skew.q.out (revision 796808) +++ ql/src/test/results/clientpositive/groupby1_map_skew.q.out (working copy) @@ -14,6 +14,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: key @@ -57,7 +59,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1063768856/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/567734003/10002 Reduce Output Operator key expressions: expr: _col0 @@ -115,7 +117,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1299315404/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/483962459/10000 0 0.0 10 10.0 100 200.0 Index: ql/src/test/results/clientpositive/udf3.q.out =================================================================== --- ql/src/test/results/clientpositive/udf3.q.out (revision 796808) +++ ql/src/test/results/clientpositive/udf3.q.out (working copy) @@ -14,6 +14,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator Group By Operator aggregations: @@ -84,5 +86,5 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/973262666/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/399859229/10000 0 NULL NULL NULL NULL Index: ql/src/test/results/clientpositive/noalias_subq1.q.out =================================================================== --- ql/src/test/results/clientpositive/noalias_subq1.q.out (revision 796808) +++ ql/src/test/results/clientpositive/noalias_subq1.q.out (working copy) @@ -12,6 +12,8 @@ Map Reduce Alias -> Map Operator Tree: x:src + TableScan + alias: src Filter Operator predicate: expr: (UDFToDouble(key) < UDFToDouble(100)) @@ -44,7 +46,7 @@ query: SELECT c1 FROM (select value as c1, key as c2 from src) x where c2 < 100 Input: default/src -Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/1322275245/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1546313252/10000 val_86 val_27 val_98 Index: ql/src/test/results/clientpositive/input11.q.out =================================================================== --- ql/src/test/results/clientpositive/input11.q.out (revision 796808) +++ ql/src/test/results/clientpositive/input11.q.out (working copy) @@ -15,6 +15,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Filter Operator predicate: expr: (UDFToDouble(key) < UDFToDouble(100)) @@ -50,10 +52,10 @@ Move Operator files: hdfs directory: true - destination: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/2128936217/10000 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2063110150/10000 Map Reduce Alias -> Map Operator Tree: - file:/data/users/pchakka/workspace/oshive/build/ql/tmp/1543237247/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2033528688/10002 Reduce Output Operator sort order: Map-reduce partition columns: @@ -93,7 +95,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/178293675/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2124979009/10000 86 val_86 27 val_27 98 val_98 Index: ql/src/test/results/clientpositive/groupby6_noskew.q.out =================================================================== --- ql/src/test/results/clientpositive/groupby6_noskew.q.out (revision 796808) +++ ql/src/test/results/clientpositive/groupby6_noskew.q.out (working copy) @@ -14,6 +14,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: value @@ -63,7 +65,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/571336309/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1520087699/10000 0 1 2 Index: ql/src/test/results/clientpositive/input_testxpath.q.out =================================================================== --- ql/src/test/results/clientpositive/input_testxpath.q.out (revision 796808) +++ ql/src/test/results/clientpositive/input_testxpath.q.out (working copy) @@ -15,6 +15,8 @@ Map Reduce Alias -> Map Operator Tree: src_thrift + TableScan + alias: src_thrift Select Operator expressions: expr: lint[1] @@ -38,10 +40,10 @@ Move Operator files: hdfs directory: true - destination: file:/data/users/njain/hive4/hive4/build/ql/tmp/1059065359/10000 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1532988582/10000 Map Reduce Alias -> Map Operator Tree: - file:/data/users/njain/hive4/hive4/build/ql/tmp/1356781088/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1011207052/10002 Reduce Output Operator sort order: Map-reduce partition columns: @@ -83,7 +85,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/1951274528/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1110348659/10000 0 0 NULL 2 1 NULL 4 8 value_2 Index: ql/src/test/results/clientpositive/join14.q.out =================================================================== --- ql/src/test/results/clientpositive/join14.q.out (revision 796808) +++ ql/src/test/results/clientpositive/join14.q.out (working copy) @@ -14,6 +14,8 @@ Map Reduce Alias -> Map Operator Tree: srcpart + TableScan + alias: srcpart Filter Operator predicate: expr: (ds = '2008-04-08') @@ -35,6 +37,8 @@ expr: value type: string src + TableScan + alias: src Filter Operator predicate: expr: (UDFToDouble(key) > UDFToDouble(100)) @@ -102,7 +106,7 @@ Output: default/dest1 query: select dest1.* from dest1 Input: default/dest1 -Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/500537057/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1860221791/10000 103 val_103 103 val_103 103 val_103 Index: ql/src/test/results/clientpositive/ppd_gby2.q.out =================================================================== --- ql/src/test/results/clientpositive/ppd_gby2.q.out (revision 796808) +++ ql/src/test/results/clientpositive/ppd_gby2.q.out (working copy) @@ -17,6 +17,8 @@ Map Reduce Alias -> Map Operator Tree: src1:src + TableScan + alias: src Filter Operator predicate: expr: ((value > 'val_10') and (value > 'val_200')) @@ -91,7 +93,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1611172064/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1595333926/10002 Reduce Output Operator key expressions: expr: _col0 @@ -136,7 +138,7 @@ WHERE src1.c1 > 'val_200' AND (src1.c2 > 30 OR src1.c1 < 'val_400') GROUP BY src1.c2 Input: default/src -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/283923095/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/793451489/10000 val_4 1 val_399 2 val_396 3 Index: ql/src/test/results/clientpositive/subq.q.out =================================================================== --- ql/src/test/results/clientpositive/subq.q.out (revision 796808) +++ ql/src/test/results/clientpositive/subq.q.out (working copy) @@ -16,6 +16,8 @@ Map Reduce Alias -> Map Operator Tree: unioninput:src + TableScan + alias: src Filter Operator predicate: expr: (UDFToDouble(key) < UDFToDouble(100)) @@ -49,10 +51,10 @@ Move Operator files: hdfs directory: true - destination: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/1386424262/10000 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1570302430/10000 Map Reduce Alias -> Map Operator Tree: - file:/data/users/pchakka/workspace/oshive/build/ql/tmp/1220050565/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1565287404/10001 Reduce Output Operator sort order: Map-reduce partition columns: Index: ql/src/test/results/clientpositive/groupby3.q.out =================================================================== --- ql/src/test/results/clientpositive/groupby3.q.out (revision 796808) +++ ql/src/test/results/clientpositive/groupby3.q.out (working copy) @@ -15,6 +15,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: value @@ -47,7 +49,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1329975533/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/960088176/10002 Reduce Output Operator sort order: tag: -1 @@ -121,5 +123,5 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1938797006/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/352140758/10000 130091.0 260.182 256.10355987055016 98.0 0.0 Index: ql/src/test/results/clientpositive/input_part6.q.out =================================================================== --- ql/src/test/results/clientpositive/input_part6.q.out (revision 796808) +++ ql/src/test/results/clientpositive/input_part6.q.out (working copy) @@ -12,6 +12,8 @@ Map Reduce Alias -> Map Operator Tree: x + TableScan + alias: x Filter Operator predicate: expr: (UDFToDouble(ds) = UDFToDouble(((2008 - 4) - 8))) @@ -48,4 +50,4 @@ Input: default/srcpart/ds=2008-04-08/hr=12 Input: default/srcpart/ds=2008-04-09/hr=11 Input: default/srcpart/ds=2008-04-09/hr=12 -Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/495001163/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/63074880/10000 Index: ql/src/test/results/clientpositive/union6.q.out =================================================================== --- ql/src/test/results/clientpositive/union6.q.out (revision 796808) +++ ql/src/test/results/clientpositive/union6.q.out (working copy) @@ -25,6 +25,8 @@ Map Reduce Alias -> Map Operator Tree: null-subquery1:unionsrc-subquery1:s1 + TableScan + alias: s1 Select Operator Group By Operator aggregations: @@ -57,7 +59,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/76493251/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2002755495/10002 Union Select Operator expressions: @@ -73,7 +75,7 @@ output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: tmptable - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/76493251/10004 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2002755495/10004 Union Select Operator expressions: @@ -96,10 +98,10 @@ Move Operator files: hdfs directory: true - destination: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1900876768/10000 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2006459386/10000 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/76493251/10003 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2002755495/10003 Reduce Output Operator sort order: Map-reduce partition columns: @@ -136,6 +138,8 @@ Map Reduce Alias -> Map Operator Tree: null-subquery2:unionsrc-subquery2:s2 + TableScan + alias: s2 Select Operator expressions: expr: key @@ -159,7 +163,7 @@ Output: default/tmptable query: select * from tmptable x sort by x.key, x.value Input: default/tmptable -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1362569604/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1578482807/10000 Index: ql/src/test/results/clientpositive/mapreduce1.q.out =================================================================== --- ql/src/test/results/clientpositive/mapreduce1.q.out (revision 796808) +++ ql/src/test/results/clientpositive/mapreduce1.q.out (working copy) @@ -18,6 +18,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: key @@ -97,7 +99,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/632753703/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/257132289/10000 0 0 0 val_0 0 0 0 val_0 0 0 0 val_0 Index: ql/src/test/results/clientpositive/input20.q.out =================================================================== --- ql/src/test/results/clientpositive/input20.q.out (revision 796808) +++ ql/src/test/results/clientpositive/input20.q.out (working copy) @@ -23,6 +23,8 @@ Map Reduce Alias -> Map Operator Tree: tmap:src + TableScan + alias: src Select Operator expressions: expr: key @@ -104,7 +106,7 @@ Output: default/dest1 query: SELECT * FROM dest1 SORT BY key, value Input: default/dest1 -Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/2104480316/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1330475334/10000 1 105_105 1 10_10 1 111_111 Index: ql/src/test/results/clientpositive/input14_limit.q.out =================================================================== --- ql/src/test/results/clientpositive/input14_limit.q.out (revision 796808) +++ ql/src/test/results/clientpositive/input14_limit.q.out (working copy) @@ -20,6 +20,8 @@ Map Reduce Alias -> Map Operator Tree: tmap:src + TableScan + alias: src Select Operator expressions: expr: key @@ -58,7 +60,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/105591315/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/713515402/10002 Reduce Output Operator key expressions: expr: _col0 @@ -123,7 +125,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/790975206/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/984470541/10000 0 val_0 0 val_0 0 val_0 Index: ql/src/test/results/clientpositive/sample2.q.out =================================================================== --- ql/src/test/results/clientpositive/sample2.q.out (revision 796808) +++ ql/src/test/results/clientpositive/sample2.q.out (working copy) @@ -17,11 +17,15 @@ Map Reduce Alias -> Map Operator Tree: s + TableScan + alias: s Filter Operator + isSamplingPred: false predicate: expr: (((hash(key) & 2147483647) % 2) = 0) type: boolean Filter Operator + isSamplingPred: true predicate: expr: (((hash(key) & 2147483647) % 2) = 0) type: boolean @@ -34,7 +38,7 @@ File Output Operator compressed: false GlobalTableId: 1 - directory: file:/Users/rmurthy/workspace/hive/build/ql/tmp/58163774/10002 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1638516516/10002 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -48,14 +52,14 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/Users/rmurthy/workspace/hive/build/ql/test/data/warehouse/dest1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest1 Needs Tagging: false Path -> Alias: - file:/Users/rmurthy/workspace/hive/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt Path -> Partition: - file:/Users/rmurthy/workspace/hive/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt Partition input format: org.apache.hadoop.mapred.TextInputFormat @@ -71,7 +75,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/Users/rmurthy/workspace/hive/build/ql/test/data/warehouse/srcbucket + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcbucket serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: srcbucket @@ -81,11 +85,11 @@ Move Operator files: hdfs directory: true - source: file:/Users/rmurthy/workspace/hive/build/ql/tmp/58163774/10002 - destination: file:/Users/rmurthy/workspace/hive/build/ql/tmp/185536818/10000 + source: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1638516516/10002 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/377987885/10000 Map Reduce Alias -> Map Operator Tree: - file:/Users/rmurthy/workspace/hive/build/ql/tmp/58163774/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1638516516/10002 Reduce Output Operator sort order: Map-reduce partition columns: @@ -99,9 +103,9 @@ type: string Needs Tagging: false Path -> Alias: - file:/Users/rmurthy/workspace/hive/build/ql/tmp/58163774/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1638516516/10002 Path -> Partition: - file:/Users/rmurthy/workspace/hive/build/ql/tmp/58163774/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1638516516/10002 Partition input format: org.apache.hadoop.mapred.TextInputFormat @@ -116,7 +120,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/Users/rmurthy/workspace/hive/build/ql/test/data/warehouse/dest1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest1 Reduce Operator Tree: @@ -124,7 +128,7 @@ File Output Operator compressed: false GlobalTableId: 0 - directory: file:/Users/rmurthy/workspace/hive/build/ql/tmp/185536818/10000 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/377987885/10000 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -137,8 +141,8 @@ bucket_count -1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/Users/rmurthy/workspace/hive/build/ql/test/data/warehouse/dest1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest1 @@ -146,7 +150,7 @@ Move Operator tables: replace: true - source: file:/Users/rmurthy/workspace/hive/build/ql/tmp/185536818/10000 + source: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/377987885/10000 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -160,10 +164,10 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/Users/rmurthy/workspace/hive/build/ql/test/data/warehouse/dest1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest1 - tmp directory: file:/Users/rmurthy/workspace/hive/build/ql/tmp/185536818/10001 + tmp directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/377987885/10001 query: INSERT OVERWRITE TABLE dest1 SELECT s.* @@ -172,7 +176,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/Users/rmurthy/workspace/hive/build/ql/tmp/1592489862/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/753153109/10000 474 val_475 62 val_63 468 val_469 Index: ql/src/test/results/clientpositive/join23.q.out =================================================================== --- ql/src/test/results/clientpositive/join23.q.out (revision 796808) +++ ql/src/test/results/clientpositive/join23.q.out (working copy) @@ -13,6 +13,8 @@ Map Reduce Alias -> Map Operator Tree: src2 + TableScan + alias: src2 Filter Operator predicate: expr: (UDFToDouble(key) < UDFToDouble(10)) @@ -26,6 +28,8 @@ expr: value type: string src1 + TableScan + alias: src1 Filter Operator predicate: expr: (UDFToDouble(key) < UDFToDouble(10)) @@ -69,7 +73,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/701301764/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1517101975/10002 Reduce Output Operator key expressions: expr: _col0 @@ -107,7 +111,7 @@ query: SELECT * FROM src src1 JOIN src src2 WHERE src1.key < 10 and src2.key < 10 SORT BY src1.key, src1.value, src2.key, src2.value Input: default/src -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1243967728/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/767396917/10000 0 val_0 0 val_0 0 val_0 0 val_0 0 val_0 0 val_0 Index: ql/src/test/results/clientpositive/ppd_outer_join4.q.out =================================================================== --- ql/src/test/results/clientpositive/ppd_outer_join4.q.out (revision 796808) +++ ql/src/test/results/clientpositive/ppd_outer_join4.q.out (working copy) @@ -21,6 +21,8 @@ Map Reduce Alias -> Map Operator Tree: b + TableScan + alias: b Reduce Output Operator key expressions: expr: key @@ -36,6 +38,8 @@ expr: value type: string c + TableScan + alias: c Reduce Output Operator key expressions: expr: key @@ -49,6 +53,8 @@ expr: key type: string a + TableScan + alias: a Reduce Output Operator key expressions: expr: key @@ -111,7 +117,7 @@ SELECT a.key, a.value, b.key, b.value, c.key WHERE a.key > '10' AND a.key < '20' AND b.key > '15' AND b.key < '25' AND sqrt(c.key) <> 13 Input: default/src -Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/390144859/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1541344267/10000 150 val_150 150 val_150 150 152 val_152 152 val_152 152 152 val_152 152 val_152 152 Index: ql/src/test/results/clientpositive/regex_col.q.out =================================================================== --- ql/src/test/results/clientpositive/regex_col.q.out (revision 796808) +++ ql/src/test/results/clientpositive/regex_col.q.out (working copy) @@ -26,6 +26,8 @@ Map Reduce Alias -> Map Operator Tree: srcpart + TableScan + alias: srcpart Select Operator expressions: expr: ds @@ -58,6 +60,8 @@ Map Reduce Alias -> Map Operator Tree: srcpart + TableScan + alias: srcpart Select Operator expressions: expr: ds @@ -91,6 +95,8 @@ Map Reduce Alias -> Map Operator Tree: b + TableScan + alias: b Reduce Output Operator key expressions: expr: key @@ -110,6 +116,8 @@ expr: hr type: string a + TableScan + alias: a Reduce Output Operator key expressions: expr: key @@ -174,6 +182,8 @@ Map Reduce Alias -> Map Operator Tree: b + TableScan + alias: b Reduce Output Operator key expressions: expr: key @@ -197,6 +207,8 @@ expr: hr type: string a + TableScan + alias: a Filter Operator predicate: expr: (UDFToDouble(key) = UDFToDouble(103)) @@ -245,7 +257,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/54303527/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/755783968/10002 Reduce Output Operator key expressions: expr: _col0 @@ -280,7 +292,7 @@ Input: default/srcpart/ds=2008-04-08/hr=12 Input: default/srcpart/ds=2008-04-09/hr=11 Input: default/srcpart/ds=2008-04-09/hr=12 -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1566516401/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/792524699/10000 2008-04-08 11 2008-04-08 11 2008-04-08 11 @@ -311,6 +323,8 @@ Map Reduce Alias -> Map Operator Tree: srcpart + TableScan + alias: srcpart Select Operator expressions: expr: key @@ -341,6 +355,8 @@ Map Reduce Alias -> Map Operator Tree: srcpart + TableScan + alias: srcpart Select Operator expressions: expr: ds @@ -371,6 +387,8 @@ Map Reduce Alias -> Map Operator Tree: srcpart + TableScan + alias: srcpart Select Operator expressions: expr: key @@ -405,6 +423,8 @@ Map Reduce Alias -> Map Operator Tree: srcpart + TableScan + alias: srcpart Select Operator expressions: expr: key @@ -444,7 +464,7 @@ Input: default/srcpart/ds=2008-04-08/hr=12 Input: default/srcpart/ds=2008-04-09/hr=11 Input: default/srcpart/ds=2008-04-09/hr=12 -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/332258618/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/495055703/10000 0 val_0 0 val_0 0 val_0 Index: ql/src/test/results/clientpositive/groupby8_map.q.out =================================================================== --- ql/src/test/results/clientpositive/groupby8_map.q.out (revision 796808) +++ ql/src/test/results/clientpositive/groupby8_map.q.out (working copy) @@ -19,6 +19,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Reduce Output Operator key expressions: expr: substr(value, 5) @@ -63,7 +65,7 @@ Stage: Stage-3 Map Reduce Alias -> Map Operator Tree: - file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/.ptest_1/build/ql/tmp/1595587809/10004 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1923009278/10004 Reduce Output Operator key expressions: expr: _col0 @@ -118,7 +120,7 @@ Stage: Stage-4 Map Reduce Alias -> Map Operator Tree: - file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/.ptest_1/build/ql/tmp/1595587809/10005 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1923009278/10005 Reduce Output Operator key expressions: expr: _col0 @@ -179,7 +181,7 @@ Output: default/dest2 query: SELECT DEST1.* FROM DEST1 Input: default/dest1 -Output: file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/.ptest_1/build/ql/tmp/929246458/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1807480107/10000 0 1 10 1 100 1 @@ -491,7 +493,7 @@ 98 1 query: SELECT DEST2.* FROM DEST2 Input: default/dest2 -Output: file:/data/users/njain/deploy/hive2/tools/ahive2-trunk-apache-hive/.ptest_1/build/ql/tmp/1213240639/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/764500021/10000 0 1 10 1 100 1 Index: ql/src/test/results/clientpositive/join_thrift.q.out =================================================================== --- ql/src/test/results/clientpositive/join_thrift.q.out (revision 796808) +++ ql/src/test/results/clientpositive/join_thrift.q.out (working copy) @@ -22,6 +22,8 @@ Map Reduce Alias -> Map Operator Tree: s2 + TableScan + alias: s2 Reduce Output Operator key expressions: expr: aint @@ -35,6 +37,8 @@ expr: lintstring type: array> s1 + TableScan + alias: s1 Reduce Output Operator key expressions: expr: aint @@ -77,7 +81,7 @@ JOIN src_thrift s2 ON s1.aint = s2.aint Input: default/src_thrift -Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1144800345/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/921239153/10000 -1952710710 [{"myint":25,"mystring":"125","underscore_int":5}] -1461153973 [{"myint":49,"mystring":"343","underscore_int":7}] -751827638 [{"myint":4,"mystring":"8","underscore_int":2}] Index: ql/src/test/results/clientpositive/quote2.q.out =================================================================== --- ql/src/test/results/clientpositive/quote2.q.out (revision 796808) +++ ql/src/test/results/clientpositive/quote2.q.out (working copy) @@ -24,6 +24,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: 'abc' @@ -91,5 +93,5 @@ FROM src LIMIT 1 Input: default/src -Output: file:/data/users/emil/hive1/hive1/build/ql/tmp/171746919/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1547269137/10000 abc abc abc' abc" abc\ abc\ abc\' abc\" abc\\ abc\\ abc\\' abc\\" abc\\\ abc\\\ abc""""\ abc''''\ awk '{print NR"\t"$0}' tab tab tab tab Index: ql/src/test/results/clientpositive/merge1.q.out =================================================================== --- ql/src/test/results/clientpositive/merge1.q.out (revision 796808) +++ ql/src/test/results/clientpositive/merge1.q.out (working copy) @@ -16,6 +16,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: key @@ -74,10 +76,10 @@ Move Operator files: hdfs directory: true - destination: file:/data/users/njain/hive1/hive1/build/ql/tmp/261244854/10000 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/630418550/10000 Map Reduce Alias -> Map Operator Tree: - file:/data/users/njain/hive1/hive1/build/ql/tmp/856923111/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1744279924/10002 Reduce Output Operator sort order: Map-reduce partition columns: @@ -117,7 +119,7 @@ Output: default/dest1 query: select * from dest1 Input: default/dest1 -Output: file:/data/users/njain/hive1/hive1/build/ql/tmp/710265692/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/715579769/10000 0 3 10 1 100 2 Index: ql/src/test/results/clientpositive/join3.q.out =================================================================== --- ql/src/test/results/clientpositive/join3.q.out (revision 796808) +++ ql/src/test/results/clientpositive/join3.q.out (working copy) @@ -14,6 +14,8 @@ Map Reduce Alias -> Map Operator Tree: src2 + TableScan + alias: src2 Reduce Output Operator key expressions: expr: key @@ -24,6 +26,8 @@ type: string tag: 1 src3 + TableScan + alias: src3 Reduce Output Operator key expressions: expr: key @@ -37,6 +41,8 @@ expr: value type: string src1 + TableScan + alias: src1 Reduce Output Operator key expressions: expr: key @@ -96,7 +102,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1106403218/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/137142463/10000 0 val_0 0 val_0 0 val_0 Index: ql/src/test/results/clientpositive/udf_elt.q.out =================================================================== --- ql/src/test/results/clientpositive/udf_elt.q.out (revision 796808) +++ ql/src/test/results/clientpositive/udf_elt.q.out (working copy) @@ -23,6 +23,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: elt(2, 'abc', 'defg') @@ -73,5 +75,5 @@ elt(3, 'abc', 'defg') FROM src LIMIT 1 Input: default/src -Output: file:/home/zhoumin/hive-trunk/build/ql/tmp/472855229/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/347043679/10000 defg cc abc 2 12345 123456789012 1.25 16.0 NULL NULL NULL Index: ql/src/test/results/clientpositive/input_testxpath2.q.out =================================================================== --- ql/src/test/results/clientpositive/input_testxpath2.q.out (revision 796808) +++ ql/src/test/results/clientpositive/input_testxpath2.q.out (working copy) @@ -15,6 +15,8 @@ Map Reduce Alias -> Map Operator Tree: src_thrift + TableScan + alias: src_thrift Filter Operator predicate: expr: (lint is not null and not mstringstring is null) @@ -46,10 +48,10 @@ Move Operator files: hdfs directory: true - destination: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/1796327141/10000 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/999342593/10000 Map Reduce Alias -> Map Operator Tree: - file:/data/users/pchakka/workspace/oshive/build/ql/tmp/1492277620/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/660915895/10002 Reduce Output Operator sort order: Map-reduce partition columns: @@ -91,7 +93,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/1273440758/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1979632541/10000 3 1 1 3 1 1 3 1 1 Index: ql/src/test/results/clientpositive/input8.q.out =================================================================== --- ql/src/test/results/clientpositive/input8.q.out (revision 796808) +++ ql/src/test/results/clientpositive/input8.q.out (working copy) @@ -15,6 +15,8 @@ Map Reduce Alias -> Map Operator Tree: src1 + TableScan + alias: src1 Select Operator expressions: expr: (UDFToDouble(4) + null) @@ -46,10 +48,10 @@ Move Operator files: hdfs directory: true - destination: file:/data/users/njain/hive4/hive4/build/ql/tmp/640113256/10000 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1196598604/10000 Map Reduce Alias -> Map Operator Tree: - file:/data/users/njain/hive4/hive4/build/ql/tmp/29595687/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/439205000/10002 Reduce Output Operator sort order: Map-reduce partition columns: @@ -91,7 +93,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/533758377/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1052388885/10000 NULL NULL NULL NULL NULL NULL NULL NULL NULL Index: ql/src/test/results/clientpositive/union.q.out =================================================================== --- ql/src/test/results/clientpositive/union.q.out (revision 796808) +++ ql/src/test/results/clientpositive/union.q.out (working copy) @@ -20,6 +20,8 @@ Map Reduce Alias -> Map Operator Tree: null-subquery1:unioninput-subquery1:src + TableScan + alias: src Filter Operator predicate: expr: (UDFToDouble(key) < UDFToDouble(100)) @@ -48,6 +50,8 @@ input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat null-subquery2:unioninput-subquery2:src + TableScan + alias: src Filter Operator predicate: expr: (UDFToDouble(key) > UDFToDouble(100)) @@ -82,10 +86,10 @@ Move Operator files: hdfs directory: true - destination: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/888465041/10000 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/520235734/10000 Map Reduce Alias -> Map Operator Tree: - file:/data/users/pchakka/workspace/oshive/build/ql/tmp/976024110/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/664251191/10001 Reduce Output Operator sort order: Map-reduce partition columns: Index: ql/src/test/results/clientpositive/udf_10_trims.q.out =================================================================== --- ql/src/test/results/clientpositive/udf_10_trims.q.out (revision 796808) +++ ql/src/test/results/clientpositive/udf_10_trims.q.out (working copy) @@ -17,6 +17,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Filter Operator predicate: expr: (UDFToDouble(key) = UDFToDouble(86)) @@ -44,10 +46,10 @@ Move Operator files: hdfs directory: true - destination: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/1489774447/10000 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/86217675/10000 Map Reduce Alias -> Map Operator Tree: - file:/data/users/pchakka/workspace/oshive/build/ql/tmp/1596742883/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/727955868/10002 Reduce Output Operator sort order: Map-reduce partition columns: Index: ql/src/test/results/clientpositive/union16.q.out =================================================================== --- ql/src/test/results/clientpositive/union16.q.out (revision 796808) +++ ql/src/test/results/clientpositive/union16.q.out (working copy) @@ -41,6 +41,8 @@ Map Reduce Alias -> Map Operator Tree: null-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery2:src-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery2:src + TableScan + alias: src Select Operator expressions: expr: key @@ -60,6 +62,8 @@ expr: _col0 type: bigint null-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery2:src-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery2:src + TableScan + alias: src Select Operator expressions: expr: key @@ -79,6 +83,8 @@ expr: _col0 type: bigint null-subquery1-subquery1-subquery1-subquery1-subquery2:src-subquery1-subquery1-subquery1-subquery1-subquery2:src + TableScan + alias: src Select Operator expressions: expr: key @@ -98,6 +104,8 @@ expr: _col0 type: bigint null-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery2:src-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery2:src + TableScan + alias: src Select Operator expressions: expr: key @@ -117,6 +125,8 @@ expr: _col0 type: bigint null-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery2:src-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery2:src + TableScan + alias: src Select Operator expressions: expr: key @@ -136,6 +146,8 @@ expr: _col0 type: bigint null-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery2:src-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery2:src + TableScan + alias: src Select Operator expressions: expr: key @@ -155,6 +167,8 @@ expr: _col0 type: bigint null-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery2:src-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery2:src + TableScan + alias: src Select Operator expressions: expr: key @@ -174,6 +188,8 @@ expr: _col0 type: bigint null-subquery2:src-subquery2:src + TableScan + alias: src Select Operator expressions: expr: key @@ -193,6 +209,8 @@ expr: _col0 type: bigint null-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery2:src-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery2:src + TableScan + alias: src Select Operator expressions: expr: key @@ -212,6 +230,8 @@ expr: _col0 type: bigint null-subquery1-subquery1-subquery1-subquery1-subquery1-subquery2:src-subquery1-subquery1-subquery1-subquery1-subquery1-subquery2:src + TableScan + alias: src Select Operator expressions: expr: key @@ -231,6 +251,8 @@ expr: _col0 type: bigint null-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery2:src-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery2:src + TableScan + alias: src Select Operator expressions: expr: key @@ -250,6 +272,8 @@ expr: _col0 type: bigint null-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery2:src-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery2:src + TableScan + alias: src Select Operator expressions: expr: key @@ -269,6 +293,8 @@ expr: _col0 type: bigint null-subquery1-subquery2:src-subquery1-subquery2:src + TableScan + alias: src Select Operator expressions: expr: key @@ -288,6 +314,8 @@ expr: _col0 type: bigint null-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery2:src-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery2:src + TableScan + alias: src Select Operator expressions: expr: key @@ -307,6 +335,8 @@ expr: _col0 type: bigint null-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery2:src-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery2:src + TableScan + alias: src Select Operator expressions: expr: key @@ -326,6 +356,8 @@ expr: _col0 type: bigint null-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery2:src-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery2:src + TableScan + alias: src Select Operator expressions: expr: key @@ -345,6 +377,8 @@ expr: _col0 type: bigint null-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery2:src-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery2:src + TableScan + alias: src Select Operator expressions: expr: key @@ -364,6 +398,8 @@ expr: _col0 type: bigint null-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1:src-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1:src + TableScan + alias: src Select Operator expressions: expr: key @@ -383,6 +419,8 @@ expr: _col0 type: bigint null-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery2:src-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery2:src + TableScan + alias: src Select Operator expressions: expr: key @@ -402,6 +440,8 @@ expr: _col0 type: bigint null-subquery1-subquery1-subquery1-subquery2:src-subquery1-subquery1-subquery1-subquery2:src + TableScan + alias: src Select Operator expressions: expr: key @@ -421,6 +461,8 @@ expr: _col0 type: bigint null-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery2:src-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery2:src + TableScan + alias: src Select Operator expressions: expr: key @@ -440,6 +482,8 @@ expr: _col0 type: bigint null-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery2:src-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery2:src + TableScan + alias: src Select Operator expressions: expr: key @@ -459,6 +503,8 @@ expr: _col0 type: bigint null-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery2:src-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery2:src + TableScan + alias: src Select Operator expressions: expr: key @@ -478,6 +524,8 @@ expr: _col0 type: bigint null-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery2:src-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery1-subquery2:src + TableScan + alias: src Select Operator expressions: expr: key @@ -497,6 +545,8 @@ expr: _col0 type: bigint null-subquery1-subquery1-subquery2:src-subquery1-subquery1-subquery2:src + TableScan + alias: src Select Operator expressions: expr: key @@ -567,5 +617,5 @@ SELECT key, value FROM src UNION ALL SELECT key, value FROM src) src Input: default/src -Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1260154385/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/77993374/10000 12500 Index: ql/src/test/results/clientpositive/ppd_gby_join.q.out =================================================================== --- ql/src/test/results/clientpositive/ppd_gby_join.q.out (revision 796808) +++ ql/src/test/results/clientpositive/ppd_gby_join.q.out (working copy) @@ -20,6 +20,8 @@ Map Reduce Alias -> Map Operator Tree: src2:src + TableScan + alias: src Filter Operator predicate: expr: ((key > '2') and (key <> '4')) @@ -45,6 +47,8 @@ expr: _col0 type: string src1:src + TableScan + alias: src Filter Operator predicate: expr: (((key > '1') and (key < '400')) and ((key > '20') and ((value < 'val_50') or (key > '2')))) @@ -109,7 +113,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/322267744/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1370510952/10002 Reduce Output Operator key expressions: expr: _col0 Index: ql/src/test/results/clientpositive/input14.q.out =================================================================== --- ql/src/test/results/clientpositive/input14.q.out (revision 796808) +++ ql/src/test/results/clientpositive/input14.q.out (working copy) @@ -19,6 +19,8 @@ Map Reduce Alias -> Map Operator Tree: tmap:src + TableScan + alias: src Select Operator expressions: expr: key @@ -93,7 +95,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/1767038905/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/566045181/10000 0 val_0 0 val_0 0 val_0 Index: ql/src/test/results/clientpositive/join32.q.out =================================================================== --- ql/src/test/results/clientpositive/join32.q.out (revision 796808) +++ ql/src/test/results/clientpositive/join32.q.out (working copy) @@ -18,6 +18,8 @@ Map Reduce Alias -> Map Operator Tree: y + TableScan + alias: y Common Join Operator condition map: Inner Join 0 to 1 @@ -31,7 +33,7 @@ File Output Operator compressed: false GlobalTableId: 0 - directory: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1444018326/10003 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/790209890/10003 table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -47,6 +49,8 @@ limit: -1 Alias -> Map Local Operator Tree: x + TableScan + alias: x Common Join Operator condition map: Inner Join 0 to 1 @@ -60,7 +64,7 @@ File Output Operator compressed: false GlobalTableId: 0 - directory: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1444018326/10003 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/790209890/10003 table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -70,9 +74,9 @@ escape.delim \ Needs Tagging: false Path -> Alias: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src Path -> Partition: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src Partition input format: org.apache.hadoop.mapred.TextInputFormat @@ -87,14 +91,14 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: src Stage: Stage-1 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1444018326/10003 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/790209890/10003 Select Operator expressions: expr: _col0 @@ -132,7 +136,7 @@ File Output Operator compressed: false GlobalTableId: 1 - directory: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1444018326/10002 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/790209890/10002 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -146,7 +150,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/dest_j1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest_j1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest_j1 Local Work: @@ -157,15 +161,20 @@ limit: -1 Alias -> Map Local Operator Tree: z + TableScan + alias: z Filter Operator + isSamplingPred: false predicate: expr: ((ds = '2008-04-08') and (UDFToDouble(hr) = UDFToDouble(11))) type: boolean Filter Operator + isSamplingPred: false predicate: expr: (ds = '2008-04-08') type: boolean Filter Operator + isSamplingPred: false predicate: expr: (UDFToDouble(hr) = UDFToDouble(11)) type: boolean @@ -198,7 +207,7 @@ File Output Operator compressed: false GlobalTableId: 1 - directory: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1444018326/10002 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/790209890/10002 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -212,14 +221,14 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/dest_j1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest_j1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest_j1 Needs Tagging: false Path -> Alias: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1444018326/10003 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/790209890/10003 Path -> Partition: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1444018326/10003 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/790209890/10003 Partition input format: org.apache.hadoop.mapred.SequenceFileInputFormat @@ -235,11 +244,11 @@ Move Operator files: hdfs directory: true - source: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1444018326/10002 - destination: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1885700877/10000 + source: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/790209890/10002 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1126913842/10000 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1444018326/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/790209890/10002 Reduce Output Operator sort order: Map-reduce partition columns: @@ -255,9 +264,9 @@ type: string Needs Tagging: false Path -> Alias: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1444018326/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/790209890/10002 Path -> Partition: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1444018326/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/790209890/10002 Partition input format: org.apache.hadoop.mapred.TextInputFormat @@ -272,7 +281,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/dest_j1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest_j1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest_j1 Reduce Operator Tree: @@ -280,7 +289,7 @@ File Output Operator compressed: false GlobalTableId: 0 - directory: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1885700877/10000 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1126913842/10000 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -293,8 +302,8 @@ bucket_count -1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest_j1 file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/dest_j1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest_j1 @@ -302,7 +311,7 @@ Move Operator tables: replace: true - source: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1885700877/10000 + source: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1126913842/10000 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -316,10 +325,10 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/dest_j1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest_j1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest_j1 - tmp directory: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1885700877/10001 + tmp directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1126913842/10001 query: INSERT OVERWRITE TABLE dest_j1 @@ -332,7 +341,7 @@ Output: default/dest_j1 query: select * from dest_j1 x order by x.key Input: default/dest_j1 -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/149664059/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1997289829/10000 146 val_146 val_146 146 val_146 val_146 146 val_146 val_146 Index: ql/src/test/results/clientpositive/udf6.q.out =================================================================== --- ql/src/test/results/clientpositive/udf6.q.out (revision 796808) +++ ql/src/test/results/clientpositive/udf6.q.out (working copy) @@ -16,6 +16,8 @@ Map Reduce Alias -> Map Operator Tree: dest1 + TableScan + alias: dest1 Select Operator expressions: expr: if(true, 1, 2) @@ -34,7 +36,7 @@ query: SELECT IF(TRUE, 1, 2) FROM dest1 Input: default/dest1 -Output: file:/data/users/zshao/tools/549-trunk-apache-hive/build/ql/tmp/1130815402/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1369106011/10000 1 query: EXPLAIN SELECT IF(TRUE, 1, 2), IF(FALSE, 1, 2), IF(NULL, 1, 2), IF(TRUE, "a", "b"), @@ -55,6 +57,8 @@ Map Reduce Alias -> Map Operator Tree: dest1 + TableScan + alias: dest1 Select Operator expressions: expr: if(true, 1, 2) @@ -98,5 +102,5 @@ CAST(128 AS INT), CAST(1.0 AS DOUBLE), CAST('128' AS STRING) FROM dest1 Input: default/dest1 -Output: file:/data/users/zshao/tools/549-trunk-apache-hive/build/ql/tmp/1171008206/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1174306646/10000 1 2 2 a 0.1 2 126 128 128 1.0 128 Index: ql/src/test/results/clientpositive/input_part1.q.out =================================================================== --- ql/src/test/results/clientpositive/input_part1.q.out (revision 796808) +++ ql/src/test/results/clientpositive/input_part1.q.out (working copy) @@ -15,11 +15,15 @@ Map Reduce Alias -> Map Operator Tree: srcpart + TableScan + alias: srcpart Filter Operator + isSamplingPred: false predicate: expr: (((UDFToDouble(key) < UDFToDouble(100)) and (ds = '2008-04-08')) and (hr = '12')) type: boolean Filter Operator + isSamplingPred: false predicate: expr: (((UDFToDouble(key) < UDFToDouble(100)) and (ds = '2008-04-08')) and (hr = '12')) type: boolean @@ -46,7 +50,7 @@ File Output Operator compressed: false GlobalTableId: 1 - directory: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/700297246/10002 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/119264444/10002 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -60,14 +64,14 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/dest1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest1 Needs Tagging: false Path -> Alias: - file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 Path -> Partition: - file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 Partition partition values: ds 2008-04-08 @@ -86,7 +90,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/srcpart + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: srcpart @@ -96,11 +100,11 @@ Move Operator files: hdfs directory: true - source: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/700297246/10002 - destination: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/1780771114/10000 + source: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/119264444/10002 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/804844041/10000 Map Reduce Alias -> Map Operator Tree: - file:/data/users/pchakka/workspace/oshive/build/ql/tmp/700297246/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/119264444/10002 Reduce Output Operator sort order: Map-reduce partition columns: @@ -118,9 +122,9 @@ type: string Needs Tagging: false Path -> Alias: - file:/data/users/pchakka/workspace/oshive/build/ql/tmp/700297246/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/119264444/10002 Path -> Partition: - file:/data/users/pchakka/workspace/oshive/build/ql/tmp/700297246/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/119264444/10002 Partition input format: org.apache.hadoop.mapred.TextInputFormat @@ -135,7 +139,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/dest1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest1 Reduce Operator Tree: @@ -143,7 +147,7 @@ File Output Operator compressed: false GlobalTableId: 0 - directory: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/1780771114/10000 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/804844041/10000 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -157,7 +161,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/dest1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest1 @@ -165,7 +169,7 @@ Move Operator tables: replace: true - source: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/1780771114/10000 + source: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/804844041/10000 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -179,10 +183,10 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/dest1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest1 - tmp directory: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/1780771114/10001 + tmp directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/804844041/10001 query: FROM srcpart @@ -191,7 +195,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/708383510/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/754236822/10000 86 val_86 12 2008-04-08 27 val_27 12 2008-04-08 98 val_98 12 2008-04-08 Index: ql/src/test/results/clientpositive/join17.q.out =================================================================== --- ql/src/test/results/clientpositive/join17.q.out (revision 796808) +++ ql/src/test/results/clientpositive/join17.q.out (working copy) @@ -14,6 +14,8 @@ Map Reduce Alias -> Map Operator Tree: src2 + TableScan + alias: src2 Reduce Output Operator key expressions: expr: key @@ -29,6 +31,8 @@ expr: value type: string src1 + TableScan + alias: src1 Reduce Output Operator key expressions: expr: key @@ -45,9 +49,9 @@ type: string Needs Tagging: true Path -> Alias: - file:/data/users/njain/hive4/hive4/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src Path -> Partition: - file:/data/users/njain/hive4/hive4/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src Partition input format: org.apache.hadoop.mapred.TextInputFormat @@ -62,7 +66,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/njain/hive4/hive4/build/ql/test/data/warehouse/src + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: src Reduce Operator Tree: @@ -95,7 +99,7 @@ File Output Operator compressed: false GlobalTableId: 1 - directory: file:/data/users/njain/hive4/hive4/build/ql/tmp/1063371838/10000 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1271249284/10000 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -109,7 +113,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/njain/hive4/hive4/build/ql/test/data/warehouse/dest1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest1 @@ -117,7 +121,7 @@ Move Operator tables: replace: true - source: file:/data/users/njain/hive4/hive4/build/ql/tmp/1063371838/10000 + source: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1271249284/10000 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -131,10 +135,10 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/njain/hive4/hive4/build/ql/test/data/warehouse/dest1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest1 - tmp directory: file:/data/users/njain/hive4/hive4/build/ql/tmp/1063371838/10001 + tmp directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1271249284/10001 query: FROM src src1 JOIN src src2 ON (src1.key = src2.key) @@ -143,7 +147,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/1031861333/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/327559084/10000 0 val_0 0 val_0 0 val_0 0 val_0 0 val_0 0 val_0 Index: ql/src/test/results/clientpositive/nullgroup3.q.out =================================================================== --- ql/src/test/results/clientpositive/nullgroup3.q.out (revision 796808) +++ ql/src/test/results/clientpositive/nullgroup3.q.out (working copy) @@ -16,6 +16,8 @@ Map Reduce Alias -> Map Operator Tree: tstparttbl + TableScan + alias: tstparttbl Select Operator Group By Operator aggregations: @@ -51,7 +53,7 @@ query: select count(1) from tstparttbl Input: default/tstparttbl/ds=2008-04-08 Input: default/tstparttbl/ds=2008-04-09 -Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/869080729/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/658778318/10000 500 query: DROP TABLE tstparttbl2 query: CREATE TABLE tstparttbl2(KEY STRING, VALUE STRING) PARTITIONED BY(ds string) STORED AS TEXTFILE @@ -71,6 +73,8 @@ Map Reduce Alias -> Map Operator Tree: tstparttbl2 + TableScan + alias: tstparttbl2 Select Operator Group By Operator aggregations: @@ -106,7 +110,7 @@ query: select count(1) from tstparttbl2 Input: default/tstparttbl2/ds=2008-04-08 Input: default/tstparttbl2/ds=2008-04-09 -Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/317850076/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1030935442/10000 0 query: DROP TABLE tstparttbl query: CREATE TABLE tstparttbl(KEY STRING, VALUE STRING) PARTITIONED BY(ds string) STORED AS TEXTFILE @@ -126,6 +130,8 @@ Map Reduce Alias -> Map Operator Tree: tstparttbl + TableScan + alias: tstparttbl Select Operator Group By Operator aggregations: @@ -161,7 +167,7 @@ query: select count(1) from tstparttbl Input: default/tstparttbl/ds=2008-04-08 Input: default/tstparttbl/ds=2008-04-09 -Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1944930089/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1952278386/10000 500 query: DROP TABLE tstparttbl2 query: CREATE TABLE tstparttbl2(KEY STRING, VALUE STRING) PARTITIONED BY(ds string) STORED AS TEXTFILE @@ -181,6 +187,8 @@ Map Reduce Alias -> Map Operator Tree: tstparttbl2 + TableScan + alias: tstparttbl2 Select Operator Group By Operator aggregations: @@ -216,7 +224,7 @@ query: select count(1) from tstparttbl2 Input: default/tstparttbl2/ds=2008-04-08 Input: default/tstparttbl2/ds=2008-04-09 -Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/768347306/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1151414338/10000 0 query: DROP TABLE tstparttbl query: DROP TABLE tstparttbl2 Index: ql/src/test/results/clientpositive/groupby6.q.out =================================================================== --- ql/src/test/results/clientpositive/groupby6.q.out (revision 796808) +++ ql/src/test/results/clientpositive/groupby6.q.out (working copy) @@ -15,6 +15,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: value @@ -44,7 +46,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/2034874876/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1553598876/10002 Reduce Output Operator key expressions: expr: _col0 @@ -90,7 +92,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/770471577/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/633948298/10000 0 1 2 Index: ql/src/test/results/clientpositive/input_part9.q.out =================================================================== --- ql/src/test/results/clientpositive/input_part9.q.out (revision 796808) +++ ql/src/test/results/clientpositive/input_part9.q.out (working copy) @@ -12,11 +12,15 @@ Map Reduce Alias -> Map Operator Tree: x + TableScan + alias: x Filter Operator + isSamplingPred: false predicate: expr: (key is not null and (ds = '2008-04-08')) type: boolean Filter Operator + isSamplingPred: false predicate: expr: (key is not null and (ds = '2008-04-08')) type: boolean @@ -33,7 +37,7 @@ File Output Operator compressed: false GlobalTableId: 0 - directory: file:/data/users/njain/hive1/hive1/build/ql/tmp/1867593931/10001 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/909203334/10001 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -43,10 +47,10 @@ columns.types string:string:string:string Needs Tagging: false Path -> Alias: - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 Path -> Partition: - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 Partition partition values: ds 2008-04-08 @@ -65,10 +69,10 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/srcpart + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: srcpart - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 Partition partition values: ds 2008-04-08 @@ -87,7 +91,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/srcpart + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: srcpart @@ -99,7 +103,7 @@ query: SELECT x.* FROM SRCPART x WHERE key IS NOT NULL AND ds = '2008-04-08' Input: default/srcpart/ds=2008-04-08/hr=11 Input: default/srcpart/ds=2008-04-08/hr=12 -Output: file:/data/users/njain/hive1/hive1/build/ql/tmp/640376818/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/928251156/10000 238 val_238 2008-04-08 11 86 val_86 2008-04-08 11 311 val_311 2008-04-08 11 Index: ql/src/test/results/clientpositive/input4_limit.q.out =================================================================== --- ql/src/test/results/clientpositive/input4_limit.q.out (revision 796808) +++ ql/src/test/results/clientpositive/input4_limit.q.out (working copy) @@ -13,6 +13,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: key @@ -43,7 +45,7 @@ Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1567308263/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1797839583/10002 Reduce Output Operator key expressions: expr: _col0 @@ -72,7 +74,7 @@ query: select * from src sort by key limit 10 Input: default/src -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1617449632/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1169478789/10000 0 val_0 0 val_0 0 val_0 Index: ql/src/test/results/clientpositive/union9.q.out =================================================================== --- ql/src/test/results/clientpositive/union9.q.out (revision 796808) +++ ql/src/test/results/clientpositive/union9.q.out (working copy) @@ -16,6 +16,8 @@ Map Reduce Alias -> Map Operator Tree: null-subquery1-subquery1:unionsrc-subquery1-subquery1:s1 + TableScan + alias: s1 Select Operator expressions: expr: key @@ -35,6 +37,8 @@ expr: _col0 type: bigint null-subquery1-subquery2:unionsrc-subquery1-subquery2:s2 + TableScan + alias: s2 Select Operator expressions: expr: key @@ -54,6 +58,8 @@ expr: _col0 type: bigint null-subquery2:unionsrc-subquery2:s3 + TableScan + alias: s3 Select Operator expressions: expr: key @@ -97,5 +103,5 @@ select s2.key as key, s2.value as value from src s2 UNION ALL select s3.key as key, s3.value as value from src s3) unionsrc Input: default/src -Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1321381431/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/213010031/10000 1500 Index: ql/src/test/results/clientpositive/sort.q.out =================================================================== --- ql/src/test/results/clientpositive/sort.q.out (revision 796808) +++ ql/src/test/results/clientpositive/sort.q.out (working copy) @@ -12,6 +12,8 @@ Map Reduce Alias -> Map Operator Tree: x + TableScan + alias: x Select Operator expressions: expr: key @@ -45,7 +47,7 @@ query: SELECT x.* FROM SRC x SORT BY key Input: default/src -Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1617011148/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/760108579/10000 0 val_0 0 val_0 0 val_0 Index: ql/src/test/results/clientpositive/mapreduce4.q.out =================================================================== --- ql/src/test/results/clientpositive/mapreduce4.q.out (revision 796808) +++ ql/src/test/results/clientpositive/mapreduce4.q.out (working copy) @@ -18,6 +18,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: key @@ -97,7 +99,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/1878933561/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/82915632/10000 90 9 0 val_90 90 9 0 val_90 90 9 0 val_90 Index: ql/src/test/results/clientpositive/udf_parse_url.q.out =================================================================== --- ql/src/test/results/clientpositive/udf_parse_url.q.out (revision 796808) +++ ql/src/test/results/clientpositive/udf_parse_url.q.out (working copy) @@ -23,6 +23,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Filter Operator predicate: expr: (UDFToDouble(key) = UDFToDouble(86)) @@ -80,5 +82,5 @@ parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'AUTHORITY') FROM src WHERE key = 86 Input: default/src -Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/17165920/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/751738063/10000 facebook.com /path1/p.php k1=v1&k2=v2 Ref1 v2 v1 NULL /path1/p.php?k1=v1&k2=v2 http NULL facebook.com Index: ql/src/test/results/clientpositive/nullscript.q.out =================================================================== --- ql/src/test/results/clientpositive/nullscript.q.out (revision 796808) +++ ql/src/test/results/clientpositive/nullscript.q.out (working copy) @@ -16,6 +16,8 @@ Map Reduce Alias -> Map Operator Tree: nullscript + TableScan + alias: nullscript Select Operator expressions: expr: key @@ -39,7 +41,7 @@ query: select transform(key) using '/bin/cat' as key1 from nullscript Input: default/nullscript -Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/318391745/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1391923638/10000 238 86 311 Index: ql/src/test/results/clientpositive/groupby5_noskew.q.out =================================================================== --- ql/src/test/results/clientpositive/groupby5_noskew.q.out (revision 796808) +++ ql/src/test/results/clientpositive/groupby5_noskew.q.out (working copy) @@ -16,6 +16,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: key @@ -82,7 +84,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1880216237/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1958768198/10000 0 0.0 10 10.0 100 200.0 Index: ql/src/test/results/clientpositive/input23.q.out =================================================================== --- ql/src/test/results/clientpositive/input23.q.out (revision 796808) +++ ql/src/test/results/clientpositive/input23.q.out (working copy) @@ -12,7 +12,10 @@ Map Reduce Alias -> Map Operator Tree: b + TableScan + alias: b Filter Operator + isSamplingPred: false predicate: expr: ((ds = '2008-04-08') and (hr = '14')) type: boolean @@ -29,7 +32,10 @@ expr: hr type: string a + TableScan + alias: a Filter Operator + isSamplingPred: false predicate: expr: ((ds = '2008-04-08') and (hr = '11')) type: boolean @@ -47,9 +53,9 @@ type: string Needs Tagging: true Path -> Alias: - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 Path -> Partition: - file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 Partition partition values: ds 2008-04-08 @@ -68,7 +74,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/njain/hive1/hive1/build/ql/test/data/warehouse/srcpart + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: srcpart Reduce Operator Tree: @@ -79,6 +85,7 @@ 0 {VALUE._col0} {VALUE._col1} {VALUE._col2} {VALUE._col3} 1 {VALUE._col0} {VALUE._col1} {VALUE._col2} {VALUE._col3} Filter Operator + isSamplingPred: false predicate: expr: ((((_col2 = '2008-04-08') and (_col3 = '11')) and (_col6 = '2008-04-08')) and (_col7 = '14')) type: boolean @@ -104,7 +111,7 @@ File Output Operator compressed: false GlobalTableId: 0 - directory: file:/data/users/njain/hive1/hive1/build/ql/tmp/518105757/10001 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1320193526/10001 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -120,4 +127,4 @@ query: select * from srcpart a join srcpart b where a.ds = '2008-04-08' and a.hr = '11' and b.ds = '2008-04-08' and b.hr = '14' limit 5 Input: default/srcpart/ds=2008-04-08/hr=11 -Output: file:/data/users/njain/hive1/hive1/build/ql/tmp/1090207992/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1014190506/10000 Index: ql/src/test/results/clientpositive/sample5.q.out =================================================================== --- ql/src/test/results/clientpositive/sample5.q.out (revision 796808) +++ ql/src/test/results/clientpositive/sample5.q.out (working copy) @@ -16,11 +16,15 @@ Map Reduce Alias -> Map Operator Tree: s + TableScan + alias: s Filter Operator + isSamplingPred: false predicate: expr: (((hash(key) & 2147483647) % 5) = 0) type: boolean Filter Operator + isSamplingPred: true predicate: expr: (((hash(key) & 2147483647) % 5) = 0) type: boolean @@ -33,7 +37,7 @@ File Output Operator compressed: false GlobalTableId: 1 - directory: file:/Users/rmurthy/workspace/hive/build/ql/tmp/1149177794/10002 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1436648510/10002 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -47,14 +51,14 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/Users/rmurthy/workspace/hive/build/ql/test/data/warehouse/dest1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest1 Needs Tagging: false Path -> Alias: - file:/Users/rmurthy/workspace/hive/build/ql/test/data/warehouse/srcbucket + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcbucket Path -> Partition: - file:/Users/rmurthy/workspace/hive/build/ql/test/data/warehouse/srcbucket + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcbucket Partition input format: org.apache.hadoop.mapred.TextInputFormat @@ -70,7 +74,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/Users/rmurthy/workspace/hive/build/ql/test/data/warehouse/srcbucket + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcbucket serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: srcbucket @@ -80,11 +84,11 @@ Move Operator files: hdfs directory: true - source: file:/Users/rmurthy/workspace/hive/build/ql/tmp/1149177794/10002 - destination: file:/Users/rmurthy/workspace/hive/build/ql/tmp/964570774/10000 + source: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1436648510/10002 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1980020538/10000 Map Reduce Alias -> Map Operator Tree: - file:/Users/rmurthy/workspace/hive/build/ql/tmp/1149177794/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1436648510/10002 Reduce Output Operator sort order: Map-reduce partition columns: @@ -98,9 +102,9 @@ type: string Needs Tagging: false Path -> Alias: - file:/Users/rmurthy/workspace/hive/build/ql/tmp/1149177794/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1436648510/10002 Path -> Partition: - file:/Users/rmurthy/workspace/hive/build/ql/tmp/1149177794/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1436648510/10002 Partition input format: org.apache.hadoop.mapred.TextInputFormat @@ -115,7 +119,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/Users/rmurthy/workspace/hive/build/ql/test/data/warehouse/dest1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest1 Reduce Operator Tree: @@ -123,7 +127,7 @@ File Output Operator compressed: false GlobalTableId: 0 - directory: file:/Users/rmurthy/workspace/hive/build/ql/tmp/964570774/10000 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1980020538/10000 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -136,8 +140,8 @@ bucket_count -1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/Users/rmurthy/workspace/hive/build/ql/test/data/warehouse/dest1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest1 @@ -145,7 +149,7 @@ Move Operator tables: replace: true - source: file:/Users/rmurthy/workspace/hive/build/ql/tmp/964570774/10000 + source: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1980020538/10000 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -159,10 +163,10 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/Users/rmurthy/workspace/hive/build/ql/test/data/warehouse/dest1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest1 - tmp directory: file:/Users/rmurthy/workspace/hive/build/ql/tmp/964570774/10001 + tmp directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1980020538/10001 query: INSERT OVERWRITE TABLE dest1 SELECT s.* -- here's another test @@ -171,7 +175,7 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 SORT BY key, value Input: default/dest1 -Output: file:/Users/rmurthy/workspace/hive/build/ql/tmp/1391249417/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/374339980/10000 0 val_0 0 val_0 0 val_0 Index: ql/src/test/results/clientpositive/join26.q.out =================================================================== --- ql/src/test/results/clientpositive/join26.q.out (revision 796808) +++ ql/src/test/results/clientpositive/join26.q.out (working copy) @@ -17,15 +17,20 @@ Map Reduce Alias -> Map Operator Tree: z + TableScan + alias: z Filter Operator + isSamplingPred: false predicate: expr: ((ds = '2008-04-08') and (UDFToDouble(hr) = UDFToDouble(11))) type: boolean Filter Operator + isSamplingPred: false predicate: expr: (ds = '2008-04-08') type: boolean Filter Operator + isSamplingPred: false predicate: expr: (UDFToDouble(hr) = UDFToDouble(11)) type: boolean @@ -61,7 +66,7 @@ File Output Operator compressed: false GlobalTableId: 1 - directory: file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/107323288/10002 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1321271186/10002 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -75,7 +80,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest_j1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest_j1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest_j1 Local Work: @@ -89,6 +94,8 @@ limit: -1 Alias -> Map Local Operator Tree: y + TableScan + alias: y Common Join Operator condition map: Inner Join 0 to 1 @@ -121,7 +128,7 @@ File Output Operator compressed: false GlobalTableId: 1 - directory: file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/107323288/10002 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1321271186/10002 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -135,10 +142,12 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest_j1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest_j1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest_j1 x + TableScan + alias: x Common Join Operator condition map: Inner Join 0 to 1 @@ -171,7 +180,7 @@ File Output Operator compressed: false GlobalTableId: 1 - directory: file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/107323288/10002 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1321271186/10002 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -185,14 +194,14 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest_j1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest_j1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest_j1 Needs Tagging: false Path -> Alias: - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 Path -> Partition: - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 Partition partition values: ds 2008-04-08 @@ -211,7 +220,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/srcpart + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: srcpart @@ -221,11 +230,11 @@ Move Operator files: hdfs directory: true - source: file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/107323288/10002 - destination: file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/991349586/10000 + source: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1321271186/10002 + destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1748715496/10000 Map Reduce Alias -> Map Operator Tree: - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/107323288/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1321271186/10002 Reduce Output Operator sort order: Map-reduce partition columns: @@ -241,9 +250,9 @@ type: string Needs Tagging: false Path -> Alias: - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/107323288/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1321271186/10002 Path -> Partition: - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/107323288/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1321271186/10002 Partition input format: org.apache.hadoop.mapred.TextInputFormat @@ -258,7 +267,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest_j1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest_j1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest_j1 Reduce Operator Tree: @@ -266,7 +275,7 @@ File Output Operator compressed: false GlobalTableId: 0 - directory: file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/991349586/10000 + directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1748715496/10000 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -280,7 +289,7 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest_j1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest_j1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest_j1 @@ -288,7 +297,7 @@ Move Operator tables: replace: true - source: file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/991349586/10000 + source: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1748715496/10000 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -302,10 +311,10 @@ serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest_j1 + location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest_j1 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest_j1 - tmp directory: file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/991349586/10001 + tmp directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1748715496/10001 query: INSERT OVERWRITE TABLE dest_j1 @@ -318,7 +327,7 @@ Output: default/dest_j1 query: select * from dest_j1 x order by x.key Input: default/dest_j1 -Output: file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/350810175/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/443112157/10000 128 val_128 val_128 128 val_128 val_128 128 val_128 val_128 Index: ql/src/test/results/clientpositive/groupby5_map.q.out =================================================================== --- ql/src/test/results/clientpositive/groupby5_map.q.out (revision 796808) +++ ql/src/test/results/clientpositive/groupby5_map.q.out (working copy) @@ -13,6 +13,8 @@ Map Reduce Alias -> Map Operator Tree: src + TableScan + alias: src Select Operator expressions: expr: key @@ -65,5 +67,5 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/430800667/10000 +Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2046478039/10000 130091 Index: ql/src/test/results/compiler/plan/join2.q.xml =================================================================== --- ql/src/test/results/compiler/plan/join2.q.xml (revision 796808) +++ ql/src/test/results/compiler/plan/join2.q.xml (working copy) @@ -30,7 +30,7 @@ true - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/773086090/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1025001006/10000 @@ -83,7 +83,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 @@ -93,7 +93,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/773086090/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1025001006/10001 @@ -173,7 +173,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -202,6 +202,9 @@ _col0 + + src1 + @@ -259,6 +262,9 @@ _col0 + + src1 + @@ -297,6 +303,9 @@ _col2 + + src2 + @@ -479,6 +488,9 @@ value + + src3 + @@ -512,6 +524,9 @@ key + + src3 + @@ -645,6 +660,13 @@ + + + + src3 + + + @@ -699,7 +721,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1883742783/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/526105390/10002 $INTNAME @@ -707,7 +729,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src src3 @@ -719,7 +741,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1883742783/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/526105390/10002 @@ -753,7 +775,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -797,7 +819,7 @@ 1 - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/773086090/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1025001006/10000 @@ -851,6 +873,9 @@ _col5 + + src3 + @@ -862,6 +887,9 @@ _col2 + + src1 + @@ -940,6 +968,9 @@ VALUE._col1 + + src3 + @@ -951,6 +982,9 @@ VALUE._col2 + + src1 + @@ -1173,7 +1207,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -1241,7 +1275,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -1270,6 +1304,9 @@ key + + src2 + @@ -1286,6 +1323,9 @@ key + + src2 + @@ -1412,6 +1452,13 @@ + + + + src2 + + + @@ -1464,6 +1511,9 @@ key + + src1 + @@ -1480,6 +1530,9 @@ key + + src1 + @@ -1603,6 +1656,13 @@ + + + + src1 + + + @@ -1654,7 +1714,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src src2 @@ -1669,7 +1729,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -1706,7 +1766,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1883742783/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/526105390/10002 @@ -1735,6 +1795,9 @@ VALUE._col0 + + src2 + @@ -1746,6 +1809,9 @@ VALUE._col0 + + src1 + Index: ql/src/test/results/compiler/plan/input2.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input2.q.xml (revision 796808) +++ ql/src/test/results/compiler/plan/input2.q.xml (working copy) @@ -30,7 +30,7 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1231242820/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/876560732/10000 @@ -83,7 +83,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 @@ -93,7 +93,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1231242820/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/876560732/10001 @@ -121,10 +121,10 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1773686843/10006 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1610100885/10006 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1231242820/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/876560732/10000 @@ -142,7 +142,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1773686843/10006 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1610100885/10006 @@ -235,6 +235,9 @@ key + + + @@ -249,6 +252,9 @@ value + + + @@ -342,10 +348,10 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1773686843/10006 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1610100885/10006 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1773686843/10006 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1610100885/10006 @@ -354,7 +360,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1773686843/10006 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1610100885/10006 @@ -372,7 +378,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1231242820/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/876560732/10000 @@ -421,7 +427,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 file.outputformat @@ -457,6 +463,9 @@ VALUE + + + @@ -520,7 +529,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1773686843/10006 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1610100885/10006 @@ -570,7 +579,7 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1231242820/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/876560732/10002 @@ -623,7 +632,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest2 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest2 @@ -633,7 +642,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1231242820/10003 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/876560732/10003 @@ -661,10 +670,10 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1773686843/10007 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1610100885/10007 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1231242820/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/876560732/10002 @@ -682,7 +691,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1773686843/10007 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1610100885/10007 @@ -771,6 +780,9 @@ key + + + @@ -781,6 +793,9 @@ value + + + @@ -874,10 +889,10 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1773686843/10007 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1610100885/10007 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1773686843/10007 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1610100885/10007 @@ -886,7 +901,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1773686843/10007 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1610100885/10007 @@ -904,7 +919,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1231242820/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/876560732/10002 @@ -953,7 +968,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest2 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest2 file.outputformat @@ -989,6 +1004,9 @@ VALUE + + + @@ -1052,7 +1070,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1773686843/10007 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1610100885/10007 @@ -1111,7 +1129,7 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1231242820/10004 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/876560732/10004 @@ -1164,7 +1182,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest3 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest3 @@ -1174,7 +1192,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1231242820/10005 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/876560732/10005 @@ -1202,10 +1220,10 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1773686843/10008 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1610100885/10008 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1231242820/10004 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/876560732/10004 @@ -1223,7 +1241,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1773686843/10008 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1610100885/10008 @@ -1312,6 +1330,9 @@ key + + + @@ -1322,6 +1343,9 @@ value + + + @@ -1415,10 +1439,10 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1773686843/10008 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1610100885/10008 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1773686843/10008 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1610100885/10008 @@ -1427,7 +1451,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1773686843/10008 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1610100885/10008 @@ -1445,7 +1469,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1231242820/10004 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/876560732/10004 @@ -1498,7 +1522,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest3 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest3 file.outputformat @@ -1534,6 +1558,9 @@ VALUE + + + @@ -1601,7 +1628,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1773686843/10008 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1610100885/10008 @@ -1689,7 +1716,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -1724,7 +1751,7 @@ 1 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1773686843/10006 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1610100885/10006 @@ -1753,6 +1780,9 @@ value + + src + @@ -1764,6 +1794,9 @@ key + + src + @@ -1881,6 +1914,9 @@ key + + src + @@ -1993,7 +2029,7 @@ 2 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1773686843/10007 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1610100885/10007 @@ -2022,6 +2058,9 @@ value + + src + @@ -2033,6 +2072,9 @@ key + + src + @@ -2167,6 +2209,9 @@ key + + src + @@ -2262,6 +2307,9 @@ key + + src + @@ -2356,7 +2404,7 @@ 3 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1773686843/10008 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1610100885/10008 @@ -2396,6 +2444,9 @@ key + + src + @@ -2510,6 +2561,9 @@ key + + src + @@ -2583,6 +2637,13 @@ + + + + src + + + @@ -2607,7 +2668,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src src @@ -2619,7 +2680,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src Index: ql/src/test/results/compiler/plan/join3.q.xml =================================================================== --- ql/src/test/results/compiler/plan/join3.q.xml (revision 796808) +++ ql/src/test/results/compiler/plan/join3.q.xml (working copy) @@ -26,7 +26,7 @@ true - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1833177717/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1166257470/10000 @@ -79,7 +79,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 @@ -89,7 +89,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1833177717/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1166257470/10001 @@ -162,7 +162,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -230,7 +230,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -298,7 +298,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -331,6 +331,9 @@ key + + src2 + @@ -442,6 +445,13 @@ + + + + src2 + + + @@ -494,6 +504,9 @@ value + + src3 + @@ -510,6 +523,9 @@ key + + src3 + @@ -636,6 +652,13 @@ + + + + src3 + + + @@ -691,6 +714,9 @@ key + + src1 + @@ -707,6 +733,9 @@ key + + src1 + @@ -830,6 +859,13 @@ + + + + src1 + + + @@ -881,7 +917,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src src2 @@ -899,7 +935,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -943,7 +979,7 @@ 1 - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1833177717/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1166257470/10000 @@ -997,6 +1033,9 @@ _col5 + + src3 + @@ -1008,6 +1047,9 @@ _col0 + + src1 + @@ -1086,6 +1128,9 @@ VALUE._col1 + + src3 + @@ -1097,6 +1142,9 @@ VALUE._col0 + + src1 + Index: ql/src/test/results/compiler/plan/input3.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input3.q.xml (revision 796808) +++ ql/src/test/results/compiler/plan/input3.q.xml (working copy) @@ -30,7 +30,7 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/943669715/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/586179958/10000 @@ -83,7 +83,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 @@ -93,7 +93,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/943669715/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/586179958/10001 @@ -121,10 +121,10 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10007 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1114892063/10007 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/943669715/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/586179958/10000 @@ -142,7 +142,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10007 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1114892063/10007 @@ -235,6 +235,9 @@ key + + + @@ -249,6 +252,9 @@ value + + + @@ -342,10 +348,10 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10007 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1114892063/10007 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10007 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1114892063/10007 @@ -354,7 +360,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10007 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1114892063/10007 @@ -372,7 +378,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/943669715/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/586179958/10000 @@ -421,7 +427,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 file.outputformat @@ -457,6 +463,9 @@ VALUE + + + @@ -520,7 +529,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10007 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1114892063/10007 @@ -570,7 +579,7 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/943669715/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/586179958/10002 @@ -623,7 +632,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest2 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest2 @@ -633,7 +642,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/943669715/10003 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/586179958/10003 @@ -661,10 +670,10 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10008 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1114892063/10008 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/943669715/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/586179958/10002 @@ -682,7 +691,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10008 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1114892063/10008 @@ -771,6 +780,9 @@ key + + + @@ -781,6 +793,9 @@ value + + + @@ -874,10 +889,10 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10008 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1114892063/10008 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10008 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1114892063/10008 @@ -886,7 +901,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10008 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1114892063/10008 @@ -904,7 +919,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/943669715/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/586179958/10002 @@ -953,7 +968,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest2 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest2 file.outputformat @@ -989,6 +1004,9 @@ VALUE + + + @@ -1052,7 +1070,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10008 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1114892063/10008 @@ -1111,7 +1129,7 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/943669715/10004 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/586179958/10004 @@ -1164,7 +1182,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest3 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest3 @@ -1174,7 +1192,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/943669715/10005 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/586179958/10005 @@ -1202,10 +1220,10 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10009 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1114892063/10009 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/943669715/10004 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/586179958/10004 @@ -1223,7 +1241,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10009 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1114892063/10009 @@ -1312,6 +1330,9 @@ key + + + @@ -1322,6 +1343,9 @@ value + + + @@ -1415,10 +1439,10 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10009 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1114892063/10009 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10009 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1114892063/10009 @@ -1427,7 +1451,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10009 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1114892063/10009 @@ -1445,7 +1469,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/943669715/10004 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/586179958/10004 @@ -1498,7 +1522,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest3 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest3 file.outputformat @@ -1534,6 +1558,9 @@ VALUE + + + @@ -1601,7 +1628,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10009 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1114892063/10009 @@ -1654,7 +1681,7 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/943669715/10006 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/586179958/10006 ../../../../build/contrib/hive/ql/test/data/warehouse/dest4.out @@ -1685,10 +1712,10 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10010 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1114892063/10010 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/943669715/10006 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/586179958/10006 @@ -1706,7 +1733,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10010 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1114892063/10010 @@ -1792,6 +1819,9 @@ src.value + + + @@ -1875,10 +1905,10 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10010 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1114892063/10010 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10010 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1114892063/10010 @@ -1887,7 +1917,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10010 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1114892063/10010 @@ -1931,7 +1961,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/943669715/10006 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/586179958/10006 @@ -1985,6 +2015,9 @@ VALUE + + + @@ -2038,7 +2071,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10010 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1114892063/10010 @@ -2126,7 +2159,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -2161,7 +2194,7 @@ 1 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10007 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1114892063/10007 @@ -2190,6 +2223,9 @@ value + + src + @@ -2201,6 +2237,9 @@ key + + src + @@ -2318,6 +2357,9 @@ key + + src + @@ -2430,7 +2472,7 @@ 2 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10008 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1114892063/10008 @@ -2459,6 +2501,9 @@ value + + src + @@ -2470,6 +2515,9 @@ key + + src + @@ -2604,6 +2652,9 @@ key + + src + @@ -2699,6 +2750,9 @@ key + + src + @@ -2793,7 +2847,7 @@ 3 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10009 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1114892063/10009 @@ -2833,6 +2887,9 @@ key + + src + @@ -2967,6 +3024,9 @@ key + + src + @@ -3062,6 +3122,9 @@ key + + src + @@ -3156,7 +3219,7 @@ 4 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10010 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1114892063/10010 @@ -3185,6 +3248,9 @@ value + + src + @@ -3283,6 +3349,9 @@ key + + src + @@ -3356,6 +3425,13 @@ + + + + src + + + @@ -3380,7 +3456,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src src @@ -3392,7 +3468,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src Index: ql/src/test/results/compiler/plan/join4.q.xml =================================================================== --- ql/src/test/results/compiler/plan/join4.q.xml (revision 796808) +++ ql/src/test/results/compiler/plan/join4.q.xml (working copy) @@ -64,7 +64,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -132,7 +132,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -351,6 +351,9 @@ value + + src1 + @@ -362,6 +365,9 @@ key + + src1 + @@ -496,6 +502,9 @@ key + + src1 + @@ -603,6 +612,9 @@ key + + src1 + @@ -741,6 +753,9 @@ key + + src1 + @@ -812,6 +827,9 @@ key + + src1 + @@ -885,6 +903,13 @@ + + + + src1 + + + @@ -1108,6 +1133,9 @@ value + + src2 + @@ -1119,6 +1147,9 @@ key + + src2 + @@ -1253,6 +1284,9 @@ key + + src2 + @@ -1348,6 +1382,9 @@ key + + src2 + @@ -1486,6 +1523,9 @@ key + + src2 + @@ -1557,6 +1597,9 @@ key + + src2 + @@ -1630,6 +1673,13 @@ + + + + src2 + + + @@ -1663,7 +1713,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src c:a:src1 @@ -1678,7 +1728,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -1723,7 +1773,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/185294480/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1940373938/10001 @@ -1966,6 +2016,9 @@ _col3 + + b + @@ -1977,6 +2030,9 @@ _col2 + + b + @@ -1988,6 +2044,9 @@ _col1 + + a + @@ -1999,6 +2058,9 @@ _col0 + + a + @@ -2109,6 +2171,9 @@ VALUE._col1 + + b + @@ -2120,6 +2185,9 @@ VALUE._col0 + + b + @@ -2131,6 +2199,9 @@ VALUE._col1 + + a + @@ -2142,6 +2213,9 @@ VALUE._col0 + + a + Index: ql/src/test/results/compiler/plan/input4.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input4.q.xml (revision 796808) +++ ql/src/test/results/compiler/plan/input4.q.xml (working copy) @@ -26,7 +26,7 @@ true - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/326603487/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/474383658/10000 @@ -79,7 +79,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 @@ -89,7 +89,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/326603487/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/474383658/10001 @@ -162,7 +162,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -466,6 +466,9 @@ value + + src + @@ -477,6 +480,9 @@ key + + src + @@ -547,6 +553,13 @@ + + + + src + + + @@ -598,7 +611,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src tmap:src @@ -610,7 +623,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -658,7 +671,7 @@ 1 - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/326603487/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/474383658/10000 @@ -712,6 +725,9 @@ _col1 + + tmap + @@ -723,6 +739,9 @@ _col0 + + tmap + @@ -837,6 +856,9 @@ _col0 + + tmap + @@ -950,6 +972,9 @@ VALUE + + + Index: ql/src/test/results/compiler/plan/join5.q.xml =================================================================== --- ql/src/test/results/compiler/plan/join5.q.xml (revision 796808) +++ ql/src/test/results/compiler/plan/join5.q.xml (working copy) @@ -64,7 +64,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -132,7 +132,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -351,6 +351,9 @@ value + + src1 + @@ -362,6 +365,9 @@ key + + src1 + @@ -496,6 +502,9 @@ key + + src1 + @@ -603,6 +612,9 @@ key + + src1 + @@ -741,6 +753,9 @@ key + + src1 + @@ -812,6 +827,9 @@ key + + src1 + @@ -885,6 +903,13 @@ + + + + src1 + + + @@ -1108,6 +1133,9 @@ value + + src2 + @@ -1119,6 +1147,9 @@ key + + src2 + @@ -1253,6 +1284,9 @@ key + + src2 + @@ -1348,6 +1382,9 @@ key + + src2 + @@ -1486,6 +1523,9 @@ key + + src2 + @@ -1557,6 +1597,9 @@ key + + src2 + @@ -1630,6 +1673,13 @@ + + + + src2 + + + @@ -1663,7 +1713,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src c:a:src1 @@ -1678,7 +1728,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -1723,7 +1773,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1048442464/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/359582936/10001 @@ -1966,6 +2016,9 @@ _col3 + + b + @@ -1977,6 +2030,9 @@ _col2 + + b + @@ -1988,6 +2044,9 @@ _col1 + + a + @@ -1999,6 +2058,9 @@ _col0 + + a + @@ -2109,6 +2171,9 @@ VALUE._col1 + + b + @@ -2120,6 +2185,9 @@ VALUE._col0 + + b + @@ -2131,6 +2199,9 @@ VALUE._col1 + + a + @@ -2142,6 +2213,9 @@ VALUE._col0 + + a + Index: ql/src/test/results/compiler/plan/input5.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input5.q.xml (revision 796808) +++ ql/src/test/results/compiler/plan/input5.q.xml (working copy) @@ -26,7 +26,7 @@ true - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/tmp/129277062/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1695012277/10000 @@ -79,7 +79,7 @@ location - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/dest1 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 @@ -89,7 +89,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/tmp/129277062/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1695012277/10001 @@ -166,7 +166,7 @@ location - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src_thrift + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src_thrift @@ -470,6 +470,9 @@ lintstring + + src_thrift + @@ -485,6 +488,9 @@ lint + + src_thrift + @@ -563,6 +569,13 @@ + + + + src_thrift + + + @@ -665,7 +678,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src_thrift + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src_thrift tmap:src_thrift @@ -677,7 +690,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src_thrift + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src_thrift @@ -721,7 +734,7 @@ 1 - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/tmp/129277062/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1695012277/10000 @@ -775,6 +788,9 @@ _col1 + + tmap + @@ -786,6 +802,9 @@ _col0 + + tmap + @@ -863,6 +882,9 @@ VALUE + + + Index: ql/src/test/results/compiler/plan/join6.q.xml =================================================================== --- ql/src/test/results/compiler/plan/join6.q.xml (revision 796808) +++ ql/src/test/results/compiler/plan/join6.q.xml (working copy) @@ -64,7 +64,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -132,7 +132,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -351,6 +351,9 @@ value + + src1 + @@ -362,6 +365,9 @@ key + + src1 + @@ -496,6 +502,9 @@ key + + src1 + @@ -603,6 +612,9 @@ key + + src1 + @@ -741,6 +753,9 @@ key + + src1 + @@ -812,6 +827,9 @@ key + + src1 + @@ -885,6 +903,13 @@ + + + + src1 + + + @@ -1108,6 +1133,9 @@ value + + src2 + @@ -1119,6 +1147,9 @@ key + + src2 + @@ -1253,6 +1284,9 @@ key + + src2 + @@ -1348,6 +1382,9 @@ key + + src2 + @@ -1486,6 +1523,9 @@ key + + src2 + @@ -1557,6 +1597,9 @@ key + + src2 + @@ -1630,6 +1673,13 @@ + + + + src2 + + + @@ -1663,7 +1713,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src c:a:src1 @@ -1678,7 +1728,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -1723,7 +1773,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/397527640/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/373975660/10001 @@ -1966,6 +2016,9 @@ _col3 + + b + @@ -1977,6 +2030,9 @@ _col2 + + b + @@ -1988,6 +2044,9 @@ _col1 + + a + @@ -1999,6 +2058,9 @@ _col0 + + a + @@ -2109,6 +2171,9 @@ VALUE._col1 + + b + @@ -2120,6 +2185,9 @@ VALUE._col0 + + b + @@ -2131,6 +2199,9 @@ VALUE._col1 + + a + @@ -2142,6 +2213,9 @@ VALUE._col0 + + a + Index: ql/src/test/results/compiler/plan/input_testxpath2.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input_testxpath2.q.xml (revision 796808) +++ ql/src/test/results/compiler/plan/input_testxpath2.q.xml (working copy) @@ -68,7 +68,7 @@ location - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src_thrift + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src_thrift @@ -104,7 +104,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/tmp/179258729/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/316372344/10001 @@ -202,6 +202,9 @@ mstringstring + + src_thrift + @@ -238,6 +241,9 @@ lintstring + + src_thrift + @@ -267,6 +273,9 @@ lint + + src_thrift + @@ -398,6 +407,9 @@ lint + + src_thrift + @@ -443,6 +455,9 @@ mstringstring + + src_thrift + @@ -578,6 +593,9 @@ lint + + src_thrift + @@ -612,6 +630,9 @@ mstringstring + + src_thrift + @@ -661,6 +682,13 @@ + + + + src_thrift + + + @@ -688,7 +716,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src_thrift + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src_thrift src_thrift @@ -700,7 +728,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src_thrift + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src_thrift Index: ql/src/test/results/compiler/plan/input6.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input6.q.xml (revision 796808) +++ ql/src/test/results/compiler/plan/input6.q.xml (working copy) @@ -30,7 +30,7 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/859581041/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/735533751/10000 @@ -83,7 +83,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 @@ -93,7 +93,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/859581041/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/735533751/10001 @@ -121,10 +121,10 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/193107959/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/869139276/10002 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/859581041/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/735533751/10000 @@ -142,7 +142,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/193107959/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/869139276/10002 @@ -235,6 +235,9 @@ key + + + @@ -249,6 +252,9 @@ value + + + @@ -342,10 +348,10 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/193107959/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/869139276/10002 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/193107959/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/869139276/10002 @@ -354,7 +360,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/193107959/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/869139276/10002 @@ -372,7 +378,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/859581041/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/735533751/10000 @@ -421,7 +427,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 file.outputformat @@ -457,6 +463,9 @@ VALUE + + + @@ -520,7 +529,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/193107959/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/869139276/10002 @@ -608,7 +617,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src1 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src1 @@ -647,7 +656,7 @@ 1 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/193107959/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/869139276/10002 @@ -676,6 +685,9 @@ value + + src1 + @@ -687,6 +699,9 @@ key + + src1 + @@ -768,6 +783,9 @@ key + + src1 + @@ -839,6 +857,9 @@ key + + src1 + @@ -874,6 +895,13 @@ + + + + src1 + + + @@ -898,7 +926,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src1 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src1 src1 @@ -910,7 +938,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src1 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src1 Index: ql/src/test/results/compiler/plan/join7.q.xml =================================================================== --- ql/src/test/results/compiler/plan/join7.q.xml (revision 796808) +++ ql/src/test/results/compiler/plan/join7.q.xml (working copy) @@ -64,7 +64,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -132,7 +132,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -200,7 +200,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -419,6 +419,9 @@ value + + src1 + @@ -430,6 +433,9 @@ key + + src1 + @@ -564,6 +570,9 @@ key + + src1 + @@ -671,6 +680,9 @@ key + + src1 + @@ -809,6 +821,9 @@ key + + src1 + @@ -880,6 +895,9 @@ key + + src1 + @@ -953,6 +971,13 @@ + + + + src1 + + + @@ -1176,6 +1201,9 @@ value + + src2 + @@ -1187,6 +1215,9 @@ key + + src2 + @@ -1321,6 +1352,9 @@ key + + src2 + @@ -1416,6 +1450,9 @@ key + + src2 + @@ -1554,6 +1591,9 @@ key + + src2 + @@ -1625,6 +1665,9 @@ key + + src2 + @@ -1698,6 +1741,13 @@ + + + + src2 + + + @@ -1921,6 +1971,9 @@ value + + src3 + @@ -1932,6 +1985,9 @@ key + + src3 + @@ -2066,6 +2122,9 @@ key + + src3 + @@ -2161,6 +2220,9 @@ key + + src3 + @@ -2299,6 +2361,9 @@ key + + src3 + @@ -2370,6 +2435,9 @@ key + + src3 + @@ -2443,6 +2511,13 @@ + + + + src3 + + + @@ -2476,7 +2551,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src c:a:src1 @@ -2494,7 +2569,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -2539,7 +2614,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/245344500/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/433489518/10001 @@ -2856,6 +2931,9 @@ _col5 + + c + @@ -2867,6 +2945,9 @@ _col4 + + c + @@ -2878,6 +2959,9 @@ _col3 + + b + @@ -2889,6 +2973,9 @@ _col2 + + b + @@ -2900,6 +2987,9 @@ _col1 + + a + @@ -2911,6 +3001,9 @@ _col0 + + a + @@ -3053,6 +3146,9 @@ VALUE._col1 + + c + @@ -3064,6 +3160,9 @@ VALUE._col0 + + c + @@ -3075,6 +3174,9 @@ VALUE._col1 + + b + @@ -3086,6 +3188,9 @@ VALUE._col0 + + b + @@ -3097,6 +3202,9 @@ VALUE._col1 + + a + @@ -3108,6 +3216,9 @@ VALUE._col0 + + a + Index: ql/src/test/results/compiler/plan/input7.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input7.q.xml (revision 796808) +++ ql/src/test/results/compiler/plan/input7.q.xml (working copy) @@ -30,7 +30,7 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/471888232/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1783749025/10000 @@ -83,7 +83,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 @@ -93,7 +93,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/471888232/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1783749025/10001 @@ -121,10 +121,10 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1506551529/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1917168887/10002 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/471888232/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1783749025/10000 @@ -142,7 +142,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1506551529/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1917168887/10002 @@ -235,6 +235,9 @@ key + + + @@ -249,6 +252,9 @@ value + + + @@ -342,10 +348,10 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1506551529/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1917168887/10002 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1506551529/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1917168887/10002 @@ -354,7 +360,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1506551529/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1917168887/10002 @@ -372,7 +378,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/471888232/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1783749025/10000 @@ -421,7 +427,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 file.outputformat @@ -457,6 +463,9 @@ VALUE + + + @@ -524,7 +533,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1506551529/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1917168887/10002 @@ -612,7 +621,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src1 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src1 @@ -643,7 +652,7 @@ 1 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1506551529/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1917168887/10002 @@ -672,6 +681,9 @@ key + + src1 + @@ -750,6 +762,13 @@ + + + + src1 + + + @@ -792,7 +811,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src1 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src1 src1 @@ -804,7 +823,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src1 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src1 Index: ql/src/test/results/compiler/plan/join8.q.xml =================================================================== --- ql/src/test/results/compiler/plan/join8.q.xml (revision 796808) +++ ql/src/test/results/compiler/plan/join8.q.xml (working copy) @@ -64,7 +64,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -132,7 +132,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -351,6 +351,9 @@ value + + src1 + @@ -362,6 +365,9 @@ key + + src1 + @@ -496,6 +502,9 @@ key + + src1 + @@ -603,6 +612,9 @@ key + + src1 + @@ -741,6 +753,9 @@ key + + src1 + @@ -812,6 +827,9 @@ key + + src1 + @@ -885,6 +903,13 @@ + + + + src1 + + + @@ -1108,6 +1133,9 @@ value + + src2 + @@ -1119,6 +1147,9 @@ key + + src2 + @@ -1253,6 +1284,9 @@ key + + src2 + @@ -1348,6 +1382,9 @@ key + + src2 + @@ -1486,6 +1523,9 @@ key + + src2 + @@ -1557,6 +1597,9 @@ key + + src2 + @@ -1630,6 +1673,13 @@ + + + + src2 + + + @@ -1663,7 +1713,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src c:a:src1 @@ -1678,7 +1728,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -1727,7 +1777,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/2085351933/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1545779089/10001 @@ -2108,6 +2158,9 @@ _col3 + + b + @@ -2119,6 +2172,9 @@ _col2 + + b + @@ -2130,6 +2186,9 @@ _col1 + + a + @@ -2141,6 +2200,9 @@ _col0 + + a + @@ -2223,6 +2285,9 @@ VALUE._col1 + + b + @@ -2234,6 +2299,9 @@ VALUE._col0 + + b + @@ -2245,6 +2313,9 @@ VALUE._col1 + + a + @@ -2256,6 +2327,9 @@ VALUE._col0 + + a + Index: ql/src/test/results/compiler/plan/input_testsequencefile.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input_testsequencefile.q.xml (revision 796808) +++ ql/src/test/results/compiler/plan/input_testsequencefile.q.xml (working copy) @@ -30,7 +30,7 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/967650497/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1035004410/10000 @@ -83,7 +83,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest4_sequencefile + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest4_sequencefile @@ -93,7 +93,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/967650497/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1035004410/10001 @@ -121,10 +121,10 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1146419397/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/413589060/10002 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/967650497/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1035004410/10000 @@ -142,7 +142,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1146419397/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/413589060/10002 @@ -235,6 +235,9 @@ key + + + @@ -249,6 +252,9 @@ value + + + @@ -342,10 +348,10 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1146419397/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/413589060/10002 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1146419397/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/413589060/10002 @@ -354,7 +360,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1146419397/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/413589060/10002 @@ -372,7 +378,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/967650497/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1035004410/10000 @@ -421,7 +427,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest4_sequencefile + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest4_sequencefile file.outputformat @@ -457,6 +463,9 @@ VALUE + + + @@ -520,7 +529,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1146419397/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/413589060/10002 @@ -608,7 +617,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -639,7 +648,7 @@ 1 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1146419397/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/413589060/10002 @@ -668,6 +677,9 @@ value + + src + @@ -679,6 +691,9 @@ key + + src + @@ -749,6 +764,13 @@ + + + + src + + + @@ -794,7 +816,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src src @@ -806,7 +828,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src Index: ql/src/test/results/compiler/plan/input8.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input8.q.xml (revision 796808) +++ ql/src/test/results/compiler/plan/input8.q.xml (working copy) @@ -64,7 +64,7 @@ location - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src1 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src1 @@ -92,7 +92,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/tmp/1325741410/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1935782658/10001 @@ -265,6 +265,9 @@ key + + src1 + @@ -449,6 +452,13 @@ + + + + src1 + + + @@ -491,7 +501,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src1 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src1 src1 @@ -503,7 +513,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src1 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src1 Index: ql/src/test/results/compiler/plan/union.q.xml =================================================================== --- ql/src/test/results/compiler/plan/union.q.xml (revision 796808) +++ ql/src/test/results/compiler/plan/union.q.xml (working copy) @@ -33,7 +33,7 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1824776098/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/192688784/10000 ../build/ql/test/data/warehouse/union.out @@ -64,10 +64,10 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/555401062/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1915142156/10001 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1824776098/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/192688784/10000 @@ -85,7 +85,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/555401062/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1915142156/10001 @@ -178,6 +178,9 @@ unioninput.key + + + @@ -192,6 +195,9 @@ unioninput.value + + + @@ -285,10 +291,10 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/555401062/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1915142156/10001 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/555401062/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1915142156/10001 @@ -297,7 +303,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/555401062/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1915142156/10001 @@ -341,7 +347,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1824776098/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/192688784/10000 @@ -395,6 +401,9 @@ VALUE + + + @@ -458,7 +467,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/555401062/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1915142156/10001 @@ -546,7 +555,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -614,7 +623,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -661,7 +670,7 @@ 1 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/555401062/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1915142156/10001 @@ -690,6 +699,9 @@ _col1 + + src + @@ -701,6 +713,9 @@ _col0 + + src + @@ -799,6 +814,9 @@ value + + src + @@ -810,6 +828,9 @@ key + + src + @@ -899,6 +920,9 @@ key + + src + @@ -1000,6 +1024,9 @@ key + + src + @@ -1059,6 +1086,13 @@ + + + + src + + + @@ -1195,6 +1229,9 @@ value + + src + @@ -1206,6 +1243,9 @@ key + + src + @@ -1306,6 +1346,9 @@ key + + src + @@ -1427,6 +1470,9 @@ key + + src + @@ -1493,6 +1539,13 @@ + + + + src + + + @@ -1521,7 +1574,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src null-subquery1:unioninput-subquery1:src @@ -1536,7 +1589,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src Index: ql/src/test/results/compiler/plan/input9.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input9.q.xml (revision 796808) +++ ql/src/test/results/compiler/plan/input9.q.xml (working copy) @@ -30,7 +30,7 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/120413419/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2127984322/10000 @@ -83,7 +83,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 @@ -93,7 +93,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/120413419/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2127984322/10001 @@ -121,10 +121,10 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1640616512/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1986155657/10002 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/120413419/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2127984322/10000 @@ -142,7 +142,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1640616512/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1986155657/10002 @@ -235,6 +235,9 @@ key + + + @@ -249,6 +252,9 @@ value + + + @@ -342,10 +348,10 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1640616512/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1986155657/10002 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1640616512/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1986155657/10002 @@ -354,7 +360,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1640616512/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1986155657/10002 @@ -372,7 +378,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/120413419/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2127984322/10000 @@ -421,7 +427,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 file.outputformat @@ -457,6 +463,9 @@ VALUE + + + @@ -524,7 +533,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1640616512/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1986155657/10002 @@ -612,7 +621,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src1 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src1 @@ -651,7 +660,7 @@ 1 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1640616512/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1986155657/10002 @@ -680,6 +689,9 @@ key + + src1 + @@ -899,6 +911,13 @@ + + + + src1 + + + @@ -920,7 +939,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src1 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src1 src1 @@ -932,7 +951,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src1 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src1 Index: ql/src/test/results/compiler/plan/udf1.q.xml =================================================================== --- ql/src/test/results/compiler/plan/udf1.q.xml (revision 796808) +++ ql/src/test/results/compiler/plan/udf1.q.xml (working copy) @@ -64,7 +64,7 @@ location - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -100,7 +100,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/tmp/1175969971/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/13429007/10001 @@ -1549,6 +1549,9 @@ key + + src + @@ -1678,6 +1681,9 @@ key + + src + @@ -1744,6 +1750,13 @@ + + + + src + + + @@ -1765,7 +1778,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src src @@ -1777,7 +1790,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src Index: ql/src/test/results/compiler/plan/udf4.q.xml =================================================================== --- ql/src/test/results/compiler/plan/udf4.q.xml (revision 796808) +++ ql/src/test/results/compiler/plan/udf4.q.xml (working copy) @@ -64,7 +64,7 @@ location - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 @@ -92,7 +92,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/tmp/312017041/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/710014415/10001 @@ -1496,6 +1496,13 @@ + + + + dest1 + + + @@ -1538,7 +1545,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 dest1 @@ -1550,7 +1557,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 Index: ql/src/test/results/compiler/plan/input_testxpath.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input_testxpath.q.xml (revision 796808) +++ ql/src/test/results/compiler/plan/input_testxpath.q.xml (working copy) @@ -68,7 +68,7 @@ location - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src_thrift + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src_thrift @@ -96,7 +96,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/tmp/2068674940/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1751377301/10001 @@ -198,6 +198,9 @@ mstringstring + + src_thrift + @@ -242,6 +245,9 @@ lintstring + + src_thrift + @@ -292,6 +298,9 @@ lint + + src_thrift + @@ -402,6 +411,13 @@ + + + + src_thrift + + + @@ -494,7 +510,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src_thrift + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src_thrift src_thrift @@ -506,7 +522,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src_thrift + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src_thrift Index: ql/src/test/results/compiler/plan/udf6.q.xml =================================================================== --- ql/src/test/results/compiler/plan/udf6.q.xml (revision 796808) +++ ql/src/test/results/compiler/plan/udf6.q.xml (working copy) @@ -64,7 +64,7 @@ location - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -92,7 +92,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/tmp/1889137772/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1925641413/10001 @@ -336,6 +336,13 @@ + + + + src + + + @@ -374,7 +381,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src src @@ -386,7 +393,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src Index: ql/src/test/results/compiler/plan/input_part1.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input_part1.q.xml (revision 796808) +++ ql/src/test/results/compiler/plan/input_part1.q.xml (working copy) @@ -77,7 +77,7 @@ location - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/srcpart + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart @@ -113,7 +113,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/tmp/1486263187/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1160930068/10001 @@ -217,6 +217,9 @@ ds + + srcpart + @@ -228,6 +231,9 @@ hr + + srcpart + @@ -239,6 +245,9 @@ value + + srcpart + @@ -250,6 +259,9 @@ key + + srcpart + @@ -436,6 +448,9 @@ key + + srcpart + @@ -526,6 +541,9 @@ ds + + srcpart + @@ -580,6 +598,9 @@ hr + + srcpart + @@ -717,6 +738,9 @@ key + + srcpart + @@ -778,6 +802,9 @@ ds + + srcpart + @@ -822,6 +849,9 @@ hr + + srcpart + @@ -871,6 +901,13 @@ + + + + srcpart + + + @@ -901,7 +938,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 srcpart @@ -913,7 +950,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 Index: ql/src/test/results/compiler/plan/groupby1.q.xml =================================================================== --- ql/src/test/results/compiler/plan/groupby1.q.xml (revision 796808) +++ ql/src/test/results/compiler/plan/groupby1.q.xml (working copy) @@ -26,7 +26,7 @@ true - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/706639104/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1213736270/10000 @@ -79,7 +79,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 @@ -89,7 +89,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/706639104/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1213736270/10001 @@ -162,7 +162,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -199,6 +199,9 @@ _col0 + + + @@ -278,6 +281,9 @@ _col1 + + + @@ -367,6 +373,9 @@ key + + src + @@ -418,6 +427,9 @@ value + + src + @@ -522,6 +534,9 @@ key + + src + @@ -532,6 +547,9 @@ value + + src + @@ -593,6 +611,13 @@ + + + + src + + + @@ -623,7 +648,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src src @@ -635,7 +660,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -679,7 +704,7 @@ 1 - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/706639104/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1213736270/10000 @@ -733,6 +758,9 @@ _col1 + + + @@ -744,6 +772,9 @@ _col0 + + + Index: ql/src/test/results/compiler/plan/groupby2.q.xml =================================================================== --- ql/src/test/results/compiler/plan/groupby2.q.xml (revision 796808) +++ ql/src/test/results/compiler/plan/groupby2.q.xml (working copy) @@ -64,7 +64,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -101,6 +101,9 @@ _col0 + + + @@ -116,6 +119,9 @@ _col1 + + + @@ -204,6 +210,9 @@ _col2 + + + @@ -218,6 +227,9 @@ _col3 + + + @@ -347,6 +359,9 @@ value + + src + @@ -402,6 +417,9 @@ key + + src + @@ -483,6 +501,9 @@ value + + src + @@ -547,6 +568,9 @@ value + + src + @@ -676,6 +700,9 @@ key + + src + @@ -686,6 +713,9 @@ value + + src + @@ -747,6 +777,13 @@ + + + + src + + + @@ -777,7 +814,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src src @@ -789,7 +826,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -830,7 +867,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1682245307/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/385750402/10001 @@ -940,6 +977,9 @@ _col0 + + + @@ -967,6 +1007,9 @@ _col2 + + + @@ -992,6 +1035,9 @@ _col1 + + + @@ -1003,6 +1049,9 @@ _col0 + + + Index: ql/src/test/results/compiler/plan/udf_case.q.xml =================================================================== --- ql/src/test/results/compiler/plan/udf_case.q.xml (revision 796808) +++ ql/src/test/results/compiler/plan/udf_case.q.xml (working copy) @@ -64,7 +64,7 @@ location - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -96,7 +96,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/tmp/848278268/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/726688263/10001 @@ -404,6 +404,13 @@ + + + + src + + + @@ -446,7 +453,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src src @@ -458,7 +465,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src Index: ql/src/test/results/compiler/plan/subq.q.xml =================================================================== --- ql/src/test/results/compiler/plan/subq.q.xml (revision 796808) +++ ql/src/test/results/compiler/plan/subq.q.xml (working copy) @@ -33,7 +33,7 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1374780294/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1374961512/10000 ../build/ql/test/data/warehouse/union.out @@ -64,10 +64,10 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/604868872/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1547411239/10001 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1374780294/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1374961512/10000 @@ -85,7 +85,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/604868872/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1547411239/10001 @@ -178,6 +178,9 @@ unioninput.key + + + @@ -192,6 +195,9 @@ unioninput.value + + + @@ -285,10 +291,10 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/604868872/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1547411239/10001 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/604868872/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1547411239/10001 @@ -297,7 +303,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/604868872/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1547411239/10001 @@ -341,7 +347,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1374780294/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1374961512/10000 @@ -395,6 +401,9 @@ VALUE + + + @@ -458,7 +467,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/604868872/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1547411239/10001 @@ -546,7 +555,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -589,7 +598,7 @@ 1 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/604868872/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1547411239/10001 @@ -618,6 +627,9 @@ _col1 + + src + @@ -629,6 +641,9 @@ _col0 + + src + @@ -710,6 +725,9 @@ value + + src + @@ -721,6 +739,9 @@ key + + src + @@ -838,6 +859,9 @@ key + + src + @@ -967,6 +991,9 @@ key + + src + @@ -1033,6 +1060,13 @@ + + + + src + + + @@ -1057,7 +1091,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src unioninput:src @@ -1069,7 +1103,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src Index: ql/src/test/results/compiler/plan/groupby3.q.xml =================================================================== --- ql/src/test/results/compiler/plan/groupby3.q.xml (revision 796808) +++ ql/src/test/results/compiler/plan/groupby3.q.xml (working copy) @@ -64,7 +64,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -101,6 +101,9 @@ _col0 + + + @@ -192,6 +195,9 @@ _col1 + + + @@ -206,6 +212,9 @@ _col2 + + + @@ -216,6 +225,9 @@ _col3 + + + @@ -226,6 +238,9 @@ _col4 + + + @@ -236,6 +251,9 @@ _col5 + + + @@ -381,6 +399,9 @@ value + + src + @@ -453,6 +474,9 @@ value + + src + @@ -517,6 +541,9 @@ value + + src + @@ -584,6 +611,9 @@ value + + src + @@ -652,6 +682,9 @@ value + + src + @@ -720,6 +753,9 @@ value + + src + @@ -872,6 +908,9 @@ value + + src + @@ -920,6 +959,13 @@ + + + + src + + + @@ -961,7 +1007,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src src @@ -973,7 +1019,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -1014,7 +1060,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1043603428/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/927520441/10001 @@ -1124,6 +1170,9 @@ _col4 + + + @@ -1135,6 +1184,9 @@ _col3 + + + @@ -1146,6 +1198,9 @@ _col2 + + + @@ -1157,6 +1212,9 @@ _col1 + + + @@ -1168,6 +1226,9 @@ _col0 + + + Index: ql/src/test/results/compiler/plan/groupby4.q.xml =================================================================== --- ql/src/test/results/compiler/plan/groupby4.q.xml (revision 796808) +++ ql/src/test/results/compiler/plan/groupby4.q.xml (working copy) @@ -64,7 +64,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -101,6 +101,9 @@ _col0 + + + @@ -263,6 +266,9 @@ key + + src + @@ -365,6 +371,9 @@ key + + src + @@ -413,6 +422,13 @@ + + + + src + + + @@ -454,7 +470,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src src @@ -466,7 +482,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -507,7 +523,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1174115931/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/359284942/10001 @@ -577,6 +593,9 @@ _col0 + + + Index: ql/src/test/results/compiler/plan/groupby5.q.xml =================================================================== --- ql/src/test/results/compiler/plan/groupby5.q.xml (revision 796808) +++ ql/src/test/results/compiler/plan/groupby5.q.xml (working copy) @@ -64,7 +64,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -101,6 +101,9 @@ _col0 + + + @@ -180,6 +183,9 @@ _col1 + + + @@ -269,6 +275,9 @@ key + + src + @@ -320,6 +329,9 @@ value + + src + @@ -424,6 +436,9 @@ key + + src + @@ -434,6 +449,9 @@ value + + src + @@ -495,6 +513,13 @@ + + + + src + + + @@ -525,7 +550,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src src @@ -537,7 +562,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -578,7 +603,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1095942610/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1513087886/10001 @@ -658,6 +683,9 @@ _col1 + + + @@ -669,6 +697,9 @@ _col0 + + + Index: ql/src/test/results/compiler/plan/groupby6.q.xml =================================================================== --- ql/src/test/results/compiler/plan/groupby6.q.xml (revision 796808) +++ ql/src/test/results/compiler/plan/groupby6.q.xml (working copy) @@ -64,7 +64,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -101,6 +101,9 @@ _col0 + + + @@ -263,6 +266,9 @@ value + + src + @@ -365,6 +371,9 @@ value + + src + @@ -413,6 +422,13 @@ + + + + src + + + @@ -454,7 +470,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src src @@ -466,7 +482,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -507,7 +523,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1444219471/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1900167580/10001 @@ -577,6 +593,9 @@ _col0 + + + Index: ql/src/test/results/compiler/plan/case_sensitivity.q.xml =================================================================== --- ql/src/test/results/compiler/plan/case_sensitivity.q.xml (revision 796808) +++ ql/src/test/results/compiler/plan/case_sensitivity.q.xml (working copy) @@ -30,7 +30,7 @@ true - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/tmp/1148174611/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1146535351/10000 @@ -83,7 +83,7 @@ location - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/dest1 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 @@ -93,7 +93,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/tmp/1148174611/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1146535351/10001 @@ -121,10 +121,10 @@ true - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/tmp/1680424512/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/715441594/10002 - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/tmp/1148174611/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1146535351/10000 @@ -142,7 +142,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/tmp/1680424512/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/715441594/10002 @@ -235,6 +235,9 @@ key + + + @@ -249,6 +252,9 @@ value + + + @@ -342,10 +348,10 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/tmp/1680424512/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/715441594/10002 - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/tmp/1680424512/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/715441594/10002 @@ -354,7 +360,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/tmp/1680424512/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/715441594/10002 @@ -372,7 +378,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/tmp/1148174611/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1146535351/10000 @@ -421,7 +427,7 @@ location - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/dest1 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 file.outputformat @@ -457,6 +463,9 @@ VALUE + + + @@ -524,7 +533,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/tmp/1680424512/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/715441594/10002 @@ -616,7 +625,7 @@ location - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src_thrift + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src_thrift @@ -655,7 +664,7 @@ 1 - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/tmp/1680424512/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/715441594/10002 @@ -690,6 +699,9 @@ lintstring + + src_thrift + @@ -740,6 +752,9 @@ lint + + src_thrift + @@ -865,6 +880,9 @@ lint + + src_thrift + @@ -1024,6 +1042,9 @@ lint + + src_thrift + @@ -1086,6 +1107,13 @@ + + + + src_thrift + + + @@ -1110,7 +1138,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src_thrift + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src_thrift src_thrift @@ -1122,7 +1150,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src_thrift + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src_thrift Index: ql/src/test/results/compiler/plan/udf_when.q.xml =================================================================== --- ql/src/test/results/compiler/plan/udf_when.q.xml (revision 796808) +++ ql/src/test/results/compiler/plan/udf_when.q.xml (working copy) @@ -64,7 +64,7 @@ location - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -96,7 +96,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/tmp/1365386357/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/449335539/10001 @@ -536,6 +536,13 @@ + + + + src + + + @@ -578,7 +585,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src src @@ -590,7 +597,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src Index: ql/src/test/results/compiler/plan/input20.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input20.q.xml (revision 796808) +++ ql/src/test/results/compiler/plan/input20.q.xml (working copy) @@ -64,7 +64,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -409,6 +409,9 @@ key + + src + @@ -513,6 +516,9 @@ key + + src + @@ -631,6 +637,13 @@ + + + + src + + + @@ -679,7 +692,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src tmap:src @@ -691,7 +704,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -736,7 +749,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/723531623/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/568447420/10001 @@ -912,6 +925,9 @@ _col1 + + tmap + @@ -923,6 +939,9 @@ _col0 + + tmap + @@ -1000,6 +1019,9 @@ VALUE + + + Index: ql/src/test/results/compiler/plan/sample1.q.xml =================================================================== --- ql/src/test/results/compiler/plan/sample1.q.xml (revision 796808) +++ ql/src/test/results/compiler/plan/sample1.q.xml (working copy) @@ -77,7 +77,7 @@ location - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/srcpart + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart @@ -113,7 +113,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/tmp/506075331/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1090806240/10001 @@ -217,6 +217,9 @@ hr + + s + @@ -228,6 +231,9 @@ ds + + s + @@ -239,6 +245,9 @@ value + + s + @@ -250,6 +259,9 @@ key + + s + @@ -402,6 +414,9 @@ ds + + s + @@ -453,6 +468,9 @@ hr + + s + @@ -545,6 +563,9 @@ + + true + @@ -710,6 +731,13 @@ + + + + s + + + @@ -740,7 +768,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 s @@ -752,7 +780,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 Index: ql/src/test/results/compiler/plan/sample2.q.xml =================================================================== --- ql/src/test/results/compiler/plan/sample2.q.xml (revision 796808) +++ ql/src/test/results/compiler/plan/sample2.q.xml (working copy) @@ -30,7 +30,7 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1490423752/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/434009635/10000 @@ -83,7 +83,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 @@ -93,7 +93,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1490423752/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/434009635/10001 @@ -121,10 +121,10 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1313373355/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/372887105/10002 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1490423752/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/434009635/10000 @@ -142,7 +142,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1313373355/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/372887105/10002 @@ -235,6 +235,9 @@ key + + + @@ -249,6 +252,9 @@ value + + + @@ -342,10 +348,10 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1313373355/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/372887105/10002 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1313373355/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/372887105/10002 @@ -354,7 +360,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1313373355/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/372887105/10002 @@ -372,7 +378,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1490423752/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/434009635/10000 @@ -421,7 +427,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 file.outputformat @@ -457,6 +463,9 @@ VALUE + + + @@ -524,7 +533,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1313373355/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/372887105/10002 @@ -616,7 +625,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/srcbucket + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcbucket @@ -655,7 +664,7 @@ 1 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1313373355/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/372887105/10002 @@ -684,6 +693,9 @@ value + + s + @@ -695,6 +707,9 @@ key + + s + @@ -770,6 +785,9 @@ + + true + @@ -839,6 +857,9 @@ key + + s + @@ -963,6 +984,9 @@ key + + s + @@ -1070,6 +1094,13 @@ + + + + s + + + @@ -1094,7 +1125,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt s @@ -1106,7 +1137,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt Index: ql/src/test/results/compiler/plan/sample3.q.xml =================================================================== --- ql/src/test/results/compiler/plan/sample3.q.xml (revision 796808) +++ ql/src/test/results/compiler/plan/sample3.q.xml (working copy) @@ -30,7 +30,7 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1719224789/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1779762730/10000 @@ -83,7 +83,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 @@ -93,7 +93,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1719224789/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1779762730/10001 @@ -121,10 +121,10 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/2025285331/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1270025131/10002 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1719224789/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1779762730/10000 @@ -142,7 +142,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/2025285331/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1270025131/10002 @@ -235,6 +235,9 @@ key + + + @@ -249,6 +252,9 @@ value + + + @@ -342,10 +348,10 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/2025285331/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1270025131/10002 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/2025285331/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1270025131/10002 @@ -354,7 +360,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/2025285331/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1270025131/10002 @@ -372,7 +378,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1719224789/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1779762730/10000 @@ -421,7 +427,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 file.outputformat @@ -457,6 +463,9 @@ VALUE + + + @@ -524,7 +533,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/2025285331/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1270025131/10002 @@ -616,7 +625,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/srcbucket + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcbucket @@ -655,7 +664,7 @@ 1 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/2025285331/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1270025131/10002 @@ -684,6 +693,9 @@ value + + s + @@ -695,6 +707,9 @@ key + + s + @@ -770,6 +785,9 @@ + + true + @@ -839,6 +857,9 @@ key + + s + @@ -849,6 +870,9 @@ value + + s + @@ -973,6 +997,9 @@ key + + s + @@ -983,6 +1010,9 @@ value + + s + @@ -1090,6 +1120,13 @@ + + + + s + + + @@ -1114,7 +1151,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/srcbucket + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcbucket s @@ -1126,7 +1163,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/srcbucket + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcbucket Index: ql/src/test/results/compiler/plan/sample4.q.xml =================================================================== --- ql/src/test/results/compiler/plan/sample4.q.xml (revision 796808) +++ ql/src/test/results/compiler/plan/sample4.q.xml (working copy) @@ -30,7 +30,7 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/487130226/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/284129638/10000 @@ -83,7 +83,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 @@ -93,7 +93,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/487130226/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/284129638/10001 @@ -121,10 +121,10 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/667179734/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/280853893/10002 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/487130226/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/284129638/10000 @@ -142,7 +142,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/667179734/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/280853893/10002 @@ -235,6 +235,9 @@ key + + + @@ -249,6 +252,9 @@ value + + + @@ -342,10 +348,10 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/667179734/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/280853893/10002 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/667179734/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/280853893/10002 @@ -354,7 +360,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/667179734/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/280853893/10002 @@ -372,7 +378,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/487130226/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/284129638/10000 @@ -421,7 +427,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 file.outputformat @@ -457,6 +463,9 @@ VALUE + + + @@ -524,7 +533,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/667179734/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/280853893/10002 @@ -616,7 +625,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/srcbucket + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcbucket @@ -655,7 +664,7 @@ 1 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/667179734/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/280853893/10002 @@ -684,6 +693,9 @@ value + + s + @@ -695,6 +707,9 @@ key + + s + @@ -770,6 +785,9 @@ + + true + @@ -839,6 +857,9 @@ key + + s + @@ -963,6 +984,9 @@ key + + s + @@ -1070,6 +1094,13 @@ + + + + s + + + @@ -1094,7 +1125,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt s @@ -1106,7 +1137,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt Index: ql/src/test/results/compiler/plan/sample5.q.xml =================================================================== --- ql/src/test/results/compiler/plan/sample5.q.xml (revision 796808) +++ ql/src/test/results/compiler/plan/sample5.q.xml (working copy) @@ -30,7 +30,7 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/707138646/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/69748977/10000 @@ -83,7 +83,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 @@ -93,7 +93,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/707138646/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/69748977/10001 @@ -121,10 +121,10 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1776114372/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/19454389/10002 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/707138646/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/69748977/10000 @@ -142,7 +142,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1776114372/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/19454389/10002 @@ -235,6 +235,9 @@ key + + + @@ -249,6 +252,9 @@ value + + + @@ -342,10 +348,10 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1776114372/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/19454389/10002 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1776114372/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/19454389/10002 @@ -354,7 +360,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1776114372/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/19454389/10002 @@ -372,7 +378,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/707138646/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/69748977/10000 @@ -421,7 +427,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 file.outputformat @@ -457,6 +463,9 @@ VALUE + + + @@ -524,7 +533,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1776114372/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/19454389/10002 @@ -616,7 +625,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/srcbucket + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcbucket @@ -655,7 +664,7 @@ 1 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1776114372/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/19454389/10002 @@ -684,6 +693,9 @@ value + + s + @@ -695,6 +707,9 @@ key + + s + @@ -770,6 +785,9 @@ + + true + @@ -839,6 +857,9 @@ key + + s + @@ -963,6 +984,9 @@ key + + s + @@ -1070,6 +1094,13 @@ + + + + s + + + @@ -1094,7 +1125,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/srcbucket + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcbucket s @@ -1106,7 +1137,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/srcbucket + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcbucket Index: ql/src/test/results/compiler/plan/sample6.q.xml =================================================================== --- ql/src/test/results/compiler/plan/sample6.q.xml (revision 796808) +++ ql/src/test/results/compiler/plan/sample6.q.xml (working copy) @@ -30,7 +30,7 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/950802647/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/752460895/10000 @@ -83,7 +83,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 @@ -93,7 +93,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/950802647/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/752460895/10001 @@ -121,10 +121,10 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1635011117/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/71825406/10002 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/950802647/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/752460895/10000 @@ -142,7 +142,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1635011117/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/71825406/10002 @@ -235,6 +235,9 @@ key + + + @@ -249,6 +252,9 @@ value + + + @@ -342,10 +348,10 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1635011117/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/71825406/10002 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1635011117/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/71825406/10002 @@ -354,7 +360,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1635011117/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/71825406/10002 @@ -372,7 +378,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/950802647/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/752460895/10000 @@ -421,7 +427,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 file.outputformat @@ -457,6 +463,9 @@ VALUE + + + @@ -524,7 +533,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1635011117/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/71825406/10002 @@ -616,7 +625,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/srcbucket + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcbucket @@ -655,7 +664,7 @@ 1 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1635011117/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/71825406/10002 @@ -684,6 +693,9 @@ value + + s + @@ -695,6 +707,9 @@ key + + s + @@ -770,6 +785,9 @@ + + true + @@ -839,6 +857,9 @@ key + + s + @@ -963,6 +984,9 @@ key + + s + @@ -1070,6 +1094,13 @@ + + + + s + + + @@ -1094,7 +1125,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt s @@ -1106,7 +1137,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt Index: ql/src/test/results/compiler/plan/sample7.q.xml =================================================================== --- ql/src/test/results/compiler/plan/sample7.q.xml (revision 796808) +++ ql/src/test/results/compiler/plan/sample7.q.xml (working copy) @@ -30,7 +30,7 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/274403833/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/103983702/10000 @@ -83,7 +83,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 @@ -93,7 +93,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/274403833/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/103983702/10001 @@ -121,10 +121,10 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/240735029/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1491647368/10002 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/274403833/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/103983702/10000 @@ -142,7 +142,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/240735029/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1491647368/10002 @@ -235,6 +235,9 @@ key + + + @@ -249,6 +252,9 @@ value + + + @@ -342,10 +348,10 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/240735029/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1491647368/10002 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/240735029/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1491647368/10002 @@ -354,7 +360,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/240735029/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1491647368/10002 @@ -372,7 +378,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/274403833/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/103983702/10000 @@ -421,7 +427,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 file.outputformat @@ -457,6 +463,9 @@ VALUE + + + @@ -524,7 +533,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/240735029/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1491647368/10002 @@ -616,7 +625,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/srcbucket + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcbucket @@ -659,7 +668,7 @@ 1 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/240735029/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1491647368/10002 @@ -688,6 +697,9 @@ value + + s + @@ -699,6 +711,9 @@ key + + s + @@ -799,6 +814,9 @@ key + + s + @@ -868,6 +886,9 @@ + + true + @@ -937,6 +958,9 @@ key + + s + @@ -1077,6 +1101,9 @@ key + + s + @@ -1158,6 +1185,9 @@ key + + s + @@ -1207,6 +1237,13 @@ + + + + s + + + @@ -1231,7 +1268,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt s @@ -1243,7 +1280,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt Index: ql/src/test/results/compiler/plan/cast1.q.xml =================================================================== --- ql/src/test/results/compiler/plan/cast1.q.xml (revision 796808) +++ ql/src/test/results/compiler/plan/cast1.q.xml (working copy) @@ -64,7 +64,7 @@ location - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -100,7 +100,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/tmp/1987981431/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1543265863/10001 @@ -807,6 +807,9 @@ key + + src + @@ -932,6 +935,9 @@ key + + src + @@ -998,6 +1004,13 @@ + + + + src + + + @@ -1019,7 +1032,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src src @@ -1031,7 +1044,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src Index: ql/src/test/results/compiler/plan/join1.q.xml =================================================================== --- ql/src/test/results/compiler/plan/join1.q.xml (revision 796808) +++ ql/src/test/results/compiler/plan/join1.q.xml (working copy) @@ -26,7 +26,7 @@ true - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/972415285/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1981920029/10000 @@ -79,7 +79,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 @@ -89,7 +89,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/972415285/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1981920029/10001 @@ -162,7 +162,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -230,7 +230,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -259,6 +259,9 @@ value + + src2 + @@ -279,6 +282,9 @@ key + + src2 + @@ -405,6 +411,13 @@ + + + + src2 + + + @@ -460,6 +473,9 @@ key + + src1 + @@ -476,6 +492,9 @@ key + + src1 + @@ -599,6 +618,13 @@ + + + + src1 + + + @@ -650,7 +676,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src src2 @@ -665,7 +691,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -709,7 +735,7 @@ 1 - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/972415285/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1981920029/10000 @@ -763,6 +789,9 @@ _col3 + + src2 + @@ -774,6 +803,9 @@ _col0 + + src1 + @@ -852,6 +884,9 @@ VALUE._col1 + + src2 + @@ -863,6 +898,9 @@ VALUE._col0 + + src1 + Index: ql/src/test/results/compiler/plan/input1.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input1.q.xml (revision 796808) +++ ql/src/test/results/compiler/plan/input1.q.xml (working copy) @@ -30,7 +30,7 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/983045819/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1575743351/10000 @@ -83,7 +83,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 @@ -93,7 +93,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/983045819/10001 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1575743351/10001 @@ -121,10 +121,10 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1046375614/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/458674099/10002 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/983045819/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1575743351/10000 @@ -142,7 +142,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1046375614/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/458674099/10002 @@ -235,6 +235,9 @@ key + + + @@ -249,6 +252,9 @@ value + + + @@ -342,10 +348,10 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1046375614/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/458674099/10002 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1046375614/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/458674099/10002 @@ -354,7 +360,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1046375614/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/458674099/10002 @@ -372,7 +378,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/983045819/10000 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1575743351/10000 @@ -421,7 +427,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/dest1 file.outputformat @@ -457,6 +463,9 @@ VALUE + + + @@ -520,7 +529,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1046375614/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/458674099/10002 @@ -608,7 +617,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src @@ -647,7 +656,7 @@ 1 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1046375614/10002 + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/458674099/10002 @@ -676,6 +685,9 @@ value + + src + @@ -687,6 +699,9 @@ key + + src + @@ -801,6 +816,9 @@ key + + src + @@ -930,6 +948,9 @@ key + + src + @@ -996,6 +1017,13 @@ + + + + src + + + @@ -1020,7 +1048,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src src @@ -1032,7 +1060,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/src Index: ql/src/test/org/apache/hadoop/hive/ql/exec/TestExecDriver.java =================================================================== --- ql/src/test/org/apache/hadoop/hive/ql/exec/TestExecDriver.java (revision 796808) +++ ql/src/test/org/apache/hadoop/hive/ql/exec/TestExecDriver.java (working copy) @@ -155,7 +155,7 @@ private filterDesc getTestFilterDesc(String column) { ArrayList children1 = new ArrayList(); - children1.add(new exprNodeColumnDesc(TypeInfoFactory.stringTypeInfo, column)); + children1.add(new exprNodeColumnDesc(TypeInfoFactory.stringTypeInfo, column, "", false)); exprNodeDesc lhs = new exprNodeFuncDesc( TypeInfoFactory.doubleTypeInfo, FunctionRegistry.getUDFClass(Constants.DOUBLE_TYPE_NAME), @@ -180,7 +180,7 @@ FunctionRegistry.getUDFMethod("<", TypeInfoFactory.doubleTypeInfo, TypeInfoFactory.doubleTypeInfo), children3); - return new filterDesc(desc); + return new filterDesc(desc, false); } @SuppressWarnings("unchecked") @@ -322,7 +322,7 @@ new exprNodeFieldDesc(TypeInfoFactory.stringTypeInfo, new exprNodeColumnDesc(TypeInfoFactory.getListTypeInfo( TypeInfoFactory.stringTypeInfo), - Utilities.ReduceField.VALUE.toString()), + Utilities.ReduceField.VALUE.toString(), "", false), "0", false)), outputColumns), op4); @@ -371,7 +371,7 @@ } public static exprNodeColumnDesc getStringColumn(String columnName) { - return new exprNodeColumnDesc(TypeInfoFactory.stringTypeInfo, columnName); + return new exprNodeColumnDesc(TypeInfoFactory.stringTypeInfo, columnName, "", false); } @SuppressWarnings("unchecked") Index: ql/src/test/org/apache/hadoop/hive/ql/exec/TestExpressionEvaluator.java =================================================================== --- ql/src/test/org/apache/hadoop/hive/ql/exec/TestExpressionEvaluator.java (revision 796808) +++ ql/src/test/org/apache/hadoop/hive/ql/exec/TestExpressionEvaluator.java (working copy) @@ -98,7 +98,7 @@ public void testExprNodeColumnEvaluator() throws Throwable { try { // get a evaluator for a simple field expression - exprNodeDesc exprDesc = new exprNodeColumnDesc(colaType, "cola"); + exprNodeDesc exprDesc = new exprNodeColumnDesc(colaType, "cola", "", false); ExprNodeEvaluator eval = ExprNodeEvaluatorFactory.get(exprDesc); // evaluate on row @@ -128,8 +128,8 @@ public void testExprNodeFuncEvaluator() throws Throwable { try { // get a evaluator for a string concatenation expression - exprNodeDesc col1desc = new exprNodeColumnDesc(col1Type, "col1"); - exprNodeDesc coladesc = new exprNodeColumnDesc(colaType, "cola"); + exprNodeDesc col1desc = new exprNodeColumnDesc(col1Type, "col1", "", false); + exprNodeDesc coladesc = new exprNodeColumnDesc(colaType, "cola", "", false); exprNodeDesc col11desc = getListIndexNode(col1desc, 1); exprNodeDesc cola0desc = getListIndexNode(coladesc, 0); exprNodeDesc func1 = TypeCheckProcFactory.DefaultExprProcessor.getFuncExprNodeDesc("concat", col11desc, cola0desc); @@ -150,7 +150,7 @@ public void testExprNodeConversionEvaluator() throws Throwable { try { // get a evaluator for a string concatenation expression - exprNodeDesc col1desc = new exprNodeColumnDesc(col1Type, "col1"); + exprNodeDesc col1desc = new exprNodeColumnDesc(col1Type, "col1", "", false); exprNodeDesc col11desc = getListIndexNode(col1desc, 1); exprNodeDesc func1 = TypeCheckProcFactory.DefaultExprProcessor.getFuncExprNodeDesc(Constants.DOUBLE_TYPE_NAME, col11desc); ExprNodeEvaluator eval = ExprNodeEvaluatorFactory.get(func1); @@ -253,8 +253,8 @@ basetimes * 10, ExprNodeEvaluatorFactory.get( TypeCheckProcFactory.DefaultExprProcessor.getFuncExprNodeDesc("concat", - getListIndexNode(new exprNodeColumnDesc(col1Type, "col1"), constant1), - getListIndexNode(new exprNodeColumnDesc(colaType, "cola"), constant1))), + getListIndexNode(new exprNodeColumnDesc(col1Type, "col1", "", false), constant1), + getListIndexNode(new exprNodeColumnDesc(colaType, "cola", "", false), constant1))), r, "1b"); measureSpeed("concat(concat(col1[1], cola[1]), col1[2])", @@ -262,9 +262,9 @@ ExprNodeEvaluatorFactory.get( TypeCheckProcFactory.DefaultExprProcessor.getFuncExprNodeDesc("concat", TypeCheckProcFactory.DefaultExprProcessor.getFuncExprNodeDesc("concat", - getListIndexNode(new exprNodeColumnDesc(col1Type, "col1"), constant1), - getListIndexNode(new exprNodeColumnDesc(colaType, "cola"), constant1)), - getListIndexNode(new exprNodeColumnDesc(col1Type, "col1"), constant2))), + getListIndexNode(new exprNodeColumnDesc(col1Type, "col1", "", false), constant1), + getListIndexNode(new exprNodeColumnDesc(colaType, "cola", "", false), constant1)), + getListIndexNode(new exprNodeColumnDesc(col1Type, "col1", "", false), constant2))), r, "1b2"); measureSpeed("concat(concat(concat(col1[1], cola[1]), col1[2]), cola[2])", @@ -273,10 +273,10 @@ TypeCheckProcFactory.DefaultExprProcessor.getFuncExprNodeDesc("concat", TypeCheckProcFactory.DefaultExprProcessor.getFuncExprNodeDesc("concat", TypeCheckProcFactory.DefaultExprProcessor.getFuncExprNodeDesc("concat", - getListIndexNode(new exprNodeColumnDesc(col1Type, "col1"), constant1), - getListIndexNode(new exprNodeColumnDesc(colaType, "cola"), constant1)), - getListIndexNode(new exprNodeColumnDesc(col1Type, "col1"), constant2)), - getListIndexNode(new exprNodeColumnDesc(colaType, "cola"), constant2))), + getListIndexNode(new exprNodeColumnDesc(col1Type, "col1", "", false), constant1), + getListIndexNode(new exprNodeColumnDesc(colaType, "cola", "", false), constant1)), + getListIndexNode(new exprNodeColumnDesc(col1Type, "col1", "", false), constant2)), + getListIndexNode(new exprNodeColumnDesc(colaType, "cola", "", false), constant2))), r, "1b2c"); Index: ql/src/test/org/apache/hadoop/hive/ql/exec/TestPlan.java =================================================================== --- ql/src/test/org/apache/hadoop/hive/ql/exec/TestPlan.java (revision 796808) +++ ql/src/test/org/apache/hadoop/hive/ql/exec/TestPlan.java (working copy) @@ -43,11 +43,11 @@ try { // initialize a complete map reduce configuration - exprNodeDesc expr1 = new exprNodeColumnDesc(TypeInfoFactory.stringTypeInfo, F1); - exprNodeDesc expr2 = new exprNodeColumnDesc(TypeInfoFactory.stringTypeInfo, F2); + exprNodeDesc expr1 = new exprNodeColumnDesc(TypeInfoFactory.stringTypeInfo, F1, "", false); + exprNodeDesc expr2 = new exprNodeColumnDesc(TypeInfoFactory.stringTypeInfo, F2, "", false); exprNodeDesc filterExpr = TypeCheckProcFactory.DefaultExprProcessor.getFuncExprNodeDesc("==", expr1, expr2); - filterDesc filterCtx = new filterDesc(filterExpr); + filterDesc filterCtx = new filterDesc(filterExpr, false); Operator op = OperatorFactory.get(filterDesc.class); op.setConf(filterCtx); Index: ql/src/test/org/apache/hadoop/hive/ql/exec/TestOperators.java =================================================================== --- ql/src/test/org/apache/hadoop/hive/ql/exec/TestOperators.java (revision 796808) +++ ql/src/test/org/apache/hadoop/hive/ql/exec/TestOperators.java (working copy) @@ -90,7 +90,7 @@ exprNodeDesc func2 = TypeCheckProcFactory.DefaultExprProcessor.getFuncExprNodeDesc("==", col0, zero); exprNodeDesc func3 = TypeCheckProcFactory.DefaultExprProcessor.getFuncExprNodeDesc("&&", func1, func2); assert(func3 != null); - filterDesc filterCtx = new filterDesc(func3); + filterDesc filterCtx = new filterDesc(func3, false); // Configuration Operator op = OperatorFactory.get(filterDesc.class); Index: ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMRFileSink1.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMRFileSink1.java (revision 796808) +++ ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMRFileSink1.java (working copy) @@ -128,7 +128,8 @@ ArrayList valueCols = new ArrayList(); for (ColumnInfo ci : fsRS.getSignature()) { - valueCols.add(new exprNodeColumnDesc(ci.getType(), ci.getInternalName())); + valueCols.add(new exprNodeColumnDesc(ci.getType(), ci.getInternalName(), ci.getTabAlias(), + ci.getIsPartitionCol())); } // create a dummy tableScan operator @@ -155,13 +156,15 @@ for(ColumnInfo colInfo: interim_rwsch.getColumnInfos()) { String [] info = interim_rwsch.reverseLookup(colInfo.getInternalName()); out_rwsch.put(info[0], info[1], - new ColumnInfo(pos.toString(), colInfo.getType())); + new ColumnInfo(pos.toString(), colInfo.getType(), info[0], + colInfo.getIsPartitionCol())); pos = Integer.valueOf(pos.intValue() + 1); } Operator extract = OperatorFactory.getAndMakeChild( - new extractDesc(new exprNodeColumnDesc(TypeInfoFactory.stringTypeInfo, Utilities.ReduceField.VALUE.toString())), + new extractDesc(new exprNodeColumnDesc(TypeInfoFactory.stringTypeInfo, + Utilities.ReduceField.VALUE.toString(), "", false)), new RowSchema(out_rwsch.getColumnInfos())); tableDesc ts = (tableDesc)fsConf.getTableInfo().clone(); Index: ql/src/java/org/apache/hadoop/hive/ql/optimizer/ppr/ExprProcCtx.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/optimizer/ppr/ExprProcCtx.java (revision 0) +++ ql/src/java/org/apache/hadoop/hive/ql/optimizer/ppr/ExprProcCtx.java (revision 0) @@ -0,0 +1,60 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.hive.ql.optimizer.ppr; + +import org.apache.hadoop.hive.ql.lib.NodeProcessorCtx; + +/** + * The processor context for partition pruner. This contains the table + * alias that is being currently processed. + */ +public class ExprProcCtx implements NodeProcessorCtx { + + /** + * The table alias that is being currently processed. + */ + String tabAlias; + + /** + * Flag to hold whether there are any non partition columns accessed in the + * expression. + */ + boolean hasNonPartCols; + + public ExprProcCtx(String tabAlias) { + this.tabAlias = tabAlias; + this.hasNonPartCols = false; + } + + public String getTabAlias() { + return tabAlias; + } + + public void setTabAlias(String tabAlias) { + this.tabAlias = tabAlias; + } + + public boolean getHasNonPartCols() { + return this.hasNonPartCols; + } + + public void setHasNonPartCols(boolean val) { + this.hasNonPartCols = val; + } +} Index: ql/src/java/org/apache/hadoop/hive/ql/optimizer/ppr/OpWalkerCtx.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/optimizer/ppr/OpWalkerCtx.java (revision 0) +++ ql/src/java/org/apache/hadoop/hive/ql/optimizer/ppr/OpWalkerCtx.java (revision 0) @@ -0,0 +1,59 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.hive.ql.optimizer.ppr; + +import java.util.HashMap; + +import org.apache.hadoop.hive.ql.exec.TableScanOperator; +import org.apache.hadoop.hive.ql.lib.NodeProcessorCtx; +import org.apache.hadoop.hive.ql.plan.exprNodeDesc; + +/** + * Context class for operator tree walker for partition pruner. + */ +public class OpWalkerCtx implements NodeProcessorCtx { + + private boolean hasNonPartCols; + + /** + * Map from tablescan operator to partition pruning predicate + * that is initialized from the ParseContext + */ + private HashMap opToPartPruner; + + /** + * Constructor + */ + public OpWalkerCtx(HashMap opToPartPruner) { + this.opToPartPruner = opToPartPruner; + this.hasNonPartCols = false; + } + + public HashMap getOpToPartPruner() { + return this.opToPartPruner; + } + + public void addHasNonPartCols(boolean val) { + hasNonPartCols = (hasNonPartCols || val); + } + + public boolean getHasNonPartCols() { + return hasNonPartCols; + } +} Index: ql/src/java/org/apache/hadoop/hive/ql/optimizer/ppr/PartitionPruner.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/optimizer/ppr/PartitionPruner.java (revision 0) +++ ql/src/java/org/apache/hadoop/hive/ql/optimizer/ppr/PartitionPruner.java (revision 0) @@ -0,0 +1,162 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.hive.ql.optimizer.ppr; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.Map; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.hive.metastore.MetaStoreUtils; +import org.apache.hadoop.hive.metastore.Warehouse; +import org.apache.hadoop.hive.ql.exec.ExprNodeEvaluator; +import org.apache.hadoop.hive.ql.exec.ExprNodeEvaluatorFactory; +import org.apache.hadoop.hive.ql.lib.DefaultGraphWalker; +import org.apache.hadoop.hive.ql.lib.DefaultRuleDispatcher; +import org.apache.hadoop.hive.ql.lib.Dispatcher; +import org.apache.hadoop.hive.ql.lib.GraphWalker; +import org.apache.hadoop.hive.ql.lib.Node; +import org.apache.hadoop.hive.ql.lib.NodeProcessor; +import org.apache.hadoop.hive.ql.lib.Rule; +import org.apache.hadoop.hive.ql.lib.RuleRegExp; +import org.apache.hadoop.hive.ql.metadata.Hive; +import org.apache.hadoop.hive.ql.metadata.HiveException; +import org.apache.hadoop.hive.ql.metadata.Partition; +import org.apache.hadoop.hive.ql.metadata.Table; +import org.apache.hadoop.hive.ql.optimizer.Transform; +import org.apache.hadoop.hive.ql.parse.ParseContext; +import org.apache.hadoop.hive.ql.parse.PrunedPartitionList; +import org.apache.hadoop.hive.ql.parse.SemanticException; +import org.apache.hadoop.hive.ql.plan.exprNodeDesc; +import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; +import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorFactory; +import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector; +import org.apache.hadoop.hive.serde2.objectinspector.StructObjectInspector; +import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory; + +/** + * The transformation step that does partition pruning. + * + */ +public class PartitionPruner implements Transform { + + // The log + private static final Log LOG = LogFactory.getLog("hive.ql.optimizer.ppr.PartitionPruner"); + + /* (non-Javadoc) + * @see org.apache.hadoop.hive.ql.optimizer.Transform#transform(org.apache.hadoop.hive.ql.parse.ParseContext) + */ + @Override + public ParseContext transform(ParseContext pctx) throws SemanticException { + + // create a the context for walking operators + OpWalkerCtx opWalkerCtx = new OpWalkerCtx(pctx.getOpToPartPruner()); + + Map opRules = new LinkedHashMap(); + opRules.put(new RuleRegExp("R1", "(TS%FIL%)|(TS%FIL%FIL%)"), + OpProcFactory.getFilterProc()); + + // The dispatcher fires the processor corresponding to the closest matching rule and passes the context along + Dispatcher disp = new DefaultRuleDispatcher(OpProcFactory.getDefaultProc(), opRules, opWalkerCtx); + GraphWalker ogw = new DefaultGraphWalker(disp); + + // Create a list of topop nodes + ArrayList topNodes = new ArrayList(); + topNodes.addAll(pctx.getTopOps().values()); + ogw.startWalking(topNodes, null); + pctx.setHasNonPartCols(opWalkerCtx.getHasNonPartCols()); + + return pctx; + } + + public static PrunedPartitionList prune(Table tab, exprNodeDesc prunerExpr) throws HiveException { + LOG.trace("Started pruning partiton"); + LOG.trace("tabname = " + tab.getName()); + LOG.trace("prune Expression = " + prunerExpr); + + LinkedHashSet true_parts = new LinkedHashSet(); + LinkedHashSet unkn_parts = new LinkedHashSet(); + LinkedHashSet denied_parts = new LinkedHashSet(); + + try { + StructObjectInspector rowObjectInspector = (StructObjectInspector)tab.getDeserializer().getObjectInspector(); + Object[] rowWithPart = new Object[2]; + + if(tab.isPartitioned()) { + for(String partName: Hive.get().getPartitionNames(MetaStoreUtils.DEFAULT_DATABASE_NAME, tab.getName(), (short) -1)) { + // Set all the variables here + LinkedHashMap partSpec = Warehouse.makeSpecFromName(partName); + // Create the row object + ArrayList partNames = new ArrayList(); + ArrayList partValues = new ArrayList(); + ArrayList partObjectInspectors = new ArrayList(); + for(Map.Entryentry : partSpec.entrySet()) { + partNames.add(entry.getKey()); + partValues.add(entry.getValue()); + partObjectInspectors.add(PrimitiveObjectInspectorFactory.javaStringObjectInspector); + } + StructObjectInspector partObjectInspector = ObjectInspectorFactory.getStandardStructObjectInspector(partNames, partObjectInspectors); + + rowWithPart[1] = partValues; + ArrayList ois = new ArrayList(2); + ois.add(rowObjectInspector); + ois.add(partObjectInspector); + StructObjectInspector rowWithPartObjectInspector = ObjectInspectorFactory.getUnionStructObjectInspector(ois); + + // evaluate the expression tree + if (prunerExpr != null) { + ExprNodeEvaluator evaluator = ExprNodeEvaluatorFactory.get(prunerExpr); + ObjectInspector evaluateResultOI = evaluator.initialize(rowWithPartObjectInspector); + Object evaluateResultO = evaluator.evaluate(rowWithPart); + Boolean r = (Boolean) ((PrimitiveObjectInspector)evaluateResultOI).getPrimitiveJavaObject(evaluateResultO); + LOG.trace("prune result for partition " + partSpec + ": " + r); + if (Boolean.FALSE.equals(r)) { + if (denied_parts.isEmpty()) { + Partition part = Hive.get().getPartition(tab, partSpec, Boolean.FALSE); + denied_parts.add(part); + } + LOG.trace("pruned partition: " + partSpec); + } else { + Partition part = Hive.get().getPartition(tab, partSpec, Boolean.FALSE); + if (Boolean.TRUE.equals(r)) { + LOG.debug("retained partition: " + partSpec); + true_parts.add(part); + } else { + LOG.debug("unknown partition: " + partSpec); + unkn_parts.add(part); + } + } + } else { + // is there is no parition pruning, all of them are needed + true_parts.add(Hive.get().getPartition(tab, partSpec, Boolean.FALSE)); + } + } + } else { + true_parts.addAll(Hive.get().getPartitions(tab)); + } + } catch (Exception e) { + throw new HiveException(e); + } + + // Now return the set of partitions + return new PrunedPartitionList(true_parts, unkn_parts, denied_parts); + } +} Index: ql/src/java/org/apache/hadoop/hive/ql/optimizer/ppr/ExprPrunerInfo.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/optimizer/ppr/ExprPrunerInfo.java (revision 0) +++ ql/src/java/org/apache/hadoop/hive/ql/optimizer/ppr/ExprPrunerInfo.java (revision 0) @@ -0,0 +1,41 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.hive.ql.optimizer.ppr; + +import org.apache.hadoop.hive.ql.lib.NodeProcessorCtx; + +/** + * The processor context for partition pruner. This contains the table + * alias that is being currently processed. + */ +public class ExprPrunerInfo implements NodeProcessorCtx { + + /** + * The table alias that is being currently processed. + */ + String tabAlias; + + public String getTabAlias() { + return tabAlias; + } + + public void setTabAlias(String tabAlias) { + this.tabAlias = tabAlias; + } +} Index: ql/src/java/org/apache/hadoop/hive/ql/optimizer/ppr/ExprProcFactory.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/optimizer/ppr/ExprProcFactory.java (revision 0) +++ ql/src/java/org/apache/hadoop/hive/ql/optimizer/ppr/ExprProcFactory.java (revision 0) @@ -0,0 +1,277 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.hive.ql.optimizer.ppr; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Stack; + +import org.apache.hadoop.hive.ql.lib.DefaultGraphWalker; +import org.apache.hadoop.hive.ql.lib.DefaultRuleDispatcher; +import org.apache.hadoop.hive.ql.lib.Dispatcher; +import org.apache.hadoop.hive.ql.lib.GraphWalker; +import org.apache.hadoop.hive.ql.lib.Node; +import org.apache.hadoop.hive.ql.lib.NodeProcessor; +import org.apache.hadoop.hive.ql.lib.NodeProcessorCtx; +import org.apache.hadoop.hive.ql.lib.Rule; +import org.apache.hadoop.hive.ql.lib.RuleRegExp; +import org.apache.hadoop.hive.ql.parse.SemanticException; +import org.apache.hadoop.hive.ql.plan.exprNodeColumnDesc; +import org.apache.hadoop.hive.ql.plan.exprNodeConstantDesc; +import org.apache.hadoop.hive.ql.plan.exprNodeDesc; +import org.apache.hadoop.hive.ql.plan.exprNodeFieldDesc; +import org.apache.hadoop.hive.ql.plan.exprNodeFuncDesc; +import org.apache.hadoop.hive.ql.plan.exprNodeGenericFuncDesc; +import org.apache.hadoop.hive.ql.plan.exprNodeNullDesc; +import org.apache.hadoop.hive.ql.udf.UDFOPAnd; +import org.apache.hadoop.hive.ql.udf.UDFOPOr; +import org.apache.hadoop.hive.ql.udf.UDFOPNot; +import org.apache.hadoop.hive.ql.udf.UDFType; + +/** + * Expression processor factory for partition pruning. Each processor tries + * to convert the expression subtree into a partition pruning expression. + * This expression is then used to figure out whether a particular partition + * should be scanned or not. + */ +public class ExprProcFactory { + + /** + * Processor for column expressions. + */ + public static class ColumnExprProcessor implements NodeProcessor { + + /** + * Converts the reference from child row resolver to current row resolver + */ + @Override + public Object process(Node nd, Stack stack, NodeProcessorCtx procCtx, + Object... nodeOutputs) throws SemanticException { + + exprNodeDesc newcd = null; + exprNodeColumnDesc cd = (exprNodeColumnDesc) nd; + ExprProcCtx epc = (ExprProcCtx) procCtx; + if (cd.getTabAlias().equalsIgnoreCase(epc.getTabAlias()) && cd.getIsParititonCol()) + newcd = cd.clone(); + else { + newcd = new exprNodeConstantDesc(cd.getTypeInfo(), null); + epc.setHasNonPartCols(true); + } + + return newcd; + } + + } + + /** + * Process function descriptors. + */ + public static class FuncExprProcessor implements NodeProcessor { + + @Override + public Object process(Node nd, Stack stack, NodeProcessorCtx procCtx, + Object... nodeOutputs) throws SemanticException { + + exprNodeDesc newfd = null; + exprNodeFuncDesc fd = (exprNodeFuncDesc) nd; + + boolean unknown = false; + // Check if any of the children is unknown for non logical operators + if (!fd.getUDFMethod().getDeclaringClass().equals(UDFOPAnd.class) + && !fd.getUDFMethod().getDeclaringClass().equals(UDFOPOr.class) + && !fd.getUDFMethod().getDeclaringClass().equals(UDFOPNot.class)) + for(Object child: nodeOutputs) { + exprNodeDesc child_nd = (exprNodeDesc)child; + if (child_nd instanceof exprNodeConstantDesc && + ((exprNodeConstantDesc)child_nd).getValue() == null) { + unknown = true; + } + } + + if (fd.getUDFClass().getAnnotation(UDFType.class) != null && + (fd.getUDFClass().getAnnotation(UDFType.class).deterministic() == false || + unknown)) + newfd = new exprNodeConstantDesc(fd.getTypeInfo(), null); + else { + // Create the list of children + ArrayList children = new ArrayList(); + for(Object child: nodeOutputs) { + children.add((exprNodeDesc) child); + } + // Create a copy of the function descriptor + newfd = new exprNodeFuncDesc(fd.getTypeInfo(), fd.getUDFClass(), + fd.getUDFMethod(), children); + } + + return newfd; + } + + } + + /** + * If all children are candidates and refer only to one table alias then this expr is a candidate + * else it is not a candidate but its children could be final candidates + */ + public static class GenericFuncExprProcessor implements NodeProcessor { + + @Override + public Object process(Node nd, Stack stack, NodeProcessorCtx procCtx, + Object... nodeOutputs) throws SemanticException { + + exprNodeDesc newfd = null; + exprNodeGenericFuncDesc fd = (exprNodeGenericFuncDesc) nd; + + boolean unknown = false; + // Check if any of the children is unknown + for(Object child: nodeOutputs) { + exprNodeDesc child_nd = (exprNodeDesc)child; + if (child_nd instanceof exprNodeConstantDesc && + ((exprNodeConstantDesc)child_nd).getValue() == null) { + unknown = true; + } + } + + if (unknown) + newfd = new exprNodeConstantDesc(fd.getTypeInfo(), null); + else { + // Create the list of children + ArrayList children = new ArrayList(); + for(Object child: nodeOutputs) { + children.add((exprNodeDesc) child); + } + // Create a copy of the function descriptor + newfd = new exprNodeGenericFuncDesc(fd.getTypeInfo(), fd.getGenericUDFClass(), children); + } + + return newfd; + } + + } + + public static class FieldExprProcessor implements NodeProcessor { + + @Override + public Object process(Node nd, Stack stack, NodeProcessorCtx procCtx, + Object... nodeOutputs) throws SemanticException { + + exprNodeFieldDesc fnd = (exprNodeFieldDesc)nd; + boolean unknown = false; + int idx = 0; + exprNodeDesc left_nd = null; + for(Object child: nodeOutputs) { + exprNodeDesc child_nd = (exprNodeDesc) child; + if (child_nd instanceof exprNodeConstantDesc && + ((exprNodeConstantDesc)child_nd).getValue() == null) + unknown = true; + left_nd = child_nd; + } + + assert(idx == 0); + + exprNodeDesc newnd = null; + if (unknown) { + newnd = new exprNodeConstantDesc(fnd.getTypeInfo(), null); + } + else { + newnd = new exprNodeFieldDesc(fnd.getTypeInfo(), left_nd, fnd.getFieldName(), fnd.getIsList()); + } + return newnd; + } + + } + + /** + * Processor for constants and null expressions. For such expressions + * the processor simply clones the exprNodeDesc and returns it. + */ + public static class DefaultExprProcessor implements NodeProcessor { + + @Override + public Object process(Node nd, Stack stack, NodeProcessorCtx procCtx, + Object... nodeOutputs) throws SemanticException { + if (nd instanceof exprNodeConstantDesc) + return ((exprNodeConstantDesc)nd).clone(); + else if (nd instanceof exprNodeNullDesc) + return ((exprNodeNullDesc)nd).clone(); + + assert(false); + return null; + } + } + + public static NodeProcessor getDefaultExprProcessor() { + return new DefaultExprProcessor(); + } + + public static NodeProcessor getFuncProcessor() { + return new FuncExprProcessor(); + } + + public static NodeProcessor getGenericFuncProcessor() { + return new GenericFuncExprProcessor(); + } + + public static NodeProcessor getFieldProcessor() { + return new FieldExprProcessor(); + } + + public static NodeProcessor getColumnProcessor() { + return new ColumnExprProcessor(); + } + + /** + * Extracts pushdown predicates from the given list of predicate expression + * @param opContext operator context used for resolving column references + * @param op operator of the predicates being processed + * @param preds + * @return hasNonPartCols returns true/false depending upon whether this pred has a non partition column + * @throws SemanticException + */ + public static exprNodeDesc genPruner(String tabAlias, exprNodeDesc pred, + boolean hasNonPartCols) throws SemanticException { + // Create the walker, the rules dispatcher and the context. + ExprProcCtx pprCtx= new ExprProcCtx(tabAlias); + + // create a walker which walks the tree in a DFS manner while maintaining the operator stack. The dispatcher + // generates the plan from the operator tree + Map exprRules = new LinkedHashMap(); + exprRules.put(new RuleRegExp("R1", exprNodeColumnDesc.class.getName() + "%"), getColumnProcessor()); + exprRules.put(new RuleRegExp("R2", exprNodeFieldDesc.class.getName() + "%"), getFieldProcessor()); + exprRules.put(new RuleRegExp("R3", exprNodeFuncDesc.class.getName() + "%"), getFuncProcessor()); + exprRules.put(new RuleRegExp("R5", exprNodeGenericFuncDesc.class.getName() + "%"), getGenericFuncProcessor()); + + // The dispatcher fires the processor corresponding to the closest matching rule and passes the context along + Dispatcher disp = new DefaultRuleDispatcher(getDefaultExprProcessor(), exprRules, pprCtx); + GraphWalker egw = new DefaultGraphWalker(disp); + + List startNodes = new ArrayList(); + startNodes.add(pred); + + HashMap outputMap = new HashMap(); + egw.startWalking(startNodes, outputMap); + hasNonPartCols = pprCtx.getHasNonPartCols(); + + // Get the exprNodeDesc corresponding to the first start node; + return (exprNodeDesc)outputMap.get(pred); + } + +} Index: ql/src/java/org/apache/hadoop/hive/ql/optimizer/ppr/OpProcFactory.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/optimizer/ppr/OpProcFactory.java (revision 0) +++ ql/src/java/org/apache/hadoop/hive/ql/optimizer/ppr/OpProcFactory.java (revision 0) @@ -0,0 +1,138 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.hive.ql.optimizer.ppr; + +import java.util.Map; +import java.util.Stack; +import org.apache.hadoop.hive.ql.exec.FilterOperator; +import org.apache.hadoop.hive.ql.exec.TableScanOperator; +import org.apache.hadoop.hive.ql.lib.Node; +import org.apache.hadoop.hive.ql.lib.NodeProcessor; +import org.apache.hadoop.hive.ql.lib.NodeProcessorCtx; +import org.apache.hadoop.hive.ql.parse.SemanticException; +import org.apache.hadoop.hive.ql.parse.TypeCheckProcFactory; +import org.apache.hadoop.hive.ql.plan.exprNodeDesc; + +/** + * Operator factory for partition pruning processing of operator graph + * We find all the filter operators that appear just beneath the table scan + * operators. We then pass the filter to the partition pruner to construct + * a pruner for that table alias and store a mapping from the table scan + * operator to that pruner. We call that pruner later during plan generation. + */ +public class OpProcFactory { + + /** + * Determines the partition pruner for the filter. This is called only when the filter + * follows a table scan operator. + */ + public static class FilterPPR implements NodeProcessor { + + @Override + public Object process(Node nd, Stack stack, NodeProcessorCtx procCtx, + Object... nodeOutputs) throws SemanticException { + OpWalkerCtx owc = (OpWalkerCtx)procCtx; + FilterOperator fop = (FilterOperator) nd; + FilterOperator fop2 = null; + + // The stack contains either ... TS, Filter or + // ... TS, Filter, Filter with the head of the stack being the rightmost + // symbol. So we just pop out the two elements from the top and if the + // second one of them is not a table scan then the operator on the top of + // the stack is the Table scan operator. + Node tmp = stack.pop(); + Node tmp2 = stack.pop(); + TableScanOperator top = null; + if (tmp2 instanceof TableScanOperator) { + top = (TableScanOperator)tmp2; + } + else { + top = (TableScanOperator) stack.peek(); + fop2 = (FilterOperator) tmp2; + } + stack.push(tmp2); + stack.push(tmp); + + // If fop2 exists (i.e this is not the top level filter and fop2 is not + // a sampling filter t1ehen we ignore the current filter + if (fop2 != null && !fop2.getConf().getIsSamplingPred()) + return null; + + // ignore the predicate in case it is not a sampling predicate + if (fop.getConf().getIsSamplingPred()) { + return null; + } + + // Otherwise this is not a sampling predicate and we need to + exprNodeDesc predicate = fop.getConf().getPredicate(); + String alias = top.getConf().getAlias(); + + // Generate the partition pruning predicate + boolean hasNonPartCols = false; + exprNodeDesc ppr_pred = ExprProcFactory.genPruner(alias, predicate, hasNonPartCols); + owc.addHasNonPartCols(hasNonPartCols); + + // Add the pruning predicate to the table scan operator + addPruningPred(owc.getOpToPartPruner(), top, ppr_pred); + + return null; + } + + private void addPruningPred(Map opToPPR, + TableScanOperator top, exprNodeDesc new_ppr_pred) { + exprNodeDesc old_ppr_pred = opToPPR.get(top); + exprNodeDesc ppr_pred = null; + if (old_ppr_pred != null) { + // or the old_ppr_pred and the new_ppr_pred + ppr_pred = TypeCheckProcFactory.DefaultExprProcessor.getFuncExprNodeDesc("OR", old_ppr_pred, new_ppr_pred); + } + else { + ppr_pred = new_ppr_pred; + } + + // Put the mapping from table scan operator to ppr_pred + opToPPR.put(top, ppr_pred); + + return; + } + } + + + /** + * Default processor which just merges its children + */ + public static class DefaultPPR implements NodeProcessor { + + @Override + public Object process(Node nd, Stack stack, NodeProcessorCtx procCtx, + Object... nodeOutputs) throws SemanticException { + // Nothing needs to be done. + return null; + } + } + + public static NodeProcessor getFilterProc() { + return new FilterPPR(); + } + + public static NodeProcessor getDefaultProc() { + return new DefaultPPR(); + } + +} Index: ql/src/java/org/apache/hadoop/hive/ql/optimizer/Optimizer.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/optimizer/Optimizer.java (revision 796808) +++ ql/src/java/org/apache/hadoop/hive/ql/optimizer/Optimizer.java (working copy) @@ -25,61 +25,56 @@ import org.apache.hadoop.hive.ql.parse.ParseContext; import org.apache.hadoop.hive.ql.parse.SemanticException; import org.apache.hadoop.hive.ql.ppd.PredicatePushDown; +import org.apache.hadoop.hive.ql.optimizer.ppr.PartitionPruner; import org.apache.hadoop.hive.ql.optimizer.unionproc.UnionProcessor; /** * Implementation of the optimizer */ public class Optimizer { - private ParseContext pctx; - private List transformations; - - /** - * empty constructor - */ - public Optimizer() { - } + private ParseContext pctx; + private List transformations; /** * create the list of transformations * @param hiveConf */ - public void initialize(HiveConf hiveConf) { - transformations = new ArrayList(); - if (HiveConf.getBoolVar(hiveConf, HiveConf.ConfVars.HIVEOPTCP)) { - transformations.add(new ColumnPruner()); - } + public void initialize(HiveConf hiveConf) { + transformations = new ArrayList(); + if (HiveConf.getBoolVar(hiveConf, HiveConf.ConfVars.HIVEOPTCP)) { + transformations.add(new ColumnPruner()); + } if (HiveConf.getBoolVar(hiveConf, HiveConf.ConfVars.HIVEOPTPPD)) { transformations.add(new PredicatePushDown()); + transformations.add(new PartitionPruner()); } transformations.add(new UnionProcessor()); - transformations.add(new MapJoinProcessor()); - } - - /** - * invoke all the transformations one-by-one, and alter the query plan - * @return ParseContext - * @throws SemanticException - */ - public ParseContext optimize() throws SemanticException { - for (Transform t : transformations) - pctx = t.transform(pctx); + transformations.add(new MapJoinProcessor()); + } + + /** + * invoke all the transformations one-by-one, and alter the query plan + * @return ParseContext + * @throws SemanticException + */ + public ParseContext optimize() throws SemanticException { + for (Transform t : transformations) + pctx = t.transform(pctx); return pctx; - } - - /** - * @return the pctx - */ - public ParseContext getPctx() { - return pctx; - } + } - /** - * @param pctx the pctx to set - */ - public void setPctx(ParseContext pctx) { - this.pctx = pctx; - } - - + /** + * @return the pctx + */ + public ParseContext getPctx() { + return pctx; + } + + /** + * @param pctx the pctx to set + */ + public void setPctx(ParseContext pctx) { + this.pctx = pctx; + } + } Index: ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java (revision 796808) +++ ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java (working copy) @@ -392,29 +392,37 @@ Path tblDir = null; tableDesc tblDesc = null; - // Generate the map work for this alias_id - PartitionPruner pruner = parseCtx.getAliasToPruner().get(alias_id); - Set parts = null; + PrunedPartitionList partsList = null; + try { - // pass both confirmed and unknown partitions through the map-reduce framework - PartitionPruner.PrunedPartitionList partsList = pruner.prune(); - - parts = partsList.getConfirmedPartns(); - parts.addAll(partsList.getUnknownPartns()); - partitionDesc aliasPartnDesc = null; - if (parts.isEmpty()) { - if (!partsList.getDeniedPartns().isEmpty()) - aliasPartnDesc = Utilities.getPartitionDesc(partsList.getDeniedPartns().iterator().next()); + if (!opProcCtx.getConf().getBoolVar(HiveConf.ConfVars.HIVEOPTPPD)) { + partsList = parseCtx.getAliasToPruner().get(alias_id).prune(); } else { - aliasPartnDesc = Utilities.getPartitionDesc(parts.iterator().next()); + partsList = org.apache.hadoop.hive.ql.optimizer.ppr.PartitionPruner.prune( + parseCtx.getTopToTable().get(topOp), + parseCtx.getOpToPartPruner().get(topOp)); } - plan.getAliasToPartnInfo().put(alias_id, aliasPartnDesc); } catch (HiveException e) { - // Has to use full name to make sure it does not conflict with org.apache.commons.lang.StringUtils LOG.error(org.apache.hadoop.util.StringUtils.stringifyException(e)); throw new SemanticException(e.getMessage(), e); } + + // Generate the map work for this alias_id + Set parts = null; + // pass both confirmed and unknown partitions through the map-reduce framework + + parts = partsList.getConfirmedPartns(); + parts.addAll(partsList.getUnknownPartns()); + partitionDesc aliasPartnDesc = null; + if (parts.isEmpty()) { + if (!partsList.getDeniedPartns().isEmpty()) + aliasPartnDesc = Utilities.getPartitionDesc(partsList.getDeniedPartns().iterator().next()); + } + else { + aliasPartnDesc = Utilities.getPartitionDesc(parts.iterator().next()); + } + plan.getAliasToPartnInfo().put(alias_id, aliasPartnDesc); SamplePruner samplePruner = parseCtx.getAliasToSamplePruner().get(alias_id); for (Partition part : parts) { Index: ql/src/java/org/apache/hadoop/hive/ql/optimizer/MapJoinProcessor.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/optimizer/MapJoinProcessor.java (revision 796808) +++ ql/src/java/org/apache/hadoop/hive/ql/optimizer/MapJoinProcessor.java (working copy) @@ -178,10 +178,11 @@ String outputCol = oldValueInfo.getInternalName(); if (outputRS.get(key, field) == null) { outputColumnNames.add(outputCol); - exprNodeDesc colDesc = new exprNodeColumnDesc(valueInfo.getType(), valueInfo.getInternalName()); + exprNodeDesc colDesc = new exprNodeColumnDesc(valueInfo.getType(), valueInfo.getInternalName(), + valueInfo.getTabAlias(), valueInfo.getIsPartitionCol()); values.add(colDesc); outputRS.put(key, field, new ColumnInfo(outputCol, - valueInfo.getType())); + valueInfo.getType(), valueInfo.getTabAlias(), valueInfo.getIsPartitionCol())); colExprMap.put(outputCol, colDesc); } } @@ -283,11 +284,11 @@ String[] nm = inputRR.reverseLookup(internalName); ColumnInfo valueInfo = inputRR.get(nm[0], nm[1]); exprNodeDesc colDesc = new exprNodeColumnDesc(valueInfo.getType(), - valueInfo.getInternalName()); + valueInfo.getInternalName(), nm[0], valueInfo.getIsPartitionCol()); exprs.add(colDesc); outputs.add(internalName); outputRS .put(nm[0], nm[1], new ColumnInfo(internalName, - valueInfo.getType())); + valueInfo.getType(), nm[0], valueInfo.getIsPartitionCol())); colExprMap.put(internalName, colDesc); } Index: ql/src/java/org/apache/hadoop/hive/ql/ppd/OpProcFactory.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/ppd/OpProcFactory.java (revision 796808) +++ ql/src/java/org/apache/hadoop/hive/ql/ppd/OpProcFactory.java (working copy) @@ -134,7 +134,7 @@ List> originalChilren = tsOp.getChildOperators(); tsOp.setChildOperators(null); Operator output = - OperatorFactory.getAndMakeChild(new filterDesc(condn), + OperatorFactory.getAndMakeChild(new filterDesc(condn, false), new RowSchema(inputRR.getColumnInfos()), tsOp); output.setChildOperators(originalChilren); Index: ql/src/java/org/apache/hadoop/hive/ql/exec/ColumnInfo.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/exec/ColumnInfo.java (revision 796808) +++ ql/src/java/org/apache/hadoop/hive/ql/exec/ColumnInfo.java (working copy) @@ -37,25 +37,34 @@ private String internalName; /** - * isVirtual indicates whether the column is a virtual column or not. Virtual columns - * are the ones that are not stored in the tables. For now these are just the partitioning - * columns. + * Store the alias of the table where available. */ - private boolean isVirtual; + private String tabAlias; + /** + * Indicates whether the column is a partition column. + */ + private boolean isPartitionCol; + transient private TypeInfo type; public ColumnInfo() { } - public ColumnInfo(String internalName, TypeInfo type) { + public ColumnInfo(String internalName, TypeInfo type, + String tabAlias, boolean isPartitionCol) { this.internalName = internalName; this.type = type; + this.tabAlias = tabAlias; + this.isPartitionCol = isPartitionCol; } - public ColumnInfo(String internalName, Class type) { + public ColumnInfo(String internalName, Class type, + String tabAlias, boolean isPartitionCol) { this.internalName = internalName; this.type = TypeInfoFactory.getPrimitiveTypeInfoFromPrimitiveWritable(type); + this.tabAlias = tabAlias; + this.isPartitionCol = isPartitionCol; } public TypeInfo getType() { @@ -74,6 +83,13 @@ this.internalName = internalName; } + public String getTabAlias() { + return this.tabAlias; + } + + public boolean getIsPartitionCol() { + return this.isPartitionCol; + } /** * Returns the string representation of the ColumnInfo. */ Index: ql/src/java/org/apache/hadoop/hive/ql/plan/exprNodeColumnDesc.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/plan/exprNodeColumnDesc.java (revision 796808) +++ ql/src/java/org/apache/hadoop/hive/ql/plan/exprNodeColumnDesc.java (working copy) @@ -27,16 +27,36 @@ public class exprNodeColumnDesc extends exprNodeDesc implements Serializable { private static final long serialVersionUID = 1L; + + /** + * The column name. + */ private String column; + + /** + * The alias of the table. + */ + private String tabAlias; + /** + * Is the column a partitioned column. + */ + private boolean isPartitionCol; + public exprNodeColumnDesc() {} - public exprNodeColumnDesc(TypeInfo typeInfo, String column) { + public exprNodeColumnDesc(TypeInfo typeInfo, String column, + String tabAlias, boolean isPartitionCol) { super(typeInfo); this.column = column; + this.tabAlias = tabAlias; + this.isPartitionCol = isPartitionCol; } - public exprNodeColumnDesc(Class c, String column) { + public exprNodeColumnDesc(Class c, String column, String tabAlias, + boolean isPartitionCol) { super(TypeInfoFactory.getPrimitiveTypeInfoFromJavaPrimitive(c)); this.column = column; + this.tabAlias = tabAlias; + this.isPartitionCol = isPartitionCol; } public String getColumn() { return this.column; @@ -45,6 +65,20 @@ this.column = column; } + public String getTabAlias() { + return this.tabAlias; + } + public void setTabAlias(String tabAlias) { + this.tabAlias = tabAlias; + } + + public boolean getIsParititonCol() { + return this.isPartitionCol; + } + public void setIsPartitionCol(boolean isPartitionCol) { + this.isPartitionCol = isPartitionCol; + } + public String toString() { return "Column[" + column + "]"; } @@ -62,7 +96,8 @@ } @Override public exprNodeDesc clone() { - return new exprNodeColumnDesc(this.typeInfo, this.column); + return new exprNodeColumnDesc(this.typeInfo, this.column, + this.tabAlias, this.isPartitionCol); } @Override public boolean isSame(Object o) { Index: ql/src/java/org/apache/hadoop/hive/ql/plan/tableScanDesc.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/plan/tableScanDesc.java (revision 796808) +++ ql/src/java/org/apache/hadoop/hive/ql/plan/tableScanDesc.java (working copy) @@ -28,8 +28,22 @@ @explain(displayName="TableScan") public class tableScanDesc implements Serializable { private static final long serialVersionUID = 1L; + + private String alias; + @SuppressWarnings("nls") - public tableScanDesc() { - throw new RuntimeException("This class does not need to be instantiated"); + public tableScanDesc() { } + + public tableScanDesc(final String alias) { + this.alias = alias; } + + @explain(displayName="alias") + public String getAlias() { + return alias; + } + + public void setAlias(String alias) { + this.alias = alias; + } } Index: ql/src/java/org/apache/hadoop/hive/ql/plan/filterDesc.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/plan/filterDesc.java (revision 796808) +++ ql/src/java/org/apache/hadoop/hive/ql/plan/filterDesc.java (working copy) @@ -24,10 +24,12 @@ public class filterDesc implements Serializable { private static final long serialVersionUID = 1L; private org.apache.hadoop.hive.ql.plan.exprNodeDesc predicate; + private boolean isSamplingPred; public filterDesc() { } public filterDesc( - final org.apache.hadoop.hive.ql.plan.exprNodeDesc predicate) { + final org.apache.hadoop.hive.ql.plan.exprNodeDesc predicate, boolean isSamplingPred) { this.predicate = predicate; + this.isSamplingPred = isSamplingPred; } @explain(displayName="predicate") public org.apache.hadoop.hive.ql.plan.exprNodeDesc getPredicate() { @@ -36,4 +38,11 @@ public void setPredicate(final org.apache.hadoop.hive.ql.plan.exprNodeDesc predicate) { this.predicate = predicate; } + @explain(displayName="isSamplingPred", normalExplain=false) + public boolean getIsSamplingPred() { + return this.isSamplingPred; + } + public void setIsSamplingPred(final boolean isSamplingPred) { + this.isSamplingPred = isSamplingPred; + } } Index: ql/src/java/org/apache/hadoop/hive/ql/lib/DefaultGraphWalker.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/lib/DefaultGraphWalker.java (revision 796808) +++ ql/src/java/org/apache/hadoop/hive/ql/lib/DefaultGraphWalker.java (working copy) @@ -105,7 +105,8 @@ * @throws SemanticException */ public void walk(Node nd) throws SemanticException { - opStack.push(nd); + if (opStack.empty() || nd != opStack.peek()) + opStack.push(nd); if((nd.getChildren() == null) || getDispatchedList().containsAll(nd.getChildren())) { @@ -121,6 +122,6 @@ getToWalk().add(0, nd); getToWalk().removeAll(nd.getChildren()); getToWalk().addAll(0, nd.getChildren()); - opStack.pop(); + // opStack.pop(); } } Index: ql/src/java/org/apache/hadoop/hive/ql/parse/PartitionPruner.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/parse/PartitionPruner.java (revision 796808) +++ ql/src/java/org/apache/hadoop/hive/ql/parse/PartitionPruner.java (working copy) @@ -301,7 +301,8 @@ if (t.isPartitionKey(colName)) { // Set value to null if it's not partition column if (tabAlias.equalsIgnoreCase(tableAlias)) { - desc = new ExprNodeTempDesc(new exprNodeColumnDesc(TypeInfoFactory.stringTypeInfo, colName)); + desc = new ExprNodeTempDesc(new exprNodeColumnDesc(TypeInfoFactory.stringTypeInfo, + colName, tabAlias, true)); } else { desc = new ExprNodeTempDesc(new exprNodeConstantDesc(TypeInfoFactory.stringTypeInfo, null)); } @@ -427,147 +428,13 @@ } } - /** - * list of the partitions satisfying the pruning criteria - contains both confirmed and unknown partitions - */ - public static class PrunedPartitionList { - // confirmed partitions - satisfy the partition criteria - private Set confirmedPartns; - - // unknown partitions - may/may not satisfy the partition criteria - private Set unknownPartns; - - // denied partitions - do not satisfy the partition criteria - private Set deniedPartns; - - /** - * @param confirmedPartns confirmed paritions - * @param unknownPartns unknown partitions - */ - public PrunedPartitionList(Set confirmedPartns, Set unknownPartns, Set deniedPartns) { - this.confirmedPartns = confirmedPartns; - this.unknownPartns = unknownPartns; - this.deniedPartns = deniedPartns; - } - - /** - * get confirmed partitions - * @return confirmedPartns confirmed paritions - */ - public Set getConfirmedPartns() { - return confirmedPartns; - } - - /** - * get unknown partitions - * @return unknownPartns unknown paritions - */ - public Set getUnknownPartns() { - return unknownPartns; - } - - /** - * get denied partitions - * @return deniedPartns denied paritions - */ - public Set getDeniedPartns() { - return deniedPartns; - } - - /** - * set confirmed partitions - * @param confirmedPartns confirmed paritions - */ - public void setConfirmedPartns(Set confirmedPartns) { - this.confirmedPartns = confirmedPartns; - } - - /** - * set unknown partitions - * @param unknownPartns unknown partitions - */ - public void setUnknownPartns(Set unknownPartns) { - this.unknownPartns = unknownPartns; - } - } - /** * From the table metadata prune the partitions to return the partitions. * Evaluate the parition pruner for each partition and return confirmed and unknown partitions separately */ @SuppressWarnings("nls") public PrunedPartitionList prune() throws HiveException { - LOG.trace("Started pruning partiton"); - LOG.trace("tabname = " + this.tab.getName()); - LOG.trace("prune Expression = " + this.prunerExpr); - - LinkedHashSet true_parts = new LinkedHashSet(); - LinkedHashSet unkn_parts = new LinkedHashSet(); - LinkedHashSet denied_parts = new LinkedHashSet(); - - try { - StructObjectInspector rowObjectInspector = (StructObjectInspector)this.tab.getDeserializer().getObjectInspector(); - Object[] rowWithPart = new Object[2]; - - if(tab.isPartitioned()) { - for(String partName: Hive.get().getPartitionNames(MetaStoreUtils.DEFAULT_DATABASE_NAME, tab.getName(), (short) -1)) { - // Set all the variables here - LinkedHashMap partSpec = Warehouse.makeSpecFromName(partName); - LOG.debug("part name: " + partName); - // Create the row object - ArrayList partNames = new ArrayList(); - ArrayList partValues = new ArrayList(); - ArrayList partObjectInspectors = new ArrayList(); - for(Map.Entryentry : partSpec.entrySet()) { - partNames.add(entry.getKey()); - partValues.add(entry.getValue()); - partObjectInspectors.add(PrimitiveObjectInspectorFactory.javaStringObjectInspector); - } - StructObjectInspector partObjectInspector = ObjectInspectorFactory.getStandardStructObjectInspector(partNames, partObjectInspectors); - - rowWithPart[1] = partValues; - ArrayList ois = new ArrayList(2); - ois.add(rowObjectInspector); - ois.add(partObjectInspector); - StructObjectInspector rowWithPartObjectInspector = ObjectInspectorFactory.getUnionStructObjectInspector(ois); - - // evaluate the expression tree - if (this.prunerExpr != null) { - ExprNodeEvaluator evaluator = ExprNodeEvaluatorFactory.get(this.prunerExpr); - ObjectInspector evaluateResultOI = evaluator.initialize(rowWithPartObjectInspector); - Object evaluateResultO = evaluator.evaluate(rowWithPart); - Boolean r = (Boolean) ((PrimitiveObjectInspector)evaluateResultOI).getPrimitiveJavaObject(evaluateResultO); - LOG.trace("prune result for partition " + partSpec + ": " + r); - if (Boolean.FALSE.equals(r)) { - if (denied_parts.isEmpty()) { - Partition part = Hive.get().getPartition(tab, partSpec, Boolean.FALSE); - denied_parts.add(part); - } - LOG.trace("pruned partition: " + partSpec); - } else { - Partition part = Hive.get().getPartition(tab, partSpec, Boolean.FALSE); - if (Boolean.TRUE.equals(r)) { - LOG.debug("retained partition: " + partSpec); - true_parts.add(part); - } else { - LOG.debug("unknown partition: " + partSpec); - unkn_parts.add(part); - } - } - } else { - // is there is no parition pruning, all of them are needed - true_parts.add(Hive.get().getPartition(tab, partSpec, Boolean.FALSE)); - } - } - } else { - true_parts.addAll(Hive.get().getPartitions(tab)); - } - } catch (Exception e) { - throw new HiveException(e); - } - - // Now return the set of partitions - return new PrunedPartitionList(true_parts, unkn_parts, denied_parts); + return org.apache.hadoop.hive.ql.optimizer.ppr.PartitionPruner.prune(this.tab, this.prunerExpr); } public Table getTable() { Index: ql/src/java/org/apache/hadoop/hive/ql/parse/TypeCheckProcFactory.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/parse/TypeCheckProcFactory.java (revision 796808) +++ ql/src/java/org/apache/hadoop/hive/ql/parse/TypeCheckProcFactory.java (working copy) @@ -93,7 +93,8 @@ // If the current subExpression is pre-calculated, as in Group-By etc. ColumnInfo colInfo = input.get("", expr.toStringTree()); if (colInfo != null) { - desc = new exprNodeColumnDesc(colInfo.getType(), colInfo.getInternalName()); + desc = new exprNodeColumnDesc(colInfo.getType(), colInfo.getInternalName(), + colInfo.getTabAlias(), colInfo.getIsPartitionCol()); return desc; } return desc; @@ -326,7 +327,8 @@ } } else { // It's a column. - return new exprNodeColumnDesc(colInfo.getType(), colInfo.getInternalName()); + return new exprNodeColumnDesc(colInfo.getType(), colInfo.getInternalName(), + colInfo.getTabAlias(), colInfo.getIsPartitionCol()); } } @@ -626,7 +628,8 @@ ctx.setError(ErrorMsg.INVALID_COLUMN.getMsg(expr.getChild(1))); return null; } - return new exprNodeColumnDesc(colInfo.getType(), colInfo.getInternalName()); + return new exprNodeColumnDesc(colInfo.getType(), colInfo.getInternalName(), + colInfo.getTabAlias(), colInfo.getIsPartitionCol()); } // Return nulls for conversion operators Index: ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java (revision 796808) +++ ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java (working copy) @@ -109,6 +109,7 @@ import org.apache.hadoop.hive.ql.plan.tableDesc; import org.apache.hadoop.hive.ql.plan.tableScanDesc; import org.apache.hadoop.hive.ql.plan.unionDesc; +import org.apache.hadoop.hive.ql.ppd.PredicatePushDown; import org.apache.hadoop.hive.ql.session.SessionState; import org.apache.hadoop.hive.ql.udf.generic.GenericUDAFEvaluator; import org.apache.hadoop.hive.ql.udf.generic.GenericUDAFResolver; @@ -136,7 +137,8 @@ */ public class SemanticAnalyzer extends BaseSemanticAnalyzer { - private HashMap aliasToPruner; + private HashMap aliasToPruner; + private HashMap opToPartPruner; private HashMap aliasToSamplePruner; private HashMap> topOps; private HashMap> topSelOps; @@ -144,6 +146,7 @@ private List loadTableWork; private List loadFileWork; private Map joinContext; + private HashMap topToTable; private QB qb; private ASTNode ast; private int destTableId; @@ -168,7 +171,8 @@ super(conf); - this.aliasToPruner = new HashMap(); + this.aliasToPruner = new HashMap(); + this.opToPartPruner = new HashMap(); this.aliasToSamplePruner = new HashMap(); this.topOps = new HashMap>(); this.topSelOps = new HashMap>(); @@ -176,6 +180,7 @@ this.loadFileWork = new ArrayList(); opParseCtx = new LinkedHashMap, OpParseContext>(); joinContext = new HashMap(); + topToTable = new HashMap(); this.destTableId = 1; this.uCtx = null; this.listMapJoinOpsNoReducer = new ArrayList(); @@ -205,6 +210,7 @@ public void init(ParseContext pctx) { aliasToPruner = pctx.getAliasToPruner(); + opToPartPruner = pctx.getOpToPartPruner(); aliasToSamplePruner = pctx.getAliasToSamplePruner(); topOps = pctx.getTopOps(); topSelOps = pctx.getTopSelOps(); @@ -221,8 +227,8 @@ } public ParseContext getParseContext() { - return new ParseContext(conf, qb, ast, aliasToPruner, aliasToSamplePruner, topOps, - topSelOps, opParseCtx, joinContext, loadTableWork, loadFileWork, ctx, idToTableNameMap, destTableId, uCtx, + return new ParseContext(conf, qb, ast, aliasToPruner, opToPartPruner, aliasToSamplePruner, topOps, + topSelOps, opParseCtx, joinContext, topToTable, loadTableWork, loadFileWork, ctx, idToTableNameMap, destTableId, uCtx, listMapJoinOpsNoReducer); } @@ -232,7 +238,7 @@ assert (ast.getToken() != null); switch (ast.getToken().getType()) { - case HiveParser.TOK_QUERY: { + case HiveParser.TOK_QUERY: { QB qb = new QB(id, alias, true); doPhase1(ast, qb, initPhase1Ctx()); qbexpr.setOpcode(QBExpr.Opcode.NULLOP); @@ -603,7 +609,9 @@ for (String alias : qb.getTabAliases()) { String alias_id = (qb.getId() == null ? alias : qb.getId() + ":" + alias); - PartitionPruner pruner = new PartitionPruner(alias, qb.getMetaData()); + org.apache.hadoop.hive.ql.parse.PartitionPruner pruner = + new org.apache.hadoop.hive.ql.parse.PartitionPruner(alias, qb.getMetaData()); + // Pass each where clause to the pruner for(String clause: qbp.getClauseNames()) { @@ -622,7 +630,8 @@ for (String alias : qb.getQbJoinTree().getBaseSrc()) { if (alias != null) { String alias_id = (qb.getId() == null ? alias : qb.getId() + ":" + alias); - PartitionPruner pruner = this.aliasToPruner.get(alias_id); + org.apache.hadoop.hive.ql.parse.PartitionPruner pruner = + this.aliasToPruner.get(alias_id); if(pruner == null) { // this means that the alias is a subquery pos++; @@ -649,7 +658,7 @@ for (String alias : qb.getTabAliases()) { String alias_id = (qb.getId() == null ? alias : qb.getId() + ":" + alias); - PartitionPruner pruner = this.aliasToPruner.get(alias_id); + org.apache.hadoop.hive.ql.parse.PartitionPruner pruner = this.aliasToPruner.get(alias_id); if (joinPartnPruner.get(alias_id) == null) { // Pass each where clause to the pruner for(String clause: qbp.getClauseNames()) { @@ -1003,7 +1012,7 @@ RowResolver inputRR = inputCtx.getRR(); Operator output = putOpInsertMap( OperatorFactory.getAndMakeChild( - new filterDesc(genExprNodeDesc(condn, inputRR)), + new filterDesc(genExprNodeDesc(condn, inputRR), false), new RowSchema(inputRR.getColumnInfos()), input), inputRR); LOG.debug("Created Filter Plan for " + qb.getId() + " row schema: " + inputRR.toString()); @@ -1014,7 +1023,7 @@ private Integer genColListRegex(String colRegex, String tabAlias, String alias, ASTNode sel, ArrayList col_list, RowResolver input, Integer pos, RowResolver output) throws SemanticException { - + // The table alias should exist if (tabAlias != null && !input.hasTableAlias(tabAlias)) throw new SemanticException(ErrorMsg.INVALID_TABLE_ALIAS.getMsg(sel)); @@ -1045,9 +1054,13 @@ continue; } - exprNodeColumnDesc expr = new exprNodeColumnDesc(colInfo.getType(), name); + exprNodeColumnDesc expr = new exprNodeColumnDesc(colInfo.getType(), name, + colInfo.getTabAlias(), + colInfo.getIsPartitionCol()); col_list.add(expr); - output.put(tmp[0], tmp[1], new ColumnInfo(getColumnInternalName(pos), colInfo.getType())); + output.put(tmp[0], tmp[1], + new ColumnInfo(getColumnInternalName(pos), colInfo.getType(), + colInfo.getTabAlias(), colInfo.getIsPartitionCol())); pos = Integer.valueOf(pos.intValue() + 1); matched ++; } @@ -1120,7 +1133,7 @@ out_rwsch.put( qb.getParseInfo().getAlias(), outputColList.get(i), - new ColumnInfo(outputColList.get(i), TypeInfoFactory.stringTypeInfo) // Script output is always a string + new ColumnInfo(outputColList.get(i), TypeInfoFactory.stringTypeInfo, null, false) // Script output is always a string ); } @@ -1317,7 +1330,7 @@ } out_rwsch.put(tabAlias, colAlias, new ColumnInfo(getColumnInternalName(pos), - exp.getTypeInfo())); + exp.getTypeInfo(), tabAlias, false)); pos = Integer.valueOf(pos.intValue() + 1); } } @@ -1479,11 +1492,12 @@ throw new SemanticException(ErrorMsg.INVALID_COLUMN.getMsg(grpbyExpr)); } - groupByKeys.add(new exprNodeColumnDesc(exprInfo.getType(), exprInfo.getInternalName())); + groupByKeys.add(new exprNodeColumnDesc(exprInfo.getType(), + exprInfo.getInternalName(), "", false)); String field = getColumnInternalName(i); outputColumnNames.add(field); groupByOutputRowResolver.put("",grpbyExpr.toStringTree(), - new ColumnInfo(field, exprInfo.getType())); + new ColumnInfo(field, exprInfo.getType(), null, false)); colExprMap.put(field, groupByKeys.get(groupByKeys.size() - 1)); } // For each aggregation @@ -1509,7 +1523,10 @@ String paraExpression = paraExprInfo.getInternalName(); assert(paraExpression != null); - aggParameters.add(new exprNodeColumnDesc(paraExprInfo.getType(), paraExprInfo.getInternalName())); + aggParameters.add(new exprNodeColumnDesc(paraExprInfo.getType(), + paraExprInfo.getInternalName(), + paraExprInfo.getTabAlias(), + paraExprInfo.getIsPartitionCol())); } boolean isDistinct = value.getType() == HiveParser.TOK_FUNCTIONDI; @@ -1523,7 +1540,7 @@ outputColumnNames.add(field); groupByOutputRowResolver.put("",value.toStringTree(), new ColumnInfo(field, - udaf.returnType)); + udaf.returnType, "", false)); // Save the evaluator so that it can be used by the next-stage GroupByOperators if (genericUDAFEvaluators != null) { genericUDAFEvaluators.put(entry.getKey(), genericUDAFEvaluator); @@ -1572,11 +1589,14 @@ throw new SemanticException(ErrorMsg.INVALID_COLUMN.getMsg(grpbyExpr)); } - groupByKeys.add(new exprNodeColumnDesc(exprInfo.getType(), exprInfo.getInternalName())); + groupByKeys.add(new exprNodeColumnDesc(exprInfo.getType(), + exprInfo.getInternalName(), + exprInfo.getTabAlias(), + exprInfo.getIsPartitionCol())); String field = getColumnInternalName(i); outputColumnNames.add(field); groupByOutputRowResolver.put("",grpbyExpr.toStringTree(), - new ColumnInfo(field, exprInfo.getType())); + new ColumnInfo(field, exprInfo.getType(), "", false)); colExprMap.put(field, groupByKeys.get(groupByKeys.size() - 1)); } @@ -1606,7 +1626,10 @@ String paraExpression = paraExprInfo.getInternalName(); assert(paraExpression != null); - aggParameters.add(new exprNodeColumnDesc(paraExprInfo.getType(), paraExprInfo.getInternalName())); + aggParameters.add(new exprNodeColumnDesc(paraExprInfo.getType(), + paraExprInfo.getInternalName(), + paraExprInfo.getTabAlias(), + paraExprInfo.getIsPartitionCol())); } } else { @@ -1617,7 +1640,9 @@ } String paraExpression = paraExprInfo.getInternalName(); assert(paraExpression != null); - aggParameters.add(new exprNodeColumnDesc(paraExprInfo.getType(), paraExpression)); + aggParameters.add(new exprNodeColumnDesc(paraExprInfo.getType(), paraExpression, + paraExprInfo.getTabAlias(), + paraExprInfo.getIsPartitionCol())); } boolean isDistinct = (value.getType() == HiveParser.TOK_FUNCTIONDI); Mode amode = groupByDescModeToUDAFMode(mode, isDistinct); @@ -1638,7 +1663,9 @@ (mode != groupByDesc.Mode.FINAL && isDistinct), amode)); String field = getColumnInternalName(groupByKeys.size() + aggregations.size() - 1); outputColumnNames.add(field); - groupByOutputRowResolver.put("", value.toStringTree(), new ColumnInfo(field, udaf.returnType)); + groupByOutputRowResolver.put("", value.toStringTree(), + new ColumnInfo(field, + udaf.returnType, "", false)); } Operator op = putOpInsertMap( @@ -1681,7 +1708,7 @@ String field = getColumnInternalName(i); outputColumnNames.add(field); groupByOutputRowResolver.put("",grpbyExpr.toStringTree(), - new ColumnInfo(field, grpByExprNode.getTypeInfo())); + new ColumnInfo(field, grpByExprNode.getTypeInfo(), "", false)); colExprMap.put(field, groupByKeys.get(groupByKeys.size() - 1)); } @@ -1699,7 +1726,7 @@ numDistn++; String field = getColumnInternalName(grpByExprs.size() + numDistn -1); outputColumnNames.add(field); - groupByOutputRowResolver.put("", text, new ColumnInfo(field, distExprNode.getTypeInfo())); + groupByOutputRowResolver.put("", text, new ColumnInfo(field, distExprNode.getTypeInfo(), "", false)); colExprMap.put(field, groupByKeys.get(groupByKeys.size() - 1)); } } @@ -1735,7 +1762,7 @@ outputColumnNames.add(field); groupByOutputRowResolver.put("",value.toStringTree(), new ColumnInfo(field, - udaf.returnType)); + udaf.returnType, "", false)); // Save the evaluator so that it can be used by the next-stage GroupByOperators if (genericUDAFEvaluators != null) { genericUDAFEvaluators.put(entry.getKey(), genericUDAFEvaluator); @@ -1787,7 +1814,7 @@ outputColumnNames.add(getColumnInternalName(reduceKeys.size() - 1)); String field = Utilities.ReduceField.KEY.toString() + "." + getColumnInternalName(reduceKeys.size() - 1); ColumnInfo colInfo = new ColumnInfo(field, - reduceKeys.get(reduceKeys.size()-1).getTypeInfo()); + reduceKeys.get(reduceKeys.size()-1).getTypeInfo(), null, false); reduceSinkOutputRowResolver.put("", text, colInfo); colExprMap.put(colInfo.getInternalName(), inputExpr); } else { @@ -1807,7 +1834,7 @@ outputColumnNames.add(getColumnInternalName(reduceKeys.size() - 1)); String field = Utilities.ReduceField.KEY.toString() + "." + getColumnInternalName(reduceKeys.size() - 1); ColumnInfo colInfo = new ColumnInfo(field, - reduceKeys.get(reduceKeys.size()-1).getTypeInfo()); + reduceKeys.get(reduceKeys.size()-1).getTypeInfo(), null, false); reduceSinkOutputRowResolver.put("", text, colInfo); colExprMap.put(colInfo.getInternalName(), reduceKeys.get(reduceKeys.size()-1)); } @@ -1831,7 +1858,8 @@ String field = Utilities.ReduceField.VALUE.toString() + "." + getColumnInternalName(reduceValues.size() - 1); reduceSinkOutputRowResolver.put("", text, new ColumnInfo(field, - reduceValues.get(reduceValues.size()-1).getTypeInfo())); + reduceValues.get(reduceValues.size()-1).getTypeInfo(), + null, false)); } } } @@ -1844,13 +1872,14 @@ for (Map.Entry entry : aggregationTrees.entrySet()) { TypeInfo type = reduceSinkInputRowResolver.getColumnInfos().get(inputField).getType(); - reduceValues.add(new exprNodeColumnDesc(type, getColumnInternalName(inputField))); + reduceValues.add(new exprNodeColumnDesc(type, getColumnInternalName(inputField), + "", false)); inputField++; outputColumnNames.add(getColumnInternalName(reduceValues.size() - 1)); String field = Utilities.ReduceField.VALUE.toString() + "." + getColumnInternalName(reduceValues.size() - 1); reduceSinkOutputRowResolver.put("", ((ASTNode)entry.getValue()).toStringTree(), new ColumnInfo(field, - type)); + type, null, false)); } } @@ -1895,10 +1924,10 @@ String field = getColumnInternalName(i); outputColumnNames.add(field); TypeInfo typeInfo = reduceSinkInputRowResolver2.get("", grpbyExpr.toStringTree()).getType(); - exprNodeColumnDesc inputExpr = new exprNodeColumnDesc(typeInfo, field); + exprNodeColumnDesc inputExpr = new exprNodeColumnDesc(typeInfo, field, "", false); reduceKeys.add(inputExpr); ColumnInfo colInfo = new ColumnInfo(Utilities.ReduceField.KEY.toString() + "." + field, - typeInfo); + typeInfo, "", false); reduceSinkOutputRowResolver2.put("", grpbyExpr.toStringTree(), colInfo); colExprMap.put(colInfo.getInternalName(), inputExpr); @@ -1912,13 +1941,13 @@ String field = getColumnInternalName(inputField); ASTNode t = entry.getValue(); TypeInfo typeInfo = reduceSinkInputRowResolver2.get("", t.toStringTree()).getType(); - reduceValues.add(new exprNodeColumnDesc(typeInfo, field)); + reduceValues.add(new exprNodeColumnDesc(typeInfo, field, "", false)); inputField++; String col = getColumnInternalName(reduceValues.size()-1); outputColumnNames.add(col); reduceSinkOutputRowResolver2.put("", t.toStringTree(), new ColumnInfo(Utilities.ReduceField.VALUE.toString() + "." + col, - typeInfo)); + typeInfo, "", false)); } ReduceSinkOperator rsOp = (ReduceSinkOperator) putOpInsertMap( @@ -1966,11 +1995,13 @@ } String expression = exprInfo.getInternalName(); - groupByKeys.add(new exprNodeColumnDesc(exprInfo.getType(), expression)); + groupByKeys.add(new exprNodeColumnDesc(exprInfo.getType(), expression, + exprInfo.getTabAlias(), + exprInfo.getIsPartitionCol())); String field = getColumnInternalName(i); outputColumnNames.add(field); groupByOutputRowResolver2.put("",grpbyExpr.toStringTree(), - new ColumnInfo(field, exprInfo.getType())); + new ColumnInfo(field, exprInfo.getType(), "", false)); colExprMap.put(field, groupByKeys.get(groupByKeys.size() - 1)); } HashMap aggregationTrees = parseInfo @@ -1985,7 +2016,9 @@ } String paraExpression = paraExprInfo.getInternalName(); assert(paraExpression != null); - aggParameters.add(new exprNodeColumnDesc(paraExprInfo.getType(), paraExpression)); + aggParameters.add(new exprNodeColumnDesc(paraExprInfo.getType(), paraExpression, + paraExprInfo.getTabAlias(), + paraExprInfo.getIsPartitionCol())); String aggName = value.getChild(0).getText(); @@ -2001,7 +2034,7 @@ outputColumnNames.add(field); groupByOutputRowResolver2.put("", value.toStringTree(), new ColumnInfo(field, - udaf.returnType)); + udaf.returnType, "", false)); } Operator op = putOpInsertMap( @@ -2530,7 +2563,8 @@ List fields = rowObjectInspector.getAllStructFieldRefs(); for (int i=0; i colName = new ArrayList(); for (int i=0; i colExprMap = new HashMap(); ArrayList valueCols = new ArrayList(); for(ColumnInfo colInfo: inputRR.getColumnInfos()) { - valueCols.add(new exprNodeColumnDesc(colInfo.getType(), colInfo.getInternalName())); + valueCols.add(new exprNodeColumnDesc(colInfo.getType(), colInfo.getInternalName(), + colInfo.getTabAlias(), colInfo.getIsPartitionCol())); colExprMap.put(colInfo.getInternalName(), valueCols.get(valueCols.size() - 1)); } @@ -2757,13 +2793,15 @@ for(ColumnInfo colInfo: interim_rwsch.getColumnInfos()) { String [] info = interim_rwsch.reverseLookup(colInfo.getInternalName()); out_rwsch.put(info[0], info[1], - new ColumnInfo(getColumnInternalName(pos), colInfo.getType())); + new ColumnInfo(getColumnInternalName(pos), colInfo.getType(), info[0], false)); pos = Integer.valueOf(pos.intValue() + 1); } Operator output = putOpInsertMap( OperatorFactory.getAndMakeChild( - new extractDesc(new exprNodeColumnDesc(TypeInfoFactory.stringTypeInfo, Utilities.ReduceField.VALUE.toString())), + new extractDesc(new exprNodeColumnDesc(TypeInfoFactory.stringTypeInfo, + Utilities.ReduceField.VALUE.toString(), + "", false)), new RowSchema(out_rwsch.getColumnInfos()), interim), out_rwsch); @@ -2809,14 +2847,17 @@ { String field = fNamesIter.next(); ColumnInfo valueInfo = inputRS.get(key, field); - keyDesc.add(new exprNodeColumnDesc(valueInfo.getType(), valueInfo.getInternalName())); + keyDesc.add(new exprNodeColumnDesc(valueInfo.getType(), + valueInfo.getInternalName(), + valueInfo.getTabAlias(), + valueInfo.getIsPartitionCol())); if (outputRS.get(key, field) == null) { String colName = getColumnInternalName(outputPos); outputPos++; outputColumnNames.add(colName); colExprMap.put(colName, keyDesc.get(keyDesc.size() - 1)); outputRS.put(key, field, new ColumnInfo(colName, - valueInfo.getType())); + valueInfo.getType(), key, false)); reversedExprs.put(colName, tag); } } @@ -2867,14 +2908,17 @@ for (Map.Entry entry : fMap.entrySet()) { String field = entry.getKey(); ColumnInfo valueInfo = entry.getValue(); - exprNodeColumnDesc inputExpr = new exprNodeColumnDesc(valueInfo.getType(), valueInfo.getInternalName()); + exprNodeColumnDesc inputExpr = new exprNodeColumnDesc(valueInfo.getType(), + valueInfo.getInternalName(), + valueInfo.getTabAlias(), + valueInfo.getIsPartitionCol()); reduceValues.add(inputExpr); if (outputRS.get(src, field) == null) { String col = getColumnInternalName(reduceValues.size() - 1); outputColumns.add(col); ColumnInfo newColInfo = new ColumnInfo(Utilities.ReduceField.VALUE.toString() + "." + col, - valueInfo.getType()); + valueInfo.getType(), src, false); colExprMap.put(newColInfo.getInternalName(), inputExpr); outputRS.put(src, field, newColInfo); } @@ -3307,7 +3351,8 @@ ArrayList columnNames = new ArrayList(); for (int i = 0; i < columns.size(); i++) { ColumnInfo col = columns.get(i); - colList.add(new exprNodeColumnDesc(col.getType(), col.getInternalName())); + colList.add(new exprNodeColumnDesc(col.getType(), col.getInternalName(), + col.getTabAlias(), col.getIsPartitionCol())); columnNames.add(col.getInternalName()); } Operator output = putOpInsertMap(OperatorFactory.getAndMakeChild( @@ -3406,7 +3451,7 @@ outputColumnNames.add(getColumnInternalName(reduceKeys.size() - 1)); String field = Utilities.ReduceField.KEY.toString() + "." + getColumnInternalName(reduceKeys.size() - 1); ColumnInfo colInfo = new ColumnInfo(field, - reduceKeys.get(reduceKeys.size()-1).getTypeInfo()); + reduceKeys.get(reduceKeys.size()-1).getTypeInfo(), "", false); reduceSinkOutputRowResolver.put("", text, colInfo); colExprMap.put(colInfo.getInternalName(), distExpr); } @@ -3424,7 +3469,7 @@ exprNodeDesc grpByExprNode = genExprNodeDesc(grpbyExpr, inputRR); reduceValues.add(grpByExprNode); String field = Utilities.ReduceField.VALUE.toString() + "." + getColumnInternalName(reduceValues.size() - 1); - ColumnInfo colInfo = new ColumnInfo(field, reduceValues.get(reduceValues.size()-1).getTypeInfo()); + ColumnInfo colInfo = new ColumnInfo(field, reduceValues.get(reduceValues.size()-1).getTypeInfo(), "", false); reduceSinkOutputRowResolver.put("", text, colInfo); outputColumnNames.add(getColumnInternalName(reduceValues.size() - 1)); } @@ -3447,7 +3492,7 @@ exprNodeDesc paraExprNode = genExprNodeDesc(paraExpr, inputRR); reduceValues.add(paraExprNode); String field = Utilities.ReduceField.VALUE.toString() + "." + getColumnInternalName(reduceValues.size() - 1); - ColumnInfo colInfo = new ColumnInfo(field, reduceValues.get(reduceValues.size()-1).getTypeInfo()); + ColumnInfo colInfo = new ColumnInfo(field, reduceValues.get(reduceValues.size()-1).getTypeInfo(), "", false); reduceSinkOutputRowResolver.put("", text, colInfo); outputColumnNames.add(getColumnInternalName(reduceValues.size() - 1)); } @@ -3728,7 +3773,8 @@ for (String col : bucketCols) { ColumnInfo ci = rwsch.get(alias, col); // TODO: change type to the one in the table schema - args.add(new exprNodeColumnDesc(ci.getType(), ci.getInternalName())); + args.add(new exprNodeColumnDesc(ci.getType(), ci.getInternalName(), + ci.getTabAlias(), ci.getIsPartitionCol())); } } else { @@ -3778,7 +3824,8 @@ for (int i=0; i> iterP = aliasToPruner.entrySet().iterator(); - PartitionPruner pr = ((Map.Entry)iterP.next()).getValue(); + Iterator> iterP = + aliasToPruner.entrySet().iterator(); + org.apache.hadoop.hive.ql.parse.PartitionPruner pr = + ((Map.Entry)iterP.next()).getValue(); if (pr.onlyContainsPartitionCols()) { List listP = new ArrayList(); List partP = new ArrayList(); - PartitionPruner.PrunedPartitionList partsList = null; + PrunedPartitionList partsList = null; Set parts = null; try { partsList = pr.prune(); @@ -4205,9 +4258,9 @@ genPlan(qb); - ParseContext pCtx = new ParseContext(conf, qb, ast, aliasToPruner, aliasToSamplePruner, topOps, - topSelOps, opParseCtx, joinContext, loadTableWork, loadFileWork, - ctx, idToTableNameMap, destTableId, uCtx, listMapJoinOpsNoReducer); + ParseContext pCtx = new ParseContext(conf, qb, ast, aliasToPruner, opToPartPruner, aliasToSamplePruner, topOps, + topSelOps, opParseCtx, joinContext, topToTable, loadTableWork, loadFileWork, + ctx, idToTableNameMap, destTableId, uCtx, listMapJoinOpsNoReducer); Optimizer optm = new Optimizer(); optm.setPctx(pCtx); @@ -4219,7 +4272,7 @@ // Do any partition pruning genPartitionPruners(qb); LOG.info("Completed partition pruning"); - + // Do any sample pruning genSamplePruners(qb); LOG.info("Completed sample pruning"); @@ -4253,7 +4306,8 @@ // If the current subExpression is pre-calculated, as in Group-By etc. ColumnInfo colInfo = input.get("", expr.toStringTree()); if (colInfo != null) { - return new exprNodeColumnDesc(colInfo.getType(), colInfo.getInternalName()); + return new exprNodeColumnDesc(colInfo.getType(), colInfo.getInternalName(), + colInfo.getTabAlias(), colInfo.getIsPartitionCol()); } // Create the walker, the rules dispatcher and the context. Index: ql/src/java/org/apache/hadoop/hive/ql/parse/ParseContext.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/parse/ParseContext.java (revision 796808) +++ ql/src/java/org/apache/hadoop/hive/ql/parse/ParseContext.java (working copy) @@ -27,10 +27,13 @@ import org.apache.hadoop.hive.ql.exec.JoinOperator; import org.apache.hadoop.hive.ql.exec.MapJoinOperator; import org.apache.hadoop.hive.ql.exec.Operator; +import org.apache.hadoop.hive.ql.exec.TableScanOperator; +import org.apache.hadoop.hive.ql.plan.exprNodeDesc; import org.apache.hadoop.hive.ql.plan.loadFileDesc; import org.apache.hadoop.hive.ql.plan.loadTableDesc; import org.apache.hadoop.hive.ql.Context; import org.apache.hadoop.hive.conf.HiveConf; +import org.apache.hadoop.hive.ql.metadata.Table; import org.apache.hadoop.hive.ql.optimizer.unionproc.UnionProcContext; /** @@ -47,11 +50,13 @@ private QB qb; private ASTNode ast; private HashMap aliasToPruner; + private HashMap opToPartPruner; private HashMap aliasToSamplePruner; private HashMap> topOps; private HashMap> topSelOps; private LinkedHashMap, OpParseContext> opParseCtx; private Map joinContext; + private HashMap topToTable; private List loadTableWork; private List loadFileWork; private Context ctx; @@ -60,6 +65,12 @@ private int destTableId; private UnionProcContext uCtx; private List listMapJoinOpsNoReducer; // list of map join operators with no reducer + + // is set to true if the expression only contains partitioning columns and not any other column reference. + // This is used to optimize select * from table where ... scenario, when the where condition only references + // partitioning columns - the partitions are identified and streamed directly to the client without requiring + // a map-reduce job + private boolean hasNonPartCols; public ParseContext() { } @@ -71,6 +82,8 @@ * current parse tree * @param aliasToPruner * partition pruner list + * @param opToPartPruner + * map from table scan operator to partition pruner * @param aliasToSamplePruner * sample pruner list * @param loadFileWork @@ -85,15 +98,19 @@ * @param topSelOps * list of operators for the selects introduced for column pruning * @param listMapJoinOpsNoReducer - * list of map join operators with no reducer + * list of map join operators with no reducer + * @param hasNonPartCols + * the query has non partition columns */ public ParseContext(HiveConf conf, QB qb, ASTNode ast, HashMap aliasToPruner, + HashMap opToPartPruner, HashMap aliasToSamplePruner, HashMap> topOps, HashMap> topSelOps, LinkedHashMap, OpParseContext> opParseCtx, Map joinContext, + HashMap topToTable, List loadTableWork, List loadFileWork, Context ctx, HashMap idToTableNameMap, int destTableId, UnionProcContext uCtx, List listMapJoinOpsNoReducer) { @@ -101,8 +118,10 @@ this.qb = qb; this.ast = ast; this.aliasToPruner = aliasToPruner; + this.opToPartPruner = opToPartPruner; this.aliasToSamplePruner = aliasToSamplePruner; this.joinContext = joinContext; + this.topToTable = topToTable; this.loadFileWork = loadFileWork; this.loadTableWork = loadTableWork; this.opParseCtx = opParseCtx; @@ -113,6 +132,7 @@ this.destTableId = destTableId; this.uCtx = uCtx; this.listMapJoinOpsNoReducer = listMapJoinOpsNoReducer; + this.hasNonPartCols = false; } /** @@ -191,6 +211,35 @@ } /** + * @return the opToPartPruner + */ + public HashMap getOpToPartPruner() { + return opToPartPruner; + } + + /** + * @param opToPartPruner + * the opToPartPruner to set + */ + public void setOpToPartPruner(HashMap opToPartPruner) { + this.opToPartPruner = opToPartPruner; + } + + /** + * @return the topToTable + */ + public HashMap getTopToTable() { + return topToTable; + } + + /** + * @param topToTable + * the topToTable to set + */ + public void setTopToTable(HashMap topToTable) { + this.topToTable = topToTable; + } + /** * @return the aliasToSamplePruner */ public HashMap getAliasToSamplePruner() { @@ -335,4 +384,19 @@ List listMapJoinOpsNoReducer) { this.listMapJoinOpsNoReducer = listMapJoinOpsNoReducer; } + + /** + * Sets the hasNonPartCols flag + * @param val + */ + public void setHasNonPartCols(boolean val) { + this.hasNonPartCols = val; + } + + /** + * Gets the value of the hasNonPartCols flag + */ + public boolean getHasNonPartCols() { + return this.hasNonPartCols; + } } Index: ql/src/java/org/apache/hadoop/hive/ql/parse/PrunedPartitionList.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/parse/PrunedPartitionList.java (revision 0) +++ ql/src/java/org/apache/hadoop/hive/ql/parse/PrunedPartitionList.java (revision 0) @@ -0,0 +1,87 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.hive.ql.parse; + +import java.util.Set; + +import org.apache.hadoop.hive.ql.metadata.Partition; + +/** + * The list of pruned partitions. + */ +public class PrunedPartitionList { + // confirmed partitions - satisfy the partition criteria + private Set confirmedPartns; + + // unknown partitions - may/may not satisfy the partition criteria + private Set unknownPartns; + + // denied partitions - do not satisfy the partition criteria + private Set deniedPartns; + + /** + * @param confirmedPartns confirmed paritions + * @param unknownPartns unknown partitions + */ + public PrunedPartitionList(Set confirmedPartns, Set unknownPartns, Set deniedPartns) { + this.confirmedPartns = confirmedPartns; + this.unknownPartns = unknownPartns; + this.deniedPartns = deniedPartns; + } + + /** + * get confirmed partitions + * @return confirmedPartns confirmed paritions + */ + public Set getConfirmedPartns() { + return confirmedPartns; + } + + /** + * get unknown partitions + * @return unknownPartns unknown paritions + */ + public Set getUnknownPartns() { + return unknownPartns; + } + + /** + * get denied partitions + * @return deniedPartns denied paritions + */ + public Set getDeniedPartns() { + return deniedPartns; + } + + /** + * set confirmed partitions + * @param confirmedPartns confirmed paritions + */ + public void setConfirmedPartns(Set confirmedPartns) { + this.confirmedPartns = confirmedPartns; + } + + /** + * set unknown partitions + * @param unknownPartns unknown partitions + */ + public void setUnknownPartns(Set unknownPartns) { + this.unknownPartns = unknownPartns; + } +}