java: fix error message when attempting to import Parquet TIMESTAMP The code was comparing a Parquet type object to a javax.sql Timestamp type enum. This would never be true, so the code was dead. This fixes it to do the appropriate comparison.
Change-Id: Ib961d5372c0d8afc436317dc7c63738860612700 Reviewed-on: http://gerrit.cloudera.org:8080/10194 Reviewed-by: Grant Henke <[email protected]> Tested-by: Kudu Jenkins Project: http://git-wip-us.apache.org/repos/asf/kudu/repo Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/4969989f Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/4969989f Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/4969989f Branch: refs/heads/master Commit: 4969989fd0cc02c26993c6a897bd274833800a5c Parents: 597b907 Author: Todd Lipcon <[email protected]> Authored: Wed Apr 25 11:33:18 2018 -0700 Committer: Todd Lipcon <[email protected]> Committed: Thu Apr 26 22:18:20 2018 +0000 ---------------------------------------------------------------------- .../org/apache/kudu/mapreduce/tools/ImportParquet.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kudu/blob/4969989f/java/kudu-client-tools/src/main/java/org/apache/kudu/mapreduce/tools/ImportParquet.java ---------------------------------------------------------------------- diff --git a/java/kudu-client-tools/src/main/java/org/apache/kudu/mapreduce/tools/ImportParquet.java b/java/kudu-client-tools/src/main/java/org/apache/kudu/mapreduce/tools/ImportParquet.java index 1a02c5a..386a5a1 100644 --- a/java/kudu-client-tools/src/main/java/org/apache/kudu/mapreduce/tools/ImportParquet.java +++ b/java/kudu-client-tools/src/main/java/org/apache/kudu/mapreduce/tools/ImportParquet.java @@ -17,8 +17,6 @@ package org.apache.kudu.mapreduce.tools; -import static java.sql.Types.TIMESTAMP; - import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; @@ -38,6 +36,7 @@ import org.apache.parquet.hadoop.ParquetInputFormat; import org.apache.parquet.hadoop.example.GroupWriteSupport; import org.apache.parquet.schema.MessageType; import org.apache.parquet.schema.PrimitiveType; +import org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName; import org.apache.yetus.audience.InterfaceAudience; import org.apache.yetus.audience.InterfaceStability; @@ -111,9 +110,10 @@ public class ImportParquet extends Configured implements Tool { // Kudu doesn't support Parquet's TIMESTAMP. Iterator<ColumnDescriptor> fields = schema.getColumns().iterator(); while (fields.hasNext()) { - if (fields.next().getType().equals(TIMESTAMP)) { - throw new IllegalArgumentException("This " + fields.next().getType() + - " Parquet type is not supported in Kudu"); + ColumnDescriptor colDesc = fields.next(); + if (colDesc.getType().equals(PrimitiveTypeName.INT96)) { + throw new IllegalArgumentException("Column type not supported in Kudu: " + + colDesc); } }
