From 19d486096bcb37993e6a34c3e8777780b5a42fe1 Mon Sep 17 00:00:00 2001
From: Ray Cromwell <cromwellian@google.com>
Date: Thu, 18 Mar 2021 13:43:08 -0700
Subject: [PATCH] Remove batch container store ops flag

PiperOrigin-RevId: 363735592
---
 java/arcs/core/storage/ReferenceModeStore.kt  | 36 ++++++-------------
 .../core/storage/ReferenceModeStoreTest.kt    |  1 -
 third_party/java/arcs/flags/flags.bzl         |  9 -----
 3 files changed, 10 insertions(+), 36 deletions(-)

diff --git a/java/arcs/core/storage/ReferenceModeStore.kt b/java/arcs/core/storage/ReferenceModeStore.kt
index 69218397368..3a1994aacf4 100644
--- a/java/arcs/core/storage/ReferenceModeStore.kt
+++ b/java/arcs/core/storage/ReferenceModeStore.kt
@@ -280,33 +280,17 @@ class ReferenceModeStore private constructor(
             is BridgingOperation.ClearSet -> clearAllEntitiesInBackingStore()
           }
 
-          if (BuildFlags.BATCH_CONTAINER_STORE_OPS) {
-            containerOps.add(op.containerOp)
-            upstreamOps.add(op.refModeOp)
-          } else {
-            containerStore.onProxyMessage(
-              ProxyMessage.Operations(listOf(op.containerOp), containerStoreId)
-            )
-            sendQueue.enqueue {
-              val upstream = listOf(op.refModeOp)
-              callbacks.allCallbacksExcept(proxyMessage.id).forEach { callback ->
-                callback(
-                  ProxyMessage.Operations(upstream, id = proxyMessage.id)
-                )
-              }
-            }
-          }
+          containerOps.add(op.containerOp)
+          upstreamOps.add(op.refModeOp)
         }
-        if (BuildFlags.BATCH_CONTAINER_STORE_OPS) {
-          containerStore.onProxyMessage(
-            ProxyMessage.Operations(containerOps, containerStoreId)
-          )
-          sendQueue.enqueue {
-            callbacks.allCallbacksExcept(proxyMessage.id).forEach { callback ->
-              callback(
-                ProxyMessage.Operations(upstreamOps, id = proxyMessage.id)
-              )
-            }
+        containerStore.onProxyMessage(
+          ProxyMessage.Operations(containerOps, containerStoreId)
+        )
+        sendQueue.enqueue {
+          callbacks.allCallbacksExcept(proxyMessage.id).forEach { callback ->
+            callback(
+              ProxyMessage.Operations(upstreamOps, id = proxyMessage.id)
+            )
           }
         }
       }
diff --git a/javatests/arcs/core/storage/ReferenceModeStoreTest.kt b/javatests/arcs/core/storage/ReferenceModeStoreTest.kt
index 49ba5059645..baf4cfbfe0f 100644
--- a/javatests/arcs/core/storage/ReferenceModeStoreTest.kt
+++ b/javatests/arcs/core/storage/ReferenceModeStoreTest.kt
@@ -44,7 +44,6 @@ class ReferenceModeStoreTest(
     @get:Parameterized.Parameters(name = "{0}")
     val PARAMETERS = ParameterizedBuildFlags.of(
       "STORAGE_STRING_REDUCTION",
-      "BATCH_CONTAINER_STORE_OPS",
       "REFERENCE_MODE_STORE_FIXES"
     )
   }
diff --git a/third_party/java/arcs/flags/flags.bzl b/third_party/java/arcs/flags/flags.bzl
index dc1940a44ce..e16ef691b81 100644
--- a/third_party/java/arcs/flags/flags.bzl
+++ b/third_party/java/arcs/flags/flags.bzl
@@ -91,15 +91,6 @@ ARCS_BUILD_FLAGS = [
             "DatabaseOp",
         ],
     ),
-    arcs_build_flag(
-        name = "batch_container_store_ops",
-        bug_id = "b/182508100",
-        desc = "Batch container store ops in ref mode store for improved performance.",
-        status = "NOT_READY",
-        stopwords = [
-            "batch.?container.?store.?ops",
-        ],
-    ),
     arcs_build_flag(
         name = "reference_mode_store_fixes",
         desc = "Resolve several reference mode store bugs",