You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by xu...@apache.org on 2017/07/03 01:38:04 UTC
hive git commit: HIVE-16958: Setting hive.merge.sparkfiles=true will
retrun an error when generating parquet databases (Liyun Zhang reviewed by Li
Rui, Ferdinand Xu)
Repository: hive
Updated Branches:
refs/heads/master bec80e8c1 -> d68630b6e
HIVE-16958: Setting hive.merge.sparkfiles=true will retrun an error when generating parquet databases (Liyun Zhang reviewed by Li Rui, Ferdinand Xu)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/d68630b6
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/d68630b6
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/d68630b6
Branch: refs/heads/master
Commit: d68630b6ed25884a76030a9073cd864032ab85c2
Parents: bec80e8
Author: Ferdinand Xu <ch...@intel.com>
Authored: Mon Jul 3 09:26:15 2017 +0800
Committer: Ferdinand Xu <ch...@intel.com>
Committed: Mon Jul 3 09:26:15 2017 +0800
----------------------------------------------------------------------
.../org/apache/hadoop/hive/ql/io/parquet/ProjectionPusher.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/d68630b6/ql/src/java/org/apache/hadoop/hive/ql/io/parquet/ProjectionPusher.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/io/parquet/ProjectionPusher.java b/ql/src/java/org/apache/hadoop/hive/ql/io/parquet/ProjectionPusher.java
index 42f9b66..855efa0 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/io/parquet/ProjectionPusher.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/io/parquet/ProjectionPusher.java
@@ -115,7 +115,9 @@ public class ProjectionPusher {
allColumnsNeeded = true;
} else {
neededColumnIDs.addAll(ts.getNeededColumnIDs());
- neededNestedColumnPaths.addAll(ts.getNeededNestedColumnPaths());
+ if (ts.getNeededNestedColumnPaths() != null) {
+ neededNestedColumnPaths.addAll(ts.getNeededNestedColumnPaths());
+ }
}
rowSchema = ts.getSchema();