commit 926d92bac13ff8171d503aa0f7b429e030284e2f
author Kate Ting <kathleen@apache.org> Fri Jan 15 16:00:34 2016 -0800
committer Kate Ting <kathleen@apache.org> Fri Jan 15 16:00:34 2016 -0800
tree db84795926ef4ec7de479a2b0b75c3531a295da7
parent 1e310ad9f5608c08d0d1850c6f63aa9aff4c4239

SQOOP-2783: Query import with parquet fails on incompatible schema
 (Jarek Jarcec Cecho via Kate Ting)

src/java/org/apache/sqoop/orm/AvroSchemaGenerator.java

diff --git a/src/java/org/apache/sqoop/orm/AvroSchemaGenerator.java b/src/java/org/apache/sqoop/orm/AvroSchemaGenerator.java
index dcffb99..0a693d0 100644
--- a/src/java/org/apache/sqoop/orm/AvroSchemaGenerator.java
+++ b/src/java/org/apache/sqoop/orm/AvroSchemaGenerator.java
@@ -48,6 +48,8 @@
   private final ConnManager connManager;
   private final String tableName;
 
+  private final String DEFAULT_SCHEMA_NAME = "AutoGeneratedSchema";
+
   public AvroSchemaGenerator(final SqoopOptions opts, final ConnManager connMgr,
       final String table) {
     this.options = opts;
@@ -78,7 +80,7 @@
     }
 
     TableClassName tableClassName = new TableClassName(options);
-    String shortClassName = tableClassName.getShortClassForTable(tableName);
+    String shortClassName = tableName == null ? DEFAULT_SCHEMA_NAME : tableClassName.getShortClassForTable(tableName);
     String avroTableName = (tableName == null ? TableClassName.QUERY_RESULT : tableName);
     String avroName = schemaNameOverride != null ? schemaNameOverride :
         (shortClassName == null ? avroTableName : shortClassName);