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.

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

DPP-650 Remove the mutating schema #11211

Merged
merged 9 commits into from
Oct 21, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ client_server_build(
"--ledgerid=lf16-export-ledger",
"--port=0",
"--port-file=%PORT_FILE%",
"--enable-append-only-schema",
],
server_files = ["lf16.build"],
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ client_server_build(
server_args = [
"--port=0",
"--port-file=%PORT_FILE%",
"--enable-append-only-schema",
],
server_files = ["//daml-script/test:script-test.dar"],
)
Expand Down
1 change: 0 additions & 1 deletion ledger/daml-on-sql/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ conformance_test(
"--ledgerid=conformance-test",
"--port=6865",
"--eager-package-loading",
"--enable-append-only-schema",
],
test_tool_args = [
"--verbose",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ object Config {
participantId = Ref.ParticipantId.assertFromString("IndexerBenchmarkParticipant"),
jdbcUrl = "",
startupMode = IndexerStartupMode.MigrateAndStart,
enableAppendOnlySchema = true,
),
waitForUserInput = false,
minUpdateRate = None,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import com.daml.lf.data.Time
import com.daml.logging.LoggingContext
import com.daml.logging.LoggingContext.newLoggingContext
import com.daml.metrics.{JvmMetricSet, Metrics}
import com.daml.platform.configuration.ServerRole
import com.daml.platform.indexer.{JdbcIndexer, StandaloneIndexerServer}
import com.daml.platform.store.LfValueTranslationCache
import com.daml.testing.postgresql.PostgresResource
Expand Down Expand Up @@ -70,7 +69,6 @@ class IndexerBenchmark() {
println("Creating read service and indexer...")
val readService = createReadService(updates)
val indexerFactory = new JdbcIndexer.Factory(
ServerRole.Indexer,
config.indexerConfig,
readService,
indexerEC,
Expand All @@ -91,8 +89,7 @@ class IndexerBenchmark() {
.result(
StandaloneIndexerServer
.migrateOnly(
jdbcUrl = config.indexerConfig.jdbcUrl,
enableAppendOnlySchema = config.indexerConfig.enableAppendOnlySchema,
jdbcUrl = config.indexerConfig.jdbcUrl
)
.map(_ => indexerFactory.initialized())(indexerEC),
Duration(5, "minute"),
Expand Down Expand Up @@ -135,7 +132,6 @@ class IndexerBenchmark() {
| jdbcUrl: ${config.indexerConfig.jdbcUrl}
|
|Indexer parameters:
| enableAppendOnlySchema: ${config.indexerConfig.enableAppendOnlySchema}
| maxInputBufferSize: ${config.indexerConfig.maxInputBufferSize}
| inputMappingParallelism: ${config.indexerConfig.inputMappingParallelism}
| ingestionParallelism: ${config.indexerConfig.ingestionParallelism}
Expand Down
5 changes: 0 additions & 5 deletions ledger/ledger-on-memory/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,6 @@ conformance_test(
"--contract-id-seeding=testing-weak",
"--participant=participant-id=example,port=6865",
"--max-deduplication-duration=PT5S",
"--index-append-only-schema",
"--mutable-contract-state-cache",
],
test_tool_args = [
Expand Down Expand Up @@ -175,7 +174,6 @@ conformance_test(
"--participant=participant-id=example,port=6865",
"--daml-lf-min-version-1.14-unsafe",
"--max-deduplication-duration=PT5S",
"--index-append-only-schema",
"--mutable-contract-state-cache",
],
test_tool_args = [
Expand All @@ -195,7 +193,6 @@ conformance_test(
server = ":app",
server_args = [
"--contract-id-seeding=testing-weak",
"--index-append-only-schema",
"--mutable-contract-state-cache",
"--participant=participant-id=example1,port=6865",
"--participant=participant-id=example2,port=6866",
Expand Down Expand Up @@ -223,7 +220,6 @@ conformance_test(
server = ":app",
server_args = [
"--contract-id-seeding=testing-weak",
"--index-append-only-schema",
"--mutable-contract-state-cache",
"--participant=participant-id=split-example,port=6865,server-jdbc-url=jdbc:h2:mem:split-example;db_close_delay=-1;db_close_on_exit=false,shard-name=server1,run-mode=ledger-api-server",
"--participant=participant-id=split-example,port=6865,server-jdbc-url=jdbc:h2:mem:split-example;db_close_delay=-1;db_close_on_exit=false,shard-name=indexer,run-mode=indexer",
Expand All @@ -250,7 +246,6 @@ conformance_test(
server_args = [
"--contract-id-seeding=testing-weak",
"--participant=participant-id=example,port=6865",
"--index-append-only-schema",
"--mutable-contract-state-cache",
],
test_tool_args = [
Expand Down
10 changes: 1 addition & 9 deletions ledger/ledger-on-sql/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,6 @@ da_scala_test_suite(
"--contract-id-seeding=testing-weak",
"--participant participant-id=conformance-test,port=6865",
"--max-deduplication-duration=PT5S",
"--index-append-only-schema",
"--mutable-contract-state-cache",
] + db.get("conformance_test_server_args", []),
tags = db.get("conformance_test_tags", []),
Expand All @@ -279,7 +278,6 @@ da_scala_test_suite(
server_args = [
"--contract-id-seeding=testing-weak",
"--participant participant-id=example,port=6865",
"--index-append-only-schema",
"--mutable-contract-state-cache",
] + db.get("conformance_test_server_args", []),
tags = db.get("benchmark_performance_envelope_tags", []),
Expand Down Expand Up @@ -315,7 +313,6 @@ conformance_test(
server_args = [
"--contract-id-seeding=testing-weak",
"--participant participant-id=conformance-test,port=6865,contract-state-cache-max-size=1,contract-key-state-cache-max-size=1",
"--index-append-only-schema",
"--mutable-contract-state-cache",
"--max-deduplication-duration=PT5S",
],
Expand All @@ -342,7 +339,6 @@ conformance_test(
server_args = [
"--contract-id-seeding=testing-weak",
"--participant participant-id=conformance-test,port=6865,contract-state-cache-max-size=1,contract-key-state-cache-max-size=1",
"--index-append-only-schema",
"--mutable-contract-state-cache",
"--jdbc-url=jdbc:h2:mem:daml-on-sql-conformance-test",
"--max-deduplication-duration=PT5S",
Expand Down Expand Up @@ -370,7 +366,6 @@ conformance_test(
server_args = [
"--contract-id-seeding=testing-weak",
"--participant participant-id=conformance-test,port=6865,contract-state-cache-max-size=1,contract-key-state-cache-max-size=1",
"--index-append-only-schema",
"--mutable-contract-state-cache",
"--max-deduplication-duration=PT5S",
],
Expand All @@ -397,7 +392,6 @@ conformance_test(
server_args = [
"--contract-id-seeding=testing-weak",
"--participant participant-id=conformance-test,port=6865,contract-state-cache-max-size=1,contract-key-state-cache-max-size=1,ledger-api-transactions-buffer-max-size=10",
"--index-append-only-schema",
"--mutable-contract-state-cache",
"--buffered-ledger-api-streams-unsafe",
"--max-deduplication-duration=PT5S",
Expand All @@ -419,13 +413,12 @@ conformance_test(

# Feature test: --buffered-ledger-api-streams-unsafe (in-memory fan-out) (Oracle)
conformance_test(
name = "conformance-test-append-only-in-memory-fan-out-oracle",
name = "conformance-test-in-memory-fan-out-oracle",
ports = [6865],
server = ":conformance-test-oracle-bin",
server_args = [
"--contract-id-seeding=testing-weak",
"--participant participant-id=conformance-test,port=6865,contract-state-cache-max-size=1,contract-key-state-cache-max-size=1,ledger-api-transactions-buffer-max-size=10",
"--index-append-only-schema",
"--mutable-contract-state-cache",
"--buffered-ledger-api-streams-unsafe",
"--max-deduplication-duration=PT5S",
Expand Down Expand Up @@ -455,7 +448,6 @@ conformance_test(
server_args = [
"--contract-id-seeding=testing-weak",
"--participant participant-id=conformance-test,port=6865,contract-state-cache-max-size=1,contract-key-state-cache-max-size=1",
"--index-append-only-schema",
"--mutable-contract-state-cache",
"--jdbc-url=jdbc:h2:mem:daml-on-sql-conformance-test",
],
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading