Index: ql/src/test/results/clientpositive/input40.q.out =================================================================== --- ql/src/test/results/clientpositive/input40.q.out (revision 1068052) +++ ql/src/test/results/clientpositive/input40.q.out (working copy) @@ -11,11 +11,11 @@ PREHOOK: query: select * from tmp_insert_test PREHOOK: type: QUERY PREHOOK: Input: default@tmp_insert_test -PREHOOK: Output: file:/tmp/njain/hive_2011-02-01_22-25-57_203_5560167211316870946/-mr-10000 +PREHOOK: Output: file:/var/folders/7P/7PeC14kXFIWq0PIYyexGbmKuXUk/-Tmp-/jsichi/hive_2011-02-07_11-11-02_623_8354673663972504357/-mr-10000 POSTHOOK: query: select * from tmp_insert_test POSTHOOK: type: QUERY POSTHOOK: Input: default@tmp_insert_test -POSTHOOK: Output: file:/tmp/njain/hive_2011-02-01_22-25-57_203_5560167211316870946/-mr-10000 +POSTHOOK: Output: file:/var/folders/7P/7PeC14kXFIWq0PIYyexGbmKuXUk/-Tmp-/jsichi/hive_2011-02-07_11-11-02_623_8354673663972504357/-mr-10000 238 val_238 86 val_86 311 val_311 @@ -527,15 +527,15 @@ POSTHOOK: type: LOAD POSTHOOK: Output: default@tmp_insert_test_p@ds=2009-08-01 PREHOOK: query: select * from tmp_insert_test_p where ds= '2009-08-01' -order by key +order by key, value PREHOOK: type: QUERY PREHOOK: Input: default@tmp_insert_test_p@ds=2009-08-01 -PREHOOK: Output: file:/tmp/njain/hive_2011-02-01_22-25-58_152_6691784345192473342/-mr-10000 +PREHOOK: Output: file:/var/folders/7P/7PeC14kXFIWq0PIYyexGbmKuXUk/-Tmp-/jsichi/hive_2011-02-07_11-11-03_519_106320324250598417/-mr-10000 POSTHOOK: query: select * from tmp_insert_test_p where ds= '2009-08-01' -order by key +order by key, value POSTHOOK: type: QUERY POSTHOOK: Input: default@tmp_insert_test_p@ds=2009-08-01 -POSTHOOK: Output: file:/tmp/njain/hive_2011-02-01_22-25-58_152_6691784345192473342/-mr-10000 +POSTHOOK: Output: file:/var/folders/7P/7PeC14kXFIWq0PIYyexGbmKuXUk/-Tmp-/jsichi/hive_2011-02-07_11-11-03_519_106320324250598417/-mr-10000 0 val_0 2009-08-01 0 val_0 2009-08-01 0 val_0 2009-08-01 @@ -1045,12 +1045,12 @@ order by key PREHOOK: type: QUERY PREHOOK: Input: default@tmp_insert_test_p@ds=2009-08-01 -PREHOOK: Output: file:/tmp/njain/hive_2011-02-01_22-26-01_929_199947475392615760/-mr-10000 +PREHOOK: Output: file:/var/folders/7P/7PeC14kXFIWq0PIYyexGbmKuXUk/-Tmp-/jsichi/hive_2011-02-07_11-11-11_870_1803578172187312765/-mr-10000 POSTHOOK: query: select * from tmp_insert_test_p where ds= '2009-08-01' order by key POSTHOOK: type: QUERY POSTHOOK: Input: default@tmp_insert_test_p@ds=2009-08-01 -POSTHOOK: Output: file:/tmp/njain/hive_2011-02-01_22-26-01_929_199947475392615760/-mr-10000 +POSTHOOK: Output: file:/var/folders/7P/7PeC14kXFIWq0PIYyexGbmKuXUk/-Tmp-/jsichi/hive_2011-02-07_11-11-11_870_1803578172187312765/-mr-10000 0 val_0 2009-08-01 0 val_0 2009-08-01 0 val_1 2009-08-01 Index: ql/src/test/results/clientpositive/union22.q.out =================================================================== --- ql/src/test/results/clientpositive/union22.q.out (revision 1068052) +++ ql/src/test/results/clientpositive/union22.q.out (working copy) @@ -162,7 +162,7 @@ File Output Operator compressed: false GlobalTableId: 0 - directory: file:/tmp/njain/hive_2011-02-01_22-31-21_856_7111197832719783346/-mr-10002 + directory: file:/var/folders/7P/7PeC14kXFIWq0PIYyexGbmKuXUk/-Tmp-/jsichi/hive_2011-02-07_10-46-08_466_7609771648760025606/-mr-10002 NumFilesPerFileSink: 1 table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat @@ -178,9 +178,9 @@ Map Reduce Local Work Needs Tagging: false Path -> Alias: - pfile:/data/users/njain/hive2/build/ql/test/data/warehouse/dst_union22/ds=1 [null-subquery2:subq-subquery2:a] + pfile:/Users/jsichi/open/hive-trunk/build/ql/test/data/warehouse/dst_union22/ds=1 [null-subquery2:subq-subquery2:a] Path -> Partition: - pfile:/data/users/njain/hive2/build/ql/test/data/warehouse/dst_union22/ds=1 + pfile:/Users/jsichi/open/hive-trunk/build/ql/test/data/warehouse/dst_union22/ds=1 Partition base file name: ds=1 input format: org.apache.hadoop.mapred.TextInputFormat @@ -193,7 +193,7 @@ columns.types string:string:string:string file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location pfile:/data/users/njain/hive2/build/ql/test/data/warehouse/dst_union22/ds=1 + location pfile:/Users/jsichi/open/hive-trunk/build/ql/test/data/warehouse/dst_union22/ds=1 name dst_union22 numFiles 1 numPartitions 1 @@ -203,7 +203,7 @@ serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe totalSize 11624 - transient_lastDdlTime 1296628277 + transient_lastDdlTime 1297104359 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe input format: org.apache.hadoop.mapred.TextInputFormat @@ -214,7 +214,7 @@ columns.types string:string:string:string file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location pfile:/data/users/njain/hive2/build/ql/test/data/warehouse/dst_union22 + location pfile:/Users/jsichi/open/hive-trunk/build/ql/test/data/warehouse/dst_union22 name dst_union22 numFiles 1 numPartitions 1 @@ -224,7 +224,7 @@ serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe totalSize 11624 - transient_lastDdlTime 1296628277 + transient_lastDdlTime 1297104359 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dst_union22 name: dst_union22 @@ -232,7 +232,7 @@ Stage: Stage-3 Map Reduce Alias -> Map Operator Tree: - file:/tmp/njain/hive_2011-02-01_22-31-21_856_7111197832719783346/-mr-10002 + file:/var/folders/7P/7PeC14kXFIWq0PIYyexGbmKuXUk/-Tmp-/jsichi/hive_2011-02-07_10-46-08_466_7609771648760025606/-mr-10002 Select Operator expressions: expr: _col0 @@ -275,10 +275,10 @@ File Output Operator compressed: false GlobalTableId: 1 - directory: pfile:/data/users/njain/hive2/build/ql/scratchdir/hive_2011-02-01_22-31-21_856_7111197832719783346/-ext-10000 + directory: pfile:/Users/jsichi/open/hive-trunk/build/ql/scratchdir/hive_2011-02-07_10-46-08_466_7609771648760025606/-ext-10000 NumFilesPerFileSink: 1 Static Partition Specification: ds=2/ - Stats Publishing Key Prefix: pfile:/data/users/njain/hive2/build/ql/scratchdir/hive_2011-02-01_22-31-21_856_7111197832719783346/-ext-10000/ + Stats Publishing Key Prefix: pfile:/Users/jsichi/open/hive-trunk/build/ql/scratchdir/hive_2011-02-07_10-46-08_466_7609771648760025606/-ext-10000/ table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -288,7 +288,7 @@ columns.types string:string:string:string file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location pfile:/data/users/njain/hive2/build/ql/test/data/warehouse/dst_union22 + location pfile:/Users/jsichi/open/hive-trunk/build/ql/test/data/warehouse/dst_union22 name dst_union22 numFiles 1 numPartitions 1 @@ -298,7 +298,7 @@ serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe totalSize 11624 - transient_lastDdlTime 1296628277 + transient_lastDdlTime 1297104359 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dst_union22 TotalFiles: 1 @@ -344,10 +344,10 @@ File Output Operator compressed: false GlobalTableId: 1 - directory: pfile:/data/users/njain/hive2/build/ql/scratchdir/hive_2011-02-01_22-31-21_856_7111197832719783346/-ext-10000 + directory: pfile:/Users/jsichi/open/hive-trunk/build/ql/scratchdir/hive_2011-02-07_10-46-08_466_7609771648760025606/-ext-10000 NumFilesPerFileSink: 1 Static Partition Specification: ds=2/ - Stats Publishing Key Prefix: pfile:/data/users/njain/hive2/build/ql/scratchdir/hive_2011-02-01_22-31-21_856_7111197832719783346/-ext-10000/ + Stats Publishing Key Prefix: pfile:/Users/jsichi/open/hive-trunk/build/ql/scratchdir/hive_2011-02-07_10-46-08_466_7609771648760025606/-ext-10000/ table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -357,7 +357,7 @@ columns.types string:string:string:string file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location pfile:/data/users/njain/hive2/build/ql/test/data/warehouse/dst_union22 + location pfile:/Users/jsichi/open/hive-trunk/build/ql/test/data/warehouse/dst_union22 name dst_union22 numFiles 1 numPartitions 1 @@ -367,7 +367,7 @@ serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe totalSize 11624 - transient_lastDdlTime 1296628277 + transient_lastDdlTime 1297104359 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dst_union22 TotalFiles: 1 @@ -375,10 +375,10 @@ MultiFileSpray: false Needs Tagging: false Path -> Alias: - file:/tmp/njain/hive_2011-02-01_22-31-21_856_7111197832719783346/-mr-10002 [file:/tmp/njain/hive_2011-02-01_22-31-21_856_7111197832719783346/-mr-10002] - pfile:/data/users/njain/hive2/build/ql/test/data/warehouse/dst_union22_delta/ds=1 [null-subquery1:subq-subquery1:dst_union22_delta] + file:/var/folders/7P/7PeC14kXFIWq0PIYyexGbmKuXUk/-Tmp-/jsichi/hive_2011-02-07_10-46-08_466_7609771648760025606/-mr-10002 [file:/var/folders/7P/7PeC14kXFIWq0PIYyexGbmKuXUk/-Tmp-/jsichi/hive_2011-02-07_10-46-08_466_7609771648760025606/-mr-10002] + pfile:/Users/jsichi/open/hive-trunk/build/ql/test/data/warehouse/dst_union22_delta/ds=1 [null-subquery1:subq-subquery1:dst_union22_delta] Path -> Partition: - file:/tmp/njain/hive_2011-02-01_22-31-21_856_7111197832719783346/-mr-10002 + file:/var/folders/7P/7PeC14kXFIWq0PIYyexGbmKuXUk/-Tmp-/jsichi/hive_2011-02-07_10-46-08_466_7609771648760025606/-mr-10002 Partition base file name: -mr-10002 input format: org.apache.hadoop.mapred.SequenceFileInputFormat @@ -394,7 +394,7 @@ columns _col0,_col1,_col10,_col11 columns.types string,string,string,string escape.delim \ - pfile:/data/users/njain/hive2/build/ql/test/data/warehouse/dst_union22_delta/ds=1 + pfile:/Users/jsichi/open/hive-trunk/build/ql/test/data/warehouse/dst_union22_delta/ds=1 Partition base file name: ds=1 input format: org.apache.hadoop.mapred.TextInputFormat @@ -407,7 +407,7 @@ columns.types string:string:string:string:string:string file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location pfile:/data/users/njain/hive2/build/ql/test/data/warehouse/dst_union22_delta/ds=1 + location pfile:/Users/jsichi/open/hive-trunk/build/ql/test/data/warehouse/dst_union22_delta/ds=1 name dst_union22_delta numFiles 1 numPartitions 1 @@ -417,7 +417,7 @@ serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe totalSize 17436 - transient_lastDdlTime 1296628281 + transient_lastDdlTime 1297104368 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe input format: org.apache.hadoop.mapred.TextInputFormat @@ -428,7 +428,7 @@ columns.types string:string:string:string:string:string file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location pfile:/data/users/njain/hive2/build/ql/test/data/warehouse/dst_union22_delta + location pfile:/Users/jsichi/open/hive-trunk/build/ql/test/data/warehouse/dst_union22_delta name dst_union22_delta numFiles 1 numPartitions 1 @@ -438,7 +438,7 @@ serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe totalSize 17436 - transient_lastDdlTime 1296628281 + transient_lastDdlTime 1297104368 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dst_union22_delta name: dst_union22_delta @@ -449,7 +449,7 @@ partition: ds 2 replace: true - source: pfile:/data/users/njain/hive2/build/ql/scratchdir/hive_2011-02-01_22-31-21_856_7111197832719783346/-ext-10000 + source: pfile:/Users/jsichi/open/hive-trunk/build/ql/scratchdir/hive_2011-02-07_10-46-08_466_7609771648760025606/-ext-10000 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -459,7 +459,7 @@ columns.types string:string:string:string file.inputformat org.apache.hadoop.mapred.TextInputFormat file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - location pfile:/data/users/njain/hive2/build/ql/test/data/warehouse/dst_union22 + location pfile:/Users/jsichi/open/hive-trunk/build/ql/test/data/warehouse/dst_union22 name dst_union22 numFiles 1 numPartitions 1 @@ -469,14 +469,14 @@ serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe totalSize 11624 - transient_lastDdlTime 1296628277 + transient_lastDdlTime 1297104359 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dst_union22 - tmp directory: pfile:/data/users/njain/hive2/build/ql/scratchdir/hive_2011-02-01_22-31-21_856_7111197832719783346/-ext-10001 + tmp directory: pfile:/Users/jsichi/open/hive-trunk/build/ql/scratchdir/hive_2011-02-07_10-46-08_466_7609771648760025606/-ext-10001 Stage: Stage-4 Stats-Aggr Operator - Stats Aggregation Key Prefix: pfile:/data/users/njain/hive2/build/ql/scratchdir/hive_2011-02-01_22-31-21_856_7111197832719783346/-ext-10000/ + Stats Aggregation Key Prefix: pfile:/Users/jsichi/open/hive-trunk/build/ql/scratchdir/hive_2011-02-07_10-46-08_466_7609771648760025606/-ext-10000/ PREHOOK: query: insert overwrite table dst_union22 partition (ds='2') select * from @@ -522,14 +522,14 @@ POSTHOOK: Lineage: dst_union22_delta PARTITION(ds=1).k3 SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: dst_union22_delta PARTITION(ds=1).k4 SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: dst_union22_delta PARTITION(ds=1).k5 SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -PREHOOK: query: select * from dst_union22 where ds = '2' order by k1 +PREHOOK: query: select * from dst_union22 where ds = '2' order by k1, k2, k3, k4 PREHOOK: type: QUERY PREHOOK: Input: default@dst_union22@ds=2 -PREHOOK: Output: file:/tmp/njain/hive_2011-02-01_22-31-31_092_8460885695793732904/-mr-10000 -POSTHOOK: query: select * from dst_union22 where ds = '2' order by k1 +PREHOOK: Output: file:/var/folders/7P/7PeC14kXFIWq0PIYyexGbmKuXUk/-Tmp-/jsichi/hive_2011-02-07_10-46-27_561_2189263148420397827/-mr-10000 +POSTHOOK: query: select * from dst_union22 where ds = '2' order by k1, k2, k3, k4 POSTHOOK: type: QUERY POSTHOOK: Input: default@dst_union22@ds=2 -POSTHOOK: Output: file:/tmp/njain/hive_2011-02-01_22-31-31_092_8460885695793732904/-mr-10000 +POSTHOOK: Output: file:/var/folders/7P/7PeC14kXFIWq0PIYyexGbmKuXUk/-Tmp-/jsichi/hive_2011-02-07_10-46-27_561_2189263148420397827/-mr-10000 POSTHOOK: Lineage: dst_union22 PARTITION(ds=1).k1 SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: dst_union22 PARTITION(ds=1).k2 SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: dst_union22 PARTITION(ds=1).k3 SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] @@ -880,10 +880,10 @@ 239 val_239 239 val_239 2 239 val_239 239 val_239 2 239 val_239 239 val_239 2 +24 val_24 NULL NULL 2 +24 val_24 NULL NULL 2 24 val_24 24 val_24 2 24 val_24 24 val_24 2 -24 val_24 NULL NULL 2 -24 val_24 NULL NULL 2 241 val_241 241 val_241 2 242 val_242 242 val_242 2 242 val_242 242 val_242 2 @@ -916,8 +916,8 @@ 265 val_265 265 val_265 2 265 val_265 265 val_265 2 266 val_266 266 val_266 2 +27 val_27 NULL NULL 2 27 val_27 27 val_27 2 -27 val_27 NULL NULL 2 272 val_272 272 val_272 2 272 val_272 272 val_272 2 272 val_272 272 val_272 2 @@ -989,8 +989,8 @@ 298 val_298 298 val_298 2 298 val_298 298 val_298 2 298 val_298 298 val_298 2 +30 val_30 NULL NULL 2 30 val_30 30 val_30 2 -30 val_30 NULL NULL 2 302 val_302 302 val_302 2 305 val_305 305 val_305 2 306 val_306 306 val_306 2 @@ -1073,8 +1073,8 @@ 336 val_336 336 val_336 2 338 val_338 338 val_338 2 339 val_339 339 val_339 2 +34 val_34 NULL NULL 2 34 val_34 34 val_34 2 -34 val_34 NULL NULL 2 341 val_341 341 val_341 2 342 val_342 342 val_342 2 342 val_342 342 val_342 2 @@ -1111,11 +1111,11 @@ 348 val_348 348 val_348 2 348 val_348 348 val_348 2 35 val_35 NULL NULL 2 +35 val_35 NULL NULL 2 +35 val_35 NULL NULL 2 35 val_35 35 val_35 2 35 val_35 35 val_35 2 -35 val_35 NULL NULL 2 35 val_35 35 val_35 2 -35 val_35 NULL NULL 2 351 val_351 351 val_351 2 353 val_353 353 val_353 2 353 val_353 353 val_353 2 @@ -1142,9 +1142,9 @@ 369 val_369 369 val_369 2 369 val_369 369 val_369 2 37 val_37 NULL NULL 2 +37 val_37 NULL NULL 2 37 val_37 37 val_37 2 37 val_37 37 val_37 2 -37 val_37 NULL NULL 2 373 val_373 373 val_373 2 374 val_374 374 val_374 2 375 val_375 375 val_375 2 @@ -1280,9 +1280,9 @@ 418 val_418 418 val_418 2 419 val_419 419 val_419 2 42 val_42 NULL NULL 2 +42 val_42 NULL NULL 2 42 val_42 42 val_42 2 42 val_42 42 val_42 2 -42 val_42 NULL NULL 2 421 val_421 421 val_421 2 424 val_424 424 val_424 2 424 val_424 424 val_424 2 @@ -1330,8 +1330,8 @@ 439 val_439 439 val_439 2 439 val_439 439 val_439 2 439 val_439 439 val_439 2 +44 val_44 NULL NULL 2 44 val_44 44 val_44 2 -44 val_44 NULL NULL 2 443 val_443 443 val_443 2 444 val_444 444 val_444 2 446 val_446 446 val_446 2 Index: ql/src/test/queries/clientpositive/union22.q =================================================================== --- ql/src/test/queries/clientpositive/union22.q (revision 1068052) +++ ql/src/test/queries/clientpositive/union22.q (working copy) @@ -38,7 +38,4 @@ subq; -select * from dst_union22 where ds = '2' order by k1; - - - +select * from dst_union22 where ds = '2' order by k1, k2, k3, k4; Index: ql/src/test/queries/clientpositive/input40.q =================================================================== --- ql/src/test/queries/clientpositive/input40.q (revision 1068052) +++ ql/src/test/queries/clientpositive/input40.q (working copy) @@ -9,7 +9,7 @@ load data local inpath '../data/files/kv1.txt' into table tmp_insert_test_p partition (ds = '2009-08-01'); select * from tmp_insert_test_p where ds= '2009-08-01' -order by key; +order by key, value; load data local inpath '../data/files/kv2.txt' into table tmp_insert_test_p partition (ds = '2009-08-01'); select * from tmp_insert_test_p where ds= '2009-08-01'