You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sqoop.apache.org by ja...@apache.org on 2014/09/04 11:26:41 UTC
git commit: SQOOP-1395: Potential naming conflict in Avro schema
Repository: sqoop
Updated Branches:
refs/heads/trunk f47a4fc25 -> 500b75ae4
SQOOP-1395: Potential naming conflict in Avro schema
(Qian Xu via Jarek Jarcec Cecho)
Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/500b75ae
Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/500b75ae
Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/500b75ae
Branch: refs/heads/trunk
Commit: 500b75ae4b990fd0e28ea4f3cb5a93d1e68b0d89
Parents: f47a4fc
Author: Jarek Jarcec Cecho <ja...@apache.org>
Authored: Thu Sep 4 11:26:13 2014 +0200
Committer: Jarek Jarcec Cecho <ja...@apache.org>
Committed: Thu Sep 4 11:26:13 2014 +0200
----------------------------------------------------------------------
src/java/org/apache/sqoop/orm/AvroSchemaGenerator.java | 4 ++--
src/java/org/apache/sqoop/orm/TableClassName.java | 4 +++-
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/sqoop/blob/500b75ae/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 806bace..3c913a8 100644
--- a/src/java/org/apache/sqoop/orm/AvroSchemaGenerator.java
+++ b/src/java/org/apache/sqoop/orm/AvroSchemaGenerator.java
@@ -71,8 +71,8 @@ public class AvroSchemaGenerator {
TableClassName tableClassName = new TableClassName(options);
String shortClassName = tableClassName.getShortClassForTable(tableName);
- String avroTableName = (tableName == null ? "QueryResult" : tableName);
- String avroName = (shortClassName == null ? avroTableName : shortClassName);
+ String avroTableName = (tableName == null ? TableClassName.QUERY_RESULT : tableName);
+ String avroName = "sqoop_import_" + (shortClassName == null ? avroTableName : shortClassName);
String avroNamespace = tableClassName.getPackageForTable();
String doc = "Sqoop import of " + avroTableName;
http://git-wip-us.apache.org/repos/asf/sqoop/blob/500b75ae/src/java/org/apache/sqoop/orm/TableClassName.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/sqoop/orm/TableClassName.java b/src/java/org/apache/sqoop/orm/TableClassName.java
index 88ab622..13aa301 100644
--- a/src/java/org/apache/sqoop/orm/TableClassName.java
+++ b/src/java/org/apache/sqoop/orm/TableClassName.java
@@ -33,6 +33,8 @@ public class TableClassName {
public static final Log LOG = LogFactory.getLog(
TableClassName.class.getName());
+ public static final String QUERY_RESULT = "QueryResult";
+
private final SqoopOptions options;
public TableClassName(final SqoopOptions opts) {
@@ -84,7 +86,7 @@ public class TableClassName {
String queryName = tableName;
if (null == queryName) {
- queryName = "QueryResult";
+ queryName = QUERY_RESULT;
}
String packageName = options.getPackageName();