Merge pull request #2308 from mabel-dev/#2307

#2307
mabel-dev · Jan 25, 2025 · 4e39e9d · 4e39e9d
2 parents 03364d1 + 1a6022c
commit 4e39e9d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/opteryx/__version__.py b/opteryx/__version__.py
@@ -1,4 +1,4 @@
-__build__ = 1030
+__build__ = 1031
 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/opteryx/operators/aggregate_node.py b/opteryx/operators/aggregate_node.py
@@ -103,9 +103,11 @@ def build_aggregations(aggregators):
                 count_options = pyarrow.compute.CountOptions(mode="all")
             else:
                 field_name = field_node.schema_column.identity
+            if aggregator.value == "COUNT" and aggregator.duplicate_treatment == "Distinct":
+                aggregator.value = "COUNT_DISTINCT"
             function = AGGREGATORS[aggregator.value]
             # if the array agg is distinct, base off that function instead
-            if aggregator.value == "ARRAY_AGG" and aggregator.duplicate_treatment == "Distinct":
+             if aggregator.value == "ARRAY_AGG" and aggregator.duplicate_treatment == "Distinct":
                 function = "distinct"
             aggs.append((field_name, function, count_options))
             column_map[aggregator.schema_column.identity] = f"{field_name}_{function}".replace(