[incubator-pinot] branch master updated: Enhance AggregationFunctionColumnPair to accept underscore in function name (#6079)

[jackie]

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

jackie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git


The following commit(s) were added to refs/heads/master by this push:
     new a8a6ab2  Enhance AggregationFunctionColumnPair to accept underscore in 
function name (#6079)
a8a6ab2 is described below

commit a8a6ab2f063da85f7483d0066d0af61e4d8ef915
Author: Xiaotian (Jackie) Jiang <17555551+jackie-ji...@users.noreply.github.com>
AuthorDate: Thu Oct 1 12:37:31 2020 -0700

    Enhance AggregationFunctionColumnPair to accept underscore in function name 
(#6079)
---
 .../core/startree/v2/AggregationFunctionColumnPair.java  |  2 +-
 .../startree/v2/AggregationFunctionColumnPairTest.java   | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git 
a/pinot-core/src/main/java/org/apache/pinot/core/startree/v2/AggregationFunctionColumnPair.java
 
b/pinot-core/src/main/java/org/apache/pinot/core/startree/v2/AggregationFunctionColumnPair.java
index 5224c6e..25a0130 100644
--- 
a/pinot-core/src/main/java/org/apache/pinot/core/startree/v2/AggregationFunctionColumnPair.java
+++ 
b/pinot-core/src/main/java/org/apache/pinot/core/startree/v2/AggregationFunctionColumnPair.java
@@ -57,7 +57,7 @@ public class AggregationFunctionColumnPair {
 
   public static AggregationFunctionColumnPair fromColumnName(String 
columnName) {
     String[] parts = columnName.split(DELIMITER, 2);
-    AggregationFunctionType functionType = 
AggregationFunctionType.valueOf(parts[0].toUpperCase());
+    AggregationFunctionType functionType = 
AggregationFunctionType.getAggregationFunctionType(parts[0]);
     if (functionType == AggregationFunctionType.COUNT) {
       return COUNT_STAR;
     } else {
diff --git 
a/pinot-core/src/test/java/org/apache/pinot/core/startree/v2/AggregationFunctionColumnPairTest.java
 
b/pinot-core/src/test/java/org/apache/pinot/core/startree/v2/AggregationFunctionColumnPairTest.java
index 793cb30..03b18d1 100644
--- 
a/pinot-core/src/test/java/org/apache/pinot/core/startree/v2/AggregationFunctionColumnPairTest.java
+++ 
b/pinot-core/src/test/java/org/apache/pinot/core/startree/v2/AggregationFunctionColumnPairTest.java
@@ -33,7 +33,7 @@ public class AggregationFunctionColumnPairTest {
     Assert.assertEquals(pair.getColumn(), AggregationFunctionColumnPair.STAR);
     String columnName = pair.toColumnName();
     Assert.assertEquals(columnName, "count__*");
-    AggregationFunctionColumnPair fromColumnName = 
AggregationFunctionColumnPair.fromColumnName(columnName);
+    AggregationFunctionColumnPair fromColumnName = 
AggregationFunctionColumnPair.fromColumnName("count__*");
     Assert.assertEquals(fromColumnName, pair);
     Assert.assertEquals(fromColumnName.hashCode(), pair.hashCode());
 
@@ -42,7 +42,7 @@ public class AggregationFunctionColumnPairTest {
     Assert.assertEquals(pair.getColumn(), COLUMN);
     columnName = pair.toColumnName();
     Assert.assertEquals(columnName, "min__column");
-    fromColumnName = AggregationFunctionColumnPair.fromColumnName(columnName);
+    fromColumnName = 
AggregationFunctionColumnPair.fromColumnName("MIN__column");
     Assert.assertEquals(fromColumnName, pair);
     Assert.assertEquals(fromColumnName.hashCode(), pair.hashCode());
 
@@ -51,7 +51,7 @@ public class AggregationFunctionColumnPairTest {
     Assert.assertEquals(pair.getColumn(), COLUMN);
     columnName = pair.toColumnName();
     Assert.assertEquals(columnName, "max__column");
-    fromColumnName = AggregationFunctionColumnPair.fromColumnName(columnName);
+    fromColumnName = 
AggregationFunctionColumnPair.fromColumnName("mAx__column");
     Assert.assertEquals(fromColumnName, pair);
     Assert.assertEquals(fromColumnName.hashCode(), pair.hashCode());
 
@@ -60,7 +60,7 @@ public class AggregationFunctionColumnPairTest {
     Assert.assertEquals(pair.getColumn(), COLUMN);
     columnName = pair.toColumnName();
     Assert.assertEquals(columnName, "sum__column");
-    fromColumnName = AggregationFunctionColumnPair.fromColumnName(columnName);
+    fromColumnName = 
AggregationFunctionColumnPair.fromColumnName("SuM__column");
     Assert.assertEquals(fromColumnName, pair);
     Assert.assertEquals(fromColumnName.hashCode(), pair.hashCode());
 
@@ -69,7 +69,7 @@ public class AggregationFunctionColumnPairTest {
     Assert.assertEquals(pair.getColumn(), COLUMN);
     columnName = pair.toColumnName();
     Assert.assertEquals(columnName, "distinctCountHLL__column");
-    fromColumnName = AggregationFunctionColumnPair.fromColumnName(columnName);
+    fromColumnName = 
AggregationFunctionColumnPair.fromColumnName("distinctCountHLL__column");
     Assert.assertEquals(fromColumnName, pair);
     Assert.assertEquals(fromColumnName.hashCode(), pair.hashCode());
 
@@ -78,7 +78,7 @@ public class AggregationFunctionColumnPairTest {
     Assert.assertEquals(pair.getColumn(), COLUMN);
     columnName = pair.toColumnName();
     Assert.assertEquals(columnName, "distinctCountRawHLL__column");
-    fromColumnName = AggregationFunctionColumnPair.fromColumnName(columnName);
+    fromColumnName = 
AggregationFunctionColumnPair.fromColumnName("distinct_count_raw_hll__column");
     Assert.assertEquals(fromColumnName, pair);
     Assert.assertEquals(fromColumnName.hashCode(), pair.hashCode());
 
@@ -87,7 +87,7 @@ public class AggregationFunctionColumnPairTest {
     Assert.assertEquals(pair.getColumn(), COLUMN);
     columnName = pair.toColumnName();
     Assert.assertEquals(columnName, "percentileEst__column");
-    fromColumnName = AggregationFunctionColumnPair.fromColumnName(columnName);
+    fromColumnName = 
AggregationFunctionColumnPair.fromColumnName("PERCENTILE_EST__column");
     Assert.assertEquals(fromColumnName, pair);
     Assert.assertEquals(fromColumnName.hashCode(), pair.hashCode());
 
@@ -96,7 +96,7 @@ public class AggregationFunctionColumnPairTest {
     Assert.assertEquals(pair.getColumn(), COLUMN);
     columnName = pair.toColumnName();
     Assert.assertEquals(columnName, "percentileTDigest__column");
-    fromColumnName = AggregationFunctionColumnPair.fromColumnName(columnName);
+    fromColumnName = 
AggregationFunctionColumnPair.fromColumnName("percentiletdigest__column");
     Assert.assertEquals(fromColumnName, pair);
     Assert.assertEquals(fromColumnName.hashCode(), pair.hashCode());
   }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org