Index: ql/src/test/results/clientpositive/udf_named_struct.q.out =================================================================== --- ql/src/test/results/clientpositive/udf_named_struct.q.out (revision 1158993) +++ ql/src/test/results/clientpositive/udf_named_struct.q.out (working copy) @@ -27,7 +27,7 @@ Stage: Stage-1 Map Reduce Alias -> Map Operator Tree: - src + src TableScan alias: src Select Operator @@ -54,10 +54,10 @@ named_struct("foo", 1, "bar", 2).foo FROM src LIMIT 1 PREHOOK: type: QUERY PREHOOK: Input: default@src -PREHOOK: Output: file:/var/folders/C4/C40caRNsEM4C4yVangruonVUe7Y/-Tmp-/jonchang/hive_2011-08-11_01-02-24_658_503462155153078291/-mr-10000 +PREHOOK: Output: file:/tmp/charleschen/hive_2011-08-17_22-26-45_023_7038579295503307049/-mr-10000 POSTHOOK: query: SELECT named_struct("foo", 1, "bar", 2), named_struct("foo", 1, "bar", 2).foo FROM src LIMIT 1 POSTHOOK: type: QUERY POSTHOOK: Input: default@src -POSTHOOK: Output: file:/var/folders/C4/C40caRNsEM4C4yVangruonVUe7Y/-Tmp-/jonchang/hive_2011-08-11_01-02-24_658_503462155153078291/-mr-10000 +POSTHOOK: Output: file:/tmp/charleschen/hive_2011-08-17_22-26-45_023_7038579295503307049/-mr-10000 {"foo":1,"bar":2} 1 Index: ql/src/test/results/compiler/plan/union.q.xml =================================================================== --- ql/src/test/results/compiler/plan/union.q.xml (revision 1158993) +++ ql/src/test/results/compiler/plan/union.q.xml (working copy) @@ -1,5 +1,5 @@ - + @@ -41,7 +41,7 @@ - file:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-57_227_5273764780066863405/-ext-10001 + file:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-21-47_001_5512886389105183231/-ext-10001 @@ -50,7 +50,7 @@ - file:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-57_227_5273764780066863405/-ext-10000 + file:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-21-47_001_5512886389105183231/-ext-10000 1 @@ -92,21 +92,21 @@ - CNTR_NAME_FS_665_NUM_INPUT_ROWS + CNTR_NAME_FS_649_NUM_INPUT_ROWS - CNTR_NAME_FS_665_NUM_OUTPUT_ROWS + CNTR_NAME_FS_649_NUM_OUTPUT_ROWS - CNTR_NAME_FS_665_TIME_TAKEN + CNTR_NAME_FS_649_TIME_TAKEN - CNTR_NAME_FS_665_FATAL_ERROR + CNTR_NAME_FS_649_FATAL_ERROR - FS_665 + FS_649 @@ -160,21 +160,21 @@ - CNTR_NAME_TS_664_NUM_INPUT_ROWS + CNTR_NAME_TS_648_NUM_INPUT_ROWS - CNTR_NAME_TS_664_NUM_OUTPUT_ROWS + CNTR_NAME_TS_648_NUM_OUTPUT_ROWS - CNTR_NAME_TS_664_TIME_TAKEN + CNTR_NAME_TS_648_TIME_TAKEN - CNTR_NAME_TS_664_FATAL_ERROR + CNTR_NAME_TS_648_FATAL_ERROR - TS_664 + TS_648 @@ -195,10 +195,10 @@ - file:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-57_227_5273764780066863405/-ext-10001 + file:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-21-47_001_5512886389105183231/-ext-10001 - file:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-57_227_5273764780066863405/-ext-10001 + file:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-21-47_001_5512886389105183231/-ext-10001 @@ -207,7 +207,7 @@ - file:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-57_227_5273764780066863405/-ext-10001 + file:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-21-47_001_5512886389105183231/-ext-10001 -ext-10001 @@ -280,7 +280,7 @@ true - file:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-57_227_5273764780066863405/-ext-10000 + file:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-21-47_001_5512886389105183231/-ext-10000 ../build/ql/test/data/warehouse/union.out @@ -304,10 +304,10 @@ true - file:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-57_227_5273764780066863405/-ext-10001 + file:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-21-47_001_5512886389105183231/-ext-10001 - file:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-57_227_5273764780066863405/-ext-10000 + file:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-21-47_001_5512886389105183231/-ext-10000 @@ -333,7 +333,7 @@ - file:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-57_227_5273764780066863405/-ext-10001 + file:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-21-47_001_5512886389105183231/-ext-10001 @@ -419,11 +419,11 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/src + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1310382416 + 1313648504 @@ -481,11 +481,11 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/src + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1310382416 + 1313648504 @@ -551,11 +551,11 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/src + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1310382416 + 1313648504 @@ -613,11 +613,11 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/src + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1310382416 + 1313648504 @@ -660,13 +660,13 @@ 1 - file:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-57_227_5273764780066863405/-ext-10001 + file:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-21-47_001_5512886389105183231/-ext-10001 1 - file:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-57_227_5273764780066863405/-ext-10000/ + file:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-21-47_001_5512886389105183231/-ext-10000/ @@ -679,21 +679,21 @@ - CNTR_NAME_FS_661_NUM_INPUT_ROWS + CNTR_NAME_FS_645_NUM_INPUT_ROWS - CNTR_NAME_FS_661_NUM_OUTPUT_ROWS + CNTR_NAME_FS_645_NUM_OUTPUT_ROWS - CNTR_NAME_FS_661_TIME_TAKEN + CNTR_NAME_FS_645_TIME_TAKEN - CNTR_NAME_FS_661_FATAL_ERROR + CNTR_NAME_FS_645_FATAL_ERROR - FS_661 + FS_645 @@ -771,21 +771,21 @@ - CNTR_NAME_SEL_660_NUM_INPUT_ROWS + CNTR_NAME_SEL_644_NUM_INPUT_ROWS - CNTR_NAME_SEL_660_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_644_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_660_TIME_TAKEN + CNTR_NAME_SEL_644_TIME_TAKEN - CNTR_NAME_SEL_660_FATAL_ERROR + CNTR_NAME_SEL_644_FATAL_ERROR - SEL_660 + SEL_644 @@ -844,21 +844,21 @@ - CNTR_NAME_UNION_659_NUM_INPUT_ROWS + CNTR_NAME_UNION_643_NUM_INPUT_ROWS - CNTR_NAME_UNION_659_NUM_OUTPUT_ROWS + CNTR_NAME_UNION_643_NUM_OUTPUT_ROWS - CNTR_NAME_UNION_659_TIME_TAKEN + CNTR_NAME_UNION_643_TIME_TAKEN - CNTR_NAME_UNION_659_FATAL_ERROR + CNTR_NAME_UNION_643_FATAL_ERROR - UNION_659 + UNION_643 @@ -936,21 +936,21 @@ - CNTR_NAME_SEL_658_NUM_INPUT_ROWS + CNTR_NAME_SEL_642_NUM_INPUT_ROWS - CNTR_NAME_SEL_658_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_642_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_658_TIME_TAKEN + CNTR_NAME_SEL_642_TIME_TAKEN - CNTR_NAME_SEL_658_FATAL_ERROR + CNTR_NAME_SEL_642_FATAL_ERROR - SEL_658 + SEL_642 @@ -1015,21 +1015,21 @@ - CNTR_NAME_FIL_663_NUM_INPUT_ROWS + CNTR_NAME_FIL_647_NUM_INPUT_ROWS - CNTR_NAME_FIL_663_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_647_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_663_TIME_TAKEN + CNTR_NAME_FIL_647_TIME_TAKEN - CNTR_NAME_FIL_663_FATAL_ERROR + CNTR_NAME_FIL_647_FATAL_ERROR - FIL_663 + FIL_647 @@ -1055,16 +1055,16 @@ - CNTR_NAME_TS_656_NUM_INPUT_ROWS + CNTR_NAME_TS_640_NUM_INPUT_ROWS - CNTR_NAME_TS_656_NUM_OUTPUT_ROWS + CNTR_NAME_TS_640_NUM_OUTPUT_ROWS - CNTR_NAME_TS_656_TIME_TAKEN + CNTR_NAME_TS_640_TIME_TAKEN - CNTR_NAME_TS_656_FATAL_ERROR + CNTR_NAME_TS_640_FATAL_ERROR @@ -1079,7 +1079,7 @@ - TS_656 + TS_640 @@ -1301,21 +1301,21 @@ - CNTR_NAME_SEL_655_NUM_INPUT_ROWS + CNTR_NAME_SEL_639_NUM_INPUT_ROWS - CNTR_NAME_SEL_655_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_639_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_655_TIME_TAKEN + CNTR_NAME_SEL_639_TIME_TAKEN - CNTR_NAME_SEL_655_FATAL_ERROR + CNTR_NAME_SEL_639_FATAL_ERROR - SEL_655 + SEL_639 @@ -1386,21 +1386,21 @@ - CNTR_NAME_FIL_662_NUM_INPUT_ROWS + CNTR_NAME_FIL_646_NUM_INPUT_ROWS - CNTR_NAME_FIL_662_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_646_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_662_TIME_TAKEN + CNTR_NAME_FIL_646_TIME_TAKEN - CNTR_NAME_FIL_662_FATAL_ERROR + CNTR_NAME_FIL_646_FATAL_ERROR - FIL_662 + FIL_646 @@ -1492,16 +1492,16 @@ - CNTR_NAME_TS_653_NUM_INPUT_ROWS + CNTR_NAME_TS_637_NUM_INPUT_ROWS - CNTR_NAME_TS_653_NUM_OUTPUT_ROWS + CNTR_NAME_TS_637_NUM_OUTPUT_ROWS - CNTR_NAME_TS_653_TIME_TAKEN + CNTR_NAME_TS_637_TIME_TAKEN - CNTR_NAME_TS_653_FATAL_ERROR + CNTR_NAME_TS_637_FATAL_ERROR @@ -1516,7 +1516,7 @@ - TS_653 + TS_637 @@ -1539,7 +1539,7 @@ - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/src + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/src null-subquery1:unioninput-subquery1:src @@ -1554,7 +1554,7 @@ - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/src + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/src src @@ -1611,11 +1611,11 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/src + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1310382416 + 1313648504 @@ -1673,11 +1673,11 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/src + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1310382416 + 1313648504 Index: ql/src/test/results/compiler/plan/udf1.q.xml =================================================================== --- ql/src/test/results/compiler/plan/udf1.q.xml (revision 1158993) +++ ql/src/test/results/compiler/plan/udf1.q.xml (working copy) @@ -1,5 +1,5 @@ - + Stage-3 @@ -62,11 +62,11 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/src + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1310382399 + 1313648460 @@ -124,11 +124,11 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/src + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1310382399 + 1313648460 @@ -160,13 +160,13 @@ - file:/tmp/amarsri/hive_2011-07-11_04-06-40_095_2249714112585544624/-ext-10001 + file:/tmp/charleschen/hive_2011-08-17_23-21-02_601_1928046681967104349/-ext-10001 1 - file:/tmp/amarsri/hive_2011-07-11_04-06-40_095_2249714112585544624/-ext-10001/ + file:/tmp/charleschen/hive_2011-08-17_23-21-02_601_1928046681967104349/-ext-10001/ @@ -205,21 +205,21 @@ - CNTR_NAME_FS_619_NUM_INPUT_ROWS + CNTR_NAME_FS_603_NUM_INPUT_ROWS - CNTR_NAME_FS_619_NUM_OUTPUT_ROWS + CNTR_NAME_FS_603_NUM_OUTPUT_ROWS - CNTR_NAME_FS_619_TIME_TAKEN + CNTR_NAME_FS_603_TIME_TAKEN - CNTR_NAME_FS_619_FATAL_ERROR + CNTR_NAME_FS_603_FATAL_ERROR - FS_619 + FS_603 @@ -1383,21 +1383,21 @@ - CNTR_NAME_SEL_618_NUM_INPUT_ROWS + CNTR_NAME_SEL_602_NUM_INPUT_ROWS - CNTR_NAME_SEL_618_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_602_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_618_TIME_TAKEN + CNTR_NAME_SEL_602_TIME_TAKEN - CNTR_NAME_SEL_618_FATAL_ERROR + CNTR_NAME_SEL_602_FATAL_ERROR - SEL_618 + SEL_602 @@ -1687,21 +1687,21 @@ - CNTR_NAME_FIL_620_NUM_INPUT_ROWS + CNTR_NAME_FIL_604_NUM_INPUT_ROWS - CNTR_NAME_FIL_620_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_604_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_620_TIME_TAKEN + CNTR_NAME_FIL_604_TIME_TAKEN - CNTR_NAME_FIL_620_FATAL_ERROR + CNTR_NAME_FIL_604_FATAL_ERROR - FIL_620 + FIL_604 @@ -1797,16 +1797,16 @@ - CNTR_NAME_TS_616_NUM_INPUT_ROWS + CNTR_NAME_TS_600_NUM_INPUT_ROWS - CNTR_NAME_TS_616_NUM_OUTPUT_ROWS + CNTR_NAME_TS_600_NUM_OUTPUT_ROWS - CNTR_NAME_TS_616_TIME_TAKEN + CNTR_NAME_TS_600_TIME_TAKEN - CNTR_NAME_TS_616_FATAL_ERROR + CNTR_NAME_TS_600_FATAL_ERROR @@ -1818,7 +1818,7 @@ - TS_616 + TS_600 @@ -1837,7 +1837,7 @@ - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/src + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/src src @@ -1849,7 +1849,7 @@ - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/src + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/src src @@ -1906,11 +1906,11 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/src + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1310382399 + 1313648460 @@ -1968,11 +1968,11 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/src + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1310382399 + 1313648460 Index: ql/src/test/results/compiler/plan/udf4.q.xml =================================================================== --- ql/src/test/results/compiler/plan/udf4.q.xml (revision 1158993) +++ ql/src/test/results/compiler/plan/udf4.q.xml (working copy) @@ -1,5 +1,5 @@ - + Stage-3 @@ -62,11 +62,11 @@ location - pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/dest1 + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1304060332 + 1313648471 @@ -124,11 +124,11 @@ location - pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/dest1 + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1304060332 + 1313648471 @@ -156,13 +156,13 @@ - file:/tmp/sdong/hive_2011-04-28_23-58-52_993_5880503968024471683/-ext-10001 + file:/tmp/charleschen/hive_2011-08-17_23-21-11_709_5221014774893526111/-ext-10001 1 - file:/tmp/sdong/hive_2011-04-28_23-58-52_993_5880503968024471683/-ext-10001/ + file:/tmp/charleschen/hive_2011-08-17_23-21-11_709_5221014774893526111/-ext-10001/ @@ -201,21 +201,21 @@ - CNTR_NAME_FS_627_NUM_INPUT_ROWS + CNTR_NAME_FS_611_NUM_INPUT_ROWS - CNTR_NAME_FS_627_NUM_OUTPUT_ROWS + CNTR_NAME_FS_611_NUM_OUTPUT_ROWS - CNTR_NAME_FS_627_TIME_TAKEN + CNTR_NAME_FS_611_TIME_TAKEN - CNTR_NAME_FS_627_FATAL_ERROR + CNTR_NAME_FS_611_FATAL_ERROR - FS_627 + FS_611 @@ -1367,21 +1367,21 @@ - CNTR_NAME_SEL_626_NUM_INPUT_ROWS + CNTR_NAME_SEL_610_NUM_INPUT_ROWS - CNTR_NAME_SEL_626_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_610_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_626_TIME_TAKEN + CNTR_NAME_SEL_610_TIME_TAKEN - CNTR_NAME_SEL_626_FATAL_ERROR + CNTR_NAME_SEL_610_FATAL_ERROR - SEL_626 + SEL_610 @@ -1662,16 +1662,16 @@ - CNTR_NAME_TS_625_NUM_INPUT_ROWS + CNTR_NAME_TS_609_NUM_INPUT_ROWS - CNTR_NAME_TS_625_NUM_OUTPUT_ROWS + CNTR_NAME_TS_609_NUM_OUTPUT_ROWS - CNTR_NAME_TS_625_TIME_TAKEN + CNTR_NAME_TS_609_TIME_TAKEN - CNTR_NAME_TS_625_FATAL_ERROR + CNTR_NAME_TS_609_FATAL_ERROR @@ -1679,7 +1679,7 @@ - TS_625 + TS_609 @@ -1761,7 +1761,7 @@ - pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/dest1 + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/dest1 dest1 @@ -1773,7 +1773,7 @@ - pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/dest1 + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/dest1 dest1 @@ -1830,11 +1830,11 @@ location - pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/dest1 + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1304060332 + 1313648471 @@ -1892,11 +1892,11 @@ location - pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/dest1 + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1304060332 + 1313648471 Index: ql/src/test/results/compiler/plan/udf6.q.xml =================================================================== --- ql/src/test/results/compiler/plan/udf6.q.xml (revision 1158993) +++ ql/src/test/results/compiler/plan/udf6.q.xml (working copy) @@ -1,5 +1,5 @@ - + Stage-3 @@ -62,11 +62,11 @@ location - pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1304060340 + 1313648478 @@ -124,11 +124,11 @@ location - pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1304060340 + 1313648478 @@ -156,13 +156,13 @@ - file:/tmp/sdong/hive_2011-04-28_23-59-03_071_7503340157388853266/-ext-10001 + file:/tmp/charleschen/hive_2011-08-17_23-21-20_636_4966183537269123210/-ext-10001 1 - file:/tmp/sdong/hive_2011-04-28_23-59-03_071_7503340157388853266/-ext-10001/ + file:/tmp/charleschen/hive_2011-08-17_23-21-20_636_4966183537269123210/-ext-10001/ @@ -201,21 +201,21 @@ - CNTR_NAME_FS_633_NUM_INPUT_ROWS + CNTR_NAME_FS_617_NUM_INPUT_ROWS - CNTR_NAME_FS_633_NUM_OUTPUT_ROWS + CNTR_NAME_FS_617_NUM_OUTPUT_ROWS - CNTR_NAME_FS_633_TIME_TAKEN + CNTR_NAME_FS_617_TIME_TAKEN - CNTR_NAME_FS_633_FATAL_ERROR + CNTR_NAME_FS_617_FATAL_ERROR - FS_633 + FS_617 @@ -392,21 +392,21 @@ - CNTR_NAME_SEL_632_NUM_INPUT_ROWS + CNTR_NAME_SEL_616_NUM_INPUT_ROWS - CNTR_NAME_SEL_632_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_616_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_632_TIME_TAKEN + CNTR_NAME_SEL_616_TIME_TAKEN - CNTR_NAME_SEL_632_FATAL_ERROR + CNTR_NAME_SEL_616_FATAL_ERROR - SEL_632 + SEL_616 @@ -466,16 +466,16 @@ - CNTR_NAME_TS_631_NUM_INPUT_ROWS + CNTR_NAME_TS_615_NUM_INPUT_ROWS - CNTR_NAME_TS_631_NUM_OUTPUT_ROWS + CNTR_NAME_TS_615_NUM_OUTPUT_ROWS - CNTR_NAME_TS_631_TIME_TAKEN + CNTR_NAME_TS_615_TIME_TAKEN - CNTR_NAME_TS_631_FATAL_ERROR + CNTR_NAME_TS_615_FATAL_ERROR @@ -483,7 +483,7 @@ - TS_631 + TS_615 @@ -565,7 +565,7 @@ - pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/src src @@ -577,7 +577,7 @@ - pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/src src @@ -634,11 +634,11 @@ location - pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1304060340 + 1313648478 @@ -696,11 +696,11 @@ location - pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1304060340 + 1313648478 Index: ql/src/test/results/compiler/plan/udf_case.q.xml =================================================================== --- ql/src/test/results/compiler/plan/udf_case.q.xml (revision 1158993) +++ ql/src/test/results/compiler/plan/udf_case.q.xml (working copy) @@ -1,5 +1,5 @@ - + Stage-3 @@ -62,11 +62,11 @@ location - pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1304060350 + 1313648487 @@ -124,11 +124,11 @@ location - pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1304060350 + 1313648487 @@ -160,13 +160,13 @@ - file:/tmp/sdong/hive_2011-04-28_23-59-13_016_4418197678415872532/-ext-10001 + file:/tmp/charleschen/hive_2011-08-17_23-21-29_385_443070876133663762/-ext-10001 1 - file:/tmp/sdong/hive_2011-04-28_23-59-13_016_4418197678415872532/-ext-10001/ + file:/tmp/charleschen/hive_2011-08-17_23-21-29_385_443070876133663762/-ext-10001/ @@ -205,21 +205,21 @@ - CNTR_NAME_FS_640_NUM_INPUT_ROWS + CNTR_NAME_FS_624_NUM_INPUT_ROWS - CNTR_NAME_FS_640_NUM_OUTPUT_ROWS + CNTR_NAME_FS_624_NUM_OUTPUT_ROWS - CNTR_NAME_FS_640_TIME_TAKEN + CNTR_NAME_FS_624_TIME_TAKEN - CNTR_NAME_FS_640_FATAL_ERROR + CNTR_NAME_FS_624_FATAL_ERROR - FS_640 + FS_624 @@ -280,21 +280,21 @@ - CNTR_NAME_LIM_639_NUM_INPUT_ROWS + CNTR_NAME_LIM_623_NUM_INPUT_ROWS - CNTR_NAME_LIM_639_NUM_OUTPUT_ROWS + CNTR_NAME_LIM_623_NUM_OUTPUT_ROWS - CNTR_NAME_LIM_639_TIME_TAKEN + CNTR_NAME_LIM_623_TIME_TAKEN - CNTR_NAME_LIM_639_FATAL_ERROR + CNTR_NAME_LIM_623_FATAL_ERROR - LIM_639 + LIM_623 @@ -512,21 +512,21 @@ - CNTR_NAME_SEL_638_NUM_INPUT_ROWS + CNTR_NAME_SEL_622_NUM_INPUT_ROWS - CNTR_NAME_SEL_638_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_622_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_638_TIME_TAKEN + CNTR_NAME_SEL_622_TIME_TAKEN - CNTR_NAME_SEL_638_FATAL_ERROR + CNTR_NAME_SEL_622_FATAL_ERROR - SEL_638 + SEL_622 @@ -559,16 +559,16 @@ - CNTR_NAME_TS_637_NUM_INPUT_ROWS + CNTR_NAME_TS_621_NUM_INPUT_ROWS - CNTR_NAME_TS_637_NUM_OUTPUT_ROWS + CNTR_NAME_TS_621_NUM_OUTPUT_ROWS - CNTR_NAME_TS_637_TIME_TAKEN + CNTR_NAME_TS_621_TIME_TAKEN - CNTR_NAME_TS_637_FATAL_ERROR + CNTR_NAME_TS_621_FATAL_ERROR @@ -576,7 +576,7 @@ - TS_637 + TS_621 @@ -662,7 +662,7 @@ - pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/src src @@ -674,7 +674,7 @@ - pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/src src @@ -731,11 +731,11 @@ location - pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1304060350 + 1313648487 @@ -793,11 +793,11 @@ location - pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1304060350 + 1313648487 Index: ql/src/test/results/compiler/plan/subq.q.xml =================================================================== --- ql/src/test/results/compiler/plan/subq.q.xml (revision 1158993) +++ ql/src/test/results/compiler/plan/subq.q.xml (working copy) @@ -1,5 +1,5 @@ - + @@ -41,7 +41,7 @@ - file:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-36_616_1136566510107816555/-ext-10001 + file:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-53_582_5869445995651569189/-ext-10001 @@ -50,7 +50,7 @@ - file:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-36_616_1136566510107816555/-ext-10000 + file:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-53_582_5869445995651569189/-ext-10000 1 @@ -92,21 +92,21 @@ - CNTR_NAME_FS_608_NUM_INPUT_ROWS + CNTR_NAME_FS_592_NUM_INPUT_ROWS - CNTR_NAME_FS_608_NUM_OUTPUT_ROWS + CNTR_NAME_FS_592_NUM_OUTPUT_ROWS - CNTR_NAME_FS_608_TIME_TAKEN + CNTR_NAME_FS_592_TIME_TAKEN - CNTR_NAME_FS_608_FATAL_ERROR + CNTR_NAME_FS_592_FATAL_ERROR - FS_608 + FS_592 @@ -160,21 +160,21 @@ - CNTR_NAME_TS_607_NUM_INPUT_ROWS + CNTR_NAME_TS_591_NUM_INPUT_ROWS - CNTR_NAME_TS_607_NUM_OUTPUT_ROWS + CNTR_NAME_TS_591_NUM_OUTPUT_ROWS - CNTR_NAME_TS_607_TIME_TAKEN + CNTR_NAME_TS_591_TIME_TAKEN - CNTR_NAME_TS_607_FATAL_ERROR + CNTR_NAME_TS_591_FATAL_ERROR - TS_607 + TS_591 @@ -195,10 +195,10 @@ - file:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-36_616_1136566510107816555/-ext-10001 + file:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-53_582_5869445995651569189/-ext-10001 - file:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-36_616_1136566510107816555/-ext-10001 + file:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-53_582_5869445995651569189/-ext-10001 @@ -207,7 +207,7 @@ - file:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-36_616_1136566510107816555/-ext-10001 + file:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-53_582_5869445995651569189/-ext-10001 -ext-10001 @@ -280,7 +280,7 @@ true - file:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-36_616_1136566510107816555/-ext-10000 + file:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-53_582_5869445995651569189/-ext-10000 ../build/ql/test/data/warehouse/union.out @@ -304,10 +304,10 @@ true - file:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-36_616_1136566510107816555/-ext-10001 + file:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-53_582_5869445995651569189/-ext-10001 - file:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-36_616_1136566510107816555/-ext-10000 + file:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-53_582_5869445995651569189/-ext-10000 @@ -333,7 +333,7 @@ - file:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-36_616_1136566510107816555/-ext-10001 + file:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-53_582_5869445995651569189/-ext-10001 @@ -419,11 +419,11 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/src + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1310382395 + 1313648451 @@ -481,11 +481,11 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/src + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1310382395 + 1313648451 @@ -524,13 +524,13 @@ 1 - file:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-36_616_1136566510107816555/-ext-10001 + file:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-53_582_5869445995651569189/-ext-10001 1 - file:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-36_616_1136566510107816555/-ext-10000/ + file:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-53_582_5869445995651569189/-ext-10000/ @@ -543,21 +543,21 @@ - CNTR_NAME_FS_605_NUM_INPUT_ROWS + CNTR_NAME_FS_589_NUM_INPUT_ROWS - CNTR_NAME_FS_605_NUM_OUTPUT_ROWS + CNTR_NAME_FS_589_NUM_OUTPUT_ROWS - CNTR_NAME_FS_605_TIME_TAKEN + CNTR_NAME_FS_589_TIME_TAKEN - CNTR_NAME_FS_605_FATAL_ERROR + CNTR_NAME_FS_589_FATAL_ERROR - FS_605 + FS_589 @@ -635,21 +635,21 @@ - CNTR_NAME_SEL_604_NUM_INPUT_ROWS + CNTR_NAME_SEL_588_NUM_INPUT_ROWS - CNTR_NAME_SEL_604_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_588_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_604_TIME_TAKEN + CNTR_NAME_SEL_588_TIME_TAKEN - CNTR_NAME_SEL_604_FATAL_ERROR + CNTR_NAME_SEL_588_FATAL_ERROR - SEL_604 + SEL_588 @@ -764,21 +764,21 @@ - CNTR_NAME_SEL_603_NUM_INPUT_ROWS + CNTR_NAME_SEL_587_NUM_INPUT_ROWS - CNTR_NAME_SEL_603_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_587_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_603_TIME_TAKEN + CNTR_NAME_SEL_587_TIME_TAKEN - CNTR_NAME_SEL_603_FATAL_ERROR + CNTR_NAME_SEL_587_FATAL_ERROR - SEL_603 + SEL_587 @@ -877,21 +877,21 @@ - CNTR_NAME_FIL_606_NUM_INPUT_ROWS + CNTR_NAME_FIL_590_NUM_INPUT_ROWS - CNTR_NAME_FIL_606_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_590_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_606_TIME_TAKEN + CNTR_NAME_FIL_590_TIME_TAKEN - CNTR_NAME_FIL_606_FATAL_ERROR + CNTR_NAME_FIL_590_FATAL_ERROR - FIL_606 + FIL_590 @@ -987,16 +987,16 @@ - CNTR_NAME_TS_601_NUM_INPUT_ROWS + CNTR_NAME_TS_585_NUM_INPUT_ROWS - CNTR_NAME_TS_601_NUM_OUTPUT_ROWS + CNTR_NAME_TS_585_NUM_OUTPUT_ROWS - CNTR_NAME_TS_601_TIME_TAKEN + CNTR_NAME_TS_585_TIME_TAKEN - CNTR_NAME_TS_601_FATAL_ERROR + CNTR_NAME_TS_585_FATAL_ERROR @@ -1011,7 +1011,7 @@ - TS_601 + TS_585 @@ -1030,7 +1030,7 @@ - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/src + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/src unioninput:src @@ -1042,7 +1042,7 @@ - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/src + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/src src @@ -1099,11 +1099,11 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/src + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1310382395 + 1313648451 @@ -1161,11 +1161,11 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/src + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1310382395 + 1313648451 Index: ql/src/test/results/compiler/plan/udf_when.q.xml =================================================================== --- ql/src/test/results/compiler/plan/udf_when.q.xml (revision 1158993) +++ ql/src/test/results/compiler/plan/udf_when.q.xml (working copy) @@ -1,5 +1,5 @@ - + Stage-3 @@ -62,11 +62,11 @@ location - pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1304060360 + 1313648495 @@ -124,11 +124,11 @@ location - pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1304060360 + 1313648495 @@ -160,13 +160,13 @@ - file:/tmp/sdong/hive_2011-04-28_23-59-23_011_8707825845974734698/-ext-10001 + file:/tmp/charleschen/hive_2011-08-17_23-21-38_188_4494569545835657563/-ext-10001 1 - file:/tmp/sdong/hive_2011-04-28_23-59-23_011_8707825845974734698/-ext-10001/ + file:/tmp/charleschen/hive_2011-08-17_23-21-38_188_4494569545835657563/-ext-10001/ @@ -205,21 +205,21 @@ - CNTR_NAME_FS_648_NUM_INPUT_ROWS + CNTR_NAME_FS_632_NUM_INPUT_ROWS - CNTR_NAME_FS_648_NUM_OUTPUT_ROWS + CNTR_NAME_FS_632_NUM_OUTPUT_ROWS - CNTR_NAME_FS_648_TIME_TAKEN + CNTR_NAME_FS_632_TIME_TAKEN - CNTR_NAME_FS_648_FATAL_ERROR + CNTR_NAME_FS_632_FATAL_ERROR - FS_648 + FS_632 @@ -280,21 +280,21 @@ - CNTR_NAME_LIM_647_NUM_INPUT_ROWS + CNTR_NAME_LIM_631_NUM_INPUT_ROWS - CNTR_NAME_LIM_647_NUM_OUTPUT_ROWS + CNTR_NAME_LIM_631_NUM_OUTPUT_ROWS - CNTR_NAME_LIM_647_TIME_TAKEN + CNTR_NAME_LIM_631_TIME_TAKEN - CNTR_NAME_LIM_647_FATAL_ERROR + CNTR_NAME_LIM_631_FATAL_ERROR - LIM_647 + LIM_631 @@ -592,21 +592,21 @@ - CNTR_NAME_SEL_646_NUM_INPUT_ROWS + CNTR_NAME_SEL_630_NUM_INPUT_ROWS - CNTR_NAME_SEL_646_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_630_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_646_TIME_TAKEN + CNTR_NAME_SEL_630_TIME_TAKEN - CNTR_NAME_SEL_646_FATAL_ERROR + CNTR_NAME_SEL_630_FATAL_ERROR - SEL_646 + SEL_630 @@ -639,16 +639,16 @@ - CNTR_NAME_TS_645_NUM_INPUT_ROWS + CNTR_NAME_TS_629_NUM_INPUT_ROWS - CNTR_NAME_TS_645_NUM_OUTPUT_ROWS + CNTR_NAME_TS_629_NUM_OUTPUT_ROWS - CNTR_NAME_TS_645_TIME_TAKEN + CNTR_NAME_TS_629_TIME_TAKEN - CNTR_NAME_TS_645_FATAL_ERROR + CNTR_NAME_TS_629_FATAL_ERROR @@ -656,7 +656,7 @@ - TS_645 + TS_629 @@ -742,7 +742,7 @@ - pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/src src @@ -754,7 +754,7 @@ - pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/src src @@ -811,11 +811,11 @@ location - pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1304060360 + 1313648495 @@ -873,11 +873,11 @@ location - pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1304060360 + 1313648495 Index: ql/src/test/results/compiler/plan/sample1.q.xml =================================================================== --- ql/src/test/results/compiler/plan/sample1.q.xml (revision 1158993) +++ ql/src/test/results/compiler/plan/sample1.q.xml (working copy) @@ -1,5 +1,5 @@ - + Stage-3 @@ -75,11 +75,11 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 transient_lastDdlTime - 1310382369 + 1313648380 @@ -141,11 +141,11 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/srcpart + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/srcpart transient_lastDdlTime - 1310382369 + 1313648380 @@ -177,13 +177,13 @@ - file:/tmp/amarsri/hive_2011-07-11_04-06-12_350_8086266026815616219/-ext-10001 + file:/tmp/charleschen/hive_2011-08-17_23-19-48_013_9124030926228493606/-ext-10001 1 - file:/tmp/amarsri/hive_2011-07-11_04-06-12_350_8086266026815616219/-ext-10001/ + file:/tmp/charleschen/hive_2011-08-17_23-19-48_013_9124030926228493606/-ext-10001/ @@ -222,21 +222,21 @@ - CNTR_NAME_FS_520_NUM_INPUT_ROWS + CNTR_NAME_FS_504_NUM_INPUT_ROWS - CNTR_NAME_FS_520_NUM_OUTPUT_ROWS + CNTR_NAME_FS_504_NUM_OUTPUT_ROWS - CNTR_NAME_FS_520_TIME_TAKEN + CNTR_NAME_FS_504_TIME_TAKEN - CNTR_NAME_FS_520_FATAL_ERROR + CNTR_NAME_FS_504_FATAL_ERROR - FS_520 + FS_504 @@ -421,21 +421,21 @@ - CNTR_NAME_SEL_519_NUM_INPUT_ROWS + CNTR_NAME_SEL_503_NUM_INPUT_ROWS - CNTR_NAME_SEL_519_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_503_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_519_TIME_TAKEN + CNTR_NAME_SEL_503_TIME_TAKEN - CNTR_NAME_SEL_519_FATAL_ERROR + CNTR_NAME_SEL_503_FATAL_ERROR - SEL_519 + SEL_503 @@ -668,21 +668,21 @@ - CNTR_NAME_FIL_517_NUM_INPUT_ROWS + CNTR_NAME_FIL_501_NUM_INPUT_ROWS - CNTR_NAME_FIL_517_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_501_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_517_TIME_TAKEN + CNTR_NAME_FIL_501_TIME_TAKEN - CNTR_NAME_FIL_517_FATAL_ERROR + CNTR_NAME_FIL_501_FATAL_ERROR - FIL_517 + FIL_501 @@ -768,16 +768,16 @@ - CNTR_NAME_TS_516_NUM_INPUT_ROWS + CNTR_NAME_TS_500_NUM_INPUT_ROWS - CNTR_NAME_TS_516_NUM_OUTPUT_ROWS + CNTR_NAME_TS_500_NUM_OUTPUT_ROWS - CNTR_NAME_TS_516_TIME_TAKEN + CNTR_NAME_TS_500_TIME_TAKEN - CNTR_NAME_TS_516_FATAL_ERROR + CNTR_NAME_TS_500_FATAL_ERROR @@ -792,7 +792,7 @@ - TS_516 + TS_500 @@ -860,7 +860,7 @@ - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 s @@ -872,7 +872,7 @@ - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 hr=11 @@ -942,11 +942,11 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 transient_lastDdlTime - 1310382369 + 1313648380 @@ -1008,11 +1008,11 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/srcpart + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/srcpart transient_lastDdlTime - 1310382369 + 1313648380 Index: ql/src/test/results/compiler/plan/sample2.q.xml =================================================================== --- ql/src/test/results/compiler/plan/sample2.q.xml (revision 1158993) +++ ql/src/test/results/compiler/plan/sample2.q.xml (working copy) @@ -1,5 +1,5 @@ - + @@ -33,7 +33,7 @@ - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-15_772_2901808161378380637/-ext-10000/ + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-19-56_622_3615735181506057104/-ext-10000/ @@ -73,7 +73,7 @@ - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-15_772_2901808161378380637/-ext-10002 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-19-56_622_3615735181506057104/-ext-10002 @@ -82,7 +82,7 @@ - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-15_772_2901808161378380637/-ext-10000 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-19-56_622_3615735181506057104/-ext-10000 1 @@ -134,7 +134,7 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/dest1 + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/dest1 file.outputformat @@ -142,7 +142,7 @@ transient_lastDdlTime - 1310382375 + 1313648396 @@ -159,21 +159,21 @@ - CNTR_NAME_FS_531_NUM_INPUT_ROWS + CNTR_NAME_FS_515_NUM_INPUT_ROWS - CNTR_NAME_FS_531_NUM_OUTPUT_ROWS + CNTR_NAME_FS_515_NUM_OUTPUT_ROWS - CNTR_NAME_FS_531_TIME_TAKEN + CNTR_NAME_FS_515_TIME_TAKEN - CNTR_NAME_FS_531_FATAL_ERROR + CNTR_NAME_FS_515_FATAL_ERROR - FS_531 + FS_515 @@ -227,21 +227,21 @@ - CNTR_NAME_TS_530_NUM_INPUT_ROWS + CNTR_NAME_TS_514_NUM_INPUT_ROWS - CNTR_NAME_TS_530_NUM_OUTPUT_ROWS + CNTR_NAME_TS_514_NUM_OUTPUT_ROWS - CNTR_NAME_TS_530_TIME_TAKEN + CNTR_NAME_TS_514_TIME_TAKEN - CNTR_NAME_TS_530_FATAL_ERROR + CNTR_NAME_TS_514_FATAL_ERROR - TS_530 + TS_514 @@ -262,10 +262,10 @@ - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-15_772_2901808161378380637/-ext-10002 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-19-56_622_3615735181506057104/-ext-10002 - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-15_772_2901808161378380637/-ext-10002 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-19-56_622_3615735181506057104/-ext-10002 @@ -274,7 +274,7 @@ - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-15_772_2901808161378380637/-ext-10002 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-19-56_622_3615735181506057104/-ext-10002 -ext-10002 @@ -328,11 +328,11 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/dest1 + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1310382375 + 1313648396 @@ -382,13 +382,13 @@ true - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-15_772_2901808161378380637/-ext-10000 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-19-56_622_3615735181506057104/-ext-10000 - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-15_772_2901808161378380637/-ext-10001 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-19-56_622_3615735181506057104/-ext-10001 @@ -409,10 +409,10 @@ true - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-15_772_2901808161378380637/-ext-10002 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-19-56_622_3615735181506057104/-ext-10002 - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-15_772_2901808161378380637/-ext-10000 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-19-56_622_3615735181506057104/-ext-10000 @@ -438,7 +438,7 @@ - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-15_772_2901808161378380637/-ext-10002 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-19-56_622_3615735181506057104/-ext-10002 @@ -528,11 +528,11 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1310382373 + 1313648391 @@ -594,11 +594,11 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1310382373 + 1313648391 @@ -633,7 +633,7 @@ 1 - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-15_772_2901808161378380637/-ext-10002 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-19-56_622_3615735181506057104/-ext-10002 true @@ -642,7 +642,7 @@ 1 - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-15_772_2901808161378380637/-ext-10000/ + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-19-56_622_3615735181506057104/-ext-10000/ @@ -655,21 +655,21 @@ - CNTR_NAME_FS_529_NUM_INPUT_ROWS + CNTR_NAME_FS_513_NUM_INPUT_ROWS - CNTR_NAME_FS_529_NUM_OUTPUT_ROWS + CNTR_NAME_FS_513_NUM_OUTPUT_ROWS - CNTR_NAME_FS_529_TIME_TAKEN + CNTR_NAME_FS_513_TIME_TAKEN - CNTR_NAME_FS_529_FATAL_ERROR + CNTR_NAME_FS_513_FATAL_ERROR - FS_529 + FS_513 @@ -751,21 +751,21 @@ - CNTR_NAME_SEL_528_NUM_INPUT_ROWS + CNTR_NAME_SEL_512_NUM_INPUT_ROWS - CNTR_NAME_SEL_528_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_512_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_528_TIME_TAKEN + CNTR_NAME_SEL_512_TIME_TAKEN - CNTR_NAME_SEL_528_FATAL_ERROR + CNTR_NAME_SEL_512_FATAL_ERROR - SEL_528 + SEL_512 @@ -948,21 +948,21 @@ - CNTR_NAME_FIL_527_NUM_INPUT_ROWS + CNTR_NAME_FIL_511_NUM_INPUT_ROWS - CNTR_NAME_FIL_527_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_511_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_527_TIME_TAKEN + CNTR_NAME_FIL_511_TIME_TAKEN - CNTR_NAME_FIL_527_FATAL_ERROR + CNTR_NAME_FIL_511_FATAL_ERROR - FIL_527 + FIL_511 @@ -1022,16 +1022,16 @@ - CNTR_NAME_TS_526_NUM_INPUT_ROWS + CNTR_NAME_TS_510_NUM_INPUT_ROWS - CNTR_NAME_TS_526_NUM_OUTPUT_ROWS + CNTR_NAME_TS_510_NUM_OUTPUT_ROWS - CNTR_NAME_TS_526_TIME_TAKEN + CNTR_NAME_TS_510_TIME_TAKEN - CNTR_NAME_TS_526_FATAL_ERROR + CNTR_NAME_TS_510_FATAL_ERROR @@ -1046,7 +1046,7 @@ - TS_526 + TS_510 @@ -1111,7 +1111,7 @@ - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/srcbucket s @@ -1123,7 +1123,7 @@ - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/srcbucket srcbucket @@ -1184,11 +1184,11 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1310382373 + 1313648391 @@ -1250,11 +1250,11 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1310382373 + 1313648391 Index: ql/src/test/results/compiler/plan/sample3.q.xml =================================================================== --- ql/src/test/results/compiler/plan/sample3.q.xml (revision 1158993) +++ ql/src/test/results/compiler/plan/sample3.q.xml (working copy) @@ -1,5 +1,5 @@ - + @@ -33,7 +33,7 @@ - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-19_243_2379834322132096386/-ext-10000/ + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-09_485_4584478914179485359/-ext-10000/ @@ -73,7 +73,7 @@ - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-19_243_2379834322132096386/-ext-10002 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-09_485_4584478914179485359/-ext-10002 @@ -82,7 +82,7 @@ - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-19_243_2379834322132096386/-ext-10000 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-09_485_4584478914179485359/-ext-10000 1 @@ -134,7 +134,7 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/dest1 + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/dest1 file.outputformat @@ -142,7 +142,7 @@ transient_lastDdlTime - 1310382379 + 1313648409 @@ -159,21 +159,21 @@ - CNTR_NAME_FS_543_NUM_INPUT_ROWS + CNTR_NAME_FS_527_NUM_INPUT_ROWS - CNTR_NAME_FS_543_NUM_OUTPUT_ROWS + CNTR_NAME_FS_527_NUM_OUTPUT_ROWS - CNTR_NAME_FS_543_TIME_TAKEN + CNTR_NAME_FS_527_TIME_TAKEN - CNTR_NAME_FS_543_FATAL_ERROR + CNTR_NAME_FS_527_FATAL_ERROR - FS_543 + FS_527 @@ -227,21 +227,21 @@ - CNTR_NAME_TS_542_NUM_INPUT_ROWS + CNTR_NAME_TS_526_NUM_INPUT_ROWS - CNTR_NAME_TS_542_NUM_OUTPUT_ROWS + CNTR_NAME_TS_526_NUM_OUTPUT_ROWS - CNTR_NAME_TS_542_TIME_TAKEN + CNTR_NAME_TS_526_TIME_TAKEN - CNTR_NAME_TS_542_FATAL_ERROR + CNTR_NAME_TS_526_FATAL_ERROR - TS_542 + TS_526 @@ -262,10 +262,10 @@ - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-19_243_2379834322132096386/-ext-10002 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-09_485_4584478914179485359/-ext-10002 - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-19_243_2379834322132096386/-ext-10002 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-09_485_4584478914179485359/-ext-10002 @@ -274,7 +274,7 @@ - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-19_243_2379834322132096386/-ext-10002 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-09_485_4584478914179485359/-ext-10002 -ext-10002 @@ -328,11 +328,11 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/dest1 + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1310382379 + 1313648409 @@ -382,13 +382,13 @@ true - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-19_243_2379834322132096386/-ext-10000 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-09_485_4584478914179485359/-ext-10000 - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-19_243_2379834322132096386/-ext-10001 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-09_485_4584478914179485359/-ext-10001 @@ -409,10 +409,10 @@ true - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-19_243_2379834322132096386/-ext-10002 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-09_485_4584478914179485359/-ext-10002 - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-19_243_2379834322132096386/-ext-10000 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-09_485_4584478914179485359/-ext-10000 @@ -438,7 +438,7 @@ - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-19_243_2379834322132096386/-ext-10002 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-09_485_4584478914179485359/-ext-10002 @@ -528,11 +528,11 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1310382377 + 1313648400 @@ -594,11 +594,11 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1310382377 + 1313648400 @@ -633,7 +633,7 @@ 1 - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-19_243_2379834322132096386/-ext-10002 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-09_485_4584478914179485359/-ext-10002 true @@ -642,7 +642,7 @@ 1 - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-19_243_2379834322132096386/-ext-10000/ + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-09_485_4584478914179485359/-ext-10000/ @@ -655,21 +655,21 @@ - CNTR_NAME_FS_541_NUM_INPUT_ROWS + CNTR_NAME_FS_525_NUM_INPUT_ROWS - CNTR_NAME_FS_541_NUM_OUTPUT_ROWS + CNTR_NAME_FS_525_NUM_OUTPUT_ROWS - CNTR_NAME_FS_541_TIME_TAKEN + CNTR_NAME_FS_525_TIME_TAKEN - CNTR_NAME_FS_541_FATAL_ERROR + CNTR_NAME_FS_525_FATAL_ERROR - FS_541 + FS_525 @@ -751,21 +751,21 @@ - CNTR_NAME_SEL_540_NUM_INPUT_ROWS + CNTR_NAME_SEL_524_NUM_INPUT_ROWS - CNTR_NAME_SEL_540_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_524_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_540_TIME_TAKEN + CNTR_NAME_SEL_524_TIME_TAKEN - CNTR_NAME_SEL_540_FATAL_ERROR + CNTR_NAME_SEL_524_FATAL_ERROR - SEL_540 + SEL_524 @@ -958,21 +958,21 @@ - CNTR_NAME_FIL_539_NUM_INPUT_ROWS + CNTR_NAME_FIL_523_NUM_INPUT_ROWS - CNTR_NAME_FIL_539_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_523_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_539_TIME_TAKEN + CNTR_NAME_FIL_523_TIME_TAKEN - CNTR_NAME_FIL_539_FATAL_ERROR + CNTR_NAME_FIL_523_FATAL_ERROR - FIL_539 + FIL_523 @@ -1032,16 +1032,16 @@ - CNTR_NAME_TS_538_NUM_INPUT_ROWS + CNTR_NAME_TS_522_NUM_INPUT_ROWS - CNTR_NAME_TS_538_NUM_OUTPUT_ROWS + CNTR_NAME_TS_522_NUM_OUTPUT_ROWS - CNTR_NAME_TS_538_TIME_TAKEN + CNTR_NAME_TS_522_TIME_TAKEN - CNTR_NAME_TS_538_FATAL_ERROR + CNTR_NAME_TS_522_FATAL_ERROR @@ -1056,7 +1056,7 @@ - TS_538 + TS_522 @@ -1121,7 +1121,7 @@ - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/srcbucket s @@ -1133,7 +1133,7 @@ - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/srcbucket srcbucket @@ -1194,11 +1194,11 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1310382377 + 1313648400 @@ -1260,11 +1260,11 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1310382377 + 1313648400 Index: ql/src/test/results/compiler/plan/sample4.q.xml =================================================================== --- ql/src/test/results/compiler/plan/sample4.q.xml (revision 1158993) +++ ql/src/test/results/compiler/plan/sample4.q.xml (working copy) @@ -1,5 +1,5 @@ - + @@ -33,7 +33,7 @@ - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-22_731_7652885142239938307/-ext-10000/ + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-18_251_242750198893849087/-ext-10000/ @@ -73,7 +73,7 @@ - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-22_731_7652885142239938307/-ext-10002 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-18_251_242750198893849087/-ext-10002 @@ -82,7 +82,7 @@ - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-22_731_7652885142239938307/-ext-10000 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-18_251_242750198893849087/-ext-10000 1 @@ -134,7 +134,7 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/dest1 + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/dest1 file.outputformat @@ -142,7 +142,7 @@ transient_lastDdlTime - 1310382382 + 1313648417 @@ -159,21 +159,21 @@ - CNTR_NAME_FS_555_NUM_INPUT_ROWS + CNTR_NAME_FS_539_NUM_INPUT_ROWS - CNTR_NAME_FS_555_NUM_OUTPUT_ROWS + CNTR_NAME_FS_539_NUM_OUTPUT_ROWS - CNTR_NAME_FS_555_TIME_TAKEN + CNTR_NAME_FS_539_TIME_TAKEN - CNTR_NAME_FS_555_FATAL_ERROR + CNTR_NAME_FS_539_FATAL_ERROR - FS_555 + FS_539 @@ -227,21 +227,21 @@ - CNTR_NAME_TS_554_NUM_INPUT_ROWS + CNTR_NAME_TS_538_NUM_INPUT_ROWS - CNTR_NAME_TS_554_NUM_OUTPUT_ROWS + CNTR_NAME_TS_538_NUM_OUTPUT_ROWS - CNTR_NAME_TS_554_TIME_TAKEN + CNTR_NAME_TS_538_TIME_TAKEN - CNTR_NAME_TS_554_FATAL_ERROR + CNTR_NAME_TS_538_FATAL_ERROR - TS_554 + TS_538 @@ -262,10 +262,10 @@ - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-22_731_7652885142239938307/-ext-10002 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-18_251_242750198893849087/-ext-10002 - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-22_731_7652885142239938307/-ext-10002 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-18_251_242750198893849087/-ext-10002 @@ -274,7 +274,7 @@ - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-22_731_7652885142239938307/-ext-10002 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-18_251_242750198893849087/-ext-10002 -ext-10002 @@ -328,11 +328,11 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/dest1 + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1310382382 + 1313648417 @@ -382,13 +382,13 @@ true - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-22_731_7652885142239938307/-ext-10000 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-18_251_242750198893849087/-ext-10000 - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-22_731_7652885142239938307/-ext-10001 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-18_251_242750198893849087/-ext-10001 @@ -409,10 +409,10 @@ true - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-22_731_7652885142239938307/-ext-10002 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-18_251_242750198893849087/-ext-10002 - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-22_731_7652885142239938307/-ext-10000 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-18_251_242750198893849087/-ext-10000 @@ -438,7 +438,7 @@ - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-22_731_7652885142239938307/-ext-10002 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-18_251_242750198893849087/-ext-10002 @@ -528,11 +528,11 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1310382380 + 1313648413 @@ -594,11 +594,11 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1310382380 + 1313648413 @@ -633,7 +633,7 @@ 1 - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-22_731_7652885142239938307/-ext-10002 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-18_251_242750198893849087/-ext-10002 true @@ -642,7 +642,7 @@ 1 - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-22_731_7652885142239938307/-ext-10000/ + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-18_251_242750198893849087/-ext-10000/ @@ -655,21 +655,21 @@ - CNTR_NAME_FS_553_NUM_INPUT_ROWS + CNTR_NAME_FS_537_NUM_INPUT_ROWS - CNTR_NAME_FS_553_NUM_OUTPUT_ROWS + CNTR_NAME_FS_537_NUM_OUTPUT_ROWS - CNTR_NAME_FS_553_TIME_TAKEN + CNTR_NAME_FS_537_TIME_TAKEN - CNTR_NAME_FS_553_FATAL_ERROR + CNTR_NAME_FS_537_FATAL_ERROR - FS_553 + FS_537 @@ -751,21 +751,21 @@ - CNTR_NAME_SEL_552_NUM_INPUT_ROWS + CNTR_NAME_SEL_536_NUM_INPUT_ROWS - CNTR_NAME_SEL_552_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_536_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_552_TIME_TAKEN + CNTR_NAME_SEL_536_TIME_TAKEN - CNTR_NAME_SEL_552_FATAL_ERROR + CNTR_NAME_SEL_536_FATAL_ERROR - SEL_552 + SEL_536 @@ -948,21 +948,21 @@ - CNTR_NAME_FIL_551_NUM_INPUT_ROWS + CNTR_NAME_FIL_535_NUM_INPUT_ROWS - CNTR_NAME_FIL_551_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_535_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_551_TIME_TAKEN + CNTR_NAME_FIL_535_TIME_TAKEN - CNTR_NAME_FIL_551_FATAL_ERROR + CNTR_NAME_FIL_535_FATAL_ERROR - FIL_551 + FIL_535 @@ -1022,16 +1022,16 @@ - CNTR_NAME_TS_550_NUM_INPUT_ROWS + CNTR_NAME_TS_534_NUM_INPUT_ROWS - CNTR_NAME_TS_550_NUM_OUTPUT_ROWS + CNTR_NAME_TS_534_NUM_OUTPUT_ROWS - CNTR_NAME_TS_550_TIME_TAKEN + CNTR_NAME_TS_534_TIME_TAKEN - CNTR_NAME_TS_550_FATAL_ERROR + CNTR_NAME_TS_534_FATAL_ERROR @@ -1046,7 +1046,7 @@ - TS_550 + TS_534 @@ -1111,7 +1111,7 @@ - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/srcbucket s @@ -1123,7 +1123,7 @@ - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/srcbucket srcbucket @@ -1184,11 +1184,11 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1310382380 + 1313648413 @@ -1250,11 +1250,11 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1310382380 + 1313648413 Index: ql/src/test/results/compiler/plan/sample5.q.xml =================================================================== --- ql/src/test/results/compiler/plan/sample5.q.xml (revision 1158993) +++ ql/src/test/results/compiler/plan/sample5.q.xml (working copy) @@ -1,5 +1,5 @@ - + @@ -33,7 +33,7 @@ - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-26_178_8445131308101140110/-ext-10000/ + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-26_968_4958848323679884609/-ext-10000/ @@ -73,7 +73,7 @@ - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-26_178_8445131308101140110/-ext-10002 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-26_968_4958848323679884609/-ext-10002 @@ -82,7 +82,7 @@ - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-26_178_8445131308101140110/-ext-10000 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-26_968_4958848323679884609/-ext-10000 1 @@ -134,7 +134,7 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/dest1 + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/dest1 file.outputformat @@ -142,7 +142,7 @@ transient_lastDdlTime - 1310382386 + 1313648426 @@ -159,21 +159,21 @@ - CNTR_NAME_FS_567_NUM_INPUT_ROWS + CNTR_NAME_FS_551_NUM_INPUT_ROWS - CNTR_NAME_FS_567_NUM_OUTPUT_ROWS + CNTR_NAME_FS_551_NUM_OUTPUT_ROWS - CNTR_NAME_FS_567_TIME_TAKEN + CNTR_NAME_FS_551_TIME_TAKEN - CNTR_NAME_FS_567_FATAL_ERROR + CNTR_NAME_FS_551_FATAL_ERROR - FS_567 + FS_551 @@ -227,21 +227,21 @@ - CNTR_NAME_TS_566_NUM_INPUT_ROWS + CNTR_NAME_TS_550_NUM_INPUT_ROWS - CNTR_NAME_TS_566_NUM_OUTPUT_ROWS + CNTR_NAME_TS_550_NUM_OUTPUT_ROWS - CNTR_NAME_TS_566_TIME_TAKEN + CNTR_NAME_TS_550_TIME_TAKEN - CNTR_NAME_TS_566_FATAL_ERROR + CNTR_NAME_TS_550_FATAL_ERROR - TS_566 + TS_550 @@ -262,10 +262,10 @@ - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-26_178_8445131308101140110/-ext-10002 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-26_968_4958848323679884609/-ext-10002 - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-26_178_8445131308101140110/-ext-10002 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-26_968_4958848323679884609/-ext-10002 @@ -274,7 +274,7 @@ - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-26_178_8445131308101140110/-ext-10002 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-26_968_4958848323679884609/-ext-10002 -ext-10002 @@ -328,11 +328,11 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/dest1 + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1310382386 + 1313648426 @@ -382,13 +382,13 @@ true - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-26_178_8445131308101140110/-ext-10000 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-26_968_4958848323679884609/-ext-10000 - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-26_178_8445131308101140110/-ext-10001 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-26_968_4958848323679884609/-ext-10001 @@ -409,10 +409,10 @@ true - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-26_178_8445131308101140110/-ext-10002 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-26_968_4958848323679884609/-ext-10002 - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-26_178_8445131308101140110/-ext-10000 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-26_968_4958848323679884609/-ext-10000 @@ -438,7 +438,7 @@ - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-26_178_8445131308101140110/-ext-10002 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-26_968_4958848323679884609/-ext-10002 @@ -528,11 +528,11 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1310382384 + 1313648421 @@ -594,11 +594,11 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1310382384 + 1313648421 @@ -633,7 +633,7 @@ 1 - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-26_178_8445131308101140110/-ext-10002 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-26_968_4958848323679884609/-ext-10002 true @@ -642,7 +642,7 @@ 1 - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-26_178_8445131308101140110/-ext-10000/ + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-26_968_4958848323679884609/-ext-10000/ @@ -655,21 +655,21 @@ - CNTR_NAME_FS_565_NUM_INPUT_ROWS + CNTR_NAME_FS_549_NUM_INPUT_ROWS - CNTR_NAME_FS_565_NUM_OUTPUT_ROWS + CNTR_NAME_FS_549_NUM_OUTPUT_ROWS - CNTR_NAME_FS_565_TIME_TAKEN + CNTR_NAME_FS_549_TIME_TAKEN - CNTR_NAME_FS_565_FATAL_ERROR + CNTR_NAME_FS_549_FATAL_ERROR - FS_565 + FS_549 @@ -751,21 +751,21 @@ - CNTR_NAME_SEL_564_NUM_INPUT_ROWS + CNTR_NAME_SEL_548_NUM_INPUT_ROWS - CNTR_NAME_SEL_564_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_548_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_564_TIME_TAKEN + CNTR_NAME_SEL_548_TIME_TAKEN - CNTR_NAME_SEL_564_FATAL_ERROR + CNTR_NAME_SEL_548_FATAL_ERROR - SEL_564 + SEL_548 @@ -945,21 +945,21 @@ - CNTR_NAME_FIL_563_NUM_INPUT_ROWS + CNTR_NAME_FIL_547_NUM_INPUT_ROWS - CNTR_NAME_FIL_563_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_547_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_563_TIME_TAKEN + CNTR_NAME_FIL_547_TIME_TAKEN - CNTR_NAME_FIL_563_FATAL_ERROR + CNTR_NAME_FIL_547_FATAL_ERROR - FIL_563 + FIL_547 @@ -1019,16 +1019,16 @@ - CNTR_NAME_TS_562_NUM_INPUT_ROWS + CNTR_NAME_TS_546_NUM_INPUT_ROWS - CNTR_NAME_TS_562_NUM_OUTPUT_ROWS + CNTR_NAME_TS_546_NUM_OUTPUT_ROWS - CNTR_NAME_TS_562_TIME_TAKEN + CNTR_NAME_TS_546_TIME_TAKEN - CNTR_NAME_TS_562_FATAL_ERROR + CNTR_NAME_TS_546_FATAL_ERROR @@ -1043,7 +1043,7 @@ - TS_562 + TS_546 @@ -1108,7 +1108,7 @@ - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/srcbucket s @@ -1120,7 +1120,7 @@ - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/srcbucket srcbucket @@ -1181,11 +1181,11 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1310382384 + 1313648421 @@ -1247,11 +1247,11 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1310382384 + 1313648421 Index: ql/src/test/results/compiler/plan/sample6.q.xml =================================================================== --- ql/src/test/results/compiler/plan/sample6.q.xml (revision 1158993) +++ ql/src/test/results/compiler/plan/sample6.q.xml (working copy) @@ -1,5 +1,5 @@ - + @@ -33,7 +33,7 @@ - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-29_716_3544047158874325131/-ext-10000/ + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-35_922_251324401035208760/-ext-10000/ @@ -73,7 +73,7 @@ - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-29_716_3544047158874325131/-ext-10002 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-35_922_251324401035208760/-ext-10002 @@ -82,7 +82,7 @@ - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-29_716_3544047158874325131/-ext-10000 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-35_922_251324401035208760/-ext-10000 1 @@ -134,7 +134,7 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/dest1 + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/dest1 file.outputformat @@ -142,7 +142,7 @@ transient_lastDdlTime - 1310382389 + 1313648435 @@ -159,21 +159,21 @@ - CNTR_NAME_FS_579_NUM_INPUT_ROWS + CNTR_NAME_FS_563_NUM_INPUT_ROWS - CNTR_NAME_FS_579_NUM_OUTPUT_ROWS + CNTR_NAME_FS_563_NUM_OUTPUT_ROWS - CNTR_NAME_FS_579_TIME_TAKEN + CNTR_NAME_FS_563_TIME_TAKEN - CNTR_NAME_FS_579_FATAL_ERROR + CNTR_NAME_FS_563_FATAL_ERROR - FS_579 + FS_563 @@ -227,21 +227,21 @@ - CNTR_NAME_TS_578_NUM_INPUT_ROWS + CNTR_NAME_TS_562_NUM_INPUT_ROWS - CNTR_NAME_TS_578_NUM_OUTPUT_ROWS + CNTR_NAME_TS_562_NUM_OUTPUT_ROWS - CNTR_NAME_TS_578_TIME_TAKEN + CNTR_NAME_TS_562_TIME_TAKEN - CNTR_NAME_TS_578_FATAL_ERROR + CNTR_NAME_TS_562_FATAL_ERROR - TS_578 + TS_562 @@ -262,10 +262,10 @@ - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-29_716_3544047158874325131/-ext-10002 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-35_922_251324401035208760/-ext-10002 - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-29_716_3544047158874325131/-ext-10002 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-35_922_251324401035208760/-ext-10002 @@ -274,7 +274,7 @@ - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-29_716_3544047158874325131/-ext-10002 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-35_922_251324401035208760/-ext-10002 -ext-10002 @@ -328,11 +328,11 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/dest1 + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1310382389 + 1313648435 @@ -382,13 +382,13 @@ true - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-29_716_3544047158874325131/-ext-10000 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-35_922_251324401035208760/-ext-10000 - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-29_716_3544047158874325131/-ext-10001 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-35_922_251324401035208760/-ext-10001 @@ -409,10 +409,10 @@ true - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-29_716_3544047158874325131/-ext-10002 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-35_922_251324401035208760/-ext-10002 - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-29_716_3544047158874325131/-ext-10000 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-35_922_251324401035208760/-ext-10000 @@ -438,7 +438,7 @@ - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-29_716_3544047158874325131/-ext-10002 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-35_922_251324401035208760/-ext-10002 @@ -528,11 +528,11 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1310382387 + 1313648430 @@ -594,11 +594,11 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1310382387 + 1313648430 @@ -633,7 +633,7 @@ 1 - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-29_716_3544047158874325131/-ext-10002 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-35_922_251324401035208760/-ext-10002 true @@ -642,7 +642,7 @@ 1 - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-29_716_3544047158874325131/-ext-10000/ + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-35_922_251324401035208760/-ext-10000/ @@ -655,21 +655,21 @@ - CNTR_NAME_FS_577_NUM_INPUT_ROWS + CNTR_NAME_FS_561_NUM_INPUT_ROWS - CNTR_NAME_FS_577_NUM_OUTPUT_ROWS + CNTR_NAME_FS_561_NUM_OUTPUT_ROWS - CNTR_NAME_FS_577_TIME_TAKEN + CNTR_NAME_FS_561_TIME_TAKEN - CNTR_NAME_FS_577_FATAL_ERROR + CNTR_NAME_FS_561_FATAL_ERROR - FS_577 + FS_561 @@ -751,21 +751,21 @@ - CNTR_NAME_SEL_576_NUM_INPUT_ROWS + CNTR_NAME_SEL_560_NUM_INPUT_ROWS - CNTR_NAME_SEL_576_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_560_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_576_TIME_TAKEN + CNTR_NAME_SEL_560_TIME_TAKEN - CNTR_NAME_SEL_576_FATAL_ERROR + CNTR_NAME_SEL_560_FATAL_ERROR - SEL_576 + SEL_560 @@ -948,21 +948,21 @@ - CNTR_NAME_FIL_575_NUM_INPUT_ROWS + CNTR_NAME_FIL_559_NUM_INPUT_ROWS - CNTR_NAME_FIL_575_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_559_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_575_TIME_TAKEN + CNTR_NAME_FIL_559_TIME_TAKEN - CNTR_NAME_FIL_575_FATAL_ERROR + CNTR_NAME_FIL_559_FATAL_ERROR - FIL_575 + FIL_559 @@ -1022,16 +1022,16 @@ - CNTR_NAME_TS_574_NUM_INPUT_ROWS + CNTR_NAME_TS_558_NUM_INPUT_ROWS - CNTR_NAME_TS_574_NUM_OUTPUT_ROWS + CNTR_NAME_TS_558_NUM_OUTPUT_ROWS - CNTR_NAME_TS_574_TIME_TAKEN + CNTR_NAME_TS_558_TIME_TAKEN - CNTR_NAME_TS_574_FATAL_ERROR + CNTR_NAME_TS_558_FATAL_ERROR @@ -1046,7 +1046,7 @@ - TS_574 + TS_558 @@ -1111,7 +1111,7 @@ - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/srcbucket s @@ -1123,7 +1123,7 @@ - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/srcbucket srcbucket @@ -1184,11 +1184,11 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1310382387 + 1313648430 @@ -1250,11 +1250,11 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1310382387 + 1313648430 Index: ql/src/test/results/compiler/plan/sample7.q.xml =================================================================== --- ql/src/test/results/compiler/plan/sample7.q.xml (revision 1158993) +++ ql/src/test/results/compiler/plan/sample7.q.xml (working copy) @@ -1,5 +1,5 @@ - + @@ -33,7 +33,7 @@ - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-33_170_7666241259022167376/-ext-10000/ + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-44_789_3495586579158633228/-ext-10000/ @@ -73,7 +73,7 @@ - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-33_170_7666241259022167376/-ext-10002 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-44_789_3495586579158633228/-ext-10002 @@ -82,7 +82,7 @@ - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-33_170_7666241259022167376/-ext-10000 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-44_789_3495586579158633228/-ext-10000 1 @@ -134,7 +134,7 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/dest1 + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/dest1 file.outputformat @@ -142,7 +142,7 @@ transient_lastDdlTime - 1310382393 + 1313648444 @@ -159,21 +159,21 @@ - CNTR_NAME_FS_593_NUM_INPUT_ROWS + CNTR_NAME_FS_577_NUM_INPUT_ROWS - CNTR_NAME_FS_593_NUM_OUTPUT_ROWS + CNTR_NAME_FS_577_NUM_OUTPUT_ROWS - CNTR_NAME_FS_593_TIME_TAKEN + CNTR_NAME_FS_577_TIME_TAKEN - CNTR_NAME_FS_593_FATAL_ERROR + CNTR_NAME_FS_577_FATAL_ERROR - FS_593 + FS_577 @@ -227,21 +227,21 @@ - CNTR_NAME_TS_592_NUM_INPUT_ROWS + CNTR_NAME_TS_576_NUM_INPUT_ROWS - CNTR_NAME_TS_592_NUM_OUTPUT_ROWS + CNTR_NAME_TS_576_NUM_OUTPUT_ROWS - CNTR_NAME_TS_592_TIME_TAKEN + CNTR_NAME_TS_576_TIME_TAKEN - CNTR_NAME_TS_592_FATAL_ERROR + CNTR_NAME_TS_576_FATAL_ERROR - TS_592 + TS_576 @@ -262,10 +262,10 @@ - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-33_170_7666241259022167376/-ext-10002 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-44_789_3495586579158633228/-ext-10002 - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-33_170_7666241259022167376/-ext-10002 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-44_789_3495586579158633228/-ext-10002 @@ -274,7 +274,7 @@ - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-33_170_7666241259022167376/-ext-10002 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-44_789_3495586579158633228/-ext-10002 -ext-10002 @@ -328,11 +328,11 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/dest1 + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1310382393 + 1313648444 @@ -382,13 +382,13 @@ true - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-33_170_7666241259022167376/-ext-10000 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-44_789_3495586579158633228/-ext-10000 - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-33_170_7666241259022167376/-ext-10001 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-44_789_3495586579158633228/-ext-10001 @@ -409,10 +409,10 @@ true - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-33_170_7666241259022167376/-ext-10002 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-44_789_3495586579158633228/-ext-10002 - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-33_170_7666241259022167376/-ext-10000 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-44_789_3495586579158633228/-ext-10000 @@ -438,7 +438,7 @@ - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-33_170_7666241259022167376/-ext-10002 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-44_789_3495586579158633228/-ext-10002 @@ -528,11 +528,11 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1310382391 + 1313648439 @@ -594,11 +594,11 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1310382391 + 1313648439 @@ -637,7 +637,7 @@ 1 - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-33_170_7666241259022167376/-ext-10002 + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-44_789_3495586579158633228/-ext-10002 true @@ -646,7 +646,7 @@ 1 - pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_04-06-33_170_7666241259022167376/-ext-10000/ + pfile:/data/users/charleschen/hive-trunk/build/ql/scratchdir/hive_2011-08-17_23-20-44_789_3495586579158633228/-ext-10000/ @@ -659,21 +659,21 @@ - CNTR_NAME_FS_590_NUM_INPUT_ROWS + CNTR_NAME_FS_574_NUM_INPUT_ROWS - CNTR_NAME_FS_590_NUM_OUTPUT_ROWS + CNTR_NAME_FS_574_NUM_OUTPUT_ROWS - CNTR_NAME_FS_590_TIME_TAKEN + CNTR_NAME_FS_574_TIME_TAKEN - CNTR_NAME_FS_590_FATAL_ERROR + CNTR_NAME_FS_574_FATAL_ERROR - FS_590 + FS_574 @@ -755,21 +755,21 @@ - CNTR_NAME_SEL_589_NUM_INPUT_ROWS + CNTR_NAME_SEL_573_NUM_INPUT_ROWS - CNTR_NAME_SEL_589_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_573_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_589_TIME_TAKEN + CNTR_NAME_SEL_573_TIME_TAKEN - CNTR_NAME_SEL_589_FATAL_ERROR + CNTR_NAME_SEL_573_FATAL_ERROR - SEL_589 + SEL_573 @@ -952,21 +952,21 @@ - CNTR_NAME_FIL_587_NUM_INPUT_ROWS + CNTR_NAME_FIL_571_NUM_INPUT_ROWS - CNTR_NAME_FIL_587_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_571_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_587_TIME_TAKEN + CNTR_NAME_FIL_571_TIME_TAKEN - CNTR_NAME_FIL_587_FATAL_ERROR + CNTR_NAME_FIL_571_FATAL_ERROR - FIL_587 + FIL_571 @@ -1057,21 +1057,21 @@ - CNTR_NAME_FIL_591_NUM_INPUT_ROWS + CNTR_NAME_FIL_575_NUM_INPUT_ROWS - CNTR_NAME_FIL_591_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_575_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_591_TIME_TAKEN + CNTR_NAME_FIL_575_TIME_TAKEN - CNTR_NAME_FIL_591_FATAL_ERROR + CNTR_NAME_FIL_575_FATAL_ERROR - FIL_591 + FIL_575 @@ -1147,16 +1147,16 @@ - CNTR_NAME_TS_586_NUM_INPUT_ROWS + CNTR_NAME_TS_570_NUM_INPUT_ROWS - CNTR_NAME_TS_586_NUM_OUTPUT_ROWS + CNTR_NAME_TS_570_NUM_OUTPUT_ROWS - CNTR_NAME_TS_586_TIME_TAKEN + CNTR_NAME_TS_570_TIME_TAKEN - CNTR_NAME_TS_586_FATAL_ERROR + CNTR_NAME_TS_570_FATAL_ERROR @@ -1171,7 +1171,7 @@ - TS_586 + TS_570 @@ -1193,7 +1193,7 @@ - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt s @@ -1205,7 +1205,7 @@ - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt srcbucket0.txt @@ -1266,11 +1266,11 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1310382391 + 1313648439 @@ -1332,11 +1332,11 @@ location - pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/charleschen/hive-trunk/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1310382391 + 1313648439 Index: ql/src/java/org/apache/hadoop/hive/ql/ppd/OpProcFactory.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/ppd/OpProcFactory.java (revision 1158993) +++ ql/src/java/org/apache/hadoop/hive/ql/ppd/OpProcFactory.java (working copy) @@ -23,9 +23,9 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.Stack; -import java.util.Map.Entry; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -43,7 +43,6 @@ import org.apache.hadoop.hive.ql.lib.NodeProcessorCtx; import org.apache.hadoop.hive.ql.metadata.HiveStorageHandler; import org.apache.hadoop.hive.ql.metadata.HiveStoragePredicateHandler; -import org.apache.hadoop.hive.ql.metadata.HiveUtils; import org.apache.hadoop.hive.ql.metadata.Table; import org.apache.hadoop.hive.ql.parse.OpParseContext; import org.apache.hadoop.hive.ql.parse.RowResolver; @@ -222,7 +221,19 @@ OpWalkerInfo owi = (OpWalkerInfo) procCtx; Set aliases = getQualifiedAliases((JoinOperator) nd, owi .getRowResolver(nd)); - boolean hasUnpushedPredicates = mergeWithChildrenPred(nd, owi, null, aliases, false); + // we pass null for aliases here because mergeWithChildrenPred filters + // aliases in the children node context and we need to filter them in + // the current JoinOperator's context + boolean hasUnpushedPredicates = mergeWithChildrenPred(nd, owi, null, null, false); + ExprWalkerInfo prunePreds = + owi.getPrunedPreds((Operator) nd); + if (prunePreds != null) { + for (String key : prunePreds.getFinalCandidates().keySet()) { + if (!aliases.contains(key)) { + prunePreds.getFinalCandidates().remove(key); + } + } + } if (HiveConf.getBoolVar(owi.getParseContext().getConf(), HiveConf.ConfVars.HIVEPPDREMOVEDUPLICATEFILTERS)) { if (hasUnpushedPredicates) {