From 14c206b1a3d6f3ae647886cbd778cc6a34cfc412 Mon Sep 17 00:00:00 2001 From: Sophie Atkins Date: Fri, 1 Dec 2023 18:54:01 +0100 Subject: [PATCH] fixed req-in-mem-distinct logic --- query-engine/query-structure/src/query_arguments.rs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/query-engine/query-structure/src/query_arguments.rs b/query-engine/query-structure/src/query_arguments.rs index 9553cc089e83..699f3c2879d7 100644 --- a/query-engine/query-structure/src/query_arguments.rs +++ b/query-engine/query-structure/src/query_arguments.rs @@ -76,8 +76,7 @@ impl QueryArguments { } pub fn requires_inmemory_distinct(&self) -> bool { - self.has_distinct() - && ((!self.has_distinct_capability() && !self.has_distincton_preview()) || self.has_orderby()) + !self.has_distincton_preview() || !self.has_distinct_capability() || self.has_orderby() } fn has_distincton_preview(&self) -> bool { @@ -97,10 +96,6 @@ impl QueryArguments { .has_capability(ConnectorCapability::DistinctOn) } - fn has_distinct(&self) -> bool { - self.distinct.is_some() - } - fn has_orderby(&self) -> bool { !self.order_by.is_empty() }