Index: metastore/src/java/org/apache/hadoop/hive/metastore/Warehouse.java
===================================================================
--- metastore/src/java/org/apache/hadoop/hive/metastore/Warehouse.java (revision 1041975)
+++ metastore/src/java/org/apache/hadoop/hive/metastore/Warehouse.java (working copy)
@@ -57,7 +57,8 @@
public Warehouse(Configuration conf) throws MetaException {
this.conf = conf;
- whRootString = HiveConf.getVar(conf, HiveConf.ConfVars.METASTOREWAREHOUSE);
+ whRootString = HiveConf.getVar(conf, HiveConf.ConfVars.HADOOPFS) +
+ HiveConf.getVar(conf, HiveConf.ConfVars.METASTOREWAREHOUSE);
if (StringUtils.isBlank(whRootString)) {
throw new MetaException(HiveConf.ConfVars.METASTOREWAREHOUSE.varname
+ " is not set in the config or blank");
Index: build-common.xml
===================================================================
--- build-common.xml (revision 1041975)
+++ build-common.xml (working copy)
@@ -190,7 +190,7 @@
-
+
-
+
@@ -414,7 +414,7 @@
-->
-
+
Index: ql/src/test/results/clientpositive/filter_join_breaktask.q.out
===================================================================
--- ql/src/test/results/clientpositive/filter_join_breaktask.q.out (revision 1041975)
+++ ql/src/test/results/clientpositive/filter_join_breaktask.q.out (working copy)
@@ -100,9 +100,9 @@
type: string
Needs Tagging: true
Path -> Alias:
- pfile:/data/users/sdong/www/hive-trunk/build/ql/test/data/warehouse/filter_join_breaktask/ds=2008-04-08 [f, m]
+ file:/data/users/njain/hive3/hive3/build/ql/test/data/warehouse/filter_join_breaktask/ds=2008-04-08 [f, m]
Path -> Partition:
- pfile:/data/users/sdong/www/hive-trunk/build/ql/test/data/warehouse/filter_join_breaktask/ds=2008-04-08
+ file:/data/users/njain/hive3/hive3/build/ql/test/data/warehouse/filter_join_breaktask/ds=2008-04-08
Partition
base file name: ds=2008-04-08
input format: org.apache.hadoop.mapred.TextInputFormat
@@ -115,7 +115,7 @@
columns.types int:string
file.inputformat org.apache.hadoop.mapred.TextInputFormat
file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
- location pfile:/data/users/sdong/www/hive-trunk/build/ql/test/data/warehouse/filter_join_breaktask
+ location file:/data/users/njain/hive3/hive3/build/ql/test/data/warehouse/filter_join_breaktask
name filter_join_breaktask
numFiles 1
numPartitions 1
@@ -125,7 +125,7 @@
serialization.format 1
serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
totalSize 236
- transient_lastDdlTime 1288810207
+ transient_lastDdlTime 1291324781
serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
input format: org.apache.hadoop.mapred.TextInputFormat
@@ -136,7 +136,7 @@
columns.types int:string
file.inputformat org.apache.hadoop.mapred.TextInputFormat
file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
- location pfile:/data/users/sdong/www/hive-trunk/build/ql/test/data/warehouse/filter_join_breaktask
+ location file:/data/users/njain/hive3/hive3/build/ql/test/data/warehouse/filter_join_breaktask
name filter_join_breaktask
numFiles 1
numPartitions 1
@@ -146,7 +146,7 @@
serialization.format 1
serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
totalSize 236
- transient_lastDdlTime 1288810207
+ transient_lastDdlTime 1291324781
serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
name: filter_join_breaktask
name: filter_join_breaktask
@@ -177,7 +177,7 @@
File Output Operator
compressed: false
GlobalTableId: 0
- directory: file:/tmp/sdong/hive_2010-11-03_11-50-07_978_4040810463207546064/-mr-10002
+ directory: file:/tmp/njain/hive_2010-12-02_13-19-41_752_209278141241593195/-mr-10002
NumFilesPerFileSink: 1
table:
input format: org.apache.hadoop.mapred.SequenceFileInputFormat
@@ -229,27 +229,11 @@
type: string
Needs Tagging: true
Path -> Alias:
- file:/tmp/sdong/hive_2010-11-03_11-50-07_978_4040810463207546064/-mr-10002 [$INTNAME]
- pfile:/data/users/sdong/www/hive-trunk/build/ql/test/data/warehouse/filter_join_breaktask/ds=2008-04-08 [g]
+ file:/data/users/njain/hive3/hive3/build/ql/test/data/warehouse/filter_join_breaktask/ds=2008-04-08 [g]
+ file:/tmp/njain/hive_2010-12-02_13-19-41_752_209278141241593195/-mr-10002 [$INTNAME]
Path -> Partition:
- file:/tmp/sdong/hive_2010-11-03_11-50-07_978_4040810463207546064/-mr-10002
+ file:/data/users/njain/hive3/hive3/build/ql/test/data/warehouse/filter_join_breaktask/ds=2008-04-08
Partition
- base file name: -mr-10002
- input format: org.apache.hadoop.mapred.SequenceFileInputFormat
- output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
- properties:
- columns _col0,_col6
- columns.types int,string
- escape.delim \
-
- input format: org.apache.hadoop.mapred.SequenceFileInputFormat
- output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
- properties:
- columns _col0,_col6
- columns.types int,string
- escape.delim \
- pfile:/data/users/sdong/www/hive-trunk/build/ql/test/data/warehouse/filter_join_breaktask/ds=2008-04-08
- Partition
base file name: ds=2008-04-08
input format: org.apache.hadoop.mapred.TextInputFormat
output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -261,7 +245,7 @@
columns.types int:string
file.inputformat org.apache.hadoop.mapred.TextInputFormat
file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
- location pfile:/data/users/sdong/www/hive-trunk/build/ql/test/data/warehouse/filter_join_breaktask
+ location file:/data/users/njain/hive3/hive3/build/ql/test/data/warehouse/filter_join_breaktask
name filter_join_breaktask
numFiles 1
numPartitions 1
@@ -271,7 +255,7 @@
serialization.format 1
serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
totalSize 236
- transient_lastDdlTime 1288810207
+ transient_lastDdlTime 1291324781
serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
input format: org.apache.hadoop.mapred.TextInputFormat
@@ -282,7 +266,7 @@
columns.types int:string
file.inputformat org.apache.hadoop.mapred.TextInputFormat
file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
- location pfile:/data/users/sdong/www/hive-trunk/build/ql/test/data/warehouse/filter_join_breaktask
+ location file:/data/users/njain/hive3/hive3/build/ql/test/data/warehouse/filter_join_breaktask
name filter_join_breaktask
numFiles 1
numPartitions 1
@@ -292,10 +276,26 @@
serialization.format 1
serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
totalSize 236
- transient_lastDdlTime 1288810207
+ transient_lastDdlTime 1291324781
serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
name: filter_join_breaktask
name: filter_join_breaktask
+ file:/tmp/njain/hive_2010-12-02_13-19-41_752_209278141241593195/-mr-10002
+ Partition
+ base file name: -mr-10002
+ input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+ output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+ properties:
+ columns _col0,_col6
+ columns.types int,string
+ escape.delim \
+
+ input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+ output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+ properties:
+ columns _col0,_col6
+ columns.types int,string
+ escape.delim \
Reduce Operator Tree:
Join Operator
condition map:
@@ -315,9 +315,9 @@
File Output Operator
compressed: false
GlobalTableId: 0
- directory: file:/tmp/sdong/hive_2010-11-03_11-50-07_978_4040810463207546064/-ext-10001
+ directory: file:/tmp/njain/hive_2010-12-02_13-19-41_752_209278141241593195/-ext-10001
NumFilesPerFileSink: 1
- Stats Publishing Key Prefix: file:/tmp/sdong/hive_2010-11-03_11-50-07_978_4040810463207546064/-ext-10001/
+ Stats Publishing Key Prefix: file:/tmp/njain/hive_2010-12-02_13-19-41_752_209278141241593195/-ext-10001/
table:
input format: org.apache.hadoop.mapred.TextInputFormat
output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -339,13 +339,13 @@
JOIN filter_join_breaktask g ON(g.value = m.value AND g.ds='2008-04-08' AND m.ds='2008-04-08' AND m.value is not null AND m.value !='')
PREHOOK: type: QUERY
PREHOOK: Input: default@filter_join_breaktask@ds=2008-04-08
-PREHOOK: Output: file:/tmp/sdong/hive_2010-11-03_11-50-08_167_8926817836465229505/-mr-10000
+PREHOOK: Output: file:/tmp/njain/hive_2010-12-02_13-19-42_343_4927775049707942255/-mr-10000
POSTHOOK: query: SELECT f.key, g.value
FROM filter_join_breaktask f JOIN filter_join_breaktask m ON( f.key = m.key AND f.ds='2008-04-08' AND m.ds='2008-04-08' AND f.key is not null)
JOIN filter_join_breaktask g ON(g.value = m.value AND g.ds='2008-04-08' AND m.ds='2008-04-08' AND m.value is not null AND m.value !='')
POSTHOOK: type: QUERY
POSTHOOK: Input: default@filter_join_breaktask@ds=2008-04-08
-POSTHOOK: Output: file:/tmp/sdong/hive_2010-11-03_11-50-08_167_8926817836465229505/-mr-10000
+POSTHOOK: Output: file:/tmp/njain/hive_2010-12-02_13-19-42_343_4927775049707942255/-mr-10000
POSTHOOK: Lineage: filter_join_breaktask PARTITION(ds=2008-04-08).key EXPRESSION [(src1)src1.FieldSchema(name:key, type:string, comment:default), ]
POSTHOOK: Lineage: filter_join_breaktask PARTITION(ds=2008-04-08).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ]
146 val_146
Index: ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
===================================================================
--- ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java (revision 1041975)
+++ ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java (working copy)
@@ -860,7 +860,8 @@
qb.setIsQuery(false);
// allocate a temporary output dir on the location of the table
- String location = conf.getVar(HiveConf.ConfVars.METASTOREWAREHOUSE);
+ String location = conf.getVar(HiveConf.ConfVars.HADOOPFS) +
+ conf.getVar(HiveConf.ConfVars.METASTOREWAREHOUSE);
try {
fname = ctx.getExternalTmpFileURI
(FileUtils.makeQualified(new Path(location), conf).toUri());
@@ -6213,7 +6214,8 @@
String location = qb.getTableDesc().getLocation();
if (location == null) {
// get the table's default location
- location = conf.getVar(HiveConf.ConfVars.METASTOREWAREHOUSE);
+ location = conf.getVar(HiveConf.ConfVars.HADOOPFS) +
+ conf.getVar(HiveConf.ConfVars.METASTOREWAREHOUSE);
assert (location.length() > 0);
if (location.charAt(location.length() - 1) != '/') {
location += '/';