You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by da...@apache.org on 2018/03/03 20:59:01 UTC
hive git commit: HIVE-18833: Auto Merge fails when "insert into
directory as orcfile" (Daniel Dai, reviewed by Prasanth Jayachandran)
Repository: hive
Updated Branches:
refs/heads/master 9e410b296 -> 05d4719ee
HIVE-18833: Auto Merge fails when "insert into directory as orcfile" (Daniel Dai, reviewed by Prasanth Jayachandran)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/05d4719e
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/05d4719e
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/05d4719e
Branch: refs/heads/master
Commit: 05d4719eefc56676a3e0e8f706e1c5e5e1f6b345
Parents: 9e410b2
Author: Daniel Dai <da...@hortonworks.com>
Authored: Sat Mar 3 12:58:22 2018 -0800
Committer: Daniel Dai <da...@hortonworks.com>
Committed: Sat Mar 3 12:58:26 2018 -0800
----------------------------------------------------------------------
.../java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java | 1 +
ql/src/java/org/apache/hadoop/hive/ql/plan/PlanUtils.java | 3 +++
ql/src/test/queries/clientpositive/orc_merge11.q | 4 ++++
ql/src/test/results/clientpositive/llap/orc_merge11.q.out | 4 ++++
ql/src/test/results/clientpositive/orc_merge11.q.out | 4 ++++
5 files changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/05d4719e/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
index cd6f1ee..eeab111 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
@@ -2118,6 +2118,7 @@ public class SemanticAnalyzer extends BaseSemanticAnalyzer {
ASTNode child = (ASTNode) ast.getChild(num);
if (child != null) {
if (storageFormat.fillStorageFormat(child)) {
+ directoryDesc.setInputFormat(storageFormat.getInputFormat());
directoryDesc.setOutputFormat(storageFormat.getOutputFormat());
directoryDesc.setSerName(storageFormat.getSerde());
directoryDescIsSet = true;
http://git-wip-us.apache.org/repos/asf/hive/blob/05d4719e/ql/src/java/org/apache/hadoop/hive/ql/plan/PlanUtils.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/PlanUtils.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/PlanUtils.java
index f32eb89..dde20ed 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/plan/PlanUtils.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/PlanUtils.java
@@ -148,6 +148,9 @@ public final class PlanUtils {
if (directoryDesc.getSerdeProps() != null) {
properties.putAll(directoryDesc.getSerdeProps());
}
+ if (directoryDesc.getInputFormat() != null){
+ ret.setInputFileFormatClass(JavaUtils.loadClass(directoryDesc.getInputFormat()));
+ }
if (directoryDesc.getOutputFormat() != null){
ret.setOutputFileFormatClass(JavaUtils.loadClass(directoryDesc.getOutputFormat()));
}
http://git-wip-us.apache.org/repos/asf/hive/blob/05d4719e/ql/src/test/queries/clientpositive/orc_merge11.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_merge11.q b/ql/src/test/queries/clientpositive/orc_merge11.q
index 91f1991..a10cca3 100644
--- a/ql/src/test/queries/clientpositive/orc_merge11.q
+++ b/ql/src/test/queries/clientpositive/orc_merge11.q
@@ -39,5 +39,9 @@ SET hive.exec.post.hooks=org.apache.hadoop.hive.ql.hooks.PostExecOrcFileDump;
select * from orcfile_merge1 limit 1;
SET hive.exec.post.hooks=;
+SET mapreduce.job.reduces=2;
+
+INSERT OVERWRITE DIRECTORY 'output' stored as orcfile select * from orc_split_elim;
+
DROP TABLE orc_split_elim;
DROP TABLE orcfile_merge1;
http://git-wip-us.apache.org/repos/asf/hive/blob/05d4719e/ql/src/test/results/clientpositive/llap/orc_merge11.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/orc_merge11.q.out b/ql/src/test/results/clientpositive/llap/orc_merge11.q.out
index dabf9ca..a63a018 100644
--- a/ql/src/test/results/clientpositive/llap/orc_merge11.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_merge11.q.out
@@ -430,6 +430,10 @@ ________________________________________________________________________________
-- END ORC FILE DUMP --
2 foo 0.8 1 1969-12-31 16:00:00
+PREHOOK: query: INSERT OVERWRITE DIRECTORY 'output' stored as orcfile select * from orc_split_elim
+PREHOOK: type: QUERY
+PREHOOK: Input: default@orc_split_elim
+PREHOOK: Output: output
PREHOOK: query: DROP TABLE orc_split_elim
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@orc_split_elim
http://git-wip-us.apache.org/repos/asf/hive/blob/05d4719e/ql/src/test/results/clientpositive/orc_merge11.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/orc_merge11.q.out b/ql/src/test/results/clientpositive/orc_merge11.q.out
index dabf9ca..a63a018 100644
--- a/ql/src/test/results/clientpositive/orc_merge11.q.out
+++ b/ql/src/test/results/clientpositive/orc_merge11.q.out
@@ -430,6 +430,10 @@ ________________________________________________________________________________
-- END ORC FILE DUMP --
2 foo 0.8 1 1969-12-31 16:00:00
+PREHOOK: query: INSERT OVERWRITE DIRECTORY 'output' stored as orcfile select * from orc_split_elim
+PREHOOK: type: QUERY
+PREHOOK: Input: default@orc_split_elim
+PREHOOK: Output: output
PREHOOK: query: DROP TABLE orc_split_elim
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@orc_split_elim