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 <k...@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 <k...@rxd.hu> Authored: Wed Feb 28 20:18:27 2018 +0100 Committer: Zoltan Haindrich <k...@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
