@@ -88,25 +88,53 @@ class CollectionsKVStoreTestBase : public KVStoreBackend, public KVStoreTest {
8888
8989 void applyEvents (TransactionContext& txnCtx,
9090 VB::Commit& commitData,
91- const CollectionsManifest& cm) {
91+ const CollectionsManifest& cm,
92+ bool writeEventNow = true ) {
9293 manifest.update (*vbucket, makeManifest (cm));
9394
9495 std::vector<queued_item> events;
9596 getEventsFromCheckpoint (events);
9697
9798 for (auto & ev : events) {
9899 commitData.collections .recordSystemEvent (*ev);
100+ if (writeEventNow) {
101+ if (ev->isDeleted ()) {
102+ kvstore->delSystemEvent (txnCtx, ev);
103+ } else {
104+ kvstore->setSystemEvent (txnCtx, ev);
105+ }
106+ }
107+ }
108+ if (!writeEventNow) {
109+ std::move (events.begin (),
110+ events.end (),
111+ std::back_inserter (allEvents));
112+ }
113+ }
114+
115+ void applyEvents (TransactionContext& txnCtx,
116+ const CollectionsManifest& cm,
117+ bool writeEventNow = true ) {
118+ return applyEvents (txnCtx, flush, cm, writeEventNow);
119+ }
120+
121+ // This function is to be used in conjunction with applyEvents when
122+ // writeEventNow=false allowing a test to better emulate the flusher and
123+ // write keys in a sorted batch. Tests can applyEvents so that collection
124+ // metadata management does updates, but defer the system event writing
125+ // until ready to commit
126+ void sortAndWriteAllEvents (TransactionContext& txnCtx) {
127+ std::sort (allEvents.begin (),
128+ allEvents.end (),
129+ OrderItemsForDeDuplication{});
130+ for (auto & ev : allEvents) {
99131 if (ev->isDeleted ()) {
100132 kvstore->delSystemEvent (txnCtx, ev);
101133 } else {
102134 kvstore->setSystemEvent (txnCtx, ev);
103135 }
104136 }
105- }
106-
107- void applyEvents (TransactionContext& txnCtx,
108- const CollectionsManifest& cm) {
109- applyEvents (txnCtx, flush, cm);
137+ allEvents.clear ();
110138 }
111139
112140 void checkUid (const Collections::KVStore::Manifest& md,
@@ -219,7 +247,8 @@ class CollectionsKVStoreTestBase : public KVStoreBackend, public KVStoreTest {
219247 VB::Commit commitData (manifest);
220248 auto ctx = kvstore->begin (vbucket->getId (),
221249 std::make_unique<PersistenceCallback>());
222- applyEvents (*ctx, commitData, cm);
250+ applyEvents (*ctx, commitData, cm, false );
251+ sortAndWriteAllEvents (*ctx);
223252 kvstore->commit (std::move (ctx), commitData);
224253 auto [status, md] = kvstore->getCollectionsManifest (Vbid (0 ));
225254 EXPECT_TRUE (status);
@@ -235,6 +264,7 @@ class CollectionsKVStoreTestBase : public KVStoreBackend, public KVStoreTest {
235264 VBucketPtr vbucket;
236265 WriteCallback wc;
237266 DeleteCallback dc;
267+ std::vector<queued_item> allEvents;
238268};
239269
240270class CollectionsKVStoreTest
@@ -578,19 +608,21 @@ class CollectionRessurectionKVStoreTest
578608 auto ctx = kvstore->begin (vbucket->getId (),
579609 std::make_unique<PersistenceCallback>());
580610 cm.add (targetScope);
581- applyEvents (*ctx, cm);
611+ applyEvents (*ctx, cm, false );
582612 cm.add (target, targetScope);
583- applyEvents (*ctx, cm);
613+ applyEvents (*ctx, cm, false );
614+ sortAndWriteAllEvents (*ctx);
584615 kvstore->commit (std::move (ctx), flush);
585616 }
586617
587618 // runs a flush batch that will leave the target collection in dropped state
588619 void dropScope () {
589620 openScopeOpenCollection ();
590- cm.remove (targetScope);
591621 auto ctx = kvstore->begin (vbucket->getId (),
592622 std::make_unique<PersistenceCallback>());
593- applyEvents (*ctx, cm);
623+ cm.remove (targetScope);
624+ applyEvents (*ctx, cm, false );
625+ sortAndWriteAllEvents (*ctx);
594626 kvstore->commit (std::move (ctx), flush);
595627 }
596628
@@ -704,9 +736,9 @@ void CollectionRessurectionKVStoreTest::resurectionScopesTest() {
704736 std::make_unique<PersistenceCallback>());
705737 if (!cm.exists (targetScope)) {
706738 cm.add (targetScope);
707- applyEvents (*ctx, cm);
739+ applyEvents (*ctx, cm, false );
708740 cm.add (target, targetScope);
709- applyEvents (*ctx, cm);
741+ applyEvents (*ctx, cm, false );
710742 }
711743
712744 std::string expectedName = target.name ;
@@ -715,22 +747,23 @@ void CollectionRessurectionKVStoreTest::resurectionScopesTest() {
715747 // iterate cycles of remove/add
716748 for (int ii = 0 ; ii < getCycles (); ii++) {
717749 cm.remove (scope);
718- applyEvents (*ctx, cm);
719-
750+ applyEvents (*ctx, cm, false );
720751 if (resurectWithNewName ()) {
721752 expectedName = target.name + " _" std::to_string (ii);
722753 scope.name = targetScope.name + " _" std::to_string (ii);
723754 }
724755 cm.add (scope);
725- applyEvents (*ctx, cm);
756+ applyEvents (*ctx, cm, false );
726757 cm.add ({expectedName, target.uid }, scope);
727- applyEvents (*ctx, cm);
758+ applyEvents (*ctx, cm, false );
728759 }
729760
730761 if (dropCollectionAtEnd ()) {
731762 cm.remove (scope);
732- applyEvents (*ctx, cm);
763+ applyEvents (*ctx, cm, false );
733764 }
765+
766+ sortAndWriteAllEvents (*ctx);
734767 kvstore->commit (std::move (ctx), flush);
735768
736769 // Now validate
0 commit comments