You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by se...@apache.org on 2015/07/02 03:49:21 UTC
[16/25] hive git commit: HIVE-11086: Remove use of ErrorMsg in Orc's
RunLengthIntegerReaderV2 (Owen O'Malley via Prasanth Jayachandran)
HIVE-11086: Remove use of ErrorMsg in Orc's RunLengthIntegerReaderV2 (Owen O'Malley via Prasanth Jayachandran)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/c6d3e68a
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/c6d3e68a
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/c6d3e68a
Branch: refs/heads/llap
Commit: c6d3e68a7eed553f9a231f789866d3241c487ae8
Parents: 20034d3
Author: Prasanth Jayachandran <j....@gmail.com>
Authored: Wed Jul 1 10:09:14 2015 -0700
Committer: Prasanth Jayachandran <j....@gmail.com>
Committed: Wed Jul 1 10:09:14 2015 -0700
----------------------------------------------------------------------
ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java | 3 +--
.../hadoop/hive/ql/io/orc/RunLengthIntegerReaderV2.java | 8 +++-----
2 files changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/c6d3e68a/ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java b/ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java
index f012b72..fbdd66a 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java
@@ -490,8 +490,7 @@ public enum ErrorMsg {
"Stats type {0} is missing from stats aggregator. If you don't want the query " +
"to fail because of this, set hive.stats.atomic=false", true),
STATS_SKIPPING_BY_ERROR(30017, "Skipping stats aggregation by error {0}", true),
- ORC_CORRUPTED_READ(30018, "Corruption in ORC data encountered. To skip reading corrupted "
- + "data, set " + HiveConf.ConfVars.HIVE_ORC_SKIP_CORRUPT_DATA + " to true"),
+
INVALID_FILE_FORMAT_IN_LOAD(30019, "The file that you are trying to load does not match the" +
" file format of the destination table.")
http://git-wip-us.apache.org/repos/asf/hive/blob/c6d3e68a/ql/src/java/org/apache/hadoop/hive/ql/io/orc/RunLengthIntegerReaderV2.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/io/orc/RunLengthIntegerReaderV2.java b/ql/src/java/org/apache/hadoop/hive/ql/io/orc/RunLengthIntegerReaderV2.java
index f406e17..ec46595 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/io/orc/RunLengthIntegerReaderV2.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/io/orc/RunLengthIntegerReaderV2.java
@@ -20,10 +20,6 @@ package org.apache.hadoop.hive.ql.io.orc;
import java.io.EOFException;
import java.io.IOException;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hive.conf.HiveConf;
-import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
-import org.apache.hadoop.hive.ql.ErrorMsg;
import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector;
import org.apache.hadoop.hive.ql.io.orc.RunLengthIntegerWriterV2.EncodingType;
@@ -174,7 +170,9 @@ class RunLengthIntegerReaderV2 implements IntegerReader {
long[] unpackedPatch = new long[pl];
if ((pw + pgw) > 64 && !skipCorrupt) {
- throw new IOException(ErrorMsg.ORC_CORRUPTED_READ.getMsg());
+ throw new IOException("Corruption in ORC data encountered. To skip" +
+ " reading corrupted data, set hive.exec.orc.skip.corrupt.data to" +
+ " true");
}
int bitSize = utils.getClosestFixedBits(pw + pgw);
utils.readInts(unpackedPatch, 0, pl, bitSize, input);