You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@hive.apache.org by gu...@apache.org on 2014/03/24 20:15:30 UTC

svn commit: r1581007 - /hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcStruct.java

Author: gunther
Date: Mon Mar 24 19:15:29 2014
New Revision: 1581007

URL: http://svn.apache.org/r1581007
Log:
HIVE-6716: ORC struct throws NPE for tables with inner structs having null values (Prasanth J via Gunther Hagleitner)

Modified:
    hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcStruct.java

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcStruct.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcStruct.java?rev=1581007&r1=1581006&r2=1581007&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcStruct.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcStruct.java Mon Mar 24 19:15:29 2014
@@ -207,11 +207,17 @@ final public class OrcStruct implements 
 
     @Override
     public Object getStructFieldData(Object object, StructField field) {
+      if (object == null) {
+        return null;
+      }
       return ((OrcStruct) object).fields[((Field) field).offset];
     }
 
     @Override
     public List<Object> getStructFieldsDataAsList(Object object) {
+      if (object == null) {
+        return null;
+      }
       OrcStruct struct = (OrcStruct) object;
       List<Object> result = new ArrayList<Object>(struct.fields.length);
       for (Object child: struct.fields) {