Index: ql/src/test/results/compiler/plan/join2.q.xml =================================================================== --- ql/src/test/results/compiler/plan/join2.q.xml (revision 4584) +++ ql/src/test/results/compiler/plan/join2.q.xml (working copy) @@ -1,5 +1,5 @@ - + @@ -30,7 +30,7 @@ true - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1369275629/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/983818849/10000 @@ -83,11 +83,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1262739216 + 1263415316 @@ -97,7 +97,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1369275629/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/983818849/10001 @@ -175,11 +175,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1262739216 + 1263415315 @@ -389,21 +389,21 @@ - CNTR_NAME_RS_394_NUM_INPUT_ROWS + CNTR_NAME_RS_6_NUM_INPUT_ROWS - CNTR_NAME_RS_394_NUM_OUTPUT_ROWS + CNTR_NAME_RS_6_NUM_OUTPUT_ROWS - CNTR_NAME_RS_394_TIME_TAKEN + CNTR_NAME_RS_6_TIME_TAKEN - CNTR_NAME_RS_394_FATAL_ERROR + CNTR_NAME_RS_6_FATAL_ERROR - RS_394 + RS_6 @@ -437,21 +437,21 @@ - CNTR_NAME_TS_400_NUM_INPUT_ROWS + CNTR_NAME_TS_12_NUM_INPUT_ROWS - CNTR_NAME_TS_400_NUM_OUTPUT_ROWS + CNTR_NAME_TS_12_NUM_OUTPUT_ROWS - CNTR_NAME_TS_400_TIME_TAKEN + CNTR_NAME_TS_12_TIME_TAKEN - CNTR_NAME_TS_400_FATAL_ERROR + CNTR_NAME_TS_12_FATAL_ERROR - TS_400 + TS_12 @@ -641,21 +641,21 @@ - CNTR_NAME_RS_395_NUM_INPUT_ROWS + CNTR_NAME_RS_7_NUM_INPUT_ROWS - CNTR_NAME_RS_395_NUM_OUTPUT_ROWS + CNTR_NAME_RS_7_NUM_OUTPUT_ROWS - CNTR_NAME_RS_395_TIME_TAKEN + CNTR_NAME_RS_7_TIME_TAKEN - CNTR_NAME_RS_395_FATAL_ERROR + CNTR_NAME_RS_7_FATAL_ERROR - RS_395 + RS_7 @@ -696,16 +696,16 @@ - CNTR_NAME_TS_389_NUM_INPUT_ROWS + CNTR_NAME_TS_1_NUM_INPUT_ROWS - CNTR_NAME_TS_389_NUM_OUTPUT_ROWS + CNTR_NAME_TS_1_NUM_OUTPUT_ROWS - CNTR_NAME_TS_389_TIME_TAKEN + CNTR_NAME_TS_1_TIME_TAKEN - CNTR_NAME_TS_389_FATAL_ERROR + CNTR_NAME_TS_1_FATAL_ERROR @@ -720,7 +720,7 @@ - TS_389 + TS_1 @@ -766,7 +766,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/569065061/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1600915540/10002 $INTNAME @@ -774,7 +774,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src src3 @@ -786,7 +786,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/569065061/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1600915540/10002 org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe @@ -832,7 +832,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -891,7 +891,7 @@ 1 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1369275629/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/983818849/10000 @@ -901,21 +901,21 @@ - CNTR_NAME_FS_398_NUM_INPUT_ROWS + CNTR_NAME_FS_10_NUM_INPUT_ROWS - CNTR_NAME_FS_398_NUM_OUTPUT_ROWS + CNTR_NAME_FS_10_NUM_OUTPUT_ROWS - CNTR_NAME_FS_398_TIME_TAKEN + CNTR_NAME_FS_10_TIME_TAKEN - CNTR_NAME_FS_398_FATAL_ERROR + CNTR_NAME_FS_10_FATAL_ERROR - FS_398 + FS_10 @@ -1015,21 +1015,21 @@ - CNTR_NAME_SEL_397_NUM_INPUT_ROWS + CNTR_NAME_SEL_9_NUM_INPUT_ROWS - CNTR_NAME_SEL_397_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_9_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_397_TIME_TAKEN + CNTR_NAME_SEL_9_TIME_TAKEN - CNTR_NAME_SEL_397_FATAL_ERROR + CNTR_NAME_SEL_9_FATAL_ERROR - SEL_397 + SEL_9 @@ -1250,21 +1250,21 @@ - CNTR_NAME_JOIN_396_NUM_INPUT_ROWS + CNTR_NAME_JOIN_8_NUM_INPUT_ROWS - CNTR_NAME_JOIN_396_NUM_OUTPUT_ROWS + CNTR_NAME_JOIN_8_NUM_OUTPUT_ROWS - CNTR_NAME_JOIN_396_TIME_TAKEN + CNTR_NAME_JOIN_8_TIME_TAKEN - CNTR_NAME_JOIN_396_FATAL_ERROR + CNTR_NAME_JOIN_8_FATAL_ERROR - JOIN_396 + JOIN_8 @@ -1575,21 +1575,21 @@ - CNTR_NAME_RS_392_NUM_INPUT_ROWS + CNTR_NAME_RS_4_NUM_INPUT_ROWS - CNTR_NAME_RS_392_NUM_OUTPUT_ROWS + CNTR_NAME_RS_4_NUM_OUTPUT_ROWS - CNTR_NAME_RS_392_TIME_TAKEN + CNTR_NAME_RS_4_TIME_TAKEN - CNTR_NAME_RS_392_FATAL_ERROR + CNTR_NAME_RS_4_FATAL_ERROR - RS_392 + RS_4 @@ -1630,16 +1630,16 @@ - CNTR_NAME_TS_388_NUM_INPUT_ROWS + CNTR_NAME_TS_0_NUM_INPUT_ROWS - CNTR_NAME_TS_388_NUM_OUTPUT_ROWS + CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - CNTR_NAME_TS_388_TIME_TAKEN + CNTR_NAME_TS_0_TIME_TAKEN - CNTR_NAME_TS_388_FATAL_ERROR + CNTR_NAME_TS_0_FATAL_ERROR @@ -1651,7 +1651,7 @@ - TS_388 + TS_0 @@ -1817,21 +1817,21 @@ - CNTR_NAME_RS_391_NUM_INPUT_ROWS + CNTR_NAME_RS_3_NUM_INPUT_ROWS - CNTR_NAME_RS_391_NUM_OUTPUT_ROWS + CNTR_NAME_RS_3_NUM_OUTPUT_ROWS - CNTR_NAME_RS_391_TIME_TAKEN + CNTR_NAME_RS_3_TIME_TAKEN - CNTR_NAME_RS_391_FATAL_ERROR + CNTR_NAME_RS_3_FATAL_ERROR - RS_391 + RS_3 @@ -1872,16 +1872,16 @@ - CNTR_NAME_TS_390_NUM_INPUT_ROWS + CNTR_NAME_TS_2_NUM_INPUT_ROWS - CNTR_NAME_TS_390_NUM_OUTPUT_ROWS + CNTR_NAME_TS_2_NUM_OUTPUT_ROWS - CNTR_NAME_TS_390_TIME_TAKEN + CNTR_NAME_TS_2_TIME_TAKEN - CNTR_NAME_TS_390_FATAL_ERROR + CNTR_NAME_TS_2_FATAL_ERROR @@ -1893,7 +1893,7 @@ - TS_390 + TS_2 @@ -1939,7 +1939,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src src2 @@ -1954,7 +1954,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -2006,7 +2006,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/569065061/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1600915540/10002 @@ -2016,21 +2016,21 @@ - CNTR_NAME_FS_399_NUM_INPUT_ROWS + CNTR_NAME_FS_11_NUM_INPUT_ROWS - CNTR_NAME_FS_399_NUM_OUTPUT_ROWS + CNTR_NAME_FS_11_NUM_OUTPUT_ROWS - CNTR_NAME_FS_399_TIME_TAKEN + CNTR_NAME_FS_11_TIME_TAKEN - CNTR_NAME_FS_399_FATAL_ERROR + CNTR_NAME_FS_11_FATAL_ERROR - FS_399 + FS_11 @@ -2218,21 +2218,21 @@ - CNTR_NAME_JOIN_393_NUM_INPUT_ROWS + CNTR_NAME_JOIN_5_NUM_INPUT_ROWS - CNTR_NAME_JOIN_393_NUM_OUTPUT_ROWS + CNTR_NAME_JOIN_5_NUM_OUTPUT_ROWS - CNTR_NAME_JOIN_393_TIME_TAKEN + CNTR_NAME_JOIN_5_TIME_TAKEN - CNTR_NAME_JOIN_393_FATAL_ERROR + CNTR_NAME_JOIN_5_FATAL_ERROR - JOIN_393 + JOIN_5 Index: ql/src/test/results/compiler/plan/input2.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input2.q.xml (revision 4584) +++ ql/src/test/results/compiler/plan/input2.q.xml (working copy) @@ -1,5 +1,5 @@ - + @@ -30,7 +30,7 @@ true - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1331279008/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1808739356/10000 @@ -83,11 +83,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1262739174 + 1263415277 @@ -97,7 +97,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1331279008/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1808739356/10001 @@ -125,10 +125,10 @@ true - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1912189347/10006 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/956562171/10006 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1331279008/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1808739356/10000 @@ -146,7 +146,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1912189347/10006 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/956562171/10006 @@ -301,21 +301,21 @@ - CNTR_NAME_RS_141_NUM_INPUT_ROWS + CNTR_NAME_RS_11_NUM_INPUT_ROWS - CNTR_NAME_RS_141_NUM_OUTPUT_ROWS + CNTR_NAME_RS_11_NUM_OUTPUT_ROWS - CNTR_NAME_RS_141_TIME_TAKEN + CNTR_NAME_RS_11_TIME_TAKEN - CNTR_NAME_RS_141_FATAL_ERROR + CNTR_NAME_RS_11_FATAL_ERROR - RS_141 + RS_11 @@ -359,21 +359,21 @@ - CNTR_NAME_TS_140_NUM_INPUT_ROWS + CNTR_NAME_TS_10_NUM_INPUT_ROWS - CNTR_NAME_TS_140_NUM_OUTPUT_ROWS + CNTR_NAME_TS_10_NUM_OUTPUT_ROWS - CNTR_NAME_TS_140_TIME_TAKEN + CNTR_NAME_TS_10_TIME_TAKEN - CNTR_NAME_TS_140_FATAL_ERROR + CNTR_NAME_TS_10_FATAL_ERROR - TS_140 + TS_10 @@ -391,10 +391,10 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1912189347/10006 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/956562171/10006 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1912189347/10006 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/956562171/10006 @@ -403,7 +403,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1912189347/10006 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/956562171/10006 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -436,7 +436,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1331279008/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1808739356/10000 @@ -485,7 +485,7 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/dest1 file.outputformat @@ -493,7 +493,7 @@ transient_lastDdlTime - 1262739174 + 1263415277 @@ -507,21 +507,21 @@ - CNTR_NAME_FS_143_NUM_INPUT_ROWS + CNTR_NAME_FS_13_NUM_INPUT_ROWS - CNTR_NAME_FS_143_NUM_OUTPUT_ROWS + CNTR_NAME_FS_13_NUM_OUTPUT_ROWS - CNTR_NAME_FS_143_TIME_TAKEN + CNTR_NAME_FS_13_TIME_TAKEN - CNTR_NAME_FS_143_FATAL_ERROR + CNTR_NAME_FS_13_FATAL_ERROR - FS_143 + FS_13 @@ -557,21 +557,21 @@ - CNTR_NAME_OP_142_NUM_INPUT_ROWS + CNTR_NAME_OP_12_NUM_INPUT_ROWS - CNTR_NAME_OP_142_NUM_OUTPUT_ROWS + CNTR_NAME_OP_12_NUM_OUTPUT_ROWS - CNTR_NAME_OP_142_TIME_TAKEN + CNTR_NAME_OP_12_TIME_TAKEN - CNTR_NAME_OP_142_FATAL_ERROR + CNTR_NAME_OP_12_FATAL_ERROR - OP_142 + OP_12 @@ -629,7 +629,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1912189347/10006 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/956562171/10006 @@ -679,7 +679,7 @@ true - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1331279008/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1808739356/10002 @@ -732,11 +732,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/dest2 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/dest2 transient_lastDdlTime - 1262739174 + 1263415277 @@ -746,7 +746,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1331279008/10003 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1808739356/10003 @@ -774,10 +774,10 @@ true - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1912189347/10007 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/956562171/10007 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1331279008/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1808739356/10002 @@ -795,7 +795,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1912189347/10007 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/956562171/10007 @@ -942,21 +942,21 @@ - CNTR_NAME_RS_145_NUM_INPUT_ROWS + CNTR_NAME_RS_15_NUM_INPUT_ROWS - CNTR_NAME_RS_145_NUM_OUTPUT_ROWS + CNTR_NAME_RS_15_NUM_OUTPUT_ROWS - CNTR_NAME_RS_145_TIME_TAKEN + CNTR_NAME_RS_15_TIME_TAKEN - CNTR_NAME_RS_145_FATAL_ERROR + CNTR_NAME_RS_15_FATAL_ERROR - RS_145 + RS_15 @@ -1000,21 +1000,21 @@ - CNTR_NAME_TS_144_NUM_INPUT_ROWS + CNTR_NAME_TS_14_NUM_INPUT_ROWS - CNTR_NAME_TS_144_NUM_OUTPUT_ROWS + CNTR_NAME_TS_14_NUM_OUTPUT_ROWS - CNTR_NAME_TS_144_TIME_TAKEN + CNTR_NAME_TS_14_TIME_TAKEN - CNTR_NAME_TS_144_FATAL_ERROR + CNTR_NAME_TS_14_FATAL_ERROR - TS_144 + TS_14 @@ -1032,10 +1032,10 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1912189347/10007 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/956562171/10007 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1912189347/10007 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/956562171/10007 @@ -1044,7 +1044,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1912189347/10007 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/956562171/10007 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1077,7 +1077,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1331279008/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1808739356/10002 @@ -1126,7 +1126,7 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/dest2 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/dest2 file.outputformat @@ -1134,7 +1134,7 @@ transient_lastDdlTime - 1262739174 + 1263415277 @@ -1148,21 +1148,21 @@ - CNTR_NAME_FS_147_NUM_INPUT_ROWS + CNTR_NAME_FS_17_NUM_INPUT_ROWS - CNTR_NAME_FS_147_NUM_OUTPUT_ROWS + CNTR_NAME_FS_17_NUM_OUTPUT_ROWS - CNTR_NAME_FS_147_TIME_TAKEN + CNTR_NAME_FS_17_TIME_TAKEN - CNTR_NAME_FS_147_FATAL_ERROR + CNTR_NAME_FS_17_FATAL_ERROR - FS_147 + FS_17 @@ -1198,21 +1198,21 @@ - CNTR_NAME_OP_146_NUM_INPUT_ROWS + CNTR_NAME_OP_16_NUM_INPUT_ROWS - CNTR_NAME_OP_146_NUM_OUTPUT_ROWS + CNTR_NAME_OP_16_NUM_OUTPUT_ROWS - CNTR_NAME_OP_146_TIME_TAKEN + CNTR_NAME_OP_16_TIME_TAKEN - CNTR_NAME_OP_146_FATAL_ERROR + CNTR_NAME_OP_16_FATAL_ERROR - OP_146 + OP_16 @@ -1270,7 +1270,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1912189347/10007 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/956562171/10007 @@ -1329,7 +1329,7 @@ true - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1331279008/10004 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1808739356/10004 @@ -1382,11 +1382,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/dest3 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/dest3 transient_lastDdlTime - 1262739174 + 1263415277 @@ -1396,7 +1396,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1331279008/10005 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1808739356/10005 @@ -1424,10 +1424,10 @@ true - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1912189347/10008 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/956562171/10008 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1331279008/10004 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1808739356/10004 @@ -1445,7 +1445,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1912189347/10008 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/956562171/10008 @@ -1592,21 +1592,21 @@ - CNTR_NAME_RS_149_NUM_INPUT_ROWS + CNTR_NAME_RS_19_NUM_INPUT_ROWS - CNTR_NAME_RS_149_NUM_OUTPUT_ROWS + CNTR_NAME_RS_19_NUM_OUTPUT_ROWS - CNTR_NAME_RS_149_TIME_TAKEN + CNTR_NAME_RS_19_TIME_TAKEN - CNTR_NAME_RS_149_FATAL_ERROR + CNTR_NAME_RS_19_FATAL_ERROR - RS_149 + RS_19 @@ -1650,21 +1650,21 @@ - CNTR_NAME_TS_148_NUM_INPUT_ROWS + CNTR_NAME_TS_18_NUM_INPUT_ROWS - CNTR_NAME_TS_148_NUM_OUTPUT_ROWS + CNTR_NAME_TS_18_NUM_OUTPUT_ROWS - CNTR_NAME_TS_148_TIME_TAKEN + CNTR_NAME_TS_18_TIME_TAKEN - CNTR_NAME_TS_148_FATAL_ERROR + CNTR_NAME_TS_18_FATAL_ERROR - TS_148 + TS_18 @@ -1682,10 +1682,10 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1912189347/10008 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/956562171/10008 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1912189347/10008 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/956562171/10008 @@ -1694,7 +1694,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1912189347/10008 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/956562171/10008 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1727,7 +1727,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1331279008/10004 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1808739356/10004 @@ -1780,7 +1780,7 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/dest3 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/dest3 file.outputformat @@ -1788,7 +1788,7 @@ transient_lastDdlTime - 1262739174 + 1263415277 @@ -1802,21 +1802,21 @@ - CNTR_NAME_FS_151_NUM_INPUT_ROWS + CNTR_NAME_FS_21_NUM_INPUT_ROWS - CNTR_NAME_FS_151_NUM_OUTPUT_ROWS + CNTR_NAME_FS_21_NUM_OUTPUT_ROWS - CNTR_NAME_FS_151_TIME_TAKEN + CNTR_NAME_FS_21_TIME_TAKEN - CNTR_NAME_FS_151_FATAL_ERROR + CNTR_NAME_FS_21_FATAL_ERROR - FS_151 + FS_21 @@ -1852,21 +1852,21 @@ - CNTR_NAME_OP_150_NUM_INPUT_ROWS + CNTR_NAME_OP_20_NUM_INPUT_ROWS - CNTR_NAME_OP_150_NUM_OUTPUT_ROWS + CNTR_NAME_OP_20_NUM_OUTPUT_ROWS - CNTR_NAME_OP_150_TIME_TAKEN + CNTR_NAME_OP_20_TIME_TAKEN - CNTR_NAME_OP_150_FATAL_ERROR + CNTR_NAME_OP_20_FATAL_ERROR - OP_150 + OP_20 @@ -1928,7 +1928,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1912189347/10008 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/956562171/10008 @@ -2014,11 +2014,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1262739173 + 1263415277 @@ -2070,7 +2070,7 @@ 1 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1912189347/10006 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/956562171/10006 @@ -2080,21 +2080,21 @@ - CNTR_NAME_FS_133_NUM_INPUT_ROWS + CNTR_NAME_FS_3_NUM_INPUT_ROWS - CNTR_NAME_FS_133_NUM_OUTPUT_ROWS + CNTR_NAME_FS_3_NUM_OUTPUT_ROWS - CNTR_NAME_FS_133_TIME_TAKEN + CNTR_NAME_FS_3_TIME_TAKEN - CNTR_NAME_FS_133_FATAL_ERROR + CNTR_NAME_FS_3_FATAL_ERROR - FS_133 + FS_3 @@ -2172,21 +2172,21 @@ - CNTR_NAME_SEL_132_NUM_INPUT_ROWS + CNTR_NAME_SEL_2_NUM_INPUT_ROWS - CNTR_NAME_SEL_132_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_132_TIME_TAKEN + CNTR_NAME_SEL_2_TIME_TAKEN - CNTR_NAME_SEL_132_FATAL_ERROR + CNTR_NAME_SEL_2_FATAL_ERROR - SEL_132 + SEL_2 @@ -2285,21 +2285,21 @@ - CNTR_NAME_FIL_131_NUM_INPUT_ROWS + CNTR_NAME_FIL_1_NUM_INPUT_ROWS - CNTR_NAME_FIL_131_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_1_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_131_TIME_TAKEN + CNTR_NAME_FIL_1_TIME_TAKEN - CNTR_NAME_FIL_131_FATAL_ERROR + CNTR_NAME_FIL_1_FATAL_ERROR - FIL_131 + FIL_1 @@ -2354,7 +2354,7 @@ 2 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1912189347/10007 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/956562171/10007 @@ -2364,21 +2364,21 @@ - CNTR_NAME_FS_136_NUM_INPUT_ROWS + CNTR_NAME_FS_6_NUM_INPUT_ROWS - CNTR_NAME_FS_136_NUM_OUTPUT_ROWS + CNTR_NAME_FS_6_NUM_OUTPUT_ROWS - CNTR_NAME_FS_136_TIME_TAKEN + CNTR_NAME_FS_6_TIME_TAKEN - CNTR_NAME_FS_136_FATAL_ERROR + CNTR_NAME_FS_6_FATAL_ERROR - FS_136 + FS_6 @@ -2453,21 +2453,21 @@ - CNTR_NAME_SEL_135_NUM_INPUT_ROWS + CNTR_NAME_SEL_5_NUM_INPUT_ROWS - CNTR_NAME_SEL_135_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_5_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_135_TIME_TAKEN + CNTR_NAME_SEL_5_TIME_TAKEN - CNTR_NAME_SEL_135_FATAL_ERROR + CNTR_NAME_SEL_5_FATAL_ERROR - SEL_135 + SEL_5 @@ -2633,21 +2633,21 @@ - CNTR_NAME_FIL_134_NUM_INPUT_ROWS + CNTR_NAME_FIL_4_NUM_INPUT_ROWS - CNTR_NAME_FIL_134_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_4_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_134_TIME_TAKEN + CNTR_NAME_FIL_4_TIME_TAKEN - CNTR_NAME_FIL_134_FATAL_ERROR + CNTR_NAME_FIL_4_FATAL_ERROR - FIL_134 + FIL_4 @@ -2681,7 +2681,7 @@ 3 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1912189347/10008 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/956562171/10008 @@ -2691,21 +2691,21 @@ - CNTR_NAME_FS_139_NUM_INPUT_ROWS + CNTR_NAME_FS_9_NUM_INPUT_ROWS - CNTR_NAME_FS_139_NUM_OUTPUT_ROWS + CNTR_NAME_FS_9_NUM_OUTPUT_ROWS - CNTR_NAME_FS_139_TIME_TAKEN + CNTR_NAME_FS_9_TIME_TAKEN - CNTR_NAME_FS_139_FATAL_ERROR + CNTR_NAME_FS_9_FATAL_ERROR - FS_139 + FS_9 @@ -2777,21 +2777,21 @@ - CNTR_NAME_SEL_138_NUM_INPUT_ROWS + CNTR_NAME_SEL_8_NUM_INPUT_ROWS - CNTR_NAME_SEL_138_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_8_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_138_TIME_TAKEN + CNTR_NAME_SEL_8_TIME_TAKEN - CNTR_NAME_SEL_138_FATAL_ERROR + CNTR_NAME_SEL_8_FATAL_ERROR - SEL_138 + SEL_8 @@ -2886,21 +2886,21 @@ - CNTR_NAME_FIL_137_NUM_INPUT_ROWS + CNTR_NAME_FIL_7_NUM_INPUT_ROWS - CNTR_NAME_FIL_137_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_7_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_137_TIME_TAKEN + CNTR_NAME_FIL_7_TIME_TAKEN - CNTR_NAME_FIL_137_FATAL_ERROR + CNTR_NAME_FIL_7_FATAL_ERROR - FIL_137 + FIL_7 @@ -2930,16 +2930,16 @@ - CNTR_NAME_TS_130_NUM_INPUT_ROWS + CNTR_NAME_TS_0_NUM_INPUT_ROWS - CNTR_NAME_TS_130_NUM_OUTPUT_ROWS + CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - CNTR_NAME_TS_130_TIME_TAKEN + CNTR_NAME_TS_0_TIME_TAKEN - CNTR_NAME_TS_130_FATAL_ERROR + CNTR_NAME_TS_0_FATAL_ERROR @@ -2954,7 +2954,7 @@ - TS_130 + TS_0 @@ -2970,7 +2970,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src src @@ -2982,7 +2982,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Index: ql/src/test/results/compiler/plan/join3.q.xml =================================================================== --- ql/src/test/results/compiler/plan/join3.q.xml (revision 4584) +++ ql/src/test/results/compiler/plan/join3.q.xml (working copy) @@ -1,5 +1,5 @@ - + @@ -26,7 +26,7 @@ true - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/62277540/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1602754882/10000 @@ -79,11 +79,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1262739219 + 1263415318 @@ -93,7 +93,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/62277540/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1602754882/10001 @@ -164,11 +164,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1262739219 + 1263415318 @@ -401,21 +401,21 @@ - CNTR_NAME_RS_418_NUM_INPUT_ROWS + CNTR_NAME_RS_4_NUM_INPUT_ROWS - CNTR_NAME_RS_418_NUM_OUTPUT_ROWS + CNTR_NAME_RS_4_NUM_OUTPUT_ROWS - CNTR_NAME_RS_418_TIME_TAKEN + CNTR_NAME_RS_4_TIME_TAKEN - CNTR_NAME_RS_418_FATAL_ERROR + CNTR_NAME_RS_4_FATAL_ERROR - RS_418 + RS_4 @@ -445,16 +445,16 @@ - CNTR_NAME_TS_414_NUM_INPUT_ROWS + CNTR_NAME_TS_0_NUM_INPUT_ROWS - CNTR_NAME_TS_414_NUM_OUTPUT_ROWS + CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - CNTR_NAME_TS_414_TIME_TAKEN + CNTR_NAME_TS_0_TIME_TAKEN - CNTR_NAME_TS_414_FATAL_ERROR + CNTR_NAME_TS_0_FATAL_ERROR @@ -466,7 +466,7 @@ - TS_414 + TS_0 @@ -635,21 +635,21 @@ - CNTR_NAME_RS_419_NUM_INPUT_ROWS + CNTR_NAME_RS_5_NUM_INPUT_ROWS - CNTR_NAME_RS_419_NUM_OUTPUT_ROWS + CNTR_NAME_RS_5_NUM_OUTPUT_ROWS - CNTR_NAME_RS_419_TIME_TAKEN + CNTR_NAME_RS_5_TIME_TAKEN - CNTR_NAME_RS_419_FATAL_ERROR + CNTR_NAME_RS_5_FATAL_ERROR - RS_419 + RS_5 @@ -690,16 +690,16 @@ - CNTR_NAME_TS_415_NUM_INPUT_ROWS + CNTR_NAME_TS_1_NUM_INPUT_ROWS - CNTR_NAME_TS_415_NUM_OUTPUT_ROWS + CNTR_NAME_TS_1_NUM_OUTPUT_ROWS - CNTR_NAME_TS_415_TIME_TAKEN + CNTR_NAME_TS_1_TIME_TAKEN - CNTR_NAME_TS_415_FATAL_ERROR + CNTR_NAME_TS_1_FATAL_ERROR @@ -714,7 +714,7 @@ - TS_415 + TS_1 @@ -880,21 +880,21 @@ - CNTR_NAME_RS_417_NUM_INPUT_ROWS + CNTR_NAME_RS_3_NUM_INPUT_ROWS - CNTR_NAME_RS_417_NUM_OUTPUT_ROWS + CNTR_NAME_RS_3_NUM_OUTPUT_ROWS - CNTR_NAME_RS_417_TIME_TAKEN + CNTR_NAME_RS_3_TIME_TAKEN - CNTR_NAME_RS_417_FATAL_ERROR + CNTR_NAME_RS_3_FATAL_ERROR - RS_417 + RS_3 @@ -935,16 +935,16 @@ - CNTR_NAME_TS_416_NUM_INPUT_ROWS + CNTR_NAME_TS_2_NUM_INPUT_ROWS - CNTR_NAME_TS_416_NUM_OUTPUT_ROWS + CNTR_NAME_TS_2_NUM_OUTPUT_ROWS - CNTR_NAME_TS_416_TIME_TAKEN + CNTR_NAME_TS_2_TIME_TAKEN - CNTR_NAME_TS_416_FATAL_ERROR + CNTR_NAME_TS_2_FATAL_ERROR @@ -956,7 +956,7 @@ - TS_416 + TS_2 @@ -1002,7 +1002,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src src2 @@ -1020,7 +1020,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1079,7 +1079,7 @@ 1 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/62277540/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1602754882/10000 @@ -1089,21 +1089,21 @@ - CNTR_NAME_FS_422_NUM_INPUT_ROWS + CNTR_NAME_FS_8_NUM_INPUT_ROWS - CNTR_NAME_FS_422_NUM_OUTPUT_ROWS + CNTR_NAME_FS_8_NUM_OUTPUT_ROWS - CNTR_NAME_FS_422_TIME_TAKEN + CNTR_NAME_FS_8_TIME_TAKEN - CNTR_NAME_FS_422_FATAL_ERROR + CNTR_NAME_FS_8_FATAL_ERROR - FS_422 + FS_8 @@ -1203,21 +1203,21 @@ - CNTR_NAME_SEL_421_NUM_INPUT_ROWS + CNTR_NAME_SEL_7_NUM_INPUT_ROWS - CNTR_NAME_SEL_421_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_7_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_421_TIME_TAKEN + CNTR_NAME_SEL_7_TIME_TAKEN - CNTR_NAME_SEL_421_FATAL_ERROR + CNTR_NAME_SEL_7_FATAL_ERROR - SEL_421 + SEL_7 @@ -1481,21 +1481,21 @@ - CNTR_NAME_JOIN_420_NUM_INPUT_ROWS + CNTR_NAME_JOIN_6_NUM_INPUT_ROWS - CNTR_NAME_JOIN_420_NUM_OUTPUT_ROWS + CNTR_NAME_JOIN_6_NUM_OUTPUT_ROWS - CNTR_NAME_JOIN_420_TIME_TAKEN + CNTR_NAME_JOIN_6_TIME_TAKEN - CNTR_NAME_JOIN_420_FATAL_ERROR + CNTR_NAME_JOIN_6_FATAL_ERROR - JOIN_420 + JOIN_6 Index: ql/src/test/results/compiler/plan/input3.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input3.q.xml (revision 4584) +++ ql/src/test/results/compiler/plan/input3.q.xml (working copy) @@ -1,5 +1,5 @@ - + @@ -30,7 +30,7 @@ true - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1640897559/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1715963370/10000 @@ -83,11 +83,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1262739180 + 1263415283 @@ -97,7 +97,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1640897559/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1715963370/10001 @@ -125,10 +125,10 @@ true - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/797933420/10007 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/730601114/10007 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1640897559/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1715963370/10000 @@ -146,7 +146,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/797933420/10007 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/730601114/10007 @@ -301,21 +301,21 @@ - CNTR_NAME_RS_204_NUM_INPUT_ROWS + CNTR_NAME_RS_14_NUM_INPUT_ROWS - CNTR_NAME_RS_204_NUM_OUTPUT_ROWS + CNTR_NAME_RS_14_NUM_OUTPUT_ROWS - CNTR_NAME_RS_204_TIME_TAKEN + CNTR_NAME_RS_14_TIME_TAKEN - CNTR_NAME_RS_204_FATAL_ERROR + CNTR_NAME_RS_14_FATAL_ERROR - RS_204 + RS_14 @@ -359,21 +359,21 @@ - CNTR_NAME_TS_203_NUM_INPUT_ROWS + CNTR_NAME_TS_13_NUM_INPUT_ROWS - CNTR_NAME_TS_203_NUM_OUTPUT_ROWS + CNTR_NAME_TS_13_NUM_OUTPUT_ROWS - CNTR_NAME_TS_203_TIME_TAKEN + CNTR_NAME_TS_13_TIME_TAKEN - CNTR_NAME_TS_203_FATAL_ERROR + CNTR_NAME_TS_13_FATAL_ERROR - TS_203 + TS_13 @@ -391,10 +391,10 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/797933420/10007 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/730601114/10007 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/797933420/10007 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/730601114/10007 @@ -403,7 +403,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/797933420/10007 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/730601114/10007 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -436,7 +436,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1640897559/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1715963370/10000 @@ -485,7 +485,7 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/dest1 file.outputformat @@ -493,7 +493,7 @@ transient_lastDdlTime - 1262739180 + 1263415283 @@ -507,21 +507,21 @@ - CNTR_NAME_FS_206_NUM_INPUT_ROWS + CNTR_NAME_FS_16_NUM_INPUT_ROWS - CNTR_NAME_FS_206_NUM_OUTPUT_ROWS + CNTR_NAME_FS_16_NUM_OUTPUT_ROWS - CNTR_NAME_FS_206_TIME_TAKEN + CNTR_NAME_FS_16_TIME_TAKEN - CNTR_NAME_FS_206_FATAL_ERROR + CNTR_NAME_FS_16_FATAL_ERROR - FS_206 + FS_16 @@ -557,21 +557,21 @@ - CNTR_NAME_OP_205_NUM_INPUT_ROWS + CNTR_NAME_OP_15_NUM_INPUT_ROWS - CNTR_NAME_OP_205_NUM_OUTPUT_ROWS + CNTR_NAME_OP_15_NUM_OUTPUT_ROWS - CNTR_NAME_OP_205_TIME_TAKEN + CNTR_NAME_OP_15_TIME_TAKEN - CNTR_NAME_OP_205_FATAL_ERROR + CNTR_NAME_OP_15_FATAL_ERROR - OP_205 + OP_15 @@ -629,7 +629,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/797933420/10007 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/730601114/10007 @@ -679,7 +679,7 @@ true - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1640897559/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1715963370/10002 @@ -732,11 +732,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/dest2 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/dest2 transient_lastDdlTime - 1262739180 + 1263415283 @@ -746,7 +746,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1640897559/10003 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1715963370/10003 @@ -774,10 +774,10 @@ true - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/797933420/10008 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/730601114/10008 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1640897559/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1715963370/10002 @@ -795,7 +795,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/797933420/10008 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/730601114/10008 @@ -942,21 +942,21 @@ - CNTR_NAME_RS_208_NUM_INPUT_ROWS + CNTR_NAME_RS_18_NUM_INPUT_ROWS - CNTR_NAME_RS_208_NUM_OUTPUT_ROWS + CNTR_NAME_RS_18_NUM_OUTPUT_ROWS - CNTR_NAME_RS_208_TIME_TAKEN + CNTR_NAME_RS_18_TIME_TAKEN - CNTR_NAME_RS_208_FATAL_ERROR + CNTR_NAME_RS_18_FATAL_ERROR - RS_208 + RS_18 @@ -1000,21 +1000,21 @@ - CNTR_NAME_TS_207_NUM_INPUT_ROWS + CNTR_NAME_TS_17_NUM_INPUT_ROWS - CNTR_NAME_TS_207_NUM_OUTPUT_ROWS + CNTR_NAME_TS_17_NUM_OUTPUT_ROWS - CNTR_NAME_TS_207_TIME_TAKEN + CNTR_NAME_TS_17_TIME_TAKEN - CNTR_NAME_TS_207_FATAL_ERROR + CNTR_NAME_TS_17_FATAL_ERROR - TS_207 + TS_17 @@ -1032,10 +1032,10 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/797933420/10008 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/730601114/10008 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/797933420/10008 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/730601114/10008 @@ -1044,7 +1044,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/797933420/10008 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/730601114/10008 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1077,7 +1077,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1640897559/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1715963370/10002 @@ -1126,7 +1126,7 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/dest2 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/dest2 file.outputformat @@ -1134,7 +1134,7 @@ transient_lastDdlTime - 1262739180 + 1263415283 @@ -1148,21 +1148,21 @@ - CNTR_NAME_FS_210_NUM_INPUT_ROWS + CNTR_NAME_FS_20_NUM_INPUT_ROWS - CNTR_NAME_FS_210_NUM_OUTPUT_ROWS + CNTR_NAME_FS_20_NUM_OUTPUT_ROWS - CNTR_NAME_FS_210_TIME_TAKEN + CNTR_NAME_FS_20_TIME_TAKEN - CNTR_NAME_FS_210_FATAL_ERROR + CNTR_NAME_FS_20_FATAL_ERROR - FS_210 + FS_20 @@ -1198,21 +1198,21 @@ - CNTR_NAME_OP_209_NUM_INPUT_ROWS + CNTR_NAME_OP_19_NUM_INPUT_ROWS - CNTR_NAME_OP_209_NUM_OUTPUT_ROWS + CNTR_NAME_OP_19_NUM_OUTPUT_ROWS - CNTR_NAME_OP_209_TIME_TAKEN + CNTR_NAME_OP_19_TIME_TAKEN - CNTR_NAME_OP_209_FATAL_ERROR + CNTR_NAME_OP_19_FATAL_ERROR - OP_209 + OP_19 @@ -1270,7 +1270,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/797933420/10008 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/730601114/10008 @@ -1329,7 +1329,7 @@ true - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1640897559/10004 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1715963370/10004 @@ -1382,11 +1382,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/dest3 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/dest3 transient_lastDdlTime - 1262739180 + 1263415283 @@ -1396,7 +1396,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1640897559/10005 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1715963370/10005 @@ -1424,10 +1424,10 @@ true - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/797933420/10009 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/730601114/10009 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1640897559/10004 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1715963370/10004 @@ -1445,7 +1445,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/797933420/10009 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/730601114/10009 @@ -1592,21 +1592,21 @@ - CNTR_NAME_RS_212_NUM_INPUT_ROWS + CNTR_NAME_RS_22_NUM_INPUT_ROWS - CNTR_NAME_RS_212_NUM_OUTPUT_ROWS + CNTR_NAME_RS_22_NUM_OUTPUT_ROWS - CNTR_NAME_RS_212_TIME_TAKEN + CNTR_NAME_RS_22_TIME_TAKEN - CNTR_NAME_RS_212_FATAL_ERROR + CNTR_NAME_RS_22_FATAL_ERROR - RS_212 + RS_22 @@ -1650,21 +1650,21 @@ - CNTR_NAME_TS_211_NUM_INPUT_ROWS + CNTR_NAME_TS_21_NUM_INPUT_ROWS - CNTR_NAME_TS_211_NUM_OUTPUT_ROWS + CNTR_NAME_TS_21_NUM_OUTPUT_ROWS - CNTR_NAME_TS_211_TIME_TAKEN + CNTR_NAME_TS_21_TIME_TAKEN - CNTR_NAME_TS_211_FATAL_ERROR + CNTR_NAME_TS_21_FATAL_ERROR - TS_211 + TS_21 @@ -1682,10 +1682,10 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/797933420/10009 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/730601114/10009 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/797933420/10009 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/730601114/10009 @@ -1694,7 +1694,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/797933420/10009 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/730601114/10009 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1727,7 +1727,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1640897559/10004 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1715963370/10004 @@ -1780,7 +1780,7 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/dest3 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/dest3 file.outputformat @@ -1788,7 +1788,7 @@ transient_lastDdlTime - 1262739180 + 1263415283 @@ -1802,21 +1802,21 @@ - CNTR_NAME_FS_214_NUM_INPUT_ROWS + CNTR_NAME_FS_24_NUM_INPUT_ROWS - CNTR_NAME_FS_214_NUM_OUTPUT_ROWS + CNTR_NAME_FS_24_NUM_OUTPUT_ROWS - CNTR_NAME_FS_214_TIME_TAKEN + CNTR_NAME_FS_24_TIME_TAKEN - CNTR_NAME_FS_214_FATAL_ERROR + CNTR_NAME_FS_24_FATAL_ERROR - FS_214 + FS_24 @@ -1852,21 +1852,21 @@ - CNTR_NAME_OP_213_NUM_INPUT_ROWS + CNTR_NAME_OP_23_NUM_INPUT_ROWS - CNTR_NAME_OP_213_NUM_OUTPUT_ROWS + CNTR_NAME_OP_23_NUM_OUTPUT_ROWS - CNTR_NAME_OP_213_TIME_TAKEN + CNTR_NAME_OP_23_TIME_TAKEN - CNTR_NAME_OP_213_FATAL_ERROR + CNTR_NAME_OP_23_FATAL_ERROR - OP_213 + OP_23 @@ -1928,7 +1928,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/797933420/10009 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/730601114/10009 @@ -1981,7 +1981,7 @@ true - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1640897559/10006 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1715963370/10006 ../../../../build/contrib/hive/ql/test/data/warehouse/dest4.out @@ -2012,10 +2012,10 @@ true - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/797933420/10010 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/730601114/10010 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1640897559/10006 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1715963370/10006 @@ -2033,7 +2033,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/797933420/10010 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/730601114/10010 @@ -2164,21 +2164,21 @@ - CNTR_NAME_RS_216_NUM_INPUT_ROWS + CNTR_NAME_RS_26_NUM_INPUT_ROWS - CNTR_NAME_RS_216_NUM_OUTPUT_ROWS + CNTR_NAME_RS_26_NUM_OUTPUT_ROWS - CNTR_NAME_RS_216_TIME_TAKEN + CNTR_NAME_RS_26_TIME_TAKEN - CNTR_NAME_RS_216_FATAL_ERROR + CNTR_NAME_RS_26_FATAL_ERROR - RS_216 + RS_26 @@ -2212,21 +2212,21 @@ - CNTR_NAME_TS_215_NUM_INPUT_ROWS + CNTR_NAME_TS_25_NUM_INPUT_ROWS - CNTR_NAME_TS_215_NUM_OUTPUT_ROWS + CNTR_NAME_TS_25_NUM_OUTPUT_ROWS - CNTR_NAME_TS_215_TIME_TAKEN + CNTR_NAME_TS_25_TIME_TAKEN - CNTR_NAME_TS_215_FATAL_ERROR + CNTR_NAME_TS_25_FATAL_ERROR - TS_215 + TS_25 @@ -2244,10 +2244,10 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/797933420/10010 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/730601114/10010 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/797933420/10010 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/730601114/10010 @@ -2256,7 +2256,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/797933420/10010 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/730601114/10010 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -2312,7 +2312,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1640897559/10006 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1715963370/10006 @@ -2348,21 +2348,21 @@ - CNTR_NAME_FS_218_NUM_INPUT_ROWS + CNTR_NAME_FS_28_NUM_INPUT_ROWS - CNTR_NAME_FS_218_NUM_OUTPUT_ROWS + CNTR_NAME_FS_28_NUM_OUTPUT_ROWS - CNTR_NAME_FS_218_TIME_TAKEN + CNTR_NAME_FS_28_TIME_TAKEN - CNTR_NAME_FS_218_FATAL_ERROR + CNTR_NAME_FS_28_FATAL_ERROR - FS_218 + FS_28 @@ -2398,21 +2398,21 @@ - CNTR_NAME_OP_217_NUM_INPUT_ROWS + CNTR_NAME_OP_27_NUM_INPUT_ROWS - CNTR_NAME_OP_217_NUM_OUTPUT_ROWS + CNTR_NAME_OP_27_NUM_OUTPUT_ROWS - CNTR_NAME_OP_217_TIME_TAKEN + CNTR_NAME_OP_27_TIME_TAKEN - CNTR_NAME_OP_217_FATAL_ERROR + CNTR_NAME_OP_27_FATAL_ERROR - OP_217 + OP_27 @@ -2460,7 +2460,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/797933420/10010 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/730601114/10010 @@ -2546,11 +2546,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1262739179 + 1263415283 @@ -2602,7 +2602,7 @@ 1 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/797933420/10007 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/730601114/10007 @@ -2612,21 +2612,21 @@ - CNTR_NAME_FS_193_NUM_INPUT_ROWS + CNTR_NAME_FS_3_NUM_INPUT_ROWS - CNTR_NAME_FS_193_NUM_OUTPUT_ROWS + CNTR_NAME_FS_3_NUM_OUTPUT_ROWS - CNTR_NAME_FS_193_TIME_TAKEN + CNTR_NAME_FS_3_TIME_TAKEN - CNTR_NAME_FS_193_FATAL_ERROR + CNTR_NAME_FS_3_FATAL_ERROR - FS_193 + FS_3 @@ -2704,21 +2704,21 @@ - CNTR_NAME_SEL_192_NUM_INPUT_ROWS + CNTR_NAME_SEL_2_NUM_INPUT_ROWS - CNTR_NAME_SEL_192_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_192_TIME_TAKEN + CNTR_NAME_SEL_2_TIME_TAKEN - CNTR_NAME_SEL_192_FATAL_ERROR + CNTR_NAME_SEL_2_FATAL_ERROR - SEL_192 + SEL_2 @@ -2817,21 +2817,21 @@ - CNTR_NAME_FIL_191_NUM_INPUT_ROWS + CNTR_NAME_FIL_1_NUM_INPUT_ROWS - CNTR_NAME_FIL_191_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_1_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_191_TIME_TAKEN + CNTR_NAME_FIL_1_TIME_TAKEN - CNTR_NAME_FIL_191_FATAL_ERROR + CNTR_NAME_FIL_1_FATAL_ERROR - FIL_191 + FIL_1 @@ -2886,7 +2886,7 @@ 2 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/797933420/10008 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/730601114/10008 @@ -2896,21 +2896,21 @@ - CNTR_NAME_FS_196_NUM_INPUT_ROWS + CNTR_NAME_FS_6_NUM_INPUT_ROWS - CNTR_NAME_FS_196_NUM_OUTPUT_ROWS + CNTR_NAME_FS_6_NUM_OUTPUT_ROWS - CNTR_NAME_FS_196_TIME_TAKEN + CNTR_NAME_FS_6_TIME_TAKEN - CNTR_NAME_FS_196_FATAL_ERROR + CNTR_NAME_FS_6_FATAL_ERROR - FS_196 + FS_6 @@ -2985,21 +2985,21 @@ - CNTR_NAME_SEL_195_NUM_INPUT_ROWS + CNTR_NAME_SEL_5_NUM_INPUT_ROWS - CNTR_NAME_SEL_195_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_5_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_195_TIME_TAKEN + CNTR_NAME_SEL_5_TIME_TAKEN - CNTR_NAME_SEL_195_FATAL_ERROR + CNTR_NAME_SEL_5_FATAL_ERROR - SEL_195 + SEL_5 @@ -3165,21 +3165,21 @@ - CNTR_NAME_FIL_194_NUM_INPUT_ROWS + CNTR_NAME_FIL_4_NUM_INPUT_ROWS - CNTR_NAME_FIL_194_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_4_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_194_TIME_TAKEN + CNTR_NAME_FIL_4_TIME_TAKEN - CNTR_NAME_FIL_194_FATAL_ERROR + CNTR_NAME_FIL_4_FATAL_ERROR - FIL_194 + FIL_4 @@ -3213,7 +3213,7 @@ 3 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/797933420/10009 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/730601114/10009 @@ -3223,21 +3223,21 @@ - CNTR_NAME_FS_199_NUM_INPUT_ROWS + CNTR_NAME_FS_9_NUM_INPUT_ROWS - CNTR_NAME_FS_199_NUM_OUTPUT_ROWS + CNTR_NAME_FS_9_NUM_OUTPUT_ROWS - CNTR_NAME_FS_199_TIME_TAKEN + CNTR_NAME_FS_9_TIME_TAKEN - CNTR_NAME_FS_199_FATAL_ERROR + CNTR_NAME_FS_9_FATAL_ERROR - FS_199 + FS_9 @@ -3309,21 +3309,21 @@ - CNTR_NAME_SEL_198_NUM_INPUT_ROWS + CNTR_NAME_SEL_8_NUM_INPUT_ROWS - CNTR_NAME_SEL_198_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_8_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_198_TIME_TAKEN + CNTR_NAME_SEL_8_TIME_TAKEN - CNTR_NAME_SEL_198_FATAL_ERROR + CNTR_NAME_SEL_8_FATAL_ERROR - SEL_198 + SEL_8 @@ -3489,21 +3489,21 @@ - CNTR_NAME_FIL_197_NUM_INPUT_ROWS + CNTR_NAME_FIL_7_NUM_INPUT_ROWS - CNTR_NAME_FIL_197_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_7_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_197_TIME_TAKEN + CNTR_NAME_FIL_7_TIME_TAKEN - CNTR_NAME_FIL_197_FATAL_ERROR + CNTR_NAME_FIL_7_FATAL_ERROR - FIL_197 + FIL_7 @@ -3537,7 +3537,7 @@ 4 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/797933420/10010 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/730601114/10010 @@ -3547,21 +3547,21 @@ - CNTR_NAME_FS_202_NUM_INPUT_ROWS + CNTR_NAME_FS_12_NUM_INPUT_ROWS - CNTR_NAME_FS_202_NUM_OUTPUT_ROWS + CNTR_NAME_FS_12_NUM_OUTPUT_ROWS - CNTR_NAME_FS_202_TIME_TAKEN + CNTR_NAME_FS_12_TIME_TAKEN - CNTR_NAME_FS_202_FATAL_ERROR + CNTR_NAME_FS_12_FATAL_ERROR - FS_202 + FS_12 @@ -3616,21 +3616,21 @@ - CNTR_NAME_SEL_201_NUM_INPUT_ROWS + CNTR_NAME_SEL_11_NUM_INPUT_ROWS - CNTR_NAME_SEL_201_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_11_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_201_TIME_TAKEN + CNTR_NAME_SEL_11_TIME_TAKEN - CNTR_NAME_SEL_201_FATAL_ERROR + CNTR_NAME_SEL_11_FATAL_ERROR - SEL_201 + SEL_11 @@ -3718,21 +3718,21 @@ - CNTR_NAME_FIL_200_NUM_INPUT_ROWS + CNTR_NAME_FIL_10_NUM_INPUT_ROWS - CNTR_NAME_FIL_200_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_10_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_200_TIME_TAKEN + CNTR_NAME_FIL_10_TIME_TAKEN - CNTR_NAME_FIL_200_FATAL_ERROR + CNTR_NAME_FIL_10_FATAL_ERROR - FIL_200 + FIL_10 @@ -3762,16 +3762,16 @@ - CNTR_NAME_TS_190_NUM_INPUT_ROWS + CNTR_NAME_TS_0_NUM_INPUT_ROWS - CNTR_NAME_TS_190_NUM_OUTPUT_ROWS + CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - CNTR_NAME_TS_190_TIME_TAKEN + CNTR_NAME_TS_0_TIME_TAKEN - CNTR_NAME_TS_190_FATAL_ERROR + CNTR_NAME_TS_0_FATAL_ERROR @@ -3786,7 +3786,7 @@ - TS_190 + TS_0 @@ -3802,7 +3802,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src src @@ -3814,7 +3814,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Index: ql/src/test/results/compiler/plan/join4.q.xml =================================================================== --- ql/src/test/results/compiler/plan/join4.q.xml (revision 4584) +++ ql/src/test/results/compiler/plan/join4.q.xml (working copy) @@ -1,5 +1,5 @@ - + Stage-2 @@ -62,11 +62,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1262739221 + 1263415320 @@ -300,21 +300,21 @@ - CNTR_NAME_RS_438_NUM_INPUT_ROWS + CNTR_NAME_RS_6_NUM_INPUT_ROWS - CNTR_NAME_RS_438_NUM_OUTPUT_ROWS + CNTR_NAME_RS_6_NUM_OUTPUT_ROWS - CNTR_NAME_RS_438_TIME_TAKEN + CNTR_NAME_RS_6_TIME_TAKEN - CNTR_NAME_RS_438_FATAL_ERROR + CNTR_NAME_RS_6_FATAL_ERROR - RS_438 + RS_6 @@ -414,21 +414,21 @@ - CNTR_NAME_SEL_437_NUM_INPUT_ROWS + CNTR_NAME_SEL_5_NUM_INPUT_ROWS - CNTR_NAME_SEL_437_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_5_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_437_TIME_TAKEN + CNTR_NAME_SEL_5_TIME_TAKEN - CNTR_NAME_SEL_437_FATAL_ERROR + CNTR_NAME_SEL_5_FATAL_ERROR - SEL_437 + SEL_5 @@ -602,21 +602,21 @@ - CNTR_NAME_FIL_436_NUM_INPUT_ROWS + CNTR_NAME_FIL_4_NUM_INPUT_ROWS - CNTR_NAME_FIL_436_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_4_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_436_TIME_TAKEN + CNTR_NAME_FIL_4_TIME_TAKEN - CNTR_NAME_FIL_436_FATAL_ERROR + CNTR_NAME_FIL_4_FATAL_ERROR - FIL_436 + FIL_4 @@ -782,21 +782,21 @@ - CNTR_NAME_FIL_444_NUM_INPUT_ROWS + CNTR_NAME_FIL_12_NUM_INPUT_ROWS - CNTR_NAME_FIL_444_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_12_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_444_TIME_TAKEN + CNTR_NAME_FIL_12_TIME_TAKEN - CNTR_NAME_FIL_444_FATAL_ERROR + CNTR_NAME_FIL_12_FATAL_ERROR - FIL_444 + FIL_12 @@ -826,16 +826,16 @@ - CNTR_NAME_TS_435_NUM_INPUT_ROWS + CNTR_NAME_TS_3_NUM_INPUT_ROWS - CNTR_NAME_TS_435_NUM_OUTPUT_ROWS + CNTR_NAME_TS_3_NUM_OUTPUT_ROWS - CNTR_NAME_TS_435_TIME_TAKEN + CNTR_NAME_TS_3_TIME_TAKEN - CNTR_NAME_TS_435_FATAL_ERROR + CNTR_NAME_TS_3_FATAL_ERROR @@ -850,7 +850,7 @@ - TS_435 + TS_3 @@ -1021,21 +1021,21 @@ - CNTR_NAME_RS_439_NUM_INPUT_ROWS + CNTR_NAME_RS_7_NUM_INPUT_ROWS - CNTR_NAME_RS_439_NUM_OUTPUT_ROWS + CNTR_NAME_RS_7_NUM_OUTPUT_ROWS - CNTR_NAME_RS_439_TIME_TAKEN + CNTR_NAME_RS_7_TIME_TAKEN - CNTR_NAME_RS_439_FATAL_ERROR + CNTR_NAME_RS_7_FATAL_ERROR - RS_439 + RS_7 @@ -1135,21 +1135,21 @@ - CNTR_NAME_SEL_434_NUM_INPUT_ROWS + CNTR_NAME_SEL_2_NUM_INPUT_ROWS - CNTR_NAME_SEL_434_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_434_TIME_TAKEN + CNTR_NAME_SEL_2_TIME_TAKEN - CNTR_NAME_SEL_434_FATAL_ERROR + CNTR_NAME_SEL_2_FATAL_ERROR - SEL_434 + SEL_2 @@ -1315,21 +1315,21 @@ - CNTR_NAME_FIL_433_NUM_INPUT_ROWS + CNTR_NAME_FIL_1_NUM_INPUT_ROWS - CNTR_NAME_FIL_433_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_1_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_433_TIME_TAKEN + CNTR_NAME_FIL_1_TIME_TAKEN - CNTR_NAME_FIL_433_FATAL_ERROR + CNTR_NAME_FIL_1_FATAL_ERROR - FIL_433 + FIL_1 @@ -1495,21 +1495,21 @@ - CNTR_NAME_FIL_445_NUM_INPUT_ROWS + CNTR_NAME_FIL_13_NUM_INPUT_ROWS - CNTR_NAME_FIL_445_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_13_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_445_TIME_TAKEN + CNTR_NAME_FIL_13_TIME_TAKEN - CNTR_NAME_FIL_445_FATAL_ERROR + CNTR_NAME_FIL_13_FATAL_ERROR - FIL_445 + FIL_13 @@ -1539,16 +1539,16 @@ - CNTR_NAME_TS_432_NUM_INPUT_ROWS + CNTR_NAME_TS_0_NUM_INPUT_ROWS - CNTR_NAME_TS_432_NUM_OUTPUT_ROWS + CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - CNTR_NAME_TS_432_TIME_TAKEN + CNTR_NAME_TS_0_TIME_TAKEN - CNTR_NAME_TS_432_FATAL_ERROR + CNTR_NAME_TS_0_FATAL_ERROR @@ -1563,7 +1563,7 @@ - TS_432 + TS_0 @@ -1588,7 +1588,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src c:a:src1 @@ -1603,7 +1603,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1663,7 +1663,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1491820269/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/223908391/10001 @@ -1699,21 +1699,21 @@ - CNTR_NAME_FS_443_NUM_INPUT_ROWS + CNTR_NAME_FS_11_NUM_INPUT_ROWS - CNTR_NAME_FS_443_NUM_OUTPUT_ROWS + CNTR_NAME_FS_11_NUM_OUTPUT_ROWS - CNTR_NAME_FS_443_TIME_TAKEN + CNTR_NAME_FS_11_TIME_TAKEN - CNTR_NAME_FS_443_FATAL_ERROR + CNTR_NAME_FS_11_FATAL_ERROR - FS_443 + FS_11 @@ -1861,21 +1861,21 @@ - CNTR_NAME_SEL_442_NUM_INPUT_ROWS + CNTR_NAME_SEL_10_NUM_INPUT_ROWS - CNTR_NAME_SEL_442_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_10_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_442_TIME_TAKEN + CNTR_NAME_SEL_10_TIME_TAKEN - CNTR_NAME_SEL_442_FATAL_ERROR + CNTR_NAME_SEL_10_FATAL_ERROR - SEL_442 + SEL_10 @@ -2047,21 +2047,21 @@ - CNTR_NAME_SEL_441_NUM_INPUT_ROWS + CNTR_NAME_SEL_9_NUM_INPUT_ROWS - CNTR_NAME_SEL_441_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_9_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_441_TIME_TAKEN + CNTR_NAME_SEL_9_TIME_TAKEN - CNTR_NAME_SEL_441_FATAL_ERROR + CNTR_NAME_SEL_9_FATAL_ERROR - SEL_441 + SEL_9 @@ -2337,21 +2337,21 @@ - CNTR_NAME_JOIN_440_NUM_INPUT_ROWS + CNTR_NAME_JOIN_8_NUM_INPUT_ROWS - CNTR_NAME_JOIN_440_NUM_OUTPUT_ROWS + CNTR_NAME_JOIN_8_NUM_OUTPUT_ROWS - CNTR_NAME_JOIN_440_TIME_TAKEN + CNTR_NAME_JOIN_8_TIME_TAKEN - CNTR_NAME_JOIN_440_FATAL_ERROR + CNTR_NAME_JOIN_8_FATAL_ERROR - JOIN_440 + JOIN_8 Index: ql/src/test/results/compiler/plan/input4.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input4.q.xml (revision 4584) +++ ql/src/test/results/compiler/plan/input4.q.xml (working copy) @@ -1,5 +1,5 @@ - + @@ -26,7 +26,7 @@ true - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/774205575/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/645336633/10000 @@ -79,11 +79,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1262739184 + 1263415286 @@ -93,7 +93,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/774205575/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/645336633/10001 @@ -164,11 +164,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1262739183 + 1263415286 @@ -370,21 +370,21 @@ - CNTR_NAME_RS_251_NUM_INPUT_ROWS + CNTR_NAME_RS_3_NUM_INPUT_ROWS - CNTR_NAME_RS_251_NUM_OUTPUT_ROWS + CNTR_NAME_RS_3_NUM_OUTPUT_ROWS - CNTR_NAME_RS_251_TIME_TAKEN + CNTR_NAME_RS_3_TIME_TAKEN - CNTR_NAME_RS_251_FATAL_ERROR + CNTR_NAME_RS_3_FATAL_ERROR - RS_251 + RS_3 @@ -517,21 +517,21 @@ - CNTR_NAME_SCR_250_NUM_INPUT_ROWS + CNTR_NAME_SCR_2_NUM_INPUT_ROWS - CNTR_NAME_SCR_250_NUM_OUTPUT_ROWS + CNTR_NAME_SCR_2_NUM_OUTPUT_ROWS - CNTR_NAME_SCR_250_TIME_TAKEN + CNTR_NAME_SCR_2_TIME_TAKEN - CNTR_NAME_SCR_250_FATAL_ERROR + CNTR_NAME_SCR_2_FATAL_ERROR - SCR_250 + SCR_2 @@ -610,21 +610,21 @@ - CNTR_NAME_SEL_249_NUM_INPUT_ROWS + CNTR_NAME_SEL_1_NUM_INPUT_ROWS - CNTR_NAME_SEL_249_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_1_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_249_TIME_TAKEN + CNTR_NAME_SEL_1_TIME_TAKEN - CNTR_NAME_SEL_249_FATAL_ERROR + CNTR_NAME_SEL_1_FATAL_ERROR - SEL_249 + SEL_1 @@ -675,16 +675,16 @@ - CNTR_NAME_TS_248_NUM_INPUT_ROWS + CNTR_NAME_TS_0_NUM_INPUT_ROWS - CNTR_NAME_TS_248_NUM_OUTPUT_ROWS + CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - CNTR_NAME_TS_248_TIME_TAKEN + CNTR_NAME_TS_0_TIME_TAKEN - CNTR_NAME_TS_248_FATAL_ERROR + CNTR_NAME_TS_0_FATAL_ERROR @@ -699,7 +699,7 @@ - TS_248 + TS_0 @@ -742,7 +742,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src tmap:src @@ -754,7 +754,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -817,7 +817,7 @@ 1 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/774205575/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/645336633/10000 @@ -827,21 +827,21 @@ - CNTR_NAME_FS_255_NUM_INPUT_ROWS + CNTR_NAME_FS_7_NUM_INPUT_ROWS - CNTR_NAME_FS_255_NUM_OUTPUT_ROWS + CNTR_NAME_FS_7_NUM_OUTPUT_ROWS - CNTR_NAME_FS_255_TIME_TAKEN + CNTR_NAME_FS_7_TIME_TAKEN - CNTR_NAME_FS_255_FATAL_ERROR + CNTR_NAME_FS_7_FATAL_ERROR - FS_255 + FS_7 @@ -941,21 +941,21 @@ - CNTR_NAME_SEL_254_NUM_INPUT_ROWS + CNTR_NAME_SEL_6_NUM_INPUT_ROWS - CNTR_NAME_SEL_254_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_6_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_254_TIME_TAKEN + CNTR_NAME_SEL_6_TIME_TAKEN - CNTR_NAME_SEL_254_FATAL_ERROR + CNTR_NAME_SEL_6_FATAL_ERROR - SEL_254 + SEL_6 @@ -1058,21 +1058,21 @@ - CNTR_NAME_FIL_253_NUM_INPUT_ROWS + CNTR_NAME_FIL_5_NUM_INPUT_ROWS - CNTR_NAME_FIL_253_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_5_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_253_TIME_TAKEN + CNTR_NAME_FIL_5_TIME_TAKEN - CNTR_NAME_FIL_253_FATAL_ERROR + CNTR_NAME_FIL_5_FATAL_ERROR - FIL_253 + FIL_5 @@ -1133,21 +1133,21 @@ - CNTR_NAME_OP_252_NUM_INPUT_ROWS + CNTR_NAME_OP_4_NUM_INPUT_ROWS - CNTR_NAME_OP_252_NUM_OUTPUT_ROWS + CNTR_NAME_OP_4_NUM_OUTPUT_ROWS - CNTR_NAME_OP_252_TIME_TAKEN + CNTR_NAME_OP_4_TIME_TAKEN - CNTR_NAME_OP_252_FATAL_ERROR + CNTR_NAME_OP_4_FATAL_ERROR - OP_252 + OP_4 Index: ql/src/test/results/compiler/plan/join5.q.xml =================================================================== --- ql/src/test/results/compiler/plan/join5.q.xml (revision 4584) +++ ql/src/test/results/compiler/plan/join5.q.xml (working copy) @@ -1,5 +1,5 @@ - + Stage-2 @@ -62,11 +62,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1262739224 + 1263415323 @@ -300,21 +300,21 @@ - CNTR_NAME_RS_466_NUM_INPUT_ROWS + CNTR_NAME_RS_6_NUM_INPUT_ROWS - CNTR_NAME_RS_466_NUM_OUTPUT_ROWS + CNTR_NAME_RS_6_NUM_OUTPUT_ROWS - CNTR_NAME_RS_466_TIME_TAKEN + CNTR_NAME_RS_6_TIME_TAKEN - CNTR_NAME_RS_466_FATAL_ERROR + CNTR_NAME_RS_6_FATAL_ERROR - RS_466 + RS_6 @@ -414,21 +414,21 @@ - CNTR_NAME_SEL_465_NUM_INPUT_ROWS + CNTR_NAME_SEL_5_NUM_INPUT_ROWS - CNTR_NAME_SEL_465_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_5_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_465_TIME_TAKEN + CNTR_NAME_SEL_5_TIME_TAKEN - CNTR_NAME_SEL_465_FATAL_ERROR + CNTR_NAME_SEL_5_FATAL_ERROR - SEL_465 + SEL_5 @@ -602,21 +602,21 @@ - CNTR_NAME_FIL_464_NUM_INPUT_ROWS + CNTR_NAME_FIL_4_NUM_INPUT_ROWS - CNTR_NAME_FIL_464_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_4_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_464_TIME_TAKEN + CNTR_NAME_FIL_4_TIME_TAKEN - CNTR_NAME_FIL_464_FATAL_ERROR + CNTR_NAME_FIL_4_FATAL_ERROR - FIL_464 + FIL_4 @@ -782,21 +782,21 @@ - CNTR_NAME_FIL_472_NUM_INPUT_ROWS + CNTR_NAME_FIL_12_NUM_INPUT_ROWS - CNTR_NAME_FIL_472_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_12_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_472_TIME_TAKEN + CNTR_NAME_FIL_12_TIME_TAKEN - CNTR_NAME_FIL_472_FATAL_ERROR + CNTR_NAME_FIL_12_FATAL_ERROR - FIL_472 + FIL_12 @@ -826,16 +826,16 @@ - CNTR_NAME_TS_463_NUM_INPUT_ROWS + CNTR_NAME_TS_3_NUM_INPUT_ROWS - CNTR_NAME_TS_463_NUM_OUTPUT_ROWS + CNTR_NAME_TS_3_NUM_OUTPUT_ROWS - CNTR_NAME_TS_463_TIME_TAKEN + CNTR_NAME_TS_3_TIME_TAKEN - CNTR_NAME_TS_463_FATAL_ERROR + CNTR_NAME_TS_3_FATAL_ERROR @@ -850,7 +850,7 @@ - TS_463 + TS_3 @@ -1021,21 +1021,21 @@ - CNTR_NAME_RS_467_NUM_INPUT_ROWS + CNTR_NAME_RS_7_NUM_INPUT_ROWS - CNTR_NAME_RS_467_NUM_OUTPUT_ROWS + CNTR_NAME_RS_7_NUM_OUTPUT_ROWS - CNTR_NAME_RS_467_TIME_TAKEN + CNTR_NAME_RS_7_TIME_TAKEN - CNTR_NAME_RS_467_FATAL_ERROR + CNTR_NAME_RS_7_FATAL_ERROR - RS_467 + RS_7 @@ -1135,21 +1135,21 @@ - CNTR_NAME_SEL_462_NUM_INPUT_ROWS + CNTR_NAME_SEL_2_NUM_INPUT_ROWS - CNTR_NAME_SEL_462_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_462_TIME_TAKEN + CNTR_NAME_SEL_2_TIME_TAKEN - CNTR_NAME_SEL_462_FATAL_ERROR + CNTR_NAME_SEL_2_FATAL_ERROR - SEL_462 + SEL_2 @@ -1315,21 +1315,21 @@ - CNTR_NAME_FIL_461_NUM_INPUT_ROWS + CNTR_NAME_FIL_1_NUM_INPUT_ROWS - CNTR_NAME_FIL_461_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_1_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_461_TIME_TAKEN + CNTR_NAME_FIL_1_TIME_TAKEN - CNTR_NAME_FIL_461_FATAL_ERROR + CNTR_NAME_FIL_1_FATAL_ERROR - FIL_461 + FIL_1 @@ -1495,21 +1495,21 @@ - CNTR_NAME_FIL_473_NUM_INPUT_ROWS + CNTR_NAME_FIL_13_NUM_INPUT_ROWS - CNTR_NAME_FIL_473_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_13_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_473_TIME_TAKEN + CNTR_NAME_FIL_13_TIME_TAKEN - CNTR_NAME_FIL_473_FATAL_ERROR + CNTR_NAME_FIL_13_FATAL_ERROR - FIL_473 + FIL_13 @@ -1539,16 +1539,16 @@ - CNTR_NAME_TS_460_NUM_INPUT_ROWS + CNTR_NAME_TS_0_NUM_INPUT_ROWS - CNTR_NAME_TS_460_NUM_OUTPUT_ROWS + CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - CNTR_NAME_TS_460_TIME_TAKEN + CNTR_NAME_TS_0_TIME_TAKEN - CNTR_NAME_TS_460_FATAL_ERROR + CNTR_NAME_TS_0_FATAL_ERROR @@ -1563,7 +1563,7 @@ - TS_460 + TS_0 @@ -1588,7 +1588,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src c:a:src1 @@ -1603,7 +1603,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1663,7 +1663,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1915272072/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1928660873/10001 @@ -1699,21 +1699,21 @@ - CNTR_NAME_FS_471_NUM_INPUT_ROWS + CNTR_NAME_FS_11_NUM_INPUT_ROWS - CNTR_NAME_FS_471_NUM_OUTPUT_ROWS + CNTR_NAME_FS_11_NUM_OUTPUT_ROWS - CNTR_NAME_FS_471_TIME_TAKEN + CNTR_NAME_FS_11_TIME_TAKEN - CNTR_NAME_FS_471_FATAL_ERROR + CNTR_NAME_FS_11_FATAL_ERROR - FS_471 + FS_11 @@ -1861,21 +1861,21 @@ - CNTR_NAME_SEL_470_NUM_INPUT_ROWS + CNTR_NAME_SEL_10_NUM_INPUT_ROWS - CNTR_NAME_SEL_470_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_10_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_470_TIME_TAKEN + CNTR_NAME_SEL_10_TIME_TAKEN - CNTR_NAME_SEL_470_FATAL_ERROR + CNTR_NAME_SEL_10_FATAL_ERROR - SEL_470 + SEL_10 @@ -2047,21 +2047,21 @@ - CNTR_NAME_SEL_469_NUM_INPUT_ROWS + CNTR_NAME_SEL_9_NUM_INPUT_ROWS - CNTR_NAME_SEL_469_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_9_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_469_TIME_TAKEN + CNTR_NAME_SEL_9_TIME_TAKEN - CNTR_NAME_SEL_469_FATAL_ERROR + CNTR_NAME_SEL_9_FATAL_ERROR - SEL_469 + SEL_9 @@ -2337,21 +2337,21 @@ - CNTR_NAME_JOIN_468_NUM_INPUT_ROWS + CNTR_NAME_JOIN_8_NUM_INPUT_ROWS - CNTR_NAME_JOIN_468_NUM_OUTPUT_ROWS + CNTR_NAME_JOIN_8_NUM_OUTPUT_ROWS - CNTR_NAME_JOIN_468_TIME_TAKEN + CNTR_NAME_JOIN_8_TIME_TAKEN - CNTR_NAME_JOIN_468_FATAL_ERROR + CNTR_NAME_JOIN_8_FATAL_ERROR - JOIN_468 + JOIN_8 Index: ql/src/test/results/compiler/plan/input5.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input5.q.xml (revision 4584) +++ ql/src/test/results/compiler/plan/input5.q.xml (working copy) @@ -1,5 +1,5 @@ - + @@ -26,7 +26,7 @@ true - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/820045419/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/57738313/10000 @@ -79,11 +79,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1262739187 + 1263415289 @@ -93,7 +93,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/820045419/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/57738313/10001 @@ -168,11 +168,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src_thrift + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src_thrift transient_lastDdlTime - 1262739186 + 1263415289 @@ -374,21 +374,21 @@ - CNTR_NAME_RS_267_NUM_INPUT_ROWS + CNTR_NAME_RS_3_NUM_INPUT_ROWS - CNTR_NAME_RS_267_NUM_OUTPUT_ROWS + CNTR_NAME_RS_3_NUM_OUTPUT_ROWS - CNTR_NAME_RS_267_TIME_TAKEN + CNTR_NAME_RS_3_TIME_TAKEN - CNTR_NAME_RS_267_FATAL_ERROR + CNTR_NAME_RS_3_FATAL_ERROR - RS_267 + RS_3 @@ -521,21 +521,21 @@ - CNTR_NAME_SCR_266_NUM_INPUT_ROWS + CNTR_NAME_SCR_2_NUM_INPUT_ROWS - CNTR_NAME_SCR_266_NUM_OUTPUT_ROWS + CNTR_NAME_SCR_2_NUM_OUTPUT_ROWS - CNTR_NAME_SCR_266_TIME_TAKEN + CNTR_NAME_SCR_2_TIME_TAKEN - CNTR_NAME_SCR_266_FATAL_ERROR + CNTR_NAME_SCR_2_FATAL_ERROR - SCR_266 + SCR_2 @@ -626,21 +626,21 @@ - CNTR_NAME_SEL_265_NUM_INPUT_ROWS + CNTR_NAME_SEL_1_NUM_INPUT_ROWS - CNTR_NAME_SEL_265_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_1_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_265_TIME_TAKEN + CNTR_NAME_SEL_1_TIME_TAKEN - CNTR_NAME_SEL_265_FATAL_ERROR + CNTR_NAME_SEL_1_FATAL_ERROR - SEL_265 + SEL_1 @@ -691,16 +691,16 @@ - CNTR_NAME_TS_264_NUM_INPUT_ROWS + CNTR_NAME_TS_0_NUM_INPUT_ROWS - CNTR_NAME_TS_264_NUM_OUTPUT_ROWS + CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - CNTR_NAME_TS_264_TIME_TAKEN + CNTR_NAME_TS_0_TIME_TAKEN - CNTR_NAME_TS_264_FATAL_ERROR + CNTR_NAME_TS_0_FATAL_ERROR @@ -715,7 +715,7 @@ - TS_264 + TS_0 @@ -809,7 +809,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src_thrift + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src_thrift tmap:src_thrift @@ -821,7 +821,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src_thrift + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src_thrift org.apache.hadoop.hive.serde2.thrift.ThriftDeserializer @@ -880,7 +880,7 @@ 1 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/820045419/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/57738313/10000 @@ -890,21 +890,21 @@ - CNTR_NAME_FS_270_NUM_INPUT_ROWS + CNTR_NAME_FS_6_NUM_INPUT_ROWS - CNTR_NAME_FS_270_NUM_OUTPUT_ROWS + CNTR_NAME_FS_6_NUM_OUTPUT_ROWS - CNTR_NAME_FS_270_TIME_TAKEN + CNTR_NAME_FS_6_TIME_TAKEN - CNTR_NAME_FS_270_FATAL_ERROR + CNTR_NAME_FS_6_FATAL_ERROR - FS_270 + FS_6 @@ -1004,21 +1004,21 @@ - CNTR_NAME_SEL_269_NUM_INPUT_ROWS + CNTR_NAME_SEL_5_NUM_INPUT_ROWS - CNTR_NAME_SEL_269_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_5_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_269_TIME_TAKEN + CNTR_NAME_SEL_5_TIME_TAKEN - CNTR_NAME_SEL_269_FATAL_ERROR + CNTR_NAME_SEL_5_FATAL_ERROR - SEL_269 + SEL_5 @@ -1079,21 +1079,21 @@ - CNTR_NAME_OP_268_NUM_INPUT_ROWS + CNTR_NAME_OP_4_NUM_INPUT_ROWS - CNTR_NAME_OP_268_NUM_OUTPUT_ROWS + CNTR_NAME_OP_4_NUM_OUTPUT_ROWS - CNTR_NAME_OP_268_TIME_TAKEN + CNTR_NAME_OP_4_TIME_TAKEN - CNTR_NAME_OP_268_FATAL_ERROR + CNTR_NAME_OP_4_FATAL_ERROR - OP_268 + OP_4 Index: ql/src/test/results/compiler/plan/join6.q.xml =================================================================== --- ql/src/test/results/compiler/plan/join6.q.xml (revision 4584) +++ ql/src/test/results/compiler/plan/join6.q.xml (working copy) @@ -1,5 +1,5 @@ - + Stage-2 @@ -62,11 +62,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1262739227 + 1263415326 @@ -300,21 +300,21 @@ - CNTR_NAME_RS_494_NUM_INPUT_ROWS + CNTR_NAME_RS_6_NUM_INPUT_ROWS - CNTR_NAME_RS_494_NUM_OUTPUT_ROWS + CNTR_NAME_RS_6_NUM_OUTPUT_ROWS - CNTR_NAME_RS_494_TIME_TAKEN + CNTR_NAME_RS_6_TIME_TAKEN - CNTR_NAME_RS_494_FATAL_ERROR + CNTR_NAME_RS_6_FATAL_ERROR - RS_494 + RS_6 @@ -414,21 +414,21 @@ - CNTR_NAME_SEL_493_NUM_INPUT_ROWS + CNTR_NAME_SEL_5_NUM_INPUT_ROWS - CNTR_NAME_SEL_493_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_5_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_493_TIME_TAKEN + CNTR_NAME_SEL_5_TIME_TAKEN - CNTR_NAME_SEL_493_FATAL_ERROR + CNTR_NAME_SEL_5_FATAL_ERROR - SEL_493 + SEL_5 @@ -602,21 +602,21 @@ - CNTR_NAME_FIL_492_NUM_INPUT_ROWS + CNTR_NAME_FIL_4_NUM_INPUT_ROWS - CNTR_NAME_FIL_492_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_4_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_492_TIME_TAKEN + CNTR_NAME_FIL_4_TIME_TAKEN - CNTR_NAME_FIL_492_FATAL_ERROR + CNTR_NAME_FIL_4_FATAL_ERROR - FIL_492 + FIL_4 @@ -782,21 +782,21 @@ - CNTR_NAME_FIL_500_NUM_INPUT_ROWS + CNTR_NAME_FIL_12_NUM_INPUT_ROWS - CNTR_NAME_FIL_500_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_12_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_500_TIME_TAKEN + CNTR_NAME_FIL_12_TIME_TAKEN - CNTR_NAME_FIL_500_FATAL_ERROR + CNTR_NAME_FIL_12_FATAL_ERROR - FIL_500 + FIL_12 @@ -826,16 +826,16 @@ - CNTR_NAME_TS_491_NUM_INPUT_ROWS + CNTR_NAME_TS_3_NUM_INPUT_ROWS - CNTR_NAME_TS_491_NUM_OUTPUT_ROWS + CNTR_NAME_TS_3_NUM_OUTPUT_ROWS - CNTR_NAME_TS_491_TIME_TAKEN + CNTR_NAME_TS_3_TIME_TAKEN - CNTR_NAME_TS_491_FATAL_ERROR + CNTR_NAME_TS_3_FATAL_ERROR @@ -850,7 +850,7 @@ - TS_491 + TS_3 @@ -1021,21 +1021,21 @@ - CNTR_NAME_RS_495_NUM_INPUT_ROWS + CNTR_NAME_RS_7_NUM_INPUT_ROWS - CNTR_NAME_RS_495_NUM_OUTPUT_ROWS + CNTR_NAME_RS_7_NUM_OUTPUT_ROWS - CNTR_NAME_RS_495_TIME_TAKEN + CNTR_NAME_RS_7_TIME_TAKEN - CNTR_NAME_RS_495_FATAL_ERROR + CNTR_NAME_RS_7_FATAL_ERROR - RS_495 + RS_7 @@ -1135,21 +1135,21 @@ - CNTR_NAME_SEL_490_NUM_INPUT_ROWS + CNTR_NAME_SEL_2_NUM_INPUT_ROWS - CNTR_NAME_SEL_490_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_490_TIME_TAKEN + CNTR_NAME_SEL_2_TIME_TAKEN - CNTR_NAME_SEL_490_FATAL_ERROR + CNTR_NAME_SEL_2_FATAL_ERROR - SEL_490 + SEL_2 @@ -1315,21 +1315,21 @@ - CNTR_NAME_FIL_489_NUM_INPUT_ROWS + CNTR_NAME_FIL_1_NUM_INPUT_ROWS - CNTR_NAME_FIL_489_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_1_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_489_TIME_TAKEN + CNTR_NAME_FIL_1_TIME_TAKEN - CNTR_NAME_FIL_489_FATAL_ERROR + CNTR_NAME_FIL_1_FATAL_ERROR - FIL_489 + FIL_1 @@ -1495,21 +1495,21 @@ - CNTR_NAME_FIL_501_NUM_INPUT_ROWS + CNTR_NAME_FIL_13_NUM_INPUT_ROWS - CNTR_NAME_FIL_501_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_13_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_501_TIME_TAKEN + CNTR_NAME_FIL_13_TIME_TAKEN - CNTR_NAME_FIL_501_FATAL_ERROR + CNTR_NAME_FIL_13_FATAL_ERROR - FIL_501 + FIL_13 @@ -1539,16 +1539,16 @@ - CNTR_NAME_TS_488_NUM_INPUT_ROWS + CNTR_NAME_TS_0_NUM_INPUT_ROWS - CNTR_NAME_TS_488_NUM_OUTPUT_ROWS + CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - CNTR_NAME_TS_488_TIME_TAKEN + CNTR_NAME_TS_0_TIME_TAKEN - CNTR_NAME_TS_488_FATAL_ERROR + CNTR_NAME_TS_0_FATAL_ERROR @@ -1563,7 +1563,7 @@ - TS_488 + TS_0 @@ -1588,7 +1588,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src c:a:src1 @@ -1603,7 +1603,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1663,7 +1663,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1079780824/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/644592216/10001 @@ -1699,21 +1699,21 @@ - CNTR_NAME_FS_499_NUM_INPUT_ROWS + CNTR_NAME_FS_11_NUM_INPUT_ROWS - CNTR_NAME_FS_499_NUM_OUTPUT_ROWS + CNTR_NAME_FS_11_NUM_OUTPUT_ROWS - CNTR_NAME_FS_499_TIME_TAKEN + CNTR_NAME_FS_11_TIME_TAKEN - CNTR_NAME_FS_499_FATAL_ERROR + CNTR_NAME_FS_11_FATAL_ERROR - FS_499 + FS_11 @@ -1861,21 +1861,21 @@ - CNTR_NAME_SEL_498_NUM_INPUT_ROWS + CNTR_NAME_SEL_10_NUM_INPUT_ROWS - CNTR_NAME_SEL_498_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_10_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_498_TIME_TAKEN + CNTR_NAME_SEL_10_TIME_TAKEN - CNTR_NAME_SEL_498_FATAL_ERROR + CNTR_NAME_SEL_10_FATAL_ERROR - SEL_498 + SEL_10 @@ -2047,21 +2047,21 @@ - CNTR_NAME_SEL_497_NUM_INPUT_ROWS + CNTR_NAME_SEL_9_NUM_INPUT_ROWS - CNTR_NAME_SEL_497_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_9_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_497_TIME_TAKEN + CNTR_NAME_SEL_9_TIME_TAKEN - CNTR_NAME_SEL_497_FATAL_ERROR + CNTR_NAME_SEL_9_FATAL_ERROR - SEL_497 + SEL_9 @@ -2337,21 +2337,21 @@ - CNTR_NAME_JOIN_496_NUM_INPUT_ROWS + CNTR_NAME_JOIN_8_NUM_INPUT_ROWS - CNTR_NAME_JOIN_496_NUM_OUTPUT_ROWS + CNTR_NAME_JOIN_8_NUM_OUTPUT_ROWS - CNTR_NAME_JOIN_496_TIME_TAKEN + CNTR_NAME_JOIN_8_TIME_TAKEN - CNTR_NAME_JOIN_496_FATAL_ERROR + CNTR_NAME_JOIN_8_FATAL_ERROR - JOIN_496 + JOIN_8 Index: ql/src/test/results/compiler/plan/input_testxpath2.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input_testxpath2.q.xml (revision 4584) +++ ql/src/test/results/compiler/plan/input_testxpath2.q.xml (working copy) @@ -1,5 +1,5 @@ - + Stage-2 @@ -66,11 +66,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src_thrift + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src_thrift transient_lastDdlTime - 1262739210 + 1263415310 @@ -123,7 +123,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/999740985/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/135548551/10001 @@ -159,21 +159,21 @@ - CNTR_NAME_FS_367_NUM_INPUT_ROWS + CNTR_NAME_FS_3_NUM_INPUT_ROWS - CNTR_NAME_FS_367_NUM_OUTPUT_ROWS + CNTR_NAME_FS_3_NUM_OUTPUT_ROWS - CNTR_NAME_FS_367_TIME_TAKEN + CNTR_NAME_FS_3_TIME_TAKEN - CNTR_NAME_FS_367_FATAL_ERROR + CNTR_NAME_FS_3_FATAL_ERROR - FS_367 + FS_3 @@ -368,21 +368,21 @@ - CNTR_NAME_SEL_366_NUM_INPUT_ROWS + CNTR_NAME_SEL_2_NUM_INPUT_ROWS - CNTR_NAME_SEL_366_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_366_TIME_TAKEN + CNTR_NAME_SEL_2_TIME_TAKEN - CNTR_NAME_SEL_366_FATAL_ERROR + CNTR_NAME_SEL_2_FATAL_ERROR - SEL_366 + SEL_2 @@ -555,21 +555,21 @@ - CNTR_NAME_FIL_365_NUM_INPUT_ROWS + CNTR_NAME_FIL_1_NUM_INPUT_ROWS - CNTR_NAME_FIL_365_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_1_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_365_TIME_TAKEN + CNTR_NAME_FIL_1_TIME_TAKEN - CNTR_NAME_FIL_365_FATAL_ERROR + CNTR_NAME_FIL_1_FATAL_ERROR - FIL_365 + FIL_1 @@ -763,21 +763,21 @@ - CNTR_NAME_FIL_368_NUM_INPUT_ROWS + CNTR_NAME_FIL_4_NUM_INPUT_ROWS - CNTR_NAME_FIL_368_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_4_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_368_TIME_TAKEN + CNTR_NAME_FIL_4_TIME_TAKEN - CNTR_NAME_FIL_368_FATAL_ERROR + CNTR_NAME_FIL_4_FATAL_ERROR - FIL_368 + FIL_4 @@ -807,16 +807,16 @@ - CNTR_NAME_TS_364_NUM_INPUT_ROWS + CNTR_NAME_TS_0_NUM_INPUT_ROWS - CNTR_NAME_TS_364_NUM_OUTPUT_ROWS + CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - CNTR_NAME_TS_364_TIME_TAKEN + CNTR_NAME_TS_0_TIME_TAKEN - CNTR_NAME_TS_364_FATAL_ERROR + CNTR_NAME_TS_0_FATAL_ERROR @@ -834,7 +834,7 @@ - TS_364 + TS_0 @@ -850,7 +850,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src_thrift + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src_thrift src_thrift @@ -862,7 +862,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src_thrift + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src_thrift org.apache.hadoop.hive.serde2.thrift.ThriftDeserializer Index: ql/src/test/results/compiler/plan/input6.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input6.q.xml (revision 4584) +++ ql/src/test/results/compiler/plan/input6.q.xml (working copy) @@ -1,5 +1,5 @@ - + @@ -30,7 +30,7 @@ true - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/388519398/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1704458189/10000 @@ -83,11 +83,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1262739189 + 1263415292 @@ -97,7 +97,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/388519398/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1704458189/10001 @@ -125,10 +125,10 @@ true - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/202463004/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1232662310/10002 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/388519398/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1704458189/10000 @@ -146,7 +146,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/202463004/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1232662310/10002 @@ -301,21 +301,21 @@ - CNTR_NAME_RS_284_NUM_INPUT_ROWS + CNTR_NAME_RS_6_NUM_INPUT_ROWS - CNTR_NAME_RS_284_NUM_OUTPUT_ROWS + CNTR_NAME_RS_6_NUM_OUTPUT_ROWS - CNTR_NAME_RS_284_TIME_TAKEN + CNTR_NAME_RS_6_TIME_TAKEN - CNTR_NAME_RS_284_FATAL_ERROR + CNTR_NAME_RS_6_FATAL_ERROR - RS_284 + RS_6 @@ -359,21 +359,21 @@ - CNTR_NAME_TS_283_NUM_INPUT_ROWS + CNTR_NAME_TS_5_NUM_INPUT_ROWS - CNTR_NAME_TS_283_NUM_OUTPUT_ROWS + CNTR_NAME_TS_5_NUM_OUTPUT_ROWS - CNTR_NAME_TS_283_TIME_TAKEN + CNTR_NAME_TS_5_TIME_TAKEN - CNTR_NAME_TS_283_FATAL_ERROR + CNTR_NAME_TS_5_FATAL_ERROR - TS_283 + TS_5 @@ -391,10 +391,10 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/202463004/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1232662310/10002 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/202463004/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1232662310/10002 @@ -403,7 +403,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/202463004/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1232662310/10002 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -436,7 +436,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/388519398/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1704458189/10000 @@ -485,7 +485,7 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/dest1 file.outputformat @@ -493,7 +493,7 @@ transient_lastDdlTime - 1262739189 + 1263415292 @@ -507,21 +507,21 @@ - CNTR_NAME_FS_286_NUM_INPUT_ROWS + CNTR_NAME_FS_8_NUM_INPUT_ROWS - CNTR_NAME_FS_286_NUM_OUTPUT_ROWS + CNTR_NAME_FS_8_NUM_OUTPUT_ROWS - CNTR_NAME_FS_286_TIME_TAKEN + CNTR_NAME_FS_8_TIME_TAKEN - CNTR_NAME_FS_286_FATAL_ERROR + CNTR_NAME_FS_8_FATAL_ERROR - FS_286 + FS_8 @@ -557,21 +557,21 @@ - CNTR_NAME_OP_285_NUM_INPUT_ROWS + CNTR_NAME_OP_7_NUM_INPUT_ROWS - CNTR_NAME_OP_285_NUM_OUTPUT_ROWS + CNTR_NAME_OP_7_NUM_OUTPUT_ROWS - CNTR_NAME_OP_285_TIME_TAKEN + CNTR_NAME_OP_7_TIME_TAKEN - CNTR_NAME_OP_285_FATAL_ERROR + CNTR_NAME_OP_7_FATAL_ERROR - OP_285 + OP_7 @@ -629,7 +629,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/202463004/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1232662310/10002 @@ -715,11 +715,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src1 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src1 transient_lastDdlTime - 1262739189 + 1263415292 @@ -775,7 +775,7 @@ 1 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/202463004/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1232662310/10002 @@ -785,21 +785,21 @@ - CNTR_NAME_FS_281_NUM_INPUT_ROWS + CNTR_NAME_FS_3_NUM_INPUT_ROWS - CNTR_NAME_FS_281_NUM_OUTPUT_ROWS + CNTR_NAME_FS_3_NUM_OUTPUT_ROWS - CNTR_NAME_FS_281_TIME_TAKEN + CNTR_NAME_FS_3_TIME_TAKEN - CNTR_NAME_FS_281_FATAL_ERROR + CNTR_NAME_FS_3_FATAL_ERROR - FS_281 + FS_3 @@ -874,21 +874,21 @@ - CNTR_NAME_SEL_280_NUM_INPUT_ROWS + CNTR_NAME_SEL_2_NUM_INPUT_ROWS - CNTR_NAME_SEL_280_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_280_TIME_TAKEN + CNTR_NAME_SEL_2_TIME_TAKEN - CNTR_NAME_SEL_280_FATAL_ERROR + CNTR_NAME_SEL_2_FATAL_ERROR - SEL_280 + SEL_2 @@ -967,21 +967,21 @@ - CNTR_NAME_FIL_279_NUM_INPUT_ROWS + CNTR_NAME_FIL_1_NUM_INPUT_ROWS - CNTR_NAME_FIL_279_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_1_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_279_TIME_TAKEN + CNTR_NAME_FIL_1_TIME_TAKEN - CNTR_NAME_FIL_279_FATAL_ERROR + CNTR_NAME_FIL_1_FATAL_ERROR - FIL_279 + FIL_1 @@ -1056,21 +1056,21 @@ - CNTR_NAME_FIL_282_NUM_INPUT_ROWS + CNTR_NAME_FIL_4_NUM_INPUT_ROWS - CNTR_NAME_FIL_282_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_4_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_282_TIME_TAKEN + CNTR_NAME_FIL_4_TIME_TAKEN - CNTR_NAME_FIL_282_FATAL_ERROR + CNTR_NAME_FIL_4_FATAL_ERROR - FIL_282 + FIL_4 @@ -1100,16 +1100,16 @@ - CNTR_NAME_TS_278_NUM_INPUT_ROWS + CNTR_NAME_TS_0_NUM_INPUT_ROWS - CNTR_NAME_TS_278_NUM_OUTPUT_ROWS + CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - CNTR_NAME_TS_278_TIME_TAKEN + CNTR_NAME_TS_0_TIME_TAKEN - CNTR_NAME_TS_278_FATAL_ERROR + CNTR_NAME_TS_0_FATAL_ERROR @@ -1124,7 +1124,7 @@ - TS_278 + TS_0 @@ -1140,7 +1140,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src1 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src1 src1 @@ -1152,7 +1152,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src1 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src1 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Index: ql/src/test/results/compiler/plan/join7.q.xml =================================================================== --- ql/src/test/results/compiler/plan/join7.q.xml (revision 4584) +++ ql/src/test/results/compiler/plan/join7.q.xml (working copy) @@ -1,5 +1,5 @@ - + Stage-2 @@ -62,11 +62,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1262739230 + 1263415329 @@ -342,21 +342,21 @@ - CNTR_NAME_RS_525_NUM_INPUT_ROWS + CNTR_NAME_RS_9_NUM_INPUT_ROWS - CNTR_NAME_RS_525_NUM_OUTPUT_ROWS + CNTR_NAME_RS_9_NUM_OUTPUT_ROWS - CNTR_NAME_RS_525_TIME_TAKEN + CNTR_NAME_RS_9_TIME_TAKEN - CNTR_NAME_RS_525_FATAL_ERROR + CNTR_NAME_RS_9_FATAL_ERROR - RS_525 + RS_9 @@ -456,21 +456,21 @@ - CNTR_NAME_SEL_524_NUM_INPUT_ROWS + CNTR_NAME_SEL_8_NUM_INPUT_ROWS - CNTR_NAME_SEL_524_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_8_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_524_TIME_TAKEN + CNTR_NAME_SEL_8_TIME_TAKEN - CNTR_NAME_SEL_524_FATAL_ERROR + CNTR_NAME_SEL_8_FATAL_ERROR - SEL_524 + SEL_8 @@ -644,21 +644,21 @@ - CNTR_NAME_FIL_523_NUM_INPUT_ROWS + CNTR_NAME_FIL_7_NUM_INPUT_ROWS - CNTR_NAME_FIL_523_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_7_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_523_TIME_TAKEN + CNTR_NAME_FIL_7_TIME_TAKEN - CNTR_NAME_FIL_523_FATAL_ERROR + CNTR_NAME_FIL_7_FATAL_ERROR - FIL_523 + FIL_7 @@ -824,21 +824,21 @@ - CNTR_NAME_FIL_532_NUM_INPUT_ROWS + CNTR_NAME_FIL_16_NUM_INPUT_ROWS - CNTR_NAME_FIL_532_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_16_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_532_TIME_TAKEN + CNTR_NAME_FIL_16_TIME_TAKEN - CNTR_NAME_FIL_532_FATAL_ERROR + CNTR_NAME_FIL_16_FATAL_ERROR - FIL_532 + FIL_16 @@ -868,16 +868,16 @@ - CNTR_NAME_TS_522_NUM_INPUT_ROWS + CNTR_NAME_TS_6_NUM_INPUT_ROWS - CNTR_NAME_TS_522_NUM_OUTPUT_ROWS + CNTR_NAME_TS_6_NUM_OUTPUT_ROWS - CNTR_NAME_TS_522_TIME_TAKEN + CNTR_NAME_TS_6_TIME_TAKEN - CNTR_NAME_TS_522_FATAL_ERROR + CNTR_NAME_TS_6_FATAL_ERROR @@ -892,7 +892,7 @@ - TS_522 + TS_6 @@ -1063,21 +1063,21 @@ - CNTR_NAME_RS_526_NUM_INPUT_ROWS + CNTR_NAME_RS_10_NUM_INPUT_ROWS - CNTR_NAME_RS_526_NUM_OUTPUT_ROWS + CNTR_NAME_RS_10_NUM_OUTPUT_ROWS - CNTR_NAME_RS_526_TIME_TAKEN + CNTR_NAME_RS_10_TIME_TAKEN - CNTR_NAME_RS_526_FATAL_ERROR + CNTR_NAME_RS_10_FATAL_ERROR - RS_526 + RS_10 @@ -1177,21 +1177,21 @@ - CNTR_NAME_SEL_518_NUM_INPUT_ROWS + CNTR_NAME_SEL_2_NUM_INPUT_ROWS - CNTR_NAME_SEL_518_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_518_TIME_TAKEN + CNTR_NAME_SEL_2_TIME_TAKEN - CNTR_NAME_SEL_518_FATAL_ERROR + CNTR_NAME_SEL_2_FATAL_ERROR - SEL_518 + SEL_2 @@ -1357,21 +1357,21 @@ - CNTR_NAME_FIL_517_NUM_INPUT_ROWS + CNTR_NAME_FIL_1_NUM_INPUT_ROWS - CNTR_NAME_FIL_517_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_1_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_517_TIME_TAKEN + CNTR_NAME_FIL_1_TIME_TAKEN - CNTR_NAME_FIL_517_FATAL_ERROR + CNTR_NAME_FIL_1_FATAL_ERROR - FIL_517 + FIL_1 @@ -1537,21 +1537,21 @@ - CNTR_NAME_FIL_533_NUM_INPUT_ROWS + CNTR_NAME_FIL_17_NUM_INPUT_ROWS - CNTR_NAME_FIL_533_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_17_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_533_TIME_TAKEN + CNTR_NAME_FIL_17_TIME_TAKEN - CNTR_NAME_FIL_533_FATAL_ERROR + CNTR_NAME_FIL_17_FATAL_ERROR - FIL_533 + FIL_17 @@ -1581,16 +1581,16 @@ - CNTR_NAME_TS_516_NUM_INPUT_ROWS + CNTR_NAME_TS_0_NUM_INPUT_ROWS - CNTR_NAME_TS_516_NUM_OUTPUT_ROWS + CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - CNTR_NAME_TS_516_TIME_TAKEN + CNTR_NAME_TS_0_TIME_TAKEN - CNTR_NAME_TS_516_FATAL_ERROR + CNTR_NAME_TS_0_FATAL_ERROR @@ -1605,7 +1605,7 @@ - TS_516 + TS_0 @@ -1776,21 +1776,21 @@ - CNTR_NAME_RS_527_NUM_INPUT_ROWS + CNTR_NAME_RS_11_NUM_INPUT_ROWS - CNTR_NAME_RS_527_NUM_OUTPUT_ROWS + CNTR_NAME_RS_11_NUM_OUTPUT_ROWS - CNTR_NAME_RS_527_TIME_TAKEN + CNTR_NAME_RS_11_TIME_TAKEN - CNTR_NAME_RS_527_FATAL_ERROR + CNTR_NAME_RS_11_FATAL_ERROR - RS_527 + RS_11 @@ -1890,21 +1890,21 @@ - CNTR_NAME_SEL_521_NUM_INPUT_ROWS + CNTR_NAME_SEL_5_NUM_INPUT_ROWS - CNTR_NAME_SEL_521_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_5_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_521_TIME_TAKEN + CNTR_NAME_SEL_5_TIME_TAKEN - CNTR_NAME_SEL_521_FATAL_ERROR + CNTR_NAME_SEL_5_FATAL_ERROR - SEL_521 + SEL_5 @@ -2070,21 +2070,21 @@ - CNTR_NAME_FIL_520_NUM_INPUT_ROWS + CNTR_NAME_FIL_4_NUM_INPUT_ROWS - CNTR_NAME_FIL_520_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_4_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_520_TIME_TAKEN + CNTR_NAME_FIL_4_TIME_TAKEN - CNTR_NAME_FIL_520_FATAL_ERROR + CNTR_NAME_FIL_4_FATAL_ERROR - FIL_520 + FIL_4 @@ -2250,21 +2250,21 @@ - CNTR_NAME_FIL_534_NUM_INPUT_ROWS + CNTR_NAME_FIL_18_NUM_INPUT_ROWS - CNTR_NAME_FIL_534_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_18_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_534_TIME_TAKEN + CNTR_NAME_FIL_18_TIME_TAKEN - CNTR_NAME_FIL_534_FATAL_ERROR + CNTR_NAME_FIL_18_FATAL_ERROR - FIL_534 + FIL_18 @@ -2294,16 +2294,16 @@ - CNTR_NAME_TS_519_NUM_INPUT_ROWS + CNTR_NAME_TS_3_NUM_INPUT_ROWS - CNTR_NAME_TS_519_NUM_OUTPUT_ROWS + CNTR_NAME_TS_3_NUM_OUTPUT_ROWS - CNTR_NAME_TS_519_TIME_TAKEN + CNTR_NAME_TS_3_TIME_TAKEN - CNTR_NAME_TS_519_FATAL_ERROR + CNTR_NAME_TS_3_FATAL_ERROR @@ -2318,7 +2318,7 @@ - TS_519 + TS_3 @@ -2343,7 +2343,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src c:a:src1 @@ -2361,7 +2361,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -2421,7 +2421,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1962019108/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/501132970/10001 @@ -2457,21 +2457,21 @@ - CNTR_NAME_FS_531_NUM_INPUT_ROWS + CNTR_NAME_FS_15_NUM_INPUT_ROWS - CNTR_NAME_FS_531_NUM_OUTPUT_ROWS + CNTR_NAME_FS_15_NUM_OUTPUT_ROWS - CNTR_NAME_FS_531_TIME_TAKEN + CNTR_NAME_FS_15_TIME_TAKEN - CNTR_NAME_FS_531_FATAL_ERROR + CNTR_NAME_FS_15_FATAL_ERROR - FS_531 + FS_15 @@ -2673,21 +2673,21 @@ - CNTR_NAME_SEL_530_NUM_INPUT_ROWS + CNTR_NAME_SEL_14_NUM_INPUT_ROWS - CNTR_NAME_SEL_530_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_14_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_530_TIME_TAKEN + CNTR_NAME_SEL_14_TIME_TAKEN - CNTR_NAME_SEL_530_FATAL_ERROR + CNTR_NAME_SEL_14_FATAL_ERROR - SEL_530 + SEL_14 @@ -2925,21 +2925,21 @@ - CNTR_NAME_SEL_529_NUM_INPUT_ROWS + CNTR_NAME_SEL_13_NUM_INPUT_ROWS - CNTR_NAME_SEL_529_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_13_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_529_TIME_TAKEN + CNTR_NAME_SEL_13_TIME_TAKEN - CNTR_NAME_SEL_529_FATAL_ERROR + CNTR_NAME_SEL_13_FATAL_ERROR - SEL_529 + SEL_13 @@ -3330,21 +3330,21 @@ - CNTR_NAME_JOIN_528_NUM_INPUT_ROWS + CNTR_NAME_JOIN_12_NUM_INPUT_ROWS - CNTR_NAME_JOIN_528_NUM_OUTPUT_ROWS + CNTR_NAME_JOIN_12_NUM_OUTPUT_ROWS - CNTR_NAME_JOIN_528_TIME_TAKEN + CNTR_NAME_JOIN_12_TIME_TAKEN - CNTR_NAME_JOIN_528_FATAL_ERROR + CNTR_NAME_JOIN_12_FATAL_ERROR - JOIN_528 + JOIN_12 Index: ql/src/test/results/compiler/plan/input7.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input7.q.xml (revision 4584) +++ ql/src/test/results/compiler/plan/input7.q.xml (working copy) @@ -1,5 +1,5 @@ - + @@ -30,7 +30,7 @@ true - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/2124506911/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/19955325/10000 @@ -83,11 +83,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1262739192 + 1263415295 @@ -97,7 +97,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/2124506911/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/19955325/10001 @@ -125,10 +125,10 @@ true - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1281677550/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/2078427126/10002 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/2124506911/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/19955325/10000 @@ -146,7 +146,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1281677550/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/2078427126/10002 @@ -301,21 +301,21 @@ - CNTR_NAME_RS_300_NUM_INPUT_ROWS + CNTR_NAME_RS_4_NUM_INPUT_ROWS - CNTR_NAME_RS_300_NUM_OUTPUT_ROWS + CNTR_NAME_RS_4_NUM_OUTPUT_ROWS - CNTR_NAME_RS_300_TIME_TAKEN + CNTR_NAME_RS_4_TIME_TAKEN - CNTR_NAME_RS_300_FATAL_ERROR + CNTR_NAME_RS_4_FATAL_ERROR - RS_300 + RS_4 @@ -359,21 +359,21 @@ - CNTR_NAME_TS_299_NUM_INPUT_ROWS + CNTR_NAME_TS_3_NUM_INPUT_ROWS - CNTR_NAME_TS_299_NUM_OUTPUT_ROWS + CNTR_NAME_TS_3_NUM_OUTPUT_ROWS - CNTR_NAME_TS_299_TIME_TAKEN + CNTR_NAME_TS_3_TIME_TAKEN - CNTR_NAME_TS_299_FATAL_ERROR + CNTR_NAME_TS_3_FATAL_ERROR - TS_299 + TS_3 @@ -391,10 +391,10 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1281677550/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/2078427126/10002 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1281677550/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/2078427126/10002 @@ -403,7 +403,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1281677550/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/2078427126/10002 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -436,7 +436,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/2124506911/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/19955325/10000 @@ -485,7 +485,7 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/dest1 file.outputformat @@ -493,7 +493,7 @@ transient_lastDdlTime - 1262739192 + 1263415295 @@ -507,21 +507,21 @@ - CNTR_NAME_FS_302_NUM_INPUT_ROWS + CNTR_NAME_FS_6_NUM_INPUT_ROWS - CNTR_NAME_FS_302_NUM_OUTPUT_ROWS + CNTR_NAME_FS_6_NUM_OUTPUT_ROWS - CNTR_NAME_FS_302_TIME_TAKEN + CNTR_NAME_FS_6_TIME_TAKEN - CNTR_NAME_FS_302_FATAL_ERROR + CNTR_NAME_FS_6_FATAL_ERROR - FS_302 + FS_6 @@ -557,21 +557,21 @@ - CNTR_NAME_OP_301_NUM_INPUT_ROWS + CNTR_NAME_OP_5_NUM_INPUT_ROWS - CNTR_NAME_OP_301_NUM_OUTPUT_ROWS + CNTR_NAME_OP_5_NUM_OUTPUT_ROWS - CNTR_NAME_OP_301_TIME_TAKEN + CNTR_NAME_OP_5_TIME_TAKEN - CNTR_NAME_OP_301_FATAL_ERROR + CNTR_NAME_OP_5_FATAL_ERROR - OP_301 + OP_5 @@ -633,7 +633,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1281677550/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/2078427126/10002 @@ -719,11 +719,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src1 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src1 transient_lastDdlTime - 1262739192 + 1263415294 @@ -771,7 +771,7 @@ 1 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1281677550/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/2078427126/10002 @@ -781,21 +781,21 @@ - CNTR_NAME_FS_298_NUM_INPUT_ROWS + CNTR_NAME_FS_2_NUM_INPUT_ROWS - CNTR_NAME_FS_298_NUM_OUTPUT_ROWS + CNTR_NAME_FS_2_NUM_OUTPUT_ROWS - CNTR_NAME_FS_298_TIME_TAKEN + CNTR_NAME_FS_2_TIME_TAKEN - CNTR_NAME_FS_298_FATAL_ERROR + CNTR_NAME_FS_2_FATAL_ERROR - FS_298 + FS_2 @@ -864,21 +864,21 @@ - CNTR_NAME_SEL_297_NUM_INPUT_ROWS + CNTR_NAME_SEL_1_NUM_INPUT_ROWS - CNTR_NAME_SEL_297_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_1_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_297_TIME_TAKEN + CNTR_NAME_SEL_1_TIME_TAKEN - CNTR_NAME_SEL_297_FATAL_ERROR + CNTR_NAME_SEL_1_FATAL_ERROR - SEL_297 + SEL_1 @@ -929,16 +929,16 @@ - CNTR_NAME_TS_296_NUM_INPUT_ROWS + CNTR_NAME_TS_0_NUM_INPUT_ROWS - CNTR_NAME_TS_296_NUM_OUTPUT_ROWS + CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - CNTR_NAME_TS_296_TIME_TAKEN + CNTR_NAME_TS_0_TIME_TAKEN - CNTR_NAME_TS_296_FATAL_ERROR + CNTR_NAME_TS_0_FATAL_ERROR @@ -950,7 +950,7 @@ - TS_296 + TS_0 @@ -987,7 +987,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src1 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src1 src1 @@ -999,7 +999,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src1 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src1 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Index: ql/src/test/results/compiler/plan/join8.q.xml =================================================================== --- ql/src/test/results/compiler/plan/join8.q.xml (revision 4584) +++ ql/src/test/results/compiler/plan/join8.q.xml (working copy) @@ -1,5 +1,5 @@ - + Stage-2 @@ -62,11 +62,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1262739233 + 1263415332 @@ -300,21 +300,21 @@ - CNTR_NAME_RS_560_NUM_INPUT_ROWS + CNTR_NAME_RS_6_NUM_INPUT_ROWS - CNTR_NAME_RS_560_NUM_OUTPUT_ROWS + CNTR_NAME_RS_6_NUM_OUTPUT_ROWS - CNTR_NAME_RS_560_TIME_TAKEN + CNTR_NAME_RS_6_TIME_TAKEN - CNTR_NAME_RS_560_FATAL_ERROR + CNTR_NAME_RS_6_FATAL_ERROR - RS_560 + RS_6 @@ -414,21 +414,21 @@ - CNTR_NAME_SEL_559_NUM_INPUT_ROWS + CNTR_NAME_SEL_5_NUM_INPUT_ROWS - CNTR_NAME_SEL_559_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_5_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_559_TIME_TAKEN + CNTR_NAME_SEL_5_TIME_TAKEN - CNTR_NAME_SEL_559_FATAL_ERROR + CNTR_NAME_SEL_5_FATAL_ERROR - SEL_559 + SEL_5 @@ -602,21 +602,21 @@ - CNTR_NAME_FIL_558_NUM_INPUT_ROWS + CNTR_NAME_FIL_4_NUM_INPUT_ROWS - CNTR_NAME_FIL_558_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_4_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_558_TIME_TAKEN + CNTR_NAME_FIL_4_TIME_TAKEN - CNTR_NAME_FIL_558_FATAL_ERROR + CNTR_NAME_FIL_4_FATAL_ERROR - FIL_558 + FIL_4 @@ -782,21 +782,21 @@ - CNTR_NAME_FIL_567_NUM_INPUT_ROWS + CNTR_NAME_FIL_13_NUM_INPUT_ROWS - CNTR_NAME_FIL_567_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_13_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_567_TIME_TAKEN + CNTR_NAME_FIL_13_TIME_TAKEN - CNTR_NAME_FIL_567_FATAL_ERROR + CNTR_NAME_FIL_13_FATAL_ERROR - FIL_567 + FIL_13 @@ -826,16 +826,16 @@ - CNTR_NAME_TS_557_NUM_INPUT_ROWS + CNTR_NAME_TS_3_NUM_INPUT_ROWS - CNTR_NAME_TS_557_NUM_OUTPUT_ROWS + CNTR_NAME_TS_3_NUM_OUTPUT_ROWS - CNTR_NAME_TS_557_TIME_TAKEN + CNTR_NAME_TS_3_TIME_TAKEN - CNTR_NAME_TS_557_FATAL_ERROR + CNTR_NAME_TS_3_FATAL_ERROR @@ -850,7 +850,7 @@ - TS_557 + TS_3 @@ -1021,21 +1021,21 @@ - CNTR_NAME_RS_561_NUM_INPUT_ROWS + CNTR_NAME_RS_7_NUM_INPUT_ROWS - CNTR_NAME_RS_561_NUM_OUTPUT_ROWS + CNTR_NAME_RS_7_NUM_OUTPUT_ROWS - CNTR_NAME_RS_561_TIME_TAKEN + CNTR_NAME_RS_7_TIME_TAKEN - CNTR_NAME_RS_561_FATAL_ERROR + CNTR_NAME_RS_7_FATAL_ERROR - RS_561 + RS_7 @@ -1135,21 +1135,21 @@ - CNTR_NAME_SEL_556_NUM_INPUT_ROWS + CNTR_NAME_SEL_2_NUM_INPUT_ROWS - CNTR_NAME_SEL_556_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_556_TIME_TAKEN + CNTR_NAME_SEL_2_TIME_TAKEN - CNTR_NAME_SEL_556_FATAL_ERROR + CNTR_NAME_SEL_2_FATAL_ERROR - SEL_556 + SEL_2 @@ -1315,21 +1315,21 @@ - CNTR_NAME_FIL_555_NUM_INPUT_ROWS + CNTR_NAME_FIL_1_NUM_INPUT_ROWS - CNTR_NAME_FIL_555_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_1_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_555_TIME_TAKEN + CNTR_NAME_FIL_1_TIME_TAKEN - CNTR_NAME_FIL_555_FATAL_ERROR + CNTR_NAME_FIL_1_FATAL_ERROR - FIL_555 + FIL_1 @@ -1495,21 +1495,21 @@ - CNTR_NAME_FIL_568_NUM_INPUT_ROWS + CNTR_NAME_FIL_14_NUM_INPUT_ROWS - CNTR_NAME_FIL_568_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_14_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_568_TIME_TAKEN + CNTR_NAME_FIL_14_TIME_TAKEN - CNTR_NAME_FIL_568_FATAL_ERROR + CNTR_NAME_FIL_14_FATAL_ERROR - FIL_568 + FIL_14 @@ -1539,16 +1539,16 @@ - CNTR_NAME_TS_554_NUM_INPUT_ROWS + CNTR_NAME_TS_0_NUM_INPUT_ROWS - CNTR_NAME_TS_554_NUM_OUTPUT_ROWS + CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - CNTR_NAME_TS_554_TIME_TAKEN + CNTR_NAME_TS_0_TIME_TAKEN - CNTR_NAME_TS_554_FATAL_ERROR + CNTR_NAME_TS_0_FATAL_ERROR @@ -1563,7 +1563,7 @@ - TS_554 + TS_0 @@ -1588,7 +1588,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src c:a:src1 @@ -1603,7 +1603,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1667,7 +1667,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/274584496/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1559775989/10001 @@ -1703,21 +1703,21 @@ - CNTR_NAME_FS_566_NUM_INPUT_ROWS + CNTR_NAME_FS_12_NUM_INPUT_ROWS - CNTR_NAME_FS_566_NUM_OUTPUT_ROWS + CNTR_NAME_FS_12_NUM_OUTPUT_ROWS - CNTR_NAME_FS_566_TIME_TAKEN + CNTR_NAME_FS_12_TIME_TAKEN - CNTR_NAME_FS_566_FATAL_ERROR + CNTR_NAME_FS_12_FATAL_ERROR - FS_566 + FS_12 @@ -1865,21 +1865,21 @@ - CNTR_NAME_SEL_565_NUM_INPUT_ROWS + CNTR_NAME_SEL_11_NUM_INPUT_ROWS - CNTR_NAME_SEL_565_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_11_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_565_TIME_TAKEN + CNTR_NAME_SEL_11_TIME_TAKEN - CNTR_NAME_SEL_565_FATAL_ERROR + CNTR_NAME_SEL_11_FATAL_ERROR - SEL_565 + SEL_11 @@ -2031,21 +2031,21 @@ - CNTR_NAME_FIL_564_NUM_INPUT_ROWS + CNTR_NAME_FIL_10_NUM_INPUT_ROWS - CNTR_NAME_FIL_564_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_10_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_564_TIME_TAKEN + CNTR_NAME_FIL_10_TIME_TAKEN - CNTR_NAME_FIL_564_FATAL_ERROR + CNTR_NAME_FIL_10_FATAL_ERROR - FIL_564 + FIL_10 @@ -2205,21 +2205,21 @@ - CNTR_NAME_SEL_563_NUM_INPUT_ROWS + CNTR_NAME_SEL_9_NUM_INPUT_ROWS - CNTR_NAME_SEL_563_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_9_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_563_TIME_TAKEN + CNTR_NAME_SEL_9_TIME_TAKEN - CNTR_NAME_SEL_563_FATAL_ERROR + CNTR_NAME_SEL_9_FATAL_ERROR - SEL_563 + SEL_9 @@ -2467,21 +2467,21 @@ - CNTR_NAME_JOIN_562_NUM_INPUT_ROWS + CNTR_NAME_JOIN_8_NUM_INPUT_ROWS - CNTR_NAME_JOIN_562_NUM_OUTPUT_ROWS + CNTR_NAME_JOIN_8_NUM_OUTPUT_ROWS - CNTR_NAME_JOIN_562_TIME_TAKEN + CNTR_NAME_JOIN_8_TIME_TAKEN - CNTR_NAME_JOIN_562_FATAL_ERROR + CNTR_NAME_JOIN_8_FATAL_ERROR - JOIN_562 + JOIN_8 Index: ql/src/test/results/compiler/plan/input_testsequencefile.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input_testsequencefile.q.xml (revision 4584) +++ ql/src/test/results/compiler/plan/input_testsequencefile.q.xml (working copy) @@ -1,5 +1,5 @@ - + @@ -30,7 +30,7 @@ true - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/2070471331/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/253414173/10000 @@ -83,11 +83,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/dest4_sequencefile + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/dest4_sequencefile transient_lastDdlTime - 1262739205 + 1263415306 @@ -97,7 +97,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/2070471331/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/253414173/10001 @@ -125,10 +125,10 @@ true - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1677216202/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/251674430/10002 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/2070471331/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/253414173/10000 @@ -146,7 +146,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1677216202/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/251674430/10002 @@ -301,21 +301,21 @@ - CNTR_NAME_RS_348_NUM_INPUT_ROWS + CNTR_NAME_RS_4_NUM_INPUT_ROWS - CNTR_NAME_RS_348_NUM_OUTPUT_ROWS + CNTR_NAME_RS_4_NUM_OUTPUT_ROWS - CNTR_NAME_RS_348_TIME_TAKEN + CNTR_NAME_RS_4_TIME_TAKEN - CNTR_NAME_RS_348_FATAL_ERROR + CNTR_NAME_RS_4_FATAL_ERROR - RS_348 + RS_4 @@ -359,21 +359,21 @@ - CNTR_NAME_TS_347_NUM_INPUT_ROWS + CNTR_NAME_TS_3_NUM_INPUT_ROWS - CNTR_NAME_TS_347_NUM_OUTPUT_ROWS + CNTR_NAME_TS_3_NUM_OUTPUT_ROWS - CNTR_NAME_TS_347_TIME_TAKEN + CNTR_NAME_TS_3_TIME_TAKEN - CNTR_NAME_TS_347_FATAL_ERROR + CNTR_NAME_TS_3_FATAL_ERROR - TS_347 + TS_3 @@ -391,10 +391,10 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1677216202/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/251674430/10002 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1677216202/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/251674430/10002 @@ -403,7 +403,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1677216202/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/251674430/10002 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -436,7 +436,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/2070471331/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/253414173/10000 @@ -485,7 +485,7 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/dest4_sequencefile + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/dest4_sequencefile file.outputformat @@ -493,7 +493,7 @@ transient_lastDdlTime - 1262739205 + 1263415306 @@ -507,21 +507,21 @@ - CNTR_NAME_FS_350_NUM_INPUT_ROWS + CNTR_NAME_FS_6_NUM_INPUT_ROWS - CNTR_NAME_FS_350_NUM_OUTPUT_ROWS + CNTR_NAME_FS_6_NUM_OUTPUT_ROWS - CNTR_NAME_FS_350_TIME_TAKEN + CNTR_NAME_FS_6_TIME_TAKEN - CNTR_NAME_FS_350_FATAL_ERROR + CNTR_NAME_FS_6_FATAL_ERROR - FS_350 + FS_6 @@ -557,21 +557,21 @@ - CNTR_NAME_OP_349_NUM_INPUT_ROWS + CNTR_NAME_OP_5_NUM_INPUT_ROWS - CNTR_NAME_OP_349_NUM_OUTPUT_ROWS + CNTR_NAME_OP_5_NUM_OUTPUT_ROWS - CNTR_NAME_OP_349_TIME_TAKEN + CNTR_NAME_OP_5_TIME_TAKEN - CNTR_NAME_OP_349_FATAL_ERROR + CNTR_NAME_OP_5_FATAL_ERROR - OP_349 + OP_5 @@ -629,7 +629,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1677216202/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/251674430/10002 @@ -715,11 +715,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1262739205 + 1263415305 @@ -767,7 +767,7 @@ 1 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1677216202/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/251674430/10002 @@ -777,21 +777,21 @@ - CNTR_NAME_FS_346_NUM_INPUT_ROWS + CNTR_NAME_FS_2_NUM_INPUT_ROWS - CNTR_NAME_FS_346_NUM_OUTPUT_ROWS + CNTR_NAME_FS_2_NUM_OUTPUT_ROWS - CNTR_NAME_FS_346_TIME_TAKEN + CNTR_NAME_FS_2_TIME_TAKEN - CNTR_NAME_FS_346_FATAL_ERROR + CNTR_NAME_FS_2_FATAL_ERROR - FS_346 + FS_2 @@ -866,21 +866,21 @@ - CNTR_NAME_SEL_345_NUM_INPUT_ROWS + CNTR_NAME_SEL_1_NUM_INPUT_ROWS - CNTR_NAME_SEL_345_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_1_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_345_TIME_TAKEN + CNTR_NAME_SEL_1_TIME_TAKEN - CNTR_NAME_SEL_345_FATAL_ERROR + CNTR_NAME_SEL_1_FATAL_ERROR - SEL_345 + SEL_1 @@ -931,16 +931,16 @@ - CNTR_NAME_TS_344_NUM_INPUT_ROWS + CNTR_NAME_TS_0_NUM_INPUT_ROWS - CNTR_NAME_TS_344_NUM_OUTPUT_ROWS + CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - CNTR_NAME_TS_344_TIME_TAKEN + CNTR_NAME_TS_0_TIME_TAKEN - CNTR_NAME_TS_344_FATAL_ERROR + CNTR_NAME_TS_0_FATAL_ERROR @@ -955,7 +955,7 @@ - TS_344 + TS_0 @@ -992,7 +992,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src src @@ -1004,7 +1004,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Index: ql/src/test/results/compiler/plan/input8.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input8.q.xml (revision 4584) +++ ql/src/test/results/compiler/plan/input8.q.xml (working copy) @@ -1,5 +1,5 @@ - + Stage-2 @@ -62,11 +62,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src1 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src1 transient_lastDdlTime - 1262739195 + 1263415297 @@ -111,7 +111,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/955121961/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/37685710/10001 @@ -147,21 +147,21 @@ - CNTR_NAME_FS_312_NUM_INPUT_ROWS + CNTR_NAME_FS_2_NUM_INPUT_ROWS - CNTR_NAME_FS_312_NUM_OUTPUT_ROWS + CNTR_NAME_FS_2_NUM_OUTPUT_ROWS - CNTR_NAME_FS_312_TIME_TAKEN + CNTR_NAME_FS_2_TIME_TAKEN - CNTR_NAME_FS_312_FATAL_ERROR + CNTR_NAME_FS_2_FATAL_ERROR - FS_312 + FS_2 @@ -371,21 +371,21 @@ - CNTR_NAME_SEL_311_NUM_INPUT_ROWS + CNTR_NAME_SEL_1_NUM_INPUT_ROWS - CNTR_NAME_SEL_311_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_1_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_311_TIME_TAKEN + CNTR_NAME_SEL_1_TIME_TAKEN - CNTR_NAME_SEL_311_FATAL_ERROR + CNTR_NAME_SEL_1_FATAL_ERROR - SEL_311 + SEL_1 @@ -455,16 +455,16 @@ - CNTR_NAME_TS_310_NUM_INPUT_ROWS + CNTR_NAME_TS_0_NUM_INPUT_ROWS - CNTR_NAME_TS_310_NUM_OUTPUT_ROWS + CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - CNTR_NAME_TS_310_TIME_TAKEN + CNTR_NAME_TS_0_TIME_TAKEN - CNTR_NAME_TS_310_FATAL_ERROR + CNTR_NAME_TS_0_FATAL_ERROR @@ -476,7 +476,7 @@ - TS_310 + TS_0 @@ -513,7 +513,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src1 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src1 src1 @@ -525,7 +525,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src1 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src1 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Index: ql/src/test/results/compiler/plan/input9.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input9.q.xml (revision 4584) +++ ql/src/test/results/compiler/plan/input9.q.xml (working copy) @@ -1,5 +1,5 @@ - + @@ -30,7 +30,7 @@ true - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/469779020/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/110772963/10000 @@ -83,11 +83,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1262739198 + 1263415300 @@ -97,7 +97,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/469779020/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/110772963/10001 @@ -125,10 +125,10 @@ true - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/458496460/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1232789964/10002 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/469779020/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/110772963/10000 @@ -146,7 +146,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/458496460/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1232789964/10002 @@ -301,21 +301,21 @@ - CNTR_NAME_RS_322_NUM_INPUT_ROWS + CNTR_NAME_RS_6_NUM_INPUT_ROWS - CNTR_NAME_RS_322_NUM_OUTPUT_ROWS + CNTR_NAME_RS_6_NUM_OUTPUT_ROWS - CNTR_NAME_RS_322_TIME_TAKEN + CNTR_NAME_RS_6_TIME_TAKEN - CNTR_NAME_RS_322_FATAL_ERROR + CNTR_NAME_RS_6_FATAL_ERROR - RS_322 + RS_6 @@ -359,21 +359,21 @@ - CNTR_NAME_TS_321_NUM_INPUT_ROWS + CNTR_NAME_TS_5_NUM_INPUT_ROWS - CNTR_NAME_TS_321_NUM_OUTPUT_ROWS + CNTR_NAME_TS_5_NUM_OUTPUT_ROWS - CNTR_NAME_TS_321_TIME_TAKEN + CNTR_NAME_TS_5_TIME_TAKEN - CNTR_NAME_TS_321_FATAL_ERROR + CNTR_NAME_TS_5_FATAL_ERROR - TS_321 + TS_5 @@ -391,10 +391,10 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/458496460/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1232789964/10002 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/458496460/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1232789964/10002 @@ -403,7 +403,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/458496460/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1232789964/10002 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -436,7 +436,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/469779020/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/110772963/10000 @@ -485,7 +485,7 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/dest1 file.outputformat @@ -493,7 +493,7 @@ transient_lastDdlTime - 1262739198 + 1263415300 @@ -507,21 +507,21 @@ - CNTR_NAME_FS_324_NUM_INPUT_ROWS + CNTR_NAME_FS_8_NUM_INPUT_ROWS - CNTR_NAME_FS_324_NUM_OUTPUT_ROWS + CNTR_NAME_FS_8_NUM_OUTPUT_ROWS - CNTR_NAME_FS_324_TIME_TAKEN + CNTR_NAME_FS_8_TIME_TAKEN - CNTR_NAME_FS_324_FATAL_ERROR + CNTR_NAME_FS_8_FATAL_ERROR - FS_324 + FS_8 @@ -557,21 +557,21 @@ - CNTR_NAME_OP_323_NUM_INPUT_ROWS + CNTR_NAME_OP_7_NUM_INPUT_ROWS - CNTR_NAME_OP_323_NUM_OUTPUT_ROWS + CNTR_NAME_OP_7_NUM_OUTPUT_ROWS - CNTR_NAME_OP_323_TIME_TAKEN + CNTR_NAME_OP_7_TIME_TAKEN - CNTR_NAME_OP_323_FATAL_ERROR + CNTR_NAME_OP_7_FATAL_ERROR - OP_323 + OP_7 @@ -633,7 +633,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/458496460/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1232789964/10002 @@ -719,11 +719,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src1 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src1 transient_lastDdlTime - 1262739198 + 1263415299 @@ -779,7 +779,7 @@ 1 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/458496460/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1232789964/10002 @@ -789,21 +789,21 @@ - CNTR_NAME_FS_319_NUM_INPUT_ROWS + CNTR_NAME_FS_3_NUM_INPUT_ROWS - CNTR_NAME_FS_319_NUM_OUTPUT_ROWS + CNTR_NAME_FS_3_NUM_OUTPUT_ROWS - CNTR_NAME_FS_319_TIME_TAKEN + CNTR_NAME_FS_3_TIME_TAKEN - CNTR_NAME_FS_319_FATAL_ERROR + CNTR_NAME_FS_3_FATAL_ERROR - FS_319 + FS_3 @@ -872,21 +872,21 @@ - CNTR_NAME_SEL_318_NUM_INPUT_ROWS + CNTR_NAME_SEL_2_NUM_INPUT_ROWS - CNTR_NAME_SEL_318_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_318_TIME_TAKEN + CNTR_NAME_SEL_2_TIME_TAKEN - CNTR_NAME_SEL_318_FATAL_ERROR + CNTR_NAME_SEL_2_FATAL_ERROR - SEL_318 + SEL_2 @@ -976,21 +976,21 @@ - CNTR_NAME_FIL_317_NUM_INPUT_ROWS + CNTR_NAME_FIL_1_NUM_INPUT_ROWS - CNTR_NAME_FIL_317_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_1_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_317_TIME_TAKEN + CNTR_NAME_FIL_1_TIME_TAKEN - CNTR_NAME_FIL_317_FATAL_ERROR + CNTR_NAME_FIL_1_FATAL_ERROR - FIL_317 + FIL_1 @@ -1076,21 +1076,21 @@ - CNTR_NAME_FIL_320_NUM_INPUT_ROWS + CNTR_NAME_FIL_4_NUM_INPUT_ROWS - CNTR_NAME_FIL_320_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_4_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_320_TIME_TAKEN + CNTR_NAME_FIL_4_TIME_TAKEN - CNTR_NAME_FIL_320_FATAL_ERROR + CNTR_NAME_FIL_4_FATAL_ERROR - FIL_320 + FIL_4 @@ -1120,16 +1120,16 @@ - CNTR_NAME_TS_316_NUM_INPUT_ROWS + CNTR_NAME_TS_0_NUM_INPUT_ROWS - CNTR_NAME_TS_316_NUM_OUTPUT_ROWS + CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - CNTR_NAME_TS_316_TIME_TAKEN + CNTR_NAME_TS_0_TIME_TAKEN - CNTR_NAME_TS_316_FATAL_ERROR + CNTR_NAME_TS_0_FATAL_ERROR @@ -1141,7 +1141,7 @@ - TS_316 + TS_0 @@ -1157,7 +1157,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src1 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src1 src1 @@ -1169,7 +1169,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src1 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src1 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Index: ql/src/test/results/compiler/plan/union.q.xml =================================================================== --- ql/src/test/results/compiler/plan/union.q.xml (revision 4584) +++ ql/src/test/results/compiler/plan/union.q.xml (working copy) @@ -1,5 +1,5 @@ - + @@ -33,7 +33,7 @@ true - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1235481201/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/949620779/10000 ../build/ql/test/data/warehouse/union.out @@ -64,10 +64,10 @@ true - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1388754309/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/958101029/10001 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1235481201/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/949620779/10000 @@ -85,7 +85,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1388754309/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/958101029/10001 @@ -240,21 +240,21 @@ - CNTR_NAME_RS_776_NUM_INPUT_ROWS + CNTR_NAME_RS_12_NUM_INPUT_ROWS - CNTR_NAME_RS_776_NUM_OUTPUT_ROWS + CNTR_NAME_RS_12_NUM_OUTPUT_ROWS - CNTR_NAME_RS_776_TIME_TAKEN + CNTR_NAME_RS_12_TIME_TAKEN - CNTR_NAME_RS_776_FATAL_ERROR + CNTR_NAME_RS_12_FATAL_ERROR - RS_776 + RS_12 @@ -298,21 +298,21 @@ - CNTR_NAME_TS_775_NUM_INPUT_ROWS + CNTR_NAME_TS_11_NUM_INPUT_ROWS - CNTR_NAME_TS_775_NUM_OUTPUT_ROWS + CNTR_NAME_TS_11_NUM_OUTPUT_ROWS - CNTR_NAME_TS_775_TIME_TAKEN + CNTR_NAME_TS_11_TIME_TAKEN - CNTR_NAME_TS_775_FATAL_ERROR + CNTR_NAME_TS_11_FATAL_ERROR - TS_775 + TS_11 @@ -330,10 +330,10 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1388754309/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/958101029/10001 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1388754309/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/958101029/10001 @@ -342,7 +342,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1388754309/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/958101029/10001 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -398,7 +398,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1235481201/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/949620779/10000 @@ -434,21 +434,21 @@ - CNTR_NAME_FS_778_NUM_INPUT_ROWS + CNTR_NAME_FS_14_NUM_INPUT_ROWS - CNTR_NAME_FS_778_NUM_OUTPUT_ROWS + CNTR_NAME_FS_14_NUM_OUTPUT_ROWS - CNTR_NAME_FS_778_TIME_TAKEN + CNTR_NAME_FS_14_TIME_TAKEN - CNTR_NAME_FS_778_FATAL_ERROR + CNTR_NAME_FS_14_FATAL_ERROR - FS_778 + FS_14 @@ -484,21 +484,21 @@ - CNTR_NAME_OP_777_NUM_INPUT_ROWS + CNTR_NAME_OP_13_NUM_INPUT_ROWS - CNTR_NAME_OP_777_NUM_OUTPUT_ROWS + CNTR_NAME_OP_13_NUM_OUTPUT_ROWS - CNTR_NAME_OP_777_TIME_TAKEN + CNTR_NAME_OP_13_TIME_TAKEN - CNTR_NAME_OP_777_FATAL_ERROR + CNTR_NAME_OP_13_FATAL_ERROR - OP_777 + OP_13 @@ -556,7 +556,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1388754309/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/958101029/10001 @@ -642,11 +642,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1262739274 + 1263415372 @@ -752,7 +752,7 @@ 1 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1388754309/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/958101029/10001 @@ -762,21 +762,21 @@ - CNTR_NAME_FS_772_NUM_INPUT_ROWS + CNTR_NAME_FS_8_NUM_INPUT_ROWS - CNTR_NAME_FS_772_NUM_OUTPUT_ROWS + CNTR_NAME_FS_8_NUM_OUTPUT_ROWS - CNTR_NAME_FS_772_TIME_TAKEN + CNTR_NAME_FS_8_TIME_TAKEN - CNTR_NAME_FS_772_FATAL_ERROR + CNTR_NAME_FS_8_FATAL_ERROR - FS_772 + FS_8 @@ -854,21 +854,21 @@ - CNTR_NAME_SEL_771_NUM_INPUT_ROWS + CNTR_NAME_SEL_7_NUM_INPUT_ROWS - CNTR_NAME_SEL_771_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_7_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_771_TIME_TAKEN + CNTR_NAME_SEL_7_TIME_TAKEN - CNTR_NAME_SEL_771_FATAL_ERROR + CNTR_NAME_SEL_7_FATAL_ERROR - SEL_771 + SEL_7 @@ -921,21 +921,21 @@ - CNTR_NAME_UNION_770_NUM_INPUT_ROWS + CNTR_NAME_UNION_6_NUM_INPUT_ROWS - CNTR_NAME_UNION_770_NUM_OUTPUT_ROWS + CNTR_NAME_UNION_6_NUM_OUTPUT_ROWS - CNTR_NAME_UNION_770_TIME_TAKEN + CNTR_NAME_UNION_6_TIME_TAKEN - CNTR_NAME_UNION_770_FATAL_ERROR + CNTR_NAME_UNION_6_FATAL_ERROR - UNION_770 + UNION_6 @@ -1013,21 +1013,21 @@ - CNTR_NAME_SEL_769_NUM_INPUT_ROWS + CNTR_NAME_SEL_5_NUM_INPUT_ROWS - CNTR_NAME_SEL_769_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_5_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_769_TIME_TAKEN + CNTR_NAME_SEL_5_TIME_TAKEN - CNTR_NAME_SEL_769_FATAL_ERROR + CNTR_NAME_SEL_5_FATAL_ERROR - SEL_769 + SEL_5 @@ -1102,21 +1102,21 @@ - CNTR_NAME_FIL_768_NUM_INPUT_ROWS + CNTR_NAME_FIL_4_NUM_INPUT_ROWS - CNTR_NAME_FIL_768_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_4_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_768_TIME_TAKEN + CNTR_NAME_FIL_4_TIME_TAKEN - CNTR_NAME_FIL_768_FATAL_ERROR + CNTR_NAME_FIL_4_FATAL_ERROR - FIL_768 + FIL_4 @@ -1183,21 +1183,21 @@ - CNTR_NAME_FIL_774_NUM_INPUT_ROWS + CNTR_NAME_FIL_10_NUM_INPUT_ROWS - CNTR_NAME_FIL_774_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_10_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_774_TIME_TAKEN + CNTR_NAME_FIL_10_TIME_TAKEN - CNTR_NAME_FIL_774_FATAL_ERROR + CNTR_NAME_FIL_10_FATAL_ERROR - FIL_774 + FIL_10 @@ -1220,16 +1220,16 @@ - CNTR_NAME_TS_767_NUM_INPUT_ROWS + CNTR_NAME_TS_3_NUM_INPUT_ROWS - CNTR_NAME_TS_767_NUM_OUTPUT_ROWS + CNTR_NAME_TS_3_NUM_OUTPUT_ROWS - CNTR_NAME_TS_767_TIME_TAKEN + CNTR_NAME_TS_3_TIME_TAKEN - CNTR_NAME_TS_767_FATAL_ERROR + CNTR_NAME_TS_3_FATAL_ERROR @@ -1244,7 +1244,7 @@ - TS_767 + TS_3 @@ -1423,21 +1423,21 @@ - CNTR_NAME_SEL_766_NUM_INPUT_ROWS + CNTR_NAME_SEL_2_NUM_INPUT_ROWS - CNTR_NAME_SEL_766_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_766_TIME_TAKEN + CNTR_NAME_SEL_2_TIME_TAKEN - CNTR_NAME_SEL_766_FATAL_ERROR + CNTR_NAME_SEL_2_FATAL_ERROR - SEL_766 + SEL_2 @@ -1518,21 +1518,21 @@ - CNTR_NAME_FIL_765_NUM_INPUT_ROWS + CNTR_NAME_FIL_1_NUM_INPUT_ROWS - CNTR_NAME_FIL_765_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_1_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_765_TIME_TAKEN + CNTR_NAME_FIL_1_TIME_TAKEN - CNTR_NAME_FIL_765_FATAL_ERROR + CNTR_NAME_FIL_1_FATAL_ERROR - FIL_765 + FIL_1 @@ -1627,21 +1627,21 @@ - CNTR_NAME_FIL_773_NUM_INPUT_ROWS + CNTR_NAME_FIL_9_NUM_INPUT_ROWS - CNTR_NAME_FIL_773_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_9_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_773_TIME_TAKEN + CNTR_NAME_FIL_9_TIME_TAKEN - CNTR_NAME_FIL_773_FATAL_ERROR + CNTR_NAME_FIL_9_FATAL_ERROR - FIL_773 + FIL_9 @@ -1671,16 +1671,16 @@ - CNTR_NAME_TS_764_NUM_INPUT_ROWS + CNTR_NAME_TS_0_NUM_INPUT_ROWS - CNTR_NAME_TS_764_NUM_OUTPUT_ROWS + CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - CNTR_NAME_TS_764_TIME_TAKEN + CNTR_NAME_TS_0_TIME_TAKEN - CNTR_NAME_TS_764_FATAL_ERROR + CNTR_NAME_TS_0_FATAL_ERROR @@ -1695,7 +1695,7 @@ - TS_764 + TS_0 @@ -1715,7 +1715,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src null-subquery1:unioninput-subquery1:src @@ -1730,7 +1730,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Index: ql/src/test/results/compiler/plan/udf1.q.xml =================================================================== --- ql/src/test/results/compiler/plan/udf1.q.xml (revision 4584) +++ ql/src/test/results/compiler/plan/udf1.q.xml (working copy) @@ -1,5 +1,5 @@ - + Stage-2 @@ -62,11 +62,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1262739260 + 1263415359 @@ -119,7 +119,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/763178732/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/180142573/10001 @@ -155,21 +155,21 @@ - CNTR_NAME_FS_729_NUM_INPUT_ROWS + CNTR_NAME_FS_3_NUM_INPUT_ROWS - CNTR_NAME_FS_729_NUM_OUTPUT_ROWS + CNTR_NAME_FS_3_NUM_OUTPUT_ROWS - CNTR_NAME_FS_729_TIME_TAKEN + CNTR_NAME_FS_3_TIME_TAKEN - CNTR_NAME_FS_729_FATAL_ERROR + CNTR_NAME_FS_3_FATAL_ERROR - FS_729 + FS_3 @@ -1282,21 +1282,21 @@ - CNTR_NAME_SEL_728_NUM_INPUT_ROWS + CNTR_NAME_SEL_2_NUM_INPUT_ROWS - CNTR_NAME_SEL_728_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_728_TIME_TAKEN + CNTR_NAME_SEL_2_TIME_TAKEN - CNTR_NAME_SEL_728_FATAL_ERROR + CNTR_NAME_SEL_2_FATAL_ERROR - SEL_728 + SEL_2 @@ -1596,21 +1596,21 @@ - CNTR_NAME_FIL_727_NUM_INPUT_ROWS + CNTR_NAME_FIL_1_NUM_INPUT_ROWS - CNTR_NAME_FIL_727_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_1_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_727_TIME_TAKEN + CNTR_NAME_FIL_1_TIME_TAKEN - CNTR_NAME_FIL_727_FATAL_ERROR + CNTR_NAME_FIL_1_FATAL_ERROR - FIL_727 + FIL_1 @@ -1705,21 +1705,21 @@ - CNTR_NAME_FIL_730_NUM_INPUT_ROWS + CNTR_NAME_FIL_4_NUM_INPUT_ROWS - CNTR_NAME_FIL_730_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_4_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_730_TIME_TAKEN + CNTR_NAME_FIL_4_TIME_TAKEN - CNTR_NAME_FIL_730_FATAL_ERROR + CNTR_NAME_FIL_4_FATAL_ERROR - FIL_730 + FIL_4 @@ -1749,16 +1749,16 @@ - CNTR_NAME_TS_726_NUM_INPUT_ROWS + CNTR_NAME_TS_0_NUM_INPUT_ROWS - CNTR_NAME_TS_726_NUM_OUTPUT_ROWS + CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - CNTR_NAME_TS_726_TIME_TAKEN + CNTR_NAME_TS_0_TIME_TAKEN - CNTR_NAME_TS_726_FATAL_ERROR + CNTR_NAME_TS_0_FATAL_ERROR @@ -1770,7 +1770,7 @@ - TS_726 + TS_0 @@ -1786,7 +1786,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src src @@ -1798,7 +1798,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Index: ql/src/test/results/compiler/plan/udf4.q.xml =================================================================== --- ql/src/test/results/compiler/plan/udf4.q.xml (revision 4584) +++ ql/src/test/results/compiler/plan/udf4.q.xml (working copy) @@ -1,5 +1,5 @@ - + Stage-2 @@ -62,11 +62,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1262739263 + 1263415362 @@ -111,7 +111,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1282756584/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/698882072/10001 @@ -147,21 +147,21 @@ - CNTR_NAME_FS_738_NUM_INPUT_ROWS + CNTR_NAME_FS_2_NUM_INPUT_ROWS - CNTR_NAME_FS_738_NUM_OUTPUT_ROWS + CNTR_NAME_FS_2_NUM_OUTPUT_ROWS - CNTR_NAME_FS_738_TIME_TAKEN + CNTR_NAME_FS_2_TIME_TAKEN - CNTR_NAME_FS_738_FATAL_ERROR + CNTR_NAME_FS_2_FATAL_ERROR - FS_738 + FS_2 @@ -1256,21 +1256,21 @@ - CNTR_NAME_SEL_737_NUM_INPUT_ROWS + CNTR_NAME_SEL_1_NUM_INPUT_ROWS - CNTR_NAME_SEL_737_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_1_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_737_TIME_TAKEN + CNTR_NAME_SEL_1_TIME_TAKEN - CNTR_NAME_SEL_737_FATAL_ERROR + CNTR_NAME_SEL_1_FATAL_ERROR - SEL_737 + SEL_1 @@ -1548,16 +1548,16 @@ - CNTR_NAME_TS_736_NUM_INPUT_ROWS + CNTR_NAME_TS_0_NUM_INPUT_ROWS - CNTR_NAME_TS_736_NUM_OUTPUT_ROWS + CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - CNTR_NAME_TS_736_TIME_TAKEN + CNTR_NAME_TS_0_TIME_TAKEN - CNTR_NAME_TS_736_FATAL_ERROR + CNTR_NAME_TS_0_FATAL_ERROR @@ -1565,7 +1565,7 @@ - TS_736 + TS_0 @@ -1606,7 +1606,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/dest1 dest1 @@ -1618,7 +1618,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/dest1 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Index: ql/src/test/results/compiler/plan/input_testxpath.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input_testxpath.q.xml (revision 4584) +++ ql/src/test/results/compiler/plan/input_testxpath.q.xml (working copy) @@ -1,5 +1,5 @@ - + Stage-2 @@ -66,11 +66,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src_thrift + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src_thrift transient_lastDdlTime - 1262739208 + 1263415308 @@ -115,7 +115,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/2063408437/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1238472423/10001 @@ -151,21 +151,21 @@ - CNTR_NAME_FS_360_NUM_INPUT_ROWS + CNTR_NAME_FS_2_NUM_INPUT_ROWS - CNTR_NAME_FS_360_NUM_OUTPUT_ROWS + CNTR_NAME_FS_2_NUM_OUTPUT_ROWS - CNTR_NAME_FS_360_TIME_TAKEN + CNTR_NAME_FS_2_TIME_TAKEN - CNTR_NAME_FS_360_FATAL_ERROR + CNTR_NAME_FS_2_FATAL_ERROR - FS_360 + FS_2 @@ -403,21 +403,21 @@ - CNTR_NAME_SEL_359_NUM_INPUT_ROWS + CNTR_NAME_SEL_1_NUM_INPUT_ROWS - CNTR_NAME_SEL_359_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_1_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_359_TIME_TAKEN + CNTR_NAME_SEL_1_TIME_TAKEN - CNTR_NAME_SEL_359_FATAL_ERROR + CNTR_NAME_SEL_1_FATAL_ERROR - SEL_359 + SEL_1 @@ -487,16 +487,16 @@ - CNTR_NAME_TS_358_NUM_INPUT_ROWS + CNTR_NAME_TS_0_NUM_INPUT_ROWS - CNTR_NAME_TS_358_NUM_OUTPUT_ROWS + CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - CNTR_NAME_TS_358_TIME_TAKEN + CNTR_NAME_TS_0_TIME_TAKEN - CNTR_NAME_TS_358_FATAL_ERROR + CNTR_NAME_TS_0_FATAL_ERROR @@ -514,7 +514,7 @@ - TS_358 + TS_0 @@ -595,7 +595,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src_thrift + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src_thrift src_thrift @@ -607,7 +607,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src_thrift + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src_thrift org.apache.hadoop.hive.serde2.thrift.ThriftDeserializer Index: ql/src/test/results/compiler/plan/udf6.q.xml =================================================================== --- ql/src/test/results/compiler/plan/udf6.q.xml (revision 4584) +++ ql/src/test/results/compiler/plan/udf6.q.xml (working copy) @@ -1,5 +1,5 @@ - + Stage-2 @@ -62,11 +62,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1262739265 + 1263415365 @@ -111,7 +111,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/2122400628/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1676839030/10001 @@ -147,21 +147,21 @@ - CNTR_NAME_FS_744_NUM_INPUT_ROWS + CNTR_NAME_FS_2_NUM_INPUT_ROWS - CNTR_NAME_FS_744_NUM_OUTPUT_ROWS + CNTR_NAME_FS_2_NUM_OUTPUT_ROWS - CNTR_NAME_FS_744_TIME_TAKEN + CNTR_NAME_FS_2_TIME_TAKEN - CNTR_NAME_FS_744_FATAL_ERROR + CNTR_NAME_FS_2_FATAL_ERROR - FS_744 + FS_2 @@ -332,21 +332,21 @@ - CNTR_NAME_SEL_743_NUM_INPUT_ROWS + CNTR_NAME_SEL_1_NUM_INPUT_ROWS - CNTR_NAME_SEL_743_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_1_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_743_TIME_TAKEN + CNTR_NAME_SEL_1_TIME_TAKEN - CNTR_NAME_SEL_743_FATAL_ERROR + CNTR_NAME_SEL_1_FATAL_ERROR - SEL_743 + SEL_1 @@ -403,16 +403,16 @@ - CNTR_NAME_TS_742_NUM_INPUT_ROWS + CNTR_NAME_TS_0_NUM_INPUT_ROWS - CNTR_NAME_TS_742_NUM_OUTPUT_ROWS + CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - CNTR_NAME_TS_742_TIME_TAKEN + CNTR_NAME_TS_0_TIME_TAKEN - CNTR_NAME_TS_742_FATAL_ERROR + CNTR_NAME_TS_0_FATAL_ERROR @@ -420,7 +420,7 @@ - TS_742 + TS_0 @@ -457,7 +457,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src src @@ -469,7 +469,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Index: ql/src/test/results/compiler/plan/input_part1.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input_part1.q.xml (revision 4584) +++ ql/src/test/results/compiler/plan/input_part1.q.xml (working copy) @@ -1,5 +1,5 @@ - + Stage-2 @@ -75,11 +75,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/srcpart + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/srcpart transient_lastDdlTime - 1262739199 + 1263415301 @@ -132,7 +132,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/817847895/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/61011718/10001 @@ -168,21 +168,21 @@ - CNTR_NAME_FS_337_NUM_INPUT_ROWS + CNTR_NAME_FS_3_NUM_INPUT_ROWS - CNTR_NAME_FS_337_NUM_OUTPUT_ROWS + CNTR_NAME_FS_3_NUM_OUTPUT_ROWS - CNTR_NAME_FS_337_TIME_TAKEN + CNTR_NAME_FS_3_TIME_TAKEN - CNTR_NAME_FS_337_FATAL_ERROR + CNTR_NAME_FS_3_FATAL_ERROR - FS_337 + FS_3 @@ -346,21 +346,21 @@ - CNTR_NAME_SEL_336_NUM_INPUT_ROWS + CNTR_NAME_SEL_2_NUM_INPUT_ROWS - CNTR_NAME_SEL_336_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_336_TIME_TAKEN + CNTR_NAME_SEL_2_TIME_TAKEN - CNTR_NAME_SEL_336_FATAL_ERROR + CNTR_NAME_SEL_2_FATAL_ERROR - SEL_336 + SEL_2 @@ -637,21 +637,21 @@ - CNTR_NAME_FIL_335_NUM_INPUT_ROWS + CNTR_NAME_FIL_1_NUM_INPUT_ROWS - CNTR_NAME_FIL_335_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_1_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_335_TIME_TAKEN + CNTR_NAME_FIL_1_TIME_TAKEN - CNTR_NAME_FIL_335_FATAL_ERROR + CNTR_NAME_FIL_1_FATAL_ERROR - FIL_335 + FIL_1 @@ -908,21 +908,21 @@ - CNTR_NAME_FIL_338_NUM_INPUT_ROWS + CNTR_NAME_FIL_4_NUM_INPUT_ROWS - CNTR_NAME_FIL_338_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_4_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_338_TIME_TAKEN + CNTR_NAME_FIL_4_TIME_TAKEN - CNTR_NAME_FIL_338_FATAL_ERROR + CNTR_NAME_FIL_4_FATAL_ERROR - FIL_338 + FIL_4 @@ -952,16 +952,16 @@ - CNTR_NAME_TS_334_NUM_INPUT_ROWS + CNTR_NAME_TS_0_NUM_INPUT_ROWS - CNTR_NAME_TS_334_NUM_OUTPUT_ROWS + CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - CNTR_NAME_TS_334_TIME_TAKEN + CNTR_NAME_TS_0_TIME_TAKEN - CNTR_NAME_TS_334_FATAL_ERROR + CNTR_NAME_TS_0_FATAL_ERROR @@ -982,7 +982,7 @@ - TS_334 + TS_0 @@ -998,7 +998,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 srcpart @@ -1010,7 +1010,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Index: ql/src/test/results/compiler/plan/groupby1.q.xml =================================================================== --- ql/src/test/results/compiler/plan/groupby1.q.xml (revision 4584) +++ ql/src/test/results/compiler/plan/groupby1.q.xml (working copy) @@ -1,5 +1,5 @@ - + @@ -26,7 +26,7 @@ true - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/362038280/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/214974041/10000 @@ -79,11 +79,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1262739152 + 1263415257 @@ -93,7 +93,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/362038280/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/214974041/10001 @@ -164,11 +164,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1262739152 + 1263415257 @@ -352,21 +352,21 @@ - CNTR_NAME_RS_31_NUM_INPUT_ROWS + CNTR_NAME_RS_3_NUM_INPUT_ROWS - CNTR_NAME_RS_31_NUM_OUTPUT_ROWS + CNTR_NAME_RS_3_NUM_OUTPUT_ROWS - CNTR_NAME_RS_31_TIME_TAKEN + CNTR_NAME_RS_3_TIME_TAKEN - CNTR_NAME_RS_31_FATAL_ERROR + CNTR_NAME_RS_3_FATAL_ERROR - RS_31 + RS_3 @@ -525,21 +525,21 @@ - CNTR_NAME_GBY_30_NUM_INPUT_ROWS + CNTR_NAME_GBY_2_NUM_INPUT_ROWS - CNTR_NAME_GBY_30_NUM_OUTPUT_ROWS + CNTR_NAME_GBY_2_NUM_OUTPUT_ROWS - CNTR_NAME_GBY_30_TIME_TAKEN + CNTR_NAME_GBY_2_TIME_TAKEN - CNTR_NAME_GBY_30_FATAL_ERROR + CNTR_NAME_GBY_2_FATAL_ERROR - GBY_30 + GBY_2 @@ -630,21 +630,21 @@ - CNTR_NAME_SEL_29_NUM_INPUT_ROWS + CNTR_NAME_SEL_1_NUM_INPUT_ROWS - CNTR_NAME_SEL_29_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_1_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_29_TIME_TAKEN + CNTR_NAME_SEL_1_TIME_TAKEN - CNTR_NAME_SEL_29_FATAL_ERROR + CNTR_NAME_SEL_1_FATAL_ERROR - SEL_29 + SEL_1 @@ -695,16 +695,16 @@ - CNTR_NAME_TS_28_NUM_INPUT_ROWS + CNTR_NAME_TS_0_NUM_INPUT_ROWS - CNTR_NAME_TS_28_NUM_OUTPUT_ROWS + CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - CNTR_NAME_TS_28_TIME_TAKEN + CNTR_NAME_TS_0_TIME_TAKEN - CNTR_NAME_TS_28_FATAL_ERROR + CNTR_NAME_TS_0_FATAL_ERROR @@ -719,7 +719,7 @@ - TS_28 + TS_0 @@ -741,7 +741,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src src @@ -753,7 +753,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -812,7 +812,7 @@ 1 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/362038280/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/214974041/10000 @@ -822,21 +822,21 @@ - CNTR_NAME_FS_34_NUM_INPUT_ROWS + CNTR_NAME_FS_6_NUM_INPUT_ROWS - CNTR_NAME_FS_34_NUM_OUTPUT_ROWS + CNTR_NAME_FS_6_NUM_OUTPUT_ROWS - CNTR_NAME_FS_34_TIME_TAKEN + CNTR_NAME_FS_6_TIME_TAKEN - CNTR_NAME_FS_34_FATAL_ERROR + CNTR_NAME_FS_6_FATAL_ERROR - FS_34 + FS_6 @@ -936,21 +936,21 @@ - CNTR_NAME_SEL_33_NUM_INPUT_ROWS + CNTR_NAME_SEL_5_NUM_INPUT_ROWS - CNTR_NAME_SEL_33_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_5_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_33_TIME_TAKEN + CNTR_NAME_SEL_5_TIME_TAKEN - CNTR_NAME_SEL_33_FATAL_ERROR + CNTR_NAME_SEL_5_FATAL_ERROR - SEL_33 + SEL_5 @@ -1068,21 +1068,21 @@ - CNTR_NAME_GBY_32_NUM_INPUT_ROWS + CNTR_NAME_GBY_4_NUM_INPUT_ROWS - CNTR_NAME_GBY_32_NUM_OUTPUT_ROWS + CNTR_NAME_GBY_4_NUM_OUTPUT_ROWS - CNTR_NAME_GBY_32_TIME_TAKEN + CNTR_NAME_GBY_4_TIME_TAKEN - CNTR_NAME_GBY_32_FATAL_ERROR + CNTR_NAME_GBY_4_FATAL_ERROR - GBY_32 + GBY_4 Index: ql/src/test/results/compiler/plan/groupby2.q.xml =================================================================== --- ql/src/test/results/compiler/plan/groupby2.q.xml (revision 4584) +++ ql/src/test/results/compiler/plan/groupby2.q.xml (working copy) @@ -1,5 +1,5 @@ - + Stage-2 @@ -62,11 +62,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1262739155 + 1263415260 @@ -294,21 +294,21 @@ - CNTR_NAME_RS_45_NUM_INPUT_ROWS + CNTR_NAME_RS_3_NUM_INPUT_ROWS - CNTR_NAME_RS_45_NUM_OUTPUT_ROWS + CNTR_NAME_RS_3_NUM_OUTPUT_ROWS - CNTR_NAME_RS_45_TIME_TAKEN + CNTR_NAME_RS_3_TIME_TAKEN - CNTR_NAME_RS_45_FATAL_ERROR + CNTR_NAME_RS_3_FATAL_ERROR - RS_45 + RS_3 @@ -646,21 +646,21 @@ - CNTR_NAME_GBY_44_NUM_INPUT_ROWS + CNTR_NAME_GBY_2_NUM_INPUT_ROWS - CNTR_NAME_GBY_44_NUM_OUTPUT_ROWS + CNTR_NAME_GBY_2_NUM_OUTPUT_ROWS - CNTR_NAME_GBY_44_TIME_TAKEN + CNTR_NAME_GBY_2_TIME_TAKEN - CNTR_NAME_GBY_44_FATAL_ERROR + CNTR_NAME_GBY_2_FATAL_ERROR - GBY_44 + GBY_2 @@ -771,21 +771,21 @@ - CNTR_NAME_SEL_43_NUM_INPUT_ROWS + CNTR_NAME_SEL_1_NUM_INPUT_ROWS - CNTR_NAME_SEL_43_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_1_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_43_TIME_TAKEN + CNTR_NAME_SEL_1_TIME_TAKEN - CNTR_NAME_SEL_43_FATAL_ERROR + CNTR_NAME_SEL_1_FATAL_ERROR - SEL_43 + SEL_1 @@ -836,16 +836,16 @@ - CNTR_NAME_TS_42_NUM_INPUT_ROWS + CNTR_NAME_TS_0_NUM_INPUT_ROWS - CNTR_NAME_TS_42_NUM_OUTPUT_ROWS + CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - CNTR_NAME_TS_42_TIME_TAKEN + CNTR_NAME_TS_0_TIME_TAKEN - CNTR_NAME_TS_42_FATAL_ERROR + CNTR_NAME_TS_0_FATAL_ERROR @@ -860,7 +860,7 @@ - TS_42 + TS_0 @@ -882,7 +882,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src src @@ -894,7 +894,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -950,7 +950,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1180224763/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1286023693/10001 @@ -986,21 +986,21 @@ - CNTR_NAME_FS_48_NUM_INPUT_ROWS + CNTR_NAME_FS_6_NUM_INPUT_ROWS - CNTR_NAME_FS_48_NUM_OUTPUT_ROWS + CNTR_NAME_FS_6_NUM_OUTPUT_ROWS - CNTR_NAME_FS_48_TIME_TAKEN + CNTR_NAME_FS_6_TIME_TAKEN - CNTR_NAME_FS_48_FATAL_ERROR + CNTR_NAME_FS_6_FATAL_ERROR - FS_48 + FS_6 @@ -1164,21 +1164,21 @@ - CNTR_NAME_SEL_47_NUM_INPUT_ROWS + CNTR_NAME_SEL_5_NUM_INPUT_ROWS - CNTR_NAME_SEL_47_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_5_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_47_TIME_TAKEN + CNTR_NAME_SEL_5_TIME_TAKEN - CNTR_NAME_SEL_47_FATAL_ERROR + CNTR_NAME_SEL_5_FATAL_ERROR - SEL_47 + SEL_5 @@ -1350,21 +1350,21 @@ - CNTR_NAME_GBY_46_NUM_INPUT_ROWS + CNTR_NAME_GBY_4_NUM_INPUT_ROWS - CNTR_NAME_GBY_46_NUM_OUTPUT_ROWS + CNTR_NAME_GBY_4_NUM_OUTPUT_ROWS - CNTR_NAME_GBY_46_TIME_TAKEN + CNTR_NAME_GBY_4_TIME_TAKEN - CNTR_NAME_GBY_46_FATAL_ERROR + CNTR_NAME_GBY_4_FATAL_ERROR - GBY_46 + GBY_4 Index: ql/src/test/results/compiler/plan/udf_case.q.xml =================================================================== --- ql/src/test/results/compiler/plan/udf_case.q.xml (revision 4584) +++ ql/src/test/results/compiler/plan/udf_case.q.xml (working copy) @@ -1,5 +1,5 @@ - + Stage-2 @@ -62,11 +62,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1262739268 + 1263415367 @@ -115,7 +115,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/215131228/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/859876014/10001 @@ -151,21 +151,21 @@ - CNTR_NAME_FS_751_NUM_INPUT_ROWS + CNTR_NAME_FS_3_NUM_INPUT_ROWS - CNTR_NAME_FS_751_NUM_OUTPUT_ROWS + CNTR_NAME_FS_3_NUM_OUTPUT_ROWS - CNTR_NAME_FS_751_TIME_TAKEN + CNTR_NAME_FS_3_TIME_TAKEN - CNTR_NAME_FS_751_FATAL_ERROR + CNTR_NAME_FS_3_FATAL_ERROR - FS_751 + FS_3 @@ -220,21 +220,21 @@ - CNTR_NAME_LIM_750_NUM_INPUT_ROWS + CNTR_NAME_LIM_2_NUM_INPUT_ROWS - CNTR_NAME_LIM_750_NUM_OUTPUT_ROWS + CNTR_NAME_LIM_2_NUM_OUTPUT_ROWS - CNTR_NAME_LIM_750_TIME_TAKEN + CNTR_NAME_LIM_2_TIME_TAKEN - CNTR_NAME_LIM_750_FATAL_ERROR + CNTR_NAME_LIM_2_FATAL_ERROR - LIM_750 + LIM_2 @@ -452,21 +452,21 @@ - CNTR_NAME_SEL_749_NUM_INPUT_ROWS + CNTR_NAME_SEL_1_NUM_INPUT_ROWS - CNTR_NAME_SEL_749_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_1_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_749_TIME_TAKEN + CNTR_NAME_SEL_1_TIME_TAKEN - CNTR_NAME_SEL_749_FATAL_ERROR + CNTR_NAME_SEL_1_FATAL_ERROR - SEL_749 + SEL_1 @@ -496,16 +496,16 @@ - CNTR_NAME_TS_748_NUM_INPUT_ROWS + CNTR_NAME_TS_0_NUM_INPUT_ROWS - CNTR_NAME_TS_748_NUM_OUTPUT_ROWS + CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - CNTR_NAME_TS_748_TIME_TAKEN + CNTR_NAME_TS_0_TIME_TAKEN - CNTR_NAME_TS_748_FATAL_ERROR + CNTR_NAME_TS_0_FATAL_ERROR @@ -513,7 +513,7 @@ - TS_748 + TS_0 @@ -554,7 +554,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src src @@ -566,7 +566,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Index: ql/src/test/results/compiler/plan/groupby3.q.xml =================================================================== --- ql/src/test/results/compiler/plan/groupby3.q.xml (revision 4584) +++ ql/src/test/results/compiler/plan/groupby3.q.xml (working copy) @@ -1,5 +1,5 @@ - + Stage-2 @@ -62,11 +62,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1262739158 + 1263415263 @@ -314,21 +314,21 @@ - CNTR_NAME_RS_59_NUM_INPUT_ROWS + CNTR_NAME_RS_3_NUM_INPUT_ROWS - CNTR_NAME_RS_59_NUM_OUTPUT_ROWS + CNTR_NAME_RS_3_NUM_OUTPUT_ROWS - CNTR_NAME_RS_59_TIME_TAKEN + CNTR_NAME_RS_3_TIME_TAKEN - CNTR_NAME_RS_59_FATAL_ERROR + CNTR_NAME_RS_3_FATAL_ERROR - RS_59 + RS_3 @@ -825,21 +825,21 @@ - CNTR_NAME_GBY_58_NUM_INPUT_ROWS + CNTR_NAME_GBY_2_NUM_INPUT_ROWS - CNTR_NAME_GBY_58_NUM_OUTPUT_ROWS + CNTR_NAME_GBY_2_NUM_OUTPUT_ROWS - CNTR_NAME_GBY_58_TIME_TAKEN + CNTR_NAME_GBY_2_TIME_TAKEN - CNTR_NAME_GBY_58_FATAL_ERROR + CNTR_NAME_GBY_2_FATAL_ERROR - GBY_58 + GBY_2 @@ -954,21 +954,21 @@ - CNTR_NAME_SEL_57_NUM_INPUT_ROWS + CNTR_NAME_SEL_1_NUM_INPUT_ROWS - CNTR_NAME_SEL_57_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_1_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_57_TIME_TAKEN + CNTR_NAME_SEL_1_TIME_TAKEN - CNTR_NAME_SEL_57_FATAL_ERROR + CNTR_NAME_SEL_1_FATAL_ERROR - SEL_57 + SEL_1 @@ -1009,16 +1009,16 @@ - CNTR_NAME_TS_56_NUM_INPUT_ROWS + CNTR_NAME_TS_0_NUM_INPUT_ROWS - CNTR_NAME_TS_56_NUM_OUTPUT_ROWS + CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - CNTR_NAME_TS_56_TIME_TAKEN + CNTR_NAME_TS_0_TIME_TAKEN - CNTR_NAME_TS_56_FATAL_ERROR + CNTR_NAME_TS_0_FATAL_ERROR @@ -1030,7 +1030,7 @@ - TS_56 + TS_0 @@ -1066,7 +1066,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src src @@ -1078,7 +1078,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1134,7 +1134,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/2120442501/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1510414669/10001 @@ -1170,21 +1170,21 @@ - CNTR_NAME_FS_62_NUM_INPUT_ROWS + CNTR_NAME_FS_6_NUM_INPUT_ROWS - CNTR_NAME_FS_62_NUM_OUTPUT_ROWS + CNTR_NAME_FS_6_NUM_OUTPUT_ROWS - CNTR_NAME_FS_62_TIME_TAKEN + CNTR_NAME_FS_6_TIME_TAKEN - CNTR_NAME_FS_62_FATAL_ERROR + CNTR_NAME_FS_6_FATAL_ERROR - FS_62 + FS_6 @@ -1374,21 +1374,21 @@ - CNTR_NAME_SEL_61_NUM_INPUT_ROWS + CNTR_NAME_SEL_5_NUM_INPUT_ROWS - CNTR_NAME_SEL_61_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_5_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_61_TIME_TAKEN + CNTR_NAME_SEL_5_TIME_TAKEN - CNTR_NAME_SEL_61_FATAL_ERROR + CNTR_NAME_SEL_5_FATAL_ERROR - SEL_61 + SEL_5 @@ -1657,21 +1657,21 @@ - CNTR_NAME_GBY_60_NUM_INPUT_ROWS + CNTR_NAME_GBY_4_NUM_INPUT_ROWS - CNTR_NAME_GBY_60_NUM_OUTPUT_ROWS + CNTR_NAME_GBY_4_NUM_OUTPUT_ROWS - CNTR_NAME_GBY_60_TIME_TAKEN + CNTR_NAME_GBY_4_TIME_TAKEN - CNTR_NAME_GBY_60_FATAL_ERROR + CNTR_NAME_GBY_4_FATAL_ERROR - GBY_60 + GBY_4 Index: ql/src/test/results/compiler/plan/subq.q.xml =================================================================== --- ql/src/test/results/compiler/plan/subq.q.xml (revision 4584) +++ ql/src/test/results/compiler/plan/subq.q.xml (working copy) @@ -1,5 +1,5 @@ - + @@ -33,7 +33,7 @@ true - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1523340116/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/932755019/10000 ../build/ql/test/data/warehouse/union.out @@ -64,10 +64,10 @@ true - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/311198281/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/632586304/10001 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1523340116/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/932755019/10000 @@ -85,7 +85,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/311198281/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/632586304/10001 @@ -240,21 +240,21 @@ - CNTR_NAME_RS_713_NUM_INPUT_ROWS + CNTR_NAME_RS_7_NUM_INPUT_ROWS - CNTR_NAME_RS_713_NUM_OUTPUT_ROWS + CNTR_NAME_RS_7_NUM_OUTPUT_ROWS - CNTR_NAME_RS_713_TIME_TAKEN + CNTR_NAME_RS_7_TIME_TAKEN - CNTR_NAME_RS_713_FATAL_ERROR + CNTR_NAME_RS_7_FATAL_ERROR - RS_713 + RS_7 @@ -298,21 +298,21 @@ - CNTR_NAME_TS_712_NUM_INPUT_ROWS + CNTR_NAME_TS_6_NUM_INPUT_ROWS - CNTR_NAME_TS_712_NUM_OUTPUT_ROWS + CNTR_NAME_TS_6_NUM_OUTPUT_ROWS - CNTR_NAME_TS_712_TIME_TAKEN + CNTR_NAME_TS_6_TIME_TAKEN - CNTR_NAME_TS_712_FATAL_ERROR + CNTR_NAME_TS_6_FATAL_ERROR - TS_712 + TS_6 @@ -330,10 +330,10 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/311198281/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/632586304/10001 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/311198281/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/632586304/10001 @@ -342,7 +342,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/311198281/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/632586304/10001 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -398,7 +398,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1523340116/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/932755019/10000 @@ -434,21 +434,21 @@ - CNTR_NAME_FS_715_NUM_INPUT_ROWS + CNTR_NAME_FS_9_NUM_INPUT_ROWS - CNTR_NAME_FS_715_NUM_OUTPUT_ROWS + CNTR_NAME_FS_9_NUM_OUTPUT_ROWS - CNTR_NAME_FS_715_TIME_TAKEN + CNTR_NAME_FS_9_TIME_TAKEN - CNTR_NAME_FS_715_FATAL_ERROR + CNTR_NAME_FS_9_FATAL_ERROR - FS_715 + FS_9 @@ -484,21 +484,21 @@ - CNTR_NAME_OP_714_NUM_INPUT_ROWS + CNTR_NAME_OP_8_NUM_INPUT_ROWS - CNTR_NAME_OP_714_NUM_OUTPUT_ROWS + CNTR_NAME_OP_8_NUM_OUTPUT_ROWS - CNTR_NAME_OP_714_TIME_TAKEN + CNTR_NAME_OP_8_TIME_TAKEN - CNTR_NAME_OP_714_FATAL_ERROR + CNTR_NAME_OP_8_FATAL_ERROR - OP_714 + OP_8 @@ -556,7 +556,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/311198281/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/632586304/10001 @@ -642,11 +642,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1262739257 + 1263415356 @@ -706,7 +706,7 @@ 1 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/311198281/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/632586304/10001 @@ -716,21 +716,21 @@ - CNTR_NAME_FS_710_NUM_INPUT_ROWS + CNTR_NAME_FS_4_NUM_INPUT_ROWS - CNTR_NAME_FS_710_NUM_OUTPUT_ROWS + CNTR_NAME_FS_4_NUM_OUTPUT_ROWS - CNTR_NAME_FS_710_TIME_TAKEN + CNTR_NAME_FS_4_TIME_TAKEN - CNTR_NAME_FS_710_FATAL_ERROR + CNTR_NAME_FS_4_FATAL_ERROR - FS_710 + FS_4 @@ -808,21 +808,21 @@ - CNTR_NAME_SEL_709_NUM_INPUT_ROWS + CNTR_NAME_SEL_3_NUM_INPUT_ROWS - CNTR_NAME_SEL_709_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_3_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_709_TIME_TAKEN + CNTR_NAME_SEL_3_TIME_TAKEN - CNTR_NAME_SEL_709_FATAL_ERROR + CNTR_NAME_SEL_3_FATAL_ERROR - SEL_709 + SEL_3 @@ -931,21 +931,21 @@ - CNTR_NAME_SEL_708_NUM_INPUT_ROWS + CNTR_NAME_SEL_2_NUM_INPUT_ROWS - CNTR_NAME_SEL_708_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_708_TIME_TAKEN + CNTR_NAME_SEL_2_TIME_TAKEN - CNTR_NAME_SEL_708_FATAL_ERROR + CNTR_NAME_SEL_2_FATAL_ERROR - SEL_708 + SEL_2 @@ -1048,21 +1048,21 @@ - CNTR_NAME_FIL_707_NUM_INPUT_ROWS + CNTR_NAME_FIL_1_NUM_INPUT_ROWS - CNTR_NAME_FIL_707_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_1_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_707_TIME_TAKEN + CNTR_NAME_FIL_1_TIME_TAKEN - CNTR_NAME_FIL_707_FATAL_ERROR + CNTR_NAME_FIL_1_FATAL_ERROR - FIL_707 + FIL_1 @@ -1157,21 +1157,21 @@ - CNTR_NAME_FIL_711_NUM_INPUT_ROWS + CNTR_NAME_FIL_5_NUM_INPUT_ROWS - CNTR_NAME_FIL_711_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_5_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_711_TIME_TAKEN + CNTR_NAME_FIL_5_TIME_TAKEN - CNTR_NAME_FIL_711_FATAL_ERROR + CNTR_NAME_FIL_5_FATAL_ERROR - FIL_711 + FIL_5 @@ -1201,16 +1201,16 @@ - CNTR_NAME_TS_706_NUM_INPUT_ROWS + CNTR_NAME_TS_0_NUM_INPUT_ROWS - CNTR_NAME_TS_706_NUM_OUTPUT_ROWS + CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - CNTR_NAME_TS_706_TIME_TAKEN + CNTR_NAME_TS_0_TIME_TAKEN - CNTR_NAME_TS_706_FATAL_ERROR + CNTR_NAME_TS_0_FATAL_ERROR @@ -1225,7 +1225,7 @@ - TS_706 + TS_0 @@ -1241,7 +1241,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src unioninput:src @@ -1253,7 +1253,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Index: ql/src/test/results/compiler/plan/groupby4.q.xml =================================================================== --- ql/src/test/results/compiler/plan/groupby4.q.xml (revision 4584) +++ ql/src/test/results/compiler/plan/groupby4.q.xml (working copy) @@ -1,5 +1,5 @@ - + Stage-2 @@ -62,11 +62,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1262739161 + 1263415266 @@ -228,21 +228,21 @@ - CNTR_NAME_RS_73_NUM_INPUT_ROWS + CNTR_NAME_RS_3_NUM_INPUT_ROWS - CNTR_NAME_RS_73_NUM_OUTPUT_ROWS + CNTR_NAME_RS_3_NUM_OUTPUT_ROWS - CNTR_NAME_RS_73_TIME_TAKEN + CNTR_NAME_RS_3_TIME_TAKEN - CNTR_NAME_RS_73_FATAL_ERROR + CNTR_NAME_RS_3_FATAL_ERROR - RS_73 + RS_3 @@ -365,21 +365,21 @@ - CNTR_NAME_GBY_72_NUM_INPUT_ROWS + CNTR_NAME_GBY_2_NUM_INPUT_ROWS - CNTR_NAME_GBY_72_NUM_OUTPUT_ROWS + CNTR_NAME_GBY_2_NUM_OUTPUT_ROWS - CNTR_NAME_GBY_72_TIME_TAKEN + CNTR_NAME_GBY_2_TIME_TAKEN - CNTR_NAME_GBY_72_FATAL_ERROR + CNTR_NAME_GBY_2_FATAL_ERROR - GBY_72 + GBY_2 @@ -444,21 +444,21 @@ - CNTR_NAME_SEL_71_NUM_INPUT_ROWS + CNTR_NAME_SEL_1_NUM_INPUT_ROWS - CNTR_NAME_SEL_71_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_1_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_71_TIME_TAKEN + CNTR_NAME_SEL_1_TIME_TAKEN - CNTR_NAME_SEL_71_FATAL_ERROR + CNTR_NAME_SEL_1_FATAL_ERROR - SEL_71 + SEL_1 @@ -499,16 +499,16 @@ - CNTR_NAME_TS_70_NUM_INPUT_ROWS + CNTR_NAME_TS_0_NUM_INPUT_ROWS - CNTR_NAME_TS_70_NUM_OUTPUT_ROWS + CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - CNTR_NAME_TS_70_TIME_TAKEN + CNTR_NAME_TS_0_TIME_TAKEN - CNTR_NAME_TS_70_FATAL_ERROR + CNTR_NAME_TS_0_FATAL_ERROR @@ -520,7 +520,7 @@ - TS_70 + TS_0 @@ -556,7 +556,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src src @@ -568,7 +568,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -624,7 +624,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1023294117/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/2107742547/10001 @@ -660,21 +660,21 @@ - CNTR_NAME_FS_76_NUM_INPUT_ROWS + CNTR_NAME_FS_6_NUM_INPUT_ROWS - CNTR_NAME_FS_76_NUM_OUTPUT_ROWS + CNTR_NAME_FS_6_NUM_OUTPUT_ROWS - CNTR_NAME_FS_76_TIME_TAKEN + CNTR_NAME_FS_6_TIME_TAKEN - CNTR_NAME_FS_76_FATAL_ERROR + CNTR_NAME_FS_6_FATAL_ERROR - FS_76 + FS_6 @@ -744,21 +744,21 @@ - CNTR_NAME_SEL_75_NUM_INPUT_ROWS + CNTR_NAME_SEL_5_NUM_INPUT_ROWS - CNTR_NAME_SEL_75_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_5_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_75_TIME_TAKEN + CNTR_NAME_SEL_5_TIME_TAKEN - CNTR_NAME_SEL_75_FATAL_ERROR + CNTR_NAME_SEL_5_FATAL_ERROR - SEL_75 + SEL_5 @@ -836,21 +836,21 @@ - CNTR_NAME_GBY_74_NUM_INPUT_ROWS + CNTR_NAME_GBY_4_NUM_INPUT_ROWS - CNTR_NAME_GBY_74_NUM_OUTPUT_ROWS + CNTR_NAME_GBY_4_NUM_OUTPUT_ROWS - CNTR_NAME_GBY_74_TIME_TAKEN + CNTR_NAME_GBY_4_TIME_TAKEN - CNTR_NAME_GBY_74_FATAL_ERROR + CNTR_NAME_GBY_4_FATAL_ERROR - GBY_74 + GBY_4 Index: ql/src/test/results/compiler/plan/groupby5.q.xml =================================================================== --- ql/src/test/results/compiler/plan/groupby5.q.xml (revision 4584) +++ ql/src/test/results/compiler/plan/groupby5.q.xml (working copy) @@ -1,5 +1,5 @@ - + Stage-2 @@ -62,11 +62,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1262739164 + 1263415269 @@ -250,21 +250,21 @@ - CNTR_NAME_RS_87_NUM_INPUT_ROWS + CNTR_NAME_RS_3_NUM_INPUT_ROWS - CNTR_NAME_RS_87_NUM_OUTPUT_ROWS + CNTR_NAME_RS_3_NUM_OUTPUT_ROWS - CNTR_NAME_RS_87_TIME_TAKEN + CNTR_NAME_RS_3_TIME_TAKEN - CNTR_NAME_RS_87_FATAL_ERROR + CNTR_NAME_RS_3_FATAL_ERROR - RS_87 + RS_3 @@ -423,21 +423,21 @@ - CNTR_NAME_GBY_86_NUM_INPUT_ROWS + CNTR_NAME_GBY_2_NUM_INPUT_ROWS - CNTR_NAME_GBY_86_NUM_OUTPUT_ROWS + CNTR_NAME_GBY_2_NUM_OUTPUT_ROWS - CNTR_NAME_GBY_86_TIME_TAKEN + CNTR_NAME_GBY_2_TIME_TAKEN - CNTR_NAME_GBY_86_FATAL_ERROR + CNTR_NAME_GBY_2_FATAL_ERROR - GBY_86 + GBY_2 @@ -528,21 +528,21 @@ - CNTR_NAME_SEL_85_NUM_INPUT_ROWS + CNTR_NAME_SEL_1_NUM_INPUT_ROWS - CNTR_NAME_SEL_85_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_1_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_85_TIME_TAKEN + CNTR_NAME_SEL_1_TIME_TAKEN - CNTR_NAME_SEL_85_FATAL_ERROR + CNTR_NAME_SEL_1_FATAL_ERROR - SEL_85 + SEL_1 @@ -593,16 +593,16 @@ - CNTR_NAME_TS_84_NUM_INPUT_ROWS + CNTR_NAME_TS_0_NUM_INPUT_ROWS - CNTR_NAME_TS_84_NUM_OUTPUT_ROWS + CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - CNTR_NAME_TS_84_TIME_TAKEN + CNTR_NAME_TS_0_TIME_TAKEN - CNTR_NAME_TS_84_FATAL_ERROR + CNTR_NAME_TS_0_FATAL_ERROR @@ -617,7 +617,7 @@ - TS_84 + TS_0 @@ -639,7 +639,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src src @@ -651,7 +651,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -707,7 +707,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1732269169/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1405683603/10001 @@ -743,21 +743,21 @@ - CNTR_NAME_FS_90_NUM_INPUT_ROWS + CNTR_NAME_FS_6_NUM_INPUT_ROWS - CNTR_NAME_FS_90_NUM_OUTPUT_ROWS + CNTR_NAME_FS_6_NUM_OUTPUT_ROWS - CNTR_NAME_FS_90_TIME_TAKEN + CNTR_NAME_FS_6_TIME_TAKEN - CNTR_NAME_FS_90_FATAL_ERROR + CNTR_NAME_FS_6_FATAL_ERROR - FS_90 + FS_6 @@ -857,21 +857,21 @@ - CNTR_NAME_SEL_89_NUM_INPUT_ROWS + CNTR_NAME_SEL_5_NUM_INPUT_ROWS - CNTR_NAME_SEL_89_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_5_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_89_TIME_TAKEN + CNTR_NAME_SEL_5_TIME_TAKEN - CNTR_NAME_SEL_89_FATAL_ERROR + CNTR_NAME_SEL_5_FATAL_ERROR - SEL_89 + SEL_5 @@ -995,21 +995,21 @@ - CNTR_NAME_GBY_88_NUM_INPUT_ROWS + CNTR_NAME_GBY_4_NUM_INPUT_ROWS - CNTR_NAME_GBY_88_NUM_OUTPUT_ROWS + CNTR_NAME_GBY_4_NUM_OUTPUT_ROWS - CNTR_NAME_GBY_88_TIME_TAKEN + CNTR_NAME_GBY_4_TIME_TAKEN - CNTR_NAME_GBY_88_FATAL_ERROR + CNTR_NAME_GBY_4_FATAL_ERROR - GBY_88 + GBY_4 Index: ql/src/test/results/compiler/plan/groupby6.q.xml =================================================================== --- ql/src/test/results/compiler/plan/groupby6.q.xml (revision 4584) +++ ql/src/test/results/compiler/plan/groupby6.q.xml (working copy) @@ -1,5 +1,5 @@ - + Stage-2 @@ -62,11 +62,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1262739167 + 1263415272 @@ -228,21 +228,21 @@ - CNTR_NAME_RS_101_NUM_INPUT_ROWS + CNTR_NAME_RS_3_NUM_INPUT_ROWS - CNTR_NAME_RS_101_NUM_OUTPUT_ROWS + CNTR_NAME_RS_3_NUM_OUTPUT_ROWS - CNTR_NAME_RS_101_TIME_TAKEN + CNTR_NAME_RS_3_TIME_TAKEN - CNTR_NAME_RS_101_FATAL_ERROR + CNTR_NAME_RS_3_FATAL_ERROR - RS_101 + RS_3 @@ -365,21 +365,21 @@ - CNTR_NAME_GBY_100_NUM_INPUT_ROWS + CNTR_NAME_GBY_2_NUM_INPUT_ROWS - CNTR_NAME_GBY_100_NUM_OUTPUT_ROWS + CNTR_NAME_GBY_2_NUM_OUTPUT_ROWS - CNTR_NAME_GBY_100_TIME_TAKEN + CNTR_NAME_GBY_2_TIME_TAKEN - CNTR_NAME_GBY_100_FATAL_ERROR + CNTR_NAME_GBY_2_FATAL_ERROR - GBY_100 + GBY_2 @@ -444,21 +444,21 @@ - CNTR_NAME_SEL_99_NUM_INPUT_ROWS + CNTR_NAME_SEL_1_NUM_INPUT_ROWS - CNTR_NAME_SEL_99_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_1_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_99_TIME_TAKEN + CNTR_NAME_SEL_1_TIME_TAKEN - CNTR_NAME_SEL_99_FATAL_ERROR + CNTR_NAME_SEL_1_FATAL_ERROR - SEL_99 + SEL_1 @@ -499,16 +499,16 @@ - CNTR_NAME_TS_98_NUM_INPUT_ROWS + CNTR_NAME_TS_0_NUM_INPUT_ROWS - CNTR_NAME_TS_98_NUM_OUTPUT_ROWS + CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - CNTR_NAME_TS_98_TIME_TAKEN + CNTR_NAME_TS_0_TIME_TAKEN - CNTR_NAME_TS_98_FATAL_ERROR + CNTR_NAME_TS_0_FATAL_ERROR @@ -520,7 +520,7 @@ - TS_98 + TS_0 @@ -556,7 +556,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src src @@ -568,7 +568,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -624,7 +624,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/323065343/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1355217352/10001 @@ -660,21 +660,21 @@ - CNTR_NAME_FS_104_NUM_INPUT_ROWS + CNTR_NAME_FS_6_NUM_INPUT_ROWS - CNTR_NAME_FS_104_NUM_OUTPUT_ROWS + CNTR_NAME_FS_6_NUM_OUTPUT_ROWS - CNTR_NAME_FS_104_TIME_TAKEN + CNTR_NAME_FS_6_TIME_TAKEN - CNTR_NAME_FS_104_FATAL_ERROR + CNTR_NAME_FS_6_FATAL_ERROR - FS_104 + FS_6 @@ -744,21 +744,21 @@ - CNTR_NAME_SEL_103_NUM_INPUT_ROWS + CNTR_NAME_SEL_5_NUM_INPUT_ROWS - CNTR_NAME_SEL_103_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_5_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_103_TIME_TAKEN + CNTR_NAME_SEL_5_TIME_TAKEN - CNTR_NAME_SEL_103_FATAL_ERROR + CNTR_NAME_SEL_5_FATAL_ERROR - SEL_103 + SEL_5 @@ -836,21 +836,21 @@ - CNTR_NAME_GBY_102_NUM_INPUT_ROWS + CNTR_NAME_GBY_4_NUM_INPUT_ROWS - CNTR_NAME_GBY_102_NUM_OUTPUT_ROWS + CNTR_NAME_GBY_4_NUM_OUTPUT_ROWS - CNTR_NAME_GBY_102_TIME_TAKEN + CNTR_NAME_GBY_4_TIME_TAKEN - CNTR_NAME_GBY_102_FATAL_ERROR + CNTR_NAME_GBY_4_FATAL_ERROR - GBY_102 + GBY_4 Index: ql/src/test/results/compiler/plan/udf_when.q.xml =================================================================== --- ql/src/test/results/compiler/plan/udf_when.q.xml (revision 4584) +++ ql/src/test/results/compiler/plan/udf_when.q.xml (working copy) @@ -1,5 +1,5 @@ - + Stage-2 @@ -62,11 +62,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1262739272 + 1263415370 @@ -115,7 +115,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/20968098/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/999791378/10001 @@ -151,21 +151,21 @@ - CNTR_NAME_FS_759_NUM_INPUT_ROWS + CNTR_NAME_FS_3_NUM_INPUT_ROWS - CNTR_NAME_FS_759_NUM_OUTPUT_ROWS + CNTR_NAME_FS_3_NUM_OUTPUT_ROWS - CNTR_NAME_FS_759_TIME_TAKEN + CNTR_NAME_FS_3_TIME_TAKEN - CNTR_NAME_FS_759_FATAL_ERROR + CNTR_NAME_FS_3_FATAL_ERROR - FS_759 + FS_3 @@ -220,21 +220,21 @@ - CNTR_NAME_LIM_758_NUM_INPUT_ROWS + CNTR_NAME_LIM_2_NUM_INPUT_ROWS - CNTR_NAME_LIM_758_NUM_OUTPUT_ROWS + CNTR_NAME_LIM_2_NUM_OUTPUT_ROWS - CNTR_NAME_LIM_758_TIME_TAKEN + CNTR_NAME_LIM_2_TIME_TAKEN - CNTR_NAME_LIM_758_FATAL_ERROR + CNTR_NAME_LIM_2_FATAL_ERROR - LIM_758 + LIM_2 @@ -572,21 +572,21 @@ - CNTR_NAME_SEL_757_NUM_INPUT_ROWS + CNTR_NAME_SEL_1_NUM_INPUT_ROWS - CNTR_NAME_SEL_757_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_1_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_757_TIME_TAKEN + CNTR_NAME_SEL_1_TIME_TAKEN - CNTR_NAME_SEL_757_FATAL_ERROR + CNTR_NAME_SEL_1_FATAL_ERROR - SEL_757 + SEL_1 @@ -616,16 +616,16 @@ - CNTR_NAME_TS_756_NUM_INPUT_ROWS + CNTR_NAME_TS_0_NUM_INPUT_ROWS - CNTR_NAME_TS_756_NUM_OUTPUT_ROWS + CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - CNTR_NAME_TS_756_TIME_TAKEN + CNTR_NAME_TS_0_TIME_TAKEN - CNTR_NAME_TS_756_FATAL_ERROR + CNTR_NAME_TS_0_FATAL_ERROR @@ -633,7 +633,7 @@ - TS_756 + TS_0 @@ -674,7 +674,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src src @@ -686,7 +686,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Index: ql/src/test/results/compiler/plan/input20.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input20.q.xml (revision 4584) +++ ql/src/test/results/compiler/plan/input20.q.xml (working copy) @@ -1,5 +1,5 @@ - + Stage-2 @@ -62,11 +62,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1262739176 + 1263415280 @@ -268,21 +268,21 @@ - CNTR_NAME_RS_177_NUM_INPUT_ROWS + CNTR_NAME_RS_3_NUM_INPUT_ROWS - CNTR_NAME_RS_177_NUM_OUTPUT_ROWS + CNTR_NAME_RS_3_NUM_OUTPUT_ROWS - CNTR_NAME_RS_177_TIME_TAKEN + CNTR_NAME_RS_3_TIME_TAKEN - CNTR_NAME_RS_177_FATAL_ERROR + CNTR_NAME_RS_3_FATAL_ERROR - RS_177 + RS_3 @@ -419,21 +419,21 @@ - CNTR_NAME_SCR_176_NUM_INPUT_ROWS + CNTR_NAME_SCR_2_NUM_INPUT_ROWS - CNTR_NAME_SCR_176_NUM_OUTPUT_ROWS + CNTR_NAME_SCR_2_NUM_OUTPUT_ROWS - CNTR_NAME_SCR_176_TIME_TAKEN + CNTR_NAME_SCR_2_TIME_TAKEN - CNTR_NAME_SCR_176_FATAL_ERROR + CNTR_NAME_SCR_2_FATAL_ERROR - SCR_176 + SCR_2 @@ -588,21 +588,21 @@ - CNTR_NAME_SEL_175_NUM_INPUT_ROWS + CNTR_NAME_SEL_1_NUM_INPUT_ROWS - CNTR_NAME_SEL_175_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_1_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_175_TIME_TAKEN + CNTR_NAME_SEL_1_TIME_TAKEN - CNTR_NAME_SEL_175_FATAL_ERROR + CNTR_NAME_SEL_1_FATAL_ERROR - SEL_175 + SEL_1 @@ -653,16 +653,16 @@ - CNTR_NAME_TS_174_NUM_INPUT_ROWS + CNTR_NAME_TS_0_NUM_INPUT_ROWS - CNTR_NAME_TS_174_NUM_OUTPUT_ROWS + CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - CNTR_NAME_TS_174_TIME_TAKEN + CNTR_NAME_TS_0_TIME_TAKEN - CNTR_NAME_TS_174_FATAL_ERROR + CNTR_NAME_TS_0_FATAL_ERROR @@ -674,7 +674,7 @@ - TS_174 + TS_0 @@ -717,7 +717,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src tmap:src @@ -729,7 +729,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -789,7 +789,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1330782042/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/735214883/10001 @@ -825,21 +825,21 @@ - CNTR_NAME_FS_181_NUM_INPUT_ROWS + CNTR_NAME_FS_7_NUM_INPUT_ROWS - CNTR_NAME_FS_181_NUM_OUTPUT_ROWS + CNTR_NAME_FS_7_NUM_OUTPUT_ROWS - CNTR_NAME_FS_181_TIME_TAKEN + CNTR_NAME_FS_7_TIME_TAKEN - CNTR_NAME_FS_181_FATAL_ERROR + CNTR_NAME_FS_7_FATAL_ERROR - FS_181 + FS_7 @@ -966,21 +966,21 @@ - CNTR_NAME_SCR_180_NUM_INPUT_ROWS + CNTR_NAME_SCR_6_NUM_INPUT_ROWS - CNTR_NAME_SCR_180_NUM_OUTPUT_ROWS + CNTR_NAME_SCR_6_NUM_OUTPUT_ROWS - CNTR_NAME_SCR_180_TIME_TAKEN + CNTR_NAME_SCR_6_TIME_TAKEN - CNTR_NAME_SCR_180_FATAL_ERROR + CNTR_NAME_SCR_6_FATAL_ERROR - SCR_180 + SCR_6 @@ -1086,21 +1086,21 @@ - CNTR_NAME_SEL_179_NUM_INPUT_ROWS + CNTR_NAME_SEL_5_NUM_INPUT_ROWS - CNTR_NAME_SEL_179_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_5_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_179_TIME_TAKEN + CNTR_NAME_SEL_5_TIME_TAKEN - CNTR_NAME_SEL_179_FATAL_ERROR + CNTR_NAME_SEL_5_FATAL_ERROR - SEL_179 + SEL_5 @@ -1161,21 +1161,21 @@ - CNTR_NAME_OP_178_NUM_INPUT_ROWS + CNTR_NAME_OP_4_NUM_INPUT_ROWS - CNTR_NAME_OP_178_NUM_OUTPUT_ROWS + CNTR_NAME_OP_4_NUM_OUTPUT_ROWS - CNTR_NAME_OP_178_TIME_TAKEN + CNTR_NAME_OP_4_TIME_TAKEN - CNTR_NAME_OP_178_FATAL_ERROR + CNTR_NAME_OP_4_FATAL_ERROR - OP_178 + OP_4 Index: ql/src/test/results/compiler/plan/sample1.q.xml =================================================================== --- ql/src/test/results/compiler/plan/sample1.q.xml (revision 4584) +++ ql/src/test/results/compiler/plan/sample1.q.xml (working copy) @@ -1,5 +1,5 @@ - + Stage-2 @@ -75,11 +75,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/srcpart + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/srcpart transient_lastDdlTime - 1262739235 + 1263415335 @@ -136,7 +136,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1163446186/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/339237964/10001 @@ -172,21 +172,21 @@ - CNTR_NAME_FS_588_NUM_INPUT_ROWS + CNTR_NAME_FS_4_NUM_INPUT_ROWS - CNTR_NAME_FS_588_NUM_OUTPUT_ROWS + CNTR_NAME_FS_4_NUM_OUTPUT_ROWS - CNTR_NAME_FS_588_TIME_TAKEN + CNTR_NAME_FS_4_TIME_TAKEN - CNTR_NAME_FS_588_FATAL_ERROR + CNTR_NAME_FS_4_FATAL_ERROR - FS_588 + FS_4 @@ -353,21 +353,21 @@ - CNTR_NAME_SEL_587_NUM_INPUT_ROWS + CNTR_NAME_SEL_3_NUM_INPUT_ROWS - CNTR_NAME_SEL_587_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_3_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_587_TIME_TAKEN + CNTR_NAME_SEL_3_TIME_TAKEN - CNTR_NAME_SEL_587_FATAL_ERROR + CNTR_NAME_SEL_3_FATAL_ERROR - SEL_587 + SEL_3 @@ -569,21 +569,21 @@ - CNTR_NAME_FIL_586_NUM_INPUT_ROWS + CNTR_NAME_FIL_2_NUM_INPUT_ROWS - CNTR_NAME_FIL_586_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_2_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_586_TIME_TAKEN + CNTR_NAME_FIL_2_TIME_TAKEN - CNTR_NAME_FIL_586_FATAL_ERROR + CNTR_NAME_FIL_2_FATAL_ERROR - FIL_586 + FIL_2 @@ -769,21 +769,21 @@ - CNTR_NAME_FIL_589_NUM_INPUT_ROWS + CNTR_NAME_FIL_5_NUM_INPUT_ROWS - CNTR_NAME_FIL_589_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_5_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_589_TIME_TAKEN + CNTR_NAME_FIL_5_TIME_TAKEN - CNTR_NAME_FIL_589_FATAL_ERROR + CNTR_NAME_FIL_5_FATAL_ERROR - FIL_589 + FIL_5 @@ -957,21 +957,21 @@ - CNTR_NAME_FIL_585_NUM_INPUT_ROWS + CNTR_NAME_FIL_1_NUM_INPUT_ROWS - CNTR_NAME_FIL_585_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_1_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_585_TIME_TAKEN + CNTR_NAME_FIL_1_TIME_TAKEN - CNTR_NAME_FIL_585_FATAL_ERROR + CNTR_NAME_FIL_1_FATAL_ERROR - FIL_585 + FIL_1 @@ -994,16 +994,16 @@ - CNTR_NAME_TS_584_NUM_INPUT_ROWS + CNTR_NAME_TS_0_NUM_INPUT_ROWS - CNTR_NAME_TS_584_NUM_OUTPUT_ROWS + CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - CNTR_NAME_TS_584_TIME_TAKEN + CNTR_NAME_TS_0_TIME_TAKEN - CNTR_NAME_TS_584_FATAL_ERROR + CNTR_NAME_TS_0_FATAL_ERROR @@ -1024,7 +1024,7 @@ - TS_584 + TS_0 @@ -1040,7 +1040,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 s @@ -1052,7 +1052,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Index: ql/src/test/results/compiler/plan/sample2.q.xml =================================================================== --- ql/src/test/results/compiler/plan/sample2.q.xml (revision 4584) +++ ql/src/test/results/compiler/plan/sample2.q.xml (working copy) @@ -1,5 +1,5 @@ - + @@ -30,7 +30,7 @@ true - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/432630422/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/79788243/10000 @@ -83,11 +83,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1262739239 + 1263415339 @@ -97,7 +97,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/432630422/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/79788243/10001 @@ -125,10 +125,10 @@ true - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1950037265/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1477189328/10002 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/432630422/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/79788243/10000 @@ -146,7 +146,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1950037265/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1477189328/10002 @@ -301,21 +301,21 @@ - CNTR_NAME_RS_602_NUM_INPUT_ROWS + CNTR_NAME_RS_6_NUM_INPUT_ROWS - CNTR_NAME_RS_602_NUM_OUTPUT_ROWS + CNTR_NAME_RS_6_NUM_OUTPUT_ROWS - CNTR_NAME_RS_602_TIME_TAKEN + CNTR_NAME_RS_6_TIME_TAKEN - CNTR_NAME_RS_602_FATAL_ERROR + CNTR_NAME_RS_6_FATAL_ERROR - RS_602 + RS_6 @@ -359,21 +359,21 @@ - CNTR_NAME_TS_601_NUM_INPUT_ROWS + CNTR_NAME_TS_5_NUM_INPUT_ROWS - CNTR_NAME_TS_601_NUM_OUTPUT_ROWS + CNTR_NAME_TS_5_NUM_OUTPUT_ROWS - CNTR_NAME_TS_601_TIME_TAKEN + CNTR_NAME_TS_5_TIME_TAKEN - CNTR_NAME_TS_601_FATAL_ERROR + CNTR_NAME_TS_5_FATAL_ERROR - TS_601 + TS_5 @@ -391,10 +391,10 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1950037265/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1477189328/10002 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1950037265/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1477189328/10002 @@ -403,7 +403,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1950037265/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1477189328/10002 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -436,7 +436,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/432630422/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/79788243/10000 @@ -485,7 +485,7 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/dest1 file.outputformat @@ -493,7 +493,7 @@ transient_lastDdlTime - 1262739239 + 1263415339 @@ -507,21 +507,21 @@ - CNTR_NAME_FS_604_NUM_INPUT_ROWS + CNTR_NAME_FS_8_NUM_INPUT_ROWS - CNTR_NAME_FS_604_NUM_OUTPUT_ROWS + CNTR_NAME_FS_8_NUM_OUTPUT_ROWS - CNTR_NAME_FS_604_TIME_TAKEN + CNTR_NAME_FS_8_TIME_TAKEN - CNTR_NAME_FS_604_FATAL_ERROR + CNTR_NAME_FS_8_FATAL_ERROR - FS_604 + FS_8 @@ -557,21 +557,21 @@ - CNTR_NAME_OP_603_NUM_INPUT_ROWS + CNTR_NAME_OP_7_NUM_INPUT_ROWS - CNTR_NAME_OP_603_NUM_OUTPUT_ROWS + CNTR_NAME_OP_7_NUM_OUTPUT_ROWS - CNTR_NAME_OP_603_TIME_TAKEN + CNTR_NAME_OP_7_TIME_TAKEN - CNTR_NAME_OP_603_FATAL_ERROR + CNTR_NAME_OP_7_FATAL_ERROR - OP_603 + OP_7 @@ -633,7 +633,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1950037265/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1477189328/10002 @@ -723,11 +723,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/srcbucket + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1262739238 + 1263415338 @@ -783,7 +783,7 @@ 1 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1950037265/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1477189328/10002 @@ -793,21 +793,21 @@ - CNTR_NAME_FS_599_NUM_INPUT_ROWS + CNTR_NAME_FS_3_NUM_INPUT_ROWS - CNTR_NAME_FS_599_NUM_OUTPUT_ROWS + CNTR_NAME_FS_3_NUM_OUTPUT_ROWS - CNTR_NAME_FS_599_TIME_TAKEN + CNTR_NAME_FS_3_TIME_TAKEN - CNTR_NAME_FS_599_FATAL_ERROR + CNTR_NAME_FS_3_FATAL_ERROR - FS_599 + FS_3 @@ -885,21 +885,21 @@ - CNTR_NAME_SEL_598_NUM_INPUT_ROWS + CNTR_NAME_SEL_2_NUM_INPUT_ROWS - CNTR_NAME_SEL_598_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_598_TIME_TAKEN + CNTR_NAME_SEL_2_TIME_TAKEN - CNTR_NAME_SEL_598_FATAL_ERROR + CNTR_NAME_SEL_2_FATAL_ERROR - SEL_598 + SEL_2 @@ -1086,21 +1086,21 @@ - CNTR_NAME_FIL_597_NUM_INPUT_ROWS + CNTR_NAME_FIL_1_NUM_INPUT_ROWS - CNTR_NAME_FIL_597_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_1_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_597_TIME_TAKEN + CNTR_NAME_FIL_1_TIME_TAKEN - CNTR_NAME_FIL_597_FATAL_ERROR + CNTR_NAME_FIL_1_FATAL_ERROR - FIL_597 + FIL_1 @@ -1249,21 +1249,21 @@ - CNTR_NAME_FIL_600_NUM_INPUT_ROWS + CNTR_NAME_FIL_4_NUM_INPUT_ROWS - CNTR_NAME_FIL_600_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_4_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_600_TIME_TAKEN + CNTR_NAME_FIL_4_TIME_TAKEN - CNTR_NAME_FIL_600_FATAL_ERROR + CNTR_NAME_FIL_4_FATAL_ERROR - FIL_600 + FIL_4 @@ -1314,16 +1314,16 @@ - CNTR_NAME_TS_596_NUM_INPUT_ROWS + CNTR_NAME_TS_0_NUM_INPUT_ROWS - CNTR_NAME_TS_596_NUM_OUTPUT_ROWS + CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - CNTR_NAME_TS_596_TIME_TAKEN + CNTR_NAME_TS_0_TIME_TAKEN - CNTR_NAME_TS_596_FATAL_ERROR + CNTR_NAME_TS_0_FATAL_ERROR @@ -1338,7 +1338,7 @@ - TS_596 + TS_0 @@ -1354,7 +1354,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt s @@ -1366,7 +1366,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Index: ql/src/test/results/compiler/plan/sample3.q.xml =================================================================== --- ql/src/test/results/compiler/plan/sample3.q.xml (revision 4584) +++ ql/src/test/results/compiler/plan/sample3.q.xml (working copy) @@ -1,5 +1,5 @@ - + @@ -30,7 +30,7 @@ true - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1989671541/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/127871305/10000 @@ -83,11 +83,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1262739242 + 1263415342 @@ -97,7 +97,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1989671541/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/127871305/10001 @@ -125,10 +125,10 @@ true - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/393103953/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1164955277/10002 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1989671541/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/127871305/10000 @@ -146,7 +146,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/393103953/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1164955277/10002 @@ -301,21 +301,21 @@ - CNTR_NAME_RS_620_NUM_INPUT_ROWS + CNTR_NAME_RS_6_NUM_INPUT_ROWS - CNTR_NAME_RS_620_NUM_OUTPUT_ROWS + CNTR_NAME_RS_6_NUM_OUTPUT_ROWS - CNTR_NAME_RS_620_TIME_TAKEN + CNTR_NAME_RS_6_TIME_TAKEN - CNTR_NAME_RS_620_FATAL_ERROR + CNTR_NAME_RS_6_FATAL_ERROR - RS_620 + RS_6 @@ -359,21 +359,21 @@ - CNTR_NAME_TS_619_NUM_INPUT_ROWS + CNTR_NAME_TS_5_NUM_INPUT_ROWS - CNTR_NAME_TS_619_NUM_OUTPUT_ROWS + CNTR_NAME_TS_5_NUM_OUTPUT_ROWS - CNTR_NAME_TS_619_TIME_TAKEN + CNTR_NAME_TS_5_TIME_TAKEN - CNTR_NAME_TS_619_FATAL_ERROR + CNTR_NAME_TS_5_FATAL_ERROR - TS_619 + TS_5 @@ -391,10 +391,10 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/393103953/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1164955277/10002 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/393103953/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1164955277/10002 @@ -403,7 +403,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/393103953/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1164955277/10002 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -436,7 +436,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1989671541/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/127871305/10000 @@ -485,7 +485,7 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/dest1 file.outputformat @@ -493,7 +493,7 @@ transient_lastDdlTime - 1262739242 + 1263415342 @@ -507,21 +507,21 @@ - CNTR_NAME_FS_622_NUM_INPUT_ROWS + CNTR_NAME_FS_8_NUM_INPUT_ROWS - CNTR_NAME_FS_622_NUM_OUTPUT_ROWS + CNTR_NAME_FS_8_NUM_OUTPUT_ROWS - CNTR_NAME_FS_622_TIME_TAKEN + CNTR_NAME_FS_8_TIME_TAKEN - CNTR_NAME_FS_622_FATAL_ERROR + CNTR_NAME_FS_8_FATAL_ERROR - FS_622 + FS_8 @@ -557,21 +557,21 @@ - CNTR_NAME_OP_621_NUM_INPUT_ROWS + CNTR_NAME_OP_7_NUM_INPUT_ROWS - CNTR_NAME_OP_621_NUM_OUTPUT_ROWS + CNTR_NAME_OP_7_NUM_OUTPUT_ROWS - CNTR_NAME_OP_621_TIME_TAKEN + CNTR_NAME_OP_7_TIME_TAKEN - CNTR_NAME_OP_621_FATAL_ERROR + CNTR_NAME_OP_7_FATAL_ERROR - OP_621 + OP_7 @@ -633,7 +633,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/393103953/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1164955277/10002 @@ -723,11 +723,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/srcbucket + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1262739241 + 1263415340 @@ -783,7 +783,7 @@ 1 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/393103953/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1164955277/10002 @@ -793,21 +793,21 @@ - CNTR_NAME_FS_617_NUM_INPUT_ROWS + CNTR_NAME_FS_3_NUM_INPUT_ROWS - CNTR_NAME_FS_617_NUM_OUTPUT_ROWS + CNTR_NAME_FS_3_NUM_OUTPUT_ROWS - CNTR_NAME_FS_617_TIME_TAKEN + CNTR_NAME_FS_3_TIME_TAKEN - CNTR_NAME_FS_617_FATAL_ERROR + CNTR_NAME_FS_3_FATAL_ERROR - FS_617 + FS_3 @@ -885,21 +885,21 @@ - CNTR_NAME_SEL_616_NUM_INPUT_ROWS + CNTR_NAME_SEL_2_NUM_INPUT_ROWS - CNTR_NAME_SEL_616_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_616_TIME_TAKEN + CNTR_NAME_SEL_2_TIME_TAKEN - CNTR_NAME_SEL_616_FATAL_ERROR + CNTR_NAME_SEL_2_FATAL_ERROR - SEL_616 + SEL_2 @@ -1096,21 +1096,21 @@ - CNTR_NAME_FIL_615_NUM_INPUT_ROWS + CNTR_NAME_FIL_1_NUM_INPUT_ROWS - CNTR_NAME_FIL_615_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_1_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_615_TIME_TAKEN + CNTR_NAME_FIL_1_TIME_TAKEN - CNTR_NAME_FIL_615_FATAL_ERROR + CNTR_NAME_FIL_1_FATAL_ERROR - FIL_615 + FIL_1 @@ -1272,21 +1272,21 @@ - CNTR_NAME_FIL_618_NUM_INPUT_ROWS + CNTR_NAME_FIL_4_NUM_INPUT_ROWS - CNTR_NAME_FIL_618_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_4_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_618_TIME_TAKEN + CNTR_NAME_FIL_4_TIME_TAKEN - CNTR_NAME_FIL_618_FATAL_ERROR + CNTR_NAME_FIL_4_FATAL_ERROR - FIL_618 + FIL_4 @@ -1337,16 +1337,16 @@ - CNTR_NAME_TS_614_NUM_INPUT_ROWS + CNTR_NAME_TS_0_NUM_INPUT_ROWS - CNTR_NAME_TS_614_NUM_OUTPUT_ROWS + CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - CNTR_NAME_TS_614_TIME_TAKEN + CNTR_NAME_TS_0_TIME_TAKEN - CNTR_NAME_TS_614_FATAL_ERROR + CNTR_NAME_TS_0_FATAL_ERROR @@ -1361,7 +1361,7 @@ - TS_614 + TS_0 @@ -1377,7 +1377,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/srcbucket + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/srcbucket s @@ -1389,7 +1389,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/srcbucket + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/srcbucket org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Index: ql/src/test/results/compiler/plan/sample4.q.xml =================================================================== --- ql/src/test/results/compiler/plan/sample4.q.xml (revision 4584) +++ ql/src/test/results/compiler/plan/sample4.q.xml (working copy) @@ -1,5 +1,5 @@ - + @@ -30,7 +30,7 @@ true - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1565249577/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1559997325/10000 @@ -83,11 +83,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1262739245 + 1263415345 @@ -97,7 +97,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1565249577/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1559997325/10001 @@ -125,10 +125,10 @@ true - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1348984674/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/923643320/10002 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1565249577/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1559997325/10000 @@ -146,7 +146,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1348984674/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/923643320/10002 @@ -301,21 +301,21 @@ - CNTR_NAME_RS_638_NUM_INPUT_ROWS + CNTR_NAME_RS_6_NUM_INPUT_ROWS - CNTR_NAME_RS_638_NUM_OUTPUT_ROWS + CNTR_NAME_RS_6_NUM_OUTPUT_ROWS - CNTR_NAME_RS_638_TIME_TAKEN + CNTR_NAME_RS_6_TIME_TAKEN - CNTR_NAME_RS_638_FATAL_ERROR + CNTR_NAME_RS_6_FATAL_ERROR - RS_638 + RS_6 @@ -359,21 +359,21 @@ - CNTR_NAME_TS_637_NUM_INPUT_ROWS + CNTR_NAME_TS_5_NUM_INPUT_ROWS - CNTR_NAME_TS_637_NUM_OUTPUT_ROWS + CNTR_NAME_TS_5_NUM_OUTPUT_ROWS - CNTR_NAME_TS_637_TIME_TAKEN + CNTR_NAME_TS_5_TIME_TAKEN - CNTR_NAME_TS_637_FATAL_ERROR + CNTR_NAME_TS_5_FATAL_ERROR - TS_637 + TS_5 @@ -391,10 +391,10 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1348984674/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/923643320/10002 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1348984674/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/923643320/10002 @@ -403,7 +403,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1348984674/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/923643320/10002 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -436,7 +436,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1565249577/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1559997325/10000 @@ -485,7 +485,7 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/dest1 file.outputformat @@ -493,7 +493,7 @@ transient_lastDdlTime - 1262739245 + 1263415345 @@ -507,21 +507,21 @@ - CNTR_NAME_FS_640_NUM_INPUT_ROWS + CNTR_NAME_FS_8_NUM_INPUT_ROWS - CNTR_NAME_FS_640_NUM_OUTPUT_ROWS + CNTR_NAME_FS_8_NUM_OUTPUT_ROWS - CNTR_NAME_FS_640_TIME_TAKEN + CNTR_NAME_FS_8_TIME_TAKEN - CNTR_NAME_FS_640_FATAL_ERROR + CNTR_NAME_FS_8_FATAL_ERROR - FS_640 + FS_8 @@ -557,21 +557,21 @@ - CNTR_NAME_OP_639_NUM_INPUT_ROWS + CNTR_NAME_OP_7_NUM_INPUT_ROWS - CNTR_NAME_OP_639_NUM_OUTPUT_ROWS + CNTR_NAME_OP_7_NUM_OUTPUT_ROWS - CNTR_NAME_OP_639_TIME_TAKEN + CNTR_NAME_OP_7_TIME_TAKEN - CNTR_NAME_OP_639_FATAL_ERROR + CNTR_NAME_OP_7_FATAL_ERROR - OP_639 + OP_7 @@ -633,7 +633,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1348984674/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/923643320/10002 @@ -723,11 +723,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/srcbucket + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1262739244 + 1263415344 @@ -783,7 +783,7 @@ 1 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1348984674/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/923643320/10002 @@ -793,21 +793,21 @@ - CNTR_NAME_FS_635_NUM_INPUT_ROWS + CNTR_NAME_FS_3_NUM_INPUT_ROWS - CNTR_NAME_FS_635_NUM_OUTPUT_ROWS + CNTR_NAME_FS_3_NUM_OUTPUT_ROWS - CNTR_NAME_FS_635_TIME_TAKEN + CNTR_NAME_FS_3_TIME_TAKEN - CNTR_NAME_FS_635_FATAL_ERROR + CNTR_NAME_FS_3_FATAL_ERROR - FS_635 + FS_3 @@ -885,21 +885,21 @@ - CNTR_NAME_SEL_634_NUM_INPUT_ROWS + CNTR_NAME_SEL_2_NUM_INPUT_ROWS - CNTR_NAME_SEL_634_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_634_TIME_TAKEN + CNTR_NAME_SEL_2_TIME_TAKEN - CNTR_NAME_SEL_634_FATAL_ERROR + CNTR_NAME_SEL_2_FATAL_ERROR - SEL_634 + SEL_2 @@ -1086,21 +1086,21 @@ - CNTR_NAME_FIL_633_NUM_INPUT_ROWS + CNTR_NAME_FIL_1_NUM_INPUT_ROWS - CNTR_NAME_FIL_633_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_1_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_633_TIME_TAKEN + CNTR_NAME_FIL_1_TIME_TAKEN - CNTR_NAME_FIL_633_FATAL_ERROR + CNTR_NAME_FIL_1_FATAL_ERROR - FIL_633 + FIL_1 @@ -1249,21 +1249,21 @@ - CNTR_NAME_FIL_636_NUM_INPUT_ROWS + CNTR_NAME_FIL_4_NUM_INPUT_ROWS - CNTR_NAME_FIL_636_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_4_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_636_TIME_TAKEN + CNTR_NAME_FIL_4_TIME_TAKEN - CNTR_NAME_FIL_636_FATAL_ERROR + CNTR_NAME_FIL_4_FATAL_ERROR - FIL_636 + FIL_4 @@ -1314,16 +1314,16 @@ - CNTR_NAME_TS_632_NUM_INPUT_ROWS + CNTR_NAME_TS_0_NUM_INPUT_ROWS - CNTR_NAME_TS_632_NUM_OUTPUT_ROWS + CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - CNTR_NAME_TS_632_TIME_TAKEN + CNTR_NAME_TS_0_TIME_TAKEN - CNTR_NAME_TS_632_FATAL_ERROR + CNTR_NAME_TS_0_FATAL_ERROR @@ -1338,7 +1338,7 @@ - TS_632 + TS_0 @@ -1354,7 +1354,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt s @@ -1366,7 +1366,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Index: ql/src/test/results/compiler/plan/sample5.q.xml =================================================================== --- ql/src/test/results/compiler/plan/sample5.q.xml (revision 4584) +++ ql/src/test/results/compiler/plan/sample5.q.xml (working copy) @@ -1,5 +1,5 @@ - + @@ -30,7 +30,7 @@ true - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/706617250/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/508255345/10000 @@ -83,11 +83,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1262739248 + 1263415348 @@ -97,7 +97,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/706617250/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/508255345/10001 @@ -125,10 +125,10 @@ true - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/599790689/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/575975563/10002 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/706617250/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/508255345/10000 @@ -146,7 +146,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/599790689/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/575975563/10002 @@ -301,21 +301,21 @@ - CNTR_NAME_RS_656_NUM_INPUT_ROWS + CNTR_NAME_RS_6_NUM_INPUT_ROWS - CNTR_NAME_RS_656_NUM_OUTPUT_ROWS + CNTR_NAME_RS_6_NUM_OUTPUT_ROWS - CNTR_NAME_RS_656_TIME_TAKEN + CNTR_NAME_RS_6_TIME_TAKEN - CNTR_NAME_RS_656_FATAL_ERROR + CNTR_NAME_RS_6_FATAL_ERROR - RS_656 + RS_6 @@ -359,21 +359,21 @@ - CNTR_NAME_TS_655_NUM_INPUT_ROWS + CNTR_NAME_TS_5_NUM_INPUT_ROWS - CNTR_NAME_TS_655_NUM_OUTPUT_ROWS + CNTR_NAME_TS_5_NUM_OUTPUT_ROWS - CNTR_NAME_TS_655_TIME_TAKEN + CNTR_NAME_TS_5_TIME_TAKEN - CNTR_NAME_TS_655_FATAL_ERROR + CNTR_NAME_TS_5_FATAL_ERROR - TS_655 + TS_5 @@ -391,10 +391,10 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/599790689/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/575975563/10002 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/599790689/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/575975563/10002 @@ -403,7 +403,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/599790689/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/575975563/10002 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -436,7 +436,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/706617250/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/508255345/10000 @@ -485,7 +485,7 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/dest1 file.outputformat @@ -493,7 +493,7 @@ transient_lastDdlTime - 1262739248 + 1263415348 @@ -507,21 +507,21 @@ - CNTR_NAME_FS_658_NUM_INPUT_ROWS + CNTR_NAME_FS_8_NUM_INPUT_ROWS - CNTR_NAME_FS_658_NUM_OUTPUT_ROWS + CNTR_NAME_FS_8_NUM_OUTPUT_ROWS - CNTR_NAME_FS_658_TIME_TAKEN + CNTR_NAME_FS_8_TIME_TAKEN - CNTR_NAME_FS_658_FATAL_ERROR + CNTR_NAME_FS_8_FATAL_ERROR - FS_658 + FS_8 @@ -557,21 +557,21 @@ - CNTR_NAME_OP_657_NUM_INPUT_ROWS + CNTR_NAME_OP_7_NUM_INPUT_ROWS - CNTR_NAME_OP_657_NUM_OUTPUT_ROWS + CNTR_NAME_OP_7_NUM_OUTPUT_ROWS - CNTR_NAME_OP_657_TIME_TAKEN + CNTR_NAME_OP_7_TIME_TAKEN - CNTR_NAME_OP_657_FATAL_ERROR + CNTR_NAME_OP_7_FATAL_ERROR - OP_657 + OP_7 @@ -633,7 +633,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/599790689/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/575975563/10002 @@ -723,11 +723,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/srcbucket + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1262739247 + 1263415347 @@ -783,7 +783,7 @@ 1 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/599790689/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/575975563/10002 @@ -793,21 +793,21 @@ - CNTR_NAME_FS_653_NUM_INPUT_ROWS + CNTR_NAME_FS_3_NUM_INPUT_ROWS - CNTR_NAME_FS_653_NUM_OUTPUT_ROWS + CNTR_NAME_FS_3_NUM_OUTPUT_ROWS - CNTR_NAME_FS_653_TIME_TAKEN + CNTR_NAME_FS_3_TIME_TAKEN - CNTR_NAME_FS_653_FATAL_ERROR + CNTR_NAME_FS_3_FATAL_ERROR - FS_653 + FS_3 @@ -885,21 +885,21 @@ - CNTR_NAME_SEL_652_NUM_INPUT_ROWS + CNTR_NAME_SEL_2_NUM_INPUT_ROWS - CNTR_NAME_SEL_652_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_652_TIME_TAKEN + CNTR_NAME_SEL_2_TIME_TAKEN - CNTR_NAME_SEL_652_FATAL_ERROR + CNTR_NAME_SEL_2_FATAL_ERROR - SEL_652 + SEL_2 @@ -1083,21 +1083,21 @@ - CNTR_NAME_FIL_651_NUM_INPUT_ROWS + CNTR_NAME_FIL_1_NUM_INPUT_ROWS - CNTR_NAME_FIL_651_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_1_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_651_TIME_TAKEN + CNTR_NAME_FIL_1_TIME_TAKEN - CNTR_NAME_FIL_651_FATAL_ERROR + CNTR_NAME_FIL_1_FATAL_ERROR - FIL_651 + FIL_1 @@ -1246,21 +1246,21 @@ - CNTR_NAME_FIL_654_NUM_INPUT_ROWS + CNTR_NAME_FIL_4_NUM_INPUT_ROWS - CNTR_NAME_FIL_654_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_4_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_654_TIME_TAKEN + CNTR_NAME_FIL_4_TIME_TAKEN - CNTR_NAME_FIL_654_FATAL_ERROR + CNTR_NAME_FIL_4_FATAL_ERROR - FIL_654 + FIL_4 @@ -1311,16 +1311,16 @@ - CNTR_NAME_TS_650_NUM_INPUT_ROWS + CNTR_NAME_TS_0_NUM_INPUT_ROWS - CNTR_NAME_TS_650_NUM_OUTPUT_ROWS + CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - CNTR_NAME_TS_650_TIME_TAKEN + CNTR_NAME_TS_0_TIME_TAKEN - CNTR_NAME_TS_650_FATAL_ERROR + CNTR_NAME_TS_0_FATAL_ERROR @@ -1335,7 +1335,7 @@ - TS_650 + TS_0 @@ -1351,7 +1351,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/srcbucket + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/srcbucket s @@ -1363,7 +1363,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/srcbucket + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/srcbucket org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Index: ql/src/test/results/compiler/plan/sample6.q.xml =================================================================== --- ql/src/test/results/compiler/plan/sample6.q.xml (revision 4584) +++ ql/src/test/results/compiler/plan/sample6.q.xml (working copy) @@ -1,5 +1,5 @@ - + @@ -30,7 +30,7 @@ true - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/39170804/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/758006675/10000 @@ -83,11 +83,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1262739251 + 1263415351 @@ -97,7 +97,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/39170804/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/758006675/10001 @@ -125,10 +125,10 @@ true - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/41673104/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/540986636/10002 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/39170804/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/758006675/10000 @@ -146,7 +146,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/41673104/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/540986636/10002 @@ -301,21 +301,21 @@ - CNTR_NAME_RS_674_NUM_INPUT_ROWS + CNTR_NAME_RS_6_NUM_INPUT_ROWS - CNTR_NAME_RS_674_NUM_OUTPUT_ROWS + CNTR_NAME_RS_6_NUM_OUTPUT_ROWS - CNTR_NAME_RS_674_TIME_TAKEN + CNTR_NAME_RS_6_TIME_TAKEN - CNTR_NAME_RS_674_FATAL_ERROR + CNTR_NAME_RS_6_FATAL_ERROR - RS_674 + RS_6 @@ -359,21 +359,21 @@ - CNTR_NAME_TS_673_NUM_INPUT_ROWS + CNTR_NAME_TS_5_NUM_INPUT_ROWS - CNTR_NAME_TS_673_NUM_OUTPUT_ROWS + CNTR_NAME_TS_5_NUM_OUTPUT_ROWS - CNTR_NAME_TS_673_TIME_TAKEN + CNTR_NAME_TS_5_TIME_TAKEN - CNTR_NAME_TS_673_FATAL_ERROR + CNTR_NAME_TS_5_FATAL_ERROR - TS_673 + TS_5 @@ -391,10 +391,10 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/41673104/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/540986636/10002 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/41673104/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/540986636/10002 @@ -403,7 +403,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/41673104/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/540986636/10002 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -436,7 +436,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/39170804/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/758006675/10000 @@ -485,7 +485,7 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/dest1 file.outputformat @@ -493,7 +493,7 @@ transient_lastDdlTime - 1262739251 + 1263415351 @@ -507,21 +507,21 @@ - CNTR_NAME_FS_676_NUM_INPUT_ROWS + CNTR_NAME_FS_8_NUM_INPUT_ROWS - CNTR_NAME_FS_676_NUM_OUTPUT_ROWS + CNTR_NAME_FS_8_NUM_OUTPUT_ROWS - CNTR_NAME_FS_676_TIME_TAKEN + CNTR_NAME_FS_8_TIME_TAKEN - CNTR_NAME_FS_676_FATAL_ERROR + CNTR_NAME_FS_8_FATAL_ERROR - FS_676 + FS_8 @@ -557,21 +557,21 @@ - CNTR_NAME_OP_675_NUM_INPUT_ROWS + CNTR_NAME_OP_7_NUM_INPUT_ROWS - CNTR_NAME_OP_675_NUM_OUTPUT_ROWS + CNTR_NAME_OP_7_NUM_OUTPUT_ROWS - CNTR_NAME_OP_675_TIME_TAKEN + CNTR_NAME_OP_7_TIME_TAKEN - CNTR_NAME_OP_675_FATAL_ERROR + CNTR_NAME_OP_7_FATAL_ERROR - OP_675 + OP_7 @@ -633,7 +633,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/41673104/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/540986636/10002 @@ -723,11 +723,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/srcbucket + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1262739250 + 1263415349 @@ -783,7 +783,7 @@ 1 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/41673104/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/540986636/10002 @@ -793,21 +793,21 @@ - CNTR_NAME_FS_671_NUM_INPUT_ROWS + CNTR_NAME_FS_3_NUM_INPUT_ROWS - CNTR_NAME_FS_671_NUM_OUTPUT_ROWS + CNTR_NAME_FS_3_NUM_OUTPUT_ROWS - CNTR_NAME_FS_671_TIME_TAKEN + CNTR_NAME_FS_3_TIME_TAKEN - CNTR_NAME_FS_671_FATAL_ERROR + CNTR_NAME_FS_3_FATAL_ERROR - FS_671 + FS_3 @@ -885,21 +885,21 @@ - CNTR_NAME_SEL_670_NUM_INPUT_ROWS + CNTR_NAME_SEL_2_NUM_INPUT_ROWS - CNTR_NAME_SEL_670_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_670_TIME_TAKEN + CNTR_NAME_SEL_2_TIME_TAKEN - CNTR_NAME_SEL_670_FATAL_ERROR + CNTR_NAME_SEL_2_FATAL_ERROR - SEL_670 + SEL_2 @@ -1086,21 +1086,21 @@ - CNTR_NAME_FIL_669_NUM_INPUT_ROWS + CNTR_NAME_FIL_1_NUM_INPUT_ROWS - CNTR_NAME_FIL_669_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_1_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_669_TIME_TAKEN + CNTR_NAME_FIL_1_TIME_TAKEN - CNTR_NAME_FIL_669_FATAL_ERROR + CNTR_NAME_FIL_1_FATAL_ERROR - FIL_669 + FIL_1 @@ -1249,21 +1249,21 @@ - CNTR_NAME_FIL_672_NUM_INPUT_ROWS + CNTR_NAME_FIL_4_NUM_INPUT_ROWS - CNTR_NAME_FIL_672_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_4_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_672_TIME_TAKEN + CNTR_NAME_FIL_4_TIME_TAKEN - CNTR_NAME_FIL_672_FATAL_ERROR + CNTR_NAME_FIL_4_FATAL_ERROR - FIL_672 + FIL_4 @@ -1314,16 +1314,16 @@ - CNTR_NAME_TS_668_NUM_INPUT_ROWS + CNTR_NAME_TS_0_NUM_INPUT_ROWS - CNTR_NAME_TS_668_NUM_OUTPUT_ROWS + CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - CNTR_NAME_TS_668_TIME_TAKEN + CNTR_NAME_TS_0_TIME_TAKEN - CNTR_NAME_TS_668_FATAL_ERROR + CNTR_NAME_TS_0_FATAL_ERROR @@ -1338,7 +1338,7 @@ - TS_668 + TS_0 @@ -1354,7 +1354,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt s @@ -1366,7 +1366,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Index: ql/src/test/results/compiler/plan/sample7.q.xml =================================================================== --- ql/src/test/results/compiler/plan/sample7.q.xml (revision 4584) +++ ql/src/test/results/compiler/plan/sample7.q.xml (working copy) @@ -1,5 +1,5 @@ - + @@ -30,7 +30,7 @@ true - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/179421198/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/42694853/10000 @@ -83,11 +83,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1262739254 + 1263415354 @@ -97,7 +97,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/179421198/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/42694853/10001 @@ -125,10 +125,10 @@ true - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1390676075/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/2076962111/10002 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/179421198/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/42694853/10000 @@ -146,7 +146,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1390676075/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/2076962111/10002 @@ -301,21 +301,21 @@ - CNTR_NAME_RS_693_NUM_INPUT_ROWS + CNTR_NAME_RS_7_NUM_INPUT_ROWS - CNTR_NAME_RS_693_NUM_OUTPUT_ROWS + CNTR_NAME_RS_7_NUM_OUTPUT_ROWS - CNTR_NAME_RS_693_TIME_TAKEN + CNTR_NAME_RS_7_TIME_TAKEN - CNTR_NAME_RS_693_FATAL_ERROR + CNTR_NAME_RS_7_FATAL_ERROR - RS_693 + RS_7 @@ -359,21 +359,21 @@ - CNTR_NAME_TS_692_NUM_INPUT_ROWS + CNTR_NAME_TS_6_NUM_INPUT_ROWS - CNTR_NAME_TS_692_NUM_OUTPUT_ROWS + CNTR_NAME_TS_6_NUM_OUTPUT_ROWS - CNTR_NAME_TS_692_TIME_TAKEN + CNTR_NAME_TS_6_TIME_TAKEN - CNTR_NAME_TS_692_FATAL_ERROR + CNTR_NAME_TS_6_FATAL_ERROR - TS_692 + TS_6 @@ -391,10 +391,10 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1390676075/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/2076962111/10002 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1390676075/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/2076962111/10002 @@ -403,7 +403,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1390676075/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/2076962111/10002 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -436,7 +436,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/179421198/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/42694853/10000 @@ -485,7 +485,7 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/dest1 file.outputformat @@ -493,7 +493,7 @@ transient_lastDdlTime - 1262739254 + 1263415354 @@ -507,21 +507,21 @@ - CNTR_NAME_FS_695_NUM_INPUT_ROWS + CNTR_NAME_FS_9_NUM_INPUT_ROWS - CNTR_NAME_FS_695_NUM_OUTPUT_ROWS + CNTR_NAME_FS_9_NUM_OUTPUT_ROWS - CNTR_NAME_FS_695_TIME_TAKEN + CNTR_NAME_FS_9_TIME_TAKEN - CNTR_NAME_FS_695_FATAL_ERROR + CNTR_NAME_FS_9_FATAL_ERROR - FS_695 + FS_9 @@ -557,21 +557,21 @@ - CNTR_NAME_OP_694_NUM_INPUT_ROWS + CNTR_NAME_OP_8_NUM_INPUT_ROWS - CNTR_NAME_OP_694_NUM_OUTPUT_ROWS + CNTR_NAME_OP_8_NUM_OUTPUT_ROWS - CNTR_NAME_OP_694_TIME_TAKEN + CNTR_NAME_OP_8_TIME_TAKEN - CNTR_NAME_OP_694_FATAL_ERROR + CNTR_NAME_OP_8_FATAL_ERROR - OP_694 + OP_8 @@ -633,7 +633,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1390676075/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/2076962111/10002 @@ -723,11 +723,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/srcbucket + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1262739253 + 1263415353 @@ -787,7 +787,7 @@ 1 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1390676075/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/2076962111/10002 @@ -797,21 +797,21 @@ - CNTR_NAME_FS_690_NUM_INPUT_ROWS + CNTR_NAME_FS_4_NUM_INPUT_ROWS - CNTR_NAME_FS_690_NUM_OUTPUT_ROWS + CNTR_NAME_FS_4_NUM_OUTPUT_ROWS - CNTR_NAME_FS_690_TIME_TAKEN + CNTR_NAME_FS_4_TIME_TAKEN - CNTR_NAME_FS_690_FATAL_ERROR + CNTR_NAME_FS_4_FATAL_ERROR - FS_690 + FS_4 @@ -889,21 +889,21 @@ - CNTR_NAME_SEL_689_NUM_INPUT_ROWS + CNTR_NAME_SEL_3_NUM_INPUT_ROWS - CNTR_NAME_SEL_689_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_3_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_689_TIME_TAKEN + CNTR_NAME_SEL_3_TIME_TAKEN - CNTR_NAME_SEL_689_FATAL_ERROR + CNTR_NAME_SEL_3_FATAL_ERROR - SEL_689 + SEL_3 @@ -1002,21 +1002,21 @@ - CNTR_NAME_FIL_688_NUM_INPUT_ROWS + CNTR_NAME_FIL_2_NUM_INPUT_ROWS - CNTR_NAME_FIL_688_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_2_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_688_TIME_TAKEN + CNTR_NAME_FIL_2_TIME_TAKEN - CNTR_NAME_FIL_688_FATAL_ERROR + CNTR_NAME_FIL_2_FATAL_ERROR - FIL_688 + FIL_2 @@ -1199,21 +1199,21 @@ - CNTR_NAME_FIL_687_NUM_INPUT_ROWS + CNTR_NAME_FIL_1_NUM_INPUT_ROWS - CNTR_NAME_FIL_687_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_1_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_687_TIME_TAKEN + CNTR_NAME_FIL_1_TIME_TAKEN - CNTR_NAME_FIL_687_FATAL_ERROR + CNTR_NAME_FIL_1_FATAL_ERROR - FIL_687 + FIL_1 @@ -1433,21 +1433,21 @@ - CNTR_NAME_FIL_691_NUM_INPUT_ROWS + CNTR_NAME_FIL_5_NUM_INPUT_ROWS - CNTR_NAME_FIL_691_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_5_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_691_TIME_TAKEN + CNTR_NAME_FIL_5_TIME_TAKEN - CNTR_NAME_FIL_691_FATAL_ERROR + CNTR_NAME_FIL_5_FATAL_ERROR - FIL_691 + FIL_5 @@ -1477,16 +1477,16 @@ - CNTR_NAME_TS_686_NUM_INPUT_ROWS + CNTR_NAME_TS_0_NUM_INPUT_ROWS - CNTR_NAME_TS_686_NUM_OUTPUT_ROWS + CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - CNTR_NAME_TS_686_TIME_TAKEN + CNTR_NAME_TS_0_TIME_TAKEN - CNTR_NAME_TS_686_FATAL_ERROR + CNTR_NAME_TS_0_FATAL_ERROR @@ -1501,7 +1501,7 @@ - TS_686 + TS_0 @@ -1517,7 +1517,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt s @@ -1529,7 +1529,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Index: ql/src/test/results/compiler/plan/cast1.q.xml =================================================================== --- ql/src/test/results/compiler/plan/cast1.q.xml (revision 4584) +++ ql/src/test/results/compiler/plan/cast1.q.xml (working copy) @@ -1,5 +1,5 @@ - + Stage-2 @@ -62,11 +62,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1262739149 + 1263415253 @@ -119,7 +119,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/21599662/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/260240987/10001 @@ -155,21 +155,21 @@ - CNTR_NAME_FS_21_NUM_INPUT_ROWS + CNTR_NAME_FS_3_NUM_INPUT_ROWS - CNTR_NAME_FS_21_NUM_OUTPUT_ROWS + CNTR_NAME_FS_3_NUM_OUTPUT_ROWS - CNTR_NAME_FS_21_TIME_TAKEN + CNTR_NAME_FS_3_TIME_TAKEN - CNTR_NAME_FS_21_FATAL_ERROR + CNTR_NAME_FS_3_FATAL_ERROR - FS_21 + FS_3 @@ -643,21 +643,21 @@ - CNTR_NAME_SEL_20_NUM_INPUT_ROWS + CNTR_NAME_SEL_2_NUM_INPUT_ROWS - CNTR_NAME_SEL_20_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_20_TIME_TAKEN + CNTR_NAME_SEL_2_TIME_TAKEN - CNTR_NAME_SEL_20_FATAL_ERROR + CNTR_NAME_SEL_2_FATAL_ERROR - SEL_20 + SEL_2 @@ -827,21 +827,21 @@ - CNTR_NAME_FIL_19_NUM_INPUT_ROWS + CNTR_NAME_FIL_1_NUM_INPUT_ROWS - CNTR_NAME_FIL_19_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_1_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_19_TIME_TAKEN + CNTR_NAME_FIL_1_TIME_TAKEN - CNTR_NAME_FIL_19_FATAL_ERROR + CNTR_NAME_FIL_1_FATAL_ERROR - FIL_19 + FIL_1 @@ -936,21 +936,21 @@ - CNTR_NAME_FIL_22_NUM_INPUT_ROWS + CNTR_NAME_FIL_4_NUM_INPUT_ROWS - CNTR_NAME_FIL_22_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_4_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_22_TIME_TAKEN + CNTR_NAME_FIL_4_TIME_TAKEN - CNTR_NAME_FIL_22_FATAL_ERROR + CNTR_NAME_FIL_4_FATAL_ERROR - FIL_22 + FIL_4 @@ -980,16 +980,16 @@ - CNTR_NAME_TS_18_NUM_INPUT_ROWS + CNTR_NAME_TS_0_NUM_INPUT_ROWS - CNTR_NAME_TS_18_NUM_OUTPUT_ROWS + CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - CNTR_NAME_TS_18_TIME_TAKEN + CNTR_NAME_TS_0_TIME_TAKEN - CNTR_NAME_TS_18_FATAL_ERROR + CNTR_NAME_TS_0_FATAL_ERROR @@ -1001,7 +1001,7 @@ - TS_18 + TS_0 @@ -1017,7 +1017,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src src @@ -1029,7 +1029,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Index: ql/src/test/results/compiler/plan/join1.q.xml =================================================================== --- ql/src/test/results/compiler/plan/join1.q.xml (revision 4584) +++ ql/src/test/results/compiler/plan/join1.q.xml (working copy) @@ -1,5 +1,5 @@ - + @@ -26,7 +26,7 @@ true - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1940376665/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1706922897/10000 @@ -79,11 +79,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1262739214 + 1263415313 @@ -93,7 +93,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1940376665/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1706922897/10001 @@ -164,11 +164,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1262739213 + 1263415313 @@ -382,21 +382,21 @@ - CNTR_NAME_RS_377_NUM_INPUT_ROWS + CNTR_NAME_RS_3_NUM_INPUT_ROWS - CNTR_NAME_RS_377_NUM_OUTPUT_ROWS + CNTR_NAME_RS_3_NUM_OUTPUT_ROWS - CNTR_NAME_RS_377_TIME_TAKEN + CNTR_NAME_RS_3_TIME_TAKEN - CNTR_NAME_RS_377_FATAL_ERROR + CNTR_NAME_RS_3_FATAL_ERROR - RS_377 + RS_3 @@ -437,16 +437,16 @@ - CNTR_NAME_TS_374_NUM_INPUT_ROWS + CNTR_NAME_TS_0_NUM_INPUT_ROWS - CNTR_NAME_TS_374_NUM_OUTPUT_ROWS + CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - CNTR_NAME_TS_374_TIME_TAKEN + CNTR_NAME_TS_0_TIME_TAKEN - CNTR_NAME_TS_374_FATAL_ERROR + CNTR_NAME_TS_0_FATAL_ERROR @@ -461,7 +461,7 @@ - TS_374 + TS_0 @@ -627,21 +627,21 @@ - CNTR_NAME_RS_376_NUM_INPUT_ROWS + CNTR_NAME_RS_2_NUM_INPUT_ROWS - CNTR_NAME_RS_376_NUM_OUTPUT_ROWS + CNTR_NAME_RS_2_NUM_OUTPUT_ROWS - CNTR_NAME_RS_376_TIME_TAKEN + CNTR_NAME_RS_2_TIME_TAKEN - CNTR_NAME_RS_376_FATAL_ERROR + CNTR_NAME_RS_2_FATAL_ERROR - RS_376 + RS_2 @@ -682,16 +682,16 @@ - CNTR_NAME_TS_375_NUM_INPUT_ROWS + CNTR_NAME_TS_1_NUM_INPUT_ROWS - CNTR_NAME_TS_375_NUM_OUTPUT_ROWS + CNTR_NAME_TS_1_NUM_OUTPUT_ROWS - CNTR_NAME_TS_375_TIME_TAKEN + CNTR_NAME_TS_1_TIME_TAKEN - CNTR_NAME_TS_375_FATAL_ERROR + CNTR_NAME_TS_1_FATAL_ERROR @@ -703,7 +703,7 @@ - TS_375 + TS_1 @@ -749,7 +749,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src src2 @@ -764,7 +764,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -823,7 +823,7 @@ 1 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1940376665/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1706922897/10000 @@ -833,21 +833,21 @@ - CNTR_NAME_FS_380_NUM_INPUT_ROWS + CNTR_NAME_FS_6_NUM_INPUT_ROWS - CNTR_NAME_FS_380_NUM_OUTPUT_ROWS + CNTR_NAME_FS_6_NUM_OUTPUT_ROWS - CNTR_NAME_FS_380_TIME_TAKEN + CNTR_NAME_FS_6_TIME_TAKEN - CNTR_NAME_FS_380_FATAL_ERROR + CNTR_NAME_FS_6_FATAL_ERROR - FS_380 + FS_6 @@ -947,21 +947,21 @@ - CNTR_NAME_SEL_379_NUM_INPUT_ROWS + CNTR_NAME_SEL_5_NUM_INPUT_ROWS - CNTR_NAME_SEL_379_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_5_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_379_TIME_TAKEN + CNTR_NAME_SEL_5_TIME_TAKEN - CNTR_NAME_SEL_379_FATAL_ERROR + CNTR_NAME_SEL_5_FATAL_ERROR - SEL_379 + SEL_5 @@ -1174,21 +1174,21 @@ - CNTR_NAME_JOIN_378_NUM_INPUT_ROWS + CNTR_NAME_JOIN_4_NUM_INPUT_ROWS - CNTR_NAME_JOIN_378_NUM_OUTPUT_ROWS + CNTR_NAME_JOIN_4_NUM_OUTPUT_ROWS - CNTR_NAME_JOIN_378_TIME_TAKEN + CNTR_NAME_JOIN_4_TIME_TAKEN - CNTR_NAME_JOIN_378_FATAL_ERROR + CNTR_NAME_JOIN_4_FATAL_ERROR - JOIN_378 + JOIN_4 Index: ql/src/test/results/compiler/plan/input1.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input1.q.xml (revision 4584) +++ ql/src/test/results/compiler/plan/input1.q.xml (working copy) @@ -1,5 +1,5 @@ - + @@ -30,7 +30,7 @@ true - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/711146424/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1078146347/10000 @@ -83,11 +83,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1262739171 + 1263415275 @@ -97,7 +97,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/711146424/10001 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1078146347/10001 @@ -125,10 +125,10 @@ true - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/822015054/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1377084144/10002 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/711146424/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1078146347/10000 @@ -146,7 +146,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/822015054/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1377084144/10002 @@ -301,21 +301,21 @@ - CNTR_NAME_RS_118_NUM_INPUT_ROWS + CNTR_NAME_RS_6_NUM_INPUT_ROWS - CNTR_NAME_RS_118_NUM_OUTPUT_ROWS + CNTR_NAME_RS_6_NUM_OUTPUT_ROWS - CNTR_NAME_RS_118_TIME_TAKEN + CNTR_NAME_RS_6_TIME_TAKEN - CNTR_NAME_RS_118_FATAL_ERROR + CNTR_NAME_RS_6_FATAL_ERROR - RS_118 + RS_6 @@ -359,21 +359,21 @@ - CNTR_NAME_TS_117_NUM_INPUT_ROWS + CNTR_NAME_TS_5_NUM_INPUT_ROWS - CNTR_NAME_TS_117_NUM_OUTPUT_ROWS + CNTR_NAME_TS_5_NUM_OUTPUT_ROWS - CNTR_NAME_TS_117_TIME_TAKEN + CNTR_NAME_TS_5_TIME_TAKEN - CNTR_NAME_TS_117_FATAL_ERROR + CNTR_NAME_TS_5_FATAL_ERROR - TS_117 + TS_5 @@ -391,10 +391,10 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/822015054/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1377084144/10002 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/822015054/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1377084144/10002 @@ -403,7 +403,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/822015054/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1377084144/10002 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -436,7 +436,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/711146424/10000 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1078146347/10000 @@ -485,7 +485,7 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/dest1 file.outputformat @@ -493,7 +493,7 @@ transient_lastDdlTime - 1262739171 + 1263415275 @@ -507,21 +507,21 @@ - CNTR_NAME_FS_120_NUM_INPUT_ROWS + CNTR_NAME_FS_8_NUM_INPUT_ROWS - CNTR_NAME_FS_120_NUM_OUTPUT_ROWS + CNTR_NAME_FS_8_NUM_OUTPUT_ROWS - CNTR_NAME_FS_120_TIME_TAKEN + CNTR_NAME_FS_8_TIME_TAKEN - CNTR_NAME_FS_120_FATAL_ERROR + CNTR_NAME_FS_8_FATAL_ERROR - FS_120 + FS_8 @@ -557,21 +557,21 @@ - CNTR_NAME_OP_119_NUM_INPUT_ROWS + CNTR_NAME_OP_7_NUM_INPUT_ROWS - CNTR_NAME_OP_119_NUM_OUTPUT_ROWS + CNTR_NAME_OP_7_NUM_OUTPUT_ROWS - CNTR_NAME_OP_119_TIME_TAKEN + CNTR_NAME_OP_7_TIME_TAKEN - CNTR_NAME_OP_119_FATAL_ERROR + CNTR_NAME_OP_7_FATAL_ERROR - OP_119 + OP_7 @@ -629,7 +629,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/822015054/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1377084144/10002 @@ -715,11 +715,11 @@ location - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src transient_lastDdlTime - 1262739170 + 1263415274 @@ -775,7 +775,7 @@ 1 - file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/822015054/10002 + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/tmp/1377084144/10002 @@ -785,21 +785,21 @@ - CNTR_NAME_FS_115_NUM_INPUT_ROWS + CNTR_NAME_FS_3_NUM_INPUT_ROWS - CNTR_NAME_FS_115_NUM_OUTPUT_ROWS + CNTR_NAME_FS_3_NUM_OUTPUT_ROWS - CNTR_NAME_FS_115_TIME_TAKEN + CNTR_NAME_FS_3_TIME_TAKEN - CNTR_NAME_FS_115_FATAL_ERROR + CNTR_NAME_FS_3_FATAL_ERROR - FS_115 + FS_3 @@ -874,21 +874,21 @@ - CNTR_NAME_SEL_114_NUM_INPUT_ROWS + CNTR_NAME_SEL_2_NUM_INPUT_ROWS - CNTR_NAME_SEL_114_NUM_OUTPUT_ROWS + CNTR_NAME_SEL_2_NUM_OUTPUT_ROWS - CNTR_NAME_SEL_114_TIME_TAKEN + CNTR_NAME_SEL_2_TIME_TAKEN - CNTR_NAME_SEL_114_FATAL_ERROR + CNTR_NAME_SEL_2_FATAL_ERROR - SEL_114 + SEL_2 @@ -991,21 +991,21 @@ - CNTR_NAME_FIL_113_NUM_INPUT_ROWS + CNTR_NAME_FIL_1_NUM_INPUT_ROWS - CNTR_NAME_FIL_113_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_1_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_113_TIME_TAKEN + CNTR_NAME_FIL_1_TIME_TAKEN - CNTR_NAME_FIL_113_FATAL_ERROR + CNTR_NAME_FIL_1_FATAL_ERROR - FIL_113 + FIL_1 @@ -1100,21 +1100,21 @@ - CNTR_NAME_FIL_116_NUM_INPUT_ROWS + CNTR_NAME_FIL_4_NUM_INPUT_ROWS - CNTR_NAME_FIL_116_NUM_OUTPUT_ROWS + CNTR_NAME_FIL_4_NUM_OUTPUT_ROWS - CNTR_NAME_FIL_116_TIME_TAKEN + CNTR_NAME_FIL_4_TIME_TAKEN - CNTR_NAME_FIL_116_FATAL_ERROR + CNTR_NAME_FIL_4_FATAL_ERROR - FIL_116 + FIL_4 @@ -1144,16 +1144,16 @@ - CNTR_NAME_TS_112_NUM_INPUT_ROWS + CNTR_NAME_TS_0_NUM_INPUT_ROWS - CNTR_NAME_TS_112_NUM_OUTPUT_ROWS + CNTR_NAME_TS_0_NUM_OUTPUT_ROWS - CNTR_NAME_TS_112_TIME_TAKEN + CNTR_NAME_TS_0_TIME_TAKEN - CNTR_NAME_TS_112_FATAL_ERROR + CNTR_NAME_TS_0_FATAL_ERROR @@ -1168,7 +1168,7 @@ - TS_112 + TS_0 @@ -1184,7 +1184,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src src @@ -1196,7 +1196,7 @@ - file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src + file:/data/users/pyang/mstore/trunk/VENDOR.hive/trunk/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Index: ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java =================================================================== --- ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java (revision 4584) +++ ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java (working copy) @@ -391,6 +391,7 @@ db = Hive.get(conf); fs = FileSystem.get(conf); drv = new Driver(conf); + drv.init(); pd = new ParseDriver(); sem = new SemanticAnalyzer(conf); } Index: ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java (revision 4584) +++ ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java (working copy) @@ -99,6 +99,10 @@ id = String.valueOf(seqId++); } + public static void resetId() { + seqId = 0; + } + /** * Create an operator with a reporter. * @param reporter Used to report progress of certain operators. Index: ql/src/java/org/apache/hadoop/hive/ql/processors/AddResourceProcessor.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/processors/AddResourceProcessor.java (revision 4584) +++ ql/src/java/org/apache/hadoop/hive/ql/processors/AddResourceProcessor.java (working copy) @@ -29,6 +29,9 @@ public static final Log LOG = LogFactory.getLog(AddResourceProcessor.class.getName()); public static final LogHelper console = new LogHelper(LOG); + public void init() { + } + public int run(String command) { SessionState ss = SessionState.get(); String[] tokens = command.split("\\s+"); Index: ql/src/java/org/apache/hadoop/hive/ql/processors/DeleteResourceProcessor.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/processors/DeleteResourceProcessor.java (revision 4584) +++ ql/src/java/org/apache/hadoop/hive/ql/processors/DeleteResourceProcessor.java (working copy) @@ -30,6 +30,9 @@ public static final Log LOG = LogFactory.getLog(DeleteResourceProcessor.class.getName()); public static final LogHelper console = new LogHelper(LOG); + public void init() { + } + public int run(String command) { SessionState ss = SessionState.get(); String[] tokens = command.split("\\s+"); Index: ql/src/java/org/apache/hadoop/hive/ql/processors/SetProcessor.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/processors/SetProcessor.java (revision 4584) +++ ql/src/java/org/apache/hadoop/hive/ql/processors/SetProcessor.java (working copy) @@ -55,6 +55,9 @@ } } + public void init() { + } + public int run(String command) { SessionState ss = SessionState.get(); Index: ql/src/java/org/apache/hadoop/hive/ql/processors/DfsProcessor.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/processors/DfsProcessor.java (revision 4584) +++ ql/src/java/org/apache/hadoop/hive/ql/processors/DfsProcessor.java (working copy) @@ -38,6 +38,9 @@ dfs = new FsShell(conf); } + public void init() { + } + public int run(String command) { String[] tokens = command.split("\\s+"); Index: ql/src/java/org/apache/hadoop/hive/ql/processors/CommandProcessor.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/processors/CommandProcessor.java (revision 4584) +++ ql/src/java/org/apache/hadoop/hive/ql/processors/CommandProcessor.java (working copy) @@ -19,5 +19,6 @@ package org.apache.hadoop.hive.ql.processors; public interface CommandProcessor { + public void init(); public int run(String command); } Index: ql/src/java/org/apache/hadoop/hive/ql/Driver.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/Driver.java (revision 4584) +++ ql/src/java/org/apache/hadoop/hive/ql/Driver.java (working copy) @@ -39,6 +39,7 @@ import org.apache.hadoop.hive.ql.session.SessionState; import org.apache.hadoop.hive.ql.session.SessionState.LogHelper; import org.apache.hadoop.hive.ql.exec.ExecDriver; +import org.apache.hadoop.hive.ql.exec.Operator; import org.apache.hadoop.hive.ql.exec.Task; import org.apache.hadoop.hive.ql.exec.TaskRunner; import org.apache.hadoop.hive.ql.exec.TaskResult; @@ -81,6 +82,10 @@ private int maxthreads = 8; private int sleeptime = 2000; + public void init() { + Operator.resetId(); + } + public int countJobs(List> tasks) { return countJobs(tasks, new ArrayList>()); }