From e93f93e68cc692325aff0f39007ccd7a664918bb Mon Sep 17 00:00:00 2001 From: Mitsunori Komatsu Date: Tue, 18 Jun 2024 18:45:18 +0900 Subject: [PATCH 1/3] Reduce the # of concurrent DDL to 3 for Cosmos DB --- .../cosmos/CosmosCrossPartitionScanIntegrationTest.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosCrossPartitionScanIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosCrossPartitionScanIntegrationTest.java index bdfe5aeeef..d7a59518e4 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosCrossPartitionScanIntegrationTest.java +++ b/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosCrossPartitionScanIntegrationTest.java @@ -27,6 +27,11 @@ protected Map getCreationOptions() { return CosmosEnv.getCreationOptions(); } + @Override + protected int getThreadNum() { + return 3; + } + @Test @Override @Disabled("Cross partition scan with ordering is not supported in Cosmos DB") From 93c536c085acaa3f7d7f141ff033dda735b1b29f Mon Sep 17 00:00:00 2001 From: Mitsunori Komatsu Date: Tue, 18 Jun 2024 19:47:49 +0900 Subject: [PATCH 2/3] Less concurrency --- .../storage/cosmos/CosmosCrossPartitionScanIntegrationTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosCrossPartitionScanIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosCrossPartitionScanIntegrationTest.java index d7a59518e4..f8dca0b0ca 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosCrossPartitionScanIntegrationTest.java +++ b/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosCrossPartitionScanIntegrationTest.java @@ -29,7 +29,7 @@ protected Map getCreationOptions() { @Override protected int getThreadNum() { - return 3; + return 1; } @Test From fe321b1c1ba2203dbefc3200858d1b475dd97d3a Mon Sep 17 00:00:00 2001 From: Mitsunori Komatsu Date: Wed, 19 Jun 2024 15:20:00 +0900 Subject: [PATCH 3/3] Configure DDL concurrency via isParallelDdlSupported() instead of getThreadNum() --- .../cosmos/CosmosCrossPartitionScanIntegrationTest.java | 7 ++++++- .../CosmosMultipleClusteringKeyScanIntegrationTest.java | 5 +++++ .../cosmos/CosmosMultiplePartitionKeyIntegrationTest.java | 5 +++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosCrossPartitionScanIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosCrossPartitionScanIntegrationTest.java index f8dca0b0ca..767cfc399d 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosCrossPartitionScanIntegrationTest.java +++ b/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosCrossPartitionScanIntegrationTest.java @@ -29,7 +29,12 @@ protected Map getCreationOptions() { @Override protected int getThreadNum() { - return 1; + return 3; + } + + @Override + protected boolean isParallelDdlSupported() { + return false; } @Test diff --git a/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosMultipleClusteringKeyScanIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosMultipleClusteringKeyScanIntegrationTest.java index fe6be83529..080653ee4a 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosMultipleClusteringKeyScanIntegrationTest.java +++ b/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosMultipleClusteringKeyScanIntegrationTest.java @@ -46,6 +46,11 @@ protected int getThreadNum() { return 3; } + @Override + protected boolean isParallelDdlSupported() { + return false; + } + @Override protected Map getCreationOptions() { return CosmosEnv.getCreationOptions(); diff --git a/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosMultiplePartitionKeyIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosMultiplePartitionKeyIntegrationTest.java index 3cff4464e6..0d7e4309b7 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosMultiplePartitionKeyIntegrationTest.java +++ b/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosMultiplePartitionKeyIntegrationTest.java @@ -24,6 +24,11 @@ protected int getThreadNum() { return 3; } + @Override + protected boolean isParallelDdlSupported() { + return false; + } + @Override protected Map getCreationOptions() { return CosmosEnv.getCreationOptions();