github/sqoop
5
0
Fork 0
mirror of https://github.com/apache/sqoop.git synced 2025-05-03 06:09:47 +08:00
Code Issues Projects Releases Wiki Activity

ShimLoader accepts 0.22.0-SNAPSHOT signature.

Browse Source 
From: Aaron Kimball <aaron@cloudera.com>

git-svn-id: https://svn.apache.org/repos/asf/incubator/sqoop/trunk@1149896 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Andrew Bayer 2011-07-22 20:03:46 +00:00
parent b4d59da671
commit 04fb6ee44f
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/java/org/apache/hadoop/sqoop/shims/ShimLoader.java
View File

@ -68,16 +68,22 @@ public abstract class ShimLoader {
static { static {
// These regular expressions will be evaluated in order until one matches. // These regular expressions will be evaluated in order until one matches.
// Check // CDH3 (based on 0.20.2)
HADOOP_SHIM_MATCHES.add("0.20.2-[cC][dD][hH]3.*"); HADOOP_SHIM_MATCHES.add("0.20.2-[cC][dD][hH]3.*");
HADOOP_SHIM_CLASSES.add("org.apache.hadoop.sqoop.shims.CDH3Shim"); HADOOP_SHIM_CLASSES.add("org.apache.hadoop.sqoop.shims.CDH3Shim");
HADOOP_SHIM_JARS.add("sqoop-.*-cloudera.jar"); HADOOP_SHIM_JARS.add("sqoop-.*-cloudera.jar");
// Apache 0.22 trunk // Apache 0.22 trunk.
// Version may have the form "0.22-SNAPSHOT"
HADOOP_SHIM_MATCHES.add("0.22-.*"); HADOOP_SHIM_MATCHES.add("0.22-.*");
HADOOP_SHIM_CLASSES.add("org.apache.hadoop.sqoop.shims.Apache22HadoopShim"); HADOOP_SHIM_CLASSES.add("org.apache.hadoop.sqoop.shims.Apache22HadoopShim");
HADOOP_SHIM_JARS.add("sqoop-.*-apache.jar"); HADOOP_SHIM_JARS.add("sqoop-.*-apache.jar");
// ... or "0.22.n-SNAPSHOT"
HADOOP_SHIM_MATCHES.add("0.22.\\d+-.*");
HADOOP_SHIM_CLASSES.add("org.apache.hadoop.sqoop.shims.Apache22HadoopShim");
HADOOP_SHIM_JARS.add("sqoop-.*-apache.jar");
// Apache 0.22 trunk snapshots often compile with "Unknown" version, // Apache 0.22 trunk snapshots often compile with "Unknown" version,
// so we default to guessing Apache in this case. // so we default to guessing Apache in this case.
HADOOP_SHIM_MATCHES.add("Unknown"); HADOOP_SHIM_MATCHES.add("Unknown");
@ -133,6 +139,7 @@ private static <T> T loadShim(List<String> matchExprs,
LOG.debug("Hadoop version: " + version); LOG.debug("Hadoop version: " + version);
for (int i = 0; i < matchExprs.size(); i++) { for (int i = 0; i < matchExprs.size(); i++) {
LOG.debug("Checking: " + matchExprs.get(i));
if (version.matches(matchExprs.get(i))) { if (version.matches(matchExprs.get(i))) {
String className = classNames.get(i); String className = classNames.get(i);
String jarPattern = jarPatterns.get(i); String jarPattern = jarPatterns.get(i);