This is an automated email from the ASF dual-hosted git repository. kenn 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 2e41bbb [BEAM-7024] Calcite BINARY to Beam Schema BYTES missing in CalciteUtils new 3c74212 Merge pull request #8242: [BEAM-7024] Calcite BINARY to Beam Schema BYTES missing in CalciteUtils 2e41bbb is described below commit 2e41bbb1133e7c55a0289cc3d00a427668d4fa7b Author: amaliujia <amaliu...@gmail.com> AuthorDate: Fri Apr 5 15:40:07 2019 -0700 [BEAM-7024] Calcite BINARY to Beam Schema BYTES missing in CalciteUtils --- .../extensions/sql/impl/utils/CalciteUtils.java | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/utils/CalciteUtils.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/utils/CalciteUtils.java index 02eb1b5..207900f 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/utils/CalciteUtils.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/utils/CalciteUtils.java @@ -156,8 +156,26 @@ public class CalciteUtils { .put(TIMESTAMP_WITH_LOCAL_TZ, SqlTypeName.TIMESTAMP_WITH_LOCAL_TIME_ZONE) .build(); - private static final BiMap<SqlTypeName, FieldType> CALCITE_TO_BEAM_TYPE_MAPPING = - BEAM_TO_CALCITE_TYPE_MAPPING.inverse(); + private static final ImmutableMap<SqlTypeName, FieldType> CALCITE_TO_BEAM_TYPE_MAPPING = + ImmutableMap.<SqlTypeName, FieldType>builder() + .put(SqlTypeName.TINYINT, TINY_INT) + .put(SqlTypeName.SMALLINT, SMALL_INT) + .put(SqlTypeName.INTEGER, INTEGER) + .put(SqlTypeName.BIGINT, BIG_INT) + .put(SqlTypeName.FLOAT, FLOAT) + .put(SqlTypeName.DOUBLE, DOUBLE) + .put(SqlTypeName.DECIMAL, DECIMAL) + .put(SqlTypeName.BOOLEAN, BOOLEAN) + .put(SqlTypeName.VARBINARY, VARBINARY) + .put(SqlTypeName.BINARY, VARBINARY) + .put(SqlTypeName.VARCHAR, VARCHAR) + .put(SqlTypeName.CHAR, CHAR) + .put(SqlTypeName.DATE, DATE) + .put(SqlTypeName.TIME, TIME) + .put(SqlTypeName.TIME_WITH_LOCAL_TIME_ZONE, TIME_WITH_LOCAL_TZ) + .put(SqlTypeName.TIMESTAMP, TIMESTAMP) + .put(SqlTypeName.TIMESTAMP_WITH_LOCAL_TIME_ZONE, TIMESTAMP_WITH_LOCAL_TZ) + .build(); // Since there are multiple Calcite type that correspond to a single Beam type, this is the // default mapping.