Skip to content

Commit a6ab44f

Browse files
Ray Cromwellarcs-c3po
authored andcommitted
Remove batch container store ops flag
PiperOrigin-RevId: 363735592
1 parent 4237862 commit a6ab44f

File tree

3 files changed

+10
-36
lines changed

3 files changed

+10
-36
lines changed

java/arcs/core/storage/ReferenceModeStore.kt

Lines changed: 10 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -280,33 +280,17 @@ class ReferenceModeStore private constructor(
280280
is BridgingOperation.ClearSet -> clearAllEntitiesInBackingStore()
281281
}
282282

283-
if (BuildFlags.BATCH_CONTAINER_STORE_OPS) {
284-
containerOps.add(op.containerOp)
285-
upstreamOps.add(op.refModeOp)
286-
} else {
287-
containerStore.onProxyMessage(
288-
ProxyMessage.Operations(listOf(op.containerOp), containerStoreId)
289-
)
290-
sendQueue.enqueue {
291-
val upstream = listOf(op.refModeOp)
292-
callbacks.allCallbacksExcept(proxyMessage.id).forEach { callback ->
293-
callback(
294-
ProxyMessage.Operations(upstream, id = proxyMessage.id)
295-
)
296-
}
297-
}
298-
}
283+
containerOps.add(op.containerOp)
284+
upstreamOps.add(op.refModeOp)
299285
}
300-
if (BuildFlags.BATCH_CONTAINER_STORE_OPS) {
301-
containerStore.onProxyMessage(
302-
ProxyMessage.Operations(containerOps, containerStoreId)
303-
)
304-
sendQueue.enqueue {
305-
callbacks.allCallbacksExcept(proxyMessage.id).forEach { callback ->
306-
callback(
307-
ProxyMessage.Operations(upstreamOps, id = proxyMessage.id)
308-
)
309-
}
286+
containerStore.onProxyMessage(
287+
ProxyMessage.Operations(containerOps, containerStoreId)
288+
)
289+
sendQueue.enqueue {
290+
callbacks.allCallbacksExcept(proxyMessage.id).forEach { callback ->
291+
callback(
292+
ProxyMessage.Operations(upstreamOps, id = proxyMessage.id)
293+
)
310294
}
311295
}
312296
}

javatests/arcs/core/storage/ReferenceModeStoreTest.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ class ReferenceModeStoreTest(
4444
@get:Parameterized.Parameters(name = "{0}")
4545
val PARAMETERS = ParameterizedBuildFlags.of(
4646
"STORAGE_STRING_REDUCTION",
47-
"BATCH_CONTAINER_STORE_OPS",
4847
"REFERENCE_MODE_STORE_FIXES"
4948
)
5049
}

third_party/java/arcs/flags/flags.bzl

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,6 @@ ARCS_BUILD_FLAGS = [
9191
"DatabaseOp",
9292
],
9393
),
94-
arcs_build_flag(
95-
name = "batch_container_store_ops",
96-
bug_id = "b/182508100",
97-
desc = "Batch container store ops in ref mode store for improved performance.",
98-
status = "NOT_READY",
99-
stopwords = [
100-
"batch.?container.?store.?ops",
101-
],
102-
),
10394
arcs_build_flag(
10495
name = "reference_mode_store_fixes",
10596
desc = "Resolve several reference mode store bugs",

0 commit comments

Comments
 (0)