Index: ql/src/test/results/compiler/plan/join2.q.xml
===================================================================
--- ql/src/test/results/compiler/plan/join2.q.xml (revision 762345)
+++ ql/src/test/results/compiler/plan/join2.q.xml (working copy)
@@ -35,7 +35,7 @@
true
- /data/users/pchakka/workspace/oshive/ql/../build/ql/tmp/868816526.10000.insclause-0
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/94029820.10000.insclause-0
location
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/dest1
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/dest1
@@ -97,6 +97,9 @@
+
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/94029820.10001
+
@@ -576,7 +579,7 @@
+
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/53728112/1166708610.10003
+
@@ -186,7 +192,7 @@
true
- /data/users/pchakka/workspace/oshive/ql/../build/ql/tmp/1023589341/1544700207.10002.insclause-2
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/53728112/1166708610.10004.insclause-2
@@ -243,7 +249,7 @@
location
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/dest3
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/dest3
@@ -252,6 +258,9 @@
+
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/53728112/1166708610.10005
+
@@ -290,7 +299,7 @@
1
- /data/users/pchakka/workspace/oshive/ql/../build/ql/tmp/1023589341/1544700207.10000.insclause-0
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/53728112/1166708610.10000.insclause-0
@@ -574,7 +583,7 @@
2
- /data/users/pchakka/workspace/oshive/ql/../build/ql/tmp/1023589341/1544700207.10001.insclause-1
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/53728112/1166708610.10002.insclause-1
@@ -940,7 +949,7 @@
3
- /data/users/pchakka/workspace/oshive/ql/../build/ql/tmp/1023589341/1544700207.10002.insclause-2
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/53728112/1166708610.10004.insclause-2
@@ -1187,7 +1196,7 @@
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/src
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/src
src
@@ -1199,7 +1208,7 @@
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/src
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/src
@@ -1255,7 +1264,7 @@
location
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/src
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/src
Index: ql/src/test/results/compiler/plan/join3.q.xml
===================================================================
--- ql/src/test/results/compiler/plan/join3.q.xml (revision 762345)
+++ ql/src/test/results/compiler/plan/join3.q.xml (working copy)
@@ -31,7 +31,7 @@
true
- /data/users/pchakka/workspace/oshive/ql/../build/ql/tmp/66721551.10000.insclause-0
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/750826390.10000.insclause-0
@@ -84,7 +84,7 @@
location
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/dest1
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/dest1
@@ -93,6 +93,9 @@
+
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/750826390.10001
+
@@ -794,7 +797,7 @@
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/src
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/src
src2
@@ -812,7 +815,7 @@
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/src
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/src
@@ -868,7 +871,7 @@
location
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/src
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/src
@@ -897,7 +900,7 @@
1
- /data/users/pchakka/workspace/oshive/ql/../build/ql/tmp/66721551.10000.insclause-0
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/750826390.10000.insclause-0
Index: ql/src/test/results/compiler/plan/input3.q.xml
===================================================================
--- ql/src/test/results/compiler/plan/input3.q.xml (revision 762345)
+++ ql/src/test/results/compiler/plan/input3.q.xml (working copy)
@@ -28,7 +28,7 @@
true
- /data/users/pchakka/workspace/oshive/ql/../build/ql/tmp/1233327262/304849537.10003.insclause-3
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/124974398/210301626.10006.insclause-3
../../../../build/contrib/hive/ql/test/data/warehouse/dest4.out
@@ -48,7 +48,7 @@
true
- /data/users/pchakka/workspace/oshive/ql/../build/ql/tmp/1233327262/304849537.10000.insclause-0
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/124974398/210301626.10000.insclause-0
@@ -101,7 +101,7 @@
location
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/dest1
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/dest1
@@ -110,6 +110,9 @@
+
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/124974398/210301626.10001
+
@@ -121,7 +124,7 @@
true
- /data/users/pchakka/workspace/oshive/ql/../build/ql/tmp/1233327262/304849537.10001.insclause-1
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/124974398/210301626.10002.insclause-1
@@ -174,7 +177,7 @@
location
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/dest2
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/dest2
@@ -183,6 +186,9 @@
+
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/124974398/210301626.10003
+
@@ -203,7 +209,7 @@
true
- /data/users/pchakka/workspace/oshive/ql/../build/ql/tmp/1233327262/304849537.10002.insclause-2
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/124974398/210301626.10004.insclause-2
@@ -260,7 +266,7 @@
location
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/dest3
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/dest3
@@ -269,6 +275,9 @@
+
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/124974398/210301626.10005
+
@@ -307,7 +316,7 @@
1
- /data/users/pchakka/workspace/oshive/ql/../build/ql/tmp/1233327262/304849537.10000.insclause-0
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/124974398/210301626.10000.insclause-0
@@ -591,7 +600,7 @@
2
- /data/users/pchakka/workspace/oshive/ql/../build/ql/tmp/1233327262/304849537.10001.insclause-1
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/124974398/210301626.10002.insclause-1
@@ -957,7 +966,7 @@
3
- /data/users/pchakka/workspace/oshive/ql/../build/ql/tmp/1233327262/304849537.10002.insclause-2
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/124974398/210301626.10004.insclause-2
@@ -1323,7 +1332,7 @@
4
- /data/users/pchakka/workspace/oshive/ql/../build/ql/tmp/1233327262/304849537.10003.insclause-3
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/124974398/210301626.10006.insclause-3
@@ -1568,7 +1577,7 @@
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/src
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/src
src
@@ -1580,7 +1589,7 @@
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/src
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/src
@@ -1636,7 +1645,7 @@
location
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/src
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/src
Index: ql/src/test/results/compiler/plan/input4.q.xml
===================================================================
--- ql/src/test/results/compiler/plan/input4.q.xml (revision 762345)
+++ ql/src/test/results/compiler/plan/input4.q.xml (working copy)
@@ -31,7 +31,7 @@
true
- /data/users/pchakka/workspace/oshive/ql/../build/ql/tmp/1170057543/77903464.10000.insclause-0
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/258804439/588812485.10000.insclause-0
@@ -84,7 +84,7 @@
location
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/dest1
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/dest1
@@ -93,6 +93,9 @@
+
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/258804439/588812485.10001
+
@@ -507,7 +510,7 @@
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/src
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/src
tmap:src
@@ -519,7 +522,7 @@
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/src
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/src
@@ -575,7 +578,7 @@
location
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/src
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/src
@@ -608,7 +611,7 @@
1
- /data/users/pchakka/workspace/oshive/ql/../build/ql/tmp/1170057543/77903464.10000.insclause-0
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/258804439/588812485.10000.insclause-0
Index: ql/src/test/results/compiler/plan/input5.q.xml
===================================================================
--- ql/src/test/results/compiler/plan/input5.q.xml (revision 762345)
+++ ql/src/test/results/compiler/plan/input5.q.xml (working copy)
@@ -31,7 +31,7 @@
true
- /data/users/pchakka/workspace/oshive/ql/../build/ql/tmp/312054191.10000.insclause-0
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/142551517.10000.insclause-0
@@ -84,7 +84,7 @@
location
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/dest1
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/dest1
@@ -93,6 +93,9 @@
+
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/142551517.10001
+
@@ -644,7 +647,7 @@
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/src_thrift
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/src_thrift
tmap:src_thrift
@@ -656,7 +659,7 @@
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/src_thrift
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/src_thrift
@@ -716,7 +719,7 @@
location
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/src_thrift
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/src_thrift
@@ -745,7 +748,7 @@
1
- /data/users/pchakka/workspace/oshive/ql/../build/ql/tmp/312054191.10000.insclause-0
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/142551517.10000.insclause-0
Index: ql/src/test/results/compiler/plan/input6.q.xml
===================================================================
--- ql/src/test/results/compiler/plan/input6.q.xml (revision 762345)
+++ ql/src/test/results/compiler/plan/input6.q.xml (working copy)
@@ -31,7 +31,7 @@
true
- /data/users/pchakka/workspace/oshive/ql/../build/ql/tmp/186552376/1084556020.10000.insclause-0
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/431259598/1210412976.10000.insclause-0
@@ -84,7 +84,7 @@
location
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/dest1
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/dest1
@@ -93,6 +93,9 @@
+
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/431259598/1210412976.10001
+
@@ -131,7 +134,7 @@
1
- /data/users/pchakka/workspace/oshive/ql/../build/ql/tmp/186552376/1084556020.10000.insclause-0
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/431259598/1210412976.10000.insclause-0
@@ -346,7 +349,7 @@
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/src1
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/src1
src1
@@ -358,7 +361,7 @@
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/src1
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/src1
@@ -414,7 +417,7 @@
location
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/src1
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/src1
Index: ql/src/test/results/compiler/plan/input7.q.xml
===================================================================
--- ql/src/test/results/compiler/plan/input7.q.xml (revision 762345)
+++ ql/src/test/results/compiler/plan/input7.q.xml (working copy)
@@ -31,7 +31,7 @@
true
- /data/users/pchakka/workspace/oshive/ql/../build/ql/tmp/828323262.10000.insclause-0
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/175377627.10000.insclause-0
@@ -84,7 +84,7 @@
location
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/dest1
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/dest1
@@ -93,6 +93,9 @@
+
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/175377627.10001
+
@@ -131,7 +134,7 @@
1
- /data/users/pchakka/workspace/oshive/ql/../build/ql/tmp/828323262.10000.insclause-0
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/175377627.10000.insclause-0
@@ -334,7 +337,7 @@
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/src1
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/src1
src1
@@ -346,7 +349,7 @@
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/src1
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/src1
@@ -402,7 +405,7 @@
location
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/src1
+ file:/data/users/athusoo/commits/hive_trunk_ws9/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 762345)
+++ ql/src/test/results/compiler/plan/input_testsequencefile.q.xml (working copy)
@@ -31,7 +31,7 @@
true
- /data/users/pchakka/workspace/oshive/ql/../build/ql/tmp/983664928/30149994.10000.insclause-0
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/528170912/226274005.10000.insclause-0
@@ -84,7 +84,7 @@
location
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/dest4_sequencefile
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/dest4_sequencefile
@@ -93,6 +93,9 @@
+
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/528170912/226274005.10001
+
@@ -127,7 +130,7 @@
1
- /data/users/pchakka/workspace/oshive/ql/../build/ql/tmp/983664928/30149994.10000.insclause-0
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/528170912/226274005.10000.insclause-0
@@ -279,7 +282,7 @@
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/src
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/src
src
@@ -291,7 +294,7 @@
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/src
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/src
@@ -347,7 +350,7 @@
location
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/src
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/src
Index: ql/src/test/results/compiler/plan/input9.q.xml
===================================================================
--- ql/src/test/results/compiler/plan/input9.q.xml (revision 762345)
+++ ql/src/test/results/compiler/plan/input9.q.xml (working copy)
@@ -31,7 +31,7 @@
true
- /data/users/pchakka/workspace/oshive/ql/../build/ql/tmp/181992755.10000.insclause-0
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/488279506.10000.insclause-0
@@ -84,7 +84,7 @@
location
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/dest1
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/dest1
@@ -93,6 +93,9 @@
+
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/488279506.10001
+
@@ -135,7 +138,7 @@
1
- /data/users/pchakka/workspace/oshive/ql/../build/ql/tmp/181992755.10000.insclause-0
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/488279506.10000.insclause-0
@@ -412,7 +415,7 @@
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/src1
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/src1
src1
@@ -424,7 +427,7 @@
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/src1
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/src1
@@ -480,7 +483,7 @@
location
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/src1
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/src1
Index: ql/src/test/results/compiler/plan/groupby1.q.xml
===================================================================
--- ql/src/test/results/compiler/plan/groupby1.q.xml (revision 762345)
+++ ql/src/test/results/compiler/plan/groupby1.q.xml (working copy)
@@ -31,7 +31,7 @@
true
- /data/users/pchakka/workspace/oshive/ql/../build/ql/tmp/1314341519/16659326.10000.insclause-0
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/390951103/204238523.10000.insclause-0
@@ -84,7 +84,7 @@
location
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/dest1
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/dest1
@@ -93,6 +93,9 @@
+
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/390951103/204238523.10001
+
@@ -499,7 +502,7 @@
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/src
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/src
src
@@ -511,7 +514,7 @@
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/src
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/src
@@ -567,7 +570,7 @@
location
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/src
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/src
@@ -596,7 +599,7 @@
1
- /data/users/pchakka/workspace/oshive/ql/../build/ql/tmp/1314341519/16659326.10000.insclause-0
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/390951103/204238523.10000.insclause-0
Index: ql/src/test/results/compiler/plan/case_sensitivity.q.xml
===================================================================
--- ql/src/test/results/compiler/plan/case_sensitivity.q.xml (revision 762345)
+++ ql/src/test/results/compiler/plan/case_sensitivity.q.xml (working copy)
@@ -31,7 +31,7 @@
true
- /data/users/pchakka/workspace/oshive/ql/../build/ql/tmp/222037759.10000.insclause-0
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/823955998.10000.insclause-0
@@ -84,7 +84,7 @@
location
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/dest1
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/dest1
@@ -93,6 +93,9 @@
+
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/823955998.10001
+
@@ -135,7 +138,7 @@
1
- /data/users/pchakka/workspace/oshive/ql/../build/ql/tmp/222037759.10000.insclause-0
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/823955998.10000.insclause-0
@@ -560,7 +563,7 @@
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/src_thrift
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/src_thrift
src_thrift
@@ -572,7 +575,7 @@
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/src_thrift
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/src_thrift
@@ -632,7 +635,7 @@
location
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/src_thrift
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/src_thrift
Index: ql/src/test/results/compiler/plan/sample2.q.xml
===================================================================
--- ql/src/test/results/compiler/plan/sample2.q.xml (revision 762345)
+++ ql/src/test/results/compiler/plan/sample2.q.xml (working copy)
@@ -31,7 +31,7 @@
true
- /data/users/pchakka/workspace/oshive/ql/../build/ql/tmp/290061072/981276543.10000.insclause-0
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/1019605995/847108844.10000.insclause-0
@@ -84,7 +84,7 @@
location
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/dest1
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/dest1
@@ -93,6 +93,9 @@
+
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/1019605995/847108844.10001
+
@@ -127,7 +130,7 @@
1
- /data/users/pchakka/workspace/oshive/ql/../build/ql/tmp/290061072/981276543.10000.insclause-0
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/1019605995/847108844.10000.insclause-0
@@ -282,7 +285,7 @@
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/srcbucket/kv1.txt
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/srcbucket/kv1.txt
s
@@ -294,7 +297,7 @@
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/srcbucket/kv1.txt
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/srcbucket/kv1.txt
@@ -354,7 +357,7 @@
location
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/srcbucket
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/srcbucket
Index: ql/src/test/results/compiler/plan/sample3.q.xml
===================================================================
--- ql/src/test/results/compiler/plan/sample3.q.xml (revision 762345)
+++ ql/src/test/results/compiler/plan/sample3.q.xml (working copy)
@@ -31,7 +31,7 @@
true
- /data/users/pchakka/workspace/oshive/ql/../build/ql/tmp/184235828/321224263.10000.insclause-0
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/285088828/920051529.10000.insclause-0
@@ -84,7 +84,7 @@
location
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/dest1
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/dest1
@@ -93,6 +93,9 @@
+
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/285088828/920051529.10001
+
@@ -131,7 +134,7 @@
1
- /data/users/pchakka/workspace/oshive/ql/../build/ql/tmp/184235828/321224263.10000.insclause-0
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/285088828/920051529.10000.insclause-0
@@ -470,7 +473,7 @@
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/srcbucket
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/srcbucket
s
@@ -482,7 +485,7 @@
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/srcbucket
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/srcbucket
@@ -542,7 +545,7 @@
location
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/srcbucket
+ file:/data/users/athusoo/commits/hive_trunk_ws9/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 762345)
+++ ql/src/test/results/compiler/plan/sample4.q.xml (working copy)
@@ -31,7 +31,7 @@
true
- /data/users/pchakka/workspace/oshive/ql/../build/ql/tmp/58885683/783440807.10000.insclause-0
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/18829701/27117893.10000.insclause-0
@@ -84,7 +84,7 @@
location
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/dest1
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/dest1
@@ -93,6 +93,9 @@
+
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/18829701/27117893.10001
+
@@ -127,7 +130,7 @@
1
- /data/users/pchakka/workspace/oshive/ql/../build/ql/tmp/58885683/783440807.10000.insclause-0
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/18829701/27117893.10000.insclause-0
@@ -282,7 +285,7 @@
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/srcbucket/kv1.txt
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/srcbucket/kv1.txt
s
@@ -294,7 +297,7 @@
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/srcbucket/kv1.txt
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/srcbucket/kv1.txt
@@ -354,7 +357,7 @@
location
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/srcbucket
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/srcbucket
Index: ql/src/test/results/compiler/plan/sample5.q.xml
===================================================================
--- ql/src/test/results/compiler/plan/sample5.q.xml (revision 762345)
+++ ql/src/test/results/compiler/plan/sample5.q.xml (working copy)
@@ -31,7 +31,7 @@
true
- /data/users/pchakka/workspace/oshive/ql/../build/ql/tmp/184100224/563889096.10000.insclause-0
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/83476196/1532819303.10000.insclause-0
@@ -84,7 +84,7 @@
location
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/dest1
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/dest1
@@ -93,6 +93,9 @@
+
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/83476196/1532819303.10001
+
@@ -131,7 +134,7 @@
1
- /data/users/pchakka/workspace/oshive/ql/../build/ql/tmp/184100224/563889096.10000.insclause-0
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/83476196/1532819303.10000.insclause-0
@@ -457,7 +460,7 @@
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/srcbucket
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/srcbucket
s
@@ -469,7 +472,7 @@
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/srcbucket
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/srcbucket
@@ -529,7 +532,7 @@
location
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/srcbucket
+ file:/data/users/athusoo/commits/hive_trunk_ws9/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 762345)
+++ ql/src/test/results/compiler/plan/sample6.q.xml (working copy)
@@ -31,7 +31,7 @@
true
- /data/users/pchakka/workspace/oshive/ql/../build/ql/tmp/1305695783/363605985.10000.insclause-0
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/61425565/17389492.10000.insclause-0
@@ -84,7 +84,7 @@
location
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/dest1
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/dest1
@@ -93,6 +93,9 @@
+
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/61425565/17389492.10001
+
@@ -131,7 +134,7 @@
1
- /data/users/pchakka/workspace/oshive/ql/../build/ql/tmp/1305695783/363605985.10000.insclause-0
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/61425565/17389492.10000.insclause-0
@@ -457,7 +460,7 @@
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/srcbucket/kv1.txt
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/srcbucket/kv1.txt
s
@@ -469,7 +472,7 @@
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/srcbucket/kv1.txt
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/srcbucket/kv1.txt
@@ -529,7 +532,7 @@
location
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/srcbucket
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/srcbucket
Index: ql/src/test/results/compiler/plan/sample7.q.xml
===================================================================
--- ql/src/test/results/compiler/plan/sample7.q.xml (revision 762345)
+++ ql/src/test/results/compiler/plan/sample7.q.xml (working copy)
@@ -31,7 +31,7 @@
true
- /data/users/pchakka/workspace/oshive/ql/../build/ql/tmp/167159855/303160182.10000.insclause-0
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/1894315848/355605785.10000.insclause-0
@@ -84,7 +84,7 @@
location
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/dest1
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/dest1
@@ -93,6 +93,9 @@
+
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/1894315848/355605785.10001
+
@@ -135,7 +138,7 @@
1
- /data/users/pchakka/workspace/oshive/ql/../build/ql/tmp/167159855/303160182.10000.insclause-0
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/1894315848/355605785.10000.insclause-0
@@ -585,7 +588,7 @@
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/srcbucket/kv1.txt
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/srcbucket/kv1.txt
s
@@ -597,7 +600,7 @@
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/srcbucket/kv1.txt
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/srcbucket/kv1.txt
@@ -657,7 +660,7 @@
location
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/srcbucket
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/srcbucket
Index: ql/src/test/results/compiler/plan/join1.q.xml
===================================================================
--- ql/src/test/results/compiler/plan/join1.q.xml (revision 762345)
+++ ql/src/test/results/compiler/plan/join1.q.xml (working copy)
@@ -31,7 +31,7 @@
true
- /data/users/pchakka/workspace/oshive/ql/../build/ql/tmp/386583045.10000.insclause-0
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/1222524974.10000.insclause-0
@@ -84,7 +84,7 @@
location
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/dest1
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/dest1
@@ -93,6 +93,9 @@
+
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/1222524974.10001
+
@@ -561,7 +564,7 @@
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/src
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/src
src2
@@ -576,7 +579,7 @@
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/src
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/src
@@ -632,7 +635,7 @@
location
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/src
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/src
@@ -661,7 +664,7 @@
1
- /data/users/pchakka/workspace/oshive/ql/../build/ql/tmp/386583045.10000.insclause-0
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/1222524974.10000.insclause-0
Index: ql/src/test/results/compiler/plan/input1.q.xml
===================================================================
--- ql/src/test/results/compiler/plan/input1.q.xml (revision 762345)
+++ ql/src/test/results/compiler/plan/input1.q.xml (working copy)
@@ -31,7 +31,7 @@
true
- /data/users/pchakka/workspace/oshive/ql/../build/ql/tmp/23831350/855377882.10000.insclause-0
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/15406173/10216775.10000.insclause-0
@@ -84,7 +84,7 @@
location
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/dest1
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/dest1
@@ -93,6 +93,9 @@
+
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/15406173/10216775.10001
+
@@ -131,7 +134,7 @@
1
- /data/users/pchakka/workspace/oshive/ql/../build/ql/tmp/23831350/855377882.10000.insclause-0
+ /data/users/athusoo/commits/hive_trunk_ws9/ql/../build/ql/tmp/15406173/10216775.10000.insclause-0
@@ -415,7 +418,7 @@
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/src
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/src
src
@@ -427,7 +430,7 @@
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/src
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/src
@@ -483,7 +486,7 @@
location
- file:/data/users/pchakka/workspace/oshive/build/ql/test/data/warehouse/src
+ file:/data/users/athusoo/commits/hive_trunk_ws9/build/ql/test/data/warehouse/src
Index: ql/src/test/org/apache/hadoop/hive/ql/history/TestHiveHistory.java
===================================================================
--- ql/src/test/org/apache/hadoop/hive/ql/history/TestHiveHistory.java (revision 762319)
+++ ql/src/test/org/apache/hadoop/hive/ql/history/TestHiveHistory.java (working copy)
@@ -96,7 +96,7 @@
db.dropTable(src, true, true);
db.createTable(src, cols, null, TextInputFormat.class,
IgnoreKeyTextOutputFormat.class);
- db.loadTable(hadoopDataFile[i], src, false);
+ db.loadTable(hadoopDataFile[i], src, false, null);
i++;
}
Index: ql/src/test/org/apache/hadoop/hive/ql/exec/TestExecDriver.java
===================================================================
--- ql/src/test/org/apache/hadoop/hive/ql/exec/TestExecDriver.java (revision 762319)
+++ ql/src/test/org/apache/hadoop/hive/ql/exec/TestExecDriver.java (working copy)
@@ -104,7 +104,7 @@
for(String src: srctables) {
db.dropTable(src, true, true);
db.createTable(src, cols, null, TextInputFormat.class, IgnoreKeyTextOutputFormat.class);
- db.loadTable(hadoopDataFile[i], src, false);
+ db.loadTable(hadoopDataFile[i], src, false, null);
i++;
}
Index: ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java
===================================================================
--- ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java (revision 762319)
+++ ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java (working copy)
@@ -299,25 +299,45 @@
fpath = new Path(testFiles, "kv3.txt");
newfpath = new Path(tmppath, "kv3.txt");
fs.copyFromLocalFile(false, true, fpath, newfpath);
- db.loadTable(newfpath, "src1", false);
+ //db.loadTable(newfpath, "src1", false);
+ loadCmd = "LOAD DATA INPATH '" + newfpath.toString() + "' INTO TABLE src1";
+ ecode = drv.run(loadCmd);
+ if(ecode != 0) {
+ throw new Exception("load command: " + loadCmd + " failed with exit code= " + ecode);
+ }
// load the input data into the src_sequencefile table
fpath = new Path(testFiles, "kv1.seq");
newfpath = new Path(tmppath, "kv1.seq");
fs.copyFromLocalFile(false, true, fpath, newfpath);
- db.loadTable(newfpath, "src_sequencefile", true);
+ //db.loadTable(newfpath, "src_sequencefile", true);
+ loadCmd = "LOAD DATA INPATH '" + newfpath.toString() + "' INTO TABLE src_sequencefile";
+ ecode = drv.run(loadCmd);
+ if(ecode != 0) {
+ throw new Exception("load command: " + loadCmd + " failed with exit code= " + ecode);
+ }
// load the input data into the src_thrift table
fpath = new Path(testFiles, "complex.seq");
newfpath = new Path(tmppath, "complex.seq");
fs.copyFromLocalFile(false, true, fpath, newfpath);
- db.loadTable(newfpath, "src_thrift", true);
+ //db.loadTable(newfpath, "src_thrift", true);
+ loadCmd = "LOAD DATA INPATH '" + newfpath.toString() + "' INTO TABLE src_thrift";
+ ecode = drv.run(loadCmd);
+ if(ecode != 0) {
+ throw new Exception("load command: " + loadCmd + " failed with exit code= " + ecode);
+ }
// load the json data into the src_json table
fpath = new Path(testFiles, "json.txt");
newfpath = new Path(tmppath, "json.txt");
fs.copyFromLocalFile(false, true, fpath, newfpath);
- db.loadTable(newfpath, "src_json", false);
+ //db.loadTable(newfpath, "src_json", false);
+ loadCmd = "LOAD DATA INPATH '" + newfpath.toString() + "' INTO TABLE src_json";
+ ecode = drv.run(loadCmd);
+ if(ecode != 0) {
+ throw new Exception("load command: " + loadCmd + " failed with exit code= " + ecode);
+ }
}
Index: ql/src/java/org/apache/hadoop/hive/ql/metadata/Table.java
===================================================================
--- ql/src/java/org/apache/hadoop/hive/ql/metadata/Table.java (revision 762319)
+++ ql/src/java/org/apache/hadoop/hive/ql/metadata/Table.java (working copy)
@@ -443,12 +443,13 @@
/**
* Replaces files in the partition with new data set specified by srcf. Works by moving files
* @param srcf Files to be replaced. Leaf directories or globbed file paths
+ * @param tmpd Temporary directory
*/
- protected void replaceFiles(Path srcf) throws HiveException {
+ protected void replaceFiles(Path srcf, Path tmpd) throws HiveException {
FileSystem fs;
try {
fs = FileSystem.get(getDataLocation(), Hive.get().getConf());
- Hive.get().replaceFiles(srcf, new Path(getDataLocation().getPath()), fs);
+ Hive.get().replaceFiles(srcf, new Path(getDataLocation().getPath()), fs, tmpd);
} catch (IOException e) {
throw new HiveException("addFiles: filesystem error in check phase", e);
}
Index: ql/src/java/org/apache/hadoop/hive/ql/metadata/Partition.java
===================================================================
--- ql/src/java/org/apache/hadoop/hive/ql/metadata/Partition.java (revision 762319)
+++ ql/src/java/org/apache/hadoop/hive/ql/metadata/Partition.java (working copy)
@@ -303,13 +303,14 @@
* Replaces files in the partition with new data set specified by srcf. Works by moving files
*
* @param srcf Files to be moved. Leaf Directories or Globbed File Paths
+ * @param tmpd Temporary directory
*/
@SuppressWarnings("nls")
- protected void replaceFiles(Path srcf) throws HiveException {
+ protected void replaceFiles(Path srcf, Path tmpd) throws HiveException {
FileSystem fs;
try {
fs = FileSystem.get(table.getDataLocation(), Hive.get().getConf());
- Hive.get().replaceFiles(srcf, partPath, fs);
+ Hive.get().replaceFiles(srcf, partPath, fs, tmpd);
} catch (IOException e) {
throw new HiveException("addFiles: filesystem error in check phase", e);
}
Index: ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
===================================================================
--- ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java (revision 762319)
+++ ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java (working copy)
@@ -505,14 +505,16 @@
* @param tableName name of table to be loaded.
* @param partSpec defines which partition needs to be loaded
* @param replace if true - replace files in the partition, otherwise add files to the partition
+ * @param tmpDirPath The temporary directory.
*/
public void loadPartition(Path loadPath, String tableName,
- AbstractMap partSpec, boolean replace)
+ AbstractMap partSpec, boolean replace,
+ Path tmpDirPath)
throws HiveException {
Table tbl = getTable(tableName);
Partition part = getPartition(tbl, partSpec, true);
if(replace) {
- part.replaceFiles(loadPath);
+ part.replaceFiles(loadPath, tmpDirPath);
} else {
part.copyFiles(loadPath);
}
@@ -528,11 +530,14 @@
* @param loadPath Directory containing files to load into Table
* @param tableName name of table to be loaded.
* @param replace if true - replace files in the table, otherwise add files to table
+ * @param tmpDirPath The temporary directory.
*/
- public void loadTable(Path loadPath, String tableName, boolean replace) throws HiveException {
+ public void loadTable(Path loadPath, String tableName,
+ boolean replace,
+ Path tmpDirPath) throws HiveException {
Table tbl = getTable(tableName);
if(replace) {
- tbl.replaceFiles(loadPath);
+ tbl.replaceFiles(loadPath, tmpDirPath);
} else {
tbl.copyFiles(loadPath);
}
@@ -733,8 +738,12 @@
* Replaces files in the partition with new data set specifed by srcf. Works by moving files
*
* @param srcf Files to be moved. Leaf Directories or Globbed File Paths
+ * @param dest The directory where the final data needs to go
+ * @param fs The filesystem handle
+ * @param tmppath Temporary directory
*/
- protected void replaceFiles(Path srcf, Path destf, FileSystem fs) throws HiveException {
+ protected void replaceFiles(Path srcf, Path destf, FileSystem fs,
+ Path tmppath) throws HiveException {
FileStatus [] srcs;
try {
srcs = fs.globStatus(srcf);
@@ -749,7 +758,6 @@
checkPaths(fs, srcs, destf, true);
Random randGen = new Random();
- Path tmppath = new Path("/tmp/"+randGen.nextInt());
try {
fs.mkdirs(tmppath);
for(int i=0; i partitionSpec,
final boolean replace) {
super(sourceDir);
+ this.tmpDir = tmpDir;
this.table = table;
this.partitionSpec = partitionSpec;
this.replace = replace;
}
public loadTableDesc(
final String sourceDir,
+ final String tmpDir,
final org.apache.hadoop.hive.ql.plan.tableDesc table,
final HashMap partitionSpec) {
- this(sourceDir, table, partitionSpec, true);
+ this(sourceDir, tmpDir, table, partitionSpec, true);
}
+ @explain(displayName="tmp directory", normalExplain=false)
+ public String getTmpDir() {
+ return this.tmpDir;
+ }
+ public void setTmpDir(final String tmp) {
+ this.tmpDir = tmp;
+ }
+
@explain(displayName="table")
public tableDesc getTable() {
return this.table;
Index: ql/src/java/org/apache/hadoop/hive/ql/parse/LoadSemanticAnalyzer.java
===================================================================
--- ql/src/java/org/apache/hadoop/hive/ql/parse/LoadSemanticAnalyzer.java (revision 762319)
+++ ql/src/java/org/apache/hadoop/hive/ql/parse/LoadSemanticAnalyzer.java (working copy)
@@ -208,7 +208,7 @@
List loadTableWork = new ArrayList();
List loadFileWork = new ArrayList();
- loadTableWork.add(new loadTableDesc(fromURI.toString(), Utilities.getTableDesc(ts.tableHandle),
+ loadTableWork.add(new loadTableDesc(fromURI.toString(), getTmpFileName(), Utilities.getTableDesc(ts.tableHandle),
(ts.partSpec != null) ? ts.partSpec : new HashMap (),
isOverWrite));
Index: ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
===================================================================
--- ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java (revision 762345)
+++ ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java (working copy)
@@ -2204,7 +2204,7 @@
dest_path = dest_tab.getPath().toString();
// Create the work for moving the table
- this.loadTableWork.add(new loadTableDesc(queryTmpdir,
+ this.loadTableWork.add(new loadTableDesc(queryTmpdir, getTmpFileName(),
table_desc,
new HashMap()));
break;
@@ -2219,7 +2219,7 @@
currentTableId = this.destTableId;
this.destTableId ++;
- this.loadTableWork.add(new loadTableDesc(queryTmpdir, table_desc, dest_part.getSpec()));
+ this.loadTableWork.add(new loadTableDesc(queryTmpdir, getTmpFileName(), table_desc, dest_part.getSpec()));
break;
}
case QBMetaData.DEST_LOCAL_FILE: