From 4fd8dec1452897cc7a6badf96d722af26ca5de3c Mon Sep 17 00:00:00 2001 From: Jarek Jarcec Cecho Date: Mon, 10 Nov 2014 22:13:05 -0800 Subject: [PATCH] SQOOP-1708: Rename Unsupported Column type to Unknown and add java doc (Veena Basavaraj via Jarek Jarcec Cecho) --- .../sqoop/json/util/SchemaSerialization.java | 10 ++++----- .../apache/sqoop/schema/type/ColumnType.java | 2 +- .../type/{Unsupported.java => Unknown.java} | 21 ++++++++++--------- .../json/util/TestSchemaSerialization.java | 6 +++--- .../connector/jdbc/util/SqlTypesUtils.java | 4 ++-- .../idf/CSVIntermediateDataFormat.java | 2 ++ 6 files changed, 24 insertions(+), 21 deletions(-) rename common/src/main/java/org/apache/sqoop/schema/type/{Unsupported.java => Unknown.java} (73%) diff --git a/common/src/main/java/org/apache/sqoop/json/util/SchemaSerialization.java b/common/src/main/java/org/apache/sqoop/json/util/SchemaSerialization.java index e0067615..ecb5aa32 100644 --- a/common/src/main/java/org/apache/sqoop/json/util/SchemaSerialization.java +++ b/common/src/main/java/org/apache/sqoop/json/util/SchemaSerialization.java @@ -35,7 +35,7 @@ import org.apache.sqoop.schema.type.Text; import org.apache.sqoop.schema.type.Time; import org.apache.sqoop.schema.type.ColumnType; -import org.apache.sqoop.schema.type.Unsupported; +import org.apache.sqoop.schema.type.Unknown; import org.json.simple.JSONArray; import org.json.simple.JSONObject; @@ -131,8 +131,8 @@ private static JSONObject extractColumn(Column column) { case TIME: ret.put(FRACTION, ((Time)column).getFraction()); break; - case UNSUPPORTED: - ret.put(JDBC_TYPE, ((Unsupported) column).getJdbcType()); + case UNKNOWN: + ret.put(JDBC_TYPE, ((Unknown) column).getJdbcType()); break; case DATE: case BIT: @@ -208,8 +208,8 @@ private static Column restoreColumn(JSONObject obj) { case TIME: output = new Time().setFraction(fraction); break; - case UNSUPPORTED: - output = new Unsupported().setJdbcType(jdbcType); + case UNKNOWN: + output = new Unknown().setJdbcType(jdbcType); break; default: // TODO(Jarcec): Throw an exception of unsupported type? diff --git a/common/src/main/java/org/apache/sqoop/schema/type/ColumnType.java b/common/src/main/java/org/apache/sqoop/schema/type/ColumnType.java index d98d7055..d04015e0 100644 --- a/common/src/main/java/org/apache/sqoop/schema/type/ColumnType.java +++ b/common/src/main/java/org/apache/sqoop/schema/type/ColumnType.java @@ -34,6 +34,6 @@ public enum ColumnType { SET, TEXT, TIME, - UNSUPPORTED, + UNKNOWN, ; } diff --git a/common/src/main/java/org/apache/sqoop/schema/type/Unsupported.java b/common/src/main/java/org/apache/sqoop/schema/type/Unknown.java similarity index 73% rename from common/src/main/java/org/apache/sqoop/schema/type/Unsupported.java rename to common/src/main/java/org/apache/sqoop/schema/type/Unknown.java index e7260ec7..97f72c09 100644 --- a/common/src/main/java/org/apache/sqoop/schema/type/Unsupported.java +++ b/common/src/main/java/org/apache/sqoop/schema/type/Unknown.java @@ -18,9 +18,10 @@ package org.apache.sqoop.schema.type; /** - * Unsupported data type (internally encoded as binary). + * Unknown column type (internally encoded as binary) + * */ -public class Unsupported extends Binary { +public class Unknown extends Binary { /** * Optional JDBC type that is unknown. @@ -29,39 +30,39 @@ public class Unsupported extends Binary { @Override public ColumnType getType() { - return ColumnType.UNSUPPORTED; + return ColumnType.UNKNOWN; } public Long getJdbcType() { return jdbcType; } - public Unsupported setJdbcType(Long jdbcType) { + public Unknown setJdbcType(Long jdbcType) { this.jdbcType = jdbcType; return this; } - public Unsupported() { + public Unknown() { } - public Unsupported(Long jdbcType) { + public Unknown(Long jdbcType) { setJdbcType(jdbcType); } - public Unsupported(String name) { + public Unknown(String name) { super(name); } - public Unsupported(String name, Long jdbcType) { + public Unknown(String name, Long jdbcType) { super(name); setJdbcType(jdbcType); } - public Unsupported(String name, Boolean nullable) { + public Unknown(String name, Boolean nullable) { super(name, nullable); } - public Unsupported(String name, Boolean nullable, Long jdbcType) { + public Unknown(String name, Boolean nullable, Long jdbcType) { super(name, nullable); setJdbcType(jdbcType); } diff --git a/common/src/test/java/org/apache/sqoop/json/util/TestSchemaSerialization.java b/common/src/test/java/org/apache/sqoop/json/util/TestSchemaSerialization.java index b652b323..1640ead6 100644 --- a/common/src/test/java/org/apache/sqoop/json/util/TestSchemaSerialization.java +++ b/common/src/test/java/org/apache/sqoop/json/util/TestSchemaSerialization.java @@ -31,7 +31,7 @@ import org.apache.sqoop.schema.type.Set; import org.apache.sqoop.schema.type.Text; import org.apache.sqoop.schema.type.Time; -import org.apache.sqoop.schema.type.Unsupported; +import org.apache.sqoop.schema.type.Unknown; import org.json.simple.JSONObject; import org.json.simple.JSONValue; import org.junit.Test; @@ -123,7 +123,7 @@ public void testTime() { @Test public void testUnsupported() { - Schema t = new Schema("t").addColumn(new Unsupported("u", 4L)); + Schema t = new Schema("t").addColumn(new Unknown("u", 4L)); transferAndAssert(t); } @Test @@ -148,7 +148,7 @@ public void testAllTypes() { .addColumn(new Set("k", new Text())) .addColumn(new Text("l")) .addColumn(new Time("m")) - .addColumn(new Unsupported("u")) + .addColumn(new Unknown("u")) ; transferAndAssert(allTypes); } diff --git a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/util/SqlTypesUtils.java b/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/util/SqlTypesUtils.java index 0850b0e1..572f0ecf 100644 --- a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/util/SqlTypesUtils.java +++ b/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/util/SqlTypesUtils.java @@ -27,7 +27,7 @@ import org.apache.sqoop.schema.type.FloatingPoint; import org.apache.sqoop.schema.type.Text; import org.apache.sqoop.schema.type.Time; -import org.apache.sqoop.schema.type.Unsupported; +import org.apache.sqoop.schema.type.Unknown; import java.sql.Types; @@ -88,7 +88,7 @@ public static Column sqlTypeToAbstractType(int sqlType) { return new Binary(); default: - return new Unsupported((long)sqlType); + return new Unknown((long)sqlType); } } diff --git a/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/idf/CSVIntermediateDataFormat.java b/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/idf/CSVIntermediateDataFormat.java index 1edbf4de..39a01c1b 100644 --- a/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/idf/CSVIntermediateDataFormat.java +++ b/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/idf/CSVIntermediateDataFormat.java @@ -202,6 +202,8 @@ public Object[] getObjectData() { out[i] = unescapeStrings(fields[i]); break; case BINARY: + // Unknown is treated as a binary type + case UNKNOWN: out[i] = unescapeByteArray(fields[i]); break; case FIXED_POINT: