You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sqoop.apache.org by bl...@apache.org on 2011/11/01 08:10:14 UTC

svn commit: r1195852 [4/7] - in /incubator/sqoop/trunk/src/java: com/cloudera/sqoop/orm/ com/cloudera/sqoop/tool/ org/apache/sqoop/orm/ org/apache/sqoop/tool/

Added: incubator/sqoop/trunk/src/java/org/apache/sqoop/orm/AvroSchemaGenerator.java
URL: http://svn.apache.org/viewvc/incubator/sqoop/trunk/src/java/org/apache/sqoop/orm/AvroSchemaGenerator.java?rev=1195852&view=auto
==============================================================================
--- incubator/sqoop/trunk/src/java/org/apache/sqoop/orm/AvroSchemaGenerator.java (added)
+++ incubator/sqoop/trunk/src/java/org/apache/sqoop/orm/AvroSchemaGenerator.java Tue Nov  1 07:10:13 2011
@@ -0,0 +1,124 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.sqoop.orm;
+
+import java.io.IOException;
+import java.sql.Types;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.avro.Schema;
+import org.apache.avro.Schema.Field;
+import org.apache.avro.Schema.Type;
+
+import com.cloudera.sqoop.SqoopOptions;
+import com.cloudera.sqoop.manager.ConnManager;
+
+/**
+ * Creates an Avro schema to represent a table from a database.
+ */
+public class AvroSchemaGenerator {
+
+  private final SqoopOptions options;
+  private final ConnManager connManager;
+  private final String tableName;
+
+  public AvroSchemaGenerator(final SqoopOptions opts, final ConnManager connMgr,
+      final String table) {
+    this.options = opts;
+    this.connManager = connMgr;
+    this.tableName = table;
+  }
+
+  public Schema generate() throws IOException {
+    ClassWriter classWriter = new ClassWriter(options, connManager,
+        tableName, null);
+    Map<String, Integer> columnTypes = classWriter.getColumnTypes();
+    String[] columnNames = classWriter.getColumnNames(columnTypes);
+
+    List<Field> fields = new ArrayList<Field>();
+    for (String columnName : columnNames) {
+      String cleanedCol = ClassWriter.toIdentifier(columnName);
+      int sqlType = columnTypes.get(cleanedCol);
+      Schema avroSchema = toAvroSchema(sqlType);
+      Field field = new Field(cleanedCol, avroSchema, null, null);
+      field.addProp("columnName", columnName);
+      field.addProp("sqlType", Integer.toString(sqlType));
+      fields.add(field);
+    }
+
+    String avroTableName = (tableName == null ? "QueryResult" : tableName);
+
+    String doc = "Sqoop import of " + avroTableName;
+    Schema schema = Schema.createRecord(avroTableName, doc, null, false);
+    schema.setFields(fields);
+    schema.addProp("tableName", avroTableName);
+    return schema;
+  }
+
+  private Type toAvroType(int sqlType) {
+    switch (sqlType) {
+      case Types.TINYINT:
+      case Types.SMALLINT:
+      case Types.INTEGER:
+        return Type.INT;
+      case Types.BIGINT:
+        return Type.LONG;
+      case Types.BIT:
+      case Types.BOOLEAN:
+        return Type.BOOLEAN;
+      case Types.REAL:
+        return Type.FLOAT;
+      case Types.FLOAT:
+      case Types.DOUBLE:
+        return Type.DOUBLE;
+      case Types.NUMERIC:
+      case Types.DECIMAL:
+        return Type.STRING;
+      case Types.CHAR:
+      case Types.VARCHAR:
+      case Types.LONGVARCHAR:
+      case Types.LONGNVARCHAR:
+      case Types.NVARCHAR:
+      case Types.NCHAR:
+        return Type.STRING;
+      case Types.DATE:
+      case Types.TIME:
+      case Types.TIMESTAMP:
+        return Type.LONG;
+      case Types.BINARY:
+      case Types.VARBINARY:
+        return Type.BYTES;
+      default:
+        throw new IllegalArgumentException("Cannot convert SQL type "
+            + sqlType);
+    }
+  }
+
+  public Schema toAvroSchema(int sqlType) {
+    // All types are assumed nullabl;e make a union of the "true" type for
+    // a column and NULL.
+    List<Schema> childSchemas = new ArrayList<Schema>();
+    childSchemas.add(Schema.create(toAvroType(sqlType)));
+    childSchemas.add(Schema.create(Schema.Type.NULL));
+    return Schema.createUnion(childSchemas);
+  }
+
+}

Propchange: incubator/sqoop/trunk/src/java/org/apache/sqoop/orm/AvroSchemaGenerator.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/sqoop/trunk/src/java/org/apache/sqoop/orm/ClassWriter.java
URL: http://svn.apache.org/viewvc/incubator/sqoop/trunk/src/java/org/apache/sqoop/orm/ClassWriter.java?rev=1195852&view=auto
==============================================================================
--- incubator/sqoop/trunk/src/java/org/apache/sqoop/orm/ClassWriter.java (added)
+++ incubator/sqoop/trunk/src/java/org/apache/sqoop/orm/ClassWriter.java Tue Nov  1 07:10:13 2011
@@ -0,0 +1,1315 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.sqoop.orm;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.io.BytesWritable;
+
+import com.cloudera.sqoop.SqoopOptions;
+import com.cloudera.sqoop.manager.ConnManager;
+import com.cloudera.sqoop.lib.BigDecimalSerializer;
+import com.cloudera.sqoop.lib.BooleanParser;
+import com.cloudera.sqoop.lib.DelimiterSet;
+import com.cloudera.sqoop.lib.FieldFormatter;
+import com.cloudera.sqoop.lib.JdbcWritableBridge;
+import com.cloudera.sqoop.lib.LargeObjectLoader;
+import com.cloudera.sqoop.lib.LobSerializer;
+import com.cloudera.sqoop.lib.RecordParser;
+import com.cloudera.sqoop.lib.BlobRef;
+import com.cloudera.sqoop.lib.ClobRef;
+import com.cloudera.sqoop.lib.SqoopRecord;
+
+/**
+ * Creates an ORM class to represent a table from a database.
+ */
+public class ClassWriter {
+
+  public static final Log LOG = LogFactory.getLog(ClassWriter.class.getName());
+
+  // The following are keywords and cannot be used for class, method, or field
+  // names.
+  public static final HashSet<String> JAVA_RESERVED_WORDS;
+
+  static {
+    JAVA_RESERVED_WORDS = new HashSet<String>();
+
+    JAVA_RESERVED_WORDS.add("abstract");
+    JAVA_RESERVED_WORDS.add("else");
+    JAVA_RESERVED_WORDS.add("int");
+    JAVA_RESERVED_WORDS.add("strictfp");
+    JAVA_RESERVED_WORDS.add("assert");
+    JAVA_RESERVED_WORDS.add("enum");
+    JAVA_RESERVED_WORDS.add("interface");
+    JAVA_RESERVED_WORDS.add("super");
+    JAVA_RESERVED_WORDS.add("boolean");
+    JAVA_RESERVED_WORDS.add("extends");
+    JAVA_RESERVED_WORDS.add("long");
+    JAVA_RESERVED_WORDS.add("switch");
+    JAVA_RESERVED_WORDS.add("break");
+    JAVA_RESERVED_WORDS.add("false");
+    JAVA_RESERVED_WORDS.add("native");
+    JAVA_RESERVED_WORDS.add("synchronized");
+    JAVA_RESERVED_WORDS.add("byte");
+    JAVA_RESERVED_WORDS.add("final");
+    JAVA_RESERVED_WORDS.add("new");
+    JAVA_RESERVED_WORDS.add("this");
+    JAVA_RESERVED_WORDS.add("case");
+    JAVA_RESERVED_WORDS.add("finally");
+    JAVA_RESERVED_WORDS.add("null");
+    JAVA_RESERVED_WORDS.add("throw");
+    JAVA_RESERVED_WORDS.add("catch");
+    JAVA_RESERVED_WORDS.add("float");
+    JAVA_RESERVED_WORDS.add("package");
+    JAVA_RESERVED_WORDS.add("throws");
+    JAVA_RESERVED_WORDS.add("char");
+    JAVA_RESERVED_WORDS.add("for");
+    JAVA_RESERVED_WORDS.add("private");
+    JAVA_RESERVED_WORDS.add("transient");
+    JAVA_RESERVED_WORDS.add("class");
+    JAVA_RESERVED_WORDS.add("goto");
+    JAVA_RESERVED_WORDS.add("protected");
+    JAVA_RESERVED_WORDS.add("true");
+    JAVA_RESERVED_WORDS.add("const");
+  }
+
+  /**
+   * This version number is injected into all generated Java classes to denote
+   * which version of the ClassWriter's output format was used to generate the
+   * class.
+   *
+   * If the way that we generate classes changes, bump this number.
+   * This number is retrieved by the SqoopRecord.getClassFormatVersion()
+   * method.
+   */
+  public static final int CLASS_WRITER_VERSION = 3;
+
+  private SqoopOptions options;
+  private ConnManager connManager;
+  private String tableName;
+  private CompilationManager compileManager;
+
+  /**
+   * Creates a new ClassWriter to generate an ORM class for a table
+   * or arbitrary query.
+   * @param opts program-wide options
+   * @param connMgr the connection manager used to describe the table.
+   * @param table the name of the table to read. If null, query is taken
+   * from the SqoopOptions.
+   */
+  public ClassWriter(final SqoopOptions opts, final ConnManager connMgr,
+      final String table, final CompilationManager compMgr) {
+    this.options = opts;
+    this.connManager = connMgr;
+    this.tableName = table;
+    this.compileManager = compMgr;
+  }
+
+  /**
+   * Given some character that can't be in an identifier,
+   * try to map it to a string that can.
+   *
+   * @param c a character that can't be in a Java identifier
+   * @return a string of characters that can, or null if there's
+   * no good translation.
+   */
+  public static String getIdentifierStrForChar(char c) {
+    if (Character.isJavaIdentifierPart(c)) {
+      return "" + c;
+    } else if (Character.isWhitespace(c)) {
+      // Eliminate whitespace.
+      return null;
+    } else {
+      // All other characters map to underscore.
+      return "_";
+    }
+  }
+
+  /**
+   * @param word a word to test.
+   * @return true if 'word' is reserved the in Java language.
+   */
+  private static boolean isReservedWord(String word) {
+    return JAVA_RESERVED_WORDS.contains(word);
+  }
+
+  /**
+   * Coerce a candidate name for an identifier into one which is a valid
+   * Java or Avro identifier.
+   *
+   * Ensures that the returned identifier matches [A-Za-z_][A-Za-z0-9_]*
+   * and is not a reserved word.
+   *
+   * @param candidate A string we want to use as an identifier
+   * @return A string naming an identifier which compiles and is
+   *   similar to the candidate.
+   */
+  public static String toIdentifier(String candidate) {
+    StringBuilder sb = new StringBuilder();
+    boolean first = true;
+    for (char c : candidate.toCharArray()) {
+      if (Character.isJavaIdentifierStart(c) && first) {
+        // Ok for this to be the first character of the identifier.
+        sb.append(c);
+        first = false;
+      } else if (Character.isJavaIdentifierPart(c) && !first) {
+        // Ok for this character to be in the output identifier.
+        sb.append(c);
+      } else {
+        // We have a character in the original that can't be
+        // part of this identifier we're building.
+        // If it's just not allowed to be the first char, add a leading '_'.
+        // If we have a reasonable translation (e.g., '-' -> '_'), do that.
+        // Otherwise, drop it.
+        if (first && Character.isJavaIdentifierPart(c)
+            && !Character.isJavaIdentifierStart(c)) {
+          sb.append("_");
+          sb.append(c);
+          first = false;
+        } else {
+          // Try to map this to a different character or string.
+          // If we can't just give up.
+          String translated = getIdentifierStrForChar(c);
+          if (null != translated) {
+            sb.append(translated);
+            first = false;
+          }
+        }
+      }
+    }
+    return sb.toString();
+  }
+
+  /**
+   * Coerce a candidate name for an identifier into one which will
+   * definitely compile.
+   *
+   * Ensures that the returned identifier matches [A-Za-z_][A-Za-z0-9_]*
+   * and is not a reserved word.
+   *
+   * @param candidate A string we want to use as an identifier
+   * @return A string naming an identifier which compiles and is
+   *   similar to the candidate.
+   */
+  public static String toJavaIdentifier(String candidate) {
+    String output = toIdentifier(candidate);
+    if (isReservedWord(output)) {
+      // e.g., 'class' -> '_class';
+      return "_" + output;
+    }
+
+    return output;
+  }
+
+  private String toJavaType(String columnName, int sqlType) {
+    Properties mapping = options.getMapColumnJava();
+
+    if(mapping.containsKey(columnName)) {
+      String type = mapping.getProperty(columnName);
+      if(LOG.isDebugEnabled()) {
+        LOG.info("Overriding type of column " + columnName + " to " + type);
+      }
+      return type;
+    }
+
+    return connManager.toJavaType(sqlType);
+  }
+
+  /**
+   * @param javaType
+   * @return the name of the method of JdbcWritableBridge to read an entry
+   * with a given java type.
+   */
+  private String dbGetterForType(String javaType) {
+    // All Class-based types (e.g., java.math.BigDecimal) are handled with
+    // "readBar" where some.package.foo.Bar is the canonical class name.  Turn
+    // the javaType string into the getter type string.
+
+    String [] parts = javaType.split("\\.");
+    if (parts.length == 0) {
+      LOG.error("No ResultSet method for Java type " + javaType);
+      return null;
+    }
+
+    String lastPart = parts[parts.length - 1];
+    try {
+      String getter = "read" + Character.toUpperCase(lastPart.charAt(0))
+          + lastPart.substring(1);
+      return getter;
+    } catch (StringIndexOutOfBoundsException oob) {
+      // lastPart.*() doesn't work on empty strings.
+      LOG.error("Could not infer JdbcWritableBridge getter for Java type "
+          + javaType);
+      return null;
+    }
+  }
+
+  /**
+   * @param javaType
+   * @return the name of the method of JdbcWritableBridge to write an entry
+   * with a given java type.
+   */
+  private String dbSetterForType(String javaType) {
+    // TODO(aaron): Lots of unit tests needed here.
+    // See dbGetterForType() for the logic used here; it's basically the same.
+
+    String [] parts = javaType.split("\\.");
+    if (parts.length == 0) {
+      LOG.error("No PreparedStatement Set method for Java type " + javaType);
+      return null;
+    }
+
+    String lastPart = parts[parts.length - 1];
+    try {
+      String setter = "write" + Character.toUpperCase(lastPart.charAt(0))
+          + lastPart.substring(1);
+      return setter;
+    } catch (StringIndexOutOfBoundsException oob) {
+      // lastPart.*() doesn't work on empty strings.
+      LOG.error("Could not infer PreparedStatement setter for Java type "
+          + javaType);
+      return null;
+    }
+  }
+
+  private String stringifierForType(String javaType, String colName) {
+    if (javaType.equals("String")) {
+      // Check if it is null, and write the null representation in such case
+      String r = colName  + "==null?\"" + this.options.getNullStringValue()
+          + "\":" + colName;
+      return r;
+    } else {
+      // This is an object type -- just call its toString() in a null-safe way.
+      // Also check if it is null, and instead write the null representation
+      // in such case
+      String r = colName  + "==null?\"" + this.options.getNullNonStringValue()
+          + "\":" + "\"\" + " + colName;
+      return r;
+    }
+  }
+
+  /**
+   * @param javaType the type to read
+   * @param inputObj the name of the DataInput to read from
+   * @param colName the column name to read
+   * @return the line of code involving a DataInput object to read an entry
+   * with a given java type.
+   */
+  private String rpcGetterForType(String javaType, String inputObj,
+      String colName) {
+    if (javaType.equals("Integer")) {
+      return "    this." + colName + " = Integer.valueOf(" + inputObj
+          + ".readInt());\n";
+    } else if (javaType.equals("Long")) {
+      return "    this." + colName + " = Long.valueOf(" + inputObj
+          + ".readLong());\n";
+    } else if (javaType.equals("Float")) {
+      return "    this." + colName + " = Float.valueOf(" + inputObj
+          + ".readFloat());\n";
+    } else if (javaType.equals("Double")) {
+      return "    this." + colName + " = Double.valueOf(" + inputObj
+          + ".readDouble());\n";
+    } else if (javaType.equals("Boolean")) {
+      return "    this." + colName + " = Boolean.valueOf(" + inputObj
+          + ".readBoolean());\n";
+    } else if (javaType.equals("String")) {
+      return "    this." + colName + " = Text.readString(" + inputObj + ");\n";
+    } else if (javaType.equals("java.sql.Date")) {
+      return "    this." + colName + " = new Date(" + inputObj
+          + ".readLong());\n";
+    } else if (javaType.equals("java.sql.Time")) {
+      return "    this." + colName + " = new Time(" + inputObj
+          + ".readLong());\n";
+    } else if (javaType.equals("java.sql.Timestamp")) {
+      return "    this." + colName + " = new Timestamp(" + inputObj
+          + ".readLong());\n" + "    this." + colName + ".setNanos("
+          + inputObj + ".readInt());\n";
+    } else if (javaType.equals("java.math.BigDecimal")) {
+      return "    this." + colName + " = "
+          + BigDecimalSerializer.class.getCanonicalName()
+          + ".readFields(" + inputObj + ");\n";
+    } else if (javaType.equals(ClobRef.class.getName())) {
+      return "    this." + colName + " = "
+          + LobSerializer.class.getCanonicalName()
+          + ".readClobFields(" + inputObj + ");\n";
+    } else if (javaType.equals(BlobRef.class.getName())) {
+      return "    this." + colName + " = "
+          + LobSerializer.class.getCanonicalName()
+          + ".readBlobFields(" + inputObj + ");\n";
+    } else if (javaType.equals(BytesWritable.class.getName())) {
+      return "    this." + colName + " = new BytesWritable();\n"
+          + "    this." + colName + ".readFields(" + inputObj + ");\n";
+    } else {
+      LOG.error("No ResultSet method for Java type " + javaType);
+      return null;
+    }
+  }
+
+  /**
+   * Deserialize a possibly-null value from the DataInput stream.
+   * @param javaType name of the type to deserialize if it's not null.
+   * @param inputObj name of the DataInput to read from
+   * @param colName the column name to read.
+   * @return
+   */
+  private String rpcGetterForMaybeNull(String javaType, String inputObj,
+      String colName) {
+    return "    if (" + inputObj + ".readBoolean()) { \n"
+        + "        this." + colName + " = null;\n"
+        + "    } else {\n"
+        + rpcGetterForType(javaType, inputObj, colName)
+        + "    }\n";
+  }
+
+  /**
+   * @param javaType the type to write
+   * @param inputObj the name of the DataOutput to write to
+   * @param colName the column name to write
+   * @return the line of code involving a DataOutput object to write an entry
+   * with a given java type.
+   */
+  private String rpcSetterForType(String javaType, String outputObj,
+      String colName) {
+    if (javaType.equals("Integer")) {
+      return "    " + outputObj + ".writeInt(this." + colName + ");\n";
+    } else if (javaType.equals("Long")) {
+      return "    " + outputObj + ".writeLong(this." + colName + ");\n";
+    } else if (javaType.equals("Boolean")) {
+      return "    " + outputObj + ".writeBoolean(this." + colName + ");\n";
+    } else if (javaType.equals("Float")) {
+      return "    " + outputObj + ".writeFloat(this." + colName + ");\n";
+    } else if (javaType.equals("Double")) {
+      return "    " + outputObj + ".writeDouble(this." + colName + ");\n";
+    } else if (javaType.equals("String")) {
+      return "    Text.writeString(" + outputObj + ", " + colName + ");\n";
+    } else if (javaType.equals("java.sql.Date")) {
+      return "    " + outputObj + ".writeLong(this." + colName
+          + ".getTime());\n";
+    } else if (javaType.equals("java.sql.Time")) {
+      return "    " + outputObj + ".writeLong(this." + colName
+          + ".getTime());\n";
+    } else if (javaType.equals("java.sql.Timestamp")) {
+      return "    " + outputObj + ".writeLong(this." + colName
+          + ".getTime());\n" + "    " + outputObj + ".writeInt(this." + colName
+          + ".getNanos());\n";
+    } else if (javaType.equals(BytesWritable.class.getName())) {
+      return "    this." + colName + ".write(" + outputObj + ");\n";
+    } else if (javaType.equals("java.math.BigDecimal")) {
+      return "    " + BigDecimalSerializer.class.getCanonicalName()
+          + ".write(this." + colName + ", " + outputObj + ");\n";
+    } else if (javaType.equals(ClobRef.class.getName())) {
+      return "    " + LobSerializer.class.getCanonicalName()
+          + ".writeClob(this." + colName + ", " + outputObj + ");\n";
+    } else if (javaType.equals(BlobRef.class.getName())) {
+      return "    " + LobSerializer.class.getCanonicalName()
+          + ".writeBlob(this." + colName + ", " + outputObj + ");\n";
+    } else {
+      LOG.error("No ResultSet method for Java type " + javaType);
+      return null;
+    }
+  }
+
+  /**
+   * Serialize a possibly-null value to the DataOutput stream. First a boolean
+   * isNull is written, followed by the contents itself (if not null).
+   * @param javaType name of the type to deserialize if it's not null.
+   * @param inputObj name of the DataInput to read from
+   * @param colName the column name to read.
+   * @return
+   */
+  private String rpcSetterForMaybeNull(String javaType, String outputObj,
+      String colName) {
+    return "    if (null == this." + colName + ") { \n"
+        + "        " + outputObj + ".writeBoolean(true);\n"
+        + "    } else {\n"
+        + "        " + outputObj + ".writeBoolean(false);\n"
+        + rpcSetterForType(javaType, outputObj, colName)
+        + "    }\n";
+  }
+
+  /**
+   * Generate a member field, getter, setter and with method for each column.
+   * @param columnTypes - mapping from column names to sql types
+   * @param colNames - ordered list of column names for table
+   * @param className - name of the generated class
+   * @param sb - StringBuilder to append code to
+   */
+  private void generateFields(Map<String, Integer> columnTypes,
+      String [] colNames, String className, StringBuilder sb) {
+
+    for (String col : colNames) {
+      int sqlType = columnTypes.get(col);
+      String javaType = toJavaType(col, sqlType);
+      if (null == javaType) {
+        LOG.error("Cannot resolve SQL type " + sqlType);
+        continue;
+      }
+
+      sb.append("  private " + javaType + " " + col + ";\n");
+      sb.append("  public " + javaType + " get_" + col + "() {\n");
+      sb.append("    return " + col + ";\n");
+      sb.append("  }\n");
+      sb.append("  public void set_" + col + "(" + javaType + " " + col
+          + ") {\n");
+      sb.append("    this." + col + " = " + col + ";\n");
+      sb.append("  }\n");
+      sb.append("  public " + className + " with_" + col + "(" + javaType + " "
+          + col + ") {\n");
+      sb.append("    this." + col + " = " + col + ";\n");
+      sb.append("    return this;\n");
+      sb.append("  }\n");
+    }
+  }
+
+  /**
+   * Generate an equals method that compares the fields for each column.
+   * @param columnTypes - mapping from column names to sql types
+   * @param colNames - ordered list of column names for table
+   * @param className - name of the generated class
+   * @param sb - StringBuilder to append code to
+   */
+  private void generateEquals(Map<String, Integer> columnTypes,
+      String [] colNames, String className, StringBuilder sb) {
+
+    sb.append("  public boolean equals(Object o) {\n");
+    sb.append("    if (this == o) {\n");
+    sb.append("      return true;\n");
+    sb.append("    }\n");
+    sb.append("    if (!(o instanceof " + className + ")) {\n");
+    sb.append("      return false;\n");
+    sb.append("    }\n");
+    sb.append("    " + className + " that = (" + className + ") o;\n");
+    sb.append("    boolean equal = true;\n");
+    for (String col : colNames) {
+      int sqlType = columnTypes.get(col);
+      String javaType = toJavaType(col, sqlType);
+      if (null == javaType) {
+        LOG.error("Cannot resolve SQL type " + sqlType);
+        continue;
+      }
+      sb.append("    equal = equal && (this." + col + " == null ? that." + col
+          + " == null : this." + col + ".equals(that." + col + "));\n");
+    }
+    sb.append("    return equal;\n");
+    sb.append("  }\n");
+  }
+
+  /**
+   * Generate the readFields() method used by the database.
+   * @param columnTypes - mapping from column names to sql types
+   * @param colNames - ordered list of column names for table.
+   * @param sb - StringBuilder to append code to
+   */
+  private void generateDbRead(Map<String, Integer> columnTypes,
+      String [] colNames, StringBuilder sb) {
+
+    sb.append("  public void readFields(ResultSet __dbResults) ");
+    sb.append("throws SQLException {\n");
+
+    // Save ResultSet object cursor for use in LargeObjectLoader
+    // if necessary.
+    sb.append("    this.__cur_result_set = __dbResults;\n");
+
+    int fieldNum = 0;
+
+    for (String col : colNames) {
+      fieldNum++;
+
+      int sqlType = columnTypes.get(col);
+      String javaType = toJavaType(col, sqlType);
+      if (null == javaType) {
+        LOG.error("No Java type for SQL type " + sqlType
+                  + " for column " + col);
+        continue;
+      }
+
+      String getterMethod = dbGetterForType(javaType);
+      if (null == getterMethod) {
+        LOG.error("No db getter method for Java type " + javaType);
+        continue;
+      }
+
+      sb.append("    this." + col + " = JdbcWritableBridge." +  getterMethod
+          + "(" + fieldNum + ", __dbResults);\n");
+    }
+
+    sb.append("  }\n");
+  }
+
+  /**
+   * Generate the loadLargeObjects() method called by the mapper to load
+   * delayed objects (that require the Context from the mapper).
+   */
+  private void generateLoadLargeObjects(Map<String, Integer> columnTypes,
+      String [] colNames, StringBuilder sb) {
+
+    // This method relies on the __cur_result_set field being set by
+    // readFields() method generated by generateDbRead().
+
+    sb.append("  public void loadLargeObjects(LargeObjectLoader __loader)\n");
+    sb.append("      throws SQLException, IOException, ");
+    sb.append("InterruptedException {\n");
+
+    int fieldNum = 0;
+
+    for (String col : colNames) {
+      fieldNum++;
+
+      int sqlType = columnTypes.get(col);
+      String javaType = toJavaType(col, sqlType);
+      if (null == javaType) {
+        LOG.error("No Java type for SQL type " + sqlType
+                  + " for column " + col);
+        continue;
+      }
+
+      String getterMethod = dbGetterForType(javaType);
+      if ("readClobRef".equals(getterMethod)
+          || "readBlobRef".equals(getterMethod)) {
+        // This field is a blob/clob field with delayed loading.  Call the
+        // appropriate LargeObjectLoader method (which has the same name as a
+        // JdbcWritableBridge method).
+        sb.append("    this." + col + " = __loader." + getterMethod
+            + "(" + fieldNum + ", this.__cur_result_set);\n");
+      }
+    }
+    sb.append("  }\n");
+  }
+
+
+  /**
+   * Generate the write() method used by the database.
+   * @param columnTypes - mapping from column names to sql types
+   * @param colNames - ordered list of column names for table.
+   * @param sb - StringBuilder to append code to
+   */
+  private void generateDbWrite(Map<String, Integer> columnTypes,
+      String [] colNames, StringBuilder sb) {
+
+    sb.append("  public void write(PreparedStatement __dbStmt) "
+        + "throws SQLException {\n");
+    sb.append("    write(__dbStmt, 0);\n");
+    sb.append("  }\n\n");
+
+    sb.append("  public int write(PreparedStatement __dbStmt, int __off) "
+        + "throws SQLException {\n");
+
+    int fieldNum = 0;
+
+    for (String col : colNames) {
+      fieldNum++;
+
+      int sqlType = columnTypes.get(col);
+      String javaType = toJavaType(col, sqlType);
+      if (null == javaType) {
+        LOG.error("No Java type for SQL type " + sqlType
+                  + " for column " + col);
+        continue;
+      }
+
+      String setterMethod = dbSetterForType(javaType);
+      if (null == setterMethod) {
+        LOG.error("No db setter method for Java type " + javaType);
+        continue;
+      }
+
+      sb.append("    JdbcWritableBridge." + setterMethod + "(" + col + ", "
+          + fieldNum + " + __off, " + sqlType + ", __dbStmt);\n");
+    }
+
+    sb.append("    return " + fieldNum + ";\n");
+    sb.append("  }\n");
+  }
+
+
+  /**
+   * Generate the readFields() method used by the Hadoop RPC system.
+   * @param columnTypes - mapping from column names to sql types
+   * @param colNames - ordered list of column names for table.
+   * @param sb - StringBuilder to append code to
+   */
+  private void generateHadoopRead(Map<String, Integer> columnTypes,
+      String [] colNames, StringBuilder sb) {
+
+    sb.append("  public void readFields(DataInput __dataIn) "
+        + "throws IOException {\n");
+
+    for (String col : colNames) {
+      int sqlType = columnTypes.get(col);
+      String javaType = toJavaType(col, sqlType);
+      if (null == javaType) {
+        LOG.error("No Java type for SQL type " + sqlType
+                  + " for column " + col);
+        continue;
+      }
+
+      String getterMethod = rpcGetterForMaybeNull(javaType, "__dataIn", col);
+      if (null == getterMethod) {
+        LOG.error("No RPC getter method for Java type " + javaType);
+        continue;
+      }
+
+      sb.append(getterMethod);
+    }
+
+    sb.append("  }\n");
+  }
+
+  /**
+   * Generate the clone() method.
+   * @param columnTypes - mapping from column names to sql types
+   * @param colNames - ordered list of column names for table.
+   * @param sb - StringBuilder to append code to
+   */
+  private void generateCloneMethod(Map<String, Integer> columnTypes,
+      String [] colNames, StringBuilder sb) {
+
+    TableClassName tableNameInfo = new TableClassName(options);
+    String className = tableNameInfo.getShortClassForTable(tableName);
+
+    sb.append("  public Object clone() throws CloneNotSupportedException {\n");
+    sb.append("    " + className + " o = (" + className + ") super.clone();\n");
+
+    // For each field that is mutable, we need to perform the deep copy.
+    for (String colName : colNames) {
+      int sqlType = columnTypes.get(colName);
+      String javaType = toJavaType(colName, sqlType);
+      if (null == javaType) {
+        continue;
+      } else if (javaType.equals("java.sql.Date")
+          || javaType.equals("java.sql.Time")
+          || javaType.equals("java.sql.Timestamp")
+          || javaType.equals(ClobRef.class.getName())
+          || javaType.equals(BlobRef.class.getName())) {
+        sb.append("    o." + colName + " = (o." + colName + " != null) ? ("
+                + javaType + ") o." + colName + ".clone() : null;\n");
+      } else if (javaType.equals(BytesWritable.class.getName())) {
+        sb.append("    o." + colName + " = new BytesWritable("
+            + "Arrays.copyOf(" + colName + ".getBytes(), "
+            + colName + ".getLength()));\n");
+      }
+    }
+
+    sb.append("    return o;\n");
+    sb.append("  }\n\n");
+  }
+
+  /**
+   * Generate the setField() method.
+   * @param columnTypes - mapping from column names to sql types
+   * @param colNames - ordered list of column names for table.
+   * @param sb - StringBuilder to append code to
+   */
+  private void generateSetField(Map<String, Integer> columnTypes,
+      String [] colNames, StringBuilder sb) {
+    sb.append("  public void setField(String __fieldName, Object __fieldVal) "
+        + "{\n");
+    boolean first = true;
+    for (String colName : colNames) {
+      int sqlType = columnTypes.get(colName);
+      String javaType = toJavaType(colName, sqlType);
+      if (null == javaType) {
+        continue;
+      } else {
+        if (!first) {
+          sb.append("    else");
+        }
+
+        sb.append("    if (\"" + colName + "\".equals(__fieldName)) {\n");
+        sb.append("      this." + colName + " = (" + javaType
+            + ") __fieldVal;\n");
+        sb.append("    }\n");
+        first = false;
+      }
+    }
+    sb.append("    else {\n");
+    sb.append("      throw new RuntimeException(");
+    sb.append("\"No such field: \" + __fieldName);\n");
+    sb.append("    }\n");
+    sb.append("  }\n");
+  }
+
+  /**
+   * Generate the getFieldMap() method.
+   * @param columnTypes - mapping from column names to sql types
+   * @param colNames - ordered list of column names for table.
+   * @param sb - StringBuilder to append code to
+   */
+  private void generateGetFieldMap(Map<String, Integer> columnTypes,
+      String [] colNames, StringBuilder sb) {
+    sb.append("  public Map<String, Object> getFieldMap() {\n");
+    sb.append("    Map<String, Object> __sqoop$field_map = "
+        + "new TreeMap<String, Object>();\n");
+    for (String colName : colNames) {
+      sb.append("    __sqoop$field_map.put(\"" + colName + "\", this."
+          + colName + ");\n");
+    }
+    sb.append("    return __sqoop$field_map;\n");
+    sb.append("  }\n\n");
+  }
+
+  /**
+   * Generate the toString() method.
+   * @param columnTypes - mapping from column names to sql types
+   * @param colNames - ordered list of column names for table.
+   * @param sb - StringBuilder to append code to
+   */
+  private void generateToString(Map<String, Integer> columnTypes,
+      String [] colNames, StringBuilder sb) {
+
+    // Save the delimiters to the class.
+    sb.append("  private final DelimiterSet __outputDelimiters = ");
+    sb.append(options.getOutputDelimiters().formatConstructor() + ";\n");
+
+    // The default toString() method itself follows. This just calls
+    // the delimiter-specific toString() with the default delimiters.
+    // Also appends an end-of-record delimiter to the line.
+    sb.append("  public String toString() {\n");
+    sb.append("    return toString(__outputDelimiters, true);\n");
+    sb.append("  }\n");
+
+    // This toString() variant, though, accepts delimiters as arguments.
+    sb.append("  public String toString(DelimiterSet delimiters) {\n");
+    sb.append("    return toString(delimiters, true);\n");
+    sb.append("  }\n");
+
+    // This variant allows the user to specify whether or not an end-of-record
+    // delimiter should be appended.
+    sb.append("  public String toString(boolean useRecordDelim) {\n");
+    sb.append("    return toString(__outputDelimiters, useRecordDelim);\n");
+    sb.append("  }\n");
+
+
+    // This toString() variant allows the user to specify delimiters, as well
+    // as whether or not the end-of-record delimiter should be added to the
+    // string.  Use 'false' to do reasonable things with TextOutputFormat,
+    // which appends its own newline.
+    sb.append("  public String toString(DelimiterSet delimiters, ");
+    sb.append("boolean useRecordDelim) {\n");
+    sb.append("    StringBuilder __sb = new StringBuilder();\n");
+    sb.append("    char fieldDelim = delimiters.getFieldsTerminatedBy();\n");
+
+    boolean first = true;
+    for (String col : colNames) {
+      int sqlType = columnTypes.get(col);
+      String javaType = toJavaType(col, sqlType);
+      if (null == javaType) {
+        LOG.error("No Java type for SQL type " + sqlType
+                  + " for column " + col);
+        continue;
+      }
+
+      if (!first) {
+        // print inter-field tokens.
+        sb.append("    __sb.append(fieldDelim);\n");
+      }
+
+      first = false;
+
+      String stringExpr = stringifierForType(javaType, col);
+      if (null == stringExpr) {
+        LOG.error("No toString method for Java type " + javaType);
+        continue;
+      }
+
+      if (javaType.equals("String") && options.doHiveDropDelims()) {
+        sb.append("    // special case for strings hive, dropping"
+          + "delimiters \\n,\\r,\\01 from strings\n");
+        sb.append("    __sb.append(FieldFormatter.hiveStringDropDelims("
+          + stringExpr + ", delimiters));\n");
+      } else if (javaType.equals("String")
+        && options.getHiveDelimsReplacement() != null) {
+        sb.append("    // special case for strings hive, replacing "
+          + "delimiters \\n,\\r,\\01 with '"
+          + options.getHiveDelimsReplacement() + "' from strings\n");
+        sb.append("    __sb.append(FieldFormatter.hiveStringReplaceDelims("
+          + stringExpr + ", \"" + options.getHiveDelimsReplacement() + "\", "
+          + "delimiters));\n");
+      } else {
+        sb.append("    __sb.append(FieldFormatter.escapeAndEnclose("
+            + stringExpr + ", delimiters));\n");
+      }
+    }
+
+    sb.append("    if (useRecordDelim) {\n");
+    sb.append("      __sb.append(delimiters.getLinesTerminatedBy());\n");
+    sb.append("    }\n");
+    sb.append("    return __sb.toString();\n");
+    sb.append("  }\n");
+  }
+
+  /**
+   * Helper method for generateParser(). Writes out the parse() method for one
+   * particular type we support as an input string-ish type.
+   */
+  private void generateParseMethod(String typ, StringBuilder sb) {
+    sb.append("  public void parse(" + typ + " __record) "
+        + "throws RecordParser.ParseError {\n");
+    sb.append("    if (null == this.__parser) {\n");
+    sb.append("      this.__parser = new RecordParser(__inputDelimiters);\n");
+    sb.append("    }\n");
+    sb.append("    List<String> __fields = "
+        + "this.__parser.parseRecord(__record);\n");
+    sb.append("    __loadFromFields(__fields);\n");
+    sb.append("  }\n\n");
+  }
+
+  /**
+   * Helper method for parseColumn(). Interpret the string null representation
+   * for a particular column.
+   */
+  private void parseNullVal(String javaType, String colName, StringBuilder sb) {
+    if (javaType.equals("String")) {
+      sb.append("    if (__cur_str.equals(\""
+         + this.options.getInNullStringValue() + "\")) { this.");
+      sb.append(colName);
+      sb.append(" = null; } else {\n");
+    } else {
+      sb.append("    if (__cur_str.equals(\""
+         + this.options.getInNullNonStringValue());
+      sb.append("\") || __cur_str.length() == 0) { this.");
+      sb.append(colName);
+      sb.append(" = null; } else {\n");
+    }
+  }
+
+  /**
+   * Helper method for generateParser(). Generates the code that loads one
+   * field of a specified name and type from the next element of the field
+   * strings list.
+   */
+  private void parseColumn(String colName, int colType, StringBuilder sb) {
+    // assume that we have __it and __cur_str vars, based on
+    // __loadFromFields() code.
+    sb.append("    __cur_str = __it.next();\n");
+    String javaType = toJavaType(colName, colType);
+
+    parseNullVal(javaType, colName, sb);
+    if (javaType.equals("String")) {
+      // TODO(aaron): Distinguish between 'null' and null. Currently they both
+      // set the actual object to null.
+      sb.append("      this." + colName + " = __cur_str;\n");
+    } else if (javaType.equals("Integer")) {
+      sb.append("      this." + colName + " = Integer.valueOf(__cur_str);\n");
+    } else if (javaType.equals("Long")) {
+      sb.append("      this." + colName + " = Long.valueOf(__cur_str);\n");
+    } else if (javaType.equals("Float")) {
+      sb.append("      this." + colName + " = Float.valueOf(__cur_str);\n");
+    } else if (javaType.equals("Double")) {
+      sb.append("      this." + colName + " = Double.valueOf(__cur_str);\n");
+    } else if (javaType.equals("Boolean")) {
+      sb.append("      this." + colName
+          + " = BooleanParser.valueOf(__cur_str);\n");
+    } else if (javaType.equals("java.sql.Date")) {
+      sb.append("      this." + colName
+          + " = java.sql.Date.valueOf(__cur_str);\n");
+    } else if (javaType.equals("java.sql.Time")) {
+      sb.append("      this." + colName
+          + " = java.sql.Time.valueOf(__cur_str);\n");
+    } else if (javaType.equals("java.sql.Timestamp")) {
+      sb.append("      this." + colName
+          + " = java.sql.Timestamp.valueOf(__cur_str);\n");
+    } else if (javaType.equals("java.math.BigDecimal")) {
+      sb.append("      this." + colName
+          + " = new java.math.BigDecimal(__cur_str);\n");
+    } else if (javaType.equals(ClobRef.class.getName())) {
+      sb.append("      this." + colName + " = ClobRef.parse(__cur_str);\n");
+    } else if (javaType.equals(BlobRef.class.getName())) {
+      sb.append("      this." + colName + " = BlobRef.parse(__cur_str);\n");
+    } else {
+      LOG.error("No parser available for Java type " + javaType);
+    }
+
+    sb.append("    }\n\n"); // the closing '{' based on code in parseNullVal();
+  }
+
+  /**
+   * Generate the parse() method.
+   * @param columnTypes - mapping from column names to sql types
+   * @param colNames - ordered list of column names for table.
+   * @param sb - StringBuilder to append code to
+   */
+  private void generateParser(Map<String, Integer> columnTypes,
+      String [] colNames, StringBuilder sb) {
+
+    // Embed into the class the delimiter characters to use when parsing input
+    // records.  Note that these can differ from the delims to use as output
+    // via toString(), if the user wants to use this class to convert one
+    // format to another.
+    sb.append("  private final DelimiterSet __inputDelimiters = ");
+    sb.append(options.getInputDelimiters().formatConstructor() + ";\n");
+
+    // The parser object which will do the heavy lifting for field splitting.
+    sb.append("  private RecordParser __parser;\n");
+
+    // Generate wrapper methods which will invoke the parser.
+    generateParseMethod("Text", sb);
+    generateParseMethod("CharSequence", sb);
+    generateParseMethod("byte []", sb);
+    generateParseMethod("char []", sb);
+    generateParseMethod("ByteBuffer", sb);
+    generateParseMethod("CharBuffer", sb);
+
+    // The wrapper methods call __loadFromFields() to actually interpret the
+    // raw field data as string, int, boolean, etc. The generation of this
+    // method is type-dependent for the fields.
+    sb.append("  private void __loadFromFields(List<String> fields) {\n");
+    sb.append("    Iterator<String> __it = fields.listIterator();\n");
+    sb.append("    String __cur_str;\n");
+    for (String colName : colNames) {
+      int colType = columnTypes.get(colName);
+      parseColumn(colName, colType, sb);
+    }
+    sb.append("  }\n\n");
+  }
+
+  /**
+   * Generate the write() method used by the Hadoop RPC system.
+   * @param columnTypes - mapping from column names to sql types
+   * @param colNames - ordered list of column names for table.
+   * @param sb - StringBuilder to append code to
+   */
+  private void generateHadoopWrite(Map<String, Integer> columnTypes,
+      String [] colNames, StringBuilder sb) {
+
+    sb.append("  public void write(DataOutput __dataOut) "
+        + "throws IOException {\n");
+
+    for (String col : colNames) {
+      int sqlType = columnTypes.get(col);
+      String javaType = toJavaType(col, sqlType);
+      if (null == javaType) {
+        LOG.error("No Java type for SQL type " + sqlType
+                  + " for column " + col);
+        continue;
+      }
+
+      String setterMethod = rpcSetterForMaybeNull(javaType, "__dataOut", col);
+      if (null == setterMethod) {
+        LOG.error("No RPC setter method for Java type " + javaType);
+        continue;
+      }
+
+      sb.append(setterMethod);
+    }
+
+    sb.append("  }\n");
+  }
+
+  /**
+   * Create a list of identifiers to use based on the true column names
+   * of the table.
+   * @param colNames the actual column names of the table.
+   * @return a list of column names in the same order which are
+   * cleaned up to be used as identifiers in the generated Java class.
+   */
+  private String [] cleanColNames(String [] colNames) {
+    String [] cleanedColNames = new String[colNames.length];
+    for (int i = 0; i < colNames.length; i++) {
+      String col = colNames[i];
+      String identifier = toJavaIdentifier(col);
+      cleanedColNames[i] = identifier;
+    }
+
+    return cleanedColNames;
+  }
+
+
+  /**
+   * Generate the ORM code for the class.
+   */
+  public void generate() throws IOException {
+    Map<String, Integer> columnTypes = getColumnTypes();
+
+    String[] colNames = getColumnNames(columnTypes);
+
+    // Translate all the column names into names that are safe to
+    // use as identifiers.
+    String [] cleanedColNames = cleanColNames(colNames);
+    Set<String> uniqColNames = new HashSet<String>();
+    for (int i = 0; i < colNames.length; i++) {
+      String identifier = cleanedColNames[i];
+
+      // Name can't be blank
+      if(identifier.isEmpty()) {
+        throw new IllegalArgumentException("We found column without column "
+                + "name. Please verify that you've entered all column names "
+                + "in your query if using free form query import (consider "
+                + "adding clause AS if you're using column transformation)");
+      }
+
+      // Guarantee uniq col identifier
+      if (uniqColNames.contains(identifier)) {
+          throw new IllegalArgumentException("Duplicate Column identifier "
+              + "specified: '" + identifier + "'");
+      }
+      uniqColNames.add(identifier);
+
+      // Make sure the col->type mapping holds for the
+      // new identifier name, too.
+      String col = colNames[i];
+      Integer type = columnTypes.get(col);
+      if (type == null) {
+        // column doesn't have a type, means that is illegal column name!
+        throw new IllegalArgumentException("Column name '" + col
+            + "' not in table");
+      }
+      columnTypes.put(identifier, type);
+    }
+
+    // Check that all explicitly mapped columns are present in result set
+    Properties mapping = options.getMapColumnJava();
+    if(mapping != null && !mapping.isEmpty()) {
+      for(Object column : mapping.keySet()) {
+        if(!uniqColNames.contains((String)column)) {
+        throw new IllegalArgumentException("No column by the name " + column
+                + "found while importing data");
+        }
+      }
+    }
+
+    // The db write() method may use column names in a different
+    // order. If this is set in the options, pull it out here and
+    // make sure we format the column names to identifiers in the same way
+    // as we do for the ordinary column list.
+    String [] dbWriteColNames = options.getDbOutputColumns();
+    String [] cleanedDbWriteColNames = null;
+    if (null == dbWriteColNames) {
+      cleanedDbWriteColNames = cleanedColNames;
+    } else {
+      cleanedDbWriteColNames = cleanColNames(dbWriteColNames);
+    }
+
+    if (LOG.isDebugEnabled()) {
+      LOG.debug("selected columns:");
+      for (String col : cleanedColNames) {
+        LOG.debug("  " + col);
+      }
+
+      if (cleanedDbWriteColNames != cleanedColNames) {
+        // dbWrite() has a different set of columns than the rest of the
+        // generators.
+        LOG.debug("db write column order:");
+        for (String dbCol : cleanedDbWriteColNames) {
+          LOG.debug("  " + dbCol);
+        }
+      }
+    }
+
+    // Generate the Java code.
+    StringBuilder sb = generateClassForColumns(columnTypes,
+        cleanedColNames, cleanedDbWriteColNames);
+
+    // Write this out to a file in the jar output directory.
+    // We'll move it to the user-visible CodeOutputDir after compiling.
+    String codeOutDir = options.getJarOutputDir();
+
+    // Get the class name to generate, which includes package components.
+    String className = new TableClassName(options).getClassForTable(tableName);
+    // Convert the '.' characters to '/' characters.
+    String sourceFilename = className.replace('.', File.separatorChar)
+        + ".java";
+    String filename = codeOutDir + sourceFilename;
+
+    if (LOG.isDebugEnabled()) {
+      LOG.debug("Writing source file: " + filename);
+      LOG.debug("Table name: " + tableName);
+      StringBuilder sbColTypes = new StringBuilder();
+      for (String col : colNames) {
+        Integer colType = columnTypes.get(col);
+        sbColTypes.append(col + ":" + colType + ", ");
+      }
+      String colTypeStr = sbColTypes.toString();
+      LOG.debug("Columns: " + colTypeStr);
+      LOG.debug("sourceFilename is " + sourceFilename);
+    }
+
+    compileManager.addSourceFile(sourceFilename);
+
+    // Create any missing parent directories.
+    File file = new File(filename);
+    File dir = file.getParentFile();
+    if (null != dir && !dir.exists()) {
+      boolean mkdirSuccess = dir.mkdirs();
+      if (!mkdirSuccess) {
+        LOG.debug("Could not create directory tree for " + dir);
+      }
+    }
+
+    OutputStream ostream = null;
+    Writer writer = null;
+    try {
+      ostream = new FileOutputStream(filename);
+      writer = new OutputStreamWriter(ostream);
+      writer.append(sb.toString());
+    } finally {
+      if (null != writer) {
+        try {
+          writer.close();
+        } catch (IOException ioe) {
+          // ignored because we're closing.
+        }
+      }
+
+      if (null != ostream) {
+        try {
+          ostream.close();
+        } catch (IOException ioe) {
+          // ignored because we're closing.
+        }
+      }
+    }
+  }
+
+  protected String[] getColumnNames(Map<String, Integer> columnTypes) {
+    String [] colNames = options.getColumns();
+    if (null == colNames) {
+      if (null != tableName) {
+        // Table-based import. Read column names from table.
+        colNames = connManager.getColumnNames(tableName);
+      } else {
+        // Infer/assign column names for arbitrary query.
+        colNames = connManager.getColumnNamesForQuery(
+            this.options.getSqlQuery());
+      }
+    } else {
+      // These column names were provided by the user. They may not be in
+      // the same case as the keys in the columnTypes map. So make sure
+      // we add the appropriate aliases in that map.
+      for (String userColName : colNames) {
+        for (Map.Entry<String, Integer> typeEntry : columnTypes.entrySet()) {
+          String typeColName = typeEntry.getKey();
+          if (typeColName.equalsIgnoreCase(userColName)
+              && !typeColName.equals(userColName)) {
+            // We found the correct-case equivalent.
+            columnTypes.put(userColName, typeEntry.getValue());
+            // No need to continue iteration; only one could match.
+            // Also, the use of put() just invalidated the iterator.
+            break;
+          }
+        }
+      }
+    }
+    return colNames;
+  }
+
+  protected Map<String, Integer> getColumnTypes() throws IOException {
+    return connManager.getColumnTypes(tableName, options.getSqlQuery());
+  }
+
+  /**
+   * Generate the ORM code for a table object containing the named columns.
+   * @param columnTypes - mapping from column names to sql types
+   * @param colNames - ordered list of column names for table.
+   * @param dbWriteColNames - ordered list of column names for the db
+   * write() method of the class.
+   * @return - A StringBuilder that contains the text of the class code.
+   */
+  private StringBuilder generateClassForColumns(
+      Map<String, Integer> columnTypes,
+      String [] colNames, String [] dbWriteColNames) {
+    if (colNames.length ==0) {
+      throw new IllegalArgumentException("Attempted to generate class with "
+          + "no columns!");
+    }
+    StringBuilder sb = new StringBuilder();
+    sb.append("// ORM class for " + tableName + "\n");
+    sb.append("// WARNING: This class is AUTO-GENERATED. "
+        + "Modify at your own risk.\n");
+
+    TableClassName tableNameInfo = new TableClassName(options);
+
+    String packageName = tableNameInfo.getPackageForTable();
+    if (null != packageName) {
+      sb.append("package ");
+      sb.append(packageName);
+      sb.append(";\n");
+    }
+
+    sb.append("import org.apache.hadoop.io.BytesWritable;\n");
+    sb.append("import org.apache.hadoop.io.Text;\n");
+    sb.append("import org.apache.hadoop.io.Writable;\n");
+    sb.append("import org.apache.hadoop.mapred.lib.db.DBWritable;\n");
+    sb.append("import " + JdbcWritableBridge.class.getCanonicalName() + ";\n");
+    sb.append("import " + DelimiterSet.class.getCanonicalName() + ";\n");
+    sb.append("import " + FieldFormatter.class.getCanonicalName() + ";\n");
+    sb.append("import " + RecordParser.class.getCanonicalName() + ";\n");
+    sb.append("import " + BooleanParser.class.getCanonicalName() + ";\n");
+    sb.append("import " + BlobRef.class.getCanonicalName() + ";\n");
+    sb.append("import " + ClobRef.class.getCanonicalName() + ";\n");
+    sb.append("import " + LargeObjectLoader.class.getCanonicalName() + ";\n");
+    sb.append("import " + SqoopRecord.class.getCanonicalName() + ";\n");
+    sb.append("import java.sql.PreparedStatement;\n");
+    sb.append("import java.sql.ResultSet;\n");
+    sb.append("import java.sql.SQLException;\n");
+    sb.append("import java.io.DataInput;\n");
+    sb.append("import java.io.DataOutput;\n");
+    sb.append("import java.io.IOException;\n");
+    sb.append("import java.nio.ByteBuffer;\n");
+    sb.append("import java.nio.CharBuffer;\n");
+    sb.append("import java.sql.Date;\n");
+    sb.append("import java.sql.Time;\n");
+    sb.append("import java.sql.Timestamp;\n");
+    sb.append("import java.util.Arrays;\n");
+    sb.append("import java.util.Iterator;\n");
+    sb.append("import java.util.List;\n");
+    sb.append("import java.util.Map;\n");
+    sb.append("import java.util.TreeMap;\n");
+    sb.append("\n");
+
+    String className = tableNameInfo.getShortClassForTable(tableName);
+    sb.append("public class " + className + " extends SqoopRecord "
+        + " implements DBWritable, Writable {\n");
+    sb.append("  private final int PROTOCOL_VERSION = "
+        + CLASS_WRITER_VERSION + ";\n");
+    sb.append(
+        "  public int getClassFormatVersion() { return PROTOCOL_VERSION; }\n");
+    sb.append("  protected ResultSet __cur_result_set;\n");
+    generateFields(columnTypes, colNames, className, sb);
+    generateEquals(columnTypes, colNames, className, sb);
+    generateDbRead(columnTypes, colNames, sb);
+    generateLoadLargeObjects(columnTypes, colNames, sb);
+    generateDbWrite(columnTypes, dbWriteColNames, sb);
+    generateHadoopRead(columnTypes, colNames, sb);
+    generateHadoopWrite(columnTypes, colNames, sb);
+    generateToString(columnTypes, colNames, sb);
+    generateParser(columnTypes, colNames, sb);
+    generateCloneMethod(columnTypes, colNames, sb);
+    generateGetFieldMap(columnTypes, colNames, sb);
+    generateSetField(columnTypes, colNames, sb);
+
+    // TODO(aaron): Generate hashCode(), compareTo(), equals() so it can be a
+    // WritableComparable
+
+    sb.append("}\n");
+
+    return sb;
+  }
+}

Propchange: incubator/sqoop/trunk/src/java/org/apache/sqoop/orm/ClassWriter.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/sqoop/trunk/src/java/org/apache/sqoop/orm/CompilationManager.java
URL: http://svn.apache.org/viewvc/incubator/sqoop/trunk/src/java/org/apache/sqoop/orm/CompilationManager.java?rev=1195852&view=auto
==============================================================================
--- incubator/sqoop/trunk/src/java/org/apache/sqoop/orm/CompilationManager.java (added)
+++ incubator/sqoop/trunk/src/java/org/apache/sqoop/orm/CompilationManager.java Tue Nov  1 07:10:13 2011
@@ -0,0 +1,373 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.sqoop.orm;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.jar.JarOutputStream;
+import java.util.zip.ZipEntry;
+
+import javax.tools.JavaCompiler;
+import javax.tools.JavaFileObject;
+import javax.tools.StandardJavaFileManager;
+import javax.tools.ToolProvider;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.mapred.JobConf;
+
+import com.cloudera.sqoop.SqoopOptions;
+import com.cloudera.sqoop.util.FileListing;
+import com.cloudera.sqoop.util.Jars;
+
+/**
+ * Manages the compilation of a bunch of .java files into .class files
+ * and eventually a jar.
+ *
+ * Also embeds this program's jar into the lib/ directory inside the compiled
+ * jar to ensure that the job runs correctly.
+ */
+public class CompilationManager {
+
+  /** If we cannot infer a jar name from a table name, etc., use this. */
+  public static final String DEFAULT_CODEGEN_JAR_NAME =
+      "sqoop-codegen-created.jar";
+
+  public static final Log LOG = LogFactory.getLog(
+      CompilationManager.class.getName());
+
+  private SqoopOptions options;
+  private List<String> sources;
+
+  public CompilationManager(final SqoopOptions opts) {
+    options = opts;
+    sources = new ArrayList<String>();
+  }
+
+  public void addSourceFile(String sourceName) {
+    sources.add(sourceName);
+  }
+
+  /**
+   * locate the hadoop-*-core.jar in $HADOOP_HOME or --hadoop-home.
+   * If that doesn't work, check our classpath.
+   * @return the filename of the hadoop-*-core.jar file.
+   */
+  private String findHadoopCoreJar() {
+    String hadoopHome = options.getHadoopHome();
+
+    if (null == hadoopHome) {
+      LOG.info("$HADOOP_HOME is not set");
+      return Jars.getJarPathForClass(JobConf.class);
+    }
+
+    if (!hadoopHome.endsWith(File.separator)) {
+      hadoopHome = hadoopHome + File.separator;
+    }
+
+    File hadoopHomeFile = new File(hadoopHome);
+    LOG.info("HADOOP_HOME is " + hadoopHomeFile.getAbsolutePath());
+    File [] entries = hadoopHomeFile.listFiles();
+
+    if (null == entries) {
+      LOG.warn("HADOOP_HOME appears empty or missing");
+      return Jars.getJarPathForClass(JobConf.class);
+    }
+
+    for (File f : entries) {
+      if (f.getName().startsWith("hadoop-")
+          && f.getName().endsWith("-core.jar")) {
+        LOG.info("Found hadoop core jar at: " + f.getAbsolutePath());
+        return f.getAbsolutePath();
+      }
+    }
+
+    return Jars.getJarPathForClass(JobConf.class);
+  }
+
+  /**
+   * Compile the .java files into .class files via embedded javac call.
+   * On success, move .java files to the code output dir.
+   */
+  public void compile() throws IOException {
+    List<String> args = new ArrayList<String>();
+
+    // ensure that the jar output dir exists.
+    String jarOutDir = options.getJarOutputDir();
+    File jarOutDirObj = new File(jarOutDir);
+    if (!jarOutDirObj.exists()) {
+      boolean mkdirSuccess = jarOutDirObj.mkdirs();
+      if (!mkdirSuccess) {
+        LOG.debug("Warning: Could not make directories for " + jarOutDir);
+      }
+    } else if (LOG.isDebugEnabled()) {
+      LOG.debug("Found existing " + jarOutDir);
+    }
+
+    // Make sure jarOutDir ends with a '/'.
+    if (!jarOutDir.endsWith(File.separator)) {
+      jarOutDir = jarOutDir + File.separator;
+    }
+
+    // find hadoop-*-core.jar for classpath.
+    String coreJar = findHadoopCoreJar();
+    if (null == coreJar) {
+      // Couldn't find a core jar to insert into the CP for compilation.  If,
+      // however, we're running this from a unit test, then the path to the
+      // .class files might be set via the hadoop.alt.classpath property
+      // instead. Check there first.
+      String coreClassesPath = System.getProperty("hadoop.alt.classpath");
+      if (null == coreClassesPath) {
+        // no -- we're out of options. Fail.
+        throw new IOException("Could not find hadoop core jar!");
+      } else {
+        coreJar = coreClassesPath;
+      }
+    }
+
+    // find sqoop jar for compilation classpath
+    String sqoopJar = Jars.getSqoopJarPath();
+    if (null != sqoopJar) {
+      sqoopJar = File.pathSeparator + sqoopJar;
+    } else {
+      LOG.warn("Could not find sqoop jar; child compilation may fail");
+      sqoopJar = "";
+    }
+
+    String curClasspath = System.getProperty("java.class.path");
+
+    args.add("-sourcepath");
+    args.add(jarOutDir);
+
+    args.add("-d");
+    args.add(jarOutDir);
+
+    args.add("-classpath");
+    args.add(curClasspath + File.pathSeparator + coreJar + sqoopJar);
+
+    JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
+    if (null == compiler) {
+      LOG.error("It seems as though you are running sqoop with a JRE.");
+      LOG.error("Sqoop requires a JDK that can compile Java code.");
+      LOG.error("Please install a JDK and set $JAVA_HOME to use it.");
+      throw new IOException("Could not start Java compiler.");
+    }
+    StandardJavaFileManager fileManager =
+        compiler.getStandardFileManager(null, null, null);
+
+    ArrayList<String> srcFileNames = new ArrayList<String>();
+    for (String srcfile : sources) {
+      srcFileNames.add(jarOutDir + srcfile);
+      LOG.debug("Adding source file: " + jarOutDir + srcfile);
+    }
+
+    if (LOG.isDebugEnabled()) {
+      LOG.debug("Invoking javac with args:");
+      for (String arg : args) {
+        LOG.debug("  " + arg);
+      }
+    }
+
+    Iterable<? extends JavaFileObject> srcFileObjs =
+        fileManager.getJavaFileObjectsFromStrings(srcFileNames);
+    JavaCompiler.CompilationTask task = compiler.getTask(
+        null, // Write to stderr
+        fileManager,
+        null, // No special diagnostic handling
+        args,
+        null, // Compile all classes in the source compilation units
+        srcFileObjs);
+
+    boolean result = task.call();
+    if (!result) {
+      throw new IOException("Error returned by javac");
+    }
+
+    // Where we should move source files after compilation.
+    String srcOutDir = new File(options.getCodeOutputDir()).getAbsolutePath();
+    if (!srcOutDir.endsWith(File.separator)) {
+      srcOutDir = srcOutDir + File.separator;
+    }
+
+    // Move these files to the srcOutDir.
+    for (String srcFileName : sources) {
+      String orig = jarOutDir + srcFileName;
+      String dest = srcOutDir + srcFileName;
+      File fOrig = new File(orig);
+      File fDest = new File(dest);
+      File fDestParent = fDest.getParentFile();
+      if (null != fDestParent && !fDestParent.exists()) {
+        if (!fDestParent.mkdirs()) {
+          LOG.error("Could not make directory: " + fDestParent);
+        }
+      }
+      try {
+          FileUtils.moveFile(fOrig, fDest);
+      } catch (IOException e) {
+          LOG.error("Could not rename " + orig + " to " + dest, e);
+      }
+    }
+  }
+
+  /**
+   * @return the complete filename of the .jar file to generate. */
+  public String getJarFilename() {
+    String jarOutDir = options.getJarOutputDir();
+    String tableName = options.getTableName();
+    String specificClassName = options.getClassName();
+
+    if (specificClassName != null && specificClassName.length() > 0) {
+      return jarOutDir + specificClassName + ".jar";
+    } else if (null != tableName && tableName.length() > 0) {
+      return jarOutDir + tableName + ".jar";
+    } else if (this.sources.size() == 1) {
+      // if we only have one source file, find it's base name,
+      // turn "foo.java" into "foo", and then return jarDir + "foo" + ".jar"
+      String srcFileName = this.sources.get(0);
+      String basename = new File(srcFileName).getName();
+      String [] parts = basename.split("\\.");
+      String preExtPart = parts[0];
+      return jarOutDir + preExtPart + ".jar";
+    } else {
+      return jarOutDir + DEFAULT_CODEGEN_JAR_NAME;
+    }
+  }
+
+  /**
+   * Searches through a directory and its children for .class
+   * files to add to a jar.
+   *
+   * @param dir - The root directory to scan with this algorithm.
+   * @param jstream - The JarOutputStream to write .class files to.
+   */
+  private void addClassFilesFromDir(File dir, JarOutputStream jstream)
+      throws IOException {
+    LOG.debug("Scanning for .class files in directory: " + dir);
+    List<File> dirEntries = FileListing.getFileListing(dir);
+    String baseDirName = dir.getAbsolutePath();
+    if (!baseDirName.endsWith(File.separator)) {
+      baseDirName = baseDirName + File.separator;
+    }
+
+    // For each input class file, create a zipfile entry for it,
+    // read the file into a buffer, and write it to the jar file.
+    for (File entry : dirEntries) {
+      if (!entry.isDirectory()) {
+        // Chomp off the portion of the full path that is shared
+        // with the base directory where class files were put;
+        // we only record the subdir parts in the zip entry.
+        String fullPath = entry.getAbsolutePath();
+        String chompedPath = fullPath.substring(baseDirName.length());
+
+        boolean include = chompedPath.endsWith(".class")
+            && sources.contains(
+            chompedPath.substring(0, chompedPath.length() - ".class".length())
+            + ".java");
+
+        if (include) {
+          // include this file.
+          LOG.debug("Got classfile: " + entry.getPath() + " -> " + chompedPath);
+          ZipEntry ze = new ZipEntry(chompedPath);
+          jstream.putNextEntry(ze);
+          copyFileToStream(entry, jstream);
+          jstream.closeEntry();
+        }
+      }
+    }
+  }
+
+  /**
+   * Create an output jar file to use when executing MapReduce jobs.
+   */
+  public void jar() throws IOException {
+    String jarOutDir = options.getJarOutputDir();
+
+    String jarFilename = getJarFilename();
+
+    LOG.info("Writing jar file: " + jarFilename);
+
+    File jarFileObj = new File(jarFilename);
+    if (jarFileObj.exists()) {
+      LOG.debug("Found existing jar (" + jarFilename + "); removing.");
+      if (!jarFileObj.delete()) {
+        LOG.warn("Could not remove existing jar file: " + jarFilename);
+      }
+    }
+
+    FileOutputStream fstream = null;
+    JarOutputStream jstream = null;
+    try {
+      fstream = new FileOutputStream(jarFilename);
+      jstream = new JarOutputStream(fstream);
+
+      addClassFilesFromDir(new File(jarOutDir), jstream);
+      jstream.finish();
+    } finally {
+      if (null != jstream) {
+        try {
+          jstream.close();
+        } catch (IOException ioe) {
+          LOG.warn("IOException closing jar stream: " + ioe.toString());
+        }
+      }
+
+      if (null != fstream) {
+        try {
+          fstream.close();
+        } catch (IOException ioe) {
+          LOG.warn("IOException closing file stream: " + ioe.toString());
+        }
+      }
+    }
+
+    LOG.debug("Finished writing jar file " + jarFilename);
+  }
+
+  private static final int BUFFER_SZ = 4096;
+
+  /**
+   * Utility method to copy a .class file into the jar stream.
+   * @param f
+   * @param ostream
+   * @throws IOException
+   */
+  private void copyFileToStream(File f, OutputStream ostream)
+      throws IOException {
+    FileInputStream fis = new FileInputStream(f);
+    byte [] buffer = new byte[BUFFER_SZ];
+    try {
+      while (true) {
+        int bytesReceived = fis.read(buffer);
+        if (bytesReceived < 1) {
+          break;
+        }
+
+        ostream.write(buffer, 0, bytesReceived);
+      }
+    } finally {
+      fis.close();
+    }
+  }
+}

Propchange: incubator/sqoop/trunk/src/java/org/apache/sqoop/orm/CompilationManager.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/sqoop/trunk/src/java/org/apache/sqoop/orm/TableClassName.java
URL: http://svn.apache.org/viewvc/incubator/sqoop/trunk/src/java/org/apache/sqoop/orm/TableClassName.java?rev=1195852&view=auto
==============================================================================
--- incubator/sqoop/trunk/src/java/org/apache/sqoop/orm/TableClassName.java (added)
+++ incubator/sqoop/trunk/src/java/org/apache/sqoop/orm/TableClassName.java Tue Nov  1 07:10:13 2011
@@ -0,0 +1,118 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.sqoop.orm;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.cloudera.sqoop.SqoopOptions;
+
+/**
+ * Reconciles the table name being imported with the class naming information
+ * specified in SqoopOptions to determine the actual package and class name to
+ * use for a table.
+ */
+public class TableClassName {
+
+  public static final Log LOG = LogFactory.getLog(
+      TableClassName.class.getName());
+
+  private final SqoopOptions options;
+
+  public TableClassName(final SqoopOptions opts) {
+    if (null == opts) {
+      throw new NullPointerException(
+          "Cannot instantiate a TableClassName on null options.");
+    } else {
+      this.options = opts;
+    }
+  }
+
+  /**
+   * Taking into account --class-name and --package-name, return the actual
+   * package-part which will be used for a class. The actual table name being
+   * generated-for is irrelevant; so not an argument.
+   *
+   * @return the package where generated ORM classes go. Will be null for
+   * top-level.
+   */
+  public String getPackageForTable() {
+    String predefinedClass = options.getClassName();
+    if (null != predefinedClass) {
+      // If the predefined classname contains a package-part, return that.
+      int lastDot = predefinedClass.lastIndexOf('.');
+      if (-1 == lastDot) {
+        // No package part.
+        return null;
+      } else {
+        // Return the string up to but not including the last dot.
+        return predefinedClass.substring(0, lastDot);
+      }
+    } else {
+      // If the user has specified a package name, return it.
+      // This will be null if the user hasn't specified one -- as we expect.
+      return options.getPackageName();
+    }
+  }
+
+  /**
+   * @param tableName the name of the table being imported.
+   * @return the full name of the class to generate/use to import a table.
+   */
+  public String getClassForTable(String tableName) {
+    String predefinedClass = options.getClassName();
+    if (predefinedClass != null) {
+      // The user's chosen a specific class name for this job.
+      return predefinedClass;
+    }
+
+    String queryName = tableName;
+    if (null == queryName) {
+      queryName = "QueryResult";
+    }
+
+    String packageName = options.getPackageName();
+    if (null != packageName) {
+      // return packageName.queryName.
+      return packageName + "." + queryName;
+    }
+
+    // no specific class; no specific package.
+    // Just make sure it's a legal identifier.
+    return ClassWriter.toJavaIdentifier(queryName);
+  }
+
+  /**
+   * @return just the last segment of the class name -- all package info
+   * stripped.
+   */
+  public String getShortClassForTable(String tableName) {
+    String fullClass = getClassForTable(tableName);
+    if (null == fullClass) {
+      return null;
+    }
+
+    int lastDot = fullClass.lastIndexOf('.');
+    if (-1 == lastDot) {
+      return fullClass;
+    } else {
+      return fullClass.substring(lastDot + 1, fullClass.length());
+    }
+  }
+}

Propchange: incubator/sqoop/trunk/src/java/org/apache/sqoop/orm/TableClassName.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain