hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prasan...@apache.org
Subject hive git commit: HIVE-14447: Set HIVE_TRANSACTIONAL_TABLE_SCAN to the correct job conf for FetchOperator (Prasanth Jayachandran reviewed by Matt McCline)
Date Sun, 07 Aug 2016 06:24:22 GMT
Repository: hive
Updated Branches:
  refs/heads/branch-1 cf64d7521 -> 996a16ca6


HIVE-14447: Set HIVE_TRANSACTIONAL_TABLE_SCAN to the correct job conf for FetchOperator (Prasanth
Jayachandran reviewed by Matt McCline)


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/996a16ca
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/996a16ca
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/996a16ca

Branch: refs/heads/branch-1
Commit: 996a16ca60418ea0ce30440dd863a52db0f70dea
Parents: cf64d75
Author: Prasanth Jayachandran <prasanthj@apache.org>
Authored: Sat Aug 6 23:23:08 2016 -0700
Committer: Prasanth Jayachandran <prasanthj@apache.org>
Committed: Sat Aug 6 23:24:09 2016 -0700

----------------------------------------------------------------------
 .../hadoop/hive/ql/exec/mr/MapredLocalTask.java |   2 +-
 .../test/queries/clientpositive/acid_mapjoin.q  |  22 +++
 .../results/clientpositive/acid_mapjoin.q.out   | 157 +++++++++++++++++++
 3 files changed, 180 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/996a16ca/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapredLocalTask.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapredLocalTask.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapredLocalTask.java
index a07f822..4f8f200 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapredLocalTask.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapredLocalTask.java
@@ -433,7 +433,7 @@ public class MapredLocalTask extends Task<MapredLocalWork> implements
Serializab
       // push down filters
       HiveInputFormat.pushFilters(jobClone, ts);
 
-      AcidUtils.setTransactionalTableScan(job, ts.getConf().isAcidTable());
+      AcidUtils.setTransactionalTableScan(jobClone, ts.getConf().isAcidTable());
 
       // create a fetch operator
       FetchOperator fetchOp = new FetchOperator(entry.getValue(), jobClone);

http://git-wip-us.apache.org/repos/asf/hive/blob/996a16ca/ql/src/test/queries/clientpositive/acid_mapjoin.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/acid_mapjoin.q b/ql/src/test/queries/clientpositive/acid_mapjoin.q
new file mode 100644
index 0000000..5eee6e7
--- /dev/null
+++ b/ql/src/test/queries/clientpositive/acid_mapjoin.q
@@ -0,0 +1,22 @@
+set hive.auto.convert.join=true;
+set hive.auto.convert.join.noconditionaltask=true;
+set hive.auto.convert.join.noconditionaltask.size=10000;
+
+set hive.support.concurrency=true;
+set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
+
+drop table if exists acid1;
+drop table if exists acid2;
+
+create table acid1 (key int, value string) clustered by (key) into 2 buckets stored as orc
tblproperties ("transactional"="true");
+create table acid2 (key int, value string) clustered by (key) into 2 buckets stored as orc
tblproperties ("transactional"="true");
+
+insert into acid1 values (1, 'a'), (2, 'b'), (3, 'c'), (4, 'd'), (5, 'e'), (6, 'f'), (7,
'g'), (8, 'h');
+insert into acid2 values (1,'a'),(3,'c'),(5,'e'),(7,'g');
+
+explain
+select count(*) from acid1 join acid2 on acid1.key = acid2.key;
+select count(*) from acid1 join acid2 on acid1.key = acid2.key;
+
+drop table acid1;
+drop table acid2;

http://git-wip-us.apache.org/repos/asf/hive/blob/996a16ca/ql/src/test/results/clientpositive/acid_mapjoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/acid_mapjoin.q.out b/ql/src/test/results/clientpositive/acid_mapjoin.q.out
new file mode 100644
index 0000000..036c56c
--- /dev/null
+++ b/ql/src/test/results/clientpositive/acid_mapjoin.q.out
@@ -0,0 +1,157 @@
+PREHOOK: query: drop table if exists acid1
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: drop table if exists acid1
+POSTHOOK: type: DROPTABLE
+PREHOOK: query: drop table if exists acid2
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: drop table if exists acid2
+POSTHOOK: type: DROPTABLE
+PREHOOK: query: create table acid1 (key int, value string) clustered by (key) into 2 buckets
stored as orc tblproperties ("transactional"="true")
+PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
+PREHOOK: Output: default@acid1
+POSTHOOK: query: create table acid1 (key int, value string) clustered by (key) into 2 buckets
stored as orc tblproperties ("transactional"="true")
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@acid1
+PREHOOK: query: create table acid2 (key int, value string) clustered by (key) into 2 buckets
stored as orc tblproperties ("transactional"="true")
+PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
+PREHOOK: Output: default@acid2
+POSTHOOK: query: create table acid2 (key int, value string) clustered by (key) into 2 buckets
stored as orc tblproperties ("transactional"="true")
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@acid2
+PREHOOK: query: insert into acid1 values (1, 'a'), (2, 'b'), (3, 'c'), (4, 'd'), (5, 'e'),
(6, 'f'), (7, 'g'), (8, 'h')
+PREHOOK: type: QUERY
+PREHOOK: Input: default@values__tmp__table__1
+PREHOOK: Output: default@acid1
+POSTHOOK: query: insert into acid1 values (1, 'a'), (2, 'b'), (3, 'c'), (4, 'd'), (5, 'e'),
(6, 'f'), (7, 'g'), (8, 'h')
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@values__tmp__table__1
+POSTHOOK: Output: default@acid1
+POSTHOOK: Lineage: acid1.key EXPRESSION [(values__tmp__table__1)values__tmp__table__1.FieldSchema(name:tmp_values_col1,
type:string, comment:), ]
+POSTHOOK: Lineage: acid1.value SIMPLE [(values__tmp__table__1)values__tmp__table__1.FieldSchema(name:tmp_values_col2,
type:string, comment:), ]
+PREHOOK: query: insert into acid2 values (1,'a'),(3,'c'),(5,'e'),(7,'g')
+PREHOOK: type: QUERY
+PREHOOK: Input: default@values__tmp__table__2
+PREHOOK: Output: default@acid2
+POSTHOOK: query: insert into acid2 values (1,'a'),(3,'c'),(5,'e'),(7,'g')
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@values__tmp__table__2
+POSTHOOK: Output: default@acid2
+POSTHOOK: Lineage: acid2.key EXPRESSION [(values__tmp__table__2)values__tmp__table__2.FieldSchema(name:tmp_values_col1,
type:string, comment:), ]
+POSTHOOK: Lineage: acid2.value SIMPLE [(values__tmp__table__2)values__tmp__table__2.FieldSchema(name:tmp_values_col2,
type:string, comment:), ]
+PREHOOK: query: explain
+select count(*) from acid1 join acid2 on acid1.key = acid2.key
+PREHOOK: type: QUERY
+POSTHOOK: query: explain
+select count(*) from acid1 join acid2 on acid1.key = acid2.key
+POSTHOOK: type: QUERY
+STAGE DEPENDENCIES:
+  Stage-5 is a root stage
+  Stage-2 depends on stages: Stage-5
+  Stage-0 depends on stages: Stage-2
+
+STAGE PLANS:
+  Stage: Stage-5
+    Map Reduce Local Work
+      Alias -> Map Local Tables:
+        $hdt$_1:acid2 
+          Fetch Operator
+            limit: -1
+      Alias -> Map Local Operator Tree:
+        $hdt$_1:acid2 
+          TableScan
+            alias: acid2
+            Statistics: Num rows: 209 Data size: 839 Basic stats: COMPLETE Column stats:
NONE
+            Filter Operator
+              predicate: key is not null (type: boolean)
+              Statistics: Num rows: 209 Data size: 839 Basic stats: COMPLETE Column stats:
NONE
+              Select Operator
+                expressions: key (type: int)
+                outputColumnNames: _col0
+                Statistics: Num rows: 209 Data size: 839 Basic stats: COMPLETE Column stats:
NONE
+                HashTable Sink Operator
+                  keys:
+                    0 _col0 (type: int)
+                    1 _col0 (type: int)
+
+  Stage: Stage-2
+    Map Reduce
+      Map Operator Tree:
+          TableScan
+            alias: acid1
+            Statistics: Num rows: 312 Data size: 1251 Basic stats: COMPLETE Column stats:
NONE
+            Filter Operator
+              predicate: key is not null (type: boolean)
+              Statistics: Num rows: 312 Data size: 1251 Basic stats: COMPLETE Column stats:
NONE
+              Select Operator
+                expressions: key (type: int)
+                outputColumnNames: _col0
+                Statistics: Num rows: 312 Data size: 1251 Basic stats: COMPLETE Column stats:
NONE
+                Map Join Operator
+                  condition map:
+                       Inner Join 0 to 1
+                  keys:
+                    0 _col0 (type: int)
+                    1 _col0 (type: int)
+                  Statistics: Num rows: 343 Data size: 1376 Basic stats: COMPLETE Column
stats: NONE
+                  Group By Operator
+                    aggregations: count()
+                    mode: hash
+                    outputColumnNames: _col0
+                    Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats:
NONE
+                    Reduce Output Operator
+                      sort order: 
+                      Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats:
NONE
+                      value expressions: _col0 (type: bigint)
+      Local Work:
+        Map Reduce Local Work
+      Reduce Operator Tree:
+        Group By Operator
+          aggregations: count(VALUE._col0)
+          mode: mergepartial
+          outputColumnNames: _col0
+          Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
+          File Output Operator
+            compressed: false
+            Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
+            table:
+                input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+                output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+                serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+
+  Stage: Stage-0
+    Fetch Operator
+      limit: -1
+      Processor Tree:
+        ListSink
+
+PREHOOK: query: select count(*) from acid1 join acid2 on acid1.key = acid2.key
+PREHOOK: type: QUERY
+PREHOOK: Input: default@acid1
+PREHOOK: Input: default@acid2
+#### A masked pattern was here ####
+POSTHOOK: query: select count(*) from acid1 join acid2 on acid1.key = acid2.key
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@acid1
+POSTHOOK: Input: default@acid2
+#### A masked pattern was here ####
+4
+PREHOOK: query: drop table acid1
+PREHOOK: type: DROPTABLE
+PREHOOK: Input: default@acid1
+PREHOOK: Output: default@acid1
+POSTHOOK: query: drop table acid1
+POSTHOOK: type: DROPTABLE
+POSTHOOK: Input: default@acid1
+POSTHOOK: Output: default@acid1
+PREHOOK: query: drop table acid2
+PREHOOK: type: DROPTABLE
+PREHOOK: Input: default@acid2
+PREHOOK: Output: default@acid2
+POSTHOOK: query: drop table acid2
+POSTHOOK: type: DROPTABLE
+POSTHOOK: Input: default@acid2
+POSTHOOK: Output: default@acid2


Mime
View raw message