From 7bd317ace4e2a181e127cbcceced7b968f1f40ce Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Fri, 30 Jun 2023 00:52:52 +0300 Subject: [PATCH] cql3: selection: reimplement selection::is_aggregate() We can get rid of the last use of selector_factories by reimplementing is_aggregate(). It's simple - if we have an inner loop, we're aggregating. --- cql3/selection/selection.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cql3/selection/selection.cc b/cql3/selection/selection.cc index d557f1be32..62e5c8412f 100644 --- a/cql3/selection/selection.cc +++ b/cql3/selection/selection.cc @@ -247,7 +247,7 @@ public: } virtual bool is_aggregate() const override { - return _factories->does_aggregation(); + return !_inner_loop.empty(); } virtual bool is_count() const override { @@ -373,7 +373,7 @@ protected: } virtual bool is_aggregate() const override { - return _factories->does_aggregation(); + return !_sel._inner_loop.empty(); } virtual std::vector transform_input_row(result_set_builder& rs) override {