HIVE-11886 : LLAP: merge master into branch (Sergey Shelukhin) ADDENDUM SPARK TESTS
Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/4fa4e40e Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/4fa4e40e Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/4fa4e40e Branch: refs/heads/master Commit: 4fa4e40e5d3d76633b2a1da1435cb6a15cbc4721 Parents: f324305 Author: Sergey Shelukhin <[email protected]> Authored: Fri Sep 18 15:06:51 2015 -0700 Committer: Sergey Shelukhin <[email protected]> Committed: Fri Sep 18 15:06:51 2015 -0700 ---------------------------------------------------------------------- .../results/clientpositive/spark/vector_distinct_2.q.out | 8 -------- .../results/clientpositive/spark/vector_groupby_3.q.out | 8 -------- .../clientpositive/spark/vectorized_nested_mapjoin.q.out | 9 +-------- 3 files changed, 1 insertion(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/4fa4e40e/ql/src/test/results/clientpositive/spark/vector_distinct_2.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/spark/vector_distinct_2.q.out b/ql/src/test/results/clientpositive/spark/vector_distinct_2.q.out index 563213a..e2143ad 100644 --- a/ql/src/test/results/clientpositive/spark/vector_distinct_2.q.out +++ b/ql/src/test/results/clientpositive/spark/vector_distinct_2.q.out @@ -154,12 +154,6 @@ STAGE PLANS: expressions: _col1 (type: string), _col0 (type: tinyint) outputColumnNames: _col0, _col1 Statistics: Num rows: 1000 Data size: 459356 Basic stats: COMPLETE Column stats: NONE -<<<<<<< HEAD - 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 -======= File Output Operator compressed: false Statistics: Num rows: 1000 Data size: 459356 Basic stats: COMPLETE Column stats: NONE @@ -167,8 +161,6 @@ STAGE PLANS: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe - Execution mode: vectorized ->>>>>>> master Stage: Stage-0 Fetch Operator http://git-wip-us.apache.org/repos/asf/hive/blob/4fa4e40e/ql/src/test/results/clientpositive/spark/vector_groupby_3.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/spark/vector_groupby_3.q.out b/ql/src/test/results/clientpositive/spark/vector_groupby_3.q.out index b2402db..47a3846 100644 --- a/ql/src/test/results/clientpositive/spark/vector_groupby_3.q.out +++ b/ql/src/test/results/clientpositive/spark/vector_groupby_3.q.out @@ -157,12 +157,6 @@ STAGE PLANS: expressions: _col1 (type: string), _col0 (type: tinyint), _col2 (type: bigint) outputColumnNames: _col0, _col1, _col2 Statistics: Num rows: 1000 Data size: 459356 Basic stats: COMPLETE Column stats: NONE -<<<<<<< HEAD - 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 -======= File Output Operator compressed: false Statistics: Num rows: 1000 Data size: 459356 Basic stats: COMPLETE Column stats: NONE @@ -170,8 +164,6 @@ STAGE PLANS: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe - Execution mode: vectorized ->>>>>>> master Stage: Stage-0 Fetch Operator http://git-wip-us.apache.org/repos/asf/hive/blob/4fa4e40e/ql/src/test/results/clientpositive/spark/vectorized_nested_mapjoin.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/spark/vectorized_nested_mapjoin.q.out b/ql/src/test/results/clientpositive/spark/vectorized_nested_mapjoin.q.out index bf23ae4..6aabab6 100644 --- a/ql/src/test/results/clientpositive/spark/vectorized_nested_mapjoin.q.out +++ b/ql/src/test/results/clientpositive/spark/vectorized_nested_mapjoin.q.out @@ -105,15 +105,8 @@ STAGE PLANS: Reduce Output Operator sort order: Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE -<<<<<<< HEAD - Reduce Output Operator - sort order: - Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE - value expressions: _col0 (type: double) - Execution mode: vectorized -======= value expressions: _col0 (type: double) ->>>>>>> master + Execution mode: vectorized Local Work: Map Reduce Local Work Reducer 3
