Index: common/src/java/org/apache/hadoop/hive/conf/HiveConf.java =================================================================== --- common/src/java/org/apache/hadoop/hive/conf/HiveConf.java (revision 1067253) +++ common/src/java/org/apache/hadoop/hive/conf/HiveConf.java (working copy) @@ -368,7 +368,13 @@ HIVE_ERROR_ON_EMPTY_PARTITION("hive.error.on.empty.partition", false), - HIVE_INDEX_IGNORE_HDFS_LOC("hive.index.compact.file.ignore.hdfs", false), + HIVE_INDEX_IGNORE_HDFS_LOC("hive.index.compact.file.ignore.hdfs", false), + + // temporary variable for testing. This is added just to turn off this feature in case of a bug in + // deployment. It has not been documented in hive-default.xml intentionally, this should be removed + // once the feature is stable + HIVE_MAPPER_CANNOT_SPAN_MULTIPLE_PARTITIONS("hive.mapper.cannot.span.multiple.partitions", false), + ; Index: ql/src/test/results/clientpositive/partition_wise_fileformat5.q.out =================================================================== --- ql/src/test/results/clientpositive/partition_wise_fileformat5.q.out (revision 0) +++ ql/src/test/results/clientpositive/partition_wise_fileformat5.q.out (revision 0) @@ -0,0 +1,96 @@ +PREHOOK: query: create table partition_test_partitioned(key string, value string) partitioned by (dt string) +PREHOOK: type: CREATETABLE +POSTHOOK: query: create table partition_test_partitioned(key string, value string) partitioned by (dt string) +POSTHOOK: type: CREATETABLE +POSTHOOK: Output: default@partition_test_partitioned +PREHOOK: query: alter table partition_test_partitioned set fileformat rcfile +PREHOOK: type: ALTERTABLE_FILEFORMAT +PREHOOK: Input: default@partition_test_partitioned +PREHOOK: Output: default@partition_test_partitioned +POSTHOOK: query: alter table partition_test_partitioned set fileformat rcfile +POSTHOOK: type: ALTERTABLE_FILEFORMAT +POSTHOOK: Input: default@partition_test_partitioned +POSTHOOK: Output: default@partition_test_partitioned +PREHOOK: query: insert overwrite table partition_test_partitioned partition(dt=101) select * from src1 +PREHOOK: type: QUERY +PREHOOK: Input: default@src1 +PREHOOK: Output: default@partition_test_partitioned@dt=101 +POSTHOOK: query: insert overwrite table partition_test_partitioned partition(dt=101) select * from src1 +POSTHOOK: type: QUERY +POSTHOOK: Input: default@src1 +POSTHOOK: Output: default@partition_test_partitioned@dt=101 +POSTHOOK: Lineage: partition_test_partitioned PARTITION(dt=101).key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ] +POSTHOOK: Lineage: partition_test_partitioned PARTITION(dt=101).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] +PREHOOK: query: alter table partition_test_partitioned set fileformat Sequencefile +PREHOOK: type: ALTERTABLE_FILEFORMAT +PREHOOK: Input: default@partition_test_partitioned +PREHOOK: Output: default@partition_test_partitioned +POSTHOOK: query: alter table partition_test_partitioned set fileformat Sequencefile +POSTHOOK: type: ALTERTABLE_FILEFORMAT +POSTHOOK: Input: default@partition_test_partitioned +POSTHOOK: Output: default@partition_test_partitioned +POSTHOOK: Lineage: partition_test_partitioned PARTITION(dt=101).key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ] +POSTHOOK: Lineage: partition_test_partitioned PARTITION(dt=101).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] +PREHOOK: query: insert overwrite table partition_test_partitioned partition(dt=102) select * from src1 +PREHOOK: type: QUERY +PREHOOK: Input: default@src1 +PREHOOK: Output: default@partition_test_partitioned@dt=102 +POSTHOOK: query: insert overwrite table partition_test_partitioned partition(dt=102) select * from src1 +POSTHOOK: type: QUERY +POSTHOOK: Input: default@src1 +POSTHOOK: Output: default@partition_test_partitioned@dt=102 +POSTHOOK: Lineage: partition_test_partitioned PARTITION(dt=101).key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ] +POSTHOOK: Lineage: partition_test_partitioned PARTITION(dt=101).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] +POSTHOOK: Lineage: partition_test_partitioned PARTITION(dt=102).key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ] +POSTHOOK: Lineage: partition_test_partitioned PARTITION(dt=102).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] +PREHOOK: query: select dt, count(1) from partition_test_partitioned where dt is not null group by dt +PREHOOK: type: QUERY +PREHOOK: Input: default@partition_test_partitioned@dt=101 +PREHOOK: Input: default@partition_test_partitioned@dt=102 +PREHOOK: Output: file:/tmp/njain/hive_2011-02-02_15-20-57_358_902155619985638012/-mr-10000 +POSTHOOK: query: select dt, count(1) from partition_test_partitioned where dt is not null group by dt +POSTHOOK: type: QUERY +POSTHOOK: Input: default@partition_test_partitioned@dt=101 +POSTHOOK: Input: default@partition_test_partitioned@dt=102 +POSTHOOK: Output: file:/tmp/njain/hive_2011-02-02_15-20-57_358_902155619985638012/-mr-10000 +POSTHOOK: Lineage: partition_test_partitioned PARTITION(dt=101).key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ] +POSTHOOK: Lineage: partition_test_partitioned PARTITION(dt=101).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] +POSTHOOK: Lineage: partition_test_partitioned PARTITION(dt=102).key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ] +POSTHOOK: Lineage: partition_test_partitioned PARTITION(dt=102).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] +101 25 +102 25 +PREHOOK: query: insert overwrite table partition_test_partitioned partition(dt=103) select * from src1 +PREHOOK: type: QUERY +PREHOOK: Input: default@src1 +PREHOOK: Output: default@partition_test_partitioned@dt=103 +POSTHOOK: query: insert overwrite table partition_test_partitioned partition(dt=103) select * from src1 +POSTHOOK: type: QUERY +POSTHOOK: Input: default@src1 +POSTHOOK: Output: default@partition_test_partitioned@dt=103 +POSTHOOK: Lineage: partition_test_partitioned PARTITION(dt=101).key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ] +POSTHOOK: Lineage: partition_test_partitioned PARTITION(dt=101).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] +POSTHOOK: Lineage: partition_test_partitioned PARTITION(dt=102).key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ] +POSTHOOK: Lineage: partition_test_partitioned PARTITION(dt=102).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] +POSTHOOK: Lineage: partition_test_partitioned PARTITION(dt=103).key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ] +POSTHOOK: Lineage: partition_test_partitioned PARTITION(dt=103).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] +PREHOOK: query: select dt, count(1) from partition_test_partitioned where dt is not null group by dt +PREHOOK: type: QUERY +PREHOOK: Input: default@partition_test_partitioned@dt=101 +PREHOOK: Input: default@partition_test_partitioned@dt=102 +PREHOOK: Input: default@partition_test_partitioned@dt=103 +PREHOOK: Output: file:/tmp/njain/hive_2011-02-02_15-21-05_958_2383252255379009164/-mr-10000 +POSTHOOK: query: select dt, count(1) from partition_test_partitioned where dt is not null group by dt +POSTHOOK: type: QUERY +POSTHOOK: Input: default@partition_test_partitioned@dt=101 +POSTHOOK: Input: default@partition_test_partitioned@dt=102 +POSTHOOK: Input: default@partition_test_partitioned@dt=103 +POSTHOOK: Output: file:/tmp/njain/hive_2011-02-02_15-21-05_958_2383252255379009164/-mr-10000 +POSTHOOK: Lineage: partition_test_partitioned PARTITION(dt=101).key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ] +POSTHOOK: Lineage: partition_test_partitioned PARTITION(dt=101).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] +POSTHOOK: Lineage: partition_test_partitioned PARTITION(dt=102).key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ] +POSTHOOK: Lineage: partition_test_partitioned PARTITION(dt=102).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] +POSTHOOK: Lineage: partition_test_partitioned PARTITION(dt=103).key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ] +POSTHOOK: Lineage: partition_test_partitioned PARTITION(dt=103).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] +101 25 +102 25 +103 25 Index: ql/src/test/results/clientpositive/input42.q.out =================================================================== --- ql/src/test/results/clientpositive/input42.q.out (revision 1067253) +++ ql/src/test/results/clientpositive/input42.q.out (working copy) @@ -54,10 +54,10 @@ type: string Needs Tagging: false Path -> Alias: - pfile:/data/users/sdong/www/hive-trunk/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 [a] - pfile:/data/users/sdong/www/hive-trunk/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 [a] + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 [a] + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 [a] Path -> Partition: - pfile:/data/users/sdong/www/hive-trunk/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 Partition base file name: hr=11 input format: org.apache.hadoop.mapred.TextInputFormat @@ -71,13 +71,13 @@ columns.types string: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/srcpart + location pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 name srcpart partition_columns ds/hr serialization.ddl struct srcpart { string key, string value} serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe - transient_lastDdlTime 1288389287 + transient_lastDdlTime 1296766190 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe input format: org.apache.hadoop.mapred.TextInputFormat @@ -88,17 +88,17 @@ columns.types string: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/srcpart + location pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcpart name srcpart partition_columns ds/hr serialization.ddl struct srcpart { string key, string value} serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe - transient_lastDdlTime 1288389287 + transient_lastDdlTime 1296766190 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: srcpart name: srcpart - pfile:/data/users/sdong/www/hive-trunk/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 Partition base file name: hr=12 input format: org.apache.hadoop.mapred.TextInputFormat @@ -112,13 +112,13 @@ columns.types string: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/srcpart + location pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 name srcpart partition_columns ds/hr serialization.ddl struct srcpart { string key, string value} serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe - transient_lastDdlTime 1288389287 + transient_lastDdlTime 1296766190 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe input format: org.apache.hadoop.mapred.TextInputFormat @@ -129,13 +129,13 @@ columns.types string: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/srcpart + location pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcpart name srcpart partition_columns ds/hr serialization.ddl struct srcpart { string key, string value} serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe - transient_lastDdlTime 1288389287 + transient_lastDdlTime 1296766190 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: srcpart name: srcpart @@ -144,9 +144,9 @@ File Output Operator compressed: false GlobalTableId: 0 - directory: file:/tmp/sdong/hive_2010-10-29_15-31-51_423_2950637669981243052/-ext-10001 + directory: file:/tmp/njain/hive_2011-02-03_12-49-59_467_3796150470392177289/-ext-10001 NumFilesPerFileSink: 1 - Stats Publishing Key Prefix: file:/tmp/sdong/hive_2010-10-29_15-31-51_423_2950637669981243052/-ext-10001/ + Stats Publishing Key Prefix: file:/tmp/njain/hive_2011-02-03_12-49-59_467_3796150470392177289/-ext-10001/ table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -167,12 +167,12 @@ PREHOOK: type: QUERY PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11 PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 -PREHOOK: Output: file:/tmp/sdong/hive_2010-10-29_15-31-51_551_23639250440929738/-mr-10000 +PREHOOK: Output: file:/tmp/njain/hive_2011-02-03_12-49-59_801_525167415497485863/-mr-10000 POSTHOOK: query: select * from srcpart a where a.ds='2008-04-08' order by a.key, a.hr POSTHOOK: type: QUERY POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11 POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 -POSTHOOK: Output: file:/tmp/sdong/hive_2010-10-29_15-31-51_551_23639250440929738/-mr-10000 +POSTHOOK: Output: file:/tmp/njain/hive_2011-02-03_12-49-59_801_525167415497485863/-mr-10000 0 val_0 2008-04-08 11 0 val_0 2008-04-08 11 0 val_0 2008-04-08 11 @@ -1234,10 +1234,10 @@ type: string Needs Tagging: false Path -> Alias: - pfile:/data/users/sdong/www/hive-trunk/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 [a] - pfile:/data/users/sdong/www/hive-trunk/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 [a] + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 [a] + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 [a] Path -> Partition: - pfile:/data/users/sdong/www/hive-trunk/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 Partition base file name: hr=11 input format: org.apache.hadoop.mapred.TextInputFormat @@ -1251,13 +1251,13 @@ columns.types string: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/srcpart + location pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 name srcpart partition_columns ds/hr serialization.ddl struct srcpart { string key, string value} serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe - transient_lastDdlTime 1288389287 + transient_lastDdlTime 1296766190 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe input format: org.apache.hadoop.mapred.TextInputFormat @@ -1268,17 +1268,17 @@ columns.types string: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/srcpart + location pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcpart name srcpart partition_columns ds/hr serialization.ddl struct srcpart { string key, string value} serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe - transient_lastDdlTime 1288389287 + transient_lastDdlTime 1296766190 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: srcpart name: srcpart - pfile:/data/users/sdong/www/hive-trunk/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 Partition base file name: hr=12 input format: org.apache.hadoop.mapred.TextInputFormat @@ -1292,13 +1292,13 @@ columns.types string: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/srcpart + location pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 name srcpart partition_columns ds/hr serialization.ddl struct srcpart { string key, string value} serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe - transient_lastDdlTime 1288389287 + transient_lastDdlTime 1296766190 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe input format: org.apache.hadoop.mapred.TextInputFormat @@ -1309,13 +1309,13 @@ columns.types string: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/srcpart + location pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcpart name srcpart partition_columns ds/hr serialization.ddl struct srcpart { string key, string value} serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe - transient_lastDdlTime 1288389287 + transient_lastDdlTime 1296766190 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: srcpart name: srcpart @@ -1324,9 +1324,9 @@ File Output Operator compressed: false GlobalTableId: 0 - directory: file:/tmp/sdong/hive_2010-10-29_15-31-55_370_4976912681665825327/-ext-10001 + directory: file:/tmp/njain/hive_2011-02-03_12-50-03_142_654060154054043640/-ext-10001 NumFilesPerFileSink: 1 - Stats Publishing Key Prefix: file:/tmp/sdong/hive_2010-10-29_15-31-55_370_4976912681665825327/-ext-10001/ + Stats Publishing Key Prefix: file:/tmp/njain/hive_2011-02-03_12-50-03_142_654060154054043640/-ext-10001/ table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -1347,12 +1347,12 @@ PREHOOK: type: QUERY PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11 PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 -PREHOOK: Output: file:/tmp/sdong/hive_2010-10-29_15-31-55_529_6657949327034269590/-mr-10000 +PREHOOK: Output: file:/tmp/njain/hive_2011-02-03_12-50-03_306_2508303776661842458/-mr-10000 POSTHOOK: query: select * from srcpart a where a.ds='2008-04-08' and key < 200 order by a.key, a.hr POSTHOOK: type: QUERY POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11 POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 -POSTHOOK: Output: file:/tmp/sdong/hive_2010-10-29_15-31-55_529_6657949327034269590/-mr-10000 +POSTHOOK: Output: file:/tmp/njain/hive_2011-02-03_12-50-03_306_2508303776661842458/-mr-10000 0 val_0 2008-04-08 11 0 val_0 2008-04-08 11 0 val_0 2008-04-08 11 @@ -1787,10 +1787,10 @@ type: string Needs Tagging: false Path -> Alias: - pfile:/data/users/sdong/www/hive-trunk/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 [a] - pfile:/data/users/sdong/www/hive-trunk/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 [a] + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 [a] + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 [a] Path -> Partition: - pfile:/data/users/sdong/www/hive-trunk/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 Partition base file name: hr=11 input format: org.apache.hadoop.mapred.TextInputFormat @@ -1804,13 +1804,13 @@ columns.types string: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/srcpart + location pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 name srcpart partition_columns ds/hr serialization.ddl struct srcpart { string key, string value} serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe - transient_lastDdlTime 1288389287 + transient_lastDdlTime 1296766190 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe input format: org.apache.hadoop.mapred.TextInputFormat @@ -1821,17 +1821,17 @@ columns.types string: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/srcpart + location pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcpart name srcpart partition_columns ds/hr serialization.ddl struct srcpart { string key, string value} serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe - transient_lastDdlTime 1288389287 + transient_lastDdlTime 1296766190 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: srcpart name: srcpart - pfile:/data/users/sdong/www/hive-trunk/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 Partition base file name: hr=12 input format: org.apache.hadoop.mapred.TextInputFormat @@ -1845,13 +1845,13 @@ columns.types string: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/srcpart + location pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 name srcpart partition_columns ds/hr serialization.ddl struct srcpart { string key, string value} serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe - transient_lastDdlTime 1288389287 + transient_lastDdlTime 1296766190 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe input format: org.apache.hadoop.mapred.TextInputFormat @@ -1862,13 +1862,13 @@ columns.types string: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/srcpart + location pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcpart name srcpart partition_columns ds/hr serialization.ddl struct srcpart { string key, string value} serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe - transient_lastDdlTime 1288389287 + transient_lastDdlTime 1296766190 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: srcpart name: srcpart @@ -1877,9 +1877,9 @@ File Output Operator compressed: false GlobalTableId: 0 - directory: file:/tmp/sdong/hive_2010-10-29_15-31-58_886_3715859592074339834/-ext-10001 + directory: file:/tmp/njain/hive_2011-02-03_12-50-06_477_8143234486934165536/-ext-10001 NumFilesPerFileSink: 1 - Stats Publishing Key Prefix: file:/tmp/sdong/hive_2010-10-29_15-31-58_886_3715859592074339834/-ext-10001/ + Stats Publishing Key Prefix: file:/tmp/njain/hive_2011-02-03_12-50-06_477_8143234486934165536/-ext-10001/ table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -1900,103 +1900,101 @@ PREHOOK: type: QUERY PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11 PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 -PREHOOK: Output: file:/tmp/sdong/hive_2010-10-29_15-31-59_013_2075633210966279442/-mr-10000 +PREHOOK: Output: file:/tmp/njain/hive_2011-02-03_12-50-06_625_1807918217728904887/-mr-10000 POSTHOOK: query: select * from srcpart a where a.ds='2008-04-08' and rand(100) < 0.1 order by a.key, a.hr POSTHOOK: type: QUERY POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11 POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 -POSTHOOK: Output: file:/tmp/sdong/hive_2010-10-29_15-31-59_013_2075633210966279442/-mr-10000 +POSTHOOK: Output: file:/tmp/njain/hive_2011-02-03_12-50-06_625_1807918217728904887/-mr-10000 113 val_113 2008-04-08 11 -113 val_113 2008-04-08 12 118 val_118 2008-04-08 11 -118 val_118 2008-04-08 12 +12 val_12 2008-04-08 12 +125 val_125 2008-04-08 12 128 val_128 2008-04-08 11 -128 val_128 2008-04-08 12 143 val_143 2008-04-08 11 143 val_143 2008-04-08 12 145 val_145 2008-04-08 11 -145 val_145 2008-04-08 12 +149 val_149 2008-04-08 12 15 val_15 2008-04-08 11 15 val_15 2008-04-08 12 +160 val_160 2008-04-08 12 164 val_164 2008-04-08 11 -164 val_164 2008-04-08 12 +165 val_165 2008-04-08 12 +166 val_166 2008-04-08 12 170 val_170 2008-04-08 11 -170 val_170 2008-04-08 12 176 val_176 2008-04-08 11 176 val_176 2008-04-08 12 181 val_181 2008-04-08 11 -181 val_181 2008-04-08 12 +191 val_191 2008-04-08 12 195 val_195 2008-04-08 11 -195 val_195 2008-04-08 12 +197 val_197 2008-04-08 12 +199 val_199 2008-04-08 12 +203 val_203 2008-04-08 12 +216 val_216 2008-04-08 12 +218 val_218 2008-04-08 12 223 val_223 2008-04-08 11 -223 val_223 2008-04-08 12 +224 val_224 2008-04-08 12 237 val_237 2008-04-08 11 -237 val_237 2008-04-08 12 239 val_239 2008-04-08 11 -239 val_239 2008-04-08 12 +242 val_242 2008-04-08 12 256 val_256 2008-04-08 11 256 val_256 2008-04-08 12 +278 val_278 2008-04-08 12 +288 val_288 2008-04-08 12 292 val_292 2008-04-08 11 -292 val_292 2008-04-08 12 298 val_298 2008-04-08 11 -298 val_298 2008-04-08 12 +316 val_316 2008-04-08 12 +325 val_325 2008-04-08 12 +332 val_332 2008-04-08 12 +34 val_34 2008-04-08 12 341 val_341 2008-04-08 11 -341 val_341 2008-04-08 12 +348 val_348 2008-04-08 12 368 val_368 2008-04-08 11 -368 val_368 2008-04-08 12 369 val_369 2008-04-08 11 -369 val_369 2008-04-08 12 +37 val_37 2008-04-08 12 394 val_394 2008-04-08 11 -394 val_394 2008-04-08 12 +4 val_4 2008-04-08 12 +400 val_400 2008-04-08 12 401 val_401 2008-04-08 11 -401 val_401 2008-04-08 12 +402 val_402 2008-04-08 12 404 val_404 2008-04-08 11 -404 val_404 2008-04-08 12 406 val_406 2008-04-08 11 -406 val_406 2008-04-08 12 +414 val_414 2008-04-08 12 417 val_417 2008-04-08 11 -417 val_417 2008-04-08 12 +42 val_42 2008-04-08 12 424 val_424 2008-04-08 11 424 val_424 2008-04-08 11 424 val_424 2008-04-08 12 -424 val_424 2008-04-08 12 444 val_444 2008-04-08 11 444 val_444 2008-04-08 12 446 val_446 2008-04-08 11 -446 val_446 2008-04-08 12 453 val_453 2008-04-08 11 -453 val_453 2008-04-08 12 +454 val_454 2008-04-08 12 455 val_455 2008-04-08 11 455 val_455 2008-04-08 12 466 val_466 2008-04-08 11 -466 val_466 2008-04-08 12 470 val_470 2008-04-08 11 -470 val_470 2008-04-08 12 472 val_472 2008-04-08 11 -472 val_472 2008-04-08 12 +478 val_478 2008-04-08 12 483 val_483 2008-04-08 11 -483 val_483 2008-04-08 12 +485 val_485 2008-04-08 12 487 val_487 2008-04-08 11 -487 val_487 2008-04-08 12 489 val_489 2008-04-08 11 489 val_489 2008-04-08 12 +489 val_489 2008-04-08 12 +489 val_489 2008-04-08 12 491 val_491 2008-04-08 11 -491 val_491 2008-04-08 12 +492 val_492 2008-04-08 12 +497 val_497 2008-04-08 12 53 val_53 2008-04-08 11 -53 val_53 2008-04-08 12 +64 val_64 2008-04-08 12 65 val_65 2008-04-08 11 -65 val_65 2008-04-08 12 69 val_69 2008-04-08 11 -69 val_69 2008-04-08 12 70 val_70 2008-04-08 11 -70 val_70 2008-04-08 12 72 val_72 2008-04-08 11 -72 val_72 2008-04-08 12 76 val_76 2008-04-08 11 76 val_76 2008-04-08 12 78 val_78 2008-04-08 11 -78 val_78 2008-04-08 12 85 val_85 2008-04-08 11 -85 val_85 2008-04-08 12 +92 val_92 2008-04-08 12 97 val_97 2008-04-08 11 -97 val_97 2008-04-08 12 Index: ql/src/test/results/clientpositive/partition_wise_fileformat6.q.out =================================================================== --- ql/src/test/results/clientpositive/partition_wise_fileformat6.q.out (revision 0) +++ ql/src/test/results/clientpositive/partition_wise_fileformat6.q.out (revision 0) @@ -0,0 +1,85 @@ +PREHOOK: query: create table partition_test_partitioned(key string, value string) partitioned by (dt string) +PREHOOK: type: CREATETABLE +POSTHOOK: query: create table partition_test_partitioned(key string, value string) partitioned by (dt string) +POSTHOOK: type: CREATETABLE +POSTHOOK: Output: default@partition_test_partitioned +PREHOOK: query: alter table partition_test_partitioned set fileformat rcfile +PREHOOK: type: ALTERTABLE_FILEFORMAT +PREHOOK: Input: default@partition_test_partitioned +PREHOOK: Output: default@partition_test_partitioned +POSTHOOK: query: alter table partition_test_partitioned set fileformat rcfile +POSTHOOK: type: ALTERTABLE_FILEFORMAT +POSTHOOK: Input: default@partition_test_partitioned +POSTHOOK: Output: default@partition_test_partitioned +PREHOOK: query: insert overwrite table partition_test_partitioned partition(dt=101) select * from src1 +PREHOOK: type: QUERY +PREHOOK: Input: default@src1 +PREHOOK: Output: default@partition_test_partitioned@dt=101 +POSTHOOK: query: insert overwrite table partition_test_partitioned partition(dt=101) select * from src1 +POSTHOOK: type: QUERY +POSTHOOK: Input: default@src1 +POSTHOOK: Output: default@partition_test_partitioned@dt=101 +POSTHOOK: Lineage: partition_test_partitioned PARTITION(dt=101).key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ] +POSTHOOK: Lineage: partition_test_partitioned PARTITION(dt=101).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] +PREHOOK: query: alter table partition_test_partitioned set fileformat Sequencefile +PREHOOK: type: ALTERTABLE_FILEFORMAT +PREHOOK: Input: default@partition_test_partitioned +PREHOOK: Output: default@partition_test_partitioned +POSTHOOK: query: alter table partition_test_partitioned set fileformat Sequencefile +POSTHOOK: type: ALTERTABLE_FILEFORMAT +POSTHOOK: Input: default@partition_test_partitioned +POSTHOOK: Output: default@partition_test_partitioned +POSTHOOK: Lineage: partition_test_partitioned PARTITION(dt=101).key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ] +POSTHOOK: Lineage: partition_test_partitioned PARTITION(dt=101).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] +PREHOOK: query: insert overwrite table partition_test_partitioned partition(dt=102) select * from src1 +PREHOOK: type: QUERY +PREHOOK: Input: default@src1 +PREHOOK: Output: default@partition_test_partitioned@dt=102 +POSTHOOK: query: insert overwrite table partition_test_partitioned partition(dt=102) select * from src1 +POSTHOOK: type: QUERY +POSTHOOK: Input: default@src1 +POSTHOOK: Output: default@partition_test_partitioned@dt=102 +POSTHOOK: Lineage: partition_test_partitioned PARTITION(dt=101).key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ] +POSTHOOK: Lineage: partition_test_partitioned PARTITION(dt=101).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] +POSTHOOK: Lineage: partition_test_partitioned PARTITION(dt=102).key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ] +POSTHOOK: Lineage: partition_test_partitioned PARTITION(dt=102).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] +PREHOOK: query: select count(1) from +(select key, value from partition_test_partitioned where dt=101 and key < 100 + union all +select key, value from partition_test_partitioned where dt=101 and key < 20)s +PREHOOK: type: QUERY +PREHOOK: Input: default@partition_test_partitioned@dt=101 +PREHOOK: Output: file:/tmp/njain/hive_2011-02-02_15-34-45_437_4407266801936254750/-mr-10000 +POSTHOOK: query: select count(1) from +(select key, value from partition_test_partitioned where dt=101 and key < 100 + union all +select key, value from partition_test_partitioned where dt=101 and key < 20)s +POSTHOOK: type: QUERY +POSTHOOK: Input: default@partition_test_partitioned@dt=101 +POSTHOOK: Output: file:/tmp/njain/hive_2011-02-02_15-34-45_437_4407266801936254750/-mr-10000 +POSTHOOK: Lineage: partition_test_partitioned PARTITION(dt=101).key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ] +POSTHOOK: Lineage: partition_test_partitioned PARTITION(dt=101).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] +POSTHOOK: Lineage: partition_test_partitioned PARTITION(dt=102).key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ] +POSTHOOK: Lineage: partition_test_partitioned PARTITION(dt=102).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] +2 +PREHOOK: query: select count(1) from +(select key, value from partition_test_partitioned where dt=101 and key < 100 + union all +select key, value from partition_test_partitioned where dt=102 and key < 20)s +PREHOOK: type: QUERY +PREHOOK: Input: default@partition_test_partitioned@dt=101 +PREHOOK: Input: default@partition_test_partitioned@dt=102 +PREHOOK: Output: file:/tmp/njain/hive_2011-02-02_15-34-48_866_3762944345717931440/-mr-10000 +POSTHOOK: query: select count(1) from +(select key, value from partition_test_partitioned where dt=101 and key < 100 + union all +select key, value from partition_test_partitioned where dt=102 and key < 20)s +POSTHOOK: type: QUERY +POSTHOOK: Input: default@partition_test_partitioned@dt=101 +POSTHOOK: Input: default@partition_test_partitioned@dt=102 +POSTHOOK: Output: file:/tmp/njain/hive_2011-02-02_15-34-48_866_3762944345717931440/-mr-10000 +POSTHOOK: Lineage: partition_test_partitioned PARTITION(dt=101).key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ] +POSTHOOK: Lineage: partition_test_partitioned PARTITION(dt=101).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] +POSTHOOK: Lineage: partition_test_partitioned PARTITION(dt=102).key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ] +POSTHOOK: Lineage: partition_test_partitioned PARTITION(dt=102).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] +2 Index: ql/src/test/results/clientpositive/rand_partitionpruner2.q.out =================================================================== --- ql/src/test/results/clientpositive/rand_partitionpruner2.q.out (revision 1067253) +++ ql/src/test/results/clientpositive/rand_partitionpruner2.q.out (working copy) @@ -53,9 +53,9 @@ File Output Operator compressed: false GlobalTableId: 1 - directory: pfile:/data/users/sdong/www/hive-trunk/build/ql/scratchdir/hive_2010-10-29_16-22-05_968_3706327449059726358/-ext-10002 + directory: pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-03_11-49-31_456_2816292350579044006/-ext-10002 NumFilesPerFileSink: 1 - Stats Publishing Key Prefix: pfile:/data/users/sdong/www/hive-trunk/build/ql/scratchdir/hive_2010-10-29_16-22-05_968_3706327449059726358/-ext-10000/ + Stats Publishing Key Prefix: pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-03_11-49-31_456_2816292350579044006/-ext-10000/ table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -65,12 +65,12 @@ columns.types string:string:string: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/tmptable + location pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/tmptable name tmptable serialization.ddl struct tmptable { string key, string value, string hr, string ds} serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe - transient_lastDdlTime 1288394525 + transient_lastDdlTime 1296762571 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: tmptable TotalFiles: 1 @@ -78,10 +78,10 @@ MultiFileSpray: false Needs Tagging: false Path -> Alias: - pfile:/data/users/sdong/www/hive-trunk/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 [a] - pfile:/data/users/sdong/www/hive-trunk/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 [a] + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 [a] + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 [a] Path -> Partition: - pfile:/data/users/sdong/www/hive-trunk/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 Partition base file name: hr=11 input format: org.apache.hadoop.mapred.TextInputFormat @@ -95,13 +95,13 @@ columns.types string: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/srcpart + location pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 name srcpart partition_columns ds/hr serialization.ddl struct srcpart { string key, string value} serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe - transient_lastDdlTime 1288389287 + transient_lastDdlTime 1296762562 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe input format: org.apache.hadoop.mapred.TextInputFormat @@ -112,17 +112,17 @@ columns.types string: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/srcpart + location pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcpart name srcpart partition_columns ds/hr serialization.ddl struct srcpart { string key, string value} serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe - transient_lastDdlTime 1288389287 + transient_lastDdlTime 1296762562 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: srcpart name: srcpart - pfile:/data/users/sdong/www/hive-trunk/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 Partition base file name: hr=12 input format: org.apache.hadoop.mapred.TextInputFormat @@ -136,13 +136,13 @@ columns.types string: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/srcpart + location pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 name srcpart partition_columns ds/hr serialization.ddl struct srcpart { string key, string value} serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe - transient_lastDdlTime 1288389287 + transient_lastDdlTime 1296762562 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe input format: org.apache.hadoop.mapred.TextInputFormat @@ -153,13 +153,13 @@ columns.types string: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/srcpart + location pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcpart name srcpart partition_columns ds/hr serialization.ddl struct srcpart { string key, string value} serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe - transient_lastDdlTime 1288389287 + transient_lastDdlTime 1296762562 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: srcpart name: srcpart @@ -171,14 +171,14 @@ Move Operator files: hdfs directory: true - source: pfile:/data/users/sdong/www/hive-trunk/build/ql/scratchdir/hive_2010-10-29_16-22-05_968_3706327449059726358/-ext-10002 - destination: pfile:/data/users/sdong/www/hive-trunk/build/ql/scratchdir/hive_2010-10-29_16-22-05_968_3706327449059726358/-ext-10000 + source: pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-03_11-49-31_456_2816292350579044006/-ext-10002 + destination: pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-03_11-49-31_456_2816292350579044006/-ext-10000 Stage: Stage-0 Move Operator tables: replace: true - source: pfile:/data/users/sdong/www/hive-trunk/build/ql/scratchdir/hive_2010-10-29_16-22-05_968_3706327449059726358/-ext-10000 + source: pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-03_11-49-31_456_2816292350579044006/-ext-10000 table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -188,28 +188,28 @@ columns.types string:string:string: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/tmptable + location pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/tmptable name tmptable serialization.ddl struct tmptable { string key, string value, string hr, string ds} serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe - transient_lastDdlTime 1288394525 + transient_lastDdlTime 1296762571 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: tmptable - tmp directory: pfile:/data/users/sdong/www/hive-trunk/build/ql/scratchdir/hive_2010-10-29_16-22-05_968_3706327449059726358/-ext-10001 + tmp directory: pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-03_11-49-31_456_2816292350579044006/-ext-10001 Stage: Stage-2 Stats-Aggr Operator - Stats Aggregation Key Prefix: pfile:/data/users/sdong/www/hive-trunk/build/ql/scratchdir/hive_2010-10-29_16-22-05_968_3706327449059726358/-ext-10000/ + Stats Aggregation Key Prefix: pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-03_11-49-31_456_2816292350579044006/-ext-10000/ Stage: Stage-3 Map Reduce Alias -> Map Operator Tree: - pfile:/data/users/sdong/www/hive-trunk/build/ql/scratchdir/hive_2010-10-29_16-22-05_968_3706327449059726358/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-03_11-49-31_456_2816292350579044006/-ext-10002 File Output Operator compressed: false GlobalTableId: 0 - directory: pfile:/data/users/sdong/www/hive-trunk/build/ql/scratchdir/hive_2010-10-29_16-22-05_968_3706327449059726358/-ext-10000 + directory: pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-03_11-49-31_456_2816292350579044006/-ext-10000 NumFilesPerFileSink: 1 table: input format: org.apache.hadoop.mapred.TextInputFormat @@ -220,12 +220,12 @@ columns.types string:string:string: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/tmptable + location pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/tmptable name tmptable serialization.ddl struct tmptable { string key, string value, string hr, string ds} serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe - transient_lastDdlTime 1288394525 + transient_lastDdlTime 1296762571 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: tmptable TotalFiles: 1 @@ -233,9 +233,9 @@ MultiFileSpray: false Needs Tagging: false Path -> Alias: - pfile:/data/users/sdong/www/hive-trunk/build/ql/scratchdir/hive_2010-10-29_16-22-05_968_3706327449059726358/-ext-10002 [pfile:/data/users/sdong/www/hive-trunk/build/ql/scratchdir/hive_2010-10-29_16-22-05_968_3706327449059726358/-ext-10002] + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-03_11-49-31_456_2816292350579044006/-ext-10002 [pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-03_11-49-31_456_2816292350579044006/-ext-10002] Path -> Partition: - pfile:/data/users/sdong/www/hive-trunk/build/ql/scratchdir/hive_2010-10-29_16-22-05_968_3706327449059726358/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-03_11-49-31_456_2816292350579044006/-ext-10002 Partition base file name: -ext-10002 input format: org.apache.hadoop.mapred.TextInputFormat @@ -246,12 +246,12 @@ columns.types string:string:string: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/tmptable + location pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/tmptable name tmptable serialization.ddl struct tmptable { string key, string value, string hr, string ds} serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe - transient_lastDdlTime 1288394525 + transient_lastDdlTime 1296762571 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe input format: org.apache.hadoop.mapred.TextInputFormat @@ -262,12 +262,12 @@ columns.types string:string:string: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/tmptable + location pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/tmptable name tmptable serialization.ddl struct tmptable { string key, string value, string hr, string ds} serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe - transient_lastDdlTime 1288394525 + transient_lastDdlTime 1296762571 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: tmptable name: tmptable @@ -292,124 +292,128 @@ PREHOOK: query: select * from tmptable x sort by x.key,x.value,x.ds,x.hr PREHOOK: type: QUERY PREHOOK: Input: default@tmptable -PREHOOK: Output: file:/tmp/sdong/hive_2010-10-29_16-22-14_374_3621363072564055777/-mr-10000 +PREHOOK: Output: file:/tmp/njain/hive_2011-02-03_11-49-37_501_3000043998617029956/-mr-10000 POSTHOOK: query: select * from tmptable x sort by x.key,x.value,x.ds,x.hr POSTHOOK: type: QUERY POSTHOOK: Input: default@tmptable -POSTHOOK: Output: file:/tmp/sdong/hive_2010-10-29_16-22-14_374_3621363072564055777/-mr-10000 +POSTHOOK: Output: file:/tmp/njain/hive_2011-02-03_11-49-37_501_3000043998617029956/-mr-10000 POSTHOOK: Lineage: tmptable.ds SIMPLE [(srcpart)a.FieldSchema(name:hr, type:string, comment:null), ] POSTHOOK: Lineage: tmptable.hr SIMPLE [(srcpart)a.FieldSchema(name:ds, type:string, comment:null), ] POSTHOOK: Lineage: tmptable.key SIMPLE [(srcpart)a.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: tmptable.value SIMPLE [(srcpart)a.FieldSchema(name:value, type:string, comment:default), ] 103 val_103 2008-04-08 11 -103 val_103 2008-04-08 12 +118 val_118 2008-04-08 12 +119 val_119 2008-04-08 12 +119 val_119 2008-04-08 12 +126 val_126 2008-04-08 12 +131 val_131 2008-04-08 12 133 val_133 2008-04-08 11 -133 val_133 2008-04-08 12 134 val_134 2008-04-08 11 -134 val_134 2008-04-08 12 138 val_138 2008-04-08 11 -138 val_138 2008-04-08 12 +143 val_143 2008-04-08 12 152 val_152 2008-04-08 11 -152 val_152 2008-04-08 12 153 val_153 2008-04-08 11 -153 val_153 2008-04-08 12 +162 val_162 2008-04-08 12 169 val_169 2008-04-08 11 -169 val_169 2008-04-08 12 170 val_170 2008-04-08 11 -170 val_170 2008-04-08 12 +175 val_175 2008-04-08 12 176 val_176 2008-04-08 11 176 val_176 2008-04-08 11 -176 val_176 2008-04-08 12 -176 val_176 2008-04-08 12 18 val_18 2008-04-08 11 18 val_18 2008-04-08 12 +191 val_191 2008-04-08 12 197 val_197 2008-04-08 11 -197 val_197 2008-04-08 12 199 val_199 2008-04-08 11 -199 val_199 2008-04-08 12 +200 val_200 2008-04-08 12 +201 val_201 2008-04-08 12 202 val_202 2008-04-08 11 -202 val_202 2008-04-08 12 203 val_203 2008-04-08 11 -203 val_203 2008-04-08 12 209 val_209 2008-04-08 11 -209 val_209 2008-04-08 12 +214 val_214 2008-04-08 12 217 val_217 2008-04-08 11 -217 val_217 2008-04-08 12 +218 val_218 2008-04-08 12 221 val_221 2008-04-08 11 -221 val_221 2008-04-08 12 +223 val_223 2008-04-08 12 224 val_224 2008-04-08 11 -224 val_224 2008-04-08 12 +229 val_229 2008-04-08 12 +230 val_230 2008-04-08 12 233 val_233 2008-04-08 11 233 val_233 2008-04-08 12 +237 val_237 2008-04-08 12 +238 val_238 2008-04-08 12 +256 val_256 2008-04-08 12 26 val_26 2008-04-08 11 -26 val_26 2008-04-08 12 +265 val_265 2008-04-08 12 +273 val_273 2008-04-08 12 277 val_277 2008-04-08 11 277 val_277 2008-04-08 12 +280 val_280 2008-04-08 12 +286 val_286 2008-04-08 12 288 val_288 2008-04-08 11 -288 val_288 2008-04-08 12 298 val_298 2008-04-08 11 -298 val_298 2008-04-08 12 309 val_309 2008-04-08 11 309 val_309 2008-04-08 12 310 val_310 2008-04-08 11 -310 val_310 2008-04-08 12 317 val_317 2008-04-08 11 -317 val_317 2008-04-08 12 +322 val_322 2008-04-08 12 +323 val_323 2008-04-08 12 +325 val_325 2008-04-08 12 331 val_331 2008-04-08 11 -331 val_331 2008-04-08 12 +332 val_332 2008-04-08 12 336 val_336 2008-04-08 11 336 val_336 2008-04-08 12 +339 val_339 2008-04-08 12 +341 val_341 2008-04-08 12 +342 val_342 2008-04-08 12 348 val_348 2008-04-08 11 348 val_348 2008-04-08 12 +35 val_35 2008-04-08 12 +364 val_364 2008-04-08 12 37 val_37 2008-04-08 11 -37 val_37 2008-04-08 12 378 val_378 2008-04-08 11 -378 val_378 2008-04-08 12 384 val_384 2008-04-08 11 -384 val_384 2008-04-08 12 389 val_389 2008-04-08 11 -389 val_389 2008-04-08 12 400 val_400 2008-04-08 11 -400 val_400 2008-04-08 12 +403 val_403 2008-04-08 12 +407 val_407 2008-04-08 12 409 val_409 2008-04-08 11 -409 val_409 2008-04-08 12 +417 val_417 2008-04-08 12 42 val_42 2008-04-08 11 -42 val_42 2008-04-08 12 +424 val_424 2008-04-08 12 429 val_429 2008-04-08 11 429 val_429 2008-04-08 12 +430 val_430 2008-04-08 12 431 val_431 2008-04-08 11 -431 val_431 2008-04-08 12 +432 val_432 2008-04-08 12 44 val_44 2008-04-08 11 -44 val_44 2008-04-08 12 453 val_453 2008-04-08 11 -453 val_453 2008-04-08 12 454 val_454 2008-04-08 11 -454 val_454 2008-04-08 12 457 val_457 2008-04-08 11 457 val_457 2008-04-08 12 458 val_458 2008-04-08 11 -458 val_458 2008-04-08 12 +466 val_466 2008-04-08 12 467 val_467 2008-04-08 11 -467 val_467 2008-04-08 12 469 val_469 2008-04-08 11 469 val_469 2008-04-08 11 469 val_469 2008-04-08 11 -469 val_469 2008-04-08 12 -469 val_469 2008-04-08 12 -469 val_469 2008-04-08 12 +47 val_47 2008-04-08 12 +470 val_470 2008-04-08 12 489 val_489 2008-04-08 11 -489 val_489 2008-04-08 12 491 val_491 2008-04-08 11 -491 val_491 2008-04-08 12 +496 val_496 2008-04-08 12 498 val_498 2008-04-08 11 498 val_498 2008-04-08 12 51 val_51 2008-04-08 11 -51 val_51 2008-04-08 12 +58 val_58 2008-04-08 12 70 val_70 2008-04-08 11 -70 val_70 2008-04-08 12 +72 val_72 2008-04-08 12 74 val_74 2008-04-08 11 -74 val_74 2008-04-08 12 77 val_77 2008-04-08 11 77 val_77 2008-04-08 12 78 val_78 2008-04-08 11 -78 val_78 2008-04-08 12 +82 val_82 2008-04-08 12 +87 val_87 2008-04-08 12 +90 val_90 2008-04-08 12 +97 val_97 2008-04-08 12 +97 val_97 2008-04-08 12 +98 val_98 2008-04-08 12 Index: ql/src/test/results/clientpositive/partition_wise_fileformat7.q.out =================================================================== --- ql/src/test/results/clientpositive/partition_wise_fileformat7.q.out (revision 0) +++ ql/src/test/results/clientpositive/partition_wise_fileformat7.q.out (revision 0) @@ -0,0 +1,49 @@ +PREHOOK: query: create table partition_test_partitioned(key string, value string) partitioned by (dt string) +PREHOOK: type: CREATETABLE +POSTHOOK: query: create table partition_test_partitioned(key string, value string) partitioned by (dt string) +POSTHOOK: type: CREATETABLE +POSTHOOK: Output: default@partition_test_partitioned +PREHOOK: query: alter table partition_test_partitioned set fileformat rcfile +PREHOOK: type: ALTERTABLE_FILEFORMAT +PREHOOK: Input: default@partition_test_partitioned +PREHOOK: Output: default@partition_test_partitioned +POSTHOOK: query: alter table partition_test_partitioned set fileformat rcfile +POSTHOOK: type: ALTERTABLE_FILEFORMAT +POSTHOOK: Input: default@partition_test_partitioned +POSTHOOK: Output: default@partition_test_partitioned +PREHOOK: query: insert overwrite table partition_test_partitioned partition(dt=101) select * from src1 +PREHOOK: type: QUERY +PREHOOK: Input: default@src1 +PREHOOK: Output: default@partition_test_partitioned@dt=101 +POSTHOOK: query: insert overwrite table partition_test_partitioned partition(dt=101) select * from src1 +POSTHOOK: type: QUERY +POSTHOOK: Input: default@src1 +POSTHOOK: Output: default@partition_test_partitioned@dt=101 +POSTHOOK: Lineage: partition_test_partitioned PARTITION(dt=101).key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ] +POSTHOOK: Lineage: partition_test_partitioned PARTITION(dt=101).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] +PREHOOK: query: select count(1) from partition_test_partitioned a join partition_test_partitioned b on a.key = b.key +where a.dt = '101' and b.dt = '101' +PREHOOK: type: QUERY +PREHOOK: Input: default@partition_test_partitioned@dt=101 +PREHOOK: Output: file:/tmp/njain/hive_2011-02-02_15-45-22_412_8167802428528151380/-mr-10000 +POSTHOOK: query: select count(1) from partition_test_partitioned a join partition_test_partitioned b on a.key = b.key +where a.dt = '101' and b.dt = '101' +POSTHOOK: type: QUERY +POSTHOOK: Input: default@partition_test_partitioned@dt=101 +POSTHOOK: Output: file:/tmp/njain/hive_2011-02-02_15-45-22_412_8167802428528151380/-mr-10000 +POSTHOOK: Lineage: partition_test_partitioned PARTITION(dt=101).key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ] +POSTHOOK: Lineage: partition_test_partitioned PARTITION(dt=101).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] +115 +PREHOOK: query: select count(1) from partition_test_partitioned a join partition_test_partitioned b on a.key = b.key +where a.dt = '101' and b.dt = '101' and a.key < 100 +PREHOOK: type: QUERY +PREHOOK: Input: default@partition_test_partitioned@dt=101 +PREHOOK: Output: file:/tmp/njain/hive_2011-02-02_15-45-28_424_5032685511472669327/-mr-10000 +POSTHOOK: query: select count(1) from partition_test_partitioned a join partition_test_partitioned b on a.key = b.key +where a.dt = '101' and b.dt = '101' and a.key < 100 +POSTHOOK: type: QUERY +POSTHOOK: Input: default@partition_test_partitioned@dt=101 +POSTHOOK: Output: file:/tmp/njain/hive_2011-02-02_15-45-28_424_5032685511472669327/-mr-10000 +POSTHOOK: Lineage: partition_test_partitioned PARTITION(dt=101).key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ] +POSTHOOK: Lineage: partition_test_partitioned PARTITION(dt=101).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] +2 Index: ql/src/test/results/compiler/plan/input2.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input2.q.xml (revision 1067253) +++ ql/src/test/results/compiler/plan/input2.q.xml (working copy) @@ -33,7 +33,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-19_525_3908040901193805029/-ext-10000/ + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-47_535_2971635271324102182/-ext-10000/ @@ -73,7 +73,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-19_525_3908040901193805029/-ext-10006 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-47_535_2971635271324102182/-ext-10006 @@ -82,7 +82,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-19_525_3908040901193805029/-ext-10000 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-47_535_2971635271324102182/-ext-10000 1 @@ -134,7 +134,7 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/dest1 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/dest1 file.outputformat @@ -142,7 +142,7 @@ transient_lastDdlTime - 1294989139 + 1296711347 @@ -253,16 +253,19 @@ org.apache.hadoop.hive.ql.io.CombineHiveInputFormat + + true + 0 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-19_525_3908040901193805029/-ext-10006 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-47_535_2971635271324102182/-ext-10006 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-19_525_3908040901193805029/-ext-10006 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-47_535_2971635271324102182/-ext-10006 @@ -271,7 +274,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-19_525_3908040901193805029/-ext-10006 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-47_535_2971635271324102182/-ext-10006 -ext-10006 @@ -325,11 +328,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/dest1 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1294989139 + 1296711347 @@ -379,13 +382,13 @@ true - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-19_525_3908040901193805029/-ext-10000 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-47_535_2971635271324102182/-ext-10000 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-19_525_3908040901193805029/-ext-10001 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-47_535_2971635271324102182/-ext-10001 @@ -406,10 +409,10 @@ true - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-19_525_3908040901193805029/-ext-10006 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-47_535_2971635271324102182/-ext-10006 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-19_525_3908040901193805029/-ext-10000 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-47_535_2971635271324102182/-ext-10000 @@ -435,7 +438,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-19_525_3908040901193805029/-ext-10006 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-47_535_2971635271324102182/-ext-10006 @@ -488,7 +491,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-19_525_3908040901193805029/-ext-10002/ + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-47_535_2971635271324102182/-ext-10002/ @@ -528,7 +531,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-19_525_3908040901193805029/-ext-10007 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-47_535_2971635271324102182/-ext-10007 @@ -537,7 +540,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-19_525_3908040901193805029/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-47_535_2971635271324102182/-ext-10002 1 @@ -589,7 +592,7 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/dest2 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/dest2 file.outputformat @@ -597,7 +600,7 @@ transient_lastDdlTime - 1294989139 + 1296711347 @@ -704,16 +707,19 @@ org.apache.hadoop.hive.ql.io.CombineHiveInputFormat + + true + 0 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-19_525_3908040901193805029/-ext-10007 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-47_535_2971635271324102182/-ext-10007 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-19_525_3908040901193805029/-ext-10007 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-47_535_2971635271324102182/-ext-10007 @@ -722,7 +728,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-19_525_3908040901193805029/-ext-10007 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-47_535_2971635271324102182/-ext-10007 -ext-10007 @@ -776,11 +782,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/dest2 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/dest2 transient_lastDdlTime - 1294989139 + 1296711347 @@ -830,13 +836,13 @@ true - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-19_525_3908040901193805029/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-47_535_2971635271324102182/-ext-10002 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-19_525_3908040901193805029/-ext-10003 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-47_535_2971635271324102182/-ext-10003 @@ -857,10 +863,10 @@ true - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-19_525_3908040901193805029/-ext-10007 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-47_535_2971635271324102182/-ext-10007 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-19_525_3908040901193805029/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-47_535_2971635271324102182/-ext-10002 @@ -886,7 +892,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-19_525_3908040901193805029/-ext-10007 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-47_535_2971635271324102182/-ext-10007 @@ -939,7 +945,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-19_525_3908040901193805029/-ext-10004/ + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-47_535_2971635271324102182/-ext-10004/ @@ -979,7 +985,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-19_525_3908040901193805029/-ext-10008 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-47_535_2971635271324102182/-ext-10008 @@ -988,7 +994,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-19_525_3908040901193805029/-ext-10004 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-47_535_2971635271324102182/-ext-10004 1 @@ -1044,7 +1050,7 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/dest3 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/dest3 file.outputformat @@ -1052,7 +1058,7 @@ transient_lastDdlTime - 1294989139 + 1296711347 @@ -1159,16 +1165,19 @@ org.apache.hadoop.hive.ql.io.CombineHiveInputFormat + + true + 0 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-19_525_3908040901193805029/-ext-10008 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-47_535_2971635271324102182/-ext-10008 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-19_525_3908040901193805029/-ext-10008 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-47_535_2971635271324102182/-ext-10008 @@ -1177,7 +1186,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-19_525_3908040901193805029/-ext-10008 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-47_535_2971635271324102182/-ext-10008 -ext-10008 @@ -1231,11 +1240,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/dest3 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/dest3 transient_lastDdlTime - 1294989139 + 1296711347 @@ -1294,13 +1303,13 @@ true - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-19_525_3908040901193805029/-ext-10004 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-47_535_2971635271324102182/-ext-10004 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-19_525_3908040901193805029/-ext-10005 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-47_535_2971635271324102182/-ext-10005 @@ -1321,10 +1330,10 @@ true - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-19_525_3908040901193805029/-ext-10008 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-47_535_2971635271324102182/-ext-10008 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-19_525_3908040901193805029/-ext-10004 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-47_535_2971635271324102182/-ext-10004 @@ -1350,7 +1359,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-19_525_3908040901193805029/-ext-10008 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-47_535_2971635271324102182/-ext-10008 @@ -1436,11 +1445,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1294989136 + 1296711344 @@ -1498,11 +1507,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1294989136 + 1296711344 @@ -1537,7 +1546,7 @@ 1 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-19_525_3908040901193805029/-ext-10006 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-47_535_2971635271324102182/-ext-10006 true @@ -1546,7 +1555,7 @@ 1 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-19_525_3908040901193805029/-ext-10000/ + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-47_535_2971635271324102182/-ext-10000/ @@ -1839,7 +1848,7 @@ 2 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-19_525_3908040901193805029/-ext-10007 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-47_535_2971635271324102182/-ext-10007 true @@ -1848,7 +1857,7 @@ 1 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-19_525_3908040901193805029/-ext-10002/ + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-47_535_2971635271324102182/-ext-10002/ @@ -2161,7 +2170,7 @@ 3 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-19_525_3908040901193805029/-ext-10008 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-47_535_2971635271324102182/-ext-10008 true @@ -2173,7 +2182,7 @@ ds=2008-04-08/hr=12/ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-19_525_3908040901193805029/-ext-10004/ + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-47_535_2971635271324102182/-ext-10004/ @@ -2511,7 +2520,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src src @@ -2523,7 +2532,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src src @@ -2580,11 +2589,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1294989136 + 1296711344 @@ -2642,11 +2651,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1294989136 + 1296711344 Index: ql/src/test/results/compiler/plan/input3.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input3.q.xml (revision 1067253) +++ ql/src/test/results/compiler/plan/input3.q.xml (working copy) @@ -33,7 +33,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-42_016_8141772010937394934/-ext-10000/ + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-07_901_8898953280149754103/-ext-10000/ @@ -73,7 +73,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-42_016_8141772010937394934/-ext-10007 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-07_901_8898953280149754103/-ext-10007 @@ -82,7 +82,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-42_016_8141772010937394934/-ext-10000 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-07_901_8898953280149754103/-ext-10000 1 @@ -134,7 +134,7 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/dest1 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/dest1 file.outputformat @@ -142,7 +142,7 @@ transient_lastDdlTime - 1294989161 + 1296711367 @@ -253,16 +253,19 @@ org.apache.hadoop.hive.ql.io.CombineHiveInputFormat + + true + 0 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-42_016_8141772010937394934/-ext-10007 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-07_901_8898953280149754103/-ext-10007 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-42_016_8141772010937394934/-ext-10007 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-07_901_8898953280149754103/-ext-10007 @@ -271,7 +274,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-42_016_8141772010937394934/-ext-10007 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-07_901_8898953280149754103/-ext-10007 -ext-10007 @@ -325,11 +328,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/dest1 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1294989161 + 1296711367 @@ -379,13 +382,13 @@ true - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-42_016_8141772010937394934/-ext-10000 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-07_901_8898953280149754103/-ext-10000 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-42_016_8141772010937394934/-ext-10001 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-07_901_8898953280149754103/-ext-10001 @@ -406,10 +409,10 @@ true - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-42_016_8141772010937394934/-ext-10007 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-07_901_8898953280149754103/-ext-10007 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-42_016_8141772010937394934/-ext-10000 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-07_901_8898953280149754103/-ext-10000 @@ -435,7 +438,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-42_016_8141772010937394934/-ext-10007 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-07_901_8898953280149754103/-ext-10007 @@ -488,7 +491,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-42_016_8141772010937394934/-ext-10002/ + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-07_901_8898953280149754103/-ext-10002/ @@ -528,7 +531,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-42_016_8141772010937394934/-ext-10008 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-07_901_8898953280149754103/-ext-10008 @@ -537,7 +540,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-42_016_8141772010937394934/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-07_901_8898953280149754103/-ext-10002 1 @@ -589,7 +592,7 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/dest2 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/dest2 file.outputformat @@ -597,7 +600,7 @@ transient_lastDdlTime - 1294989161 + 1296711367 @@ -704,16 +707,19 @@ org.apache.hadoop.hive.ql.io.CombineHiveInputFormat + + true + 0 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-42_016_8141772010937394934/-ext-10008 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-07_901_8898953280149754103/-ext-10008 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-42_016_8141772010937394934/-ext-10008 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-07_901_8898953280149754103/-ext-10008 @@ -722,7 +728,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-42_016_8141772010937394934/-ext-10008 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-07_901_8898953280149754103/-ext-10008 -ext-10008 @@ -776,11 +782,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/dest2 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/dest2 transient_lastDdlTime - 1294989161 + 1296711367 @@ -830,13 +836,13 @@ true - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-42_016_8141772010937394934/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-07_901_8898953280149754103/-ext-10002 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-42_016_8141772010937394934/-ext-10003 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-07_901_8898953280149754103/-ext-10003 @@ -857,10 +863,10 @@ true - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-42_016_8141772010937394934/-ext-10008 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-07_901_8898953280149754103/-ext-10008 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-42_016_8141772010937394934/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-07_901_8898953280149754103/-ext-10002 @@ -886,7 +892,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-42_016_8141772010937394934/-ext-10008 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-07_901_8898953280149754103/-ext-10008 @@ -939,7 +945,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-42_016_8141772010937394934/-ext-10004/ + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-07_901_8898953280149754103/-ext-10004/ @@ -979,7 +985,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-42_016_8141772010937394934/-ext-10009 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-07_901_8898953280149754103/-ext-10009 @@ -988,7 +994,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-42_016_8141772010937394934/-ext-10004 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-07_901_8898953280149754103/-ext-10004 1 @@ -1044,7 +1050,7 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/dest3 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/dest3 file.outputformat @@ -1052,7 +1058,7 @@ transient_lastDdlTime - 1294989161 + 1296711367 @@ -1159,16 +1165,19 @@ org.apache.hadoop.hive.ql.io.CombineHiveInputFormat + + true + 0 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-42_016_8141772010937394934/-ext-10009 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-07_901_8898953280149754103/-ext-10009 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-42_016_8141772010937394934/-ext-10009 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-07_901_8898953280149754103/-ext-10009 @@ -1177,7 +1186,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-42_016_8141772010937394934/-ext-10009 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-07_901_8898953280149754103/-ext-10009 -ext-10009 @@ -1231,11 +1240,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/dest3 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/dest3 transient_lastDdlTime - 1294989161 + 1296711367 @@ -1294,13 +1303,13 @@ true - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-42_016_8141772010937394934/-ext-10004 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-07_901_8898953280149754103/-ext-10004 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-42_016_8141772010937394934/-ext-10005 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-07_901_8898953280149754103/-ext-10005 @@ -1321,10 +1330,10 @@ true - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-42_016_8141772010937394934/-ext-10009 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-07_901_8898953280149754103/-ext-10009 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-42_016_8141772010937394934/-ext-10004 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-07_901_8898953280149754103/-ext-10004 @@ -1350,7 +1359,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-42_016_8141772010937394934/-ext-10009 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-07_901_8898953280149754103/-ext-10009 @@ -1411,7 +1420,7 @@ - file:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-42_016_8141772010937394934/-ext-10010 + file:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-07_901_8898953280149754103/-ext-10010 @@ -1420,7 +1429,7 @@ - file:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-42_016_8141772010937394934/-ext-10006 + file:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-07_901_8898953280149754103/-ext-10006 1 @@ -1539,16 +1548,19 @@ org.apache.hadoop.hive.ql.io.CombineHiveInputFormat + + true + 0 - file:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-42_016_8141772010937394934/-ext-10010 + file:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-07_901_8898953280149754103/-ext-10010 - file:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-42_016_8141772010937394934/-ext-10010 + file:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-07_901_8898953280149754103/-ext-10010 @@ -1557,7 +1569,7 @@ - file:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-42_016_8141772010937394934/-ext-10010 + file:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-07_901_8898953280149754103/-ext-10010 -ext-10010 @@ -1630,7 +1642,7 @@ true - file:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-42_016_8141772010937394934/-ext-10006 + file:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-07_901_8898953280149754103/-ext-10006 ../../../../build/contrib/hive/ql/test/data/warehouse/dest4.out @@ -1654,10 +1666,10 @@ true - file:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-42_016_8141772010937394934/-ext-10010 + file:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-07_901_8898953280149754103/-ext-10010 - file:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-42_016_8141772010937394934/-ext-10006 + file:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-07_901_8898953280149754103/-ext-10006 @@ -1683,7 +1695,7 @@ - file:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-42_016_8141772010937394934/-ext-10010 + file:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-07_901_8898953280149754103/-ext-10010 @@ -1769,11 +1781,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1294989159 + 1296711365 @@ -1831,11 +1843,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1294989159 + 1296711365 @@ -1870,7 +1882,7 @@ 1 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-42_016_8141772010937394934/-ext-10007 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-07_901_8898953280149754103/-ext-10007 true @@ -1879,7 +1891,7 @@ 1 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-42_016_8141772010937394934/-ext-10000/ + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-07_901_8898953280149754103/-ext-10000/ @@ -2172,7 +2184,7 @@ 2 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-42_016_8141772010937394934/-ext-10008 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-07_901_8898953280149754103/-ext-10008 true @@ -2181,7 +2193,7 @@ 1 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-42_016_8141772010937394934/-ext-10002/ + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-07_901_8898953280149754103/-ext-10002/ @@ -2494,7 +2506,7 @@ 3 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-42_016_8141772010937394934/-ext-10009 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-07_901_8898953280149754103/-ext-10009 true @@ -2506,7 +2518,7 @@ ds=2008-04-08/hr=12/ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-42_016_8141772010937394934/-ext-10004/ + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-07_901_8898953280149754103/-ext-10004/ @@ -2810,13 +2822,13 @@ 4 - file:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-42_016_8141772010937394934/-ext-10010 + file:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-07_901_8898953280149754103/-ext-10010 1 - file:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-42_016_8141772010937394934/-ext-10006/ + file:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-07_901_8898953280149754103/-ext-10006/ @@ -3133,7 +3145,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src src @@ -3145,7 +3157,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src src @@ -3202,11 +3214,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1294989159 + 1296711365 @@ -3264,11 +3276,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1294989159 + 1296711365 Index: ql/src/test/results/compiler/plan/input6.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input6.q.xml (revision 1067253) +++ ql/src/test/results/compiler/plan/input6.q.xml (working copy) @@ -33,7 +33,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-13-16_481_7780196748255829580/-ext-10000/ + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-38_920_3171581459138360865/-ext-10000/ @@ -73,7 +73,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-13-16_481_7780196748255829580/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-38_920_3171581459138360865/-ext-10002 @@ -82,7 +82,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-13-16_481_7780196748255829580/-ext-10000 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-38_920_3171581459138360865/-ext-10000 1 @@ -134,7 +134,7 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/dest1 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/dest1 file.outputformat @@ -142,7 +142,7 @@ transient_lastDdlTime - 1294989196 + 1296711398 @@ -253,16 +253,19 @@ org.apache.hadoop.hive.ql.io.CombineHiveInputFormat + + true + 0 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-13-16_481_7780196748255829580/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-38_920_3171581459138360865/-ext-10002 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-13-16_481_7780196748255829580/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-38_920_3171581459138360865/-ext-10002 @@ -271,7 +274,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-13-16_481_7780196748255829580/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-38_920_3171581459138360865/-ext-10002 -ext-10002 @@ -325,11 +328,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/dest1 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1294989196 + 1296711398 @@ -379,13 +382,13 @@ true - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-13-16_481_7780196748255829580/-ext-10000 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-38_920_3171581459138360865/-ext-10000 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-13-16_481_7780196748255829580/-ext-10001 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-38_920_3171581459138360865/-ext-10001 @@ -406,10 +409,10 @@ true - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-13-16_481_7780196748255829580/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-38_920_3171581459138360865/-ext-10002 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-13-16_481_7780196748255829580/-ext-10000 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-38_920_3171581459138360865/-ext-10000 @@ -435,7 +438,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-13-16_481_7780196748255829580/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-38_920_3171581459138360865/-ext-10002 @@ -521,11 +524,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src1 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src1 transient_lastDdlTime - 1294989194 + 1296711396 @@ -583,11 +586,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src1 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src1 transient_lastDdlTime - 1294989194 + 1296711396 @@ -626,7 +629,7 @@ 1 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-13-16_481_7780196748255829580/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-38_920_3171581459138360865/-ext-10002 true @@ -635,7 +638,7 @@ 1 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-13-16_481_7780196748255829580/-ext-10000/ + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-38_920_3171581459138360865/-ext-10000/ @@ -1064,7 +1067,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src1 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src1 src1 @@ -1076,7 +1079,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src1 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src1 src1 @@ -1133,11 +1136,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src1 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src1 transient_lastDdlTime - 1294989194 + 1296711396 @@ -1195,11 +1198,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src1 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src1 transient_lastDdlTime - 1294989194 + 1296711396 Index: ql/src/test/results/compiler/plan/input7.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input7.q.xml (revision 1067253) +++ ql/src/test/results/compiler/plan/input7.q.xml (working copy) @@ -33,7 +33,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-13-28_196_7460295757703531049/-ext-10000/ + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-49_185_2005058264018621164/-ext-10000/ @@ -73,7 +73,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-13-28_196_7460295757703531049/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-49_185_2005058264018621164/-ext-10002 @@ -82,7 +82,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-13-28_196_7460295757703531049/-ext-10000 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-49_185_2005058264018621164/-ext-10000 1 @@ -134,7 +134,7 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/dest1 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/dest1 file.outputformat @@ -142,7 +142,7 @@ transient_lastDdlTime - 1294989207 + 1296711408 @@ -253,16 +253,19 @@ org.apache.hadoop.hive.ql.io.CombineHiveInputFormat + + true + 0 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-13-28_196_7460295757703531049/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-49_185_2005058264018621164/-ext-10002 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-13-28_196_7460295757703531049/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-49_185_2005058264018621164/-ext-10002 @@ -271,7 +274,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-13-28_196_7460295757703531049/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-49_185_2005058264018621164/-ext-10002 -ext-10002 @@ -325,11 +328,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/dest1 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1294989207 + 1296711408 @@ -379,13 +382,13 @@ true - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-13-28_196_7460295757703531049/-ext-10000 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-49_185_2005058264018621164/-ext-10000 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-13-28_196_7460295757703531049/-ext-10001 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-49_185_2005058264018621164/-ext-10001 @@ -406,10 +409,10 @@ true - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-13-28_196_7460295757703531049/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-49_185_2005058264018621164/-ext-10002 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-13-28_196_7460295757703531049/-ext-10000 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-49_185_2005058264018621164/-ext-10000 @@ -435,7 +438,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-13-28_196_7460295757703531049/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-49_185_2005058264018621164/-ext-10002 @@ -521,11 +524,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src1 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src1 transient_lastDdlTime - 1294989205 + 1296711407 @@ -583,11 +586,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src1 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src1 transient_lastDdlTime - 1294989205 + 1296711407 @@ -618,7 +621,7 @@ 1 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-13-28_196_7460295757703531049/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-49_185_2005058264018621164/-ext-10002 true @@ -627,7 +630,7 @@ 1 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-13-28_196_7460295757703531049/-ext-10000/ + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-36-49_185_2005058264018621164/-ext-10000/ @@ -901,7 +904,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src1 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src1 src1 @@ -913,7 +916,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src1 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src1 src1 @@ -970,11 +973,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src1 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src1 transient_lastDdlTime - 1294989205 + 1296711407 @@ -1032,11 +1035,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src1 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src1 transient_lastDdlTime - 1294989205 + 1296711407 Index: ql/src/test/results/compiler/plan/input_testsequencefile.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input_testsequencefile.q.xml (revision 1067253) +++ ql/src/test/results/compiler/plan/input_testsequencefile.q.xml (working copy) @@ -33,7 +33,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-14-15_701_7250782905457084545/-ext-10000/ + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-37-30_337_933193628740514624/-ext-10000/ @@ -73,7 +73,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-14-15_701_7250782905457084545/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-37-30_337_933193628740514624/-ext-10002 @@ -82,7 +82,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-14-15_701_7250782905457084545/-ext-10000 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-37-30_337_933193628740514624/-ext-10000 1 @@ -134,7 +134,7 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/dest4_sequencefile + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/dest4_sequencefile file.outputformat @@ -142,7 +142,7 @@ transient_lastDdlTime - 1294989255 + 1296711450 @@ -253,16 +253,19 @@ org.apache.hadoop.hive.ql.io.CombineHiveInputFormat + + true + 0 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-14-15_701_7250782905457084545/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-37-30_337_933193628740514624/-ext-10002 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-14-15_701_7250782905457084545/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-37-30_337_933193628740514624/-ext-10002 @@ -271,7 +274,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-14-15_701_7250782905457084545/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-37-30_337_933193628740514624/-ext-10002 -ext-10002 @@ -325,11 +328,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/dest4_sequencefile + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/dest4_sequencefile transient_lastDdlTime - 1294989255 + 1296711450 @@ -379,13 +382,13 @@ true - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-14-15_701_7250782905457084545/-ext-10000 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-37-30_337_933193628740514624/-ext-10000 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-14-15_701_7250782905457084545/-ext-10001 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-37-30_337_933193628740514624/-ext-10001 @@ -406,10 +409,10 @@ true - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-14-15_701_7250782905457084545/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-37-30_337_933193628740514624/-ext-10002 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-14-15_701_7250782905457084545/-ext-10000 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-37-30_337_933193628740514624/-ext-10000 @@ -435,7 +438,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-14-15_701_7250782905457084545/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-37-30_337_933193628740514624/-ext-10002 @@ -521,11 +524,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1294989252 + 1296711447 @@ -583,11 +586,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1294989252 + 1296711447 @@ -618,7 +621,7 @@ 1 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-14-15_701_7250782905457084545/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-37-30_337_933193628740514624/-ext-10002 true @@ -627,7 +630,7 @@ 1 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-14-15_701_7250782905457084545/-ext-10000/ + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-37-30_337_933193628740514624/-ext-10000/ @@ -909,7 +912,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src src @@ -921,7 +924,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src src @@ -978,11 +981,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1294989252 + 1296711447 @@ -1040,11 +1043,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1294989252 + 1296711447 Index: ql/src/test/results/compiler/plan/input9.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input9.q.xml (revision 1067253) +++ ql/src/test/results/compiler/plan/input9.q.xml (working copy) @@ -33,7 +33,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-13-51_486_7275790306322879338/-ext-10000/ + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-37-09_810_1261152760696241806/-ext-10000/ @@ -73,7 +73,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-13-51_486_7275790306322879338/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-37-09_810_1261152760696241806/-ext-10002 @@ -82,7 +82,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-13-51_486_7275790306322879338/-ext-10000 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-37-09_810_1261152760696241806/-ext-10000 1 @@ -134,7 +134,7 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/dest1 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/dest1 file.outputformat @@ -142,7 +142,7 @@ transient_lastDdlTime - 1294989231 + 1296711429 @@ -253,16 +253,19 @@ org.apache.hadoop.hive.ql.io.CombineHiveInputFormat + + true + 0 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-13-51_486_7275790306322879338/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-37-09_810_1261152760696241806/-ext-10002 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-13-51_486_7275790306322879338/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-37-09_810_1261152760696241806/-ext-10002 @@ -271,7 +274,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-13-51_486_7275790306322879338/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-37-09_810_1261152760696241806/-ext-10002 -ext-10002 @@ -325,11 +328,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/dest1 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1294989231 + 1296711429 @@ -379,13 +382,13 @@ true - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-13-51_486_7275790306322879338/-ext-10000 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-37-09_810_1261152760696241806/-ext-10000 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-13-51_486_7275790306322879338/-ext-10001 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-37-09_810_1261152760696241806/-ext-10001 @@ -406,10 +409,10 @@ true - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-13-51_486_7275790306322879338/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-37-09_810_1261152760696241806/-ext-10002 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-13-51_486_7275790306322879338/-ext-10000 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-37-09_810_1261152760696241806/-ext-10000 @@ -435,7 +438,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-13-51_486_7275790306322879338/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-37-09_810_1261152760696241806/-ext-10002 @@ -521,11 +524,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src1 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src1 transient_lastDdlTime - 1294989229 + 1296711427 @@ -583,11 +586,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src1 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src1 transient_lastDdlTime - 1294989229 + 1296711427 @@ -626,7 +629,7 @@ 1 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-13-51_486_7275790306322879338/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-37-09_810_1261152760696241806/-ext-10002 true @@ -635,7 +638,7 @@ 1 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-13-51_486_7275790306322879338/-ext-10000/ + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-37-09_810_1261152760696241806/-ext-10000/ @@ -1055,7 +1058,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src1 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src1 src1 @@ -1067,7 +1070,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src1 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src1 src1 @@ -1124,11 +1127,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src1 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src1 transient_lastDdlTime - 1294989229 + 1296711427 @@ -1186,11 +1189,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src1 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src1 transient_lastDdlTime - 1294989229 + 1296711427 Index: ql/src/test/results/compiler/plan/union.q.xml =================================================================== --- ql/src/test/results/compiler/plan/union.q.xml (revision 1067253) +++ ql/src/test/results/compiler/plan/union.q.xml (working copy) @@ -41,7 +41,7 @@ - file:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-19-18_533_3818504713608055638/-ext-10001 + file:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-41-47_409_7384638659374812967/-ext-10001 @@ -50,7 +50,7 @@ - file:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-19-18_533_3818504713608055638/-ext-10000 + file:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-41-47_409_7384638659374812967/-ext-10000 1 @@ -186,16 +186,19 @@ org.apache.hadoop.hive.ql.io.CombineHiveInputFormat + + true + 0 - file:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-19-18_533_3818504713608055638/-ext-10001 + file:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-41-47_409_7384638659374812967/-ext-10001 - file:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-19-18_533_3818504713608055638/-ext-10001 + file:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-41-47_409_7384638659374812967/-ext-10001 @@ -204,7 +207,7 @@ - file:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-19-18_533_3818504713608055638/-ext-10001 + file:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-41-47_409_7384638659374812967/-ext-10001 -ext-10001 @@ -277,7 +280,7 @@ true - file:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-19-18_533_3818504713608055638/-ext-10000 + file:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-41-47_409_7384638659374812967/-ext-10000 ../build/ql/test/data/warehouse/union.out @@ -301,10 +304,10 @@ true - file:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-19-18_533_3818504713608055638/-ext-10001 + file:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-41-47_409_7384638659374812967/-ext-10001 - file:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-19-18_533_3818504713608055638/-ext-10000 + file:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-41-47_409_7384638659374812967/-ext-10000 @@ -330,7 +333,7 @@ - file:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-19-18_533_3818504713608055638/-ext-10001 + file:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-41-47_409_7384638659374812967/-ext-10001 @@ -416,11 +419,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1294989555 + 1296711704 @@ -478,11 +481,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1294989555 + 1296711704 @@ -548,11 +551,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1294989555 + 1296711704 @@ -610,11 +613,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1294989555 + 1296711704 @@ -661,13 +664,13 @@ 1 - file:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-19-18_533_3818504713608055638/-ext-10001 + file:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-41-47_409_7384638659374812967/-ext-10001 1 - file:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-19-18_533_3818504713608055638/-ext-10000/ + file:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-41-47_409_7384638659374812967/-ext-10000/ @@ -1711,7 +1714,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src null-subquery1:unioninput-subquery1:src @@ -1726,7 +1729,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src src @@ -1783,11 +1786,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1294989555 + 1296711704 @@ -1845,11 +1848,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1294989555 + 1296711704 Index: ql/src/test/results/compiler/plan/subq.q.xml =================================================================== --- ql/src/test/results/compiler/plan/subq.q.xml (revision 1067253) +++ ql/src/test/results/compiler/plan/subq.q.xml (working copy) @@ -41,7 +41,7 @@ - file:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-18-03_247_654820158118113924/-ext-10001 + file:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-40-40_152_2336998614782801356/-ext-10001 @@ -50,7 +50,7 @@ - file:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-18-03_247_654820158118113924/-ext-10000 + file:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-40-40_152_2336998614782801356/-ext-10000 1 @@ -186,16 +186,19 @@ org.apache.hadoop.hive.ql.io.CombineHiveInputFormat + + true + 0 - file:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-18-03_247_654820158118113924/-ext-10001 + file:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-40-40_152_2336998614782801356/-ext-10001 - file:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-18-03_247_654820158118113924/-ext-10001 + file:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-40-40_152_2336998614782801356/-ext-10001 @@ -204,7 +207,7 @@ - file:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-18-03_247_654820158118113924/-ext-10001 + file:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-40-40_152_2336998614782801356/-ext-10001 -ext-10001 @@ -277,7 +280,7 @@ true - file:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-18-03_247_654820158118113924/-ext-10000 + file:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-40-40_152_2336998614782801356/-ext-10000 ../build/ql/test/data/warehouse/union.out @@ -301,10 +304,10 @@ true - file:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-18-03_247_654820158118113924/-ext-10001 + file:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-40-40_152_2336998614782801356/-ext-10001 - file:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-18-03_247_654820158118113924/-ext-10000 + file:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-40-40_152_2336998614782801356/-ext-10000 @@ -330,7 +333,7 @@ - file:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-18-03_247_654820158118113924/-ext-10001 + file:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-40-40_152_2336998614782801356/-ext-10001 @@ -416,11 +419,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1294989480 + 1296711637 @@ -478,11 +481,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1294989480 + 1296711637 @@ -525,13 +528,13 @@ 1 - file:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-18-03_247_654820158118113924/-ext-10001 + file:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-40-40_152_2336998614782801356/-ext-10001 1 - file:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-18-03_247_654820158118113924/-ext-10000/ + file:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-40-40_152_2336998614782801356/-ext-10000/ @@ -1113,7 +1116,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src unioninput:src @@ -1125,7 +1128,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src src @@ -1182,11 +1185,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1294989480 + 1296711637 @@ -1244,11 +1247,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1294989480 + 1296711637 Index: ql/src/test/results/compiler/plan/case_sensitivity.q.xml =================================================================== --- ql/src/test/results/compiler/plan/case_sensitivity.q.xml (revision 1067253) +++ ql/src/test/results/compiler/plan/case_sensitivity.q.xml (working copy) @@ -33,7 +33,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-10-43_630_1872650018544863623/-ext-10000/ + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-34-17_263_3250513503747436594/-ext-10000/ @@ -73,7 +73,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-10-43_630_1872650018544863623/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-34-17_263_3250513503747436594/-ext-10002 @@ -82,7 +82,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-10-43_630_1872650018544863623/-ext-10000 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-34-17_263_3250513503747436594/-ext-10000 1 @@ -134,7 +134,7 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/dest1 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/dest1 file.outputformat @@ -142,7 +142,7 @@ transient_lastDdlTime - 1294989043 + 1296711256 @@ -253,16 +253,19 @@ org.apache.hadoop.hive.ql.io.CombineHiveInputFormat + + true + 0 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-10-43_630_1872650018544863623/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-34-17_263_3250513503747436594/-ext-10002 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-10-43_630_1872650018544863623/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-34-17_263_3250513503747436594/-ext-10002 @@ -271,7 +274,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-10-43_630_1872650018544863623/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-34-17_263_3250513503747436594/-ext-10002 -ext-10002 @@ -325,11 +328,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/dest1 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1294989043 + 1296711256 @@ -379,13 +382,13 @@ true - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-10-43_630_1872650018544863623/-ext-10000 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-34-17_263_3250513503747436594/-ext-10000 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-10-43_630_1872650018544863623/-ext-10001 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-34-17_263_3250513503747436594/-ext-10001 @@ -406,10 +409,10 @@ true - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-10-43_630_1872650018544863623/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-34-17_263_3250513503747436594/-ext-10002 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-10-43_630_1872650018544863623/-ext-10000 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-34-17_263_3250513503747436594/-ext-10000 @@ -435,7 +438,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-10-43_630_1872650018544863623/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-34-17_263_3250513503747436594/-ext-10002 @@ -525,11 +528,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src_thrift + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src_thrift transient_lastDdlTime - 1294989042 + 1296711256 @@ -591,11 +594,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src_thrift + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src_thrift transient_lastDdlTime - 1294989042 + 1296711256 @@ -634,7 +637,7 @@ 1 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-10-43_630_1872650018544863623/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-34-17_263_3250513503747436594/-ext-10002 true @@ -643,7 +646,7 @@ 1 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-10-43_630_1872650018544863623/-ext-10000/ + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-34-17_263_3250513503747436594/-ext-10000/ @@ -1297,7 +1300,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src_thrift + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src_thrift src_thrift @@ -1309,7 +1312,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src_thrift + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src_thrift src_thrift @@ -1370,11 +1373,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src_thrift + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src_thrift transient_lastDdlTime - 1294989042 + 1296711256 @@ -1436,11 +1439,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src_thrift + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src_thrift transient_lastDdlTime - 1294989042 + 1296711256 Index: ql/src/test/results/compiler/plan/sample2.q.xml =================================================================== --- ql/src/test/results/compiler/plan/sample2.q.xml (revision 1067253) +++ ql/src/test/results/compiler/plan/sample2.q.xml (working copy) @@ -33,7 +33,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-16-47_400_4545560280042684151/-ext-10000/ + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-39-36_897_4578906238300949872/-ext-10000/ @@ -73,7 +73,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-16-47_400_4545560280042684151/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-39-36_897_4578906238300949872/-ext-10002 @@ -82,7 +82,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-16-47_400_4545560280042684151/-ext-10000 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-39-36_897_4578906238300949872/-ext-10000 1 @@ -134,7 +134,7 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/dest1 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/dest1 file.outputformat @@ -142,7 +142,7 @@ transient_lastDdlTime - 1294989406 + 1296711576 @@ -253,16 +253,19 @@ org.apache.hadoop.hive.ql.io.CombineHiveInputFormat + + true + 0 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-16-47_400_4545560280042684151/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-39-36_897_4578906238300949872/-ext-10002 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-16-47_400_4545560280042684151/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-39-36_897_4578906238300949872/-ext-10002 @@ -271,7 +274,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-16-47_400_4545560280042684151/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-39-36_897_4578906238300949872/-ext-10002 -ext-10002 @@ -325,11 +328,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/dest1 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1294989406 + 1296711576 @@ -379,13 +382,13 @@ true - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-16-47_400_4545560280042684151/-ext-10000 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-39-36_897_4578906238300949872/-ext-10000 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-16-47_400_4545560280042684151/-ext-10001 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-39-36_897_4578906238300949872/-ext-10001 @@ -406,10 +409,10 @@ true - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-16-47_400_4545560280042684151/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-39-36_897_4578906238300949872/-ext-10002 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-16-47_400_4545560280042684151/-ext-10000 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-39-36_897_4578906238300949872/-ext-10000 @@ -435,7 +438,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-16-47_400_4545560280042684151/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-39-36_897_4578906238300949872/-ext-10002 @@ -525,11 +528,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1294989400 + 1296711570 @@ -591,11 +594,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1294989400 + 1296711570 @@ -634,7 +637,7 @@ 1 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-16-47_400_4545560280042684151/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-39-36_897_4578906238300949872/-ext-10002 true @@ -643,7 +646,7 @@ 1 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-16-47_400_4545560280042684151/-ext-10000/ + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-39-36_897_4578906238300949872/-ext-10000/ @@ -1269,7 +1272,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt s @@ -1281,7 +1284,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt srcbucket0.txt @@ -1342,11 +1345,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1294989400 + 1296711570 @@ -1408,11 +1411,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1294989400 + 1296711570 Index: ql/src/test/results/compiler/plan/sample3.q.xml =================================================================== --- ql/src/test/results/compiler/plan/sample3.q.xml (revision 1067253) +++ ql/src/test/results/compiler/plan/sample3.q.xml (working copy) @@ -33,7 +33,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-16-59_745_5346433325153496739/-ext-10000/ + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-39-47_353_7010187035856221735/-ext-10000/ @@ -73,7 +73,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-16-59_745_5346433325153496739/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-39-47_353_7010187035856221735/-ext-10002 @@ -82,7 +82,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-16-59_745_5346433325153496739/-ext-10000 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-39-47_353_7010187035856221735/-ext-10000 1 @@ -134,7 +134,7 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/dest1 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/dest1 file.outputformat @@ -142,7 +142,7 @@ transient_lastDdlTime - 1294989419 + 1296711586 @@ -253,16 +253,19 @@ org.apache.hadoop.hive.ql.io.CombineHiveInputFormat + + true + 0 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-16-59_745_5346433325153496739/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-39-47_353_7010187035856221735/-ext-10002 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-16-59_745_5346433325153496739/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-39-47_353_7010187035856221735/-ext-10002 @@ -271,7 +274,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-16-59_745_5346433325153496739/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-39-47_353_7010187035856221735/-ext-10002 -ext-10002 @@ -325,11 +328,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/dest1 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1294989419 + 1296711586 @@ -379,13 +382,13 @@ true - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-16-59_745_5346433325153496739/-ext-10000 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-39-47_353_7010187035856221735/-ext-10000 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-16-59_745_5346433325153496739/-ext-10001 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-39-47_353_7010187035856221735/-ext-10001 @@ -406,10 +409,10 @@ true - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-16-59_745_5346433325153496739/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-39-47_353_7010187035856221735/-ext-10002 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-16-59_745_5346433325153496739/-ext-10000 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-39-47_353_7010187035856221735/-ext-10000 @@ -435,7 +438,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-16-59_745_5346433325153496739/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-39-47_353_7010187035856221735/-ext-10002 @@ -525,11 +528,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1294989412 + 1296711581 @@ -591,11 +594,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1294989412 + 1296711581 @@ -634,7 +637,7 @@ 1 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-16-59_745_5346433325153496739/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-39-47_353_7010187035856221735/-ext-10002 true @@ -643,7 +646,7 @@ 1 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-16-59_745_5346433325153496739/-ext-10000/ + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-39-47_353_7010187035856221735/-ext-10000/ @@ -1292,7 +1295,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcbucket s @@ -1304,7 +1307,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcbucket srcbucket @@ -1365,11 +1368,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1294989412 + 1296711581 @@ -1431,11 +1434,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1294989412 + 1296711581 Index: ql/src/test/results/compiler/plan/sample4.q.xml =================================================================== --- ql/src/test/results/compiler/plan/sample4.q.xml (revision 1067253) +++ ql/src/test/results/compiler/plan/sample4.q.xml (working copy) @@ -33,7 +33,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-12_127_6760743392928888907/-ext-10000/ + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-39-57_757_9096638253701332069/-ext-10000/ @@ -73,7 +73,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-12_127_6760743392928888907/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-39-57_757_9096638253701332069/-ext-10002 @@ -82,7 +82,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-12_127_6760743392928888907/-ext-10000 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-39-57_757_9096638253701332069/-ext-10000 1 @@ -134,7 +134,7 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/dest1 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/dest1 file.outputformat @@ -142,7 +142,7 @@ transient_lastDdlTime - 1294989431 + 1296711597 @@ -253,16 +253,19 @@ org.apache.hadoop.hive.ql.io.CombineHiveInputFormat + + true + 0 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-12_127_6760743392928888907/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-39-57_757_9096638253701332069/-ext-10002 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-12_127_6760743392928888907/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-39-57_757_9096638253701332069/-ext-10002 @@ -271,7 +274,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-12_127_6760743392928888907/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-39-57_757_9096638253701332069/-ext-10002 -ext-10002 @@ -325,11 +328,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/dest1 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1294989431 + 1296711597 @@ -379,13 +382,13 @@ true - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-12_127_6760743392928888907/-ext-10000 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-39-57_757_9096638253701332069/-ext-10000 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-12_127_6760743392928888907/-ext-10001 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-39-57_757_9096638253701332069/-ext-10001 @@ -406,10 +409,10 @@ true - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-12_127_6760743392928888907/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-39-57_757_9096638253701332069/-ext-10002 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-12_127_6760743392928888907/-ext-10000 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-39-57_757_9096638253701332069/-ext-10000 @@ -435,7 +438,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-12_127_6760743392928888907/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-39-57_757_9096638253701332069/-ext-10002 @@ -525,11 +528,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1294989425 + 1296711591 @@ -591,11 +594,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1294989425 + 1296711591 @@ -634,7 +637,7 @@ 1 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-12_127_6760743392928888907/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-39-57_757_9096638253701332069/-ext-10002 true @@ -643,7 +646,7 @@ 1 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-12_127_6760743392928888907/-ext-10000/ + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-39-57_757_9096638253701332069/-ext-10000/ @@ -1269,7 +1272,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt s @@ -1281,7 +1284,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt srcbucket0.txt @@ -1342,11 +1345,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1294989425 + 1296711591 @@ -1408,11 +1411,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1294989425 + 1296711591 Index: ql/src/test/results/compiler/plan/sample5.q.xml =================================================================== --- ql/src/test/results/compiler/plan/sample5.q.xml (revision 1067253) +++ ql/src/test/results/compiler/plan/sample5.q.xml (working copy) @@ -33,7 +33,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-24_760_2824559644899781098/-ext-10000/ + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-40-08_342_6099626154841641179/-ext-10000/ @@ -73,7 +73,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-24_760_2824559644899781098/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-40-08_342_6099626154841641179/-ext-10002 @@ -82,7 +82,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-24_760_2824559644899781098/-ext-10000 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-40-08_342_6099626154841641179/-ext-10000 1 @@ -134,7 +134,7 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/dest1 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/dest1 file.outputformat @@ -142,7 +142,7 @@ transient_lastDdlTime - 1294989444 + 1296711608 @@ -253,16 +253,19 @@ org.apache.hadoop.hive.ql.io.CombineHiveInputFormat + + true + 0 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-24_760_2824559644899781098/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-40-08_342_6099626154841641179/-ext-10002 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-24_760_2824559644899781098/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-40-08_342_6099626154841641179/-ext-10002 @@ -271,7 +274,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-24_760_2824559644899781098/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-40-08_342_6099626154841641179/-ext-10002 -ext-10002 @@ -325,11 +328,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/dest1 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1294989444 + 1296711608 @@ -379,13 +382,13 @@ true - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-24_760_2824559644899781098/-ext-10000 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-40-08_342_6099626154841641179/-ext-10000 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-24_760_2824559644899781098/-ext-10001 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-40-08_342_6099626154841641179/-ext-10001 @@ -406,10 +409,10 @@ true - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-24_760_2824559644899781098/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-40-08_342_6099626154841641179/-ext-10002 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-24_760_2824559644899781098/-ext-10000 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-40-08_342_6099626154841641179/-ext-10000 @@ -435,7 +438,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-24_760_2824559644899781098/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-40-08_342_6099626154841641179/-ext-10002 @@ -525,11 +528,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1294989437 + 1296711602 @@ -591,11 +594,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1294989437 + 1296711602 @@ -634,7 +637,7 @@ 1 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-24_760_2824559644899781098/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-40-08_342_6099626154841641179/-ext-10002 true @@ -643,7 +646,7 @@ 1 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-24_760_2824559644899781098/-ext-10000/ + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-40-08_342_6099626154841641179/-ext-10000/ @@ -1266,7 +1269,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcbucket s @@ -1278,7 +1281,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcbucket srcbucket @@ -1339,11 +1342,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1294989437 + 1296711602 @@ -1405,11 +1408,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1294989437 + 1296711602 Index: ql/src/test/results/compiler/plan/sample6.q.xml =================================================================== --- ql/src/test/results/compiler/plan/sample6.q.xml (revision 1067253) +++ ql/src/test/results/compiler/plan/sample6.q.xml (working copy) @@ -33,7 +33,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-37_314_4916044476906940398/-ext-10000/ + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-40-18_813_4357411068769423265/-ext-10000/ @@ -73,7 +73,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-37_314_4916044476906940398/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-40-18_813_4357411068769423265/-ext-10002 @@ -82,7 +82,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-37_314_4916044476906940398/-ext-10000 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-40-18_813_4357411068769423265/-ext-10000 1 @@ -134,7 +134,7 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/dest1 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/dest1 file.outputformat @@ -142,7 +142,7 @@ transient_lastDdlTime - 1294989456 + 1296711618 @@ -253,16 +253,19 @@ org.apache.hadoop.hive.ql.io.CombineHiveInputFormat + + true + 0 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-37_314_4916044476906940398/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-40-18_813_4357411068769423265/-ext-10002 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-37_314_4916044476906940398/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-40-18_813_4357411068769423265/-ext-10002 @@ -271,7 +274,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-37_314_4916044476906940398/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-40-18_813_4357411068769423265/-ext-10002 -ext-10002 @@ -325,11 +328,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/dest1 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1294989456 + 1296711618 @@ -379,13 +382,13 @@ true - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-37_314_4916044476906940398/-ext-10000 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-40-18_813_4357411068769423265/-ext-10000 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-37_314_4916044476906940398/-ext-10001 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-40-18_813_4357411068769423265/-ext-10001 @@ -406,10 +409,10 @@ true - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-37_314_4916044476906940398/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-40-18_813_4357411068769423265/-ext-10002 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-37_314_4916044476906940398/-ext-10000 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-40-18_813_4357411068769423265/-ext-10000 @@ -435,7 +438,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-37_314_4916044476906940398/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-40-18_813_4357411068769423265/-ext-10002 @@ -525,11 +528,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1294989450 + 1296711612 @@ -591,11 +594,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1294989450 + 1296711612 @@ -634,7 +637,7 @@ 1 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-37_314_4916044476906940398/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-40-18_813_4357411068769423265/-ext-10002 true @@ -643,7 +646,7 @@ 1 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-37_314_4916044476906940398/-ext-10000/ + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-40-18_813_4357411068769423265/-ext-10000/ @@ -1269,7 +1272,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt s @@ -1281,7 +1284,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt srcbucket0.txt @@ -1342,11 +1345,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1294989450 + 1296711612 @@ -1408,11 +1411,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1294989450 + 1296711612 Index: ql/src/test/results/compiler/plan/sample7.q.xml =================================================================== --- ql/src/test/results/compiler/plan/sample7.q.xml (revision 1067253) +++ ql/src/test/results/compiler/plan/sample7.q.xml (working copy) @@ -33,7 +33,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-49_952_1781592330243488231/-ext-10000/ + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-40-29_317_1791083451591035750/-ext-10000/ @@ -73,7 +73,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-49_952_1781592330243488231/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-40-29_317_1791083451591035750/-ext-10002 @@ -82,7 +82,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-49_952_1781592330243488231/-ext-10000 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-40-29_317_1791083451591035750/-ext-10000 1 @@ -134,7 +134,7 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/dest1 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/dest1 file.outputformat @@ -142,7 +142,7 @@ transient_lastDdlTime - 1294989469 + 1296711628 @@ -253,16 +253,19 @@ org.apache.hadoop.hive.ql.io.CombineHiveInputFormat + + true + 0 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-49_952_1781592330243488231/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-40-29_317_1791083451591035750/-ext-10002 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-49_952_1781592330243488231/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-40-29_317_1791083451591035750/-ext-10002 @@ -271,7 +274,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-49_952_1781592330243488231/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-40-29_317_1791083451591035750/-ext-10002 -ext-10002 @@ -325,11 +328,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/dest1 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1294989469 + 1296711628 @@ -379,13 +382,13 @@ true - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-49_952_1781592330243488231/-ext-10000 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-40-29_317_1791083451591035750/-ext-10000 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-49_952_1781592330243488231/-ext-10001 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-40-29_317_1791083451591035750/-ext-10001 @@ -406,10 +409,10 @@ true - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-49_952_1781592330243488231/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-40-29_317_1791083451591035750/-ext-10002 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-49_952_1781592330243488231/-ext-10000 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-40-29_317_1791083451591035750/-ext-10000 @@ -435,7 +438,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-49_952_1781592330243488231/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-40-29_317_1791083451591035750/-ext-10002 @@ -525,11 +528,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1294989463 + 1296711623 @@ -591,11 +594,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1294989463 + 1296711623 @@ -638,7 +641,7 @@ 1 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-49_952_1781592330243488231/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-40-29_317_1791083451591035750/-ext-10002 true @@ -647,7 +650,7 @@ 1 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-17-49_952_1781592330243488231/-ext-10000/ + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-40-29_317_1791083451591035750/-ext-10000/ @@ -1409,7 +1412,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt s @@ -1421,7 +1424,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt srcbucket0.txt @@ -1482,11 +1485,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1294989463 + 1296711623 @@ -1548,11 +1551,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/srcbucket + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1294989463 + 1296711623 Index: ql/src/test/results/compiler/plan/input1.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input1.q.xml (revision 1067253) +++ ql/src/test/results/compiler/plan/input1.q.xml (working copy) @@ -33,7 +33,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-08_572_6716980305566811864/-ext-10000/ + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-36_464_1675269816375563492/-ext-10000/ @@ -73,7 +73,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-08_572_6716980305566811864/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-36_464_1675269816375563492/-ext-10002 @@ -82,7 +82,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-08_572_6716980305566811864/-ext-10000 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-36_464_1675269816375563492/-ext-10000 1 @@ -134,7 +134,7 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/dest1 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/dest1 file.outputformat @@ -142,7 +142,7 @@ transient_lastDdlTime - 1294989128 + 1296711336 @@ -253,16 +253,19 @@ org.apache.hadoop.hive.ql.io.CombineHiveInputFormat + + true + 0 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-08_572_6716980305566811864/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-36_464_1675269816375563492/-ext-10002 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-08_572_6716980305566811864/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-36_464_1675269816375563492/-ext-10002 @@ -271,7 +274,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-08_572_6716980305566811864/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-36_464_1675269816375563492/-ext-10002 -ext-10002 @@ -325,11 +328,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/dest1 + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1294989128 + 1296711336 @@ -379,13 +382,13 @@ true - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-08_572_6716980305566811864/-ext-10000 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-36_464_1675269816375563492/-ext-10000 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-08_572_6716980305566811864/-ext-10001 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-36_464_1675269816375563492/-ext-10001 @@ -406,10 +409,10 @@ true - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-08_572_6716980305566811864/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-36_464_1675269816375563492/-ext-10002 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-08_572_6716980305566811864/-ext-10000 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-36_464_1675269816375563492/-ext-10000 @@ -435,7 +438,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-08_572_6716980305566811864/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-36_464_1675269816375563492/-ext-10002 @@ -521,11 +524,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1294989125 + 1296711333 @@ -583,11 +586,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1294989125 + 1296711333 @@ -626,7 +629,7 @@ 1 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-08_572_6716980305566811864/-ext-10002 + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-36_464_1675269816375563492/-ext-10002 true @@ -635,7 +638,7 @@ 1 - pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-01-13_23-12-08_572_6716980305566811864/-ext-10000/ + pfile:/data/users/njain/hive3/build/ql/scratchdir/hive_2011-02-02_21-35-36_464_1675269816375563492/-ext-10000/ @@ -1088,7 +1091,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src src @@ -1100,7 +1103,7 @@ - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src src @@ -1157,11 +1160,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1294989125 + 1296711333 @@ -1219,11 +1222,11 @@ location - pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src + pfile:/data/users/njain/hive3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1294989125 + 1296711333 Index: ql/src/test/queries/clientpositive/partition_wise_fileformat5.q =================================================================== --- ql/src/test/queries/clientpositive/partition_wise_fileformat5.q (revision 0) +++ ql/src/test/queries/clientpositive/partition_wise_fileformat5.q (revision 0) @@ -0,0 +1,14 @@ +set hive.input.format = org.apache.hadoop.hive.ql.io.CombineHiveInputFormat; + +create table partition_test_partitioned(key string, value string) partitioned by (dt string); + +alter table partition_test_partitioned set fileformat rcfile; +insert overwrite table partition_test_partitioned partition(dt=101) select * from src1; +alter table partition_test_partitioned set fileformat Sequencefile; +insert overwrite table partition_test_partitioned partition(dt=102) select * from src1; + +select dt, count(1) from partition_test_partitioned where dt is not null group by dt; + +insert overwrite table partition_test_partitioned partition(dt=103) select * from src1; + +select dt, count(1) from partition_test_partitioned where dt is not null group by dt; Index: ql/src/test/queries/clientpositive/partition_wise_fileformat6.q =================================================================== --- ql/src/test/queries/clientpositive/partition_wise_fileformat6.q (revision 0) +++ ql/src/test/queries/clientpositive/partition_wise_fileformat6.q (revision 0) @@ -0,0 +1,19 @@ +set hive.input.format = org.apache.hadoop.hive.ql.io.CombineHiveInputFormat; + +create table partition_test_partitioned(key string, value string) partitioned by (dt string); + +alter table partition_test_partitioned set fileformat rcfile; +insert overwrite table partition_test_partitioned partition(dt=101) select * from src1; +alter table partition_test_partitioned set fileformat Sequencefile; + +insert overwrite table partition_test_partitioned partition(dt=102) select * from src1; + +select count(1) from +(select key, value from partition_test_partitioned where dt=101 and key < 100 + union all +select key, value from partition_test_partitioned where dt=101 and key < 20)s; + +select count(1) from +(select key, value from partition_test_partitioned where dt=101 and key < 100 + union all +select key, value from partition_test_partitioned where dt=102 and key < 20)s; Index: ql/src/test/queries/clientpositive/partition_wise_fileformat7.q =================================================================== --- ql/src/test/queries/clientpositive/partition_wise_fileformat7.q (revision 0) +++ ql/src/test/queries/clientpositive/partition_wise_fileformat7.q (revision 0) @@ -0,0 +1,12 @@ +set hive.input.format = org.apache.hadoop.hive.ql.io.CombineHiveInputFormat; + +create table partition_test_partitioned(key string, value string) partitioned by (dt string); + +alter table partition_test_partitioned set fileformat rcfile; +insert overwrite table partition_test_partitioned partition(dt=101) select * from src1; + +select count(1) from partition_test_partitioned a join partition_test_partitioned b on a.key = b.key +where a.dt = '101' and b.dt = '101'; + +select count(1) from partition_test_partitioned a join partition_test_partitioned b on a.key = b.key +where a.dt = '101' and b.dt = '101' and a.key < 100; \ No newline at end of file Index: ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMRFileSink1.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMRFileSink1.java (revision 1067253) +++ ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMRFileSink1.java (working copy) @@ -426,6 +426,7 @@ cplan.getPathToPartitionInfo().put(inputDir, new PartitionDesc(tblDesc, null)); cplan.setNumReduceTasks(0); cplan.getAliasToWork().put(inputDir, topOp); + cplan.setMapperCannotSpanPartns(true); return cplan; } Index: ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java (revision 1067253) +++ ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java (working copy) @@ -765,6 +765,11 @@ */ public static MapredWork getMapRedWork(HiveConf conf) { MapredWork work = new MapredWork(); + // This code has been only added for testing + boolean mapperCannotSpanPartns = + conf.getBoolVar( + HiveConf.ConfVars.HIVE_MAPPER_CANNOT_SPAN_MULTIPLE_PARTITIONS); + work.setMapperCannotSpanPartns(mapperCannotSpanPartns); work.setPathToAliases(new LinkedHashMap>()); work.setPathToPartitionInfo(new LinkedHashMap()); work.setAliasToWork(new LinkedHashMap>()); Index: ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/GenMRSkewJoinProcessor.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/GenMRSkewJoinProcessor.java (revision 1067253) +++ ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/GenMRSkewJoinProcessor.java (working copy) @@ -58,6 +58,7 @@ import org.apache.hadoop.hive.ql.plan.TableScanDesc; import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo; import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * GenMRSkewJoinProcessor. @@ -232,6 +233,13 @@ for (int i = 0; i < numAliases - 1; i++) { Byte src = tags[i]; MapredWork newPlan = PlanUtils.getMapRedWork(); + + // This code has been only added for testing + boolean mapperCannotSpanPartns = + parseCtx.getConf().getBoolVar( + HiveConf.ConfVars.HIVE_MAPPER_CANNOT_SPAN_MULTIPLE_PARTITIONS); + newPlan.setMapperCannotSpanPartns(mapperCannotSpanPartns); + MapredWork clonePlan = null; try { String xmlPlan = currPlan.toXML(); Index: ql/src/java/org/apache/hadoop/hive/ql/exec/SMBMapJoinOperator.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/exec/SMBMapJoinOperator.java (revision 1067253) +++ ql/src/java/org/apache/hadoop/hive/ql/exec/SMBMapJoinOperator.java (working copy) @@ -67,6 +67,7 @@ private transient boolean[] fetchOpDone; private transient boolean[] foundNextKeyGroup; transient boolean firstFetchHappened = false; + private transient boolean inputFileChanged = false; transient boolean localWorkInited = false; public SMBMapJoinOperator() { @@ -85,6 +86,7 @@ closeCalled = false; this.firstFetchHappened = false; + this.inputFileChanged = false; // get the largest table alias from order int maxAlias = 0; @@ -177,11 +179,17 @@ } } + // The input file has changed - load the correct hash bucket @Override + public void cleanUpInputFileChangedOp() throws HiveException { + inputFileChanged = true; + } + + @Override public void processOp(Object row, int tag) throws HiveException { if (tag == posBigTable) { - if (this.getExecContext().inputFileChanged()) { + if (inputFileChanged) { if (firstFetchHappened) { // we need to first join and flush out data left by the previous file. joinFinalLeftData(); @@ -194,6 +202,7 @@ setUpFetchOpContext(fetchOp, alias); } firstFetchHappened = false; + inputFileChanged = false; } } @@ -531,8 +540,7 @@ } closeCalled = true; - if ((this.getExecContext() != null && this.getExecContext().inputFileChanged()) - || !firstFetchHappened) { + if (inputFileChanged || !firstFetchHappened) { //set up the fetch operator for the new input file. for (Map.Entry entry : fetchOperators.entrySet()) { String alias = entry.getKey(); @@ -546,6 +554,7 @@ fetchNextGroup(t); } } + inputFileChanged = false; } joinFinalLeftData(); Index: ql/src/java/org/apache/hadoop/hive/ql/exec/MapOperator.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/exec/MapOperator.java (revision 1067253) +++ ql/src/java/org/apache/hadoop/hive/ql/exec/MapOperator.java (working copy) @@ -25,6 +25,8 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Set; +import java.util.HashSet; import java.util.Map.Entry; import java.util.Properties; @@ -79,6 +81,7 @@ private transient boolean isPartitioned; private transient boolean hasVC; private Map opCtxMap; + private Set listInputPaths = new HashSet(); private Map, java.util.ArrayList> operatorToPaths; @@ -121,6 +124,15 @@ public int hashCode() { return (op == null) ? 0 : op.hashCode(); } + + public Operator getOp() { + return op; + } + + public void setOp(Operator op) { + this.op = op; + } + } private static class MapOpCtx { @@ -271,10 +283,70 @@ return opCtx; } + /** + * Set the inspectors given a input. Since a mapper can span multiple partitions, the inspectors + * need to be changed if the input changes + **/ + private void setInspectorInput(MapInputPath inp) { + Operator op = inp.getOp(); + + deserializer = opCtxMap.get(inp).getDeserializer(); + isPartitioned = opCtxMap.get(inp).isPartitioned(); + rowWithPart = opCtxMap.get(inp).getRowWithPart(); + rowObjectInspector = opCtxMap.get(inp).getRowObjectInspector(); + if (listInputPaths.contains(inp)) { + return; + } + + listInputPaths.add(inp); + StructObjectInspector rawRowObjectInspector = opCtxMap.get(inp).rawRowObjectInspector; + StructObjectInspector partObjectInspector = opCtxMap.get(inp).partObjectInspector; + if (op instanceof TableScanOperator) { + TableScanOperator tsOp = (TableScanOperator) op; + TableScanDesc tsDesc = tsOp.getConf(); + if(tsDesc != null) { + this.vcs = tsDesc.getVirtualCols(); + if (vcs != null && vcs.size() > 0) { + this.hasVC = true; + List vcNames = new ArrayList(vcs.size()); + this.vcValues = new Writable[vcs.size()]; + List vcsObjectInspectors = new ArrayList(vcs.size()); + for (int i = 0; i < vcs.size(); i++) { + VirtualColumn vc = vcs.get(i); + vcsObjectInspectors.add( + PrimitiveObjectInspectorFactory.getPrimitiveWritableObjectInspector( + ((PrimitiveTypeInfo) vc.getTypeInfo()).getPrimitiveCategory())); + vcNames.add(vc.getName()); + } + StructObjectInspector vcStructObjectInspector = ObjectInspectorFactory + .getStandardStructObjectInspector(vcNames, + vcsObjectInspectors); + if (isPartitioned) { + this.rowWithPartAndVC = new Object[3]; + this.rowWithPartAndVC[1] = this.rowWithPart[1]; + } else { + this.rowWithPartAndVC = new Object[2]; + } + if(partObjectInspector == null) { + this.rowObjectInspector = ObjectInspectorFactory.getUnionStructObjectInspector(Arrays + .asList(new StructObjectInspector[] { + rowObjectInspector, vcStructObjectInspector })); + } else { + this.rowObjectInspector = ObjectInspectorFactory.getUnionStructObjectInspector(Arrays + .asList(new StructObjectInspector[] { + rawRowObjectInspector, partObjectInspector, vcStructObjectInspector })); + } + opCtxMap.get(inp).rowObjectInspector = this.rowObjectInspector; + } + } + } + } + public void setChildren(Configuration hconf) throws HiveException { Path fpath = new Path((new Path(HiveConf.getVar(hconf, HiveConf.ConfVars.HADOOPMAPFILENAME))).toUri().getPath()); + ArrayList> children = new ArrayList>(); opCtxMap = new HashMap(); operatorToPaths = new HashMap, java.util.ArrayList>(); @@ -311,51 +383,7 @@ LOG.info("dump " + op.getName() + " " + opCtxMap.get(inp).getRowObjectInspector().getTypeName()); if (!done) { - deserializer = opCtxMap.get(inp).getDeserializer(); - isPartitioned = opCtxMap.get(inp).isPartitioned(); - rowWithPart = opCtxMap.get(inp).getRowWithPart(); - rowObjectInspector = opCtxMap.get(inp).getRowObjectInspector(); - StructObjectInspector rawRowObjectInspector = opCtxMap.get(inp).rawRowObjectInspector; - StructObjectInspector partObjectInspector = opCtxMap.get(inp).partObjectInspector; - if (op instanceof TableScanOperator) { - TableScanOperator tsOp = (TableScanOperator) op; - TableScanDesc tsDesc = tsOp.getConf(); - if(tsDesc != null) { - this.vcs = tsDesc.getVirtualCols(); - if (vcs != null && vcs.size() > 0) { - this.hasVC = true; - List vcNames = new ArrayList(vcs.size()); - this.vcValues = new Writable[vcs.size()]; - List vcsObjectInspectors = new ArrayList(vcs.size()); - for (int i = 0; i < vcs.size(); i++) { - VirtualColumn vc = vcs.get(i); - vcsObjectInspectors.add( - PrimitiveObjectInspectorFactory.getPrimitiveWritableObjectInspector( - ((PrimitiveTypeInfo) vc.getTypeInfo()).getPrimitiveCategory())); - vcNames.add(vc.getName()); - } - StructObjectInspector vcStructObjectInspector = ObjectInspectorFactory - .getStandardStructObjectInspector(vcNames, - vcsObjectInspectors); - if (isPartitioned) { - this.rowWithPartAndVC = new Object[3]; - this.rowWithPartAndVC[1] = this.rowWithPart[1]; - } else { - this.rowWithPartAndVC = new Object[2]; - } - if(partObjectInspector == null) { - this.rowObjectInspector = ObjectInspectorFactory.getUnionStructObjectInspector(Arrays - .asList(new StructObjectInspector[] { - rowObjectInspector, vcStructObjectInspector })); - } else { - this.rowObjectInspector = ObjectInspectorFactory.getUnionStructObjectInspector(Arrays - .asList(new StructObjectInspector[] { - rawRowObjectInspector, partObjectInspector, vcStructObjectInspector })); - } - opCtxMap.get(inp).rowObjectInspector = this.rowObjectInspector; - } - } - } + setInspectorInput(inp); done = true; } } @@ -430,7 +458,41 @@ } } + // Change the serializer etc. since it is a new file, and split can span + // multiple files/partitions. + public void cleanUpInputFileChangedOp() throws HiveException { + Path fpath = new Path((new Path(this.getExecContext().getCurrentInputFile())) + .toUri().getPath()); + + for (String onefile : conf.getPathToAliases().keySet()) { + Path onepath = new Path(new Path(onefile).toUri().getPath()); + // check for the operators who will process rows coming to this Map + // Operator + if (!onepath.toUri().relativize(fpath.toUri()).equals(fpath.toUri())) { + String onealias = conf.getPathToAliases().get(onefile).get(0); + Operator op = + conf.getAliasToWork().get(onealias); + + LOG.info("Processing alias " + onealias + " for file " + onefile); + + MapInputPath inp = new MapInputPath(onefile, onealias, op); + setInspectorInput(inp); + break; + } + } + } + public void process(Writable value) throws HiveException { + // A mapper can span multiple files/partitions. + // The serializers need to be reset if the input file changed + if ((this.getExecContext() != null) && + this.getExecContext().inputFileChanged()) { + LOG.info("Processing path " + this.getExecContext().getCurrentInputFile()); + + // The child operators cleanup if input file has changed + cleanUpInputFileChanged(); + } + Object row = null; try { if (this.hasVC) { Index: ql/src/java/org/apache/hadoop/hive/ql/exec/TableScanOperator.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/exec/TableScanOperator.java (revision 1067253) +++ ql/src/java/org/apache/hadoop/hive/ql/exec/TableScanOperator.java (working copy) @@ -51,6 +51,7 @@ private transient Configuration hconf; private transient Stat stat; private transient String partitionSpecs; + private transient boolean inputFileChanged = false; private TableDesc tableDesc; @@ -77,8 +78,16 @@ forward(row, inputObjInspectors[tag]); } + // Change the table partition for collecting stats + @Override + public void cleanUpInputFileChangedOp() throws HiveException { + inputFileChanged = true; + } + private void gatherStats(Object row) { - if (stat == null) { // first row/call + // first row/call or a new partition + if ((stat == null) || inputFileChanged) { + inputFileChanged = false; stat = new Stat(); if (conf.getPartColumns() == null || conf.getPartColumns().size() == 0) { partitionSpecs = ""; @@ -122,6 +131,8 @@ @Override protected void initializeOp(Configuration hconf) throws HiveException { initializeChildren(hconf); + inputFileChanged = false; + if (conf == null) { return; } Index: ql/src/java/org/apache/hadoop/hive/ql/exec/MapJoinOperator.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/exec/MapJoinOperator.java (revision 1067253) +++ ql/src/java/org/apache/hadoop/hive/ql/exec/MapJoinOperator.java (working copy) @@ -194,7 +194,24 @@ } } + // Load the hash table @Override + public void cleanUpInputFileChangedOp() throws HiveException { + try { + if (firstRow) { + // generate the map metadata + generateMapMetaData(); + firstRow = false; + } + + loadHashTable(); + } catch (SerDeException e) { + e.printStackTrace(); + throw new HiveException(e); + } + } + + @Override public void processOp(Object row, int tag) throws HiveException { try { @@ -203,9 +220,6 @@ generateMapMetaData(); firstRow = false; } - if (this.getExecContext().inputFileChanged()) { - loadHashTable(); - } // get alias alias = order[tag]; Index: ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java (revision 1067253) +++ ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java (working copy) @@ -1236,4 +1236,22 @@ } } } + + // The input file has changed - every operator can invoke specific action + // for each input file + public void cleanUpInputFileChanged() throws HiveException { + this.cleanUpInputFileChangedOp(); + if(this.childOperators != null) { + for (int i = 0; i op = this.childOperators.get(i); + op.cleanUpInputFileChanged(); + } + } + } + + // If a operator needs to invoke specific cleanup, that operator can override + // this method + public void cleanUpInputFileChangedOp() throws HiveException { + } + } Index: ql/src/java/org/apache/hadoop/hive/ql/exec/ExecMapperContext.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/exec/ExecMapperContext.java (revision 1067253) +++ ql/src/java/org/apache/hadoop/hive/ql/exec/ExecMapperContext.java (working copy) @@ -107,6 +107,11 @@ } public String getCurrentInputFile() { + if (!inputFileChecked) { + currentInputFile = this.ioCxt.getInputFile(); + inputFileChecked = true; + } + return currentInputFile; } Index: ql/src/java/org/apache/hadoop/hive/ql/plan/MapredWork.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/plan/MapredWork.java (revision 1067253) +++ ql/src/java/org/apache/hadoop/hive/ql/plan/MapredWork.java (working copy) @@ -29,6 +29,9 @@ import org.apache.hadoop.hive.ql.exec.Utilities; import org.apache.hadoop.hive.ql.parse.OpParseContext; import org.apache.hadoop.hive.ql.parse.QBJoinTree; +import org.apache.hadoop.hive.conf.HiveConf; +import org.apache.hadoop.hive.ql.metadata.Hive; +import org.apache.hadoop.hive.ql.metadata.HiveException; /** * MapredWork. @@ -75,6 +78,8 @@ private QBJoinTree joinTree; + private boolean mapperCannotSpanPartns; + public MapredWork() { aliasToPartnInfo = new LinkedHashMap(); } @@ -339,6 +344,14 @@ return this.gatheringStats; } + public void setMapperCannotSpanPartns(boolean mapperCannotSpanPartns) { + this.mapperCannotSpanPartns = mapperCannotSpanPartns; + } + + public boolean isMapperCannotSpanPartns() { + return this.mapperCannotSpanPartns; + } + public String getTmpHDFSFileURI() { return tmpHDFSFileURI; } Index: ql/src/java/org/apache/hadoop/hive/ql/io/CombineHiveInputFormat.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/io/CombineHiveInputFormat.java (revision 1067253) +++ ql/src/java/org/apache/hadoop/hive/ql/io/CombineHiveInputFormat.java (working copy) @@ -22,9 +22,12 @@ import java.io.DataOutput; import java.io.File; import java.io.IOException; +import java.io.Serializable; import java.util.ArrayList; import java.util.HashSet; import java.util.LinkedList; +import java.util.List; +import java.util.HashMap; import java.util.Map; import java.util.Queue; import java.util.Set; @@ -50,10 +53,8 @@ import org.apache.hadoop.mapred.RecordReader; import org.apache.hadoop.mapred.Reporter; import org.apache.hadoop.mapred.TextInputFormat; +import org.apache.hadoop.hive.ql.exec.Operator; - - - /** * CombineHiveInputFormat is a parameterized InputFormat which looks at the path * name and determine the correct InputFormat for that path name from @@ -211,7 +212,37 @@ out.writeUTF(inputFormatClassName); } } - + + // Splits are not shared across different partitions with different input formats. + // For example, 2 partitions (1 sequencefile and 1 rcfile) will have 2 different splits + private static class CombinePathInputFormat { + private List> opList; + private String inputFormatClassName; + + public CombinePathInputFormat(List> opList, + String inputFormatClassName) { + this.opList = opList; + this.inputFormatClassName = inputFormatClassName; + } + + public boolean equals(Object o) { + if (o instanceof CombinePathInputFormat) { + CombinePathInputFormat mObj = (CombinePathInputFormat)o; + if (mObj == null) { + return false; + } + return opList.equals(mObj.opList) && + inputFormatClassName.equals(mObj.inputFormatClassName); + } + return false; + } + + @Override + public int hashCode() { + return (opList == null) ? 0 : opList.hashCode(); + } + } + /** * Create Hive splits based on CombineFileSplit. */ @@ -219,6 +250,9 @@ public InputSplit[] getSplits(JobConf job, int numSplits) throws IOException { init(job); + Map> pathToAliases = mrwork.getPathToAliases(); + Map> aliasToWork = + mrwork.getAliasToWork(); CombineFileInputFormatShim combine = ShimLoader.getHadoopShims() .getCombineFileInputFormat(); @@ -234,7 +268,10 @@ // combine splits only from same tables and same partitions. Do not combine splits from multiple // tables or multiple partitions. Path[] paths = combine.getInputPathsShim(job); + Map poolMap = + new HashMap(); Set poolSet = new HashSet(); + for (Path path : paths) { PartitionDesc part = HiveFileFormatUtils.getPartitionDescFromPathRecursively( @@ -246,6 +283,7 @@ // Use HiveInputFormat if any of the paths is not splittable Class inputFormatClass = part.getInputFileFormatClass(); + String inputFormatClassName = inputFormatClass.getName(); InputFormat inputFormat = getInputFormatFromCache(inputFormatClass, job); // Since there is no easy way of knowing whether MAPREDUCE-1597 is present in the tree or not, @@ -288,25 +326,54 @@ return super.getSplits(job, numSplits); } + Path filterPath = path; + // In the case of tablesample, the input paths are pointing to files rather than directories. // We need to get the parent directory as the filtering path so that all files in the same // parent directory will be grouped into one pool but not files from different parent // directories. This guarantees that a split will combine all files in the same partition - // but won't cross multiple partitions. - Path filterPath = path; - if (!path.getFileSystem(job).getFileStatus(path).isDir()) { // path is not directory + // but won't cross multiple partitions if the user has asked so. + if (mrwork.isMapperCannotSpanPartns() && + !path.getFileSystem(job).getFileStatus(path).isDir()) { // path is not directory filterPath = path.getParent(); } - if (!poolSet.contains(filterPath)) { - LOG.info("CombineHiveInputSplit creating pool for " + path + - "; using filter path " + filterPath); - combine.createPool(job, new CombineFilter(filterPath)); + + // Does a pool exist for this path already + CombineFilter f = null; + List> opList = null; + boolean done = false; + + if (!mrwork.isMapperCannotSpanPartns()) { + opList = HiveFileFormatUtils.doGetAliasesFromPath( + pathToAliases, aliasToWork, filterPath); + f = poolMap.get(new CombinePathInputFormat(opList, inputFormatClassName)); + } + else { + if (poolSet.contains(filterPath)) { + LOG.info("CombineHiveInputSplit: pool is already created for " + path + + "; using filter path " + filterPath); + done = true; + } poolSet.add(filterPath); - } else { - LOG.info("CombineHiveInputSplit: pool is already created for " + path + - "; using filter path " + filterPath); } + + if (!done) { + if (f == null) { + f = new CombineFilter(filterPath); + LOG.info("CombineHiveInputSplit creating pool for " + path + + "; using filter path " + filterPath); + combine.createPool(job, f); + if (!mrwork.isMapperCannotSpanPartns()) { + poolMap.put(new CombinePathInputFormat(opList, inputFormatClassName), f); + } + } else { + LOG.info("CombineHiveInputSplit: pool is already created for " + path + + "; using filter path " + filterPath); + f.addPath(filterPath); + } + } } + InputSplitShim[] iss = combine.getSplits(job, 1); for (InputSplitShim is : iss) { CombineHiveInputSplit csplit = new CombineHiveInputSplit(job, is); @@ -314,7 +381,6 @@ } LOG.info("number of splits " + result.size()); - return result.toArray(new CombineHiveInputSplit[result.size()]); } @@ -351,7 +417,7 @@ } static class CombineFilter implements PathFilter { - private final String pString; + private List pStrings = new ArrayList(); // store a path prefix in this TestFilter // PRECONDITION: p should always be a directory @@ -359,21 +425,33 @@ // we need to keep the path part only because the Hadoop CombineFileInputFormat will // pass the path part only to accept(). // Trailing the path with a separator to prevent partial matching. - pString = p.toUri().getPath().toString() + File.separator;; + addPath(p); } + public void addPath(Path p) { + String pString = p.toUri().getPath().toString() + File.separator;; + pStrings.add(pString); + } + // returns true if the specified path matches the prefix stored // in this TestFilter. public boolean accept(Path path) { - if (path.toString().indexOf(pString) == 0) { - return true; + for (String pString : pStrings) { + if (path.toString().indexOf(pString) == 0) { + return true; + } } return false; } @Override public String toString() { - return "PathFilter:" + pString; + StringBuilder s = new StringBuilder(); + s.append("PathFilter: "); + for (String pString : pStrings) { + s.append(pString + " "); + } + return s.toString(); } } } Index: ql/src/java/org/apache/hadoop/hive/ql/io/HiveFileFormatUtils.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/io/HiveFileFormatUtils.java (revision 1067253) +++ ql/src/java/org/apache/hadoop/hive/ql/io/HiveFileFormatUtils.java (working copy) @@ -20,7 +20,9 @@ import java.io.File; import java.io.IOException; +import java.io.Serializable; import java.util.ArrayList; +import java.util.List; import java.util.HashMap; import java.util.Map; import java.util.Properties; @@ -31,6 +33,7 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.ql.exec.FileSinkOperator.RecordWriter; +import org.apache.hadoop.hive.ql.exec.Operator; import org.apache.hadoop.hive.ql.exec.Utilities; import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.ql.plan.FileSinkDesc; @@ -244,7 +247,7 @@ } return null; } - + public static PartitionDesc getPartitionDescFromPathRecursively( Map pathToPartitionInfo, Path dir, Map, Map> cacheMap) @@ -252,7 +255,7 @@ return getPartitionDescFromPathRecursively(pathToPartitionInfo, dir, cacheMap, false); } - + public static PartitionDesc getPartitionDescFromPathRecursively( Map pathToPartitionInfo, Path dir, Map, Map> cacheMap, @@ -267,11 +270,11 @@ if (cacheMap != null) { newPathToPartitionInfo = cacheMap.get(pathToPartitionInfo); } - + if (newPathToPartitionInfo == null) { // still null newPathToPartitionInfo = new HashMap(); populateNewPartitionDesc(pathToPartitionInfo, newPathToPartitionInfo); - + if (cacheMap != null) { cacheMap.put(pathToPartitionInfo, newPathToPartitionInfo); } @@ -309,7 +312,7 @@ // LOG.warn("exact match not found, try ripping input path's theme and authority"); part = pathToPartitionInfo.get(dirPath); } - + if (part == null) { String dirStr = dir.toString(); int dirPathIndex = dirPath.lastIndexOf(File.separator); @@ -333,6 +336,62 @@ return part; } + private static boolean foundAlias(Map> pathToAliases, + String path) { + List aliases = pathToAliases.get(path); + if ((aliases == null) || (aliases.isEmpty())) { + return false; + } + return true; + } + + private static String getMatchingPath(Map> pathToAliases, + Path dir) { + // First find the path to be searched + String path = dir.toString(); + if (foundAlias(pathToAliases, path)) { + return path; + } + + String dirPath = dir.toUri().getPath(); + if (foundAlias(pathToAliases, dirPath)) { + return dirPath; + } + path = dirPath; + + String dirStr = dir.toString(); + int dirPathIndex = dirPath.lastIndexOf(File.separator); + int dirStrIndex = dirStr.lastIndexOf(File.separator); + while (dirPathIndex >= 0 && dirStrIndex >= 0) { + dirStr = dirStr.substring(0, dirStrIndex); + dirPath = dirPath.substring(0, dirPathIndex); + //first try full match + if (foundAlias(pathToAliases, dirStr)) { + return dirStr; + } + if (foundAlias(pathToAliases, dirPath)) { + return dirPath; + } + dirPathIndex = dirPath.lastIndexOf(File.separator); + dirStrIndex = dirStr.lastIndexOf(File.separator); + } + return null; + } + + public static List> doGetAliasesFromPath( + Map> pathToAliases, + Map> aliasToWork, Path dir) { + + String path = getMatchingPath(pathToAliases, dir); + List> opList = + new ArrayList>(); + List aliases = pathToAliases.get(path); + for (String alias : aliases) { + opList.add(aliasToWork.get(alias)); + } + return opList; + } + private HiveFileFormatUtils() { // prevent instantiation } Index: ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java (revision 1067253) +++ ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java (working copy) @@ -288,6 +288,9 @@ result.add(new HiveInputSplit(is, inputFormatClass.getName())); } } + + LOG.info("number of splits " + result.size()); + return result.toArray(new HiveInputSplit[result.size()]); } @@ -365,7 +368,7 @@ pushProjectionsAndFilters(jobConf, inputFormatClass, splitPath, splitPathWithNoSchema, false); } - + protected void pushProjectionsAndFilters(JobConf jobConf, Class inputFormatClass, String splitPath, String splitPathWithNoSchema, boolean nonNative) { if (this.mrwork == null) {