You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ek...@apache.org on 2017/02/09 18:14:38 UTC
hive git commit: HIVE-15851 CompactorMR.launchCompactionJob() should
use JobClient.submitJob() not runJob (Eugene Koifman, reviewed by Wei Zheng)
Repository: hive
Updated Branches:
refs/heads/master 27613f0c7 -> 36ff484f7
HIVE-15851 CompactorMR.launchCompactionJob() should use JobClient.submitJob() not runJob (Eugene Koifman, reviewed by Wei Zheng)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/36ff484f
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/36ff484f
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/36ff484f
Branch: refs/heads/master
Commit: 36ff484f79b8d2f6771ef42ef6789678b7dcd295
Parents: 27613f0
Author: Eugene Koifman <ek...@hortonworks.com>
Authored: Thu Feb 9 10:14:30 2017 -0800
Committer: Eugene Koifman <ek...@hortonworks.com>
Committed: Thu Feb 9 10:14:30 2017 -0800
----------------------------------------------------------------------
.../hive/ql/txn/compactor/CompactorMR.java | 2 +-
.../clientpositive/acid_globallimit.q.out | 52 --------------------
2 files changed, 1 insertion(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/36ff484f/ql/src/java/org/apache/hadoop/hive/ql/txn/compactor/CompactorMR.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/txn/compactor/CompactorMR.java b/ql/src/java/org/apache/hadoop/hive/ql/txn/compactor/CompactorMR.java
index 2f25925..1aef7ac 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/txn/compactor/CompactorMR.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/txn/compactor/CompactorMR.java
@@ -309,7 +309,7 @@ public class CompactorMR {
job.getJobName() + "' to " + job.getQueueName() + " queue. " +
"(current delta dirs count=" + curDirNumber +
", obsolete delta dirs count=" + obsoleteDirNumber + ". TxnIdRange[" + minTxn + "," + maxTxn + "]");
- RunningJob rj = JobClient.runJob(job);
+ RunningJob rj = new JobClient(job).submitJob(job);
LOG.info("Submitted compaction job '" + job.getJobName() + "' with jobID=" + rj.getID() + " compaction ID=" + id);
txnHandler.setHadoopJobId(rj.getID().toString(), id);
rj.waitForCompletion();
http://git-wip-us.apache.org/repos/asf/hive/blob/36ff484f/ql/src/test/results/clientpositive/acid_globallimit.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/acid_globallimit.q.out b/ql/src/test/results/clientpositive/acid_globallimit.q.out
deleted file mode 100644
index fe738a6..0000000
--- a/ql/src/test/results/clientpositive/acid_globallimit.q.out
+++ /dev/null
@@ -1,52 +0,0 @@
-PREHOOK: query: -- Global Limit optimization does not work with ACID table. Make sure to skip it for ACID table.
-CREATE TABLE acidtest1(c1 INT, c2 STRING)
-CLUSTERED BY (c1) INTO 3 BUCKETS
-STORED AS ORC
-TBLPROPERTIES ("transactional"="true")
-PREHOOK: type: CREATETABLE
-PREHOOK: Output: database:default
-PREHOOK: Output: default@acidtest1
-POSTHOOK: query: -- Global Limit optimization does not work with ACID table. Make sure to skip it for ACID table.
-CREATE TABLE acidtest1(c1 INT, c2 STRING)
-CLUSTERED BY (c1) INTO 3 BUCKETS
-STORED AS ORC
-TBLPROPERTIES ("transactional"="true")
-POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@acidtest1
-PREHOOK: query: insert into table acidtest1 select cint, cstring1 from alltypesorc where cint is not null order by cint
-PREHOOK: type: QUERY
-PREHOOK: Input: default@alltypesorc
-PREHOOK: Output: default@acidtest1
-POSTHOOK: query: insert into table acidtest1 select cint, cstring1 from alltypesorc where cint is not null order by cint
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@alltypesorc
-POSTHOOK: Output: default@acidtest1
-POSTHOOK: Lineage: acidtest1.c1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ]
-POSTHOOK: Lineage: acidtest1.c2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ]
-PREHOOK: query: select cast (c1 as string) from acidtest1 limit 10
-PREHOOK: type: QUERY
-PREHOOK: Input: default@acidtest1
-#### A masked pattern was here ####
-POSTHOOK: query: select cast (c1 as string) from acidtest1 limit 10
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@acidtest1
-#### A masked pattern was here ####
-185520768
-186950964
-186967185
-187206627
-187503456
-188474907
-190070046
-190435023
-190587882
-191372331
-PREHOOK: query: drop table acidtest1
-PREHOOK: type: DROPTABLE
-PREHOOK: Input: default@acidtest1
-PREHOOK: Output: default@acidtest1
-POSTHOOK: query: drop table acidtest1
-POSTHOOK: type: DROPTABLE
-POSTHOOK: Input: default@acidtest1
-POSTHOOK: Output: default@acidtest1