Merge pull request #328 from cloudflare/bcaimano/actor-cache-delete-flush-bug

bcaimano · web-flow · commit 0c632bc86c3e · 2023-01-30T15:54:06.000-05:00
Bugfix: Assert upon counted deletes not muted deletes in actor cache …
diff --git a/src/workerd/io/actor-cache.c++ b/src/workerd/io/actor-cache.c++
@@ -2645,7 +2645,7 @@ kj::Promise<void> ActorCache::flushImplUsingTxn(
       auto request = txn.deleteRequest(capnp::MessageSize { 4 + batch.wordCount, 0 });
       auto listBuilder = request.initKeys(batch.pairCount);
       for (size_t i = 0; i < batch.pairCount; ++i) {
-        KJ_ASSERT(entryIt != mutedDeleteFlush.entries.end());
+        KJ_ASSERT(entryIt != flush.entries.end());
         auto& entry = **(entryIt++);
         listBuilder.set(i, entry.key.asBytes());
       }

Original file line number	Diff line number	Diff line change
`@@ -2645,7 +2645,7 @@ kj::Promise<void> ActorCache::flushImplUsingTxn(`
`2645`	`2645`	`auto request = txn.deleteRequest(capnp::MessageSize { 4 + batch.wordCount, 0 });`
`2646`	`2646`	`auto listBuilder = request.initKeys(batch.pairCount);`
`2647`	`2647`	`for (size_t i = 0; i < batch.pairCount; ++i) {`
`2648`		`- KJ_ASSERT(entryIt != mutedDeleteFlush.entries.end());`
	`2648`	`+ KJ_ASSERT(entryIt != flush.entries.end());`
`2649`	`2649`	`auto& entry = **(entryIt++);`
`2650`	`2650`	`listBuilder.set(i, entry.key.asBytes());`
`2651`	`2651`	`}`