You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2014/09/01 03:51:03 UTC
svn commit: r1621657 -
/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/merge/MergeTask.java
Author: hashutosh
Date: Mon Sep 1 01:51:03 2014
New Revision: 1621657
URL: http://svn.apache.org/r1621657
Log:
HIVE-7599 : NPE in MergeTask#main() when -format is absent (DJ Choi via Ashutosh Chauhan)
Modified:
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/merge/MergeTask.java
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/merge/MergeTask.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/merge/MergeTask.java?rev=1621657&r1=1621656&r2=1621657&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/merge/MergeTask.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/merge/MergeTask.java Mon Sep 1 01:51:03 2014
@@ -373,6 +373,10 @@ public class MergeTask extends Task<Merg
}
}
+ if (format == null || format.trim().equals("")) {
+ printUsage();
+ }
+
MergeWork mergeWork = null;
if (format.equals("rcfile")) {
mergeWork = new MergeWork(inputPaths, new Path(outputDir), RCFileInputFormat.class);