Repository: sqoop Updated Branches: refs/heads/sqoop2 89dcbe879 -> 4adc766b5
SQOOP-1996: Sqoop2: Change getNullable to isNullable (Veena Basavaraj via Abraham Elmahrek) Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/4adc766b Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/4adc766b Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/4adc766b Branch: refs/heads/sqoop2 Commit: 4adc766b5496b81f192996519febb7c3c7f398d5 Parents: 89dcbe8 Author: Abraham Elmahrek <[email protected]> Authored: Fri Jan 9 11:43:52 2015 -0800 Committer: Abraham Elmahrek <[email protected]> Committed: Fri Jan 9 11:43:52 2015 -0800 ---------------------------------------------------------------------- .../main/java/org/apache/sqoop/json/util/SchemaSerialization.java | 2 +- common/src/main/java/org/apache/sqoop/schema/type/Column.java | 2 +- .../org/apache/sqoop/connector/kite/util/KiteDataTypeUtil.java | 2 +- .../java/org/apache/sqoop/connector/common/SqoopAvroUtils.java | 2 +- .../org/apache/sqoop/connector/idf/AVROIntermediateDataFormat.java | 2 +- .../src/main/java/org/apache/sqoop/connector/matcher/Matcher.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sqoop/blob/4adc766b/common/src/main/java/org/apache/sqoop/json/util/SchemaSerialization.java ---------------------------------------------------------------------- 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 6b9a7f9..bbd58fc 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 @@ -120,7 +120,7 @@ public class SchemaSerialization { JSONObject ret = new JSONObject(); ret.put(NAME, column.getName()); - ret.put(NULLABLE, column.getNullable()); + ret.put(NULLABLE, column.isNullable()); ret.put(TYPE, column.getType().name()); switch (column.getType()) { http://git-wip-us.apache.org/repos/asf/sqoop/blob/4adc766b/common/src/main/java/org/apache/sqoop/schema/type/Column.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/sqoop/schema/type/Column.java b/common/src/main/java/org/apache/sqoop/schema/type/Column.java index 6f1f8d8..2d35c3a 100644 --- a/common/src/main/java/org/apache/sqoop/schema/type/Column.java +++ b/common/src/main/java/org/apache/sqoop/schema/type/Column.java @@ -63,7 +63,7 @@ public abstract class Column { return this; } - public Boolean getNullable() { + public Boolean isNullable() { return nullable; } http://git-wip-us.apache.org/repos/asf/sqoop/blob/4adc766b/connector/connector-kite/src/main/java/org/apache/sqoop/connector/kite/util/KiteDataTypeUtil.java ---------------------------------------------------------------------- diff --git a/connector/connector-kite/src/main/java/org/apache/sqoop/connector/kite/util/KiteDataTypeUtil.java b/connector/connector-kite/src/main/java/org/apache/sqoop/connector/kite/util/KiteDataTypeUtil.java index d3a7847..f4f30fb 100644 --- a/connector/connector-kite/src/main/java/org/apache/sqoop/connector/kite/util/KiteDataTypeUtil.java +++ b/connector/connector-kite/src/main/java/org/apache/sqoop/connector/kite/util/KiteDataTypeUtil.java @@ -71,7 +71,7 @@ public class KiteDataTypeUtil { private static Schema createAvroFieldSchema(Column column) { Schema.Type type = toAvroType(column.getType()); - if (!column.getNullable()) { + if (!column.isNullable()) { return Schema.create(type); } else { List<Schema> union = new ArrayList<Schema>(); http://git-wip-us.apache.org/repos/asf/sqoop/blob/4adc766b/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/common/SqoopAvroUtils.java ---------------------------------------------------------------------- diff --git a/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/common/SqoopAvroUtils.java b/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/common/SqoopAvroUtils.java index e47d8fe..c19c7f4 100644 --- a/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/common/SqoopAvroUtils.java +++ b/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/common/SqoopAvroUtils.java @@ -56,7 +56,7 @@ public class SqoopAvroUtils { public static Schema createAvroFieldSchema(Column column) { Schema schema = toAvroFieldType(column); - if (!column.getNullable()) { + if (!column.isNullable()) { return schema; } else { List<Schema> union = new ArrayList<Schema>(); http://git-wip-us.apache.org/repos/asf/sqoop/blob/4adc766b/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/idf/AVROIntermediateDataFormat.java ---------------------------------------------------------------------- diff --git a/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/idf/AVROIntermediateDataFormat.java b/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/idf/AVROIntermediateDataFormat.java index f0dd914..67b47e7 100644 --- a/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/idf/AVROIntermediateDataFormat.java +++ b/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/idf/AVROIntermediateDataFormat.java @@ -153,7 +153,7 @@ public class AVROIntermediateDataFormat extends IntermediateDataFormat<GenericRe for (int i = 0; i < csvStringArray.length; i++) { // check for NULL field and assume this field is nullable as per the sqoop // schema - if (csvStringArray[i].equals(NULL_VALUE) && columnArray[i].getNullable()) { + if (csvStringArray[i].equals(NULL_VALUE) && columnArray[i].isNullable()) { avroObject.put(columnArray[i].getName(), null); continue; } http://git-wip-us.apache.org/repos/asf/sqoop/blob/4adc766b/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/matcher/Matcher.java ---------------------------------------------------------------------- diff --git a/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/matcher/Matcher.java b/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/matcher/Matcher.java index 554e415..36ac5a5 100644 --- a/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/matcher/Matcher.java +++ b/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/matcher/Matcher.java @@ -73,7 +73,7 @@ public abstract class Matcher { protected void tryFillNullInArrayForUnexpectedColumn(Column column, Object[] array, int index) throws SqoopException { - if (!column.getNullable()) { + if (!column.isNullable()) { throw new SqoopException(SchemaError.SCHEMA_0004, "Target column " + column + " didn't match with any source column and cannot be null."); }
