You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by kg...@apache.org on 2018/02/28 19:32:35 UTC
[1/2] hive git commit: HIVE-18695: fix
TestAccumuloCliDriver.testCliDriver[accumulo_queries] (Zoltan Haindrich
reviewed by Anthony Hsu, Thejas M Nair)
Repository: hive
Updated Branches:
refs/heads/master 1837846da -> 169811cfa
HIVE-18695: fix TestAccumuloCliDriver.testCliDriver[accumulo_queries] (Zoltan Haindrich reviewed by Anthony Hsu, Thejas M Nair)
Signed-off-by: Zoltan Haindrich <ki...@rxd.hu>
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/169811cf
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/169811cf
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/169811cf
Branch: refs/heads/master
Commit: 169811cfaac0dcab7c847c859bb6c2aa2ebc18c7
Parents: 9f6c073
Author: Zoltan Haindrich <ki...@rxd.hu>
Authored: Wed Feb 28 20:18:27 2018 +0100
Committer: Zoltan Haindrich <ki...@rxd.hu>
Committed: Wed Feb 28 20:24:51 2018 +0100
----------------------------------------------------------------------
.../test/queries/positive/accumulo_queries.q | 6 +++
.../results/positive/accumulo_queries.q.out | 39 +++++++++++---------
2 files changed, 27 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/169811cf/accumulo-handler/src/test/queries/positive/accumulo_queries.q
----------------------------------------------------------------------
diff --git a/accumulo-handler/src/test/queries/positive/accumulo_queries.q b/accumulo-handler/src/test/queries/positive/accumulo_queries.q
index 279b661..0aceaa0 100644
--- a/accumulo-handler/src/test/queries/positive/accumulo_queries.q
+++ b/accumulo-handler/src/test/queries/positive/accumulo_queries.q
@@ -1,3 +1,9 @@
+-- remove these; after HIVE-18802 is fixed
+set hive.optimize.index.filter=false;
+set hive.optimize.ppd=false;
+-- remove these; after HIVE-18802 is fixed
+
+
DROP TABLE accumulo_table_1;
CREATE TABLE accumulo_table_1(key int, value string)
STORED BY 'org.apache.hadoop.hive.accumulo.AccumuloStorageHandler'
http://git-wip-us.apache.org/repos/asf/hive/blob/169811cf/accumulo-handler/src/test/results/positive/accumulo_queries.q.out
----------------------------------------------------------------------
diff --git a/accumulo-handler/src/test/results/positive/accumulo_queries.q.out b/accumulo-handler/src/test/results/positive/accumulo_queries.q.out
index a21a099..287557f 100644
--- a/accumulo-handler/src/test/results/positive/accumulo_queries.q.out
+++ b/accumulo-handler/src/test/results/positive/accumulo_queries.q.out
@@ -289,31 +289,35 @@ STAGE PLANS:
Map Operator Tree:
TableScan
alias: accumulo_table_1
- filterExpr: ((100 < key) and (key < 120)) (type: boolean)
Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
- Select Operator
- expressions: key (type: int)
- outputColumnNames: _col0
+ Filter Operator
+ predicate: ((100 < key) and (key < 120)) (type: boolean)
Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
- Reduce Output Operator
- key expressions: _col0 (type: int)
- sort order: +
- Map-reduce partition columns: _col0 (type: int)
+ Select Operator
+ expressions: key (type: int)
+ outputColumnNames: _col0
Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
+ Reduce Output Operator
+ key expressions: _col0 (type: int)
+ sort order: +
+ Map-reduce partition columns: _col0 (type: int)
+ Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
TableScan
alias: accumulo_table_2
- filterExpr: ((key < 120) and (100 < key)) (type: boolean)
Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
- Select Operator
- expressions: key (type: int), value (type: string)
- outputColumnNames: _col0, _col1
+ Filter Operator
+ predicate: ((100 < key) and (key < 120)) (type: boolean)
Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
- Reduce Output Operator
- key expressions: _col0 (type: int)
- sort order: +
- Map-reduce partition columns: _col0 (type: int)
+ Select Operator
+ expressions: key (type: int), value (type: string)
+ outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
- value expressions: _col1 (type: string)
+ Reduce Output Operator
+ key expressions: _col0 (type: int)
+ sort order: +
+ Map-reduce partition columns: _col0 (type: int)
+ Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
+ value expressions: _col1 (type: string)
Reduce Operator Tree:
Join Operator
condition map:
@@ -383,7 +387,6 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@accumulo_table_1
POSTHOOK: Input: default@accumulo_table_2
#### A masked pattern was here ####
-12 val_12
104 val_104
114 val_114
116 val_116
[2/2] hive git commit: HIVE-18813: Fix qtest mapjoin_hook.q (Zoltan
Haindrich reviewed by Ashutosh Chauhan)
Posted by kg...@apache.org.
HIVE-18813: Fix qtest mapjoin_hook.q (Zoltan Haindrich reviewed by Ashutosh Chauhan)
Signed-off-by: Zoltan Haindrich <ki...@rxd.hu>
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/9f6c0732
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/9f6c0732
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/9f6c0732
Branch: refs/heads/master
Commit: 9f6c073244faec43c88eead146e7d1c4df328508
Parents: 1837846
Author: Zoltan Haindrich <ki...@rxd.hu>
Authored: Wed Feb 28 20:16:45 2018 +0100
Committer: Zoltan Haindrich <ki...@rxd.hu>
Committed: Wed Feb 28 20:24:51 2018 +0100
----------------------------------------------------------------------
.../test/queries/clientpositive/mapjoin_hook.q | 2 +-
.../results/clientpositive/mapjoin_hook.q.out | 36 +++++++++++---------
2 files changed, 20 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/9f6c0732/ql/src/test/queries/clientpositive/mapjoin_hook.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/mapjoin_hook.q b/ql/src/test/queries/clientpositive/mapjoin_hook.q
index a9e1960..dd47d73 100644
--- a/ql/src/test/queries/clientpositive/mapjoin_hook.q
+++ b/ql/src/test/queries/clientpositive/mapjoin_hook.q
@@ -1,3 +1,4 @@
+set hive.stats.column.autogather=false;
set hive.exec.post.hooks = org.apache.hadoop.hive.ql.hooks.MapJoinCounterHook,org.apache.hadoop.hive.ql.hooks.PrintCompletedTasksHook;
drop table dest1;
@@ -13,7 +14,6 @@ FROM src src1 JOIN src src2 ON (src1.key = src2.key) JOIN src src3 ON (src1.key
INSERT OVERWRITE TABLE dest1 SELECT src1.key, src3.value;
-
set hive.mapjoin.localtask.max.memory.usage = 0.0001;
set hive.mapjoin.check.memory.rows = 2;
set hive.auto.convert.join.noconditionaltask = false;
http://git-wip-us.apache.org/repos/asf/hive/blob/9f6c0732/ql/src/test/results/clientpositive/mapjoin_hook.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/mapjoin_hook.q.out b/ql/src/test/results/clientpositive/mapjoin_hook.q.out
index 36d895c..f80a26a 100644
--- a/ql/src/test/results/clientpositive/mapjoin_hook.q.out
+++ b/ql/src/test/results/clientpositive/mapjoin_hook.q.out
@@ -13,10 +13,9 @@ PREHOOK: Input: default@src
PREHOOK: Input: default@src1
PREHOOK: Output: default@dest1
[MapJoinCounter PostHook] COMMON_JOIN: 0 HINTED_MAPJOIN: 1 HINTED_MAPJOIN_LOCAL: 1 CONVERTED_MAPJOIN: 0 CONVERTED_MAPJOIN_LOCAL: 0 BACKUP_COMMON_JOIN: 0
-RUN: Stage-7:MAPREDLOCAL
+RUN: Stage-6:MAPREDLOCAL
RUN: Stage-2:MAPRED
RUN: Stage-0:MOVE
-RUN: Stage-4:MAPRED
RUN: Stage-3:STATS
PREHOOK: query: FROM src src1 JOIN src src2 ON (src1.key = src2.key) JOIN src src3 ON (src1.key = src3.key)
INSERT OVERWRITE TABLE dest1 SELECT src1.key, src3.value
@@ -24,10 +23,9 @@ PREHOOK: type: QUERY
PREHOOK: Input: default@src
PREHOOK: Output: default@dest1
[MapJoinCounter PostHook] COMMON_JOIN: 0 HINTED_MAPJOIN: 1 HINTED_MAPJOIN_LOCAL: 1 CONVERTED_MAPJOIN: 0 CONVERTED_MAPJOIN_LOCAL: 0 BACKUP_COMMON_JOIN: 0
-RUN: Stage-7:MAPREDLOCAL
-RUN: Stage-6:MAPRED
+RUN: Stage-6:MAPREDLOCAL
+RUN: Stage-5:MAPRED
RUN: Stage-0:MOVE
-RUN: Stage-3:MAPRED
RUN: Stage-2:STATS
PREHOOK: query: FROM srcpart src1 JOIN src src2 ON (src1.key = src2.key)
INSERT OVERWRITE TABLE dest1 SELECT src1.key, src2.value
@@ -40,12 +38,14 @@ PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
PREHOOK: Output: default@dest1
-[MapJoinCounter PostHook] COMMON_JOIN: 0 HINTED_MAPJOIN: 0 HINTED_MAPJOIN_LOCAL: 0 CONVERTED_MAPJOIN: 1 CONVERTED_MAPJOIN_LOCAL: 1 BACKUP_COMMON_JOIN: 0
-RUN: Stage-7:CONDITIONAL
-RUN: Stage-8:MAPREDLOCAL
-RUN: Stage-5:MAPRED
+Hive Runtime Error: Map local work exhausted memory
+FAILED: Execution Error, return code 3 from org.apache.hadoop.hive.ql.exec.mr.MapredLocalTask
+ATTEMPT: Execute BackupTask: org.apache.hadoop.hive.ql.exec.mr.MapRedTask
+[MapJoinCounter PostHook] COMMON_JOIN: 0 HINTED_MAPJOIN: 0 HINTED_MAPJOIN_LOCAL: 0 CONVERTED_MAPJOIN: 0 CONVERTED_MAPJOIN_LOCAL: 1 BACKUP_COMMON_JOIN: 1
+RUN: Stage-6:CONDITIONAL
+RUN: Stage-7:MAPREDLOCAL
+RUN: Stage-1:MAPRED
RUN: Stage-0:MOVE
-RUN: Stage-3:MAPRED
RUN: Stage-2:STATS
PREHOOK: query: FROM src src1 JOIN src src2 ON (src1.key = src2.key) JOIN src src3 ON (src1.key + src2.key = src3.key)
INSERT OVERWRITE TABLE dest1 SELECT src1.key, src3.value
@@ -55,13 +55,15 @@ PREHOOK: Output: default@dest1
Hive Runtime Error: Map local work exhausted memory
FAILED: Execution Error, return code 3 from org.apache.hadoop.hive.ql.exec.mr.MapredLocalTask
ATTEMPT: Execute BackupTask: org.apache.hadoop.hive.ql.exec.mr.MapRedTask
-[MapJoinCounter PostHook] COMMON_JOIN: 0 HINTED_MAPJOIN: 0 HINTED_MAPJOIN_LOCAL: 0 CONVERTED_MAPJOIN: 1 CONVERTED_MAPJOIN_LOCAL: 2 BACKUP_COMMON_JOIN: 1
-RUN: Stage-12:CONDITIONAL
-RUN: Stage-15:MAPREDLOCAL
+Hive Runtime Error: Map local work exhausted memory
+FAILED: Execution Error, return code 3 from org.apache.hadoop.hive.ql.exec.mr.MapredLocalTask
+ATTEMPT: Execute BackupTask: org.apache.hadoop.hive.ql.exec.mr.MapRedTask
+[MapJoinCounter PostHook] COMMON_JOIN: 0 HINTED_MAPJOIN: 0 HINTED_MAPJOIN_LOCAL: 0 CONVERTED_MAPJOIN: 0 CONVERTED_MAPJOIN_LOCAL: 2 BACKUP_COMMON_JOIN: 2
+RUN: Stage-11:CONDITIONAL
+RUN: Stage-14:MAPREDLOCAL
RUN: Stage-1:MAPRED
-RUN: Stage-9:CONDITIONAL
-RUN: Stage-13:MAPREDLOCAL
-RUN: Stage-7:MAPRED
+RUN: Stage-8:CONDITIONAL
+RUN: Stage-12:MAPREDLOCAL
+RUN: Stage-2:MAPRED
RUN: Stage-0:MOVE
-RUN: Stage-4:MAPRED
RUN: Stage-3:STATS