Repository: sqoop Updated Branches: refs/heads/sqoop2 5de4b4378 -> fe5d615bf
SQOOP-1703: Sqoop2: rename Type to Column Type + size to length + minor doc fixes (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/fe5d615b Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/fe5d615b Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/fe5d615b Branch: refs/heads/sqoop2 Commit: fe5d615bf10eed939985e39f06c23584250d9829 Parents: 5de4b43 Author: Abraham Elmahrek <[email protected]> Authored: Mon Nov 10 16:09:08 2014 -0800 Committer: Abraham Elmahrek <[email protected]> Committed: Mon Nov 10 17:06:57 2014 -0800 ---------------------------------------------------------------------- .../sqoop/json/util/SchemaSerialization.java | 10 ++--- .../java/org/apache/sqoop/schema/Schema.java | 4 +- .../sqoop/schema/type/AbstractString.java | 24 ++++++------ .../org/apache/sqoop/schema/type/Array.java | 4 +- .../org/apache/sqoop/schema/type/Binary.java | 10 ++--- .../java/org/apache/sqoop/schema/type/Bit.java | 4 +- .../org/apache/sqoop/schema/type/Column.java | 13 ++++--- .../apache/sqoop/schema/type/ColumnType.java | 39 ++++++++++++++++++++ .../java/org/apache/sqoop/schema/type/Date.java | 4 +- .../org/apache/sqoop/schema/type/DateTime.java | 4 +- .../org/apache/sqoop/schema/type/Decimal.java | 4 +- .../java/org/apache/sqoop/schema/type/Enum.java | 4 +- .../apache/sqoop/schema/type/FixedPoint.java | 4 +- .../apache/sqoop/schema/type/FloatingPoint.java | 4 +- .../java/org/apache/sqoop/schema/type/Map.java | 4 +- .../java/org/apache/sqoop/schema/type/Set.java | 6 +-- .../java/org/apache/sqoop/schema/type/Text.java | 8 ++-- .../java/org/apache/sqoop/schema/type/Time.java | 4 +- .../java/org/apache/sqoop/schema/type/Type.java | 39 -------------------- .../apache/sqoop/schema/type/Unsupported.java | 4 +- .../idf/CSVIntermediateDataFormat.java | 8 ++-- 21 files changed, 103 insertions(+), 102 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sqoop/blob/fe5d615b/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 4b4b932..e006761 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 @@ -34,7 +34,7 @@ import org.apache.sqoop.schema.type.Map; 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.Type; +import org.apache.sqoop.schema.type.ColumnType; import org.apache.sqoop.schema.type.Unsupported; import org.json.simple.JSONArray; import org.json.simple.JSONObject; @@ -111,7 +111,7 @@ public class SchemaSerialization { break; case BINARY: case TEXT: - ret.put(SIZE, ((AbstractString)column).getSize()); + ret.put(SIZE, ((AbstractString)column).getLength()); break; case DATE_TIME: ret.put(FRACTION, ((DateTime)column).getFraction()); @@ -166,14 +166,14 @@ public class SchemaSerialization { Boolean unsigned = (Boolean)obj.get(UNSIGNED); Long jdbcType = (Long)obj.get(JDBC_TYPE); - Type type = Type.valueOf((String) obj.get(TYPE)); + ColumnType type = ColumnType.valueOf((String) obj.get(TYPE)); Column output = null; switch (type) { case ARRAY: output = new Array(key); break; case BINARY: - output = new Binary().setSize(size); + output = new Binary().setLength(size); break; case BIT: output = new Bit(); @@ -203,7 +203,7 @@ public class SchemaSerialization { output = new Set(key); break; case TEXT: - output = new Text().setSize(size); + output = new Text().setLength(size); break; case TIME: output = new Time().setFraction(fraction); http://git-wip-us.apache.org/repos/asf/sqoop/blob/fe5d615b/common/src/main/java/org/apache/sqoop/schema/Schema.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/sqoop/schema/Schema.java b/common/src/main/java/org/apache/sqoop/schema/Schema.java index 3aa3aea..496f6e3 100644 --- a/common/src/main/java/org/apache/sqoop/schema/Schema.java +++ b/common/src/main/java/org/apache/sqoop/schema/Schema.java @@ -28,7 +28,7 @@ import java.util.List; import java.util.Set; /** - * Schema represents data that are being transferred. + * Schema represents the data fields that are transferred between {@link #From} and {@link #To} */ public class Schema { @@ -43,7 +43,7 @@ public class Schema { private String note; /** - * Generation date. + * Creation date. */ private Date creationDate; http://git-wip-us.apache.org/repos/asf/sqoop/blob/fe5d615b/common/src/main/java/org/apache/sqoop/schema/type/AbstractString.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/sqoop/schema/type/AbstractString.java b/common/src/main/java/org/apache/sqoop/schema/type/AbstractString.java index d84c7ec..950c2fd 100644 --- a/common/src/main/java/org/apache/sqoop/schema/type/AbstractString.java +++ b/common/src/main/java/org/apache/sqoop/schema/type/AbstractString.java @@ -22,7 +22,7 @@ package org.apache.sqoop.schema.type; */ public abstract class AbstractString extends Column { - private Long size; + private Long length; protected AbstractString() { } @@ -31,33 +31,33 @@ public abstract class AbstractString extends Column { super(name); } - protected AbstractString(String name, Long size) { + protected AbstractString(String name, Long length) { super(name); - this.size = size; + this.length = length; } protected AbstractString(String name, Boolean nullable) { super(name, nullable); } - protected AbstractString(String name, Boolean nullable, Long size) { + protected AbstractString(String name, Boolean nullable, Long length) { super(name, nullable); - this.size = size; + this.length = length; } - public Long getSize() { - return size; + public Long getLength() { + return length; } - public AbstractString setSize(Long size) { - this.size = size; + public AbstractString setLength(Long length) { + this.length = length; return this; } @Override public String toString() { return new StringBuilder(super.toString()) - .append(",size=").append(size) + .append(",length=").append(length) .toString(); } @@ -69,7 +69,7 @@ public abstract class AbstractString extends Column { AbstractString that = (AbstractString) o; - if (size != null ? !size.equals(that.size) : that.size != null) + if (length != null ? !length.equals(that.length) : that.length != null) return false; return true; @@ -78,7 +78,7 @@ public abstract class AbstractString extends Column { @Override public int hashCode() { int result = super.hashCode(); - result = 31 * result + (size != null ? size.hashCode() : 0); + result = 31 * result + (length != null ? length.hashCode() : 0); return result; } } http://git-wip-us.apache.org/repos/asf/sqoop/blob/fe5d615b/common/src/main/java/org/apache/sqoop/schema/type/Array.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/sqoop/schema/type/Array.java b/common/src/main/java/org/apache/sqoop/schema/type/Array.java index cbf8f6e..d7dcc0c 100644 --- a/common/src/main/java/org/apache/sqoop/schema/type/Array.java +++ b/common/src/main/java/org/apache/sqoop/schema/type/Array.java @@ -37,8 +37,8 @@ public class Array extends AbstractComplexType { } @Override - public Type getType() { - return Type.ARRAY; + public ColumnType getType() { + return ColumnType.ARRAY; } @Override http://git-wip-us.apache.org/repos/asf/sqoop/blob/fe5d615b/common/src/main/java/org/apache/sqoop/schema/type/Binary.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/sqoop/schema/type/Binary.java b/common/src/main/java/org/apache/sqoop/schema/type/Binary.java index 53e50b8..7111bf5 100644 --- a/common/src/main/java/org/apache/sqoop/schema/type/Binary.java +++ b/common/src/main/java/org/apache/sqoop/schema/type/Binary.java @@ -31,7 +31,7 @@ public class Binary extends AbstractString { super(name); } - public Binary(String name, Long size) { + public Binary(String name, Long length) { super(name); } @@ -40,13 +40,13 @@ public class Binary extends AbstractString { super(name, nullable); } - public Binary(String name, Boolean nullable, Long size) { - super(name, nullable, size); + public Binary(String name, Boolean nullable, Long length) { + super(name, nullable, length); } @Override - public Type getType() { - return Type.BINARY; + public ColumnType getType() { + return ColumnType.BINARY; } @Override http://git-wip-us.apache.org/repos/asf/sqoop/blob/fe5d615b/common/src/main/java/org/apache/sqoop/schema/type/Bit.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/sqoop/schema/type/Bit.java b/common/src/main/java/org/apache/sqoop/schema/type/Bit.java index 3c522bf..2371746 100644 --- a/common/src/main/java/org/apache/sqoop/schema/type/Bit.java +++ b/common/src/main/java/org/apache/sqoop/schema/type/Bit.java @@ -36,8 +36,8 @@ public class Bit extends Column { } @Override - public Type getType() { - return Type.BIT; + public ColumnType getType() { + return ColumnType.BIT; } @Override http://git-wip-us.apache.org/repos/asf/sqoop/blob/fe5d615b/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 97bd303..2339d66 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 @@ -18,7 +18,7 @@ package org.apache.sqoop.schema.type; /** - * Parent of all Sqoop types. + * Base class for all the supported types in the Sqoop {@link #Schema} */ public abstract class Column { @@ -28,12 +28,12 @@ public abstract class Column { String name; /** - * Whether NULL is allowed or not. + * Whether the column value can be empty/null */ Boolean nullable; /** - * By default columns are empty name and are nullable + * By default a column has empty name and is nullable */ public Column() { this("", true); @@ -53,7 +53,7 @@ public abstract class Column { * * @return Type of the column */ - public abstract Type getType(); + public abstract ColumnType getType(); public Column setName(String name) { this.name = name; @@ -76,7 +76,8 @@ public abstract class Column { public String toString() { return new StringBuilder() .append("name=").append(name).append(",") - .append("nullable=").append(nullable) + .append("nullable=").append(nullable).append(",") + .append("type=").append(getType()) .toString(); } @@ -104,7 +105,7 @@ public abstract class Column { } public boolean validate(Object o) { - // TODO: Implement this in all subclasses! + // TODO(SQOOP-1707) return true; } } http://git-wip-us.apache.org/repos/asf/sqoop/blob/fe5d615b/common/src/main/java/org/apache/sqoop/schema/type/ColumnType.java ---------------------------------------------------------------------- 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 new file mode 100644 index 0000000..d98d705 --- /dev/null +++ b/common/src/main/java/org/apache/sqoop/schema/type/ColumnType.java @@ -0,0 +1,39 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.sqoop.schema.type; + +/** + * All {@link #Column} types supported by Sqoop. + */ +public enum ColumnType { + ARRAY, + BINARY, + BIT, + DATE, + DATE_TIME, + DECIMAL, + ENUM, + FIXED_POINT, + FLOATING_POINT, + MAP, + SET, + TEXT, + TIME, + UNSUPPORTED, + ; +} http://git-wip-us.apache.org/repos/asf/sqoop/blob/fe5d615b/common/src/main/java/org/apache/sqoop/schema/type/Date.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/sqoop/schema/type/Date.java b/common/src/main/java/org/apache/sqoop/schema/type/Date.java index 3d1bffe..324a089 100644 --- a/common/src/main/java/org/apache/sqoop/schema/type/Date.java +++ b/common/src/main/java/org/apache/sqoop/schema/type/Date.java @@ -36,8 +36,8 @@ public class Date extends AbstractDateTime { } @Override - public Type getType() { - return Type.DATE; + public ColumnType getType() { + return ColumnType.DATE; } @Override http://git-wip-us.apache.org/repos/asf/sqoop/blob/fe5d615b/common/src/main/java/org/apache/sqoop/schema/type/DateTime.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/sqoop/schema/type/DateTime.java b/common/src/main/java/org/apache/sqoop/schema/type/DateTime.java index 502f328..d982d2a 100644 --- a/common/src/main/java/org/apache/sqoop/schema/type/DateTime.java +++ b/common/src/main/java/org/apache/sqoop/schema/type/DateTime.java @@ -77,8 +77,8 @@ public class DateTime extends AbstractDateTime { } @Override - public Type getType() { - return Type.DATE_TIME; + public ColumnType getType() { + return ColumnType.DATE_TIME; } @Override http://git-wip-us.apache.org/repos/asf/sqoop/blob/fe5d615b/common/src/main/java/org/apache/sqoop/schema/type/Decimal.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/sqoop/schema/type/Decimal.java b/common/src/main/java/org/apache/sqoop/schema/type/Decimal.java index ffd3eab..5470b9c 100644 --- a/common/src/main/java/org/apache/sqoop/schema/type/Decimal.java +++ b/common/src/main/java/org/apache/sqoop/schema/type/Decimal.java @@ -77,8 +77,8 @@ public class Decimal extends AbstractNumber { } @Override - public Type getType() { - return Type.DECIMAL; + public ColumnType getType() { + return ColumnType.DECIMAL; } @Override http://git-wip-us.apache.org/repos/asf/sqoop/blob/fe5d615b/common/src/main/java/org/apache/sqoop/schema/type/Enum.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/sqoop/schema/type/Enum.java b/common/src/main/java/org/apache/sqoop/schema/type/Enum.java index 48fd048..0c54fd0 100644 --- a/common/src/main/java/org/apache/sqoop/schema/type/Enum.java +++ b/common/src/main/java/org/apache/sqoop/schema/type/Enum.java @@ -37,8 +37,8 @@ public class Enum extends AbstractComplexType { } @Override - public Type getType() { - return Type.ENUM; + public ColumnType getType() { + return ColumnType.ENUM; } @Override http://git-wip-us.apache.org/repos/asf/sqoop/blob/fe5d615b/common/src/main/java/org/apache/sqoop/schema/type/FixedPoint.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/sqoop/schema/type/FixedPoint.java b/common/src/main/java/org/apache/sqoop/schema/type/FixedPoint.java index 77adfb1..d949aa7 100644 --- a/common/src/main/java/org/apache/sqoop/schema/type/FixedPoint.java +++ b/common/src/main/java/org/apache/sqoop/schema/type/FixedPoint.java @@ -71,8 +71,8 @@ public class FixedPoint extends AbstractNumber { } @Override - public Type getType() { - return Type.FIXED_POINT; + public ColumnType getType() { + return ColumnType.FIXED_POINT; } @Override http://git-wip-us.apache.org/repos/asf/sqoop/blob/fe5d615b/common/src/main/java/org/apache/sqoop/schema/type/FloatingPoint.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/sqoop/schema/type/FloatingPoint.java b/common/src/main/java/org/apache/sqoop/schema/type/FloatingPoint.java index ceff011..9639197 100644 --- a/common/src/main/java/org/apache/sqoop/schema/type/FloatingPoint.java +++ b/common/src/main/java/org/apache/sqoop/schema/type/FloatingPoint.java @@ -57,8 +57,8 @@ public class FloatingPoint extends AbstractNumber { } @Override - public Type getType() { - return Type.FLOATING_POINT; + public ColumnType getType() { + return ColumnType.FLOATING_POINT; } @Override http://git-wip-us.apache.org/repos/asf/sqoop/blob/fe5d615b/common/src/main/java/org/apache/sqoop/schema/type/Map.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/sqoop/schema/type/Map.java b/common/src/main/java/org/apache/sqoop/schema/type/Map.java index 2dd70d8..d3301c0 100644 --- a/common/src/main/java/org/apache/sqoop/schema/type/Map.java +++ b/common/src/main/java/org/apache/sqoop/schema/type/Map.java @@ -42,8 +42,8 @@ public class Map extends AbstractComplexType { } @Override - public Type getType() { - return Type.MAP; + public ColumnType getType() { + return ColumnType.MAP; } public Column getValue() { http://git-wip-us.apache.org/repos/asf/sqoop/blob/fe5d615b/common/src/main/java/org/apache/sqoop/schema/type/Set.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/sqoop/schema/type/Set.java b/common/src/main/java/org/apache/sqoop/schema/type/Set.java index c9a658f..a18699f 100644 --- a/common/src/main/java/org/apache/sqoop/schema/type/Set.java +++ b/common/src/main/java/org/apache/sqoop/schema/type/Set.java @@ -18,7 +18,7 @@ package org.apache.sqoop.schema.type; /** - * Multiple values of the same type. + * Unique values of the same type. * * JDBC Types: set */ @@ -37,8 +37,8 @@ public class Set extends AbstractComplexType { } @Override - public Type getType() { - return Type.SET; + public ColumnType getType() { + return ColumnType.SET; } @Override http://git-wip-us.apache.org/repos/asf/sqoop/blob/fe5d615b/common/src/main/java/org/apache/sqoop/schema/type/Text.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/sqoop/schema/type/Text.java b/common/src/main/java/org/apache/sqoop/schema/type/Text.java index 550e2b6..db47ede 100644 --- a/common/src/main/java/org/apache/sqoop/schema/type/Text.java +++ b/common/src/main/java/org/apache/sqoop/schema/type/Text.java @@ -31,8 +31,8 @@ public class Text extends AbstractString { super(name); } - public Text(String name, Long size) { - super(name, size); + public Text(String name, Long length) { + super(name, length); } public Text(String name, Boolean nullable) { @@ -44,8 +44,8 @@ public class Text extends AbstractString { } @Override - public Type getType() { - return Type.TEXT; + public ColumnType getType() { + return ColumnType.TEXT; } @Override http://git-wip-us.apache.org/repos/asf/sqoop/blob/fe5d615b/common/src/main/java/org/apache/sqoop/schema/type/Time.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/sqoop/schema/type/Time.java b/common/src/main/java/org/apache/sqoop/schema/type/Time.java index 095fac0..0f71508 100644 --- a/common/src/main/java/org/apache/sqoop/schema/type/Time.java +++ b/common/src/main/java/org/apache/sqoop/schema/type/Time.java @@ -57,8 +57,8 @@ public class Time extends AbstractDateTime { } @Override - public Type getType() { - return Type.TIME; + public ColumnType getType() { + return ColumnType.TIME; } @Override http://git-wip-us.apache.org/repos/asf/sqoop/blob/fe5d615b/common/src/main/java/org/apache/sqoop/schema/type/Type.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/sqoop/schema/type/Type.java b/common/src/main/java/org/apache/sqoop/schema/type/Type.java deleted file mode 100644 index 7fca3c8..0000000 --- a/common/src/main/java/org/apache/sqoop/schema/type/Type.java +++ /dev/null @@ -1,39 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.sqoop.schema.type; - -/** - * All data types supported by Sqoop. - */ -public enum Type { - ARRAY, - BINARY, - BIT, - DATE, - DATE_TIME, - DECIMAL, - ENUM, - FIXED_POINT, - FLOATING_POINT, - MAP, - SET, - TEXT, - TIME, - UNSUPPORTED, - ; -} http://git-wip-us.apache.org/repos/asf/sqoop/blob/fe5d615b/common/src/main/java/org/apache/sqoop/schema/type/Unsupported.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/sqoop/schema/type/Unsupported.java b/common/src/main/java/org/apache/sqoop/schema/type/Unsupported.java index e09bc48..e7260ec 100644 --- a/common/src/main/java/org/apache/sqoop/schema/type/Unsupported.java +++ b/common/src/main/java/org/apache/sqoop/schema/type/Unsupported.java @@ -28,8 +28,8 @@ public class Unsupported extends Binary { Long jdbcType; @Override - public Type getType() { - return Type.UNSUPPORTED; + public ColumnType getType() { + return ColumnType.UNSUPPORTED; } public Long getJdbcType() { http://git-wip-us.apache.org/repos/asf/sqoop/blob/fe5d615b/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/idf/CSVIntermediateDataFormat.java ---------------------------------------------------------------------- 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 e65edd9..1edbf4d 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 @@ -26,7 +26,7 @@ import org.apache.sqoop.schema.Schema; import org.apache.sqoop.schema.type.Column; import org.apache.sqoop.schema.type.FixedPoint; import org.apache.sqoop.schema.type.FloatingPoint; -import org.apache.sqoop.schema.type.Type; +import org.apache.sqoop.schema.type.ColumnType; import org.joda.time.LocalDate; import org.joda.time.LocalDateTime; @@ -104,9 +104,9 @@ public class CSVIntermediateDataFormat extends IntermediateDataFormat<String> { List<Column> columns = schema.getColumns(); int i = 0; for(Column col : columns) { - if(col.getType() == Type.TEXT) { + if(col.getType() == ColumnType.TEXT) { stringFieldIndices.add(i); - } else if(col.getType() == Type.BINARY) { + } else if(col.getType() == ColumnType.BINARY) { byteFieldIndices.add(i); } i++; @@ -190,7 +190,7 @@ public class CSVIntermediateDataFormat extends IntermediateDataFormat<String> { Object[] out = new Object[fields.length]; Column[] cols = schema.getColumns().toArray(new Column[fields.length]); for (int i = 0; i < fields.length; i++) { - Type colType = cols[i].getType(); + ColumnType colType = cols[i].getType(); if (fields[i].equals("NULL")) { out[i] = null; continue;
