Index: ql/src/test/results/clientpositive/udf1.q.out =================================================================== --- ql/src/test/results/clientpositive/udf1.q.out (revision 796913) +++ ql/src/test/results/clientpositive/udf1.q.out (working copy) @@ -50,15 +50,15 @@ type: boolean expr: ('ab' like 'a') type: boolean - expr: ('' regexp '.*') + expr: ('' rlike '.*') type: boolean - expr: ('a' regexp '[ab]') + expr: ('a' rlike '[ab]') type: boolean - expr: ('' regexp '[ab]') + expr: ('' rlike '[ab]') type: boolean - expr: ('hadoop' regexp '[a-z]*') + expr: ('hadoop' rlike '[a-z]*') type: boolean - expr: ('hadoop' regexp 'o*') + expr: ('hadoop' rlike 'o*') type: boolean expr: regexp_replace('abc', 'b', 'c') type: string @@ -72,7 +72,7 @@ type: string expr: regexp_replace('abc', '', 'A') type: string - expr: ('abc' regexp '') + expr: ('abc' rlike '') type: boolean File Output Operator compressed: false @@ -89,10 +89,10 @@ Move Operator files: hdfs directory: true - destination: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/734075252/10000 + destination: file:/data/users/emil/hive1/hive1/build/ql/tmp/1012030734/10000 Map Reduce Alias -> Map Operator Tree: - file:/data/users/pchakka/workspace/oshive/build/ql/tmp/816992741/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/431659275/10002 Reduce Output Operator sort order: Map-reduce partition columns: @@ -173,5 +173,5 @@ Output: default/dest1 query: SELECT dest1.* FROM dest1 Input: default/dest1 -Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/674207509/10000 +Output: file:/data/users/emil/hive1/hive1/build/ql/tmp/220608265/10000 true false true true true false false false true true false true false acc abc abb hive hadoop AaAbAcA false Index: ql/src/test/results/clientpositive/udf4.q.out =================================================================== --- ql/src/test/results/clientpositive/udf4.q.out (revision 796913) +++ ql/src/test/results/clientpositive/udf4.q.out (working copy) @@ -36,11 +36,11 @@ type: double expr: sqrt(0.0) type: double - expr: ceiling(1.0) + expr: ceil(1.0) type: bigint - expr: ceiling(1.5) + expr: ceil(1.5) type: bigint - expr: ceiling(- 1.5) + expr: ceil(- 1.5) type: bigint expr: ceiling(1.0) type: bigint @@ -70,5 +70,5 @@ query: SELECT round(1.0), round(1.5), round(-1.5), floor(1.0), floor(1.5), floor(-1.5), sqrt(1.0), sqrt(-1.0), sqrt(0.0), ceil(1.0), ceil(1.5), ceil(-1.5), ceiling(1.0), rand(3), +3, -3, 1++2, 1+-2, ~1 FROM dest1 Input: default/dest1 -Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/1468603599/10000 +Output: file:/data/users/emil/hive1/hive1/build/ql/tmp/721635558/10000 1 2 -2 1 1 -2 1.0 NULL 0.0 1 2 -1 1 0.731057369148862 3 -3 3 -1 -2 Index: ql/src/test/results/clientpositive/udf_lower.q.out =================================================================== --- ql/src/test/results/clientpositive/udf_lower.q.out (revision 796913) +++ ql/src/test/results/clientpositive/udf_lower.q.out (working copy) @@ -24,7 +24,7 @@ expressions: expr: lower('AbC 123') type: string - expr: ucase('AbC 123') + expr: upper('AbC 123') type: string File Output Operator compressed: false @@ -40,5 +40,5 @@ query: SELECT lower('AbC 123'), upper('AbC 123') FROM src WHERE key = 86 Input: default/src -Output: file:/data/users/pchakka/workspace/oshive/build/ql/tmp/894848839/10000 +Output: file:/data/users/emil/hive1/hive1/build/ql/tmp/1693261444/10000 abc 123 ABC 123 Index: ql/src/test/results/clientpositive/udf7.q.out =================================================================== --- ql/src/test/results/clientpositive/udf7.q.out (revision 796913) +++ ql/src/test/results/clientpositive/udf7.q.out (working copy) @@ -61,17 +61,17 @@ type: double expr: pow(UDFToDouble(2), UDFToDouble(3)) type: double - expr: pow(UDFToDouble(2), UDFToDouble(3)) + expr: power(UDFToDouble(2), UDFToDouble(3)) type: double - expr: pow(UDFToDouble(2), UDFToDouble(- 3)) + expr: power(UDFToDouble(2), UDFToDouble(- 3)) type: double - expr: pow(0.5, UDFToDouble(- 3)) + expr: power(0.5, UDFToDouble(- 3)) type: double - expr: pow(UDFToDouble(4), 0.5) + expr: power(UDFToDouble(4), 0.5) type: double - expr: pow(UDFToDouble(- 1), 0.5) + expr: power(UDFToDouble(- 1), 0.5) type: double - expr: pow(UDFToDouble(- 1), UDFToDouble(2)) + expr: power(UDFToDouble(- 1), UDFToDouble(2)) type: double File Output Operator compressed: false @@ -92,5 +92,5 @@ POW(2,3), POWER(2,3), POWER(2,-3), POWER(0.5, -3), POWER(4, 0.5), POWER(-1, 0.5), POWER(-1, 2) FROM dest1 Input: default/dest1 -Output: file:/Users/char/Documents/workspace/Hive-460/build/ql/tmp/987082819/10000 +Output: file:/data/users/emil/hive1/hive1/build/ql/tmp/1531238271/10000 1.098612288668 NULL NULL 1.098612288668 NULL NULL 1.584962500721 NULL NULL 0.47712125472 NULL NULL 1.584962500721 NULL NULL NULL -1.0 7.389056098931 8.0 8.0 0.125 8.0 2.0 NaN 1.0 Index: ql/src/test/results/compiler/plan/join2.q.xml =================================================================== --- ql/src/test/results/compiler/plan/join2.q.xml (revision 796913) +++ ql/src/test/results/compiler/plan/join2.q.xml (working copy) @@ -30,7 +30,7 @@ true - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/773086090/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/789217321/10000 @@ -83,7 +83,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/dest1 @@ -93,7 +93,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/773086090/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/789217321/10001 @@ -173,7 +173,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src @@ -266,6 +266,9 @@ + + double + @@ -304,6 +307,9 @@ + + double + @@ -311,6 +317,9 @@ + + + + @@ -519,6 +528,9 @@ + + double + @@ -699,7 +711,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1883742783/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/244004302/10002 $INTNAME @@ -707,7 +719,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src src3 @@ -719,7 +731,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1883742783/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/244004302/10002 @@ -753,7 +765,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src @@ -797,7 +809,7 @@ 1 - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/773086090/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/789217321/10000 @@ -1173,7 +1185,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src @@ -1241,7 +1253,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src @@ -1654,7 +1666,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src src2 @@ -1669,7 +1681,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src @@ -1706,7 +1718,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1883742783/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/244004302/10002 Index: ql/src/test/results/compiler/plan/input2.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input2.q.xml (revision 796913) +++ ql/src/test/results/compiler/plan/input2.q.xml (working copy) @@ -30,7 +30,7 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1231242820/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1232528818/10000 @@ -83,7 +83,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/dest1 @@ -93,7 +93,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1231242820/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1232528818/10001 @@ -121,10 +121,10 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1773686843/10006 + file:/data/users/emil/hive1/hive1/build/ql/tmp/544340995/10006 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1231242820/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1232528818/10000 @@ -142,7 +142,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1773686843/10006 + file:/data/users/emil/hive1/hive1/build/ql/tmp/544340995/10006 @@ -214,6 +214,9 @@ + + rand + @@ -342,10 +345,10 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1773686843/10006 + file:/data/users/emil/hive1/hive1/build/ql/tmp/544340995/10006 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1773686843/10006 + file:/data/users/emil/hive1/hive1/build/ql/tmp/544340995/10006 @@ -354,7 +357,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1773686843/10006 + file:/data/users/emil/hive1/hive1/build/ql/tmp/544340995/10006 @@ -372,7 +375,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1231242820/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1232528818/10000 @@ -421,7 +424,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/dest1 file.outputformat @@ -520,7 +523,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1773686843/10006 + file:/data/users/emil/hive1/hive1/build/ql/tmp/544340995/10006 @@ -570,7 +573,7 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1231242820/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1232528818/10002 @@ -623,7 +626,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest2 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/dest2 @@ -633,7 +636,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1231242820/10003 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1232528818/10003 @@ -661,10 +664,10 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1773686843/10007 + file:/data/users/emil/hive1/hive1/build/ql/tmp/544340995/10007 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1231242820/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1232528818/10002 @@ -682,7 +685,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1773686843/10007 + file:/data/users/emil/hive1/hive1/build/ql/tmp/544340995/10007 @@ -754,6 +757,9 @@ + + rand + @@ -874,10 +880,10 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1773686843/10007 + file:/data/users/emil/hive1/hive1/build/ql/tmp/544340995/10007 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1773686843/10007 + file:/data/users/emil/hive1/hive1/build/ql/tmp/544340995/10007 @@ -886,7 +892,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1773686843/10007 + file:/data/users/emil/hive1/hive1/build/ql/tmp/544340995/10007 @@ -904,7 +910,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1231242820/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1232528818/10002 @@ -953,7 +959,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest2 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/dest2 file.outputformat @@ -1052,7 +1058,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1773686843/10007 + file:/data/users/emil/hive1/hive1/build/ql/tmp/544340995/10007 @@ -1111,7 +1117,7 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1231242820/10004 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1232528818/10004 @@ -1164,7 +1170,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest3 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/dest3 @@ -1174,7 +1180,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1231242820/10005 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1232528818/10005 @@ -1202,10 +1208,10 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1773686843/10008 + file:/data/users/emil/hive1/hive1/build/ql/tmp/544340995/10008 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1231242820/10004 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1232528818/10004 @@ -1223,7 +1229,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1773686843/10008 + file:/data/users/emil/hive1/hive1/build/ql/tmp/544340995/10008 @@ -1295,6 +1301,9 @@ + + rand + @@ -1415,10 +1424,10 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1773686843/10008 + file:/data/users/emil/hive1/hive1/build/ql/tmp/544340995/10008 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1773686843/10008 + file:/data/users/emil/hive1/hive1/build/ql/tmp/544340995/10008 @@ -1427,7 +1436,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1773686843/10008 + file:/data/users/emil/hive1/hive1/build/ql/tmp/544340995/10008 @@ -1445,7 +1454,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1231242820/10004 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1232528818/10004 @@ -1498,7 +1507,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest3 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/dest3 file.outputformat @@ -1601,7 +1610,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1773686843/10008 + file:/data/users/emil/hive1/hive1/build/ql/tmp/544340995/10008 @@ -1689,7 +1698,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src @@ -1724,7 +1733,7 @@ 1 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1773686843/10006 + file:/data/users/emil/hive1/hive1/build/ql/tmp/544340995/10006 @@ -1888,6 +1897,9 @@ + + double + @@ -1922,6 +1934,9 @@ + + double + @@ -1929,6 +1944,9 @@ + + < + @@ -1993,7 +2011,7 @@ 2 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1773686843/10007 + file:/data/users/emil/hive1/hive1/build/ql/tmp/544340995/10007 @@ -2174,6 +2192,9 @@ + + double + @@ -2208,6 +2229,9 @@ + + double + @@ -2215,6 +2239,9 @@ + + >= + @@ -2269,6 +2296,9 @@ + + double + @@ -2303,6 +2333,9 @@ + + double + @@ -2310,6 +2343,9 @@ + + < + @@ -2317,6 +2353,9 @@ + + and + @@ -2356,7 +2395,7 @@ 3 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1773686843/10008 + file:/data/users/emil/hive1/hive1/build/ql/tmp/544340995/10008 @@ -2517,6 +2556,9 @@ + + double + @@ -2551,6 +2593,9 @@ + + double + @@ -2558,6 +2603,9 @@ + + >= + @@ -2607,7 +2655,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src src @@ -2619,7 +2667,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src Index: ql/src/test/results/compiler/plan/input3.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input3.q.xml (revision 796913) +++ ql/src/test/results/compiler/plan/input3.q.xml (working copy) @@ -30,7 +30,7 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/943669715/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/17493187/10000 @@ -83,7 +83,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/dest1 @@ -93,7 +93,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/943669715/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/17493187/10001 @@ -121,10 +121,10 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10007 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1470837820/10007 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/943669715/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/17493187/10000 @@ -142,7 +142,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10007 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1470837820/10007 @@ -214,6 +214,9 @@ + + rand + @@ -342,10 +345,10 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10007 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1470837820/10007 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10007 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1470837820/10007 @@ -354,7 +357,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10007 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1470837820/10007 @@ -372,7 +375,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/943669715/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/17493187/10000 @@ -421,7 +424,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/dest1 file.outputformat @@ -520,7 +523,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10007 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1470837820/10007 @@ -570,7 +573,7 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/943669715/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/17493187/10002 @@ -623,7 +626,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest2 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/dest2 @@ -633,7 +636,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/943669715/10003 + file:/data/users/emil/hive1/hive1/build/ql/tmp/17493187/10003 @@ -661,10 +664,10 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10008 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1470837820/10008 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/943669715/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/17493187/10002 @@ -682,7 +685,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10008 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1470837820/10008 @@ -754,6 +757,9 @@ + + rand + @@ -874,10 +880,10 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10008 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1470837820/10008 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10008 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1470837820/10008 @@ -886,7 +892,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10008 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1470837820/10008 @@ -904,7 +910,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/943669715/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/17493187/10002 @@ -953,7 +959,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest2 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/dest2 file.outputformat @@ -1052,7 +1058,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10008 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1470837820/10008 @@ -1111,7 +1117,7 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/943669715/10004 + file:/data/users/emil/hive1/hive1/build/ql/tmp/17493187/10004 @@ -1164,7 +1170,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest3 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/dest3 @@ -1174,7 +1180,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/943669715/10005 + file:/data/users/emil/hive1/hive1/build/ql/tmp/17493187/10005 @@ -1202,10 +1208,10 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10009 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1470837820/10009 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/943669715/10004 + file:/data/users/emil/hive1/hive1/build/ql/tmp/17493187/10004 @@ -1223,7 +1229,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10009 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1470837820/10009 @@ -1295,6 +1301,9 @@ + + rand + @@ -1415,10 +1424,10 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10009 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1470837820/10009 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10009 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1470837820/10009 @@ -1427,7 +1436,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10009 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1470837820/10009 @@ -1445,7 +1454,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/943669715/10004 + file:/data/users/emil/hive1/hive1/build/ql/tmp/17493187/10004 @@ -1498,7 +1507,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest3 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/dest3 file.outputformat @@ -1601,7 +1610,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10009 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1470837820/10009 @@ -1654,7 +1663,7 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/943669715/10006 + file:/data/users/emil/hive1/hive1/build/ql/tmp/17493187/10006 ../../../../build/contrib/hive/ql/test/data/warehouse/dest4.out @@ -1685,10 +1694,10 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10010 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1470837820/10010 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/943669715/10006 + file:/data/users/emil/hive1/hive1/build/ql/tmp/17493187/10006 @@ -1706,7 +1715,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10010 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1470837820/10010 @@ -1775,6 +1784,9 @@ + + rand + @@ -1875,10 +1887,10 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10010 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1470837820/10010 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10010 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1470837820/10010 @@ -1887,7 +1899,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10010 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1470837820/10010 @@ -1931,7 +1943,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/943669715/10006 + file:/data/users/emil/hive1/hive1/build/ql/tmp/17493187/10006 @@ -2038,7 +2050,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10010 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1470837820/10010 @@ -2126,7 +2138,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src @@ -2161,7 +2173,7 @@ 1 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10007 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1470837820/10007 @@ -2325,6 +2337,9 @@ + + double + @@ -2359,6 +2374,9 @@ + + double + @@ -2366,6 +2384,9 @@ + + < + @@ -2430,7 +2451,7 @@ 2 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10008 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1470837820/10008 @@ -2611,6 +2632,9 @@ + + double + @@ -2645,6 +2669,9 @@ + + double + @@ -2652,6 +2679,9 @@ + + >= + @@ -2706,6 +2736,9 @@ + + double + @@ -2740,6 +2773,9 @@ + + double + @@ -2747,6 +2783,9 @@ + + < + @@ -2754,6 +2793,9 @@ + + and + @@ -2793,7 +2835,7 @@ 3 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10009 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1470837820/10009 @@ -2974,6 +3016,9 @@ + + double + @@ -3008,6 +3053,9 @@ + + double + @@ -3015,6 +3063,9 @@ + + >= + @@ -3069,6 +3120,9 @@ + + double + @@ -3103,6 +3157,9 @@ + + double + @@ -3110,6 +3167,9 @@ + + < + @@ -3117,6 +3177,9 @@ + + and + @@ -3156,7 +3219,7 @@ 4 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/554607221/10010 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1470837820/10010 @@ -3290,6 +3353,9 @@ + + double + @@ -3324,6 +3390,9 @@ + + double + @@ -3331,6 +3400,9 @@ + + >= + @@ -3380,7 +3452,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src src @@ -3392,7 +3464,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src Index: ql/src/test/results/compiler/plan/join4.q.xml =================================================================== --- ql/src/test/results/compiler/plan/join4.q.xml (revision 796913) +++ ql/src/test/results/compiler/plan/join4.q.xml (working copy) @@ -64,7 +64,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src @@ -132,7 +132,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src @@ -503,6 +503,9 @@ + + double + @@ -545,6 +548,9 @@ + + double + @@ -552,6 +558,9 @@ + + > + @@ -610,6 +619,9 @@ + + double + @@ -644,6 +656,9 @@ + + double + @@ -651,6 +666,9 @@ + + < + @@ -658,6 +676,9 @@ + + and + @@ -748,6 +769,9 @@ + + double + @@ -775,6 +799,9 @@ + + double + @@ -782,6 +809,9 @@ + + > + @@ -819,6 +849,9 @@ + + double + @@ -846,6 +879,9 @@ + + double + @@ -853,6 +889,9 @@ + + < + @@ -860,6 +899,9 @@ + + and + @@ -1260,6 +1302,9 @@ + + double + @@ -1294,6 +1339,9 @@ + + double + @@ -1301,6 +1349,9 @@ + + > + @@ -1355,6 +1406,9 @@ + + double + @@ -1389,6 +1443,9 @@ + + double + @@ -1396,6 +1453,9 @@ + + < + @@ -1403,6 +1463,9 @@ + + and + @@ -1493,6 +1556,9 @@ + + double + @@ -1520,6 +1586,9 @@ + + double + @@ -1527,6 +1596,9 @@ + + > + @@ -1564,6 +1636,9 @@ + + double + @@ -1591,6 +1666,9 @@ + + double + @@ -1598,6 +1676,9 @@ + + < + @@ -1605,6 +1686,9 @@ + + and + @@ -1663,7 +1747,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src c:a:src1 @@ -1678,7 +1762,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src @@ -1723,7 +1807,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/185294480/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/913448053/10001 Index: ql/src/test/results/compiler/plan/input4.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input4.q.xml (revision 796913) +++ ql/src/test/results/compiler/plan/input4.q.xml (working copy) @@ -26,7 +26,7 @@ true - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/326603487/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1597858284/10000 @@ -79,7 +79,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/dest1 @@ -89,7 +89,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/326603487/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1597858284/10001 @@ -162,7 +162,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src @@ -598,7 +598,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src tmap:src @@ -610,7 +610,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src @@ -658,7 +658,7 @@ 1 - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/326603487/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1597858284/10000 @@ -844,6 +844,9 @@ + + double + @@ -886,6 +889,9 @@ + + double + @@ -893,6 +899,9 @@ + + < + Index: ql/src/test/results/compiler/plan/join5.q.xml =================================================================== --- ql/src/test/results/compiler/plan/join5.q.xml (revision 796913) +++ ql/src/test/results/compiler/plan/join5.q.xml (working copy) @@ -64,7 +64,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src @@ -132,7 +132,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src @@ -503,6 +503,9 @@ + + double + @@ -545,6 +548,9 @@ + + double + @@ -552,6 +558,9 @@ + + > + @@ -610,6 +619,9 @@ + + double + @@ -644,6 +656,9 @@ + + double + @@ -651,6 +666,9 @@ + + < + @@ -658,6 +676,9 @@ + + and + @@ -748,6 +769,9 @@ + + double + @@ -775,6 +799,9 @@ + + double + @@ -782,6 +809,9 @@ + + > + @@ -819,6 +849,9 @@ + + double + @@ -846,6 +879,9 @@ + + double + @@ -853,6 +889,9 @@ + + < + @@ -860,6 +899,9 @@ + + and + @@ -1260,6 +1302,9 @@ + + double + @@ -1294,6 +1339,9 @@ + + double + @@ -1301,6 +1349,9 @@ + + > + @@ -1355,6 +1406,9 @@ + + double + @@ -1389,6 +1443,9 @@ + + double + @@ -1396,6 +1453,9 @@ + + < + @@ -1403,6 +1463,9 @@ + + and + @@ -1493,6 +1556,9 @@ + + double + @@ -1520,6 +1586,9 @@ + + double + @@ -1527,6 +1596,9 @@ + + > + @@ -1564,6 +1636,9 @@ + + double + @@ -1591,6 +1666,9 @@ + + double + @@ -1598,6 +1676,9 @@ + + < + @@ -1605,6 +1686,9 @@ + + and + @@ -1663,7 +1747,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src c:a:src1 @@ -1678,7 +1762,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src @@ -1723,7 +1807,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1048442464/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/236285266/10001 Index: ql/src/test/results/compiler/plan/join6.q.xml =================================================================== --- ql/src/test/results/compiler/plan/join6.q.xml (revision 796913) +++ ql/src/test/results/compiler/plan/join6.q.xml (working copy) @@ -64,7 +64,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src @@ -132,7 +132,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src @@ -503,6 +503,9 @@ + + double + @@ -545,6 +548,9 @@ + + double + @@ -552,6 +558,9 @@ + + > + @@ -610,6 +619,9 @@ + + double + @@ -644,6 +656,9 @@ + + double + @@ -651,6 +666,9 @@ + + < + @@ -658,6 +676,9 @@ + + and + @@ -748,6 +769,9 @@ + + double + @@ -775,6 +799,9 @@ + + double + @@ -782,6 +809,9 @@ + + > + @@ -819,6 +849,9 @@ + + double + @@ -846,6 +879,9 @@ + + double + @@ -853,6 +889,9 @@ + + < + @@ -860,6 +899,9 @@ + + and + @@ -1260,6 +1302,9 @@ + + double + @@ -1294,6 +1339,9 @@ + + double + @@ -1301,6 +1349,9 @@ + + > + @@ -1355,6 +1406,9 @@ + + double + @@ -1389,6 +1443,9 @@ + + double + @@ -1396,6 +1453,9 @@ + + < + @@ -1403,6 +1463,9 @@ + + and + @@ -1493,6 +1556,9 @@ + + double + @@ -1520,6 +1586,9 @@ + + double + @@ -1527,6 +1596,9 @@ + + > + @@ -1564,6 +1636,9 @@ + + double + @@ -1591,6 +1666,9 @@ + + double + @@ -1598,6 +1676,9 @@ + + < + @@ -1605,6 +1686,9 @@ + + and + @@ -1663,7 +1747,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src c:a:src1 @@ -1678,7 +1762,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src @@ -1723,7 +1807,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/397527640/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1321803935/10001 Index: ql/src/test/results/compiler/plan/input_testxpath2.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input_testxpath2.q.xml (revision 796913) +++ ql/src/test/results/compiler/plan/input_testxpath2.q.xml (working copy) @@ -68,7 +68,7 @@ location - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src_thrift + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src_thrift @@ -104,7 +104,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/tmp/179258729/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1173650674/10001 @@ -460,6 +460,9 @@ + + NOT + @@ -467,6 +470,9 @@ + + AND + @@ -629,6 +635,9 @@ + + NOT + @@ -636,6 +645,9 @@ + + AND + @@ -688,7 +700,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src_thrift + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src_thrift src_thrift @@ -700,7 +712,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src_thrift + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src_thrift Index: ql/src/test/results/compiler/plan/input6.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input6.q.xml (revision 796913) +++ ql/src/test/results/compiler/plan/input6.q.xml (working copy) @@ -30,7 +30,7 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/859581041/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/75899022/10000 @@ -83,7 +83,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/dest1 @@ -93,7 +93,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/859581041/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/75899022/10001 @@ -121,10 +121,10 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/193107959/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/575909372/10002 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/859581041/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/75899022/10000 @@ -142,7 +142,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/193107959/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/575909372/10002 @@ -214,6 +214,9 @@ + + rand + @@ -342,10 +345,10 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/193107959/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/575909372/10002 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/193107959/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/575909372/10002 @@ -354,7 +357,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/193107959/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/575909372/10002 @@ -372,7 +375,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/859581041/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/75899022/10000 @@ -421,7 +424,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/dest1 file.outputformat @@ -520,7 +523,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/193107959/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/575909372/10002 @@ -608,7 +611,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src1 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src1 @@ -647,7 +650,7 @@ 1 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/193107959/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/575909372/10002 @@ -898,7 +901,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src1 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src1 src1 @@ -910,7 +913,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src1 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src1 Index: ql/src/test/results/compiler/plan/join7.q.xml =================================================================== --- ql/src/test/results/compiler/plan/join7.q.xml (revision 796913) +++ ql/src/test/results/compiler/plan/join7.q.xml (working copy) @@ -64,7 +64,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src @@ -132,7 +132,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src @@ -200,7 +200,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src @@ -571,6 +571,9 @@ + + double + @@ -613,6 +616,9 @@ + + double + @@ -620,6 +626,9 @@ + + > + @@ -678,6 +687,9 @@ + + double + @@ -712,6 +724,9 @@ + + double + @@ -719,6 +734,9 @@ + + < + @@ -726,6 +744,9 @@ + + and + @@ -816,6 +837,9 @@ + + double + @@ -843,6 +867,9 @@ + + double + @@ -850,6 +877,9 @@ + + > + @@ -887,6 +917,9 @@ + + double + @@ -914,6 +947,9 @@ + + double + @@ -921,6 +957,9 @@ + + < + @@ -928,6 +967,9 @@ + + and + @@ -1328,6 +1370,9 @@ + + double + @@ -1362,6 +1407,9 @@ + + double + @@ -1369,6 +1417,9 @@ + + > + @@ -1423,6 +1474,9 @@ + + double + @@ -1457,6 +1511,9 @@ + + double + @@ -1464,6 +1521,9 @@ + + < + @@ -1471,6 +1531,9 @@ + + and + @@ -1561,6 +1624,9 @@ + + double + @@ -1588,6 +1654,9 @@ + + double + @@ -1595,6 +1664,9 @@ + + > + @@ -1632,6 +1704,9 @@ + + double + @@ -1659,6 +1734,9 @@ + + double + @@ -1666,6 +1744,9 @@ + + < + @@ -1673,6 +1754,9 @@ + + and + @@ -2073,6 +2157,9 @@ + + double + @@ -2107,6 +2194,9 @@ + + double + @@ -2114,6 +2204,9 @@ + + > + @@ -2168,6 +2261,9 @@ + + double + @@ -2202,6 +2298,9 @@ + + double + @@ -2209,6 +2308,9 @@ + + < + @@ -2216,6 +2318,9 @@ + + and + @@ -2306,6 +2411,9 @@ + + double + @@ -2333,6 +2441,9 @@ + + double + @@ -2340,6 +2451,9 @@ + + > + @@ -2377,6 +2491,9 @@ + + double + @@ -2404,6 +2521,9 @@ + + double + @@ -2411,6 +2531,9 @@ + + < + @@ -2418,6 +2541,9 @@ + + and + @@ -2476,7 +2602,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src c:a:src1 @@ -2494,7 +2620,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src @@ -2539,7 +2665,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/245344500/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1095521761/10001 Index: ql/src/test/results/compiler/plan/input7.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input7.q.xml (revision 796913) +++ ql/src/test/results/compiler/plan/input7.q.xml (working copy) @@ -30,7 +30,7 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/471888232/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/130880203/10000 @@ -83,7 +83,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/dest1 @@ -93,7 +93,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/471888232/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/130880203/10001 @@ -121,10 +121,10 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1506551529/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1773268111/10002 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/471888232/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/130880203/10000 @@ -142,7 +142,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1506551529/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1773268111/10002 @@ -214,6 +214,9 @@ + + rand + @@ -342,10 +345,10 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1506551529/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1773268111/10002 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1506551529/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1773268111/10002 @@ -354,7 +357,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1506551529/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1773268111/10002 @@ -372,7 +375,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/471888232/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/130880203/10000 @@ -421,7 +424,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/dest1 file.outputformat @@ -524,7 +527,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1506551529/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1773268111/10002 @@ -612,7 +615,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src1 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src1 @@ -643,7 +646,7 @@ 1 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1506551529/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1773268111/10002 @@ -792,7 +795,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src1 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src1 src1 @@ -804,7 +807,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src1 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src1 Index: ql/src/test/results/compiler/plan/input_testsequencefile.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input_testsequencefile.q.xml (revision 796913) +++ ql/src/test/results/compiler/plan/input_testsequencefile.q.xml (working copy) @@ -30,7 +30,7 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/967650497/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/707598471/10000 @@ -83,7 +83,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest4_sequencefile + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/dest4_sequencefile @@ -93,7 +93,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/967650497/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/707598471/10001 @@ -121,10 +121,10 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1146419397/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1283461713/10002 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/967650497/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/707598471/10000 @@ -142,7 +142,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1146419397/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1283461713/10002 @@ -214,6 +214,9 @@ + + rand + @@ -342,10 +345,10 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1146419397/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1283461713/10002 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1146419397/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1283461713/10002 @@ -354,7 +357,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1146419397/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1283461713/10002 @@ -372,7 +375,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/967650497/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/707598471/10000 @@ -421,7 +424,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest4_sequencefile + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/dest4_sequencefile file.outputformat @@ -520,7 +523,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1146419397/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1283461713/10002 @@ -608,7 +611,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src @@ -639,7 +642,7 @@ 1 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1146419397/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1283461713/10002 @@ -794,7 +797,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src src @@ -806,7 +809,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src Index: ql/src/test/results/compiler/plan/input8.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input8.q.xml (revision 796913) +++ ql/src/test/results/compiler/plan/input8.q.xml (working copy) @@ -64,7 +64,7 @@ location - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src1 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src1 @@ -92,7 +92,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/tmp/1325741410/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/736719518/10001 @@ -217,6 +217,9 @@ + + + + @@ -276,6 +279,9 @@ + + double + @@ -290,6 +296,9 @@ + + - + @@ -349,6 +358,9 @@ + + double + @@ -363,6 +375,9 @@ + + + + @@ -491,7 +506,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src1 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src1 src1 @@ -503,7 +518,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src1 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src1 Index: ql/src/test/results/compiler/plan/join8.q.xml =================================================================== --- ql/src/test/results/compiler/plan/join8.q.xml (revision 796913) +++ ql/src/test/results/compiler/plan/join8.q.xml (working copy) @@ -64,7 +64,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src @@ -132,7 +132,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src @@ -503,6 +503,9 @@ + + double + @@ -545,6 +548,9 @@ + + double + @@ -552,6 +558,9 @@ + + > + @@ -610,6 +619,9 @@ + + double + @@ -644,6 +656,9 @@ + + double + @@ -651,6 +666,9 @@ + + < + @@ -658,6 +676,9 @@ + + and + @@ -748,6 +769,9 @@ + + double + @@ -775,6 +799,9 @@ + + double + @@ -782,6 +809,9 @@ + + > + @@ -819,6 +849,9 @@ + + double + @@ -846,6 +879,9 @@ + + double + @@ -853,6 +889,9 @@ + + < + @@ -860,6 +899,9 @@ + + and + @@ -1260,6 +1302,9 @@ + + double + @@ -1294,6 +1339,9 @@ + + double + @@ -1301,6 +1349,9 @@ + + > + @@ -1355,6 +1406,9 @@ + + double + @@ -1389,6 +1443,9 @@ + + double + @@ -1396,6 +1453,9 @@ + + < + @@ -1403,6 +1463,9 @@ + + and + @@ -1493,6 +1556,9 @@ + + double + @@ -1520,6 +1586,9 @@ + + double + @@ -1527,6 +1596,9 @@ + + > + @@ -1564,6 +1636,9 @@ + + double + @@ -1591,6 +1666,9 @@ + + double + @@ -1598,6 +1676,9 @@ + + < + @@ -1605,6 +1686,9 @@ + + and + @@ -1663,7 +1747,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src c:a:src1 @@ -1678,7 +1762,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src @@ -1727,7 +1811,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/2085351933/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/203351842/10001 @@ -2034,6 +2118,9 @@ + + AND + Index: ql/src/test/results/compiler/plan/input9.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input9.q.xml (revision 796913) +++ ql/src/test/results/compiler/plan/input9.q.xml (working copy) @@ -30,7 +30,7 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/120413419/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/245470633/10000 @@ -83,7 +83,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/dest1 @@ -93,7 +93,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/120413419/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/245470633/10001 @@ -121,10 +121,10 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1640616512/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/737928153/10002 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/120413419/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/245470633/10000 @@ -142,7 +142,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1640616512/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/737928153/10002 @@ -214,6 +214,9 @@ + + rand + @@ -342,10 +345,10 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1640616512/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/737928153/10002 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1640616512/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/737928153/10002 @@ -354,7 +357,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1640616512/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/737928153/10002 @@ -372,7 +375,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/120413419/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/245470633/10000 @@ -421,7 +424,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/dest1 file.outputformat @@ -524,7 +527,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1640616512/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/737928153/10002 @@ -612,7 +615,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src1 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src1 @@ -651,7 +654,7 @@ 1 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1640616512/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/737928153/10002 @@ -796,6 +799,9 @@ + + = + @@ -874,6 +880,9 @@ + + = + @@ -920,7 +929,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src1 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src1 src1 @@ -932,7 +941,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src1 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src1 Index: ql/src/test/results/compiler/plan/union.q.xml =================================================================== --- ql/src/test/results/compiler/plan/union.q.xml (revision 796913) +++ ql/src/test/results/compiler/plan/union.q.xml (working copy) @@ -33,7 +33,7 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1824776098/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1910689613/10000 ../build/ql/test/data/warehouse/union.out @@ -64,10 +64,10 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/555401062/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/932937883/10001 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1824776098/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1910689613/10000 @@ -85,7 +85,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/555401062/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/932937883/10001 @@ -157,6 +157,9 @@ + + rand + @@ -285,10 +288,10 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/555401062/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/932937883/10001 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/555401062/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/932937883/10001 @@ -297,7 +300,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/555401062/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/932937883/10001 @@ -341,7 +344,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1824776098/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1910689613/10000 @@ -458,7 +461,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/555401062/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/932937883/10001 @@ -546,7 +549,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src @@ -614,7 +617,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src @@ -661,7 +664,7 @@ 1 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/555401062/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/932937883/10001 @@ -906,6 +909,9 @@ + + double + @@ -944,6 +950,9 @@ + + double + @@ -951,6 +960,9 @@ + + > + @@ -1007,6 +1019,9 @@ + + double + @@ -1034,6 +1049,9 @@ + + double + @@ -1041,6 +1059,9 @@ + + > + @@ -1313,6 +1334,9 @@ + + double + @@ -1347,6 +1371,9 @@ + + double + @@ -1354,6 +1381,9 @@ + + < + @@ -1434,6 +1464,9 @@ + + double + @@ -1461,6 +1494,9 @@ + + double + @@ -1468,6 +1504,9 @@ + + < + @@ -1521,7 +1560,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src null-subquery1:unioninput-subquery1:src @@ -1536,7 +1575,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src Index: ql/src/test/results/compiler/plan/udf1.q.xml =================================================================== --- ql/src/test/results/compiler/plan/udf1.q.xml (revision 796913) +++ ql/src/test/results/compiler/plan/udf1.q.xml (working copy) @@ -64,7 +64,7 @@ location - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src @@ -100,7 +100,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/tmp/1175969971/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/353938339/10001 @@ -375,6 +375,9 @@ + + RLIKE + @@ -423,6 +426,9 @@ + + LIKE + @@ -471,6 +477,9 @@ + + LIKE + @@ -519,6 +528,9 @@ + + LIKE + @@ -567,6 +579,9 @@ + + LIKE + @@ -615,6 +630,9 @@ + + LIKE + @@ -663,6 +681,9 @@ + + LIKE + @@ -711,6 +732,9 @@ + + LIKE + @@ -759,6 +783,9 @@ + + RLIKE + @@ -820,6 +847,9 @@ + + REGEXP_REPLACE + @@ -868,6 +898,9 @@ + + RLIKE + @@ -916,6 +949,9 @@ + + RLIKE + @@ -964,6 +1000,9 @@ + + RLIKE + @@ -1025,6 +1064,9 @@ + + REGEXP_REPLACE + @@ -1086,6 +1128,9 @@ + + REGEXP_REPLACE + @@ -1147,6 +1192,9 @@ + + REGEXP_REPLACE + @@ -1195,6 +1243,9 @@ + + LIKE + @@ -1556,6 +1607,9 @@ + + double + @@ -1598,6 +1652,9 @@ + + double + @@ -1605,6 +1662,9 @@ + + = + @@ -1685,6 +1745,9 @@ + + double + @@ -1712,6 +1775,9 @@ + + double + @@ -1719,6 +1785,9 @@ + + = + @@ -1765,7 +1834,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src src @@ -1777,7 +1846,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src Index: ql/src/test/results/compiler/plan/udf4.q.xml =================================================================== --- ql/src/test/results/compiler/plan/udf4.q.xml (revision 796913) +++ ql/src/test/results/compiler/plan/udf4.q.xml (working copy) @@ -64,7 +64,7 @@ location - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/dest1 @@ -92,7 +92,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/tmp/312017041/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/778810450/10001 @@ -378,6 +378,9 @@ + + sqrt + @@ -430,6 +433,9 @@ + + negative + @@ -437,6 +443,9 @@ + + sqrt + @@ -472,6 +481,9 @@ + + sqrt + @@ -524,6 +536,9 @@ + + negative + @@ -531,6 +546,9 @@ + + floor + @@ -566,6 +584,9 @@ + + floor + @@ -601,6 +622,9 @@ + + floor + @@ -653,6 +677,9 @@ + + negative + @@ -660,6 +687,9 @@ + + round + @@ -695,6 +725,9 @@ + + round + @@ -730,6 +763,9 @@ + + ceil + @@ -782,6 +818,9 @@ + + bigint + @@ -789,6 +828,9 @@ + + rand + @@ -824,6 +866,9 @@ + + ceiling + @@ -876,6 +921,9 @@ + + negative + @@ -883,6 +931,9 @@ + + ceil + @@ -918,6 +969,9 @@ + + ceil + @@ -983,6 +1037,9 @@ + + negative + @@ -990,6 +1047,9 @@ + + + + @@ -1038,6 +1098,9 @@ + + + + @@ -1073,6 +1136,9 @@ + + negative + @@ -1119,6 +1185,9 @@ + + round + @@ -1154,6 +1223,9 @@ + + ~ + @@ -1538,7 +1610,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/dest1 dest1 @@ -1550,7 +1622,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/dest1 Index: ql/src/test/results/compiler/plan/udf6.q.xml =================================================================== --- ql/src/test/results/compiler/plan/udf6.q.xml (revision 796913) +++ ql/src/test/results/compiler/plan/udf6.q.xml (working copy) @@ -64,7 +64,7 @@ location - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src @@ -92,7 +92,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/tmp/1889137772/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/405892277/10001 @@ -266,6 +266,9 @@ + + CONCAT + @@ -374,7 +377,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src src @@ -386,7 +389,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src Index: ql/src/test/results/compiler/plan/input_part1.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input_part1.q.xml (revision 796913) +++ ql/src/test/results/compiler/plan/input_part1.q.xml (working copy) @@ -77,7 +77,7 @@ location - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/srcpart + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/srcpart @@ -113,7 +113,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/tmp/1486263187/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1044586671/10001 @@ -443,6 +443,9 @@ + + double + @@ -485,6 +488,9 @@ + + double + @@ -492,6 +498,9 @@ + + < + @@ -543,6 +552,9 @@ + + = + @@ -550,6 +562,9 @@ + + and + @@ -597,6 +612,9 @@ + + = + @@ -604,6 +622,9 @@ + + and + @@ -724,6 +745,9 @@ + + double + @@ -751,6 +775,9 @@ + + double + @@ -758,6 +785,9 @@ + + < + @@ -795,6 +825,9 @@ + + = + @@ -802,6 +835,9 @@ + + and + @@ -839,6 +875,9 @@ + + = + @@ -846,6 +885,9 @@ + + and + @@ -901,7 +943,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 srcpart @@ -913,7 +955,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 Index: ql/src/test/results/compiler/plan/groupby1.q.xml =================================================================== --- ql/src/test/results/compiler/plan/groupby1.q.xml (revision 796913) +++ ql/src/test/results/compiler/plan/groupby1.q.xml (working copy) @@ -26,7 +26,7 @@ true - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/706639104/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/304232720/10000 @@ -79,7 +79,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/dest1 @@ -89,7 +89,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/706639104/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/304232720/10001 @@ -162,7 +162,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src @@ -439,6 +439,9 @@ + + substr + @@ -623,7 +626,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src src @@ -635,7 +638,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src @@ -679,7 +682,7 @@ 1 - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/706639104/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/304232720/10000 Index: ql/src/test/results/compiler/plan/groupby2.q.xml =================================================================== --- ql/src/test/results/compiler/plan/groupby2.q.xml (revision 796913) +++ ql/src/test/results/compiler/plan/groupby2.q.xml (working copy) @@ -64,7 +64,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src @@ -368,6 +368,9 @@ + + substr + @@ -429,6 +432,9 @@ + + substr + @@ -500,6 +506,9 @@ + + substr + @@ -564,6 +573,9 @@ + + substr + @@ -777,7 +789,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src src @@ -789,7 +801,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src @@ -830,7 +842,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1682245307/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1251435722/10001 @@ -974,6 +986,9 @@ + + string + @@ -981,6 +996,9 @@ + + concat + Index: ql/src/test/results/compiler/plan/groupby3.q.xml =================================================================== --- ql/src/test/results/compiler/plan/groupby3.q.xml (revision 796913) +++ ql/src/test/results/compiler/plan/groupby3.q.xml (working copy) @@ -64,7 +64,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src @@ -402,6 +402,9 @@ + + substr + @@ -470,6 +473,9 @@ + + substr + @@ -534,6 +540,9 @@ + + substr + @@ -601,6 +610,9 @@ + + substr + @@ -669,6 +681,9 @@ + + substr + @@ -737,6 +752,9 @@ + + substr + @@ -961,7 +979,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src src @@ -973,7 +991,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src @@ -1014,7 +1032,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1043603428/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/127382121/10001 Index: ql/src/test/results/compiler/plan/subq.q.xml =================================================================== --- ql/src/test/results/compiler/plan/subq.q.xml (revision 796913) +++ ql/src/test/results/compiler/plan/subq.q.xml (working copy) @@ -33,7 +33,7 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1374780294/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1876736051/10000 ../build/ql/test/data/warehouse/union.out @@ -64,10 +64,10 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/604868872/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/204873363/10001 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1374780294/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1876736051/10000 @@ -85,7 +85,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/604868872/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/204873363/10001 @@ -157,6 +157,9 @@ + + rand + @@ -285,10 +288,10 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/604868872/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/204873363/10001 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/604868872/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/204873363/10001 @@ -297,7 +300,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/604868872/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/204873363/10001 @@ -341,7 +344,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1374780294/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1876736051/10000 @@ -458,7 +461,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/604868872/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/204873363/10001 @@ -546,7 +549,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src @@ -589,7 +592,7 @@ 1 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/604868872/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/204873363/10001 @@ -845,6 +848,9 @@ + + double + @@ -883,6 +889,9 @@ + + double + @@ -890,6 +899,9 @@ + + < + @@ -974,6 +986,9 @@ + + double + @@ -1001,6 +1016,9 @@ + + double + @@ -1008,6 +1026,9 @@ + + < + @@ -1057,7 +1078,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src unioninput:src @@ -1069,7 +1090,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src Index: ql/src/test/results/compiler/plan/groupby4.q.xml =================================================================== --- ql/src/test/results/compiler/plan/groupby4.q.xml (revision 796913) +++ ql/src/test/results/compiler/plan/groupby4.q.xml (working copy) @@ -64,7 +64,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src @@ -294,6 +294,9 @@ + + substr + @@ -454,7 +457,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src src @@ -466,7 +469,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src @@ -507,7 +510,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1174115931/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/44369693/10001 Index: ql/src/test/results/compiler/plan/groupby5.q.xml =================================================================== --- ql/src/test/results/compiler/plan/groupby5.q.xml (revision 796913) +++ ql/src/test/results/compiler/plan/groupby5.q.xml (working copy) @@ -64,7 +64,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src @@ -341,6 +341,9 @@ + + substr + @@ -525,7 +528,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src src @@ -537,7 +540,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src @@ -578,7 +581,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1095942610/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/2075144059/10001 Index: ql/src/test/results/compiler/plan/groupby6.q.xml =================================================================== --- ql/src/test/results/compiler/plan/groupby6.q.xml (revision 796913) +++ ql/src/test/results/compiler/plan/groupby6.q.xml (working copy) @@ -64,7 +64,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src @@ -294,6 +294,9 @@ + + substr + @@ -454,7 +457,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src src @@ -466,7 +469,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src @@ -507,7 +510,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/1444219471/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/2054773832/10001 Index: ql/src/test/results/compiler/plan/case_sensitivity.q.xml =================================================================== --- ql/src/test/results/compiler/plan/case_sensitivity.q.xml (revision 796913) +++ ql/src/test/results/compiler/plan/case_sensitivity.q.xml (working copy) @@ -30,7 +30,7 @@ true - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/tmp/1148174611/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1843573926/10000 @@ -83,7 +83,7 @@ location - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/dest1 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/dest1 @@ -93,7 +93,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/tmp/1148174611/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1843573926/10001 @@ -121,10 +121,10 @@ true - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/tmp/1680424512/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/710344846/10002 - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/tmp/1148174611/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1843573926/10000 @@ -142,7 +142,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/tmp/1680424512/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/710344846/10002 @@ -214,6 +214,9 @@ + + rand + @@ -342,10 +345,10 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/tmp/1680424512/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/710344846/10002 - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/tmp/1680424512/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/710344846/10002 @@ -354,7 +357,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/tmp/1680424512/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/710344846/10002 @@ -372,7 +375,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/tmp/1148174611/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1843573926/10000 @@ -421,7 +424,7 @@ location - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/dest1 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/dest1 file.outputformat @@ -524,7 +527,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/tmp/1680424512/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/710344846/10002 @@ -616,7 +619,7 @@ location - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src_thrift + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src_thrift @@ -655,7 +658,7 @@ 1 - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/tmp/1680424512/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/710344846/10002 @@ -902,6 +905,9 @@ + + > + @@ -1061,6 +1067,9 @@ + + > + @@ -1110,7 +1119,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src_thrift + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src_thrift src_thrift @@ -1122,7 +1131,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src_thrift + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src_thrift Index: ql/src/test/results/compiler/plan/udf_when.q.xml =================================================================== --- ql/src/test/results/compiler/plan/udf_when.q.xml (revision 796913) +++ ql/src/test/results/compiler/plan/udf_when.q.xml (working copy) @@ -64,7 +64,7 @@ location - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src @@ -96,7 +96,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/tmp/1365386357/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/416453100/10001 @@ -267,6 +267,9 @@ + + = + @@ -328,6 +331,9 @@ + + = + @@ -400,6 +406,9 @@ + + = + @@ -457,6 +466,9 @@ + + = + @@ -578,7 +590,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src src @@ -590,7 +602,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src Index: ql/src/test/results/compiler/plan/input20.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input20.q.xml (revision 796913) +++ ql/src/test/results/compiler/plan/input20.q.xml (working copy) @@ -64,7 +64,7 @@ location - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src @@ -416,6 +416,9 @@ + + double + @@ -458,6 +461,9 @@ + + double + @@ -465,6 +471,9 @@ + + % + @@ -520,6 +529,9 @@ + + double + @@ -554,6 +566,9 @@ + + double + @@ -561,6 +576,9 @@ + + % + @@ -679,7 +697,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src tmap:src @@ -691,7 +709,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src @@ -736,7 +754,7 @@ - file:/data/users/zshao/tools/522-trunk-apache-hive/build/ql/tmp/723531623/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1012151206/10001 Index: ql/src/test/results/compiler/plan/sample1.q.xml =================================================================== --- ql/src/test/results/compiler/plan/sample1.q.xml (revision 796913) +++ ql/src/test/results/compiler/plan/sample1.q.xml (working copy) @@ -77,7 +77,7 @@ location - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/srcpart + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/srcpart @@ -113,7 +113,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/tmp/506075331/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1830421923/10001 @@ -419,6 +419,9 @@ + + = + @@ -470,6 +473,9 @@ + + = + @@ -477,6 +483,9 @@ + + and + @@ -623,6 +632,9 @@ + + rand + @@ -658,6 +670,9 @@ + + & + @@ -675,6 +690,9 @@ + + % + @@ -692,6 +710,9 @@ + + == + @@ -740,7 +761,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 s @@ -752,7 +773,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 Index: ql/src/test/results/compiler/plan/sample2.q.xml =================================================================== --- ql/src/test/results/compiler/plan/sample2.q.xml (revision 796913) +++ ql/src/test/results/compiler/plan/sample2.q.xml (working copy) @@ -30,7 +30,7 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1490423752/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1774688584/10000 @@ -83,7 +83,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/dest1 @@ -93,7 +93,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1490423752/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1774688584/10001 @@ -121,10 +121,10 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1313373355/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/330155326/10002 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1490423752/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1774688584/10000 @@ -142,7 +142,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1313373355/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/330155326/10002 @@ -214,6 +214,9 @@ + + rand + @@ -342,10 +345,10 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1313373355/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/330155326/10002 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1313373355/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/330155326/10002 @@ -354,7 +357,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1313373355/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/330155326/10002 @@ -372,7 +375,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1490423752/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1774688584/10000 @@ -421,7 +424,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/dest1 file.outputformat @@ -524,7 +527,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1313373355/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/330155326/10002 @@ -616,7 +619,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/srcbucket + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/srcbucket @@ -655,7 +658,7 @@ 1 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1313373355/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/330155326/10002 @@ -866,6 +869,9 @@ + + & + @@ -883,6 +889,9 @@ + + % + @@ -900,6 +909,9 @@ + + == + @@ -990,6 +1002,9 @@ + + & + @@ -1007,6 +1022,9 @@ + + % + @@ -1024,6 +1042,9 @@ + + == + @@ -1094,7 +1115,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt s @@ -1106,7 +1127,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt Index: ql/src/test/results/compiler/plan/sample3.q.xml =================================================================== --- ql/src/test/results/compiler/plan/sample3.q.xml (revision 796913) +++ ql/src/test/results/compiler/plan/sample3.q.xml (working copy) @@ -30,7 +30,7 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1719224789/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/993639541/10000 @@ -83,7 +83,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/dest1 @@ -93,7 +93,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1719224789/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/993639541/10001 @@ -121,10 +121,10 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/2025285331/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/302362714/10002 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1719224789/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/993639541/10000 @@ -142,7 +142,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/2025285331/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/302362714/10002 @@ -214,6 +214,9 @@ + + rand + @@ -342,10 +345,10 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/2025285331/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/302362714/10002 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/2025285331/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/302362714/10002 @@ -354,7 +357,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/2025285331/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/302362714/10002 @@ -372,7 +375,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1719224789/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/993639541/10000 @@ -421,7 +424,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/dest1 file.outputformat @@ -524,7 +527,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/2025285331/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/302362714/10002 @@ -616,7 +619,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/srcbucket + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/srcbucket @@ -655,7 +658,7 @@ 1 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/2025285331/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/302362714/10002 @@ -876,6 +879,9 @@ + + & + @@ -893,6 +899,9 @@ + + % + @@ -910,6 +919,9 @@ + + == + @@ -1010,6 +1022,9 @@ + + & + @@ -1027,6 +1042,9 @@ + + % + @@ -1044,6 +1062,9 @@ + + == + @@ -1114,7 +1135,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/srcbucket + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/srcbucket s @@ -1126,7 +1147,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/srcbucket + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/srcbucket Index: ql/src/test/results/compiler/plan/sample4.q.xml =================================================================== --- ql/src/test/results/compiler/plan/sample4.q.xml (revision 796913) +++ ql/src/test/results/compiler/plan/sample4.q.xml (working copy) @@ -30,7 +30,7 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/487130226/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/627049941/10000 @@ -83,7 +83,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/dest1 @@ -93,7 +93,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/487130226/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/627049941/10001 @@ -121,10 +121,10 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/667179734/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/936895587/10002 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/487130226/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/627049941/10000 @@ -142,7 +142,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/667179734/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/936895587/10002 @@ -214,6 +214,9 @@ + + rand + @@ -342,10 +345,10 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/667179734/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/936895587/10002 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/667179734/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/936895587/10002 @@ -354,7 +357,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/667179734/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/936895587/10002 @@ -372,7 +375,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/487130226/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/627049941/10000 @@ -421,7 +424,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/dest1 file.outputformat @@ -524,7 +527,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/667179734/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/936895587/10002 @@ -616,7 +619,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/srcbucket + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/srcbucket @@ -655,7 +658,7 @@ 1 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/667179734/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/936895587/10002 @@ -866,6 +869,9 @@ + + & + @@ -883,6 +889,9 @@ + + % + @@ -900,6 +909,9 @@ + + == + @@ -990,6 +1002,9 @@ + + & + @@ -1007,6 +1022,9 @@ + + % + @@ -1024,6 +1042,9 @@ + + == + @@ -1094,7 +1115,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt s @@ -1106,7 +1127,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt Index: ql/src/test/results/compiler/plan/sample5.q.xml =================================================================== --- ql/src/test/results/compiler/plan/sample5.q.xml (revision 796913) +++ ql/src/test/results/compiler/plan/sample5.q.xml (working copy) @@ -30,7 +30,7 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/707138646/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/316201729/10000 @@ -83,7 +83,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/dest1 @@ -93,7 +93,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/707138646/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/316201729/10001 @@ -121,10 +121,10 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1776114372/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1521468671/10002 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/707138646/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/316201729/10000 @@ -142,7 +142,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1776114372/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1521468671/10002 @@ -214,6 +214,9 @@ + + rand + @@ -342,10 +345,10 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1776114372/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1521468671/10002 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1776114372/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1521468671/10002 @@ -354,7 +357,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1776114372/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1521468671/10002 @@ -372,7 +375,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/707138646/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/316201729/10000 @@ -421,7 +424,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/dest1 file.outputformat @@ -524,7 +527,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1776114372/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1521468671/10002 @@ -616,7 +619,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/srcbucket + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/srcbucket @@ -655,7 +658,7 @@ 1 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1776114372/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1521468671/10002 @@ -866,6 +869,9 @@ + + & + @@ -883,6 +889,9 @@ + + % + @@ -900,6 +909,9 @@ + + == + @@ -990,6 +1002,9 @@ + + & + @@ -1007,6 +1022,9 @@ + + % + @@ -1024,6 +1042,9 @@ + + == + @@ -1094,7 +1115,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/srcbucket + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/srcbucket s @@ -1106,7 +1127,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/srcbucket + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/srcbucket Index: ql/src/test/results/compiler/plan/sample6.q.xml =================================================================== --- ql/src/test/results/compiler/plan/sample6.q.xml (revision 796913) +++ ql/src/test/results/compiler/plan/sample6.q.xml (working copy) @@ -30,7 +30,7 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/950802647/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1682467968/10000 @@ -83,7 +83,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/dest1 @@ -93,7 +93,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/950802647/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1682467968/10001 @@ -121,10 +121,10 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1635011117/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/2079888374/10002 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/950802647/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1682467968/10000 @@ -142,7 +142,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1635011117/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/2079888374/10002 @@ -214,6 +214,9 @@ + + rand + @@ -342,10 +345,10 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1635011117/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/2079888374/10002 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1635011117/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/2079888374/10002 @@ -354,7 +357,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1635011117/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/2079888374/10002 @@ -372,7 +375,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/950802647/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1682467968/10000 @@ -421,7 +424,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/dest1 file.outputformat @@ -524,7 +527,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1635011117/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/2079888374/10002 @@ -616,7 +619,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/srcbucket + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/srcbucket @@ -655,7 +658,7 @@ 1 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1635011117/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/2079888374/10002 @@ -866,6 +869,9 @@ + + & + @@ -883,6 +889,9 @@ + + % + @@ -900,6 +909,9 @@ + + == + @@ -990,6 +1002,9 @@ + + & + @@ -1007,6 +1022,9 @@ + + % + @@ -1024,6 +1042,9 @@ + + == + @@ -1094,7 +1115,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt s @@ -1106,7 +1127,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt Index: ql/src/test/results/compiler/plan/sample7.q.xml =================================================================== --- ql/src/test/results/compiler/plan/sample7.q.xml (revision 796913) +++ ql/src/test/results/compiler/plan/sample7.q.xml (working copy) @@ -30,7 +30,7 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/274403833/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1121333349/10000 @@ -83,7 +83,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/dest1 @@ -93,7 +93,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/274403833/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1121333349/10001 @@ -121,10 +121,10 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/240735029/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/905703977/10002 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/274403833/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1121333349/10000 @@ -142,7 +142,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/240735029/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/905703977/10002 @@ -214,6 +214,9 @@ + + rand + @@ -342,10 +345,10 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/240735029/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/905703977/10002 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/240735029/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/905703977/10002 @@ -354,7 +357,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/240735029/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/905703977/10002 @@ -372,7 +375,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/274403833/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1121333349/10000 @@ -421,7 +424,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/dest1 file.outputformat @@ -524,7 +527,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/240735029/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/905703977/10002 @@ -616,7 +619,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/srcbucket + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/srcbucket @@ -659,7 +662,7 @@ 1 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/240735029/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/905703977/10002 @@ -816,6 +819,9 @@ + + > + @@ -964,6 +970,9 @@ + + & + @@ -981,6 +990,9 @@ + + % + @@ -998,6 +1010,9 @@ + + == + @@ -1104,6 +1119,9 @@ + + & + @@ -1121,6 +1139,9 @@ + + % + @@ -1138,6 +1159,9 @@ + + == + @@ -1175,6 +1199,9 @@ + + > + @@ -1182,6 +1209,9 @@ + + AND + @@ -1231,7 +1261,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt s @@ -1243,7 +1273,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt Index: ql/src/test/results/compiler/plan/cast1.q.xml =================================================================== --- ql/src/test/results/compiler/plan/cast1.q.xml (revision 796913) +++ ql/src/test/results/compiler/plan/cast1.q.xml (working copy) @@ -64,7 +64,7 @@ location - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src @@ -100,7 +100,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/tmp/1987981431/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1833816284/10001 @@ -266,6 +266,9 @@ + + int + @@ -301,6 +304,9 @@ + + boolean + @@ -366,6 +372,9 @@ + + int + @@ -373,6 +382,9 @@ + + + + @@ -421,6 +433,9 @@ + + + + @@ -476,6 +491,9 @@ + + double + @@ -493,6 +511,9 @@ + + + + @@ -558,6 +579,9 @@ + + double + @@ -565,6 +589,9 @@ + + + + @@ -613,6 +640,9 @@ + + + + @@ -818,6 +848,9 @@ + + double + @@ -852,6 +885,9 @@ + + double + @@ -859,6 +895,9 @@ + + = + @@ -939,6 +978,9 @@ + + double + @@ -966,6 +1008,9 @@ + + double + @@ -973,6 +1018,9 @@ + + = + @@ -1019,7 +1067,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src src @@ -1031,7 +1079,7 @@ - file:/data/users/zshao/tools/deploy-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src Index: ql/src/test/results/compiler/plan/input1.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input1.q.xml (revision 796913) +++ ql/src/test/results/compiler/plan/input1.q.xml (working copy) @@ -30,7 +30,7 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/983045819/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1850021551/10000 @@ -83,7 +83,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/dest1 @@ -93,7 +93,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/983045819/10001 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1850021551/10001 @@ -121,10 +121,10 @@ true - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1046375614/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1771142856/10002 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/983045819/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1850021551/10000 @@ -142,7 +142,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1046375614/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1771142856/10002 @@ -214,6 +214,9 @@ + + rand + @@ -342,10 +345,10 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1046375614/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1771142856/10002 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1046375614/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1771142856/10002 @@ -354,7 +357,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1046375614/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1771142856/10002 @@ -372,7 +375,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/983045819/10000 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1850021551/10000 @@ -421,7 +424,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/dest1 + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/dest1 file.outputformat @@ -520,7 +523,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1046375614/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1771142856/10002 @@ -608,7 +611,7 @@ location - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src @@ -647,7 +650,7 @@ 1 - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/tmp/1046375614/10002 + file:/data/users/emil/hive1/hive1/build/ql/tmp/1771142856/10002 @@ -808,6 +811,9 @@ + + double + @@ -846,6 +852,9 @@ + + double + @@ -853,6 +862,9 @@ + + < + @@ -937,6 +949,9 @@ + + double + @@ -964,6 +979,9 @@ + + double + @@ -971,6 +989,9 @@ + + < + @@ -1020,7 +1041,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src src @@ -1032,7 +1053,7 @@ - file:/data/users/njain/deploy/hive1/tools/ahive1-trunk-apache-hive/build/ql/test/data/warehouse/src + file:/data/users/emil/hive1/hive1/build/ql/test/data/warehouse/src Index: ql/src/test/org/apache/hadoop/hive/ql/exec/TestExecDriver.java =================================================================== --- ql/src/test/org/apache/hadoop/hive/ql/exec/TestExecDriver.java (revision 796913) +++ ql/src/test/org/apache/hadoop/hive/ql/exec/TestExecDriver.java (working copy) @@ -157,6 +157,7 @@ ArrayList children1 = new ArrayList(); children1.add(new exprNodeColumnDesc(TypeInfoFactory.stringTypeInfo, column)); exprNodeDesc lhs = new exprNodeFuncDesc( + Constants.DOUBLE_TYPE_NAME, TypeInfoFactory.doubleTypeInfo, FunctionRegistry.getUDFClass(Constants.DOUBLE_TYPE_NAME), FunctionRegistry.getUDFMethod(Constants.DOUBLE_TYPE_NAME, TypeInfoFactory.stringTypeInfo), @@ -165,6 +166,7 @@ ArrayList children2 = new ArrayList(); children2.add(new exprNodeConstantDesc(TypeInfoFactory.longTypeInfo, Long.valueOf(100))); exprNodeDesc rhs = new exprNodeFuncDesc( + Constants.DOUBLE_TYPE_NAME, TypeInfoFactory.doubleTypeInfo, FunctionRegistry.getUDFClass(Constants.DOUBLE_TYPE_NAME), FunctionRegistry.getUDFMethod(Constants.DOUBLE_TYPE_NAME, TypeInfoFactory.longTypeInfo), @@ -175,6 +177,7 @@ children3.add(rhs); exprNodeDesc desc = new exprNodeFuncDesc( + "<", TypeInfoFactory.booleanTypeInfo, FunctionRegistry.getUDFClass("<"), FunctionRegistry.getUDFMethod("<", TypeInfoFactory.doubleTypeInfo, TypeInfoFactory.doubleTypeInfo), Index: ql/src/java/org/apache/hadoop/hive/ql/ppd/OpProcFactory.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/ppd/OpProcFactory.java (revision 796913) +++ ql/src/java/org/apache/hadoop/hive/ql/ppd/OpProcFactory.java (working copy) @@ -120,6 +120,7 @@ children.add(condn); children.add((exprNodeDesc) preds.get(i)); condn = new exprNodeFuncDesc( + "AND", TypeInfoFactory.booleanTypeInfo, FunctionRegistry.getUDFClass("AND"), FunctionRegistry.getUDFMethod("AND", Index: ql/src/java/org/apache/hadoop/hive/ql/plan/exprNodeFuncDesc.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/plan/exprNodeFuncDesc.java (revision 796913) +++ ql/src/java/org/apache/hadoop/hive/ql/plan/exprNodeFuncDesc.java (working copy) @@ -41,9 +41,10 @@ private Class UDFClass; private Method UDFMethod; private List childExprs; + private String methodName; public exprNodeFuncDesc() {} - public exprNodeFuncDesc(TypeInfo typeInfo, Class UDFClass, + public exprNodeFuncDesc(String methodName, TypeInfo typeInfo, Class UDFClass, Method UDFMethod, List children) { super(typeInfo); assert(UDFClass != null); @@ -51,6 +52,7 @@ assert(UDFMethod != null); this.UDFMethod = UDFMethod; this.childExprs = children; + this.methodName = methodName; } public Class getUDFClass() { @@ -94,7 +96,7 @@ @explain(displayName="expr") @Override public String getExprString() { - FunctionInfo fI = FunctionRegistry.getUDFInfo(UDFClass); + FunctionInfo fI = FunctionRegistry.getFunctionInfo(methodName); StringBuilder sb = new StringBuilder(); if (fI.getOpType() == FunctionInfo.OperatorType.PREFIX || @@ -157,13 +159,19 @@ return colList; } + public String getMethodName() { + return methodName; + } + public void setMethodName(String methodName) { + this.methodName = methodName.toLowerCase(); + } @Override public exprNodeDesc clone() { List cloneCh = new ArrayList(childExprs.size()); for(exprNodeDesc ch : childExprs) { cloneCh.add(ch.clone()); } - exprNodeFuncDesc clone = new exprNodeFuncDesc(this.typeInfo, + exprNodeFuncDesc clone = new exprNodeFuncDesc(methodName, this.typeInfo, this.UDFClass, this.UDFMethod, cloneCh); return clone; } Index: ql/src/java/org/apache/hadoop/hive/ql/parse/TypeCheckProcFactory.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/parse/TypeCheckProcFactory.java (revision 796913) +++ ql/src/java/org/apache/hadoop/hive/ql/parse/TypeCheckProcFactory.java (working copy) @@ -464,6 +464,7 @@ } exprNodeFuncDesc desc = new exprNodeFuncDesc( + udfName, resultTypeInfo, FunctionRegistry.getUDFClass(udfName), udfMethod, ch); Index: ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java (revision 796913) +++ ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java (working copy) @@ -4362,7 +4362,7 @@ // get the conversion method ArrayList conversionArg = new ArrayList(1); conversionArg.add(descPassed); - newParameters.add(new exprNodeFuncDesc(typeInfoAccepted, c, conv, conversionArg)); + newParameters.add(new exprNodeFuncDesc(to.getTypeName(), typeInfoAccepted, c, conv, conversionArg)); } }