Replace boolean min/max with bool_and/bool_or

Also, add standard aggregation function 'every'.
prestodb · Jan 2, 2015 · 0816a2f · 0816a2f
1 parent 58a3c20
commit 0816a2f
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 21 deletions.
diff --git a/presto-docs/src/main/sphinx/functions/aggregate.rst b/presto-docs/src/main/sphinx/functions/aggregate.rst
@@ -21,6 +21,14 @@ General Aggregate Functions
 
     Returns the average (arithmetic mean) of all input values.
 
+.. function:: bool_and(boolean) -> boolean
+
+    Returns ``TRUE`` if every input value is ``TRUE``, otherwise ``FALSE``.
+
+.. function:: bool_or(boolean) -> boolean
+
+    Returns ``TRUE`` if any input value is ``TRUE``, otherwise ``FALSE``.
+
 .. function:: count(*) -> bigint
 
     Returns the number of input rows.
@@ -34,6 +42,10 @@ General Aggregate Functions
     Returns the number of ``TRUE`` input values.
     This function is equivalent to ``count(CASE WHEN x THEN 1 END)``.
 
+.. function:: every(boolean) -> boolean
+
+    This is an alias for :func:`bool_and`.
+
 .. function:: max_by(x, y) -> [same as x]
 
     Returns the value of ``x`` associated with the maximum value of ``y`` over all input values.

diff --git a/presto-docs/src/main/sphinx/release/release-0.90.rst b/presto-docs/src/main/sphinx/release/release-0.90.rst
@@ -2,12 +2,14 @@
 Release 0.90
 ============
 
-
 General Changes
 ---------------
 * Add ConnectorPageSink which is a more efficient interface for column-oriented sources.
 * Add property ``task.writer-count`` to configure the number of writers per task.
 * Added :doc:`/sql/set-session`, :doc:`/sql/reset-session` and :doc:`/sql/show-session`
+* Replace ``min(boolean)`` with :func:`bool_and`.
+* Replace ``max(boolean)`` with :func:`bool_or`.
+* Add standard SQL function :func:`every` as an alias for :func:`bool_and`.
 
 SPI Changes
 -----------

diff --git a/presto-main/src/main/java/com/facebook/presto/metadata/FunctionRegistry.java b/presto-main/src/main/java/com/facebook/presto/metadata/FunctionRegistry.java
@@ -22,8 +22,8 @@
 import com.facebook.presto.operator.aggregation.ApproximateSetAggregation;
 import com.facebook.presto.operator.aggregation.ApproximateSumAggregations;
 import com.facebook.presto.operator.aggregation.AverageAggregations;
-import com.facebook.presto.operator.aggregation.BooleanMaxAggregation;
-import com.facebook.presto.operator.aggregation.BooleanMinAggregation;
+import com.facebook.presto.operator.aggregation.BooleanOrAggregation;
+import com.facebook.presto.operator.aggregation.BooleanAndAggregation;
 import com.facebook.presto.operator.aggregation.CountAggregation;
 import com.facebook.presto.operator.aggregation.CountIfAggregation;
 import com.facebook.presto.operator.aggregation.DoubleMaxAggregation;
@@ -245,8 +245,8 @@ public FunctionRegistry(TypeManager typeManager, boolean experimentalSyntaxEnabl
                 .aggregate(ApproximateLongPercentileAggregations.class)
                 .aggregate(ApproximateDoublePercentileAggregations.class)
                 .aggregate(CountIfAggregation.class)
-                .aggregate(BooleanMinAggregation.class)
-                .aggregate(BooleanMaxAggregation.class)
+                .aggregate(BooleanAndAggregation.class)
+                .aggregate(BooleanOrAggregation.class)
                 .aggregate(DoubleMinAggregation.class)
                 .aggregate(DoubleMaxAggregation.class)
                 .aggregate(LongMinAggregation.class)

diff --git a/...or/aggregation/BooleanMinAggregation.java → ...or/aggregation/BooleanAndAggregation.java b/...or/aggregation/BooleanMinAggregation.java → ...or/aggregation/BooleanAndAggregation.java
@@ -21,21 +21,21 @@
 import static com.facebook.presto.operator.aggregation.state.TriStateBooleanState.NULL_VALUE;
 import static com.facebook.presto.operator.aggregation.state.TriStateBooleanState.TRUE_VALUE;
 
-@AggregationFunction("min")
-public final class BooleanMinAggregation
+@AggregationFunction(value = "bool_and", alias = "every")
+public final class BooleanAndAggregation
 {
-    private BooleanMinAggregation() {}
+    private BooleanAndAggregation() {}
 
     @InputFunction
     @IntermediateInputFunction
-    public static void min(TriStateBooleanState state, @SqlType(StandardTypes.BOOLEAN) boolean value)
+    public static void booleanAnd(TriStateBooleanState state, @SqlType(StandardTypes.BOOLEAN) boolean value)
     {
-        // if value is false, update the min to false
+        // if the value is false, the result is false
         if (!value) {
             state.setByte(FALSE_VALUE);
         }
         else {
-            // if the current value is null, set the min to true
+            // if the current value is unset, set result to true
             if (state.getByte() == NULL_VALUE) {
                 state.setByte(TRUE_VALUE);
             }

diff --git a/...or/aggregation/BooleanMaxAggregation.java → ...tor/aggregation/BooleanOrAggregation.java b/...or/aggregation/BooleanMaxAggregation.java → ...tor/aggregation/BooleanOrAggregation.java
@@ -21,21 +21,21 @@
 import static com.facebook.presto.operator.aggregation.state.TriStateBooleanState.NULL_VALUE;
 import static com.facebook.presto.operator.aggregation.state.TriStateBooleanState.TRUE_VALUE;
 
-@AggregationFunction("max")
-public final class BooleanMaxAggregation
+@AggregationFunction("bool_or")
+public final class BooleanOrAggregation
 {
-    private BooleanMaxAggregation() {}
+    private BooleanOrAggregation() {}
 
     @InputFunction
     @IntermediateInputFunction
-    public static void max(TriStateBooleanState state, @SqlType(StandardTypes.BOOLEAN) boolean value)
+    public static void booleanOr(TriStateBooleanState state, @SqlType(StandardTypes.BOOLEAN) boolean value)
     {
-        // if value is true, update the max to true
+        // if value is true, the result is true
         if (value) {
             state.setByte(TRUE_VALUE);
         }
         else {
-            // if the current value is null, set the max to false
+            // if the current value is unset, set result to false
             if (state.getByte() == NULL_VALUE) {
                 state.setByte(FALSE_VALUE);
             }

diff --git a/...ggregation/TestBooleanMinAggregation.java → ...ggregation/TestBooleanAndAggregation.java b/...ggregation/TestBooleanMinAggregation.java → ...ggregation/TestBooleanAndAggregation.java
@@ -25,7 +25,7 @@
 import static java.lang.Boolean.FALSE;
 import static java.lang.Boolean.TRUE;
 
-public class TestBooleanMinAggregation
+public class TestBooleanAndAggregation
         extends AbstractTestAggregationFunction
 {
     @Override
@@ -51,7 +51,7 @@ public Boolean getExpectedValue(int start, int length)
     @Override
     protected String getFunctionName()
     {
-        return "min";
+        return "bool_and";
     }
 
     @Override

diff --git a/...ggregation/TestBooleanMaxAggregation.java → ...aggregation/TestBooleanOrAggregation.java b/...ggregation/TestBooleanMaxAggregation.java → ...aggregation/TestBooleanOrAggregation.java
@@ -25,7 +25,7 @@
 import static java.lang.Boolean.FALSE;
 import static java.lang.Boolean.TRUE;
 
-public class TestBooleanMaxAggregation
+public class TestBooleanOrAggregation
         extends AbstractTestAggregationFunction
 {
     @Override
@@ -51,7 +51,7 @@ public Boolean getExpectedValue(int start, int length)
     @Override
     protected String getFunctionName()
     {
-        return "max";
+        return "bool_or";
     }
 
     @Override