Index: contrib/src/test/results/clientnegative/serde_regex.q.out =================================================================== --- contrib/src/test/results/clientnegative/serde_regex.q.out (revision 908188) +++ contrib/src/test/results/clientnegative/serde_regex.q.out (working copy) @@ -78,5 +78,5 @@ ) STORED AS TEXTFILE PREHOOK: type: CREATETABLE -FAILED: Error in metadata: org.apache.hadoop.hive.ql.metadata.HiveException: MetaException(message:org.apache.hadoop.hive.serde2.SerDeException org.apache.hadoop.hive.contrib.serde2.RegexSerDe only accepts string columns, but column[5] named status has type int) +FAILED: Error in metadata: java.lang.RuntimeException: MetaException(message:org.apache.hadoop.hive.serde2.SerDeException org.apache.hadoop.hive.contrib.serde2.RegexSerDe only accepts string columns, but column[5] named status has type int) FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask Index: metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java =================================================================== --- metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java (revision 908188) +++ metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java (working copy) @@ -625,16 +625,18 @@ schema.setProperty( org.apache.hadoop.hive.metastore.api.Constants.BUCKET_COUNT, Integer .toString(sd.getNumBuckets())); - if (sd.getBucketCols().size() > 0) { + if (sd.getBucketCols() != null && sd.getBucketCols().size() > 0) { schema.setProperty( org.apache.hadoop.hive.metastore.api.Constants.BUCKET_FIELD_NAME, sd .getBucketCols().get(0)); } - schema.putAll(sd.getSerdeInfo().getParameters()); - if (sd.getSerdeInfo().getSerializationLib() != null) { - schema.setProperty( - org.apache.hadoop.hive.serde.Constants.SERIALIZATION_LIB, sd - .getSerdeInfo().getSerializationLib()); + if (sd.getSerdeInfo() != null) { + schema.putAll(sd.getSerdeInfo().getParameters()); + if (sd.getSerdeInfo().getSerializationLib() != null) { + schema.setProperty( + org.apache.hadoop.hive.serde.Constants.SERIALIZATION_LIB, sd + .getSerdeInfo().getSerializationLib()); + } } StringBuilder colNameBuf = new StringBuilder(); StringBuilder colTypeBuf = new StringBuilder(); @@ -656,10 +658,12 @@ schema.setProperty( org.apache.hadoop.hive.metastore.api.Constants.META_TABLE_COLUMN_TYPES, colTypes); - schema.setProperty( - org.apache.hadoop.hive.serde.Constants.SERIALIZATION_DDL, - getDDLFromFieldSchema(tableName, sd.getCols())); - + if (sd.getCols() != null) { + schema.setProperty( + org.apache.hadoop.hive.serde.Constants.SERIALIZATION_DDL, + getDDLFromFieldSchema(tableName, sd.getCols())); + } + String partString = ""; String partStringSep = ""; for (FieldSchema partKey : partitionKeys) { Index: ql/src/test/results/clientpositive/partition_wise_fileformat.q.out =================================================================== --- ql/src/test/results/clientpositive/partition_wise_fileformat.q.out (revision 908188) +++ ql/src/test/results/clientpositive/partition_wise_fileformat.q.out (working copy) @@ -16,8 +16,8 @@ POSTHOOK: query: show table extended like partition_test_partitioned POSTHOOK: type: SHOW_TABLESTATUS tableName:partition_test_partitioned -owner:njain -location:file:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/partition_test_partitioned +owner:zshao +location:file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/partition_test_partitioned inputformat:org.apache.hadoop.mapred.TextInputFormat outputformat:org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat columns:struct columns { string key, string value} @@ -27,16 +27,16 @@ totalFileSize:216 maxFileSize:216 minFileSize:216 -lastAccessTime:0 -lastUpdateTime:1259087630000 +lastAccessTime:unknown +lastUpdateTime:1265695450000 PREHOOK: query: show table extended like partition_test_partitioned partition(dt=100) PREHOOK: type: SHOW_TABLESTATUS POSTHOOK: query: show table extended like partition_test_partitioned partition(dt=100) POSTHOOK: type: SHOW_TABLESTATUS tableName:partition_test_partitioned -owner:njain -location:file:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/partition_test_partitioned/dt=100 +owner:zshao +location:file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/partition_test_partitioned/dt=100 inputformat:org.apache.hadoop.mapred.TextInputFormat outputformat:org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat columns:struct columns { string key, string value} @@ -46,17 +46,17 @@ totalFileSize:216 maxFileSize:216 minFileSize:216 -lastAccessTime:0 -lastUpdateTime:1259087630000 +lastAccessTime:unknown +lastUpdateTime:1265695450000 PREHOOK: query: select key from partition_test_partitioned where dt=100 PREHOOK: type: QUERY PREHOOK: Input: default@partition_test_partitioned@dt=100 -PREHOOK: Output: file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/1314763739/10000 +PREHOOK: Output: file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/hive_2010-02-08_22-04-11_108_1574228616810949519/10000 POSTHOOK: query: select key from partition_test_partitioned where dt=100 POSTHOOK: type: QUERY POSTHOOK: Input: default@partition_test_partitioned@dt=100 -POSTHOOK: Output: file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/1314763739/10000 +POSTHOOK: Output: file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/hive_2010-02-08_22-04-11_108_1574228616810949519/10000 238 311 @@ -85,11 +85,11 @@ PREHOOK: query: select key from partition_test_partitioned PREHOOK: type: QUERY PREHOOK: Input: default@partition_test_partitioned@dt=100 -PREHOOK: Output: file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/710640588/10000 +PREHOOK: Output: file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/hive_2010-02-08_22-04-14_894_1993466480222470885/10000 POSTHOOK: query: select key from partition_test_partitioned POSTHOOK: type: QUERY POSTHOOK: Input: default@partition_test_partitioned@dt=100 -POSTHOOK: Output: file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/710640588/10000 +POSTHOOK: Output: file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/hive_2010-02-08_22-04-14_894_1993466480222470885/10000 238 311 @@ -134,8 +134,8 @@ POSTHOOK: query: show table extended like partition_test_partitioned POSTHOOK: type: SHOW_TABLESTATUS tableName:partition_test_partitioned -owner:njain -location:file:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/partition_test_partitioned +owner:zshao +location:file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/partition_test_partitioned inputformat:org.apache.hadoop.hive.ql.io.RCFileInputFormat outputformat:org.apache.hadoop.hive.ql.io.RCFileOutputFormat columns:struct columns { string key, string value} @@ -145,16 +145,16 @@ totalFileSize:586 maxFileSize:370 minFileSize:216 -lastAccessTime:0 -lastUpdateTime:1259087640000 +lastAccessTime:unknown +lastUpdateTime:1265695461000 PREHOOK: query: show table extended like partition_test_partitioned partition(dt=100) PREHOOK: type: SHOW_TABLESTATUS POSTHOOK: query: show table extended like partition_test_partitioned partition(dt=100) POSTHOOK: type: SHOW_TABLESTATUS tableName:partition_test_partitioned -owner:njain -location:file:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/partition_test_partitioned/dt=100 +owner:zshao +location:file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/partition_test_partitioned/dt=100 inputformat:org.apache.hadoop.mapred.TextInputFormat outputformat:org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat columns:struct columns { string key, string value} @@ -164,16 +164,16 @@ totalFileSize:216 maxFileSize:216 minFileSize:216 -lastAccessTime:0 -lastUpdateTime:1259087640000 +lastAccessTime:unknown +lastUpdateTime:1265695461000 PREHOOK: query: show table extended like partition_test_partitioned partition(dt=101) PREHOOK: type: SHOW_TABLESTATUS POSTHOOK: query: show table extended like partition_test_partitioned partition(dt=101) POSTHOOK: type: SHOW_TABLESTATUS tableName:partition_test_partitioned -owner:njain -location:file:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/partition_test_partitioned/dt=101 +owner:zshao +location:file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/partition_test_partitioned/dt=101 inputformat:org.apache.hadoop.hive.ql.io.RCFileInputFormat outputformat:org.apache.hadoop.hive.ql.io.RCFileOutputFormat columns:struct columns { string key, string value} @@ -183,17 +183,17 @@ totalFileSize:370 maxFileSize:370 minFileSize:370 -lastAccessTime:0 -lastUpdateTime:1259087640000 +lastAccessTime:unknown +lastUpdateTime:1265695461000 PREHOOK: query: select key from partition_test_partitioned where dt=100 PREHOOK: type: QUERY PREHOOK: Input: default@partition_test_partitioned@dt=100 -PREHOOK: Output: file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/646831114/10000 +PREHOOK: Output: file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/hive_2010-02-08_22-04-21_275_2001928558911118972/10000 POSTHOOK: query: select key from partition_test_partitioned where dt=100 POSTHOOK: type: QUERY POSTHOOK: Input: default@partition_test_partitioned@dt=100 -POSTHOOK: Output: file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/646831114/10000 +POSTHOOK: Output: file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/hive_2010-02-08_22-04-21_275_2001928558911118972/10000 238 311 @@ -222,11 +222,11 @@ PREHOOK: query: select key from partition_test_partitioned where dt=101 PREHOOK: type: QUERY PREHOOK: Input: default@partition_test_partitioned@dt=101 -PREHOOK: Output: file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/852607729/10000 +PREHOOK: Output: file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/hive_2010-02-08_22-04-24_508_5231406110420378004/10000 POSTHOOK: query: select key from partition_test_partitioned where dt=101 POSTHOOK: type: QUERY POSTHOOK: Input: default@partition_test_partitioned@dt=101 -POSTHOOK: Output: file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/852607729/10000 +POSTHOOK: Output: file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/hive_2010-02-08_22-04-24_508_5231406110420378004/10000 238 311 @@ -256,12 +256,12 @@ PREHOOK: type: QUERY PREHOOK: Input: default@partition_test_partitioned@dt=100 PREHOOK: Input: default@partition_test_partitioned@dt=101 -PREHOOK: Output: file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/933497662/10000 +PREHOOK: Output: file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/hive_2010-02-08_22-04-27_864_595783441105808452/10000 POSTHOOK: query: select key from partition_test_partitioned POSTHOOK: type: QUERY POSTHOOK: Input: default@partition_test_partitioned@dt=100 POSTHOOK: Input: default@partition_test_partitioned@dt=101 -POSTHOOK: Output: file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/933497662/10000 +POSTHOOK: Output: file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/hive_2010-02-08_22-04-27_864_595783441105808452/10000 238 311 @@ -331,8 +331,8 @@ POSTHOOK: query: show table extended like partition_test_partitioned POSTHOOK: type: SHOW_TABLESTATUS tableName:partition_test_partitioned -owner:njain -location:file:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/partition_test_partitioned +owner:zshao +location:file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/partition_test_partitioned inputformat:org.apache.hadoop.mapred.SequenceFileInputFormat outputformat:org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat columns:struct columns { string key, string value} @@ -342,16 +342,16 @@ totalFileSize:1474 maxFileSize:888 minFileSize:216 -lastAccessTime:0 -lastUpdateTime:1259087654000 +lastAccessTime:unknown +lastUpdateTime:1265695474000 PREHOOK: query: show table extended like partition_test_partitioned partition(dt=100) PREHOOK: type: SHOW_TABLESTATUS POSTHOOK: query: show table extended like partition_test_partitioned partition(dt=100) POSTHOOK: type: SHOW_TABLESTATUS tableName:partition_test_partitioned -owner:njain -location:file:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/partition_test_partitioned/dt=100 +owner:zshao +location:file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/partition_test_partitioned/dt=100 inputformat:org.apache.hadoop.mapred.TextInputFormat outputformat:org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat columns:struct columns { string key, string value} @@ -361,16 +361,16 @@ totalFileSize:216 maxFileSize:216 minFileSize:216 -lastAccessTime:0 -lastUpdateTime:1259087654000 +lastAccessTime:unknown +lastUpdateTime:1265695474000 PREHOOK: query: show table extended like partition_test_partitioned partition(dt=101) PREHOOK: type: SHOW_TABLESTATUS POSTHOOK: query: show table extended like partition_test_partitioned partition(dt=101) POSTHOOK: type: SHOW_TABLESTATUS tableName:partition_test_partitioned -owner:njain -location:file:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/partition_test_partitioned/dt=101 +owner:zshao +location:file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/partition_test_partitioned/dt=101 inputformat:org.apache.hadoop.hive.ql.io.RCFileInputFormat outputformat:org.apache.hadoop.hive.ql.io.RCFileOutputFormat columns:struct columns { string key, string value} @@ -380,18 +380,18 @@ totalFileSize:370 maxFileSize:370 minFileSize:370 -lastAccessTime:0 -lastUpdateTime:1259087654000 +lastAccessTime:unknown +lastUpdateTime:1265695474000 PREHOOK: query: show table extended like partition_test_partitioned partition(dt=102) PREHOOK: type: SHOW_TABLESTATUS POSTHOOK: query: show table extended like partition_test_partitioned partition(dt=102) POSTHOOK: type: SHOW_TABLESTATUS tableName:partition_test_partitioned -owner:njain -location:file:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/partition_test_partitioned/dt=102 +owner:zshao +location:file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/partition_test_partitioned/dt=102 inputformat:org.apache.hadoop.mapred.SequenceFileInputFormat -outputformat:org.apache.hadoop.mapred.SequenceFileOutputFormat +outputformat:org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat columns:struct columns { string key, string value} partitioned:true partitionColumns:struct partition_columns { string dt} @@ -399,17 +399,17 @@ totalFileSize:888 maxFileSize:888 minFileSize:888 -lastAccessTime:0 -lastUpdateTime:1259087654000 +lastAccessTime:unknown +lastUpdateTime:1265695474000 PREHOOK: query: select key from partition_test_partitioned where dt=100 PREHOOK: type: QUERY PREHOOK: Input: default@partition_test_partitioned@dt=100 -PREHOOK: Output: file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/911681205/10000 +PREHOOK: Output: file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/hive_2010-02-08_22-04-34_761_6787250997648210654/10000 POSTHOOK: query: select key from partition_test_partitioned where dt=100 POSTHOOK: type: QUERY POSTHOOK: Input: default@partition_test_partitioned@dt=100 -POSTHOOK: Output: file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/911681205/10000 +POSTHOOK: Output: file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/hive_2010-02-08_22-04-34_761_6787250997648210654/10000 238 311 @@ -438,11 +438,11 @@ PREHOOK: query: select key from partition_test_partitioned where dt=101 PREHOOK: type: QUERY PREHOOK: Input: default@partition_test_partitioned@dt=101 -PREHOOK: Output: file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/1814559948/10000 +PREHOOK: Output: file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/hive_2010-02-08_22-04-37_955_7303542209833538415/10000 POSTHOOK: query: select key from partition_test_partitioned where dt=101 POSTHOOK: type: QUERY POSTHOOK: Input: default@partition_test_partitioned@dt=101 -POSTHOOK: Output: file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/1814559948/10000 +POSTHOOK: Output: file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/hive_2010-02-08_22-04-37_955_7303542209833538415/10000 238 311 @@ -471,11 +471,11 @@ PREHOOK: query: select key from partition_test_partitioned where dt=102 PREHOOK: type: QUERY PREHOOK: Input: default@partition_test_partitioned@dt=102 -PREHOOK: Output: file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/857836436/10000 +PREHOOK: Output: file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/hive_2010-02-08_22-04-41_137_8811852470249659413/10000 POSTHOOK: query: select key from partition_test_partitioned where dt=102 POSTHOOK: type: QUERY POSTHOOK: Input: default@partition_test_partitioned@dt=102 -POSTHOOK: Output: file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/857836436/10000 +POSTHOOK: Output: file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/hive_2010-02-08_22-04-41_137_8811852470249659413/10000 238 311 @@ -506,13 +506,13 @@ PREHOOK: Input: default@partition_test_partitioned@dt=100 PREHOOK: Input: default@partition_test_partitioned@dt=101 PREHOOK: Input: default@partition_test_partitioned@dt=102 -PREHOOK: Output: file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/1800799624/10000 +PREHOOK: Output: file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/hive_2010-02-08_22-04-44_320_1009489530520037925/10000 POSTHOOK: query: select key from partition_test_partitioned POSTHOOK: type: QUERY POSTHOOK: Input: default@partition_test_partitioned@dt=100 POSTHOOK: Input: default@partition_test_partitioned@dt=101 POSTHOOK: Input: default@partition_test_partitioned@dt=102 -POSTHOOK: Output: file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/1800799624/10000 +POSTHOOK: Output: file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/hive_2010-02-08_22-04-44_320_1009489530520037925/10000 238 311 @@ -593,13 +593,13 @@ PREHOOK: Input: default@partition_test_partitioned@dt=100 PREHOOK: Input: default@partition_test_partitioned@dt=101 PREHOOK: Input: default@partition_test_partitioned@dt=102 -PREHOOK: Output: file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/1806258390/10000 +PREHOOK: Output: file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/hive_2010-02-08_22-04-48_037_6984143836467375088/10000 POSTHOOK: query: select key from partition_test_partitioned where dt >=100 and dt <= 102 POSTHOOK: type: QUERY POSTHOOK: Input: default@partition_test_partitioned@dt=100 POSTHOOK: Input: default@partition_test_partitioned@dt=101 POSTHOOK: Input: default@partition_test_partitioned@dt=102 -POSTHOOK: Output: file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/1806258390/10000 +POSTHOOK: Output: file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/hive_2010-02-08_22-04-48_037_6984143836467375088/10000 238 311 Index: ql/src/test/results/compiler/plan/join2.q.xml =================================================================== --- ql/src/test/results/compiler/plan/join2.q.xml (revision 908188) +++ ql/src/test/results/compiler/plan/join2.q.xml (working copy) @@ -30,7 +30,7 @@ true - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1788636483/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-26_307_2497378498139182191/10000 @@ -83,11 +83,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/dest1 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1264705833 + 1265685626 @@ -97,7 +97,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1788636483/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-26_307_2497378498139182191/10001 @@ -133,7 +133,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + @@ -175,11 +175,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1264705832 + 1265685625 @@ -766,7 +766,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/2003826759/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-26_307_2497378498139182191/10002 $INTNAME @@ -774,7 +774,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src src3 @@ -786,7 +786,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/2003826759/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-26_307_2497378498139182191/10002 org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe @@ -832,7 +832,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -844,10 +844,55 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + src + + + columns.types + string:string + + + serialization.ddl + struct src { string key, string value} + + + serialization.format + 1 + + + columns + key,value + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src + + + transient_lastDdlTime + 1265685625 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -864,7 +909,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -891,7 +936,7 @@ 1 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1788636483/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-26_307_2497378498139182191/10000 @@ -1302,10 +1347,55 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + src + + + columns.types + string:string + + + serialization.ddl + struct src { string key, string value} + + + serialization.format + 1 + + + columns + key,value + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src + + + transient_lastDdlTime + 1265685625 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1322,7 +1412,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1344,10 +1434,55 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + src + + + columns.types + string:string + + + serialization.ddl + struct src { string key, string value} + + + serialization.format + 1 + + + columns + key,value + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src + + + transient_lastDdlTime + 1265685625 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1364,7 +1499,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1877,7 +2012,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src src2 @@ -1892,7 +2027,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1904,10 +2039,55 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + src + + + columns.types + string:string + + + serialization.ddl + struct src { string key, string value} + + + serialization.format + 1 + + + columns + key,value + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src + + + transient_lastDdlTime + 1265685625 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1924,7 +2104,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1944,7 +2124,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/2003826759/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-26_307_2497378498139182191/10002 Index: ql/src/test/results/compiler/plan/input2.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input2.q.xml (revision 908188) +++ ql/src/test/results/compiler/plan/input2.q.xml (working copy) @@ -41,7 +41,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1267400894/10006 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-32_847_4013828837935080815/10006 @@ -286,10 +286,10 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1267400894/10006 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-32_847_4013828837935080815/10006 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1267400894/10006 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-32_847_4013828837935080815/10006 @@ -298,7 +298,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1267400894/10006 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-32_847_4013828837935080815/10006 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -349,11 +349,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/dest1 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1264705788 + 1265685572 @@ -392,7 +392,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1386199012/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-32_847_4013828837935080815/10000 @@ -441,7 +441,7 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/dest1 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/dest1 file.outputformat @@ -449,7 +449,7 @@ transient_lastDdlTime - 1264705788 + 1265685572 @@ -583,13 +583,13 @@ true - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1386199012/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-32_847_4013828837935080815/10000 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1386199012/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-32_847_4013828837935080815/10001 @@ -610,10 +610,10 @@ true - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1267400894/10006 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-32_847_4013828837935080815/10006 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1386199012/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-32_847_4013828837935080815/10000 @@ -639,7 +639,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1267400894/10006 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-32_847_4013828837935080815/10006 @@ -700,7 +700,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1267400894/10007 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-32_847_4013828837935080815/10007 @@ -937,10 +937,10 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1267400894/10007 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-32_847_4013828837935080815/10007 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1267400894/10007 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-32_847_4013828837935080815/10007 @@ -949,7 +949,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1267400894/10007 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-32_847_4013828837935080815/10007 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1000,11 +1000,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/dest2 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/dest2 transient_lastDdlTime - 1264705788 + 1265685572 @@ -1043,7 +1043,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1386199012/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-32_847_4013828837935080815/10002 @@ -1092,7 +1092,7 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/dest2 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/dest2 file.outputformat @@ -1100,7 +1100,7 @@ transient_lastDdlTime - 1264705788 + 1265685572 @@ -1234,13 +1234,13 @@ true - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1386199012/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-32_847_4013828837935080815/10002 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1386199012/10003 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-32_847_4013828837935080815/10003 @@ -1261,10 +1261,10 @@ true - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1267400894/10007 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-32_847_4013828837935080815/10007 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1386199012/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-32_847_4013828837935080815/10002 @@ -1290,7 +1290,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1267400894/10007 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-32_847_4013828837935080815/10007 @@ -1351,7 +1351,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1267400894/10008 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-32_847_4013828837935080815/10008 @@ -1588,10 +1588,10 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1267400894/10008 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-32_847_4013828837935080815/10008 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1267400894/10008 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-32_847_4013828837935080815/10008 @@ -1600,7 +1600,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1267400894/10008 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-32_847_4013828837935080815/10008 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1651,11 +1651,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/dest3 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/dest3 transient_lastDdlTime - 1264705788 + 1265685572 @@ -1694,7 +1694,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1386199012/10004 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-32_847_4013828837935080815/10004 @@ -1747,7 +1747,7 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/dest3 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/dest3 file.outputformat @@ -1755,7 +1755,7 @@ transient_lastDdlTime - 1264705788 + 1265685572 @@ -1902,13 +1902,13 @@ true - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1386199012/10004 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-32_847_4013828837935080815/10004 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1386199012/10005 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-32_847_4013828837935080815/10005 @@ -1929,10 +1929,10 @@ true - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1267400894/10008 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-32_847_4013828837935080815/10008 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1386199012/10004 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-32_847_4013828837935080815/10004 @@ -1958,7 +1958,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1267400894/10008 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-32_847_4013828837935080815/10008 @@ -2002,7 +2002,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + @@ -2044,11 +2044,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1264705788 + 1265685572 @@ -2100,7 +2100,7 @@ 1 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1267400894/10006 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-32_847_4013828837935080815/10006 @@ -2384,7 +2384,7 @@ 2 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1267400894/10007 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-32_847_4013828837935080815/10007 @@ -2711,7 +2711,7 @@ 3 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1267400894/10008 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-32_847_4013828837935080815/10008 @@ -3000,7 +3000,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src src @@ -3012,7 +3012,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -3024,10 +3024,55 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + src + + + columns.types + string:string + + + serialization.ddl + struct src { string key, string value} + + + serialization.format + 1 + + + columns + key,value + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src + + + transient_lastDdlTime + 1265685572 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -3044,7 +3089,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Index: ql/src/test/results/compiler/plan/join3.q.xml =================================================================== --- ql/src/test/results/compiler/plan/join3.q.xml (revision 908188) +++ ql/src/test/results/compiler/plan/join3.q.xml (working copy) @@ -26,7 +26,7 @@ true - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/414109849/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-30_254_1878863721322782205/10000 @@ -79,11 +79,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/dest1 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1264705836 + 1265685629 @@ -93,7 +93,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/414109849/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-30_254_1878863721322782205/10001 @@ -122,7 +122,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + @@ -164,11 +164,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1264705836 + 1265685628 @@ -209,10 +209,55 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + src + + + columns.types + string:string + + + serialization.ddl + struct src { string key, string value} + + + serialization.format + 1 + + + columns + key,value + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src + + + transient_lastDdlTime + 1265685628 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -229,7 +274,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -251,10 +296,55 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + src + + + columns.types + string:string + + + serialization.ddl + struct src { string key, string value} + + + serialization.format + 1 + + + columns + key,value + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src + + + transient_lastDdlTime + 1265685628 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -271,7 +361,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1002,7 +1092,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src src2 @@ -1020,7 +1110,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1032,10 +1122,55 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + src + + + columns.types + string:string + + + serialization.ddl + struct src { string key, string value} + + + serialization.format + 1 + + + columns + key,value + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src + + + transient_lastDdlTime + 1265685628 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1052,7 +1187,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1079,7 +1214,7 @@ 1 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/414109849/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-30_254_1878863721322782205/10000 Index: ql/src/test/results/compiler/plan/input3.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input3.q.xml (revision 908188) +++ ql/src/test/results/compiler/plan/input3.q.xml (working copy) @@ -41,7 +41,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1208388297/10007 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-41_938_552812817661327438/10007 @@ -286,10 +286,10 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1208388297/10007 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-41_938_552812817661327438/10007 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1208388297/10007 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-41_938_552812817661327438/10007 @@ -298,7 +298,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1208388297/10007 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-41_938_552812817661327438/10007 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -349,11 +349,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/dest1 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1264705795 + 1265685581 @@ -392,7 +392,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1155257432/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-41_938_552812817661327438/10000 @@ -441,7 +441,7 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/dest1 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/dest1 file.outputformat @@ -449,7 +449,7 @@ transient_lastDdlTime - 1264705795 + 1265685581 @@ -583,13 +583,13 @@ true - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1155257432/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-41_938_552812817661327438/10000 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1155257432/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-41_938_552812817661327438/10001 @@ -610,10 +610,10 @@ true - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1208388297/10007 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-41_938_552812817661327438/10007 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1155257432/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-41_938_552812817661327438/10000 @@ -639,7 +639,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1208388297/10007 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-41_938_552812817661327438/10007 @@ -700,7 +700,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1208388297/10008 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-41_938_552812817661327438/10008 @@ -937,10 +937,10 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1208388297/10008 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-41_938_552812817661327438/10008 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1208388297/10008 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-41_938_552812817661327438/10008 @@ -949,7 +949,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1208388297/10008 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-41_938_552812817661327438/10008 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1000,11 +1000,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/dest2 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/dest2 transient_lastDdlTime - 1264705795 + 1265685581 @@ -1043,7 +1043,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1155257432/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-41_938_552812817661327438/10002 @@ -1092,7 +1092,7 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/dest2 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/dest2 file.outputformat @@ -1100,7 +1100,7 @@ transient_lastDdlTime - 1264705795 + 1265685581 @@ -1234,13 +1234,13 @@ true - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1155257432/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-41_938_552812817661327438/10002 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1155257432/10003 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-41_938_552812817661327438/10003 @@ -1261,10 +1261,10 @@ true - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1208388297/10008 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-41_938_552812817661327438/10008 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1155257432/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-41_938_552812817661327438/10002 @@ -1290,7 +1290,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1208388297/10008 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-41_938_552812817661327438/10008 @@ -1351,7 +1351,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1208388297/10009 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-41_938_552812817661327438/10009 @@ -1588,10 +1588,10 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1208388297/10009 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-41_938_552812817661327438/10009 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1208388297/10009 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-41_938_552812817661327438/10009 @@ -1600,7 +1600,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1208388297/10009 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-41_938_552812817661327438/10009 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1651,11 +1651,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/dest3 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/dest3 transient_lastDdlTime - 1264705796 + 1265685581 @@ -1694,7 +1694,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1155257432/10004 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-41_938_552812817661327438/10004 @@ -1747,7 +1747,7 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/dest3 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/dest3 file.outputformat @@ -1755,7 +1755,7 @@ transient_lastDdlTime - 1264705796 + 1265685581 @@ -1902,13 +1902,13 @@ true - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1155257432/10004 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-41_938_552812817661327438/10004 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1155257432/10005 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-41_938_552812817661327438/10005 @@ -1929,10 +1929,10 @@ true - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1208388297/10009 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-41_938_552812817661327438/10009 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1155257432/10004 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-41_938_552812817661327438/10004 @@ -1958,7 +1958,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1208388297/10009 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-41_938_552812817661327438/10009 @@ -2019,7 +2019,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1208388297/10010 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-41_938_552812817661327438/10010 @@ -2230,10 +2230,10 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1208388297/10010 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-41_938_552812817661327438/10010 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1208388297/10010 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-41_938_552812817661327438/10010 @@ -2242,7 +2242,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1208388297/10010 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-41_938_552812817661327438/10010 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -2298,7 +2298,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1155257432/10006 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-41_938_552812817661327438/10006 @@ -2447,7 +2447,7 @@ true - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1155257432/10006 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-41_938_552812817661327438/10006 ../../../../build/contrib/hive/ql/test/data/warehouse/dest4.out @@ -2471,10 +2471,10 @@ true - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1208388297/10010 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-41_938_552812817661327438/10010 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1155257432/10006 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-41_938_552812817661327438/10006 @@ -2500,7 +2500,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1208388297/10010 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-41_938_552812817661327438/10010 @@ -2544,7 +2544,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + @@ -2586,11 +2586,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1264705795 + 1265685580 @@ -2642,7 +2642,7 @@ 1 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1208388297/10007 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-41_938_552812817661327438/10007 @@ -2926,7 +2926,7 @@ 2 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1208388297/10008 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-41_938_552812817661327438/10008 @@ -3253,7 +3253,7 @@ 3 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1208388297/10009 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-41_938_552812817661327438/10009 @@ -3577,7 +3577,7 @@ 4 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1208388297/10010 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-41_938_552812817661327438/10010 @@ -3842,7 +3842,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src src @@ -3854,7 +3854,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -3866,10 +3866,55 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + src + + + columns.types + string:string + + + serialization.ddl + struct src { string key, string value} + + + serialization.format + 1 + + + columns + key,value + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src + + + transient_lastDdlTime + 1265685580 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -3886,7 +3931,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Index: ql/src/test/results/compiler/plan/join4.q.xml =================================================================== --- ql/src/test/results/compiler/plan/join4.q.xml (revision 908188) +++ ql/src/test/results/compiler/plan/join4.q.xml (working copy) @@ -20,7 +20,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + @@ -62,11 +62,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1264705839 + 1265685632 @@ -107,10 +107,55 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + src + + + columns.types + string:string + + + serialization.ddl + struct src { string key, string value} + + + serialization.format + 1 + + + columns + key,value + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src + + + transient_lastDdlTime + 1265685632 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -127,7 +172,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1588,7 +1633,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src c:a:src1 @@ -1603,7 +1648,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1615,10 +1660,55 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + src + + + columns.types + string:string + + + serialization.ddl + struct src { string key, string value} + + + serialization.format + 1 + + + columns + key,value + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src + + + transient_lastDdlTime + 1265685632 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1635,7 +1725,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1663,7 +1753,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/94254933/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-33_140_8333064204875031104/10001 Index: ql/src/test/results/compiler/plan/input4.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input4.q.xml (revision 908188) +++ ql/src/test/results/compiler/plan/input4.q.xml (working copy) @@ -26,7 +26,7 @@ true - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/252630809/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-48_232_2636727870054901269/10000 @@ -79,11 +79,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/dest1 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1264705800 + 1265685587 @@ -93,7 +93,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/252630809/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-48_232_2636727870054901269/10001 @@ -122,7 +122,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + @@ -164,11 +164,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1264705800 + 1265685587 @@ -742,7 +742,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src tmap:src @@ -754,7 +754,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -766,10 +766,55 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + src + + + columns.types + string:string + + + serialization.ddl + struct src { string key, string value} + + + serialization.format + 1 + + + columns + key,value + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src + + + transient_lastDdlTime + 1265685587 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -786,7 +831,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -817,7 +862,7 @@ 1 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/252630809/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-48_232_2636727870054901269/10000 Index: ql/src/test/results/compiler/plan/join5.q.xml =================================================================== --- ql/src/test/results/compiler/plan/join5.q.xml (revision 908188) +++ ql/src/test/results/compiler/plan/join5.q.xml (working copy) @@ -20,7 +20,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + @@ -62,11 +62,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1264705842 + 1265685636 @@ -107,10 +107,55 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + src + + + columns.types + string:string + + + serialization.ddl + struct src { string key, string value} + + + serialization.format + 1 + + + columns + key,value + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src + + + transient_lastDdlTime + 1265685636 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -127,7 +172,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1588,7 +1633,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src c:a:src1 @@ -1603,7 +1648,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1615,10 +1660,55 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + src + + + columns.types + string:string + + + serialization.ddl + struct src { string key, string value} + + + serialization.format + 1 + + + columns + key,value + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src + + + transient_lastDdlTime + 1265685636 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1635,7 +1725,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1663,7 +1753,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1563157490/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-37_478_8286685238470002687/10001 Index: ql/src/test/results/compiler/plan/input5.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input5.q.xml (revision 908188) +++ ql/src/test/results/compiler/plan/input5.q.xml (working copy) @@ -26,7 +26,7 @@ true - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1160021243/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-51_158_6482686542645656265/10000 @@ -79,11 +79,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/dest1 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1264705803 + 1265685590 @@ -93,7 +93,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1160021243/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-51_158_6482686542645656265/10001 @@ -122,7 +122,7 @@ org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat - + @@ -168,11 +168,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src_thrift + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src_thrift transient_lastDdlTime - 1264705803 + 1265685590 @@ -836,7 +836,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src_thrift + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src_thrift tmap:src_thrift @@ -848,7 +848,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src_thrift + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src_thrift org.apache.hadoop.hive.serde2.thrift.ThriftDeserializer @@ -860,10 +860,59 @@ org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat - + - + + + name + src_thrift + + + columns.types + + + + serialization.ddl + struct src_thrift { } + + + columns + + + + serialization.format + org.apache.thrift.protocol.TBinaryProtocol + + + serialization.class + org.apache.hadoop.hive.serde2.thrift.test.Complex + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.thrift.ThriftDeserializer + + + file.inputformat + org.apache.hadoop.mapred.SequenceFileInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src_thrift + + + transient_lastDdlTime + 1265685590 + + org.apache.hadoop.hive.serde2.thrift.ThriftDeserializer @@ -880,7 +929,7 @@ org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat - + org.apache.hadoop.hive.serde2.thrift.ThriftDeserializer @@ -907,7 +956,7 @@ 1 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1160021243/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-51_158_6482686542645656265/10000 Index: ql/src/test/results/compiler/plan/join6.q.xml =================================================================== --- ql/src/test/results/compiler/plan/join6.q.xml (revision 908188) +++ ql/src/test/results/compiler/plan/join6.q.xml (working copy) @@ -20,7 +20,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + @@ -62,11 +62,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1264705846 + 1265685640 @@ -107,10 +107,55 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + src + + + columns.types + string:string + + + serialization.ddl + struct src { string key, string value} + + + serialization.format + 1 + + + columns + key,value + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src + + + transient_lastDdlTime + 1265685640 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -127,7 +172,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1588,7 +1633,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src c:a:src1 @@ -1603,7 +1648,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1615,10 +1660,55 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + src + + + columns.types + string:string + + + serialization.ddl + struct src { string key, string value} + + + serialization.format + 1 + + + columns + key,value + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src + + + transient_lastDdlTime + 1265685640 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1635,7 +1725,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1663,7 +1753,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/220202728/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-41_441_6608063904981007957/10001 Index: ql/src/test/results/compiler/plan/input_testxpath2.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input_testxpath2.q.xml (revision 908188) +++ ql/src/test/results/compiler/plan/input_testxpath2.q.xml (working copy) @@ -20,7 +20,7 @@ org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat - + @@ -66,11 +66,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src_thrift + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src_thrift transient_lastDdlTime - 1264705826 + 1265685619 @@ -123,7 +123,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1956347806/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-20_350_1181760787024038768/10001 @@ -877,7 +877,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src_thrift + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src_thrift src_thrift @@ -889,7 +889,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src_thrift + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src_thrift org.apache.hadoop.hive.serde2.thrift.ThriftDeserializer @@ -901,10 +901,59 @@ org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat - + - + + + name + src_thrift + + + columns.types + + + + serialization.ddl + struct src_thrift { } + + + columns + + + + serialization.format + org.apache.thrift.protocol.TBinaryProtocol + + + serialization.class + org.apache.hadoop.hive.serde2.thrift.test.Complex + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.thrift.ThriftDeserializer + + + file.inputformat + org.apache.hadoop.mapred.SequenceFileInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src_thrift + + + transient_lastDdlTime + 1265685619 + + org.apache.hadoop.hive.serde2.thrift.ThriftDeserializer @@ -921,7 +970,7 @@ org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat - + org.apache.hadoop.hive.serde2.thrift.ThriftDeserializer Index: ql/src/test/results/compiler/plan/input6.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input6.q.xml (revision 908188) +++ ql/src/test/results/compiler/plan/input6.q.xml (working copy) @@ -41,7 +41,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/792201955/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-55_838_5050489204412423843/10002 @@ -286,10 +286,10 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/792201955/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-55_838_5050489204412423843/10002 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/792201955/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-55_838_5050489204412423843/10002 @@ -298,7 +298,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/792201955/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-55_838_5050489204412423843/10002 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -349,11 +349,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/dest1 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1264705806 + 1265685595 @@ -392,7 +392,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1131625621/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-55_838_5050489204412423843/10000 @@ -441,7 +441,7 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/dest1 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/dest1 file.outputformat @@ -449,7 +449,7 @@ transient_lastDdlTime - 1264705806 + 1265685595 @@ -583,13 +583,13 @@ true - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1131625621/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-55_838_5050489204412423843/10000 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1131625621/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-55_838_5050489204412423843/10001 @@ -610,10 +610,10 @@ true - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/792201955/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-55_838_5050489204412423843/10002 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1131625621/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-55_838_5050489204412423843/10000 @@ -639,7 +639,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/792201955/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-55_838_5050489204412423843/10002 @@ -683,7 +683,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + @@ -725,11 +725,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src1 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src1 transient_lastDdlTime - 1264705806 + 1265685595 @@ -785,7 +785,7 @@ 1 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/792201955/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-55_838_5050489204412423843/10002 @@ -1150,7 +1150,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src1 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src1 src1 @@ -1162,7 +1162,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src1 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src1 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1174,10 +1174,55 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + src1 + + + columns.types + string:string + + + serialization.ddl + struct src1 { string key, string value} + + + serialization.format + 1 + + + columns + key,value + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src1 + + + transient_lastDdlTime + 1265685595 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1194,7 +1239,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Index: ql/src/test/results/compiler/plan/join7.q.xml =================================================================== --- ql/src/test/results/compiler/plan/join7.q.xml (revision 908188) +++ ql/src/test/results/compiler/plan/join7.q.xml (working copy) @@ -20,7 +20,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + @@ -62,11 +62,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1264705849 + 1265685643 @@ -107,10 +107,55 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + src + + + columns.types + string:string + + + serialization.ddl + struct src { string key, string value} + + + serialization.format + 1 + + + columns + key,value + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src + + + transient_lastDdlTime + 1265685643 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -127,7 +172,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -149,10 +194,55 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + src + + + columns.types + string:string + + + serialization.ddl + struct src { string key, string value} + + + serialization.format + 1 + + + columns + key,value + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src + + + transient_lastDdlTime + 1265685643 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -169,7 +259,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -2343,7 +2433,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src c:a:src1 @@ -2361,7 +2451,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -2373,10 +2463,55 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + src + + + columns.types + string:string + + + serialization.ddl + struct src { string key, string value} + + + serialization.format + 1 + + + columns + key,value + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src + + + transient_lastDdlTime + 1265685643 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -2393,7 +2528,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -2421,7 +2556,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1320380302/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-46_304_2430982027635407092/10001 Index: ql/src/test/results/compiler/plan/input7.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input7.q.xml (revision 908188) +++ ql/src/test/results/compiler/plan/input7.q.xml (working copy) @@ -41,7 +41,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1346570059/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-58_428_8782639417234323721/10002 @@ -286,10 +286,10 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1346570059/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-58_428_8782639417234323721/10002 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1346570059/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-58_428_8782639417234323721/10002 @@ -298,7 +298,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1346570059/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-58_428_8782639417234323721/10002 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -349,11 +349,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/dest1 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1264705809 + 1265685598 @@ -392,7 +392,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/864829868/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-58_428_8782639417234323721/10000 @@ -441,7 +441,7 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/dest1 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/dest1 file.outputformat @@ -449,7 +449,7 @@ transient_lastDdlTime - 1264705809 + 1265685598 @@ -587,13 +587,13 @@ true - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/864829868/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-58_428_8782639417234323721/10000 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/864829868/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-58_428_8782639417234323721/10001 @@ -614,10 +614,10 @@ true - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1346570059/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-58_428_8782639417234323721/10002 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/864829868/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-58_428_8782639417234323721/10000 @@ -643,7 +643,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1346570059/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-58_428_8782639417234323721/10002 @@ -687,7 +687,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + @@ -729,11 +729,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src1 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src1 transient_lastDdlTime - 1264705809 + 1265685597 @@ -781,7 +781,7 @@ 1 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1346570059/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-58_428_8782639417234323721/10002 @@ -997,7 +997,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src1 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src1 src1 @@ -1009,7 +1009,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src1 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src1 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1021,10 +1021,55 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + src1 + + + columns.types + string:string + + + serialization.ddl + struct src1 { string key, string value} + + + serialization.format + 1 + + + columns + key,value + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src1 + + + transient_lastDdlTime + 1265685597 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1041,7 +1086,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Index: ql/src/test/results/compiler/plan/input8.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input8.q.xml (revision 908188) +++ ql/src/test/results/compiler/plan/input8.q.xml (working copy) @@ -20,7 +20,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + @@ -62,11 +62,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src1 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src1 transient_lastDdlTime - 1264705812 + 1265685600 @@ -111,7 +111,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1203136565/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-01_233_1786032878675052895/10001 @@ -517,7 +517,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src1 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src1 src1 @@ -529,7 +529,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src1 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src1 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -541,10 +541,55 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + src1 + + + columns.types + string:string + + + serialization.ddl + struct src1 { string key, string value} + + + serialization.format + 1 + + + columns + key,value + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src1 + + + transient_lastDdlTime + 1265685600 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -561,7 +606,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Index: ql/src/test/results/compiler/plan/join8.q.xml =================================================================== --- ql/src/test/results/compiler/plan/join8.q.xml (revision 908188) +++ ql/src/test/results/compiler/plan/join8.q.xml (working copy) @@ -20,7 +20,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + @@ -62,11 +62,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1264705853 + 1265685650 @@ -107,10 +107,55 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + src + + + columns.types + string:string + + + serialization.ddl + struct src { string key, string value} + + + serialization.format + 1 + + + columns + key,value + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src + + + transient_lastDdlTime + 1265685650 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -127,7 +172,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1588,7 +1633,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src c:a:src1 @@ -1603,7 +1648,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1615,10 +1660,55 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + src + + + columns.types + string:string + + + serialization.ddl + struct src { string key, string value} + + + serialization.format + 1 + + + columns + key,value + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src + + + transient_lastDdlTime + 1265685650 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1635,7 +1725,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1667,7 +1757,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1658908742/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-51_511_5592805717163186797/10001 Index: ql/src/test/results/compiler/plan/input_testsequencefile.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input_testsequencefile.q.xml (revision 908188) +++ ql/src/test/results/compiler/plan/input_testsequencefile.q.xml (working copy) @@ -41,7 +41,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1886317854/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-13_083_38308768144271467/10002 @@ -286,10 +286,10 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1886317854/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-13_083_38308768144271467/10002 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1886317854/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-13_083_38308768144271467/10002 @@ -298,7 +298,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1886317854/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-13_083_38308768144271467/10002 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -349,11 +349,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/dest4_sequencefile + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/dest4_sequencefile transient_lastDdlTime - 1264705821 + 1265685612 @@ -392,7 +392,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/661943677/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-13_083_38308768144271467/10000 @@ -441,7 +441,7 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/dest4_sequencefile + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/dest4_sequencefile file.outputformat @@ -449,7 +449,7 @@ transient_lastDdlTime - 1264705821 + 1265685612 @@ -583,13 +583,13 @@ true - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/661943677/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-13_083_38308768144271467/10000 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/661943677/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-13_083_38308768144271467/10001 @@ -610,10 +610,10 @@ true - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1886317854/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-13_083_38308768144271467/10002 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/661943677/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-13_083_38308768144271467/10000 @@ -639,7 +639,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1886317854/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-13_083_38308768144271467/10002 @@ -683,7 +683,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + @@ -725,11 +725,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1264705821 + 1265685612 @@ -777,7 +777,7 @@ 1 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1886317854/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-13_083_38308768144271467/10002 @@ -1002,7 +1002,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src src @@ -1014,7 +1014,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1026,10 +1026,55 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + src + + + columns.types + string:string + + + serialization.ddl + struct src { string key, string value} + + + serialization.format + 1 + + + columns + key,value + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src + + + transient_lastDdlTime + 1265685612 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1046,7 +1091,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Index: ql/src/test/results/compiler/plan/union.q.xml =================================================================== --- ql/src/test/results/compiler/plan/union.q.xml (revision 908188) +++ ql/src/test/results/compiler/plan/union.q.xml (working copy) @@ -41,7 +41,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/270683497/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-37_939_433205444757812481/10001 @@ -286,10 +286,10 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/270683497/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-37_939_433205444757812481/10001 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/270683497/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-37_939_433205444757812481/10001 @@ -298,7 +298,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/270683497/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-37_939_433205444757812481/10001 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -354,7 +354,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/80994218/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-37_939_433205444757812481/10000 @@ -513,7 +513,7 @@ true - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/80994218/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-37_939_433205444757812481/10000 ../build/ql/test/data/warehouse/union.out @@ -537,10 +537,10 @@ true - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/270683497/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-37_939_433205444757812481/10001 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/80994218/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-37_939_433205444757812481/10000 @@ -566,7 +566,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/270683497/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-37_939_433205444757812481/10001 @@ -610,7 +610,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + @@ -652,11 +652,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1264705896 + 1265685697 @@ -697,10 +697,55 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + src + + + columns.types + string:string + + + serialization.ddl + struct src { string key, string value} + + + serialization.format + 1 + + + columns + key,value + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src + + + transient_lastDdlTime + 1265685697 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -717,7 +762,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -762,7 +807,7 @@ 1 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/270683497/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-37_939_433205444757812481/10001 @@ -1725,7 +1770,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src null-subquery1:unioninput-subquery1:src @@ -1740,7 +1785,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1752,10 +1797,55 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + src + + + columns.types + string:string + + + serialization.ddl + struct src { string key, string value} + + + serialization.format + 1 + + + columns + key,value + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src + + + transient_lastDdlTime + 1265685697 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1772,7 +1862,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Index: ql/src/test/results/compiler/plan/input9.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input9.q.xml (revision 908188) +++ ql/src/test/results/compiler/plan/input9.q.xml (working copy) @@ -41,7 +41,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1509441622/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-05_236_1358875887513682364/10002 @@ -286,10 +286,10 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1509441622/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-05_236_1358875887513682364/10002 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1509441622/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-05_236_1358875887513682364/10002 @@ -298,7 +298,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1509441622/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-05_236_1358875887513682364/10002 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -349,11 +349,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/dest1 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1264705815 + 1265685605 @@ -392,7 +392,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/2136845077/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-05_236_1358875887513682364/10000 @@ -441,7 +441,7 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/dest1 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/dest1 file.outputformat @@ -449,7 +449,7 @@ transient_lastDdlTime - 1264705815 + 1265685605 @@ -587,13 +587,13 @@ true - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/2136845077/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-05_236_1358875887513682364/10000 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/2136845077/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-05_236_1358875887513682364/10001 @@ -614,10 +614,10 @@ true - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1509441622/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-05_236_1358875887513682364/10002 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/2136845077/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-05_236_1358875887513682364/10000 @@ -643,7 +643,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1509441622/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-05_236_1358875887513682364/10002 @@ -687,7 +687,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + @@ -729,11 +729,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src1 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src1 transient_lastDdlTime - 1264705814 + 1265685604 @@ -789,7 +789,7 @@ 1 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1509441622/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-05_236_1358875887513682364/10002 @@ -1167,7 +1167,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src1 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src1 src1 @@ -1179,7 +1179,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src1 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src1 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1191,10 +1191,55 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + src1 + + + columns.types + string:string + + + serialization.ddl + struct src1 { string key, string value} + + + serialization.format + 1 + + + columns + key,value + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src1 + + + transient_lastDdlTime + 1265685604 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1211,7 +1256,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Index: ql/src/test/results/compiler/plan/udf1.q.xml =================================================================== --- ql/src/test/results/compiler/plan/udf1.q.xml (revision 908188) +++ ql/src/test/results/compiler/plan/udf1.q.xml (working copy) @@ -20,7 +20,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + @@ -62,11 +62,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1264705882 + 1265685681 @@ -119,7 +119,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1079409092/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-22_028_4689840652400546647/10001 @@ -1786,7 +1786,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src src @@ -1798,7 +1798,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1810,10 +1810,55 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + src + + + columns.types + string:string + + + serialization.ddl + struct src { string key, string value} + + + serialization.format + 1 + + + columns + key,value + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src + + + transient_lastDdlTime + 1265685681 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1830,7 +1875,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Index: ql/src/test/results/compiler/plan/udf4.q.xml =================================================================== --- ql/src/test/results/compiler/plan/udf4.q.xml (revision 908188) +++ ql/src/test/results/compiler/plan/udf4.q.xml (working copy) @@ -20,7 +20,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + @@ -62,11 +62,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/dest1 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1264705886 + 1265685685 @@ -111,7 +111,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/640598622/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-25_226_9128999293477244033/10001 @@ -1606,7 +1606,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/dest1 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/dest1 dest1 @@ -1618,7 +1618,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/dest1 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/dest1 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1630,10 +1630,55 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + dest1 + + + columns.types + string:string + + + serialization.ddl + struct dest1 { string key, string value} + + + serialization.format + 1 + + + columns + key,value + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/dest1 + + + transient_lastDdlTime + 1265685685 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1650,7 +1695,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Index: ql/src/test/results/compiler/plan/input_testxpath.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input_testxpath.q.xml (revision 908188) +++ ql/src/test/results/compiler/plan/input_testxpath.q.xml (working copy) @@ -20,7 +20,7 @@ org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat - + @@ -66,11 +66,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src_thrift + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src_thrift transient_lastDdlTime - 1264705824 + 1265685615 @@ -115,7 +115,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/631970649/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-15_885_6092174993422471129/10001 @@ -622,7 +622,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src_thrift + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src_thrift src_thrift @@ -634,7 +634,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src_thrift + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src_thrift org.apache.hadoop.hive.serde2.thrift.ThriftDeserializer @@ -646,10 +646,59 @@ org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat - + - + + + name + src_thrift + + + columns.types + + + + serialization.ddl + struct src_thrift { } + + + columns + + + + serialization.format + org.apache.thrift.protocol.TBinaryProtocol + + + serialization.class + org.apache.hadoop.hive.serde2.thrift.test.Complex + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.thrift.ThriftDeserializer + + + file.inputformat + org.apache.hadoop.mapred.SequenceFileInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src_thrift + + + transient_lastDdlTime + 1265685615 + + org.apache.hadoop.hive.serde2.thrift.ThriftDeserializer @@ -666,7 +715,7 @@ org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat - + org.apache.hadoop.hive.serde2.thrift.ThriftDeserializer Index: ql/src/test/results/compiler/plan/udf6.q.xml =================================================================== --- ql/src/test/results/compiler/plan/udf6.q.xml (revision 908188) +++ ql/src/test/results/compiler/plan/udf6.q.xml (working copy) @@ -20,7 +20,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + @@ -62,11 +62,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1264705888 + 1265685687 @@ -111,7 +111,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1175412943/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-28_086_5254195256204258116/10001 @@ -457,7 +457,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src src @@ -469,7 +469,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -481,10 +481,55 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + src + + + columns.types + string:string + + + serialization.ddl + struct src { string key, string value} + + + serialization.format + 1 + + + columns + key,value + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src + + + transient_lastDdlTime + 1265685687 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -501,7 +546,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Index: ql/src/test/results/compiler/plan/input_part1.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input_part1.q.xml (revision 908188) +++ ql/src/test/results/compiler/plan/input_part1.q.xml (working copy) @@ -20,7 +20,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + ds 2008-04-08 @@ -75,11 +75,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/srcpart + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/srcpart transient_lastDdlTime - 1264705816 + 1265685606 @@ -132,7 +132,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/744206176/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-08_027_7361931221937131650/10001 @@ -998,7 +998,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 srcpart @@ -1010,7 +1010,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1022,10 +1022,68 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + + + ds + 2008-04-08 + + + hr + 12 + + - + + + name + srcpart + + + columns.types + string:string + + + serialization.ddl + struct srcpart { string key, string value} + + + serialization.format + 1 + + + columns + key,value + + + partition_columns + ds/hr + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/srcpart + + + transient_lastDdlTime + 1265685606 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1042,7 +1100,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Index: ql/src/test/results/compiler/plan/groupby1.q.xml =================================================================== --- ql/src/test/results/compiler/plan/groupby1.q.xml (revision 908188) +++ ql/src/test/results/compiler/plan/groupby1.q.xml (working copy) @@ -26,7 +26,7 @@ true - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1324759775/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-05_176_4957788022637376791/10000 @@ -79,11 +79,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/dest1 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1264705766 + 1265685544 @@ -93,7 +93,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1324759775/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-05_176_4957788022637376791/10001 @@ -122,7 +122,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + @@ -164,11 +164,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1264705766 + 1265685543 @@ -741,7 +741,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src src @@ -753,7 +753,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -765,10 +765,55 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + src + + + columns.types + string:string + + + serialization.ddl + struct src { string key, string value} + + + serialization.format + 1 + + + columns + key,value + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src + + + transient_lastDdlTime + 1265685543 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -785,7 +830,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -812,7 +857,7 @@ 1 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1324759775/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-05_176_4957788022637376791/10000 Index: ql/src/test/results/compiler/plan/udf_case.q.xml =================================================================== --- ql/src/test/results/compiler/plan/udf_case.q.xml (revision 908188) +++ ql/src/test/results/compiler/plan/udf_case.q.xml (working copy) @@ -20,7 +20,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + @@ -62,11 +62,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1264705891 + 1265685692 @@ -115,7 +115,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1041921647/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-33_063_163599242477286469/10001 @@ -554,7 +554,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src src @@ -566,7 +566,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -578,10 +578,55 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + src + + + columns.types + string:string + + + serialization.ddl + struct src { string key, string value} + + + serialization.format + 1 + + + columns + key,value + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src + + + transient_lastDdlTime + 1265685692 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -598,7 +643,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Index: ql/src/test/results/compiler/plan/groupby2.q.xml =================================================================== --- ql/src/test/results/compiler/plan/groupby2.q.xml (revision 908188) +++ ql/src/test/results/compiler/plan/groupby2.q.xml (working copy) @@ -20,7 +20,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + @@ -62,11 +62,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1264705769 + 1265685549 @@ -882,7 +882,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src src @@ -894,7 +894,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -906,10 +906,55 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + src + + + columns.types + string:string + + + serialization.ddl + struct src { string key, string value} + + + serialization.format + 1 + + + columns + key,value + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src + + + transient_lastDdlTime + 1265685549 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -926,7 +971,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -950,7 +995,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/2052655618/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-10_628_3319774251844687438/10001 Index: ql/src/test/results/compiler/plan/subq.q.xml =================================================================== --- ql/src/test/results/compiler/plan/subq.q.xml (revision 908188) +++ ql/src/test/results/compiler/plan/subq.q.xml (working copy) @@ -41,7 +41,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/2133871384/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-18_830_2411026139868912420/10001 @@ -286,10 +286,10 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/2133871384/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-18_830_2411026139868912420/10001 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/2133871384/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-18_830_2411026139868912420/10001 @@ -298,7 +298,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/2133871384/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-18_830_2411026139868912420/10001 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -354,7 +354,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/375497440/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-18_830_2411026139868912420/10000 @@ -513,7 +513,7 @@ true - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/375497440/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-18_830_2411026139868912420/10000 ../build/ql/test/data/warehouse/union.out @@ -537,10 +537,10 @@ true - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/2133871384/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-18_830_2411026139868912420/10001 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/375497440/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-18_830_2411026139868912420/10000 @@ -566,7 +566,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/2133871384/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-18_830_2411026139868912420/10001 @@ -610,7 +610,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + @@ -652,11 +652,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1264705879 + 1265685678 @@ -716,7 +716,7 @@ 1 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/2133871384/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-18_830_2411026139868912420/10001 @@ -1251,7 +1251,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src unioninput:src @@ -1263,7 +1263,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1275,10 +1275,55 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + src + + + columns.types + string:string + + + serialization.ddl + struct src { string key, string value} + + + serialization.format + 1 + + + columns + key,value + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src + + + transient_lastDdlTime + 1265685678 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1295,7 +1340,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Index: ql/src/test/results/compiler/plan/groupby3.q.xml =================================================================== --- ql/src/test/results/compiler/plan/groupby3.q.xml (revision 908188) +++ ql/src/test/results/compiler/plan/groupby3.q.xml (working copy) @@ -20,7 +20,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + @@ -62,11 +62,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1265240095 + 1265685553 @@ -1083,7 +1083,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src src @@ -1095,7 +1095,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1107,10 +1107,55 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + src + + + columns.types + string:string + + + serialization.ddl + struct src { string key, string value} + + + serialization.format + 1 + + + columns + key,value + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src + + + transient_lastDdlTime + 1265685553 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1127,7 +1172,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1151,7 +1196,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/hive_2010-02-03_15-34-56_784_7206588683002520939/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-13_914_4176087609824787109/10001 Index: ql/src/test/results/compiler/plan/groupby4.q.xml =================================================================== --- ql/src/test/results/compiler/plan/groupby4.q.xml (revision 908188) +++ ql/src/test/results/compiler/plan/groupby4.q.xml (working copy) @@ -20,7 +20,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + @@ -62,11 +62,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1264705776 + 1265685558 @@ -556,7 +556,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src src @@ -568,7 +568,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -580,10 +580,55 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + src + + + columns.types + string:string + + + serialization.ddl + struct src { string key, string value} + + + serialization.format + 1 + + + columns + key,value + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src + + + transient_lastDdlTime + 1265685558 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -600,7 +645,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -624,7 +669,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/765584165/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-19_042_405477546425061446/10001 Index: ql/src/test/results/compiler/plan/groupby5.q.xml =================================================================== --- ql/src/test/results/compiler/plan/groupby5.q.xml (revision 908188) +++ ql/src/test/results/compiler/plan/groupby5.q.xml (working copy) @@ -20,7 +20,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + @@ -62,11 +62,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1264705779 + 1265685562 @@ -639,7 +639,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src src @@ -651,7 +651,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -663,10 +663,55 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + src + + + columns.types + string:string + + + serialization.ddl + struct src { string key, string value} + + + serialization.format + 1 + + + columns + key,value + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src + + + transient_lastDdlTime + 1265685562 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -683,7 +728,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -707,7 +752,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/912523634/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-22_820_5310681093346704822/10001 Index: ql/src/test/results/compiler/plan/groupby6.q.xml =================================================================== --- ql/src/test/results/compiler/plan/groupby6.q.xml (revision 908188) +++ ql/src/test/results/compiler/plan/groupby6.q.xml (working copy) @@ -20,7 +20,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + @@ -62,11 +62,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1264705782 + 1265685565 @@ -556,7 +556,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src src @@ -568,7 +568,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -580,10 +580,55 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + src + + + columns.types + string:string + + + serialization.ddl + struct src { string key, string value} + + + serialization.format + 1 + + + columns + key,value + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src + + + transient_lastDdlTime + 1265685565 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -600,7 +645,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -624,7 +669,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/493505022/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-26_453_3202841340053107667/10001 Index: ql/src/test/results/compiler/plan/case_sensitivity.q.xml =================================================================== --- ql/src/test/results/compiler/plan/case_sensitivity.q.xml (revision 908188) +++ ql/src/test/results/compiler/plan/case_sensitivity.q.xml (working copy) @@ -41,7 +41,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/713744598/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-18-52_335_8621075522169128653/10002 @@ -286,10 +286,10 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/713744598/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-18-52_335_8621075522169128653/10002 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/713744598/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-18-52_335_8621075522169128653/10002 @@ -298,7 +298,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/713744598/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-18-52_335_8621075522169128653/10002 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -349,11 +349,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/dest1 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1264705759 + 1265685531 @@ -392,7 +392,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1676842137/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-18-52_335_8621075522169128653/10000 @@ -441,7 +441,7 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/dest1 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/dest1 file.outputformat @@ -449,7 +449,7 @@ transient_lastDdlTime - 1264705759 + 1265685531 @@ -587,13 +587,13 @@ true - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1676842137/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-18-52_335_8621075522169128653/10000 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1676842137/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-18-52_335_8621075522169128653/10001 @@ -614,10 +614,10 @@ true - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/713744598/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-18-52_335_8621075522169128653/10002 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1676842137/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-18-52_335_8621075522169128653/10000 @@ -643,7 +643,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/713744598/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-18-52_335_8621075522169128653/10002 @@ -687,7 +687,7 @@ org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat - + @@ -733,11 +733,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src_thrift + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src_thrift transient_lastDdlTime - 1264705758 + 1265685531 @@ -793,7 +793,7 @@ 1 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/713744598/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-18-52_335_8621075522169128653/10002 @@ -1393,7 +1393,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src_thrift + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src_thrift src_thrift @@ -1405,7 +1405,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src_thrift + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src_thrift org.apache.hadoop.hive.serde2.thrift.ThriftDeserializer @@ -1417,10 +1417,59 @@ org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat - + - + + + name + src_thrift + + + columns.types + + + + serialization.ddl + struct src_thrift { } + + + columns + + + + serialization.format + org.apache.thrift.protocol.TBinaryProtocol + + + serialization.class + org.apache.hadoop.hive.serde2.thrift.test.Complex + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.thrift.ThriftDeserializer + + + file.inputformat + org.apache.hadoop.mapred.SequenceFileInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src_thrift + + + transient_lastDdlTime + 1265685531 + + org.apache.hadoop.hive.serde2.thrift.ThriftDeserializer @@ -1437,7 +1486,7 @@ org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat - + org.apache.hadoop.hive.serde2.thrift.ThriftDeserializer Index: ql/src/test/results/compiler/plan/udf_when.q.xml =================================================================== --- ql/src/test/results/compiler/plan/udf_when.q.xml (revision 908188) +++ ql/src/test/results/compiler/plan/udf_when.q.xml (working copy) @@ -20,7 +20,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + @@ -62,11 +62,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1264705894 + 1265685694 @@ -115,7 +115,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1919724057/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-35_345_7825074595617026495/10001 @@ -674,7 +674,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src src @@ -686,7 +686,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -698,10 +698,55 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + src + + + columns.types + string:string + + + serialization.ddl + struct src { string key, string value} + + + serialization.format + 1 + + + columns + key,value + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src + + + transient_lastDdlTime + 1265685694 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -718,7 +763,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Index: ql/src/test/results/compiler/plan/input20.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input20.q.xml (revision 908188) +++ ql/src/test/results/compiler/plan/input20.q.xml (working copy) @@ -20,7 +20,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + @@ -62,11 +62,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1264705792 + 1265685578 @@ -717,7 +717,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src tmap:src @@ -729,7 +729,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -741,10 +741,55 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + src + + + columns.types + string:string + + + serialization.ddl + struct src { string key, string value} + + + serialization.format + 1 + + + columns + key,value + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src + + + transient_lastDdlTime + 1265685578 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -761,7 +806,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -789,7 +834,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/795466972/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-38_650_2466934365164153346/10001 Index: ql/src/test/results/compiler/plan/sample1.q.xml =================================================================== --- ql/src/test/results/compiler/plan/sample1.q.xml (revision 908188) +++ ql/src/test/results/compiler/plan/sample1.q.xml (working copy) @@ -20,7 +20,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + ds 2008-04-08 @@ -75,11 +75,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/srcpart + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/srcpart transient_lastDdlTime - 1264705856 + 1265685653 @@ -136,7 +136,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1632395817/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-57_056_2978030967372906686/10001 @@ -1040,7 +1040,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 s @@ -1052,7 +1052,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1064,10 +1064,68 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + + + ds + 2008-04-08 + + + hr + 11 + + - + + + name + srcpart + + + columns.types + string:string + + + serialization.ddl + struct srcpart { string key, string value} + + + serialization.format + 1 + + + columns + key,value + + + partition_columns + ds/hr + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/srcpart + + + transient_lastDdlTime + 1265685653 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1084,7 +1142,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Index: ql/src/test/results/compiler/plan/sample2.q.xml =================================================================== --- ql/src/test/results/compiler/plan/sample2.q.xml (revision 908188) +++ ql/src/test/results/compiler/plan/sample2.q.xml (working copy) @@ -41,7 +41,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/719989248/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-59_522_3221254866317961463/10002 @@ -286,10 +286,10 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/719989248/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-59_522_3221254866317961463/10002 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/719989248/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-59_522_3221254866317961463/10002 @@ -298,7 +298,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/719989248/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-59_522_3221254866317961463/10002 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -349,11 +349,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/dest1 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1264705860 + 1265685659 @@ -392,7 +392,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1188981886/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-59_522_3221254866317961463/10000 @@ -441,7 +441,7 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/dest1 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/dest1 file.outputformat @@ -449,7 +449,7 @@ transient_lastDdlTime - 1264705860 + 1265685659 @@ -587,13 +587,13 @@ true - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1188981886/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-59_522_3221254866317961463/10000 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1188981886/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-59_522_3221254866317961463/10001 @@ -614,10 +614,10 @@ true - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/719989248/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-59_522_3221254866317961463/10002 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1188981886/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-59_522_3221254866317961463/10000 @@ -643,7 +643,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/719989248/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-59_522_3221254866317961463/10002 @@ -687,7 +687,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + @@ -733,11 +733,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/srcbucket + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1264705859 + 1265685658 @@ -793,7 +793,7 @@ 1 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/719989248/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-59_522_3221254866317961463/10002 @@ -1364,7 +1364,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt s @@ -1376,7 +1376,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1388,10 +1388,59 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + srcbucket + + + columns.types + int:string + + + bucket_field_name + key + + + serialization.ddl + struct srcbucket { i32 key, string value} + + + columns + key,value + + + serialization.format + 1 + + + bucket_count + 2 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/srcbucket + + + transient_lastDdlTime + 1265685658 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1408,7 +1457,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Index: ql/src/test/results/compiler/plan/sample3.q.xml =================================================================== --- ql/src/test/results/compiler/plan/sample3.q.xml (revision 908188) +++ ql/src/test/results/compiler/plan/sample3.q.xml (working copy) @@ -41,7 +41,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/484266734/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-03_182_3720670040296269775/10002 @@ -286,10 +286,10 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/484266734/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-03_182_3720670040296269775/10002 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/484266734/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-03_182_3720670040296269775/10002 @@ -298,7 +298,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/484266734/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-03_182_3720670040296269775/10002 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -349,11 +349,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/dest1 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1264705864 + 1265685663 @@ -392,7 +392,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1646181153/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-03_182_3720670040296269775/10000 @@ -441,7 +441,7 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/dest1 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/dest1 file.outputformat @@ -449,7 +449,7 @@ transient_lastDdlTime - 1264705864 + 1265685663 @@ -587,13 +587,13 @@ true - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1646181153/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-03_182_3720670040296269775/10000 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1646181153/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-03_182_3720670040296269775/10001 @@ -614,10 +614,10 @@ true - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/484266734/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-03_182_3720670040296269775/10002 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1646181153/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-03_182_3720670040296269775/10000 @@ -643,7 +643,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/484266734/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-03_182_3720670040296269775/10002 @@ -687,7 +687,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + @@ -733,11 +733,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/srcbucket + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1264705862 + 1265685661 @@ -793,7 +793,7 @@ 1 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/484266734/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-03_182_3720670040296269775/10002 @@ -1387,7 +1387,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/srcbucket + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/srcbucket s @@ -1399,7 +1399,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/srcbucket + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/srcbucket org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1411,10 +1411,59 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + srcbucket + + + columns.types + int:string + + + bucket_field_name + key + + + serialization.ddl + struct srcbucket { i32 key, string value} + + + columns + key,value + + + serialization.format + 1 + + + bucket_count + 2 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/srcbucket + + + transient_lastDdlTime + 1265685661 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1431,7 +1480,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Index: ql/src/test/results/compiler/plan/sample4.q.xml =================================================================== --- ql/src/test/results/compiler/plan/sample4.q.xml (revision 908188) +++ ql/src/test/results/compiler/plan/sample4.q.xml (working copy) @@ -41,7 +41,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1451909751/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-05_628_1091752586260895582/10002 @@ -286,10 +286,10 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1451909751/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-05_628_1091752586260895582/10002 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1451909751/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-05_628_1091752586260895582/10002 @@ -298,7 +298,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1451909751/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-05_628_1091752586260895582/10002 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -349,11 +349,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/dest1 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1264705867 + 1265685665 @@ -392,7 +392,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1892914268/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-05_628_1091752586260895582/10000 @@ -441,7 +441,7 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/dest1 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/dest1 file.outputformat @@ -449,7 +449,7 @@ transient_lastDdlTime - 1264705867 + 1265685665 @@ -587,13 +587,13 @@ true - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1892914268/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-05_628_1091752586260895582/10000 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1892914268/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-05_628_1091752586260895582/10001 @@ -614,10 +614,10 @@ true - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1451909751/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-05_628_1091752586260895582/10002 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1892914268/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-05_628_1091752586260895582/10000 @@ -643,7 +643,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1451909751/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-05_628_1091752586260895582/10002 @@ -687,7 +687,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + @@ -733,11 +733,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/srcbucket + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1264705865 + 1265685664 @@ -793,7 +793,7 @@ 1 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1451909751/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-05_628_1091752586260895582/10002 @@ -1364,7 +1364,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt s @@ -1376,7 +1376,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1388,10 +1388,59 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + srcbucket + + + columns.types + int:string + + + bucket_field_name + key + + + serialization.ddl + struct srcbucket { i32 key, string value} + + + columns + key,value + + + serialization.format + 1 + + + bucket_count + 2 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/srcbucket + + + transient_lastDdlTime + 1265685664 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1408,7 +1457,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Index: ql/src/test/results/compiler/plan/sample5.q.xml =================================================================== --- ql/src/test/results/compiler/plan/sample5.q.xml (revision 908188) +++ ql/src/test/results/compiler/plan/sample5.q.xml (working copy) @@ -41,7 +41,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/192500391/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-09_828_1344087717719097782/10002 @@ -286,10 +286,10 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/192500391/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-09_828_1344087717719097782/10002 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/192500391/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-09_828_1344087717719097782/10002 @@ -298,7 +298,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/192500391/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-09_828_1344087717719097782/10002 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -349,11 +349,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/dest1 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1264705870 + 1265685669 @@ -392,7 +392,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1419098445/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-09_828_1344087717719097782/10000 @@ -441,7 +441,7 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/dest1 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/dest1 file.outputformat @@ -449,7 +449,7 @@ transient_lastDdlTime - 1264705870 + 1265685669 @@ -587,13 +587,13 @@ true - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1419098445/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-09_828_1344087717719097782/10000 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1419098445/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-09_828_1344087717719097782/10001 @@ -614,10 +614,10 @@ true - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/192500391/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-09_828_1344087717719097782/10002 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1419098445/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-09_828_1344087717719097782/10000 @@ -643,7 +643,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/192500391/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-09_828_1344087717719097782/10002 @@ -687,7 +687,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + @@ -733,11 +733,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/srcbucket + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1264705869 + 1265685667 @@ -793,7 +793,7 @@ 1 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/192500391/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-09_828_1344087717719097782/10002 @@ -1361,7 +1361,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/srcbucket + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/srcbucket s @@ -1373,7 +1373,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/srcbucket + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/srcbucket org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1385,10 +1385,59 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + srcbucket + + + columns.types + int:string + + + bucket_field_name + key + + + serialization.ddl + struct srcbucket { i32 key, string value} + + + columns + key,value + + + serialization.format + 1 + + + bucket_count + 2 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/srcbucket + + + transient_lastDdlTime + 1265685667 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1405,7 +1454,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Index: ql/src/test/results/compiler/plan/sample6.q.xml =================================================================== --- ql/src/test/results/compiler/plan/sample6.q.xml (revision 908188) +++ ql/src/test/results/compiler/plan/sample6.q.xml (working copy) @@ -41,7 +41,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1374090736/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-12_933_5933065153986231975/10002 @@ -286,10 +286,10 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1374090736/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-12_933_5933065153986231975/10002 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1374090736/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-12_933_5933065153986231975/10002 @@ -298,7 +298,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1374090736/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-12_933_5933065153986231975/10002 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -349,11 +349,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/dest1 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1264705873 + 1265685672 @@ -392,7 +392,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1685462884/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-12_933_5933065153986231975/10000 @@ -441,7 +441,7 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/dest1 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/dest1 file.outputformat @@ -449,7 +449,7 @@ transient_lastDdlTime - 1264705873 + 1265685672 @@ -587,13 +587,13 @@ true - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1685462884/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-12_933_5933065153986231975/10000 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1685462884/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-12_933_5933065153986231975/10001 @@ -614,10 +614,10 @@ true - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1374090736/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-12_933_5933065153986231975/10002 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1685462884/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-12_933_5933065153986231975/10000 @@ -643,7 +643,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1374090736/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-12_933_5933065153986231975/10002 @@ -687,7 +687,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + @@ -733,11 +733,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/srcbucket + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1264705872 + 1265685671 @@ -793,7 +793,7 @@ 1 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1374090736/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-12_933_5933065153986231975/10002 @@ -1364,7 +1364,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt s @@ -1376,7 +1376,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1388,10 +1388,59 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + srcbucket + + + columns.types + int:string + + + bucket_field_name + key + + + serialization.ddl + struct srcbucket { i32 key, string value} + + + columns + key,value + + + serialization.format + 1 + + + bucket_count + 2 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/srcbucket + + + transient_lastDdlTime + 1265685671 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1408,7 +1457,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Index: ql/src/test/results/compiler/plan/sample7.q.xml =================================================================== --- ql/src/test/results/compiler/plan/sample7.q.xml (revision 908188) +++ ql/src/test/results/compiler/plan/sample7.q.xml (working copy) @@ -41,7 +41,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1073087963/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-16_056_2741465299123939124/10002 @@ -286,10 +286,10 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1073087963/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-16_056_2741465299123939124/10002 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1073087963/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-16_056_2741465299123939124/10002 @@ -298,7 +298,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1073087963/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-16_056_2741465299123939124/10002 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -349,11 +349,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/dest1 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1264705876 + 1265685675 @@ -392,7 +392,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/983724956/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-16_056_2741465299123939124/10000 @@ -441,7 +441,7 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/dest1 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/dest1 file.outputformat @@ -449,7 +449,7 @@ transient_lastDdlTime - 1264705876 + 1265685675 @@ -587,13 +587,13 @@ true - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/983724956/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-16_056_2741465299123939124/10000 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/983724956/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-16_056_2741465299123939124/10001 @@ -614,10 +614,10 @@ true - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1073087963/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-16_056_2741465299123939124/10002 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/983724956/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-16_056_2741465299123939124/10000 @@ -643,7 +643,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1073087963/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-16_056_2741465299123939124/10002 @@ -687,7 +687,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + @@ -733,11 +733,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/srcbucket + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/srcbucket transient_lastDdlTime - 1264705874 + 1265685674 @@ -797,7 +797,7 @@ 1 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1073087963/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-21-16_056_2741465299123939124/10002 @@ -1527,7 +1527,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt s @@ -1539,7 +1539,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/srcbucket/srcbucket0.txt org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1551,10 +1551,59 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + srcbucket + + + columns.types + int:string + + + bucket_field_name + key + + + serialization.ddl + struct srcbucket { i32 key, string value} + + + columns + key,value + + + serialization.format + 1 + + + bucket_count + 2 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/srcbucket + + + transient_lastDdlTime + 1265685674 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1571,7 +1620,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Index: ql/src/test/results/compiler/plan/cast1.q.xml =================================================================== --- ql/src/test/results/compiler/plan/cast1.q.xml (revision 908188) +++ ql/src/test/results/compiler/plan/cast1.q.xml (working copy) @@ -20,7 +20,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + @@ -62,11 +62,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1264705762 + 1265685537 @@ -119,7 +119,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1533179609/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-18-58_481_5826547043629173630/10001 @@ -1017,7 +1017,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src src @@ -1029,7 +1029,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1041,10 +1041,55 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + src + + + columns.types + string:string + + + serialization.ddl + struct src { string key, string value} + + + serialization.format + 1 + + + columns + key,value + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src + + + transient_lastDdlTime + 1265685537 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1061,7 +1106,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Index: ql/src/test/results/compiler/plan/join1.q.xml =================================================================== --- ql/src/test/results/compiler/plan/join1.q.xml (revision 908188) +++ ql/src/test/results/compiler/plan/join1.q.xml (working copy) @@ -26,7 +26,7 @@ true - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1840319965/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-22_940_6445091516613192810/10000 @@ -79,11 +79,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/dest1 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1264705830 + 1265685622 @@ -93,7 +93,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1840319965/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-22_940_6445091516613192810/10001 @@ -122,7 +122,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + @@ -164,11 +164,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1264705829 + 1265685622 @@ -209,10 +209,55 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + src + + + columns.types + string:string + + + serialization.ddl + struct src { string key, string value} + + + serialization.format + 1 + + + columns + key,value + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src + + + transient_lastDdlTime + 1265685622 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -229,7 +274,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -749,7 +794,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src src2 @@ -764,7 +809,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -776,10 +821,55 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + src + + + columns.types + string:string + + + serialization.ddl + struct src { string key, string value} + + + serialization.format + 1 + + + columns + key,value + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src + + + transient_lastDdlTime + 1265685622 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -796,7 +886,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -823,7 +913,7 @@ 1 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1840319965/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-20-22_940_6445091516613192810/10000 Index: ql/src/test/results/compiler/plan/input1.q.xml =================================================================== --- ql/src/test/results/compiler/plan/input1.q.xml (revision 908188) +++ ql/src/test/results/compiler/plan/input1.q.xml (working copy) @@ -41,7 +41,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/680800885/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-28_913_376722328058231883/10002 @@ -286,10 +286,10 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/680800885/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-28_913_376722328058231883/10002 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/680800885/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-28_913_376722328058231883/10002 @@ -298,7 +298,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/680800885/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-28_913_376722328058231883/10002 org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -349,11 +349,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/dest1 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/dest1 transient_lastDdlTime - 1264705785 + 1265685568 @@ -392,7 +392,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1449157496/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-28_913_376722328058231883/10000 @@ -441,7 +441,7 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/dest1 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/dest1 file.outputformat @@ -449,7 +449,7 @@ transient_lastDdlTime - 1264705785 + 1265685568 @@ -583,13 +583,13 @@ true - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1449157496/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-28_913_376722328058231883/10000 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1449157496/10001 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-28_913_376722328058231883/10001 @@ -610,10 +610,10 @@ true - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/680800885/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-28_913_376722328058231883/10002 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/1449157496/10000 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-28_913_376722328058231883/10000 @@ -639,7 +639,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/680800885/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-28_913_376722328058231883/10002 @@ -683,7 +683,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + @@ -725,11 +725,11 @@ location - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src transient_lastDdlTime - 1264705785 + 1265685568 @@ -785,7 +785,7 @@ 1 - file:/data/users/zshao/hadoop_hive_trunk/build/ql/scratchdir/680800885/10002 + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/scratchdir/hive_2010-02-08_19-19-28_913_376722328058231883/10002 @@ -1194,7 +1194,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src src @@ -1206,7 +1206,7 @@ - file:/data/users/zshao/hadoop_hive_trunk/build/ql/test/data/warehouse/src + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1218,10 +1218,55 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + - + + + name + src + + + columns.types + string:string + + + serialization.ddl + struct src { string key, string value} + + + serialization.format + 1 + + + columns + key,value + + + bucket_count + -1 + + + serialization.lib + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + + + file.inputformat + org.apache.hadoop.mapred.TextInputFormat + + + file.outputformat + org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + + + location + file:/data/users/zshao/hadoop_hive_trunk/.ptest_3/build/ql/test/data/warehouse/src + + + transient_lastDdlTime + 1265685568 + + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1238,7 +1283,7 @@ org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - + org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Index: ql/src/test/org/apache/hadoop/hive/ql/metadata/TestHiveMetaStoreChecker.java =================================================================== --- ql/src/test/org/apache/hadoop/hive/ql/metadata/TestHiveMetaStoreChecker.java (revision 908188) +++ ql/src/test/org/apache/hadoop/hive/ql/metadata/TestHiveMetaStoreChecker.java (working copy) @@ -13,6 +13,7 @@ import org.apache.hadoop.hive.metastore.api.AlreadyExistsException; import org.apache.hadoop.hive.metastore.api.FieldSchema; import org.apache.hadoop.hive.metastore.api.MetaException; +import org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat; import org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat; import org.apache.hadoop.hive.serde.Constants; import org.apache.hadoop.mapred.TextInputFormat; @@ -91,9 +92,9 @@ hive.createDatabase(dbName, ""); Table table = new Table(tableName); - table.getTTable().setDbName(dbName); + table.setDbName(dbName); table.setInputFormatClass(TextInputFormat.class); - table.setOutputFormatClass(IgnoreKeyTextOutputFormat.class); + table.setOutputFormatClass(HiveIgnoreKeyTextOutputFormat.class); hive.createTable(table); // now we've got a table, check that it works @@ -161,9 +162,9 @@ hive.createDatabase(dbName, ""); Table table = new Table(tableName); - table.getTTable().setDbName(dbName); + table.setDbName(dbName); table.setInputFormatClass(TextInputFormat.class); - table.setOutputFormatClass(IgnoreKeyTextOutputFormat.class); + table.setOutputFormatClass(HiveIgnoreKeyTextOutputFormat.class); table.setPartCols(partCols); hive.createTable(table); @@ -196,7 +197,7 @@ assertEquals(1, result.getPartitionsNotOnFs().size()); assertEquals(partToRemove.getName(), result.getPartitionsNotOnFs().get(0) .getPartitionName()); - assertEquals(partToRemove.getTable().getName(), result + assertEquals(partToRemove.getTable().getTableName(), result .getPartitionsNotOnFs().get(0).getTableName()); assertTrue(result.getPartitionsNotInMs().isEmpty()); Index: ql/src/test/org/apache/hadoop/hive/ql/metadata/TestPartition.java =================================================================== --- ql/src/test/org/apache/hadoop/hive/ql/metadata/TestPartition.java (revision 908188) +++ ql/src/test/org/apache/hadoop/hive/ql/metadata/TestPartition.java (working copy) @@ -43,8 +43,7 @@ tbl.setDataLocation(new URI("tmplocation")); tbl.setPartCols(partCols); - Map spec = new org.apache.hadoop.hive.ql.metadata.Partition( - tbl, tp).getSpec(); + Map spec = new org.apache.hadoop.hive.ql.metadata.Partition(tbl, tp).getSpec(); assertFalse(spec.isEmpty()); assertEquals(spec.get(PARTITION_COL), PARTITION_VALUE); } Index: ql/src/test/org/apache/hadoop/hive/ql/metadata/TestHive.java =================================================================== --- ql/src/test/org/apache/hadoop/hive/ql/metadata/TestHive.java (revision 908188) +++ ql/src/test/org/apache/hadoop/hive/ql/metadata/TestHive.java (working copy) @@ -153,7 +153,7 @@ ft = hm.getTable(MetaStoreUtils.DEFAULT_DATABASE_NAME, tableName); ft.checkValidity(); assertEquals("Table names didn't match for table: " + tableName, tbl - .getName(), ft.getName()); + .getTableName(), ft.getTableName()); assertEquals("Table owners didn't match for table: " + tableName, tbl .getOwner(), ft.getOwner()); assertEquals("Table retention didn't match for table: " + tableName, @@ -226,7 +226,7 @@ assertNotNull("Unable to fetch table", ft); ft.checkValidity(); assertEquals("Table names didn't match for table: " + tableName, tbl - .getName(), ft.getName()); + .getTableName(), ft.getTableName()); assertEquals("Table owners didn't match for table: " + tableName, tbl .getOwner(), ft.getOwner()); assertEquals("Table retention didn't match for table: " + tableName, @@ -257,7 +257,7 @@ private static Table createTestTable(String dbName, String tableName) throws HiveException { Table tbl = new Table(tableName); - tbl.getTTable().setDbName(dbName); + tbl.setDbName(dbName); tbl.setInputFormatClass(SequenceFileInputFormat.class.getName()); tbl.setOutputFormatClass(SequenceFileOutputFormat.class.getName()); tbl.setSerializationLib(ThriftDeserializer.class.getName()); @@ -294,7 +294,7 @@ // also test getting a table from a specific db Table table1 = hm.getTable(dbName, table1Name); assertNotNull(table1); - assertEquals(table1Name, table1.getName()); + assertEquals(table1Name, table1.getTableName()); assertTrue(fs.exists(table1.getPath())); // and test dropping this specific table Index: ql/src/java/org/apache/hadoop/hive/ql/metadata/HiveMetaStoreChecker.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/metadata/HiveMetaStoreChecker.java (revision 908188) +++ ql/src/java/org/apache/hadoop/hive/ql/metadata/HiveMetaStoreChecker.java (working copy) @@ -225,7 +225,7 @@ Path tablePath = table.getPath(); FileSystem fs = tablePath.getFileSystem(conf); if (!fs.exists(tablePath)) { - result.getTablesNotOnFs().add(table.getName()); + result.getTablesNotOnFs().add(table.getTableName()); return; } @@ -242,7 +242,7 @@ if (!fs.exists(partPath)) { PartitionResult pr = new PartitionResult(); pr.setPartitionName(partition.getName()); - pr.setTableName(partition.getTable().getName()); + pr.setTableName(partition.getTable().getTableName()); result.getPartitionsNotOnFs().add(pr); } @@ -292,7 +292,7 @@ if (partitionName != null) { PartitionResult pr = new PartitionResult(); pr.setPartitionName(partitionName); - pr.setTableName(table.getName()); + pr.setTableName(table.getTableName()); result.getPartitionsNotInMs().add(pr); } Index: ql/src/java/org/apache/hadoop/hive/ql/metadata/Table.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/metadata/Table.java (revision 908188) +++ ql/src/java/org/apache/hadoop/hive/ql/metadata/Table.java (working copy) @@ -19,6 +19,7 @@ package org.apache.hadoop.hive.ql.metadata; import java.io.IOException; +import java.io.Serializable; import java.net.URI; import java.util.ArrayList; import java.util.HashMap; @@ -42,6 +43,7 @@ import org.apache.hadoop.hive.metastore.api.StorageDescriptor; import org.apache.hadoop.hive.ql.io.HiveFileFormatUtils; import org.apache.hadoop.hive.ql.io.HiveOutputFormat; +import org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat; import org.apache.hadoop.hive.serde.Constants; import org.apache.hadoop.hive.serde2.Deserializer; import org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe; @@ -52,125 +54,100 @@ import org.apache.hadoop.io.Writable; import org.apache.hadoop.io.WritableComparable; import org.apache.hadoop.mapred.InputFormat; +import org.apache.hadoop.mapred.SequenceFileInputFormat; /** - * A Hive Table: is a fundamental unit of data in Hive that shares a common - * schema/DDL + * A Hive Table: is a fundamental unit of data in Hive that shares a common schema/DDL. + * + * Please note that the ql code should always go through methods of this class to access the + * metadata, instead of directly accessing org.apache.hadoop.hive.metastore.api.Table. This + * helps to isolate the metastore code and the ql code. */ -public class Table { +public class Table implements Serializable { + private static final long serialVersionUID = 1L; + static final private Log LOG = LogFactory.getLog("hive.ql.metadata.Table"); - private Properties schema; - private Deserializer deserializer; - private URI uri; - private Class inputFormatClass; - private Class outputFormatClass; private org.apache.hadoop.hive.metastore.api.Table tTable; /** - * Table (only used internally) - * - * @throws HiveException - * + * These fields are all cached fields. The information comes from tTable. */ - protected Table() throws HiveException { + private Deserializer deserializer; + private Class outputFormatClass; + private Class inputFormatClass; + private URI uri; + + public Table() { } - /** - * Table - * - * Create a TableMetaInfo object presumably with the intent of saving it to - * the metastore - * - * @param name - * the name of this table in the metadb - * @param schema - * an object that represents the schema that this SerDe must know - * @param deserializer - * a Class to be used for deserializing the data - * @param dataLocation - * where is the table ? (e.g., - * dfs://hadoop001.sf2p.facebook.com:9000/ - * user/facebook/warehouse/example) NOTE: should not be hardcoding - * this, but ok for now - * - * @exception HiveException - * on internal error. Note not possible now, but in the future - * reserve the right to throw an exception - */ - public Table(String name, Properties schema, Deserializer deserializer, - Class> inputFormatClass, - Class outputFormatClass, URI dataLocation, Hive hive) - throws HiveException { - initEmpty(); - this.schema = schema; - this.deserializer = deserializer; // TODO: convert to SerDeInfo format - getTTable().getSd().getSerdeInfo().setSerializationLib( - deserializer.getClass().getName()); - getTTable().setTableName(name); - getSerdeInfo().setSerializationLib(deserializer.getClass().getName()); - setInputFormatClass(inputFormatClass); - setOutputFormatClass(HiveFileFormatUtils - .getOutputFormatSubstitute(outputFormatClass)); - setDataLocation(dataLocation); + public Table(org.apache.hadoop.hive.metastore.api.Table table) { + tTable = table; + if (!isView()) { + // This will set up field: inputFormatClass + getInputFormatClass(); + // This will set up field: outputFormatClass + getOutputFormatClass(); + } } public Table(String name) { - // fill in defaults - initEmpty(); - getTTable().setTableName(name); - getTTable().setDbName(MetaStoreUtils.DEFAULT_DATABASE_NAME); - // We have to use MetadataTypedColumnsetSerDe because LazySimpleSerDe does - // not - // support a table with no columns. - getSerdeInfo().setSerializationLib( - MetadataTypedColumnsetSerDe.class.getName()); - getSerdeInfo().getParameters().put(Constants.SERIALIZATION_FORMAT, "1"); + this(getEmptyTable(name)); } - void initEmpty() { - setTTable(new org.apache.hadoop.hive.metastore.api.Table()); - getTTable().setSd(new StorageDescriptor()); - getTTable().setPartitionKeys(new ArrayList()); - getTTable().setParameters(new HashMap()); - - StorageDescriptor sd = getTTable().getSd(); - sd.setSerdeInfo(new SerDeInfo()); - sd.setNumBuckets(-1); - sd.setBucketCols(new ArrayList()); - sd.setCols(new ArrayList()); - sd.setParameters(new HashMap()); - sd.setSortCols(new ArrayList()); - - sd.getSerdeInfo().setParameters(new HashMap()); - - setTableType(TableType.MANAGED_TABLE); + /** + * This function should only be used in serialization. + * We should never call this function to modify the fields, because + * the cached fields will become outdated. + */ + public org.apache.hadoop.hive.metastore.api.Table getTTable() { + return tTable; } - - public void reinitSerDe() throws HiveException { - try { - deserializer = MetaStoreUtils.getDeserializer(Hive.get().getConf(), - getTTable()); - } catch (MetaException e) { - throw new HiveException(e); - } + + /** + * This function should only be called by Java serialization. + */ + public void setTTable(org.apache.hadoop.hive.metastore.api.Table tTable) { + this.tTable = tTable; } - - protected void initSerDe() throws HiveException { - if (deserializer == null) { - try { - deserializer = MetaStoreUtils.getDeserializer(Hive.get().getConf(), - getTTable()); - } catch (MetaException e) { - throw new HiveException(e); - } + + /** + * Initialize an emtpy table. + */ + static org.apache.hadoop.hive.metastore.api.Table getEmptyTable(String name) { + StorageDescriptor sd = new StorageDescriptor(); + { + sd.setSerdeInfo(new SerDeInfo()); + sd.setNumBuckets(-1); + sd.setBucketCols(new ArrayList()); + sd.setCols(new ArrayList()); + sd.setParameters(new HashMap()); + sd.setSortCols(new ArrayList()); + sd.getSerdeInfo().setParameters(new HashMap()); + // We have to use MetadataTypedColumnsetSerDe because LazySimpleSerDe does + // not support a table with no columns. + sd.getSerdeInfo().setSerializationLib(MetadataTypedColumnsetSerDe.class.getName()); + sd.getSerdeInfo().getParameters().put(Constants.SERIALIZATION_FORMAT, "1"); + sd.setInputFormat(SequenceFileInputFormat.class.getName()); + sd.setOutputFormat(HiveSequenceFileOutputFormat.class.getName()); } + + org.apache.hadoop.hive.metastore.api.Table t = new org.apache.hadoop.hive.metastore.api.Table(); + { + t.setSd(sd); + t.setPartitionKeys(new ArrayList()); + t.setParameters(new HashMap()); + t.setTableType(TableType.MANAGED_TABLE.toString()); + t.setTableName(name); + t.setDbName(MetaStoreUtils.DEFAULT_DATABASE_NAME); + } + return t; } public void checkValidity() throws HiveException { // check for validity - String name = getTTable().getTableName(); + String name = tTable.getTableName(); if (null == name || name.length() == 0 || !MetaStoreUtils.validateName(name)) { throw new HiveException("[" + name + "]: is not a valid table name"); @@ -228,54 +205,77 @@ return; } - /** - * @param inputFormatClass - */ public void setInputFormatClass(Class inputFormatClass) { this.inputFormatClass = inputFormatClass; tTable.getSd().setInputFormat(inputFormatClass.getName()); } - /** - * @param class1 - */ - public void setOutputFormatClass(Class class1) { - outputFormatClass = HiveFileFormatUtils.getOutputFormatSubstitute(class1); - tTable.getSd().setOutputFormat(class1.getName()); + public void setOutputFormatClass(Class outputFormatClass) { + this.outputFormatClass = outputFormatClass; + tTable.getSd().setOutputFormat(outputFormatClass.getName()); } final public Properties getSchema() { - return schema; + return MetaStoreUtils.getSchema(tTable); } final public Path getPath() { - return new Path(getTTable().getSd().getLocation()); + return new Path(tTable.getSd().getLocation()); } - final public String getName() { - return getTTable().getTableName(); + final public String getTableName() { + return tTable.getTableName(); } final public URI getDataLocation() { + if (uri == null) { + uri = getPath().toUri(); + } return uri; } final public Deserializer getDeserializer() { - if (deserializer == null) { + if (deserializer == null) { try { - initSerDe(); + deserializer = MetaStoreUtils.getDeserializer(Hive.get().getConf(), tTable); + } catch (MetaException e) { + throw new RuntimeException(e); } catch (HiveException e) { - LOG.error("Error in initializing serde.", e); + throw new RuntimeException(e); } } return deserializer; } final public Class getInputFormatClass() { - return inputFormatClass; + if (inputFormatClass == null) { + try { + inputFormatClass = (Class) + Class.forName(tTable.getSd().getInputFormat(), true, JavaUtils.getClassLoader()); + } catch (ClassNotFoundException e) { + throw new RuntimeException(e); + } + } + return inputFormatClass; } final public Class getOutputFormatClass() { + // Replace FileOutputFormat for backward compatibility + + if (outputFormatClass == null) { + try { + Class c = Class.forName(tTable.getSd().getOutputFormat(), true, + JavaUtils.getClassLoader()); + if (!HiveOutputFormat.class.isAssignableFrom(c)) { + outputFormatClass = HiveFileFormatUtils.getOutputFormatSubstitute(c); + } else { + outputFormatClass = (Class)c; + } + + } catch (ClassNotFoundException e) { + throw new RuntimeException(e); + } + } return outputFormatClass; } @@ -283,7 +283,7 @@ throws HiveException { // TODO - types need to be checked. - List partCols = getTTable().getPartitionKeys(); + List partCols = tTable.getPartitionKeys(); if (partCols == null || (partCols.size() == 0)) { if (spec != null) { throw new HiveException( @@ -310,23 +310,19 @@ } public void setProperty(String name, String value) { - getTTable().getParameters().put(name, value); + tTable.getParameters().put(name, value); } - /** - * getProperty - * - */ public String getProperty(String name) { - return getTTable().getParameters().get(name); + return tTable.getParameters().get(name); } public void setTableType(TableType tableType) { - getTTable().setTableType(tableType.toString()); + tTable.setTableType(tableType.toString()); } public TableType getTableType() { - return Enum.valueOf(TableType.class, getTTable().getTableType()); + return Enum.valueOf(TableType.class, tTable.getTableType()); } public ArrayList getFields() { @@ -359,32 +355,16 @@ } } - /** - * @param schema - * the schema to set - */ - public void setSchema(Properties schema) { - this.schema = schema; - } - - /** - * @param deserializer - * the deserializer to set - */ - public void setDeserializer(Deserializer deserializer) { - this.deserializer = deserializer; - } - - @Override + @Override public String toString() { - return getTTable().getTableName(); + return tTable.getTableName(); } public List getPartCols() { - List partKeys = getTTable().getPartitionKeys(); + List partKeys = tTable.getPartitionKeys(); if (partKeys == null) { partKeys = new ArrayList(); - getTTable().setPartitionKeys(partKeys); + tTable.setPartitionKeys(partKeys); } return partKeys; } @@ -400,7 +380,7 @@ // TODO merge this with getBucketCols function public String getBucketingDimensionId() { - List bcols = getTTable().getSd().getBucketCols(); + List bcols = tTable.getSd().getBucketCols(); if (bcols == null || bcols.size() == 0) { return null; } @@ -413,26 +393,16 @@ return bcols.get(0); } - /** - * @return the tTable - */ - public org.apache.hadoop.hive.metastore.api.Table getTTable() { - return tTable; + public void setDataLocation(URI uri) { + this.uri = uri; + tTable.getSd().setLocation(uri.toString()); } - /** - * @param table - * the tTable to set - */ - protected void setTTable(org.apache.hadoop.hive.metastore.api.Table table) { - tTable = table; + public void unsetDataLocation() { + this.uri = null; + tTable.getSd().unsetLocation(); } - public void setDataLocation(URI uri2) { - uri = uri2; - getTTable().getSd().setLocation(uri2.toString()); - } - public void setBucketCols(List bucketCols) throws HiveException { if (bucketCols == null) { return; @@ -441,14 +411,14 @@ for (String col : bucketCols) { if (!isField(col)) { throw new HiveException("Bucket columns " + col - + " is not part of the table columns"); + + " is not part of the table columns (" + getCols() ); } } - getTTable().getSd().setBucketCols(bucketCols); + tTable.getSd().setBucketCols(bucketCols); } public void setSortCols(List sortOrder) throws HiveException { - getTTable().getSd().setSortCols(sortOrder); + tTable.getSd().setSortCols(sortOrder); } private boolean isField(String col) { @@ -464,14 +434,12 @@ boolean getColsFromSerDe = SerDeUtils.shouldGetColsFromSerDe( getSerializationLib()); if (!getColsFromSerDe) { - return getTTable().getSd().getCols(); + return tTable.getSd().getCols(); } else { try { - return Hive.getFieldsFromDeserializer(getName(), getDeserializer()); + return Hive.getFieldsFromDeserializer(getTableName(), getDeserializer()); } catch (HiveException e) { - LOG - .error("Unable to get field from serde: " + getSerializationLib(), - e); + LOG.error("Unable to get field from serde: " + getSerializationLib(), e); } return new ArrayList(); } @@ -491,15 +459,15 @@ } public void setPartCols(List partCols) { - getTTable().setPartitionKeys(partCols); + tTable.setPartitionKeys(partCols); } public String getDbName() { - return getTTable().getDbName(); + return tTable.getDbName(); } public int getNumBuckets() { - return getTTable().getSd().getNumBuckets(); + return tTable.getSd().getNumBuckets(); } /** @@ -564,11 +532,11 @@ } public void setFields(List fields) { - getTTable().getSd().setCols(fields); + tTable.getSd().setCols(fields); } public void setNumBuckets(int nb) { - getTTable().getSd().setNumBuckets(nb); + tTable.getSd().setNumBuckets(nb); } /** @@ -612,7 +580,7 @@ } private SerDeInfo getSerdeInfo() { - return getTTable().getSd().getSerdeInfo(); + return tTable.getSd().getSerdeInfo(); } public void setSerializationLib(String lib) { @@ -632,18 +600,30 @@ } public List getBucketCols() { - return getTTable().getSd().getBucketCols(); + return tTable.getSd().getBucketCols(); } public List getSortCols() { - return getTTable().getSd().getSortCols(); + return tTable.getSd().getSortCols(); } + public void setTableName(String tableName) { + tTable.setTableName(tableName); + } + + public void setDbName(String databaseName) { + tTable.setDbName(databaseName); + } + + public List getPartitionKeys() { + return tTable.getPartitionKeys(); + } + /** * @return the original view text, or null if this table is not a view */ public String getViewOriginalText() { - return getTTable().getViewOriginalText(); + return tTable.getViewOriginalText(); } /** @@ -651,22 +631,25 @@ * the original view text to set */ public void setViewOriginalText(String viewOriginalText) { - getTTable().setViewOriginalText(viewOriginalText); + tTable.setViewOriginalText(viewOriginalText); } /** * @return the expanded view text, or null if this table is not a view */ public String getViewExpandedText() { - return getTTable().getViewExpandedText(); + return tTable.getViewExpandedText(); } + public void clearSerDeInfo() { + tTable.getSd().getSerdeInfo().getParameters().clear(); + } /** * @param viewExpandedText * the expanded view text to set */ public void setViewExpandedText(String viewExpandedText) { - getTTable().setViewExpandedText(viewExpandedText); + tTable.setViewExpandedText(viewExpandedText); } /** @@ -698,15 +681,10 @@ } public Table copy() throws HiveException { - Table newTbl = new Table(); - - newTbl.schema = schema; - newTbl.deserializer = deserializer; // TODO: convert to SerDeInfo format - - newTbl.setTTable(getTTable().clone()); - newTbl.uri = uri; - newTbl.inputFormatClass = inputFormatClass; - newTbl.outputFormatClass = outputFormatClass; - return newTbl; + return new Table(tTable.clone()); } + + public void setCreateTime(int createTime) { + tTable.setCreateTime(createTime); + } }; Index: ql/src/java/org/apache/hadoop/hive/ql/metadata/Partition.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/metadata/Partition.java (revision 908188) +++ ql/src/java/org/apache/hadoop/hive/ql/metadata/Partition.java (working copy) @@ -18,6 +18,7 @@ package org.apache.hadoop.hive.ql.metadata; +import java.io.Serializable; import java.net.URI; import java.util.ArrayList; import java.util.Arrays; @@ -25,8 +26,6 @@ import java.util.List; import java.util.Map; import java.util.Properties; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -38,7 +37,9 @@ import org.apache.hadoop.hive.metastore.Warehouse; import org.apache.hadoop.hive.metastore.api.FieldSchema; import org.apache.hadoop.hive.metastore.api.MetaException; +import org.apache.hadoop.hive.metastore.api.Order; import org.apache.hadoop.hive.metastore.api.StorageDescriptor; +import org.apache.hadoop.hive.ql.exec.Utilities; import org.apache.hadoop.hive.ql.io.HiveFileFormatUtils; import org.apache.hadoop.hive.ql.io.HiveOutputFormat; import org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat; @@ -49,9 +50,13 @@ import org.apache.thrift.transport.TMemoryBuffer; /** - * A Hive Table Partition: is a fundamental storage unit within a Table + * A Hive Table Partition: is a fundamental storage unit within a Table. + * + * Please note that the ql code should always go through methods of this class to access the + * metadata, instead of directly accessing org.apache.hadoop.hive.metastore.api.Partition. + * This helps to isolate the metastore code and the ql code. */ -public class Partition { +public class Partition implements Serializable { @SuppressWarnings("nls") static final private Log LOG = LogFactory @@ -60,21 +65,15 @@ private Table table; private org.apache.hadoop.hive.metastore.api.Partition tPartition; + /** + * These fields are cached. The information comes from tPartition. + */ private Deserializer deserializer; - private Properties schema; - private Class inputFormatClass; private Class outputFormatClass; - + private Class inputFormatClass; + private URI uri; + /** - * @return the tPartition - */ - public org.apache.hadoop.hive.metastore.api.Partition getTPartition() { - return tPartition; - } - - private LinkedHashMap spec; - - /** * @return The values of the partition * @see org.apache.hadoop.hive.metastore.api.Partition#getValues() */ @@ -82,8 +81,16 @@ return tPartition.getValues(); } - private Path partPath; - private URI partURI; + /** + * create an empty partition. + * SemanticAnalyzer code requires that an empty partition when the table is not partitioned. + */ + public Partition(Table tbl) throws HiveException { + org.apache.hadoop.hive.metastore.api.Partition tPart = + new org.apache.hadoop.hive.metastore.api.Partition(); + tPart.setSd(tbl.getTTable().getSd()); // TODO: get a copy + initialize(tbl, tPart); + } public Partition(Table tbl, org.apache.hadoop.hive.metastore.api.Partition tp) throws HiveException { @@ -117,7 +124,7 @@ org.apache.hadoop.hive.metastore.api.Partition tpart = new org.apache.hadoop.hive.metastore.api.Partition(); tpart.setDbName(tbl.getDbName()); - tpart.setTableName(tbl.getName()); + tpart.setTableName(tbl.getTableName()); tpart.setValues(pvals); StorageDescriptor sd = new StorageDescriptor(); @@ -146,105 +153,87 @@ /** * Initializes this object with the given variables * - * @param tbl + * @param table * Table the partition belongs to - * @param tp + * @param tPartition * Thrift Partition object * @throws HiveException * Thrown if we cannot initialize the partition */ - private void initialize(Table tbl, - org.apache.hadoop.hive.metastore.api.Partition tp) throws HiveException { + private void initialize(Table table, + org.apache.hadoop.hive.metastore.api.Partition tPartition) throws HiveException { - table = tbl; - tPartition = tp; - partName = ""; + this.table = table; + this.tPartition = tPartition; + String partName = ""; - if (tbl.isPartitioned()) { + if (table.isPartitioned()) { try { - partName = Warehouse.makePartName(tbl.getPartCols(), tp.getValues()); - if (tp.getSd().getLocation() == null) { + partName = Warehouse.makePartName(table.getPartCols(), tPartition.getValues()); + if (tPartition.getSd().getLocation() == null) { // set default if location is not set - partPath = new Path(tbl.getDataLocation().toString(), partName); - tp.getSd().setLocation(partPath.toString()); - } else { - partPath = new Path(tp.getSd().getLocation()); + Path partPath = new Path(table.getDataLocation().toString(), partName); + tPartition.getSd().setLocation(partPath.toString()); } } catch (MetaException e) { - throw new HiveException("Invalid partition for table " + tbl.getName(), + throw new HiveException("Invalid partition for table " + table.getTableName(), e); } - } else { - // We are in the HACK territory. - // SemanticAnalyzer expects a single partition whose schema - // is same as the table partition. - partPath = table.getPath(); } - spec = tbl.createSpec(tp); - partURI = partPath.toUri(); + // This will set up field: inputFormatClass + getInputFormatClass(); + // This will set up field: outputFormatClass + getOutputFormatClass(); + } public String getName() { - return partName; + try { + return Warehouse.makePartName(table.getPartCols(), tPartition.getValues()); + } catch (MetaException e) { + throw new RuntimeException(e); + } } - public Table getTable() { - return table; - } - public Path[] getPath() { - Path[] ret = new Path[1]; - ret[0] = partPath; - return (ret); + Path[] ret = new Path[]{getPartitionPath()}; + return ret; } public Path getPartitionPath() { - return partPath; + if (table.isPartitioned()) { + return new Path(tPartition.getSd().getLocation()); + } else { + return new Path(table.getTTable().getSd().getLocation()); + } } final public URI getDataLocation() { - return partURI; + if (uri == null) { + uri = getPartitionPath().toUri(); + } + return uri; } final public Deserializer getDeserializer() { if (deserializer == null) { try { - initSerDe(); + deserializer = MetaStoreUtils.getDeserializer(Hive.get().getConf(), + tPartition, table.getTTable()); } catch (HiveException e) { - LOG.error("Error in initializing serde.", e); + throw new RuntimeException(e); + } catch (MetaException e) { + throw new RuntimeException(e); } } return deserializer; } - /** - * @param schema - * the schema to set - */ - public void setSchema(Properties schema) { - this.schema = schema; - } - public Properties getSchema() { - if (schema == null) { - schema = MetaStoreUtils - .getSchema(getTPartition(), getTable().getTTable()); - } - return schema; + return MetaStoreUtils.getSchema(tPartition, table.getTTable()); } - protected void initSerDe() throws HiveException { - if (deserializer == null) { - try { - deserializer = MetaStoreUtils.getDeserializer(Hive.get().getConf(), - getTPartition(), getTable().getTTable()); - } catch (MetaException e) { - throw new HiveException(e); - } - } - } - /** * @param inputFormatClass */ @@ -256,9 +245,10 @@ /** * @param class1 */ - public void setOutputFormatClass(Class class1) { - outputFormatClass = HiveFileFormatUtils.getOutputFormatSubstitute(class1); - tPartition.getSd().setOutputFormat(class1.getName()); + public void setOutputFormatClass(Class outputFormatClass) { + this.outputFormatClass = outputFormatClass; + tPartition.getSd().setOutputFormat(HiveFileFormatUtils + .getOutputFormatSubstitute(outputFormatClass).toString()); } final public Class getInputFormatClass() @@ -268,13 +258,12 @@ org.apache.hadoop.hive.metastore.api.Constants.FILE_INPUT_FORMAT, org.apache.hadoop.mapred.SequenceFileInputFormat.class.getName()); try { - setInputFormatClass((Class) Class.forName( - clsName, true, JavaUtils.getClassLoader())); + inputFormatClass = ((Class) Class.forName(clsName, true, + JavaUtils.getClassLoader())); } catch (ClassNotFoundException e) { throw new HiveException("Class not found: " + clsName, e); } } - return inputFormatClass; } @@ -285,8 +274,14 @@ org.apache.hadoop.hive.metastore.api.Constants.FILE_OUTPUT_FORMAT, HiveSequenceFileOutputFormat.class.getName()); try { - setOutputFormatClass(Class.forName(clsName, true, JavaUtils - .getClassLoader())); + Class c = (Class)(Class.forName(clsName, true, + JavaUtils.getClassLoader())); + // Replace FileOutputFormat for backward compatibility + if (!HiveOutputFormat.class.isAssignableFrom(c)) { + outputFormatClass = HiveFileFormatUtils.getOutputFormatSubstitute(c); + } else { + outputFormatClass = (Class)c; + } } catch (ClassNotFoundException e) { throw new HiveException("Class not found: " + clsName, e); } @@ -320,6 +315,14 @@ return tPartition.getSd().getBucketCols(); } + public List getSortCols() { + return tPartition.getSd().getSortCols(); + } + + public List getSortColNames() { + return Utilities.getColumnNamesFromSortCols(getSortCols()); + } + /** * mapping from bucket number to bucket path */ @@ -329,7 +332,7 @@ try { FileSystem fs = FileSystem.get(table.getDataLocation(), Hive.get() .getConf()); - String pathPattern = partPath.toString(); + String pathPattern = getPartitionPath().toString(); if (getBucketCount() > 0) { pathPattern = pathPattern + "/*"; } @@ -349,30 +352,7 @@ } } - /** - * mapping from a Path to the bucket number if any - */ - private static Pattern bpattern = Pattern - .compile("part-([0-9][0-9][0-9][0-9][0-9])"); - - private String partName; - @SuppressWarnings("nls") - public static int getBucketNum(Path p) { - Matcher m = bpattern.matcher(p.getName()); - if (m.find()) { - String bnum_str = m.group(1); - try { - return (Integer.parseInt(bnum_str)); - } catch (NumberFormatException e) { - throw new RuntimeException("Unexpected error parsing: " + p.getName() - + "," + bnum_str); - } - } - return 0; - } - - @SuppressWarnings("nls") public Path[] getPath(Sample s) throws HiveException { if (s == null) { return getPath(); @@ -398,7 +378,7 @@ if ((scount / bcount) * bcount != scount) { throw new HiveException("Sample Count" + scount + " is not a multiple of bucket count " + bcount + " for table " - + table.getName()); + + table.getTableName()); } // undersampling a bucket ret.add(getBucketPath((s.getSampleNum() - 1) % bcount)); @@ -406,7 +386,7 @@ if ((bcount / scount) * scount != bcount) { throw new HiveException("Sample Count" + scount + " is not a divisor of bucket count " + bcount + " for table " - + table.getName()); + + table.getTableName()); } // sampling multiple buckets for (int i = 0; i < bcount / scount; i++) { @@ -418,7 +398,7 @@ } public LinkedHashMap getSpec() { - return spec; + return table.createSpec(tPartition); } @SuppressWarnings("nls") @@ -426,7 +406,7 @@ public String toString() { String pn = "Invalid Partition"; try { - pn = Warehouse.makePartName(spec); + pn = Warehouse.makePartName(getSpec()); } catch (MetaException e) { // ignore as we most probably in an exception path already otherwise this // error wouldn't occur @@ -434,20 +414,39 @@ return table.toString() + "(" + pn + ")"; } - public void setProperty(String name, String value) { - getTPartition().putToParameters(name, value); + public Table getTable() { + return table; } /** - * getProperty - * + * Should be only used by serialization. */ - public String getProperty(String name) { - Map params = getTPartition().getParameters(); - if (params == null) { - return null; - } - return params.get(name); + public void setTable(Table table) { + this.table = table; } + /** + * Should be only used by serialization. + */ + public org.apache.hadoop.hive.metastore.api.Partition getTPartition() { + return tPartition; + } + + /** + * Should be only used by serialization. + */ + public void setTPartition( + org.apache.hadoop.hive.metastore.api.Partition partition) { + tPartition = partition; + } + + public Map getParameters() { + return tPartition.getParameters(); + } + + public List getCols() { + return tPartition.getSd().getCols(); + } + + } Index: ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java (revision 908188) +++ ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java (working copy) @@ -37,6 +37,7 @@ import org.apache.hadoop.hive.metastore.HiveMetaStoreClient; import org.apache.hadoop.hive.metastore.IMetaStoreClient; import org.apache.hadoop.hive.metastore.MetaStoreUtils; +import org.apache.hadoop.hive.metastore.TableType; import org.apache.hadoop.hive.metastore.Warehouse; import org.apache.hadoop.hive.metastore.api.AlreadyExistsException; import org.apache.hadoop.hive.metastore.api.FieldSchema; @@ -44,6 +45,7 @@ import org.apache.hadoop.hive.metastore.api.MetaException; import org.apache.hadoop.hive.metastore.api.NoSuchObjectException; import org.apache.hadoop.hive.ql.exec.Utilities; +import org.apache.hadoop.hive.ql.io.HiveFileFormatUtils; import org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat; import org.apache.hadoop.hive.serde2.Deserializer; import org.apache.hadoop.hive.serde2.SerDeException; @@ -310,9 +312,8 @@ */ public void createTable(Table tbl, boolean ifNotExists) throws HiveException { try { - tbl.initSerDe(); if (tbl.getCols().size() == 0) { - tbl.setFields(MetaStoreUtils.getFieldsFromDeserializer(tbl.getName(), + tbl.setFields(MetaStoreUtils.getFieldsFromDeserializer(tbl.getTableName(), tbl.getDeserializer())); } tbl.checkValidity(); @@ -404,7 +405,8 @@ if (tableName == null || tableName.equals("")) { throw new HiveException("empty table creation??"); } - Table table = new Table(); + + // Get the table from metastore org.apache.hadoop.hive.metastore.api.Table tTable = null; try { tTable = getMSC().getTable(dbName, tableName); @@ -417,18 +419,27 @@ } catch (Exception e) { throw new HiveException("Unable to fetch table " + tableName, e); } - // just a sanity check - assert (tTable != null); - try { - + + // For non-views, we need to do some extra fixes + if (!TableType.VIRTUAL_VIEW.toString().equals(tTable.getTableType())) { + // Fix the non-printable chars + Map parameters = tTable.getSd().getParameters(); + String sf = parameters.get(org.apache.hadoop.hive.serde.Constants.SERIALIZATION_FORMAT); + if (sf != null) { + char[] b = sf.toCharArray(); + if ((b.length == 1) && (b[0] < 10)) { // ^A, ^B, ^C, ^D, \t + parameters.put(org.apache.hadoop.hive.serde.Constants.SERIALIZATION_FORMAT, + Integer.toString(b[0])); + } + } + // Use LazySimpleSerDe for MetadataTypedColumnsetSerDe. // NOTE: LazySimpleSerDe does not support tables with a single column of // col // of type "array". This happens when the table is created using // an // earlier version of Hive. - if ( - org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe.class + if (org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe.class .getName().equals( tTable.getSd().getSerdeInfo().getSerializationLib()) && tTable.getSd().getColsSize() > 0 @@ -436,47 +447,10 @@ tTable.getSd().getSerdeInfo().setSerializationLib( org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe.class.getName()); } - - // first get a schema (in key / vals) - Properties p = MetaStoreUtils.getSchema(tTable); - table.setSchema(p); - table.setTTable(tTable); - - if (table.isView()) { - // Skip the rest, which isn't relevant for a view. - table.checkValidity(); - return table; - } - - table - .setInputFormatClass((Class>) Class - .forName( - table - .getSchema() - .getProperty( - org.apache.hadoop.hive.metastore.api.Constants.FILE_INPUT_FORMAT, - org.apache.hadoop.mapred.SequenceFileInputFormat.class - .getName()), true, JavaUtils.getClassLoader())); - table.setOutputFormatClass(Class.forName(table.getSchema().getProperty( - org.apache.hadoop.hive.metastore.api.Constants.FILE_OUTPUT_FORMAT, - HiveSequenceFileOutputFormat.class.getName()), true, JavaUtils - .getClassLoader())); - table.setDeserializer(MetaStoreUtils.getDeserializer(getConf(), p)); - table.setDataLocation(new URI(tTable.getSd().getLocation())); - } catch (Exception e) { - LOG.error(StringUtils.stringifyException(e)); - throw new HiveException(e); } - String sf = table - .getSerdeParam(org.apache.hadoop.hive.serde.Constants.SERIALIZATION_FORMAT); - if (sf != null) { - char[] b = sf.toCharArray(); - if ((b.length == 1) && (b[0] < 10)) { // ^A, ^B, ^C, ^D, \t - table.setSerdeParam( - org.apache.hadoop.hive.serde.Constants.SERIALIZATION_FORMAT, - Integer.toString(b[0])); - } - } + + Table table = new Table(tTable); + table.checkValidity(); return table; } @@ -722,11 +696,11 @@ } org.apache.hadoop.hive.metastore.api.Partition tpart = null; try { - tpart = getMSC().getPartition(tbl.getDbName(), tbl.getName(), pvals); + tpart = getMSC().getPartition(tbl.getDbName(), tbl.getTableName(), pvals); if (tpart == null && forceCreate) { - LOG.debug("creating partition for table " + tbl.getName() + LOG.debug("creating partition for table " + tbl.getTableName() + " with partition spec : " + partSpec); - tpart = getMSC().appendPartition(tbl.getDbName(), tbl.getName(), pvals); + tpart = getMSC().appendPartition(tbl.getDbName(), tbl.getTableName(), pvals); ; } if (tpart == null) { @@ -774,7 +748,7 @@ if (tbl.isPartitioned()) { List tParts; try { - tParts = getMSC().listPartitions(tbl.getDbName(), tbl.getName(), + tParts = getMSC().listPartitions(tbl.getDbName(), tbl.getTableName(), (short) -1); } catch (Exception e) { LOG.error(StringUtils.stringifyException(e)); @@ -786,12 +760,7 @@ } return parts; } else { - // create an empty partition. - // HACK, HACK. SemanticAnalyzer code requires that an empty partition when - // the table is not partitioned - org.apache.hadoop.hive.metastore.api.Partition tPart = new org.apache.hadoop.hive.metastore.api.Partition(); - tPart.setSd(tbl.getTTable().getSd()); // TODO: get a copy - Partition part = new Partition(tbl, tPart); + Partition part = new Partition(tbl); ArrayList parts = new ArrayList(1); parts.add(part); return parts; Index: ql/src/java/org/apache/hadoop/hive/ql/optimizer/SamplePruner.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/optimizer/SamplePruner.java (revision 908188) +++ ql/src/java/org/apache/hadoop/hive/ql/optimizer/SamplePruner.java (working copy) @@ -200,7 +200,7 @@ // need to do full scan fullScanMsg = "Tablesample denominator " + den + " is not multiple/divisor of bucket count " + bucketCount - + " of table " + part.getTable().getName(); + + " of table " + part.getTable().getTableName(); } } else { // need to do full scan Index: ql/src/java/org/apache/hadoop/hive/ql/optimizer/ppr/PartitionPruner.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/optimizer/ppr/PartitionPruner.java (revision 908188) +++ ql/src/java/org/apache/hadoop/hive/ql/optimizer/ppr/PartitionPruner.java (working copy) @@ -159,10 +159,10 @@ HiveConf conf, String alias, Map prunedPartitionsMap) throws HiveException { LOG.trace("Started pruning partiton"); - LOG.trace("tabname = " + tab.getName()); + LOG.trace("tabname = " + tab.getTableName()); LOG.trace("prune Expression = " + prunerExpr); - String key = tab.getName() + ";"; + String key = tab.getTableName() + ";"; if (prunerExpr != null) { key = key + prunerExpr.getExprString(); } @@ -182,7 +182,7 @@ if (tab.isPartitioned()) { for (String partName : Hive.get().getPartitionNames(tab.getDbName(), - tab.getName(), (short) -1)) { + tab.getTableName(), (short) -1)) { // Set all the variables here LinkedHashMap partSpec = Warehouse .makeSpecFromName(partName); @@ -214,7 +214,7 @@ if (!hasColumnExpr(prunerExpr)) { throw new SemanticException(ErrorMsg.NO_PARTITION_PREDICATE .getMsg("for Alias \"" + alias + "\" Table \"" - + tab.getName() + "\"")); + + tab.getTableName() + "\"")); } } Index: ql/src/java/org/apache/hadoop/hive/ql/optimizer/GroupByOptimizer.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/optimizer/GroupByOptimizer.java (revision 908188) +++ ql/src/java/org/apache/hadoop/hive/ql/optimizer/GroupByOptimizer.java (working copy) @@ -217,8 +217,7 @@ parts.addAll(partsList.getUnknownPartns()); for (Partition part : parts) { List bucketCols = part.getBucketCols(); - List sortCols = Utilities.getColumnNamesFromSortCols(part - .getTPartition().getSd().getSortCols()); + List sortCols = part.getSortColNames(); bucketGroupBy = matchBucketOrSortedColumns(groupByCols, bucketCols, sortCols); if (!bucketGroupBy) { Index: ql/src/java/org/apache/hadoop/hive/ql/hooks/WriteEntity.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/hooks/WriteEntity.java (revision 908188) +++ ql/src/java/org/apache/hadoop/hive/ql/hooks/WriteEntity.java (working copy) @@ -148,9 +148,9 @@ public String toString() { switch (typ) { case TABLE: - return t.getDbName() + "@" + t.getName(); + return t.getDbName() + "@" + t.getTableName(); case PARTITION: - return t.getDbName() + "@" + t.getName() + "@" + p.getName(); + return t.getDbName() + "@" + t.getTableName() + "@" + p.getName(); default: return d; } Index: ql/src/java/org/apache/hadoop/hive/ql/hooks/ReadEntity.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/hooks/ReadEntity.java (revision 908188) +++ ql/src/java/org/apache/hadoop/hive/ql/hooks/ReadEntity.java (working copy) @@ -81,9 +81,9 @@ */ public Map getParameters() { if (p != null) { - return p.getTPartition().getParameters(); + return p.getParameters(); } else { - return t.getTTable().getParameters(); + return t.getParameters(); } } @@ -118,10 +118,10 @@ @Override public String toString() { if (p != null) { - return p.getTable().getDbName() + "@" + p.getTable().getName() + "@" + return p.getTable().getDbName() + "@" + p.getTable().getTableName() + "@" + p.getName(); } else { - return t.getDbName() + "@" + t.getName(); + return t.getDbName() + "@" + t.getTableName(); } } Index: ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java (revision 908188) +++ ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java (working copy) @@ -381,7 +381,7 @@ } parts = db.getPartitionNames(MetaStoreUtils.DEFAULT_DATABASE_NAME, tbl - .getName(), Short.MAX_VALUE); + .getTableName(), Short.MAX_VALUE); // write the results in the file try { @@ -608,15 +608,15 @@ while (iterTables.hasNext()) { // create a row per table name Table tbl = iterTables.next(); - String tableName = tbl.getName(); + String tableName = tbl.getTableName(); String tblLoc = null; String inputFormattCls = null; String outputFormattCls = null; if (part != null) { if (par != null) { tblLoc = par.getDataLocation().toString(); - inputFormattCls = par.getTPartition().getSd().getInputFormat(); - outputFormattCls = par.getTPartition().getSd().getOutputFormat(); + inputFormattCls = par.getInputFormatClass().getName(); + outputFormattCls = par.getOutputFormatClass().getName(); } } else { tblLoc = tbl.getDataLocation().toString(); @@ -734,13 +734,13 @@ try { - LOG.info("DDLTask: got data for " + tbl.getName()); + LOG.info("DDLTask: got data for " + tbl.getTableName()); List cols = null; if (colPath.equals(tableName)) { cols = tbl.getCols(); if (part != null) { - cols = part.getTPartition().getSd().getCols(); + cols = part.getCols(); } } else { cols = Hive.getFieldsFromDeserializer(colPath, tbl.getDeserializer()); @@ -798,7 +798,7 @@ } } - LOG.info("DDLTask: written data for " + tbl.getName()); + LOG.info("DDLTask: written data for " + tbl.getTableName()); ((FSDataOutputStream) outStream).close(); } catch (FileNotFoundException e) { @@ -958,7 +958,7 @@ Table oldTbl = tbl.copy(); if (alterTbl.getOp() == AlterTableDesc.AlterTableTypes.RENAME) { - tbl.getTTable().setTableName(alterTbl.getNewName()); + tbl.setTableName(alterTbl.getNewName()); } else if (alterTbl.getOp() == AlterTableDesc.AlterTableTypes.ADDCOLS) { List newCols = alterTbl.getNewCols(); List oldCols = tbl.getCols(); @@ -1080,10 +1080,7 @@ tbl.getTTable().getSd().getSerdeInfo().getParameters().putAll( alterTbl.getProps()); } - // since serde is modified then do the appropriate things to reset columns - // etc - tbl.reinitSerDe(); - tbl.setFields(Hive.getFieldsFromDeserializer(tbl.getName(), tbl + tbl.setFields(Hive.getFieldsFromDeserializer(tbl.getTableName(), tbl .getDeserializer())); } else if (alterTbl.getOp() == AlterTableDesc.AlterTableTypes.ADDFILEFORMAT) { tbl.getTTable().getSd().setInputFormat(alterTbl.getInputFormat()); @@ -1266,18 +1263,11 @@ private int createTable(Hive db, CreateTableDesc crtTbl) throws HiveException { // create the table Table tbl = new Table(crtTbl.getTableName()); - StorageDescriptor tblStorDesc = tbl.getTTable().getSd(); - if (crtTbl.getBucketCols() != null) { - tblStorDesc.setBucketCols(crtTbl.getBucketCols()); - } - if (crtTbl.getSortCols() != null) { - tbl.setSortCols(crtTbl.getSortCols()); - } if (crtTbl.getPartCols() != null) { tbl.setPartCols(crtTbl.getPartCols()); } if (crtTbl.getNumBuckets() != -1) { - tblStorDesc.setNumBuckets(crtTbl.getNumBuckets()); + tbl.setNumBuckets(crtTbl.getNumBuckets()); } if (crtTbl.getSerName() != null) { @@ -1321,19 +1311,26 @@ */ if (crtTbl.getSerName() == null) { LOG.info("Default to LazySimpleSerDe for table " + crtTbl.getTableName()); - tbl - .setSerializationLib(org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe.class - .getName()); + tbl.setSerializationLib(org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe.class.getName()); } else { // let's validate that the serde exists validateSerDe(crtTbl.getSerName()); } + if (crtTbl.getCols() != null) { + tbl.setFields(crtTbl.getCols()); + } + if (crtTbl.getBucketCols() != null) { + tbl.setBucketCols(crtTbl.getBucketCols()); + } + if (crtTbl.getSortCols() != null) { + tbl.setSortCols(crtTbl.getSortCols()); + } if (crtTbl.getComment() != null) { tbl.setProperty("comment", crtTbl.getComment()); } if (crtTbl.getLocation() != null) { - tblStorDesc.setLocation(crtTbl.getLocation()); + tbl.setDataLocation(new Path(crtTbl.getLocation()).toUri()); } tbl.setInputFormatClass(crtTbl.getInputFormat()); @@ -1382,10 +1379,6 @@ return rc; } - if (crtTbl.getCols() != null) { - tbl.setFields(crtTbl.getCols()); - } - // create the table db.createTable(tbl, crtTbl.getIfNotExists()); work.getOutputs().add(new WriteEntity(tbl)); @@ -1407,9 +1400,8 @@ // Get the existing table Table tbl = db.getTable(MetaStoreUtils.DEFAULT_DATABASE_NAME, crtTbl .getLikeTableName()); - StorageDescriptor tblStorDesc = tbl.getTTable().getSd(); - tbl.getTTable().setTableName(crtTbl.getTableName()); + tbl.setTableName(crtTbl.getTableName()); if (crtTbl.isExternal()) { tbl.setProperty("EXTERNAL", "TRUE"); @@ -1418,10 +1410,9 @@ } if (crtTbl.getLocation() != null) { - tblStorDesc.setLocation(crtTbl.getLocation()); + tbl.setDataLocation(new Path(crtTbl.getLocation()).toUri()); } else { - tblStorDesc.setLocation(null); - tblStorDesc.unsetLocation(); + tbl.unsetDataLocation(); } // create the table @@ -1445,7 +1436,7 @@ Table tbl = new Table(crtView.getViewName()); tbl.setTableType(TableType.VIRTUAL_VIEW); tbl.setSerializationLib(null); - tbl.getTTable().getSd().getSerdeInfo().getParameters().clear(); + tbl.clearSerDeInfo(); tbl.setViewOriginalText(crtView.getViewOriginalText()); tbl.setViewExpandedText(crtView.getViewExpandedText()); tbl.setFields(crtView.getSchema()); @@ -1472,7 +1463,7 @@ return 1; } // set create time - tbl.getTTable().setCreateTime((int) (System.currentTimeMillis() / 1000)); + tbl.setCreateTime((int) (System.currentTimeMillis() / 1000)); return 0; } Index: ql/src/java/org/apache/hadoop/hive/ql/QueryPlan.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/QueryPlan.java (revision 908188) +++ ql/src/java/org/apache/hadoop/hive/ql/QueryPlan.java (working copy) @@ -64,7 +64,14 @@ private ArrayList> rootTasks; private FetchTask fetchTask; + private HashSet inputs; + /** + * Note: outputs are not all determined at compile time. + * Some of the tasks can change the outputs at run time, because only at run + * time, we know what are the changes. These tasks should keep a reference + * to the outputs here. + */ private HashSet outputs; private HashMap idToTableNameMap; Index: ql/src/java/org/apache/hadoop/hive/ql/parse/LoadSemanticAnalyzer.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/parse/LoadSemanticAnalyzer.java (revision 908188) +++ ql/src/java/org/apache/hadoop/hive/ql/parse/LoadSemanticAnalyzer.java (working copy) @@ -197,7 +197,7 @@ URI toURI = (ts.partHandle != null) ? ts.partHandle.getDataLocation() : ts.tableHandle.getDataLocation(); - List parts = ts.tableHandle.getTTable().getPartitionKeys(); + List parts = ts.tableHandle.getPartitionKeys(); if (isOverWrite && (parts != null && parts.size() > 0) && (ts.partSpec == null || ts.partSpec.size() == 0)) { throw new SemanticException(ErrorMsg.NEED_PARTITION_ERROR.getMsg()); Index: ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java (revision 908188) +++ ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java (working copy) @@ -769,10 +769,10 @@ throw new SemanticException(ErrorMsg.DML_AGAINST_VIEW.getMsg()); } - if (!HiveOutputFormat.class.isAssignableFrom(ts.tableHandle - .getOutputFormatClass())) { + Class outputFormatClass = ts.tableHandle.getOutputFormatClass(); + if (!HiveOutputFormat.class.isAssignableFrom(outputFormatClass)) { throw new SemanticException(ErrorMsg.INVALID_OUTPUT_FORMAT_TYPE - .getMsg(ast)); + .getMsg(ast, "The class is " + outputFormatClass.toString())); } if (ts.partSpec == null) { @@ -821,7 +821,7 @@ ParseDriver pd = new ParseDriver(); ASTNode viewTree; - final ASTNodeOrigin viewOrigin = new ASTNodeOrigin("VIEW", tab.getName(), + final ASTNodeOrigin viewOrigin = new ASTNodeOrigin("VIEW", tab.getTableName(), tab.getViewExpandedText(), alias, qb.getParseInfo().getSrcForAlias( alias)); try { @@ -2981,7 +2981,7 @@ dest_tab = qbm.getDestTableForAlias(dest); // check for partition - List parts = dest_tab.getTTable().getPartitionKeys(); + List parts = dest_tab.getPartitionKeys(); if (parts != null && parts.size() > 0) { throw new SemanticException(ErrorMsg.NEED_PARTITION_ERROR.getMsg()); } @@ -2989,7 +2989,7 @@ queryTmpdir = ctx.getExternalTmpFileURI(dest_path.toUri()); table_desc = Utilities.getTableDesc(dest_tab); - idToTableNameMap.put(String.valueOf(destTableId), dest_tab.getName()); + idToTableNameMap.put(String.valueOf(destTableId), dest_tab.getTableName()); currentTableId = destTableId; destTableId++; @@ -2999,7 +2999,7 @@ new HashMap())); if (!outputs.add(new WriteEntity(dest_tab))) { throw new SemanticException(ErrorMsg.OUTPUT_SPECIFIED_MULTIPLE_TIMES - .getMsg(dest_tab.getName())); + .getMsg(dest_tab.getTableName())); } break; } @@ -3011,7 +3011,7 @@ queryTmpdir = ctx.getExternalTmpFileURI(dest_path.toUri()); table_desc = Utilities.getTableDesc(dest_tab); - idToTableNameMap.put(String.valueOf(destTableId), dest_tab.getName()); + idToTableNameMap.put(String.valueOf(destTableId), dest_tab.getTableName()); currentTableId = destTableId; destTableId++; @@ -3020,7 +3020,7 @@ .getSpec())); if (!outputs.add(new WriteEntity(dest_part))) { throw new SemanticException(ErrorMsg.OUTPUT_SPECIFIED_MULTIPLE_TIMES - .getMsg(dest_tab.getName() + "@" + dest_part.getName())); + .getMsg(dest_tab.getTableName() + "@" + dest_part.getName())); } break; } @@ -4881,13 +4881,13 @@ // If there are no sample cols and no bucket cols then throw an error if (tabBucketCols.size() == 0 && sampleExprs.size() == 0) { throw new SemanticException(ErrorMsg.NON_BUCKETED_TABLE.getMsg() + " " - + tab.getName()); + + tab.getTableName()); } if (num > den) { throw new SemanticException( ErrorMsg.BUCKETED_NUMBERATOR_BIGGER_DENOMINATOR.getMsg() + " " - + tab.getName()); + + tab.getTableName()); } // check if a predicate is needed @@ -4944,7 +4944,7 @@ } else { boolean testMode = conf.getBoolVar(HiveConf.ConfVars.HIVETESTMODE); if (testMode) { - String tabName = tab.getName(); + String tabName = tab.getTableName(); // has the user explicitly asked not to sample this table String unSampleTblList = conf