[beam] branch master updated: [SQL] Remove TYPE_ prefix from DataCatalogTableProvider

[anton]

This is an automated email from the ASF dual-hosted git repository.

anton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/master by this push:
     new 90677a1  [SQL] Remove TYPE_ prefix from DataCatalogTableProvider
     new 21700d7  Merge pull request #8520 from akedin/remove-type-prefix
90677a1 is described below

commit 90677a1b954a74fe1f19684556ac517feb271299
Author: akedin <ke...@google.com>
AuthorDate: Tue May 7 14:37:29 2019 -0700

    [SQL] Remove TYPE_ prefix from DataCatalogTableProvider
---
 .../sql/meta/provider/datacatalog/SchemaUtils.java | 28 ++++++++++------------
 .../beam/sdk/io/gcp/bigquery/BigQueryUtils.java    |  3 ++-
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git 
a/sdks/java/extensions/sql/datacatalog/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/datacatalog/SchemaUtils.java
 
b/sdks/java/extensions/sql/datacatalog/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/datacatalog/SchemaUtils.java
index c28c820..80a5ece 100644
--- 
a/sdks/java/extensions/sql/datacatalog/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/datacatalog/SchemaUtils.java
+++ 
b/sdks/java/extensions/sql/datacatalog/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/datacatalog/SchemaUtils.java
@@ -33,20 +33,18 @@ class SchemaUtils {
 
   private static final Map<String, FieldType> FIELD_TYPES =
       ImmutableMap.<String, FieldType>builder()
-          .put("TYPE_BOOL", FieldType.BOOLEAN)
-          .put("TYPE_BYTES", FieldType.BYTES)
-          .put("TYPE_DATE", FieldType.logicalType(new CalciteUtils.DateType()))
-          .put("TYPE_DATETIME", FieldType.DATETIME)
-          .put("TYPE_DOUBLE", FieldType.DOUBLE)
-          .put("TYPE_FLOAT", FieldType.DOUBLE)
-          .put("TYPE_INT32", FieldType.INT32)
-          .put("TYPE_INT64", FieldType.INT64)
-          .put("TYPE_STRING", FieldType.STRING)
-          .put("TYPE_TIME", FieldType.logicalType(new CalciteUtils.TimeType()))
-          .put("TYPE_TIMESTAMP", FieldType.DATETIME)
-          .put(
-              "TYPE_MAP<TYPE_STRING, TYPE_STRING>",
-              FieldType.map(FieldType.STRING, FieldType.STRING))
+          .put("BOOL", FieldType.BOOLEAN)
+          .put("BYTES", FieldType.BYTES)
+          .put("DATE", FieldType.logicalType(new CalciteUtils.DateType()))
+          .put("DATETIME", FieldType.DATETIME)
+          .put("DOUBLE", FieldType.DOUBLE)
+          .put("FLOAT", FieldType.DOUBLE)
+          .put("INT32", FieldType.INT32)
+          .put("INT64", FieldType.INT64)
+          .put("STRING", FieldType.STRING)
+          .put("TIME", FieldType.logicalType(new CalciteUtils.TimeType()))
+          .put("TIMESTAMP", FieldType.DATETIME)
+          .put("MAP<STRING, STRING>", FieldType.map(FieldType.STRING, 
FieldType.STRING))
           .build();
 
   /** Convert DataCatalog schema to Beam schema. */
@@ -87,7 +85,7 @@ class SchemaUtils {
       return FIELD_TYPES.get(dcFieldType);
     }
 
-    if ("TYPE_STRUCT".equals(dcFieldType)) {
+    if ("STRUCT".equals(dcFieldType)) {
       Schema structSchema = fromColumnsList(column.getSubcolumnsList());
       return FieldType.row(structSchema);
     }
diff --git 
a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryUtils.java
 
b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryUtils.java
index 2c1e138..bd1fda3 100644
--- 
a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryUtils.java
+++ 
b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryUtils.java
@@ -394,7 +394,8 @@ public class BigQueryUtils {
       case MAP:
         throw new RuntimeException("Does not support converting MAP type 
value");
       default:
-        throw new RuntimeException("Does not support converting unknown type 
value");
+        throw new RuntimeException(
+            "Does not support converting unknown type value: " + 
beamFieldTypeName);
     }
   }