reject ApproxCountDistinct with DISTINCT

Signed-off-by: Richard Chien <stdrc@outlook.com>
risingwavelabs · Jul 10, 2023 · 0ce444f · 0ce444f
1 parent 09dc684
commit 0ce444f
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/src/frontend/src/binder/expr/function.rs b/src/frontend/src/binder/expr/function.rs
@@ -336,15 +336,6 @@ impl Binder {
             .map(|arg| self.bind_function_arg(arg.clone()))
             .flatten_ok()
             .try_collect()?;
-
-        if f.distinct && args.is_empty() {
-            return Err(ErrorCode::InvalidInputSyntax(format!(
-                "DISTINCT is not allowed for aggregate function `{}` without args",
-                kind
-            ))
-            .into());
-        }
-
         let order_by = OrderBy::new(
             f.order_by
                 .into_iter()
@@ -353,6 +344,14 @@ impl Binder {
         );
 
         if f.distinct {
+            if kind == AggKind::ApproxCountDistinct {
+                return Err(ErrorCode::InvalidInputSyntax(format!(
+                    "DISTINCT is not allowed for approximate aggregation `{}`",
+                    kind
+                ))
+                .into());
+            }
+
             if args.is_empty() {
                 return Err(ErrorCode::InvalidInputSyntax(format!(
                     "DISTINCT is not allowed for aggregate function `{}` without args",