Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove batch container store ops flag #7010

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove batch container store ops flag #7010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 10 additions & 26 deletions java/arcs/core/storage/ReferenceModeStore.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
)
}
}
}
Expand Down
1 change: 0 additions & 1 deletion javatests/arcs/core/storage/ReferenceModeStoreTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
}
Expand Down
9 changes: 0 additions & 9 deletions third_party/java/arcs/flags/flags.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down