Fix addRule for large number of categories (#4779)

bloomberg · Jun 5, 2024 · 3542892 · 3542892
1 parent 569c465
commit 3542892
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 0 deletions.
diff --git a/groups/bal/ball/ball_categorymanager.cpp b/groups/bal/ball/ball_categorymanager.cpp
@@ -221,6 +221,7 @@ void CategoryManager::privateApplyRulesToAllCategories(
             done = (remaining == batch);
             cachedCategories.assign(d_categories.begin() + offset,
                                     d_categories.begin() + offset + batch);
+            offset += batch;
         }
         {
             bslmt::LockGuard<bslmt::Mutex> guard(&d_ruleSetMutex);

diff --git a/groups/bal/ball/ball_categorymanager.t.cpp b/groups/bal/ball/ball_categorymanager.t.cpp
@@ -1174,6 +1174,32 @@ int main(int argc, char *argv[])
             }
             mX.removeAllRules();
         }
+
+        if (verbose) {
+            cout << "\tTest updating a large number of categories with a rule."
+                 << endl;
+        }
+        {
+
+            Obj mX(&ta);
+
+            // Adding a rule with  4K+ categories; DRQS 175529764
+            for (int j = 0; j < 4096*2; ++j) {
+                bsl::stringstream categoryPattern;
+                categoryPattern << "Category" << j;
+
+                bsl::string categoryName = categoryPattern.str();
+
+                const Entry *C = mX.addCategory(categoryName.c_str(),
+                                                255, 255, 255, 255);
+                ASSERT(C == mX.lookupCategory(categoryName.c_str()));
+            }
+
+            ball::Rule rule("C", 1, 2, 3, 4);
+            ASSERT(1 == mX.addRule(rule));
+
+            mX.removeAllRules();
+        }
       } break;
       case 11: {
         // --------------------------------------------------------------------