You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by om...@apache.org on 2017/05/31 16:49:57 UTC
[5/8] hive git commit: HIVE-16683. Backport of ORC-125 to fix
incorrect handling of future WriterVersions in ORC.
HIVE-16683. Backport of ORC-125 to fix incorrect handling of future
WriterVersions in ORC.
Signed-off-by: Owen O'Malley <om...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/b7756980
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/b7756980
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/b7756980
Branch: refs/heads/branch-2.2
Commit: b775698016a1246814b24a270dc5fa10868bbb43
Parents: fd1188a
Author: Owen O'Malley <om...@apache.org>
Authored: Tue May 16 11:04:44 2017 -0700
Committer: Owen O'Malley <om...@apache.org>
Committed: Wed May 31 09:41:32 2017 -0700
----------------------------------------------------------------------
orc/src/java/org/apache/orc/OrcFile.java | 10 +++++++++-
orc/src/test/org/apache/orc/TestVectorOrcFile.java | 7 +++++++
2 files changed, 16 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/b7756980/orc/src/java/org/apache/orc/OrcFile.java
----------------------------------------------------------------------
diff --git a/orc/src/java/org/apache/orc/OrcFile.java b/orc/src/java/org/apache/orc/OrcFile.java
index ddfa9f7..06fb666 100644
--- a/orc/src/java/org/apache/orc/OrcFile.java
+++ b/orc/src/java/org/apache/orc/OrcFile.java
@@ -140,8 +140,16 @@ public class OrcFile {
}
}
+ /**
+ * Convert the integer from OrcProto.PostScript.writerVersion
+ * to the enumeration with unknown versions being mapped to FUTURE.
+ * @param val the serialized writer version
+ * @return the corresponding enumeration value
+ */
public static WriterVersion from(int val) {
- if (val == FUTURE.id) return FUTURE; // Special handling for the magic value.
+ if (val >= values.length) {
+ return FUTURE;
+ }
return values[val];
}
}
http://git-wip-us.apache.org/repos/asf/hive/blob/b7756980/orc/src/test/org/apache/orc/TestVectorOrcFile.java
----------------------------------------------------------------------
diff --git a/orc/src/test/org/apache/orc/TestVectorOrcFile.java b/orc/src/test/org/apache/orc/TestVectorOrcFile.java
index 112edb9..73abf9e 100644
--- a/orc/src/test/org/apache/orc/TestVectorOrcFile.java
+++ b/orc/src/test/org/apache/orc/TestVectorOrcFile.java
@@ -2779,4 +2779,11 @@ public class TestVectorOrcFile {
rows.nextBatch(batch);
assertEquals(0, batch.size);
}
+
+ @Test
+ public void testWriterVersion() throws Exception {
+ assertEquals(OrcFile.WriterVersion.FUTURE, OrcFile.WriterVersion.from(99));
+ assertEquals(OrcFile.WriterVersion.ORIGINAL, OrcFile.WriterVersion.from(0));
+ assertEquals(OrcFile.WriterVersion.HIVE_4243, OrcFile.WriterVersion.from(2));
+ }
}