Index: build-common.xml =================================================================== --- build-common.xml (revision 900276) +++ build-common.xml (working copy) @@ -295,21 +295,25 @@ --> - - - + + + + + + + + - + + - - - + Index: contrib/src/test/results/clientpositive/serde_typedbytes.q.out =================================================================== --- contrib/src/test/results/clientpositive/serde_typedbytes.q.out (revision 900276) +++ contrib/src/test/results/clientpositive/serde_typedbytes.q.out (working copy) @@ -34,8 +34,10 @@ STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-4 depends on stages: Stage-1 - Stage-0 depends on stages: Stage-4 + Stage-4 depends on stages: Stage-1 , consists of Stage-3, Stage-2 + Stage-3 + Stage-0 depends on stages: Stage-3, Stage-2 + Stage-2 STAGE PLANS: Stage: Stage-1 @@ -81,36 +83,13 @@ Stage: Stage-4 Conditional Operator - list of dependent Tasks: - Move Operator - files: - hdfs directory: true - destination: file:/data/users/nzhang/work/870/apache-hive/build/ql/tmp/638596647/10000 - Map Reduce - Alias -> Map Operator Tree: - file:/data/users/nzhang/work/870/apache-hive/build/ql/tmp/66739902/10002 - Reduce Output Operator - sort order: - Map-reduce partition columns: - expr: rand() - type: double - tag: -1 - value expressions: - expr: key - type: int - expr: value - type: string - Reduce Operator Tree: - Extract - File Output Operator - compressed: false - GlobalTableId: 0 - table: - input format: org.apache.hadoop.mapred.TextInputFormat - output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe - name: dest1 + Stage: Stage-3 + Move Operator + files: + hdfs directory: true + destination: file:/Users/carl/Projects/hd4/hive-trunk/build/contrib/scratchdir/1514083418/10000 + Stage: Stage-0 Move Operator tables: @@ -121,7 +100,33 @@ serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest1 + Stage: Stage-2 + Map Reduce + Alias -> Map Operator Tree: + file:/Users/carl/Projects/hd4/hive-trunk/build/contrib/scratchdir/1500350173/10002 + Reduce Output Operator + sort order: + Map-reduce partition columns: + expr: rand() + type: double + tag: -1 + value expressions: + expr: key + type: int + expr: value + type: string + Reduce Operator Tree: + Extract + File Output Operator + compressed: false + GlobalTableId: 0 + table: + input format: org.apache.hadoop.mapred.TextInputFormat + output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + name: dest1 + PREHOOK: query: FROM ( FROM src SELECT TRANSFORM(src.key, src.value) ROW FORMAT SERDE 'org.apache.hadoop.hive.contrib.serde2.TypedBytesSerDe' @@ -149,11 +154,11 @@ PREHOOK: query: SELECT dest1.* FROM dest1 PREHOOK: type: QUERY PREHOOK: Input: default@dest1 -PREHOOK: Output: file:/data/users/nzhang/work/870/apache-hive/build/ql/tmp/934071985/10000 +PREHOOK: Output: file:/Users/carl/Projects/hd4/hive-trunk/build/contrib/scratchdir/147569992/10000 POSTHOOK: query: SELECT dest1.* FROM dest1 POSTHOOK: type: QUERY POSTHOOK: Input: default@dest1 -POSTHOOK: Output: file:/data/users/nzhang/work/870/apache-hive/build/ql/tmp/934071985/10000 +POSTHOOK: Output: file:/Users/carl/Projects/hd4/hive-trunk/build/contrib/scratchdir/147569992/10000 238 val_238 86 val_86 311 val_311 Index: contrib/src/test/results/clientpositive/java_mr_example.q.out =================================================================== --- contrib/src/test/results/clientpositive/java_mr_example.q.out (revision 900276) +++ contrib/src/test/results/clientpositive/java_mr_example.q.out (working copy) @@ -1,27 +1,27 @@ PREHOOK: query: FROM ( FROM src MAP value, key - USING 'java -cp ../build/contrib/hive_contrib.jar org.apache.hadoop.hive.contrib.mr.example.IdentityMapper' + USING 'java -cp /Users/carl/Projects/hd4/hive-trunk/build/contrib/hive-contrib-0.6.0.jar org.apache.hadoop.hive.contrib.mr.example.IdentityMapper' AS k, v CLUSTER BY k) map_output REDUCE k, v - USING 'java -cp ../build/contrib/hive_contrib.jar org.apache.hadoop.hive.contrib.mr.example.WordCountReduce' + USING 'java -cp /Users/carl/Projects/hd4/hive-trunk/build/contrib/hive-contrib-0.6.0.jar org.apache.hadoop.hive.contrib.mr.example.WordCountReduce' AS k, v PREHOOK: type: QUERY PREHOOK: Input: default@src -PREHOOK: Output: file:/opt/h3/hive-trunk/build/ql/tmp/1438670936/10000 +PREHOOK: Output: file:/Users/carl/Projects/hd4/hive-trunk/build/contrib/scratchdir/102428859/10000 POSTHOOK: query: FROM ( FROM src MAP value, key - USING 'java -cp ../build/contrib/hive_contrib.jar org.apache.hadoop.hive.contrib.mr.example.IdentityMapper' + USING 'java -cp /Users/carl/Projects/hd4/hive-trunk/build/contrib/hive-contrib-0.6.0.jar org.apache.hadoop.hive.contrib.mr.example.IdentityMapper' AS k, v CLUSTER BY k) map_output REDUCE k, v - USING 'java -cp ../build/contrib/hive_contrib.jar org.apache.hadoop.hive.contrib.mr.example.WordCountReduce' + USING 'java -cp /Users/carl/Projects/hd4/hive-trunk/build/contrib/hive-contrib-0.6.0.jar org.apache.hadoop.hive.contrib.mr.example.WordCountReduce' AS k, v POSTHOOK: type: QUERY POSTHOOK: Input: default@src -POSTHOOK: Output: file:/opt/h3/hive-trunk/build/ql/tmp/1438670936/10000 +POSTHOOK: Output: file:/Users/carl/Projects/hd4/hive-trunk/build/contrib/scratchdir/102428859/10000 val_0 0 val_10 10 val_100 200 Index: contrib/src/test/results/clientpositive/serde_typedbytes2.q.out =================================================================== --- contrib/src/test/results/clientpositive/serde_typedbytes2.q.out (revision 900276) +++ contrib/src/test/results/clientpositive/serde_typedbytes2.q.out (working copy) @@ -34,8 +34,10 @@ STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-4 depends on stages: Stage-1 - Stage-0 depends on stages: Stage-4 + Stage-4 depends on stages: Stage-1 , consists of Stage-3, Stage-2 + Stage-3 + Stage-0 depends on stages: Stage-3, Stage-2 + Stage-2 STAGE PLANS: Stage: Stage-1 @@ -74,36 +76,13 @@ Stage: Stage-4 Conditional Operator - list of dependent Tasks: - Move Operator - files: - hdfs directory: true - destination: file:/data/users/nzhang/work/870/apache-hive/build/ql/tmp/2098258409/10000 - Map Reduce - Alias -> Map Operator Tree: - file:/data/users/nzhang/work/870/apache-hive/build/ql/tmp/2125173315/10002 - Reduce Output Operator - sort order: - Map-reduce partition columns: - expr: rand() - type: double - tag: -1 - value expressions: - expr: key - type: smallint - expr: value - type: string - Reduce Operator Tree: - Extract - File Output Operator - compressed: false - GlobalTableId: 0 - table: - input format: org.apache.hadoop.mapred.TextInputFormat - output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe - name: dest1 + Stage: Stage-3 + Move Operator + files: + hdfs directory: true + destination: file:/Users/carl/Projects/hd4/hive-trunk/build/contrib/scratchdir/1700155696/10000 + Stage: Stage-0 Move Operator tables: @@ -114,7 +93,33 @@ serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest1 + Stage: Stage-2 + Map Reduce + Alias -> Map Operator Tree: + file:/Users/carl/Projects/hd4/hive-trunk/build/contrib/scratchdir/912933743/10002 + Reduce Output Operator + sort order: + Map-reduce partition columns: + expr: rand() + type: double + tag: -1 + value expressions: + expr: key + type: smallint + expr: value + type: string + Reduce Operator Tree: + Extract + File Output Operator + compressed: false + GlobalTableId: 0 + table: + input format: org.apache.hadoop.mapred.TextInputFormat + output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + name: dest1 + PREHOOK: query: FROM ( FROM src SELECT TRANSFORM(cast(src.key as smallint), src.value) ROW FORMAT SERDE 'org.apache.hadoop.hive.contrib.serde2.TypedBytesSerDe' @@ -142,11 +147,11 @@ PREHOOK: query: SELECT dest1.* FROM dest1 PREHOOK: type: QUERY PREHOOK: Input: default@dest1 -PREHOOK: Output: file:/data/users/nzhang/work/870/apache-hive/build/ql/tmp/800670373/10000 +PREHOOK: Output: file:/Users/carl/Projects/hd4/hive-trunk/build/contrib/scratchdir/1705708386/10000 POSTHOOK: query: SELECT dest1.* FROM dest1 POSTHOOK: type: QUERY POSTHOOK: Input: default@dest1 -POSTHOOK: Output: file:/data/users/nzhang/work/870/apache-hive/build/ql/tmp/800670373/10000 +POSTHOOK: Output: file:/Users/carl/Projects/hd4/hive-trunk/build/contrib/scratchdir/1705708386/10000 238 val_238 86 val_86 311 val_311 Index: contrib/src/test/results/clientpositive/serde_typedbytes3.q.out =================================================================== --- contrib/src/test/results/clientpositive/serde_typedbytes3.q.out (revision 900276) +++ contrib/src/test/results/clientpositive/serde_typedbytes3.q.out (working copy) @@ -34,8 +34,10 @@ STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-4 depends on stages: Stage-1 - Stage-0 depends on stages: Stage-4 + Stage-4 depends on stages: Stage-1 , consists of Stage-3, Stage-2 + Stage-3 + Stage-0 depends on stages: Stage-3, Stage-2 + Stage-2 STAGE PLANS: Stage: Stage-1 @@ -74,36 +76,13 @@ Stage: Stage-4 Conditional Operator - list of dependent Tasks: - Move Operator - files: - hdfs directory: true - destination: file:/data/users/njain/hive1/hive1/build/ql/tmp/1224635/10000 - Map Reduce - Alias -> Map Operator Tree: - file:/data/users/njain/hive1/hive1/build/ql/tmp/4847210/10002 - Reduce Output Operator - sort order: - Map-reduce partition columns: - expr: rand() - type: double - tag: -1 - value expressions: - expr: key - type: string - expr: value - type: string - Reduce Operator Tree: - Extract - File Output Operator - compressed: false - GlobalTableId: 0 - table: - input format: org.apache.hadoop.mapred.TextInputFormat - output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe - name: dest1 + Stage: Stage-3 + Move Operator + files: + hdfs directory: true + destination: file:/Users/carl/Projects/hd4/hive-trunk/build/contrib/scratchdir/1407877565/10000 + Stage: Stage-0 Move Operator tables: @@ -114,7 +93,33 @@ serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: dest1 + Stage: Stage-2 + Map Reduce + Alias -> Map Operator Tree: + file:/Users/carl/Projects/hd4/hive-trunk/build/contrib/scratchdir/1307548350/10002 + Reduce Output Operator + sort order: + Map-reduce partition columns: + expr: rand() + type: double + tag: -1 + value expressions: + expr: key + type: string + expr: value + type: string + Reduce Operator Tree: + Extract + File Output Operator + compressed: false + GlobalTableId: 0 + table: + input format: org.apache.hadoop.mapred.TextInputFormat + output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + name: dest1 + PREHOOK: query: FROM ( FROM src SELECT TRANSFORM(cast(src.key as smallint), src.value) ROW FORMAT SERDE 'org.apache.hadoop.hive.contrib.serde2.TypedBytesSerDe' @@ -142,11 +147,11 @@ PREHOOK: query: SELECT dest1.* FROM dest1 PREHOOK: type: QUERY PREHOOK: Input: default@dest1 -PREHOOK: Output: file:/data/users/njain/hive1/hive1/build/ql/tmp/2086086825/10000 +PREHOOK: Output: file:/Users/carl/Projects/hd4/hive-trunk/build/contrib/scratchdir/819449716/10000 POSTHOOK: query: SELECT dest1.* FROM dest1 POSTHOOK: type: QUERY POSTHOOK: Input: default@dest1 -POSTHOOK: Output: file:/data/users/njain/hive1/hive1/build/ql/tmp/2086086825/10000 +POSTHOOK: Output: file:/Users/carl/Projects/hd4/hive-trunk/build/contrib/scratchdir/819449716/10000 238 val_238 86 val_86 311 val_311 Index: contrib/src/test/queries/clientnegative/udtf_explode2.q =================================================================== --- contrib/src/test/queries/clientnegative/udtf_explode2.q (revision 900276) +++ contrib/src/test/queries/clientnegative/udtf_explode2.q (working copy) @@ -1,4 +1,4 @@ -add jar ../build/contrib/hive_contrib.jar; +add jar ${hive.contrib.jar.path}; CREATE TEMPORARY FUNCTION explode2 AS 'org.apache.hadoop.hive.contrib.udtf.example.GenericUDTFExplode2'; Index: contrib/src/test/queries/clientnegative/serde_regex.q =================================================================== --- contrib/src/test/queries/clientnegative/serde_regex.q (revision 900276) +++ contrib/src/test/queries/clientnegative/serde_regex.q (working copy) @@ -1,4 +1,4 @@ -add jar ../build/contrib/hive_contrib.jar; +add jar ${hive.contrib.jar.path}; DROP TABLE serde_regex; Index: contrib/src/test/queries/clientpositive/lateral_view_explode2.q =================================================================== --- contrib/src/test/queries/clientpositive/lateral_view_explode2.q (revision 900276) +++ contrib/src/test/queries/clientpositive/lateral_view_explode2.q (working copy) @@ -1,4 +1,4 @@ -add jar ../build/contrib/hive_contrib.jar; +add jar ${hive.contrib.jar.path}; CREATE TEMPORARY FUNCTION explode2 AS 'org.apache.hadoop.hive.contrib.udtf.example.GenericUDTFExplode2'; Index: contrib/src/test/queries/clientpositive/udaf_example_avg.q =================================================================== --- contrib/src/test/queries/clientpositive/udaf_example_avg.q (revision 900276) +++ contrib/src/test/queries/clientpositive/udaf_example_avg.q (working copy) @@ -1,4 +1,4 @@ -add jar ../build/contrib/hive_contrib.jar; +add jar ${hive.contrib.jar.path}; CREATE TEMPORARY FUNCTION example_avg AS 'org.apache.hadoop.hive.contrib.udaf.example.UDAFExampleAvg'; Index: contrib/src/test/queries/clientpositive/udf_example_arraymapstruct.q =================================================================== --- contrib/src/test/queries/clientpositive/udf_example_arraymapstruct.q (revision 900276) +++ contrib/src/test/queries/clientpositive/udf_example_arraymapstruct.q (working copy) @@ -1,4 +1,4 @@ -add jar ../build/contrib/hive_contrib.jar; +add jar ${hive.contrib.jar.path}; CREATE TEMPORARY FUNCTION example_arraysum AS 'org.apache.hadoop.hive.contrib.udf.example.UDFExampleArraySum'; CREATE TEMPORARY FUNCTION example_mapconcat AS 'org.apache.hadoop.hive.contrib.udf.example.UDFExampleMapConcat'; Index: contrib/src/test/queries/clientpositive/java_mr_example.q =================================================================== --- contrib/src/test/queries/clientpositive/java_mr_example.q (revision 900276) +++ contrib/src/test/queries/clientpositive/java_mr_example.q (working copy) @@ -1,10 +1,10 @@ FROM ( FROM src MAP value, key - USING 'java -cp ../build/contrib/hive_contrib.jar org.apache.hadoop.hive.contrib.mr.example.IdentityMapper' + USING 'java -cp ${hive.contrib.jar.path} org.apache.hadoop.hive.contrib.mr.example.IdentityMapper' AS k, v CLUSTER BY k) map_output REDUCE k, v - USING 'java -cp ../build/contrib/hive_contrib.jar org.apache.hadoop.hive.contrib.mr.example.WordCountReduce' + USING 'java -cp ${hive.contrib.jar.path} org.apache.hadoop.hive.contrib.mr.example.WordCountReduce' AS k, v ; \ No newline at end of file Index: contrib/src/test/queries/clientpositive/serde_regex.q =================================================================== --- contrib/src/test/queries/clientpositive/serde_regex.q (revision 900276) +++ contrib/src/test/queries/clientpositive/serde_regex.q (working copy) @@ -1,4 +1,4 @@ -add jar ../build/contrib/hive_contrib.jar; +add jar ${hive.contrib.jar.path}; DROP TABLE serde_regex; Index: contrib/src/test/queries/clientpositive/fileformat_base64.q =================================================================== --- contrib/src/test/queries/clientpositive/fileformat_base64.q (revision 900276) +++ contrib/src/test/queries/clientpositive/fileformat_base64.q (working copy) @@ -1,4 +1,4 @@ -add jar ../build/contrib/hive_contrib.jar; +add jar ${hive.contrib.jar.path}; DROP TABLE base64_test; Index: contrib/src/test/queries/clientpositive/udaf_example_group_concat.q =================================================================== --- contrib/src/test/queries/clientpositive/udaf_example_group_concat.q (revision 900276) +++ contrib/src/test/queries/clientpositive/udaf_example_group_concat.q (working copy) @@ -1,4 +1,4 @@ -add jar ../build/contrib/hive_contrib.jar; +add jar ${hive.contrib.jar.path}; CREATE TEMPORARY FUNCTION example_group_concat AS 'org.apache.hadoop.hive.contrib.udaf.example.UDAFExampleGroupConcat'; Index: contrib/src/test/queries/clientpositive/serde_typedbytes2.q =================================================================== --- contrib/src/test/queries/clientpositive/serde_typedbytes2.q (revision 900276) +++ contrib/src/test/queries/clientpositive/serde_typedbytes2.q (working copy) @@ -1,4 +1,4 @@ -add jar ../build/contrib/hive_contrib.jar; +add jar ${hive.contrib.jar.path}; drop table dest1; CREATE TABLE dest1(key SMALLINT, value STRING) STORED AS TEXTFILE; Index: contrib/src/test/queries/clientpositive/udf_example_format.q =================================================================== --- contrib/src/test/queries/clientpositive/udf_example_format.q (revision 900276) +++ contrib/src/test/queries/clientpositive/udf_example_format.q (working copy) @@ -1,4 +1,4 @@ -add jar ../build/contrib/hive_contrib.jar; +add jar ${hive.contrib.jar.path}; CREATE TEMPORARY FUNCTION example_format AS 'org.apache.hadoop.hive.contrib.udf.example.UDFExampleFormat'; Index: contrib/src/test/queries/clientpositive/udf_example_add.q =================================================================== --- contrib/src/test/queries/clientpositive/udf_example_add.q (revision 900276) +++ contrib/src/test/queries/clientpositive/udf_example_add.q (working copy) @@ -1,4 +1,4 @@ -add jar ../build/contrib/hive_contrib.jar; +add jar ${hive.contrib.jar.path}; CREATE TEMPORARY FUNCTION example_add AS 'org.apache.hadoop.hive.contrib.udf.example.UDFExampleAdd'; Index: contrib/src/test/queries/clientpositive/serde_typedbytes3.q =================================================================== --- contrib/src/test/queries/clientpositive/serde_typedbytes3.q (revision 900276) +++ contrib/src/test/queries/clientpositive/serde_typedbytes3.q (working copy) @@ -1,4 +1,4 @@ -add jar ../build/contrib/hive_contrib.jar; +add jar ${hive.contrib.jar.path}; drop table dest1; CREATE TABLE dest1(key STRING, value STRING) STORED AS TEXTFILE; Index: contrib/src/test/queries/clientpositive/serde_typedbytes4.q =================================================================== --- contrib/src/test/queries/clientpositive/serde_typedbytes4.q (revision 900276) +++ contrib/src/test/queries/clientpositive/serde_typedbytes4.q (working copy) @@ -1,4 +1,4 @@ -add jar ../build/contrib/hive_contrib.jar; +add jar ${hive.contrib.jar.path}; drop table dest1; CREATE TABLE dest1(key STRING, value STRING) STORED AS TEXTFILE; Index: contrib/src/test/queries/clientpositive/udtf_explode2.q =================================================================== --- contrib/src/test/queries/clientpositive/udtf_explode2.q (revision 900276) +++ contrib/src/test/queries/clientpositive/udtf_explode2.q (working copy) @@ -1,4 +1,4 @@ -add jar ../build/contrib/hive_contrib.jar; +add jar ${hive.contrib.jar.path}; CREATE TEMPORARY FUNCTION explode2 AS 'org.apache.hadoop.hive.contrib.udtf.example.GenericUDTFExplode2'; Index: contrib/src/test/queries/clientpositive/dboutput.q =================================================================== --- contrib/src/test/queries/clientpositive/dboutput.q (revision 900276) +++ contrib/src/test/queries/clientpositive/dboutput.q (working copy) @@ -1,4 +1,4 @@ -add jar ../build/contrib/hive_contrib.jar; +add jar ${hive.contrib.jar.path}; CREATE TEMPORARY FUNCTION dboutput AS 'org.apache.hadoop.hive.contrib.genericudf.example.GenericUDFDBOutput'; Index: contrib/src/test/queries/clientpositive/serde_s3.q =================================================================== --- contrib/src/test/queries/clientpositive/serde_s3.q (revision 900276) +++ contrib/src/test/queries/clientpositive/serde_s3.q (working copy) @@ -1,4 +1,4 @@ -add jar ../build/contrib/hive_contrib.jar; +add jar ${hive.contrib.jar.path}; DROP TABLE s3log; CREATE TABLE s3log Index: contrib/src/test/queries/clientpositive/serde_typedbytes.q =================================================================== --- contrib/src/test/queries/clientpositive/serde_typedbytes.q (revision 900276) +++ contrib/src/test/queries/clientpositive/serde_typedbytes.q (working copy) @@ -1,4 +1,4 @@ -add jar ../build/contrib/hive_contrib.jar; +add jar ${hive.contrib.jar.path}; drop table dest1; CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE; Index: contrib/build.xml =================================================================== --- contrib/build.xml (revision 900276) +++ contrib/build.xml (working copy) @@ -111,7 +111,7 @@