From ca0dec83e726ef0ba7c9b17ea7408993fb9808ee Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Fri, 22 Jul 2011 20:03:58 +0000 Subject: [PATCH] Adjust regex used to recognize CDH3 in ShimLoader. From: Aaron Kimball git-svn-id: https://svn.apache.org/repos/asf/incubator/sqoop/trunk@1149920 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/com/cloudera/sqoop/shims/ShimLoader.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/java/com/cloudera/sqoop/shims/ShimLoader.java b/src/java/com/cloudera/sqoop/shims/ShimLoader.java index d105546a..4746c767 100644 --- a/src/java/com/cloudera/sqoop/shims/ShimLoader.java +++ b/src/java/com/cloudera/sqoop/shims/ShimLoader.java @@ -68,8 +68,9 @@ public abstract class ShimLoader { static { // These regular expressions will be evaluated in order until one matches. - // CDH3 (based on 0.20.2) - HADOOP_SHIM_MATCHES.add("0.20.2-[cC][dD][hH]3.*"); + // CDH3 (based on 0.20.2) has versions of the form "0.20.2+nnn" where + // nnn is a build number. + HADOOP_SHIM_MATCHES.add("0.20.2\\+[0-9]+"); HADOOP_SHIM_CLASSES.add("com.cloudera.sqoop.shims.CDH3Shim"); HADOOP_SHIM_JARS.add("sqoop-.*-cloudera.jar");