[beam] 01/01: Merge pull request #6928 from amaliujia/rui_wang-add_string_functions

[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

commit f65b4850502137b2555574c4e73c91cacf38da48
Merge: 7f48e5a 139f4d1
Author: Anton Kedin <33067037+ake...@users.noreply.github.com>
AuthorDate: Thu Nov 8 17:01:26 2018 -0500

    Merge pull request #6928 from amaliujia/rui_wang-add_string_functions
    
    [BEAM-5852] BeamSQL functions

 .../interpreter/operator/BeamSqlPrimitive.java     |   1 +
 .../sql/impl/udf/BuiltinStringFunctions.java       | 302 +++++++++++++++++++++
 .../impl/udf/BuiltinTrigonometricFunctions.java    |   9 +
 .../extensions/sql/impl/utils/CalciteUtils.java    |   3 +
 .../beam/sdk/extensions/sql/BeamSqlDslBase.java    |  84 ++++++
 .../udf/BeamSalUhfSpecialTypeAndValueTest.java     | 170 ++++++++++++
 .../sql/impl/udf/BeamSqlUdfExpressionTest.java     | 202 ++++++++++++++
 .../sql/impl/udf/BeamSqlUdfImplTest.java           | 139 ----------
 ...BeamSqlBuiltinFunctionsIntegrationTestBase.java |   7 +
 9 files changed, 778 insertions(+), 139 deletions(-)

diff --cc 
sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/utils/CalciteUtils.java
index cd93166,f5c89a2..5c22314
--- 
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
@@@ -202,8 -203,10 +203,10 @@@ public class CalciteUtils 
     */
    public static RelDataType sqlTypeWithAutoCast(RelDataTypeFactory 
typeFactory, Type rawType) {
      //For Joda time types, return SQL type for java.util.Date.
 -    if (rawType instanceof Class && 
ReadableInstant.class.isAssignableFrom((Class<?>) rawType)) {
 +    if (rawType instanceof Class && 
AbstractInstant.class.isAssignableFrom((Class<?>) rawType)) {
        return typeFactory.createJavaType(Date.class);
+     } else if (rawType instanceof Class && 
ByteString.class.isAssignableFrom((Class<?>) rawType)) {
+       return typeFactory.createJavaType(byte[].class);
      }
      return typeFactory.createJavaType((Class) rawType);
    }