HIVE-19347: TestTriggersWorkloadManager tests are failing consistently (Matt McCline, reviewed by Sergey Shelukhin)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/e40aa049 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/e40aa049 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/e40aa049 Branch: refs/heads/branch-3.0.0 Commit: e40aa049ceb07ecea426234e88278b9ac3516978 Parents: c03ae0b Author: Matt McCline <mmccl...@hortonworks.com> Authored: Fri May 11 02:48:07 2018 -0500 Committer: Matt McCline <mmccl...@hortonworks.com> Committed: Fri May 11 02:48:47 2018 -0500 ---------------------------------------------------------------------- .../hadoop/hive/ql/io/HiveInputFormat.java | 27 ++++---------------- 1 file changed, 5 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/e40aa049/ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java b/ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java index b25bb1d..6c6eeff 100755 --- a/ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java @@ -284,7 +284,11 @@ public class HiveInputFormat<K extends WritableComparable, V extends Writable> } 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 @@ public class HiveInputFormat<K extends WritableComparable, V extends Writable> 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<WritableComparable, Writable> inputFormat, LlapIo<VectorizedRowBatch> llapIo) { LOG.info("Injecting LLAP caches into " + inputFormat.getClass().getCanonicalName());
