You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by go...@apache.org on 2014/09/18 04:07:48 UTC
svn commit: r1625877 - in
/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc:
CompressionCodec.java WriterImpl.java ZlibCodec.java
Author: gopalv
Date: Thu Sep 18 02:07:48 2014
New Revision: 1625877
URL: http://svn.apache.org/r1625877
Log:
HIVE-8090 Fix potential null pointer reference in WriterImpl#StreamFactory#createStream (Rahul Palamuttam reviewed by Gopal V)
Modified:
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/CompressionCodec.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/WriterImpl.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/ZlibCodec.java
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/CompressionCodec.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/CompressionCodec.java?rev=1625877&r1=1625876&r2=1625877&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/CompressionCodec.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/CompressionCodec.java Thu Sep 18 02:07:48 2014
@@ -21,6 +21,8 @@ import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.EnumSet;
+import javax.annotation.Nullable;
+
interface CompressionCodec {
public enum Modifier {
@@ -62,6 +64,6 @@ interface CompressionCodec {
* @param modifiers compression modifiers
* @return codec for use after optional modification
*/
- CompressionCodec modify(EnumSet<Modifier> modifiers);
+ CompressionCodec modify(@Nullable EnumSet<Modifier> modifiers);
}
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/WriterImpl.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/WriterImpl.java?rev=1625877&r1=1625876&r2=1625877&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/WriterImpl.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/WriterImpl.java Thu Sep 18 02:07:48 2014
@@ -485,6 +485,7 @@ class WriterImpl implements Writer, Memo
modifiers = EnumSet.of(Modifier.FASTEST, Modifier.BINARY);
break;
default:
+ LOG.warn("Missing ORC compression modifiers for " + kind);
modifiers = null;
break;
}
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/ZlibCodec.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/ZlibCodec.java?rev=1625877&r1=1625876&r2=1625877&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/ZlibCodec.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/ZlibCodec.java Thu Sep 18 02:07:48 2014
@@ -24,6 +24,8 @@ import java.util.zip.DataFormatException
import java.util.zip.Deflater;
import java.util.zip.Inflater;
+import javax.annotation.Nullable;
+
import org.apache.hadoop.hive.shims.HadoopShims;
import org.apache.hadoop.hive.shims.HadoopShims.DirectCompressionType;
import org.apache.hadoop.hive.shims.HadoopShims.DirectDecompressorShim;
@@ -130,7 +132,12 @@ class ZlibCodec implements CompressionCo
}
@Override
- public CompressionCodec modify(EnumSet<Modifier> modifiers) {
+ public CompressionCodec modify(@Nullable EnumSet<Modifier> modifiers) {
+
+ if (modifiers == null) {
+ return this;
+ }
+
int l = this.level;
int s = this.strategy;