code revise

timeplus-io · Sep 2, 2024 · 3ae578d · 3ae578d
1 parent cceecdd
commit 3ae578d
Showing 1 changed file with 15 additions and 9 deletions.
diff --git a/src/AggregateFunctions/Streaming/AggregateFunctionDistinct.h b/src/AggregateFunctions/Streaming/AggregateFunctionDistinct.h
@@ -108,15 +108,12 @@ struct AggregateFunctionDistinctSingleNumericData
         {
             if (rhs.set.find(*it) != rhs.set.end())
             {
-                auto found = std::find(rhs.extra_data_since_last_finalize.begin(), rhs.extra_data_since_last_finalize.end(), *it);
-                if (found == rhs.extra_data_since_last_finalize.end())
-                {
-                    it = extra_data_since_last_finalize.erase(it);
-                }
-                else
-                {
+                bool is_new_data = std::find(rhs.extra_data_since_last_finalize.begin(), rhs.extra_data_since_last_finalize.end(), *it)
+                    != rhs.extra_data_since_last_finalize.end();
+                if (is_new_data)
                     ++it;
-                }
+                else
+                    it = extra_data_since_last_finalize.erase(it);
             }
             else
             {
@@ -188,9 +185,18 @@ struct AggregateFunctionDistinctGenericData
         for (auto next = extra_data_since_last_finalize.begin(); next != extra_data_since_last_finalize.end();)
         {
             if (rhs.set.find(*next) != rhs.set.end())
-                next = extra_data_since_last_finalize.erase(next);
+            {
+                bool is_new_data = std::find(rhs.extra_data_since_last_finalize.begin(), rhs.extra_data_since_last_finalize.end(), *next)
+                    != rhs.extra_data_since_last_finalize.end();
+                if (is_new_data)
+                    ++next;
+                else
+                    next = extra_data_since_last_finalize.erase(next);
+            }
             else
+            {
                 ++next;
+            }
         }
 
         /// Merge and deduplicate rhs' extra data