diff --git ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java index 655d10b..3d965c0 100755 --- ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java +++ ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java @@ -284,7 +284,11 @@ public void configure(JobConf job) { } return inputFormat; } - serde = findSerDeForLlapSerDeIf(conf, part); + try { + serde = part.getDeserializer(conf); + } catch (Exception e) { + throw new HiveException("Error creating SerDe for LLAP IO", e); + } } if (isSupported && isVectorized) { InputFormat wrappedIf = llapIo.getInputFormat(inputFormat, serde); @@ -319,27 +323,6 @@ private static boolean checkInputFormatForLlapEncode(Configuration conf, String return false; } - private static Deserializer findSerDeForLlapSerDeIf( - Configuration conf, PartitionDesc part) throws HiveException { - VectorPartitionDesc vpart = part.getVectorPartitionDesc(); - if (vpart != null) { - VectorMapOperatorReadType old = vpart.getVectorMapOperatorReadType(); - if (old != VectorMapOperatorReadType.VECTORIZED_INPUT_FILE_FORMAT) { - if (LOG.isInfoEnabled()) { - LOG.info("Resetting VectorMapOperatorReadType from " + old + " for partition " - + part.getTableName() + " " + part.getPartSpec()); - } - vpart.setVectorMapOperatorReadType( - VectorMapOperatorReadType.VECTORIZED_INPUT_FILE_FORMAT); - } - } - try { - return part.getDeserializer(conf); - } catch (Exception e) { - throw new HiveException("Error creating SerDe for LLAP IO", e); - } - } - public static void injectLlapCaches(InputFormat inputFormat, LlapIo llapIo) { LOG.info("Injecting LLAP caches into " + inputFormat.getClass().getCanonicalName());