github/sqoop
5
0
Fork 0
mirror of https://github.com/apache/sqoop.git synced 2025-05-19 02:10:54 +08:00
Code Issues Projects Releases Wiki Activity

SQOOP-1395: Potential naming conflict in Avro schema

Browse Source 
(Qian Xu via Jarek Jarcec Cecho)
This commit is contained in:
Jarek Jarcec Cecho 2014-09-04 11:26:13 +02:00
parent f47a4fc25c
commit 500b75ae4b
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/java/org/apache/sqoop/orm/AvroSchemaGenerator.java
View File

@ -71,8 +71,8 @@ public Schema generate() throws IOException {
TableClassName tableClassName = new TableClassName(options); TableClassName tableClassName = new TableClassName(options);
String shortClassName = tableClassName.getShortClassForTable(tableName); String shortClassName = tableClassName.getShortClassForTable(tableName);
String avroTableName = (tableName == null ? "QueryResult" : tableName); String avroTableName = (tableName == null ? TableClassName.QUERY_RESULT : tableName);
String avroName = (shortClassName == null ? avroTableName : shortClassName); String avroName = "sqoop_import_" + (shortClassName == null ? avroTableName : shortClassName);
String avroNamespace = tableClassName.getPackageForTable(); String avroNamespace = tableClassName.getPackageForTable();
String doc = "Sqoop import of " + avroTableName; String doc = "Sqoop import of " + avroTableName;

4
src/java/org/apache/sqoop/orm/TableClassName.java
View File

@ -33,6 +33,8 @@ public class TableClassName {
public static final Log LOG = LogFactory.getLog( public static final Log LOG = LogFactory.getLog(
TableClassName.class.getName()); TableClassName.class.getName());
public static final String QUERY_RESULT = "QueryResult";
private final SqoopOptions options; private final SqoopOptions options;
public TableClassName(final SqoopOptions opts) { public TableClassName(final SqoopOptions opts) {
@ -84,7 +86,7 @@ public String getClassForTable(String tableName) {
String queryName = tableName; String queryName = tableName;
if (null == queryName) { if (null == queryName) {
queryName = "QueryResult"; queryName = QUERY_RESULT;
} }
String packageName = options.getPackageName(); String packageName = options.getPackageName();