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

gleb 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 85c81bd  [BEAM-7010] MAX/MIN(STRING)
     new a0c4650  Merge pull request #8230: [BEAM-7010] MAX/MIN(STRING)
85c81bd is described below

commit 85c81bdd85fe43f1e9f003f648ba70153c3726aa
Author: amaliujia <[email protected]>
AuthorDate: Thu Apr 4 15:50:07 2019 -0700

    [BEAM-7010] MAX/MIN(STRING)
---
 .../sdk/extensions/sql/impl/transform/BeamBuiltinAggregations.java   | 2 ++
 .../apache/beam/sdk/extensions/sql/BeamSqlDslAggregationTest.java    | 5 +++++
 2 files changed, 7 insertions(+)

diff --git 
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/BeamBuiltinAggregations.java
 
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/BeamBuiltinAggregations.java
index 200f58e..7799245 100644
--- 
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/BeamBuiltinAggregations.java
+++ 
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/BeamBuiltinAggregations.java
@@ -87,6 +87,7 @@ public class BeamBuiltinAggregations {
       case FLOAT:
       case DATETIME:
       case DECIMAL:
+      case STRING:
         return new CustMax<>();
       case INT32:
         return Max.ofIntegers();
@@ -112,6 +113,7 @@ public class BeamBuiltinAggregations {
       case FLOAT:
       case DATETIME:
       case DECIMAL:
+      case STRING:
         return new CustMin();
       case INT32:
         return Min.ofIntegers();
diff --git 
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslAggregationTest.java
 
b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslAggregationTest.java
index 67b8e51..983f91b 100644
--- 
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslAggregationTest.java
+++ 
b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslAggregationTest.java
@@ -165,6 +165,7 @@ public class BeamSqlDslAggregationTest extends 
BeamSqlDslBase {
             + "sum(f_double) as sum5, avg(f_double) as avg5, "
             + "max(f_double) as max5, min(f_double) as min5, "
             + "max(f_timestamp) as max6, min(f_timestamp) as min6, "
+            + "max(f_string) as max7, min(f_string) as min7, "
             + "var_pop(f_double) as varpop1, var_samp(f_double) as varsamp1, "
             + "var_pop(f_int) as varpop2, var_samp(f_int) as varsamp2 "
             + "FROM TABLE_A group by f_int2";
@@ -199,6 +200,8 @@ public class BeamSqlDslAggregationTest extends 
BeamSqlDslBase {
             .addDoubleField("min5")
             .addDateTimeField("max6")
             .addDateTimeField("min6")
+            .addStringField("max7")
+            .addStringField("min7")
             .addDoubleField("varpop1")
             .addDoubleField("varsamp1")
             .addInt32Field("varpop2")
@@ -232,6 +235,8 @@ public class BeamSqlDslAggregationTest extends 
BeamSqlDslBase {
                 1.0,
                 parseTimestampWithoutTimeZone("2017-01-01 02:04:03"),
                 parseTimestampWithoutTimeZone("2017-01-01 01:01:03"),
+                "第四行",
+                "string_row1",
                 1.25,
                 1.666666667,
                 1,

Reply via email to