You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@orc.apache.org by om...@apache.org on 2018/03/26 20:32:47 UTC
orc git commit: ORC-326. Fix HadoopShimsFactory to create pre 2.6
shims.
Repository: orc
Updated Branches:
refs/heads/master a5e564f39 -> a49612ead
ORC-326. Fix HadoopShimsFactory to create pre 2.6 shims.
Fixes #237
Signed-off-by: Owen O'Malley <om...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/orc/repo
Commit: http://git-wip-us.apache.org/repos/asf/orc/commit/a49612ea
Tree: http://git-wip-us.apache.org/repos/asf/orc/tree/a49612ea
Diff: http://git-wip-us.apache.org/repos/asf/orc/diff/a49612ea
Branch: refs/heads/master
Commit: a49612eada931eef8e46aab59d3217d0f4f60f20
Parents: a5e564f
Author: Owen O'Malley <om...@apache.org>
Authored: Mon Mar 26 13:08:57 2018 -0700
Committer: Owen O'Malley <om...@apache.org>
Committed: Mon Mar 26 13:30:07 2018 -0700
----------------------------------------------------------------------
java/core/src/java/org/apache/orc/impl/HadoopShimsFactory.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/orc/blob/a49612ea/java/core/src/java/org/apache/orc/impl/HadoopShimsFactory.java
----------------------------------------------------------------------
diff --git a/java/core/src/java/org/apache/orc/impl/HadoopShimsFactory.java b/java/core/src/java/org/apache/orc/impl/HadoopShimsFactory.java
index 090dc98..9e42e8c 100644
--- a/java/core/src/java/org/apache/orc/impl/HadoopShimsFactory.java
+++ b/java/core/src/java/org/apache/orc/impl/HadoopShimsFactory.java
@@ -26,6 +26,8 @@ import org.apache.hadoop.util.VersionInfo;
public class HadoopShimsFactory {
private static final String CURRENT_SHIM_NAME =
"org.apache.orc.impl.HadoopShimsCurrent";
+ private static final String PRE_2_6_SHIM_NAME =
+ "org.apache.orc.impl.HadoopShimsPre2_6";
private static final String PRE_2_7_SHIM_NAME =
"org.apache.orc.impl.HadoopShimsPre2_7";
@@ -52,6 +54,8 @@ public class HadoopShimsFactory {
int minor = Integer.parseInt(versionParts[1]);
if (major < 2 || (major == 2 && minor < 3)) {
SHIMS = new HadoopShimsPre2_3();
+ } else if (major == 2 && minor < 6) {
+ SHIMS = createShimByName(PRE_2_6_SHIM_NAME);
} else if (major == 2 && minor < 7) {
SHIMS = createShimByName(PRE_2_7_SHIM_NAME);
} else {