Merge pull request #26557 from amosbird/groupbitmaporfix

Fix wrong name of groupBitmapAnd/Or/Xor.
ClickHouse · Jul 20, 2021 · 0304cf2 · 0304cf2
2 parents 7745905 + 9fdae29
commit 0304cf2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/src/AggregateFunctions/AggregateFunctionGroupBitmap.h b/src/AggregateFunctions/AggregateFunctionGroupBitmap.h
@@ -60,7 +60,7 @@ class AggregateFunctionBitmapL2 final : public IAggregateFunctionDataHelper<Data
     {
     }
 
-    String getName() const override { return Data::name(); }
+    String getName() const override { return Policy::name; }
 
     DataTypePtr getReturnType() const override { return std::make_shared<DataTypeNumber<T>>(); }
 
@@ -120,20 +120,23 @@ template <typename Data>
 class BitmapAndPolicy
 {
 public:
+    static constexpr auto name = "groupBitmapAnd";
     static void apply(Data & lhs, const Data & rhs) { lhs.rbs.rb_and(rhs.rbs); }
 };
 
 template <typename Data>
 class BitmapOrPolicy
 {
 public:
+    static constexpr auto name = "groupBitmapOr";
     static void apply(Data & lhs, const Data & rhs) { lhs.rbs.rb_or(rhs.rbs); }
 };
 
 template <typename Data>
 class BitmapXorPolicy
 {
 public:
+    static constexpr auto name = "groupBitmapXor";
     static void apply(Data & lhs, const Data & rhs) { lhs.rbs.rb_xor(rhs.rbs); }
 };
 

diff --git a/tests/queries/0_stateless/01948_group_bitmap_and_or_xor_fix.reference b/tests/queries/0_stateless/01948_group_bitmap_and_or_xor_fix.reference
@@ -0,0 +1 @@
+1	1	0
diff --git a/tests/queries/0_stateless/01948_group_bitmap_and_or_xor_fix.sql b/tests/queries/0_stateless/01948_group_bitmap_and_or_xor_fix.sql
@@ -0,0 +1 @@
+SELECT groupBitmapAnd(bitmapBuild([toInt32(1)])), groupBitmapOr(bitmapBuild([toInt32(1)])), groupBitmapXor(bitmapBuild([toInt32(1)])) FROM cluster(test_cluster_two_shards, numbers(10));