From 683f011884f22436777b1d2daf9e7d8bb0b06da4 Mon Sep 17 00:00:00 2001 From: Vincent Guilpain Date: Wed, 3 Sep 2025 12:12:33 +0900 Subject: [PATCH 1/8] Change default mapping for BLOB column for Db2 from "VARBINARY(32672)" to "BLOB(2G)" [skip ci] --- ...tAdminIntegrationTestWithJdbcDatabase.java | 9 +- ...bcAdminCaseSensitivityIntegrationTest.java | 9 +- .../jdbc/JdbcAdminIntegrationTest.java | 9 +- ...baseCrossPartitionScanIntegrationTest.java | 5 + ...tipleClusteringKeyScanIntegrationTest.java | 7 +- ...seMultiplePartitionKeyIntegrationTest.java | 5 +- ...DatabaseSecondaryIndexIntegrationTest.java | 15 ++ ...ingleClusteringKeyScanIntegrationTest.java | 7 +- ...baseSinglePartitionKeyIntegrationTest.java | 5 +- ...nAdminIntegrationTestWithJdbcDatabase.java | 9 +- .../JdbcTransactionAdminIntegrationTest.java | 9 +- .../java/com/scalar/db/common/CoreError.java | 12 ++ .../db/common/checker/OperationChecker.java | 15 ++ .../scalar/db/storage/jdbc/RdbEngineDb2.java | 8 +- .../common/checker/OperationCheckerTest.java | 37 ++++ .../scalar/db/storage/jdbc/JdbcAdminTest.java | 158 ++++++++++++------ ...ibutedStorageAdminIntegrationTestBase.java | 44 +++-- ...CrossPartitionScanIntegrationTestBase.java | 10 ++ ...edTransactionAdminIntegrationTestBase.java | 44 +++-- 19 files changed, 325 insertions(+), 92 deletions(-) diff --git a/core/src/integration-test/java/com/scalar/db/storage/jdbc/ConsensusCommitAdminIntegrationTestWithJdbcDatabase.java b/core/src/integration-test/java/com/scalar/db/storage/jdbc/ConsensusCommitAdminIntegrationTestWithJdbcDatabase.java index 7078581c2e..b2593fc13a 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/jdbc/ConsensusCommitAdminIntegrationTestWithJdbcDatabase.java +++ b/core/src/integration-test/java/com/scalar/db/storage/jdbc/ConsensusCommitAdminIntegrationTestWithJdbcDatabase.java @@ -22,11 +22,16 @@ protected AdminTestUtils getAdminTestUtils(String testName) { } @Override - protected boolean isCreateIndexOnTextAndBlobColumnsEnabled() { - // "admin.createIndex()" for TEXT and BLOB columns fails (the "create index" query runs + protected boolean isCreateIndexOnTextColumnEnabled() { + // "admin.createIndex()" for TEXT column fails (the "create index" query runs // indefinitely) on the Db2 community edition docker version which we use for the CI. // However, the index creation is successful on Db2 hosted on IBM Cloud. // So we disable these tests until the issue with the Db2 community edition is resolved. return !JdbcTestUtils.isDb2(rdbEngine); } + + @Override + protected boolean isIndexOnBlobColumnSupported() { + return !JdbcTestUtils.isDb2(rdbEngine); + } } diff --git a/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcAdminCaseSensitivityIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcAdminCaseSensitivityIntegrationTest.java index 34d20d1906..2a684ecc90 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcAdminCaseSensitivityIntegrationTest.java +++ b/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcAdminCaseSensitivityIntegrationTest.java @@ -22,10 +22,15 @@ protected AdminTestUtils getAdminTestUtils(String testName) { } @Override - protected boolean isCreateIndexOnTextAndBlobColumnsEnabled() { - // "admin.createIndex()" for TEXT and BLOB columns fails (the "create index" query runs + protected boolean isCreateIndexOnTextColumnEnabled() { + // "admin.createIndex()" for TEXT column fails (the "create index" query runs // indefinitely) on Db2 community edition version but works on Db2 hosted on IBM Cloud. // So we disable these tests until the issue is resolved. return !JdbcTestUtils.isDb2(rdbEngine); } + + @Override + protected boolean isIndexOnBlobColumnSupported() { + return !JdbcTestUtils.isDb2(rdbEngine); + } } diff --git a/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcAdminIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcAdminIntegrationTest.java index dffdbddf5a..718456fbec 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcAdminIntegrationTest.java +++ b/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcAdminIntegrationTest.java @@ -21,10 +21,15 @@ protected AdminTestUtils getAdminTestUtils(String testName) { } @Override - protected boolean isCreateIndexOnTextAndBlobColumnsEnabled() { - // "admin.createIndex()" for TEXT and BLOB columns fails (the "create index" query runs + protected boolean isCreateIndexOnTextColumnEnabled() { + // "admin.createIndex()" for TEXT columns fails (the "create index" query runs // indefinitely) on Db2 community edition version but works on Db2 hosted on IBM Cloud. // So we disable these tests until the issue is resolved. return !JdbcTestUtils.isDb2(rdbEngine); } + + @Override + protected boolean isIndexOnBlobColumnSupported() { + return !JdbcTestUtils.isDb2(rdbEngine); + } } diff --git a/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcDatabaseCrossPartitionScanIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcDatabaseCrossPartitionScanIntegrationTest.java index 83ed7a4eb1..1e85cd44d5 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcDatabaseCrossPartitionScanIntegrationTest.java +++ b/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcDatabaseCrossPartitionScanIntegrationTest.java @@ -80,4 +80,9 @@ protected Stream provideColumnsForCNFConditionsTest() { } return Stream.of(Arguments.of(allColumnNames)); } + + @Override + protected boolean isOrderingOnBlobColumnSupported() { + return !JdbcTestUtils.isDb2(rdbEngine); + } } diff --git a/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcDatabaseMultipleClusteringKeyScanIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcDatabaseMultipleClusteringKeyScanIntegrationTest.java index 5dc47a8f7f..2247c67e0b 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcDatabaseMultipleClusteringKeyScanIntegrationTest.java +++ b/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcDatabaseMultipleClusteringKeyScanIntegrationTest.java @@ -94,9 +94,14 @@ protected Column getColumnWithMaxValue(String columnName, DataType dataType) @Override protected List getDataTypes() { // TIMESTAMP WITH TIME ZONE type cannot be used as a primary key in Oracle + // BLOB type cannot be used as a clustering key in Db2 return JdbcTestUtils.filterDataTypes( super.getDataTypes(), rdbEngine, - ImmutableMap.of(RdbEngineOracle.class, ImmutableList.of(DataType.TIMESTAMPTZ))); + ImmutableMap.of( + RdbEngineOracle.class, + ImmutableList.of(DataType.TIMESTAMPTZ), + RdbEngineDb2.class, + ImmutableList.of(DataType.BLOB))); } } diff --git a/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcDatabaseMultiplePartitionKeyIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcDatabaseMultiplePartitionKeyIntegrationTest.java index c4943d8478..82919a2f72 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcDatabaseMultiplePartitionKeyIntegrationTest.java +++ b/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcDatabaseMultiplePartitionKeyIntegrationTest.java @@ -88,6 +88,7 @@ protected Column getColumnWithMaxValue(String columnName, DataType dataType) protected List getDataTypes() { // TIMESTAMP WITH TIME ZONE type cannot be used as a primary key in Oracle // FLOAT and DOUBLE types cannot be used as partition key in Yugabyte + // BLOB type cannot be used as a partition key in Db2 return JdbcTestUtils.filterDataTypes( super.getDataTypes(), rdbEngine, @@ -95,6 +96,8 @@ protected List getDataTypes() { RdbEngineOracle.class, ImmutableList.of(DataType.TIMESTAMPTZ), RdbEngineYugabyte.class, - ImmutableList.of(DataType.FLOAT, DataType.DOUBLE))); + ImmutableList.of(DataType.FLOAT, DataType.DOUBLE), + RdbEngineDb2.class, + ImmutableList.of(DataType.BLOB))); } } diff --git a/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcDatabaseSecondaryIndexIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcDatabaseSecondaryIndexIntegrationTest.java index 4bff0bed6d..16fc9182c3 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcDatabaseSecondaryIndexIntegrationTest.java +++ b/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcDatabaseSecondaryIndexIntegrationTest.java @@ -1,12 +1,17 @@ package com.scalar.db.storage.jdbc; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Sets; import com.scalar.db.api.DistributedStorageSecondaryIndexIntegrationTestBase; import com.scalar.db.config.DatabaseConfig; import com.scalar.db.io.Column; import com.scalar.db.io.DataType; import com.scalar.db.util.TestUtils; +import java.util.Arrays; import java.util.Properties; import java.util.Random; +import java.util.Set; public class JdbcDatabaseSecondaryIndexIntegrationTest extends DistributedStorageSecondaryIndexIntegrationTestBase { @@ -68,4 +73,14 @@ protected Column getColumnWithMaxValue(String columnName, DataType dataType) } return super.getColumnWithMaxValue(columnName, dataType); } + + @Override + protected Set getSecondaryIndexTypes() { + // BLOB type cannot be used as a secondary index in Db2 + return Sets.newHashSet( + JdbcTestUtils.filterDataTypes( + Arrays.asList(DataType.values()), + rdbEngine, + ImmutableMap.of(RdbEngineDb2.class, ImmutableList.of(DataType.BLOB)))); + } } diff --git a/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcDatabaseSingleClusteringKeyScanIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcDatabaseSingleClusteringKeyScanIntegrationTest.java index d1f1f97bc9..4f77dafed1 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcDatabaseSingleClusteringKeyScanIntegrationTest.java +++ b/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcDatabaseSingleClusteringKeyScanIntegrationTest.java @@ -70,9 +70,14 @@ protected Column getColumnWithMaxValue(String columnName, DataType dataType) @Override protected List getClusteringKeyTypes() { // TIMESTAMP WITH TIME ZONE type cannot be used as a primary key in Oracle + // BLOB type cannot be used as a clustering key in Db2 return JdbcTestUtils.filterDataTypes( super.getClusteringKeyTypes(), rdbEngine, - ImmutableMap.of(RdbEngineOracle.class, ImmutableList.of(DataType.TIMESTAMPTZ))); + ImmutableMap.of( + RdbEngineOracle.class, + ImmutableList.of(DataType.TIMESTAMPTZ), + RdbEngineDb2.class, + ImmutableList.of(DataType.BLOB))); } } diff --git a/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcDatabaseSinglePartitionKeyIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcDatabaseSinglePartitionKeyIntegrationTest.java index 598936d760..480d384ec8 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcDatabaseSinglePartitionKeyIntegrationTest.java +++ b/core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcDatabaseSinglePartitionKeyIntegrationTest.java @@ -71,6 +71,7 @@ protected Column getColumnWithMaxValue(String columnName, DataType dataType) protected List getPartitionKeyTypes() { // TIMESTAMP WITH TIME ZONE type cannot be used as a primary key in Oracle // FLOAT and DOUBLE types cannot be used as partition key in Yugabyte + // BLOB type cannot be used as a partition key in Db2 return JdbcTestUtils.filterDataTypes( super.getPartitionKeyTypes(), rdbEngine, @@ -78,6 +79,8 @@ protected List getPartitionKeyTypes() { RdbEngineOracle.class, ImmutableList.of(DataType.TIMESTAMPTZ), RdbEngineYugabyte.class, - ImmutableList.of(DataType.FLOAT, DataType.DOUBLE))); + ImmutableList.of(DataType.FLOAT, DataType.DOUBLE), + RdbEngineDb2.class, + ImmutableList.of(DataType.BLOB))); } } diff --git a/core/src/integration-test/java/com/scalar/db/storage/jdbc/SingleCrudOperationTransactionAdminIntegrationTestWithJdbcDatabase.java b/core/src/integration-test/java/com/scalar/db/storage/jdbc/SingleCrudOperationTransactionAdminIntegrationTestWithJdbcDatabase.java index 78385ebd68..225e866b78 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/jdbc/SingleCrudOperationTransactionAdminIntegrationTestWithJdbcDatabase.java +++ b/core/src/integration-test/java/com/scalar/db/storage/jdbc/SingleCrudOperationTransactionAdminIntegrationTestWithJdbcDatabase.java @@ -22,11 +22,16 @@ protected AdminTestUtils getAdminTestUtils(String testName) { } @Override - protected boolean isCreateIndexOnTextAndBlobColumnsEnabled() { - // "admin.createIndex()" for TEXT and BLOB columns fails (the "create index" query runs + protected boolean isCreateIndexOnTextColumnEnabled() { + // "admin.createIndex()" for TEXT column fails (the "create index" query runs // indefinitely) on the Db2 community edition docker version which we use for the CI. // However, the index creation is successful on Db2 hosted on IBM Cloud. // So we disable these tests until the issue with the Db2 community edition is resolved. return !JdbcTestUtils.isDb2(rdbEngine); } + + @Override + protected boolean isIndexOnBlobColumnSupported() { + return !JdbcTestUtils.isDb2(rdbEngine); + } } diff --git a/core/src/integration-test/java/com/scalar/db/transaction/jdbc/JdbcTransactionAdminIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/transaction/jdbc/JdbcTransactionAdminIntegrationTest.java index 1a73a8d28a..23d8c82717 100644 --- a/core/src/integration-test/java/com/scalar/db/transaction/jdbc/JdbcTransactionAdminIntegrationTest.java +++ b/core/src/integration-test/java/com/scalar/db/transaction/jdbc/JdbcTransactionAdminIntegrationTest.java @@ -95,11 +95,16 @@ protected AdminTestUtils getAdminTestUtils(String testName) { } @Override - protected boolean isCreateIndexOnTextAndBlobColumnsEnabled() { - // "admin.createIndex()" for TEXT and BLOB columns fails (the "create index" query runs + protected boolean isCreateIndexOnTextColumnEnabled() { + // "admin.createIndex()" for TEXT column fails (the "create index" query runs // indefinitely) on the Db2 community edition docker version which we use for the CI. // However, the index creation is successful on Db2 hosted on IBM Cloud. // So we disable these tests until the issue with the Db2 community edition is resolved. return !JdbcTestUtils.isDb2(rdbEngine); } + + @Override + protected boolean isIndexOnBlobColumnSupported() { + return !JdbcTestUtils.isDb2(rdbEngine); + } } diff --git a/core/src/main/java/com/scalar/db/common/CoreError.java b/core/src/main/java/com/scalar/db/common/CoreError.java index b4e5fbe682..7f13f8d8a8 100644 --- a/core/src/main/java/com/scalar/db/common/CoreError.java +++ b/core/src/main/java/com/scalar/db/common/CoreError.java @@ -678,6 +678,18 @@ public enum CoreError implements ScalarDbError { "Mutations across multiple storages are not allowed. Mutations: %s", "", ""), + DB2_INDEX_OR_KEY_ON_BLOB_COLUMN_NOT_SUPPORTED( + Category.USER_ERROR, + "0216", + "With Db2, using a BLOB column as partition key, clustering key or secondary index is not supported.", + "", + ""), + DB2_CROSS_PARTITION_SCAN_ORDERING_ON_BLOB_COLUMN_NOT_SUPPORTED( + Category.USER_ERROR, + "0217", + "With Db2, setting an ordering on a BLOB column when using a cross partition scan operation is not supported. Ordering: %s", + "", + ""), // // Errors for the concurrency error category diff --git a/core/src/main/java/com/scalar/db/common/checker/OperationChecker.java b/core/src/main/java/com/scalar/db/common/checker/OperationChecker.java index 2754f0e471..a3ef1f4b3e 100644 --- a/core/src/main/java/com/scalar/db/common/checker/OperationChecker.java +++ b/core/src/main/java/com/scalar/db/common/checker/OperationChecker.java @@ -8,6 +8,7 @@ import com.scalar.db.api.Operation; import com.scalar.db.api.Put; import com.scalar.db.api.Scan; +import com.scalar.db.api.Scan.Ordering; import com.scalar.db.api.ScanAll; import com.scalar.db.api.Selection; import com.scalar.db.api.Selection.Conjunction; @@ -19,11 +20,14 @@ import com.scalar.db.config.DatabaseConfig; import com.scalar.db.exception.storage.ExecutionException; import com.scalar.db.io.Column; +import com.scalar.db.io.DataType; import com.scalar.db.io.Key; +import com.scalar.db.storage.jdbc.JdbcConfig; import com.scalar.db.util.ScalarDbUtils; import java.util.Iterator; import java.util.LinkedHashSet; import java.util.List; +import java.util.Optional; import java.util.function.Supplier; import javax.annotation.concurrent.ThreadSafe; @@ -159,6 +163,17 @@ private void check(ScanAll scanAll) throws ExecutionException { throw new IllegalArgumentException( CoreError.OPERATION_CHECK_ERROR_CROSS_PARTITION_SCAN_ORDERING.buildMessage(scanAll)); } + Optional orderingOnBlobColumn = + scanAll.getOrderings().stream() + .filter( + ordering -> metadata.getColumnDataType(ordering.getColumnName()) == DataType.BLOB) + .findFirst(); + if (orderingOnBlobColumn.isPresent() + && new JdbcConfig(config).getJdbcUrl().startsWith("jdbc:db2:")) { + throw new IllegalArgumentException( + CoreError.DB2_CROSS_PARTITION_SCAN_ORDERING_ON_BLOB_COLUMN_NOT_SUPPORTED.buildMessage( + orderingOnBlobColumn.get())); + } checkOrderings(scanAll, metadata); if (!config.isCrossPartitionScanFilteringEnabled() && !scanAll.getConjunctions().isEmpty()) { diff --git a/core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineDb2.java b/core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineDb2.java index cc52d349b2..626ab8ae75 100644 --- a/core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineDb2.java +++ b/core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineDb2.java @@ -65,7 +65,7 @@ public String getDataTypeForEngine(DataType scalarDbDataType) { case BIGINT: return "BIGINT"; case BLOB: - return "VARBINARY(32672)"; + return "BLOB(2G)"; case BOOLEAN: return "BOOLEAN"; case FLOAT: @@ -358,7 +358,8 @@ public String getDataTypeForKey(DataType dataType) { case TEXT: return "VARCHAR(" + keyColumnSize + ") NOT NULL"; case BLOB: - return "VARBINARY(" + keyColumnSize + ") NOT NULL"; + throw new UnsupportedOperationException( + CoreError.DB2_INDEX_OR_KEY_ON_BLOB_COLUMN_NOT_SUPPORTED.buildMessage()); default: return getDataTypeForEngine(dataType) + " NOT NULL"; } @@ -371,7 +372,8 @@ public String getDataTypeForSecondaryIndex(DataType dataType) { case TEXT: return "VARCHAR(" + keyColumnSize + ")"; case BLOB: - return "VARBINARY(" + keyColumnSize + ")"; + throw new UnsupportedOperationException( + CoreError.DB2_INDEX_OR_KEY_ON_BLOB_COLUMN_NOT_SUPPORTED.buildMessage()); default: return null; } diff --git a/core/src/test/java/com/scalar/db/common/checker/OperationCheckerTest.java b/core/src/test/java/com/scalar/db/common/checker/OperationCheckerTest.java index e2a6e0febf..230d5e18d5 100644 --- a/core/src/test/java/com/scalar/db/common/checker/OperationCheckerTest.java +++ b/core/src/test/java/com/scalar/db/common/checker/OperationCheckerTest.java @@ -32,6 +32,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; +import java.util.Properties; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -416,6 +417,42 @@ public void whenCheckingScanOperationWithEmptyOrdering_shouldNotThrowAnyExceptio assertThatCode(() -> operationChecker.check(scan)).doesNotThrowAnyException(); } + @Test + public void + whenCheckingScanAllOperationWithCrossPartitionScanEnabledWithOrderingOnBlobColumnWithDb2_shouldThrowIllegalArgumentException() + throws ExecutionException { + // Arrange + when(metadataManager.getTableMetadata(any())) + .thenReturn( + TableMetadata.newBuilder() + .addColumn(PKEY1, DataType.BLOB) + .addColumn(COL1, DataType.INT) + .addColumn(COL2, DataType.BLOB) + .addPartitionKey(PKEY1) + .build()); + Scan scan = + Scan.newBuilder() + .namespace(NAMESPACE) + .table(TABLE_NAME) + .all() + .ordering(Scan.Ordering.asc(COL1)) + .ordering(Scan.Ordering.desc(COL2)) + .build(); + when(databaseConfig.isCrossPartitionScanEnabled()).thenReturn(true); + when(databaseConfig.isCrossPartitionScanOrderingEnabled()).thenReturn(true); + when(databaseConfig.getContactPoints()) + .thenReturn(Collections.singletonList("jdbc:db2://localhost:50000/test_db")); + when(databaseConfig.getStorage()).thenReturn("jdbc"); + when(databaseConfig.getProperties()).thenReturn(new Properties()); + + operationChecker = new OperationChecker(databaseConfig, metadataManager, storageInfoProvider); + + // Act Assert + assertThatThrownBy(() -> operationChecker.check(scan)) + .isInstanceOf(IllegalArgumentException.class) + .hasMessageContainingAll("Db2", "ordering", COL2); + } + @Test public void whenCheckingScanOperationWithInvalidProjections_shouldThrowIllegalArgumentException() { diff --git a/core/src/test/java/com/scalar/db/storage/jdbc/JdbcAdminTest.java b/core/src/test/java/com/scalar/db/storage/jdbc/JdbcAdminTest.java index ee7480a99a..0574bc4a92 100644 --- a/core/src/test/java/com/scalar/db/storage/jdbc/JdbcAdminTest.java +++ b/core/src/test/java/com/scalar/db/storage/jdbc/JdbcAdminTest.java @@ -522,8 +522,8 @@ public void createTableInternal_ForSqlite_withInvalidTableName_ShouldThrowExecut public void createTableInternal_ForMysql_ShouldCreateTableAndIndexes() throws SQLException { createTableInternal_ForX_CreateTableAndIndexes( RdbEngine.MYSQL, - "CREATE TABLE `my_ns`.`foo_table`(`c3` BOOLEAN,`c1` VARCHAR(128),`c4` VARBINARY(128),`c2` BIGINT,`c5` INT,`c6` DOUBLE,`c7` REAL,`c8` DATE,`c9` TIME(6),`c10` DATETIME(3),`c11` DATETIME(3), PRIMARY KEY (`c3` ASC,`c1` DESC,`c4` ASC))", - "CREATE INDEX `index_my_ns_foo_table_c4` ON `my_ns`.`foo_table` (`c4`)", + "CREATE TABLE `my_ns`.`foo_table`(`c3` BOOLEAN,`c1` VARCHAR(128),`c5` INT,`c2` BIGINT,`c4` LONGBLOB,`c6` DOUBLE,`c7` REAL,`c8` DATE,`c9` TIME(6),`c10` DATETIME(3),`c11` DATETIME(3), PRIMARY KEY (`c3` ASC,`c1` DESC,`c5` ASC))", + "CREATE INDEX `index_my_ns_foo_table_c5` ON `my_ns`.`foo_table` (`c5`)", "CREATE INDEX `index_my_ns_foo_table_c1` ON `my_ns`.`foo_table` (`c1`)"); } @@ -534,8 +534,8 @@ public void createTableInternal_ForMysql_ShouldCreateTableAndIndexes() throws SQ when(config.getMysqlVariableKeyColumnSize()).thenReturn(64); createTableInternal_ForX_CreateTableAndIndexes( new RdbEngineMysql(config), - "CREATE TABLE `my_ns`.`foo_table`(`c3` BOOLEAN,`c1` VARCHAR(64),`c4` VARBINARY(64),`c2` BIGINT,`c5` INT,`c6` DOUBLE,`c7` REAL,`c8` DATE,`c9` TIME(6),`c10` DATETIME(3),`c11` DATETIME(3), PRIMARY KEY (`c3` ASC,`c1` DESC,`c4` ASC))", - "CREATE INDEX `index_my_ns_foo_table_c4` ON `my_ns`.`foo_table` (`c4`)", + "CREATE TABLE `my_ns`.`foo_table`(`c3` BOOLEAN,`c1` VARCHAR(64),`c5` INT,`c2` BIGINT,`c4` LONGBLOB,`c6` DOUBLE,`c7` REAL,`c8` DATE,`c9` TIME(6),`c10` DATETIME(3),`c11` DATETIME(3), PRIMARY KEY (`c3` ASC,`c1` DESC,`c5` ASC))", + "CREATE INDEX `index_my_ns_foo_table_c5` ON `my_ns`.`foo_table` (`c5`)", "CREATE INDEX `index_my_ns_foo_table_c1` ON `my_ns`.`foo_table` (`c1`)"); } @@ -543,9 +543,9 @@ public void createTableInternal_ForMysql_ShouldCreateTableAndIndexes() throws SQ public void createTableInternal_ForPostgresql_ShouldCreateTableAndIndexes() throws SQLException { createTableInternal_ForX_CreateTableAndIndexes( RdbEngine.POSTGRESQL, - "CREATE TABLE \"my_ns\".\"foo_table\"(\"c3\" BOOLEAN,\"c1\" VARCHAR(10485760),\"c4\" BYTEA,\"c2\" BIGINT,\"c5\" INT,\"c6\" DOUBLE PRECISION,\"c7\" REAL,\"c8\" DATE,\"c9\" TIME,\"c10\" TIMESTAMP,\"c11\" TIMESTAMP WITH TIME ZONE, PRIMARY KEY (\"c3\",\"c1\",\"c4\"))", - "CREATE UNIQUE INDEX \"my_ns.foo_table_clustering_order_idx\" ON \"my_ns\".\"foo_table\" (\"c3\" ASC,\"c1\" DESC,\"c4\" ASC)", - "CREATE INDEX \"index_my_ns_foo_table_c4\" ON \"my_ns\".\"foo_table\" (\"c4\")", + "CREATE TABLE \"my_ns\".\"foo_table\"(\"c3\" BOOLEAN,\"c1\" VARCHAR(10485760),\"c5\" INT,\"c2\" BIGINT,\"c4\" BYTEA,\"c6\" DOUBLE PRECISION,\"c7\" REAL,\"c8\" DATE,\"c9\" TIME,\"c10\" TIMESTAMP,\"c11\" TIMESTAMP WITH TIME ZONE, PRIMARY KEY (\"c3\",\"c1\",\"c5\"))", + "CREATE UNIQUE INDEX \"my_ns.foo_table_clustering_order_idx\" ON \"my_ns\".\"foo_table\" (\"c3\" ASC,\"c1\" DESC,\"c5\" ASC)", + "CREATE INDEX \"index_my_ns_foo_table_c5\" ON \"my_ns\".\"foo_table\" (\"c5\")", "CREATE INDEX \"index_my_ns_foo_table_c1\" ON \"my_ns\".\"foo_table\" (\"c1\")"); } @@ -553,8 +553,8 @@ public void createTableInternal_ForPostgresql_ShouldCreateTableAndIndexes() thro public void createTableInternal_ForSqlServer_ShouldCreateTableAndIndexes() throws SQLException { createTableInternal_ForX_CreateTableAndIndexes( RdbEngine.SQL_SERVER, - "CREATE TABLE [my_ns].[foo_table]([c3] BIT,[c1] VARCHAR(8000),[c4] VARBINARY(8000),[c2] BIGINT,[c5] INT,[c6] FLOAT,[c7] FLOAT(24),[c8] DATE,[c9] TIME(6),[c10] DATETIME2(3),[c11] DATETIMEOFFSET(3), PRIMARY KEY ([c3] ASC,[c1] DESC,[c4] ASC))", - "CREATE INDEX [index_my_ns_foo_table_c4] ON [my_ns].[foo_table] ([c4])", + "CREATE TABLE [my_ns].[foo_table]([c3] BIT,[c1] VARCHAR(8000),[c5] INT,[c2] BIGINT,[c4] VARBINARY(8000),[c6] FLOAT,[c7] FLOAT(24),[c8] DATE,[c9] TIME(6),[c10] DATETIME2(3),[c11] DATETIMEOFFSET(3), PRIMARY KEY ([c3] ASC,[c1] DESC,[c5] ASC))", + "CREATE INDEX [index_my_ns_foo_table_c5] ON [my_ns].[foo_table] ([c5])", "CREATE INDEX [index_my_ns_foo_table_c1] ON [my_ns].[foo_table] ([c1])"); } @@ -562,10 +562,10 @@ public void createTableInternal_ForSqlServer_ShouldCreateTableAndIndexes() throw public void createTableInternal_ForOracle_ShouldCreateTableAndIndexes() throws SQLException { createTableInternal_ForX_CreateTableAndIndexes( RdbEngine.ORACLE, - "CREATE TABLE \"my_ns\".\"foo_table\"(\"c3\" NUMBER(1),\"c1\" VARCHAR2(128),\"c4\" RAW(128),\"c2\" NUMBER(16),\"c5\" NUMBER(10),\"c6\" BINARY_DOUBLE,\"c7\" BINARY_FLOAT,\"c8\" DATE,\"c9\" TIMESTAMP(6),\"c10\" TIMESTAMP(3),\"c11\" TIMESTAMP(3) WITH TIME ZONE, PRIMARY KEY (\"c3\",\"c1\",\"c4\")) ROWDEPENDENCIES", + "CREATE TABLE \"my_ns\".\"foo_table\"(\"c3\" NUMBER(1),\"c1\" VARCHAR2(128),\"c5\" NUMBER(10),\"c2\" NUMBER(16),\"c4\" RAW(2000),\"c6\" BINARY_DOUBLE,\"c7\" BINARY_FLOAT,\"c8\" DATE,\"c9\" TIMESTAMP(6),\"c10\" TIMESTAMP(3),\"c11\" TIMESTAMP(3) WITH TIME ZONE, PRIMARY KEY (\"c3\",\"c1\",\"c5\")) ROWDEPENDENCIES", "ALTER TABLE \"my_ns\".\"foo_table\" INITRANS 3 MAXTRANS 255", - "CREATE UNIQUE INDEX \"my_ns.foo_table_clustering_order_idx\" ON \"my_ns\".\"foo_table\" (\"c3\" ASC,\"c1\" DESC,\"c4\" ASC)", - "CREATE INDEX \"my_ns\".\"index_my_ns_foo_table_c4\" ON \"my_ns\".\"foo_table\" (\"c4\")", + "CREATE UNIQUE INDEX \"my_ns.foo_table_clustering_order_idx\" ON \"my_ns\".\"foo_table\" (\"c3\" ASC,\"c1\" DESC,\"c5\" ASC)", + "CREATE INDEX \"my_ns\".\"index_my_ns_foo_table_c5\" ON \"my_ns\".\"foo_table\" (\"c5\")", "CREATE INDEX \"my_ns\".\"index_my_ns_foo_table_c1\" ON \"my_ns\".\"foo_table\" (\"c1\")"); } @@ -576,10 +576,10 @@ public void createTableInternal_ForOracle_ShouldCreateTableAndIndexes() throws S when(config.getOracleVariableKeyColumnSize()).thenReturn(64); createTableInternal_ForX_CreateTableAndIndexes( new RdbEngineOracle(config), - "CREATE TABLE \"my_ns\".\"foo_table\"(\"c3\" NUMBER(1),\"c1\" VARCHAR2(64),\"c4\" RAW(64),\"c2\" NUMBER(16),\"c5\" NUMBER(10),\"c6\" BINARY_DOUBLE,\"c7\" BINARY_FLOAT,\"c8\" DATE,\"c9\" TIMESTAMP(6),\"c10\" TIMESTAMP(3),\"c11\" TIMESTAMP(3) WITH TIME ZONE, PRIMARY KEY (\"c3\",\"c1\",\"c4\")) ROWDEPENDENCIES", + "CREATE TABLE \"my_ns\".\"foo_table\"(\"c3\" NUMBER(1),\"c1\" VARCHAR2(64),\"c5\" NUMBER(10),\"c2\" NUMBER(16),\"c4\" RAW(2000),\"c6\" BINARY_DOUBLE,\"c7\" BINARY_FLOAT,\"c8\" DATE,\"c9\" TIMESTAMP(6),\"c10\" TIMESTAMP(3),\"c11\" TIMESTAMP(3) WITH TIME ZONE, PRIMARY KEY (\"c3\",\"c1\",\"c5\")) ROWDEPENDENCIES", "ALTER TABLE \"my_ns\".\"foo_table\" INITRANS 3 MAXTRANS 255", - "CREATE UNIQUE INDEX \"my_ns.foo_table_clustering_order_idx\" ON \"my_ns\".\"foo_table\" (\"c3\" ASC,\"c1\" DESC,\"c4\" ASC)", - "CREATE INDEX \"my_ns\".\"index_my_ns_foo_table_c4\" ON \"my_ns\".\"foo_table\" (\"c4\")", + "CREATE UNIQUE INDEX \"my_ns.foo_table_clustering_order_idx\" ON \"my_ns\".\"foo_table\" (\"c3\" ASC,\"c1\" DESC,\"c5\" ASC)", + "CREATE INDEX \"my_ns\".\"index_my_ns_foo_table_c5\" ON \"my_ns\".\"foo_table\" (\"c5\")", "CREATE INDEX \"my_ns\".\"index_my_ns_foo_table_c1\" ON \"my_ns\".\"foo_table\" (\"c1\")"); } @@ -587,8 +587,8 @@ public void createTableInternal_ForOracle_ShouldCreateTableAndIndexes() throws S public void createTableInternal_ForSqlite_ShouldCreateTableAndIndexes() throws SQLException { createTableInternal_ForX_CreateTableAndIndexes( RdbEngine.SQLITE, - "CREATE TABLE \"my_ns$foo_table\"(\"c3\" BOOLEAN,\"c1\" TEXT,\"c4\" BLOB,\"c2\" BIGINT,\"c5\" INT,\"c6\" DOUBLE,\"c7\" FLOAT,\"c8\" INT,\"c9\" BIGINT,\"c10\" BIGINT,\"c11\" BIGINT, PRIMARY KEY (\"c3\",\"c1\",\"c4\"))", - "CREATE INDEX \"index_my_ns_foo_table_c4\" ON \"my_ns$foo_table\" (\"c4\")", + "CREATE TABLE \"my_ns$foo_table\"(\"c3\" BOOLEAN,\"c1\" TEXT,\"c5\" INT,\"c2\" BIGINT,\"c4\" BLOB,\"c6\" DOUBLE,\"c7\" FLOAT,\"c8\" INT,\"c9\" BIGINT,\"c10\" BIGINT,\"c11\" BIGINT, PRIMARY KEY (\"c3\",\"c1\",\"c5\"))", + "CREATE INDEX \"index_my_ns_foo_table_c5\" ON \"my_ns$foo_table\" (\"c5\")", "CREATE INDEX \"index_my_ns_foo_table_c1\" ON \"my_ns$foo_table\" (\"c1\")"); } @@ -597,9 +597,9 @@ public void createTableInternal_ForDb2_ShouldCreateTableAndIndexes() throws SQLE when(config.getDb2VariableKeyColumnSize()).thenReturn(64); createTableInternal_ForX_CreateTableAndIndexes( new RdbEngineDb2(config), - "CREATE TABLE \"my_ns\".\"foo_table\"(\"c3\" BOOLEAN NOT NULL,\"c1\" VARCHAR(64) NOT NULL,\"c4\" VARBINARY(64) NOT NULL,\"c2\" BIGINT,\"c5\" INT,\"c6\" DOUBLE,\"c7\" REAL,\"c8\" DATE,\"c9\" TIMESTAMP(6),\"c10\" TIMESTAMP(3),\"c11\" TIMESTAMP(3), PRIMARY KEY (\"c3\",\"c1\",\"c4\"))", - "CREATE UNIQUE INDEX \"my_ns.foo_table_clustering_order_idx\" ON \"my_ns\".\"foo_table\" (\"c3\" ASC,\"c1\" DESC,\"c4\" ASC)", - "CREATE INDEX \"my_ns\".\"index_my_ns_foo_table_c4\" ON \"my_ns\".\"foo_table\" (\"c4\")", + "CREATE TABLE \"my_ns\".\"foo_table\"(\"c3\" BOOLEAN NOT NULL,\"c1\" VARCHAR(64) NOT NULL,\"c5\" INT NOT NULL,\"c2\" BIGINT,\"c4\" BLOB(2G),\"c6\" DOUBLE,\"c7\" REAL,\"c8\" DATE,\"c9\" TIMESTAMP(6),\"c10\" TIMESTAMP(3),\"c11\" TIMESTAMP(3), PRIMARY KEY (\"c3\",\"c1\",\"c5\"))", + "CREATE UNIQUE INDEX \"my_ns.foo_table_clustering_order_idx\" ON \"my_ns\".\"foo_table\" (\"c3\" ASC,\"c1\" DESC,\"c5\" ASC)", + "CREATE INDEX \"my_ns\".\"index_my_ns_foo_table_c5\" ON \"my_ns\".\"foo_table\" (\"c5\")", "CREATE INDEX \"my_ns\".\"index_my_ns_foo_table_c1\" ON \"my_ns\".\"foo_table\" (\"c1\")"); } @@ -609,9 +609,9 @@ public void createTableInternal_ForDb2_ShouldCreateTableAndIndexes() throws SQLE throws SQLException { createTableInternal_ForX_CreateTableAndIndexes( RdbEngine.DB2, - "CREATE TABLE \"my_ns\".\"foo_table\"(\"c3\" BOOLEAN NOT NULL,\"c1\" VARCHAR(128) NOT NULL,\"c4\" VARBINARY(128) NOT NULL,\"c2\" BIGINT,\"c5\" INT,\"c6\" DOUBLE,\"c7\" REAL,\"c8\" DATE,\"c9\" TIMESTAMP(6),\"c10\" TIMESTAMP(3),\"c11\" TIMESTAMP(3), PRIMARY KEY (\"c3\",\"c1\",\"c4\"))", - "CREATE UNIQUE INDEX \"my_ns.foo_table_clustering_order_idx\" ON \"my_ns\".\"foo_table\" (\"c3\" ASC,\"c1\" DESC,\"c4\" ASC)", - "CREATE INDEX \"my_ns\".\"index_my_ns_foo_table_c4\" ON \"my_ns\".\"foo_table\" (\"c4\")", + "CREATE TABLE \"my_ns\".\"foo_table\"(\"c3\" BOOLEAN NOT NULL,\"c1\" VARCHAR(128) NOT NULL,\"c5\" INT NOT NULL,\"c2\" BIGINT,\"c4\" BLOB(2G),\"c6\" DOUBLE,\"c7\" REAL,\"c8\" DATE,\"c9\" TIMESTAMP(6),\"c10\" TIMESTAMP(3),\"c11\" TIMESTAMP(3), PRIMARY KEY (\"c3\",\"c1\",\"c5\"))", + "CREATE UNIQUE INDEX \"my_ns.foo_table_clustering_order_idx\" ON \"my_ns\".\"foo_table\" (\"c3\" ASC,\"c1\" DESC,\"c5\" ASC)", + "CREATE INDEX \"my_ns\".\"index_my_ns_foo_table_c5\" ON \"my_ns\".\"foo_table\" (\"c5\")", "CREATE INDEX \"my_ns\".\"index_my_ns_foo_table_c1\" ON \"my_ns\".\"foo_table\" (\"c1\")"); } @@ -630,7 +630,7 @@ private void createTableInternal_ForX_CreateTableAndIndexes( TableMetadata.newBuilder() .addPartitionKey("c3") .addClusteringKey("c1", Order.DESC) - .addClusteringKey("c4", Order.ASC) + .addClusteringKey("c5", Order.ASC) .addColumn("c1", DataType.TEXT) .addColumn("c2", DataType.BIGINT) .addColumn("c3", DataType.BOOLEAN) @@ -643,7 +643,7 @@ private void createTableInternal_ForX_CreateTableAndIndexes( .addColumn("c10", DataType.TIMESTAMP) .addColumn("c11", DataType.TIMESTAMPTZ) .addSecondaryIndex("c1") - .addSecondaryIndex("c4") + .addSecondaryIndex("c5") .build(); List mockedStatements = new ArrayList<>(); @@ -672,8 +672,8 @@ public void createTableInternal_IfNotExistsForMysql_ShouldCreateTableAndIndexesI throws SQLException { createTableInternal_IfNotExistsForX_createTableAndIndexesIfNotExists( RdbEngine.MYSQL, - "CREATE TABLE IF NOT EXISTS `my_ns`.`foo_table`(`c3` BOOLEAN,`c1` VARCHAR(128),`c4` VARBINARY(128),`c2` BIGINT,`c5` INT,`c6` DOUBLE,`c7` REAL,`c8` DATE,`c9` TIME(6),`c10` DATETIME(3),`c11` DATETIME(3), PRIMARY KEY (`c3` ASC,`c1` DESC,`c4` ASC))", - "CREATE INDEX `index_my_ns_foo_table_c4` ON `my_ns`.`foo_table` (`c4`)", + "CREATE TABLE IF NOT EXISTS `my_ns`.`foo_table`(`c3` BOOLEAN,`c1` VARCHAR(128),`c5` INT,`c2` BIGINT,`c4` LONGBLOB,`c6` DOUBLE,`c7` REAL,`c8` DATE,`c9` TIME(6),`c10` DATETIME(3),`c11` DATETIME(3), PRIMARY KEY (`c3` ASC,`c1` DESC,`c5` ASC))", + "CREATE INDEX `index_my_ns_foo_table_c5` ON `my_ns`.`foo_table` (`c5`)", "CREATE INDEX `index_my_ns_foo_table_c1` ON `my_ns`.`foo_table` (`c1`)"); } @@ -682,9 +682,9 @@ public void createTableInternal_IfNotExistsForPostgresql_ShouldCreateTableAndInd throws SQLException { createTableInternal_IfNotExistsForX_createTableAndIndexesIfNotExists( RdbEngine.POSTGRESQL, - "CREATE TABLE IF NOT EXISTS \"my_ns\".\"foo_table\"(\"c3\" BOOLEAN,\"c1\" VARCHAR(10485760),\"c4\" BYTEA,\"c2\" BIGINT,\"c5\" INT,\"c6\" DOUBLE PRECISION,\"c7\" REAL,\"c8\" DATE,\"c9\" TIME,\"c10\" TIMESTAMP,\"c11\" TIMESTAMP WITH TIME ZONE, PRIMARY KEY (\"c3\",\"c1\",\"c4\"))", - "CREATE UNIQUE INDEX IF NOT EXISTS \"my_ns.foo_table_clustering_order_idx\" ON \"my_ns\".\"foo_table\" (\"c3\" ASC,\"c1\" DESC,\"c4\" ASC)", - "CREATE INDEX IF NOT EXISTS \"index_my_ns_foo_table_c4\" ON \"my_ns\".\"foo_table\" (\"c4\")", + "CREATE TABLE IF NOT EXISTS \"my_ns\".\"foo_table\"(\"c3\" BOOLEAN,\"c1\" VARCHAR(10485760),\"c5\" INT,\"c2\" BIGINT,\"c4\" BYTEA,\"c6\" DOUBLE PRECISION,\"c7\" REAL,\"c8\" DATE,\"c9\" TIME,\"c10\" TIMESTAMP,\"c11\" TIMESTAMP WITH TIME ZONE, PRIMARY KEY (\"c3\",\"c1\",\"c5\"))", + "CREATE UNIQUE INDEX IF NOT EXISTS \"my_ns.foo_table_clustering_order_idx\" ON \"my_ns\".\"foo_table\" (\"c3\" ASC,\"c1\" DESC,\"c5\" ASC)", + "CREATE INDEX IF NOT EXISTS \"index_my_ns_foo_table_c5\" ON \"my_ns\".\"foo_table\" (\"c5\")", "CREATE INDEX IF NOT EXISTS \"index_my_ns_foo_table_c1\" ON \"my_ns\".\"foo_table\" (\"c1\")"); } @@ -693,8 +693,8 @@ public void createTableInternal_IfNotExistsForSqlServer_ShouldCreateTableAndInde throws SQLException { createTableInternal_IfNotExistsForX_createTableAndIndexesIfNotExists( RdbEngine.SQL_SERVER, - "CREATE TABLE [my_ns].[foo_table]([c3] BIT,[c1] VARCHAR(8000),[c4] VARBINARY(8000),[c2] BIGINT,[c5] INT,[c6] FLOAT,[c7] FLOAT(24),[c8] DATE,[c9] TIME(6),[c10] DATETIME2(3),[c11] DATETIMEOFFSET(3), PRIMARY KEY ([c3] ASC,[c1] DESC,[c4] ASC))", - "CREATE INDEX [index_my_ns_foo_table_c4] ON [my_ns].[foo_table] ([c4])", + "CREATE TABLE [my_ns].[foo_table]([c3] BIT,[c1] VARCHAR(8000),[c5] INT,[c2] BIGINT,[c4] VARBINARY(8000),[c6] FLOAT,[c7] FLOAT(24),[c8] DATE,[c9] TIME(6),[c10] DATETIME2(3),[c11] DATETIMEOFFSET(3), PRIMARY KEY ([c3] ASC,[c1] DESC,[c5] ASC))", + "CREATE INDEX [index_my_ns_foo_table_c5] ON [my_ns].[foo_table] ([c5])", "CREATE INDEX [index_my_ns_foo_table_c1] ON [my_ns].[foo_table] ([c1])"); } @@ -703,10 +703,10 @@ public void createTableInternal_IfNotExistsForOracle_ShouldCreateTableAndIndexes throws SQLException { createTableInternal_IfNotExistsForX_createTableAndIndexesIfNotExists( RdbEngine.ORACLE, - "CREATE TABLE \"my_ns\".\"foo_table\"(\"c3\" NUMBER(1),\"c1\" VARCHAR2(128),\"c4\" RAW(128),\"c2\" NUMBER(16),\"c5\" NUMBER(10),\"c6\" BINARY_DOUBLE,\"c7\" BINARY_FLOAT,\"c8\" DATE,\"c9\" TIMESTAMP(6),\"c10\" TIMESTAMP(3),\"c11\" TIMESTAMP(3) WITH TIME ZONE, PRIMARY KEY (\"c3\",\"c1\",\"c4\")) ROWDEPENDENCIES", + "CREATE TABLE \"my_ns\".\"foo_table\"(\"c3\" NUMBER(1),\"c1\" VARCHAR2(128),\"c5\" NUMBER(10),\"c2\" NUMBER(16),\"c4\" RAW(2000),\"c6\" BINARY_DOUBLE,\"c7\" BINARY_FLOAT,\"c8\" DATE,\"c9\" TIMESTAMP(6),\"c10\" TIMESTAMP(3),\"c11\" TIMESTAMP(3) WITH TIME ZONE, PRIMARY KEY (\"c3\",\"c1\",\"c5\")) ROWDEPENDENCIES", "ALTER TABLE \"my_ns\".\"foo_table\" INITRANS 3 MAXTRANS 255", - "CREATE UNIQUE INDEX \"my_ns.foo_table_clustering_order_idx\" ON \"my_ns\".\"foo_table\" (\"c3\" ASC,\"c1\" DESC,\"c4\" ASC)", - "CREATE INDEX \"my_ns\".\"index_my_ns_foo_table_c4\" ON \"my_ns\".\"foo_table\" (\"c4\")", + "CREATE UNIQUE INDEX \"my_ns.foo_table_clustering_order_idx\" ON \"my_ns\".\"foo_table\" (\"c3\" ASC,\"c1\" DESC,\"c5\" ASC)", + "CREATE INDEX \"my_ns\".\"index_my_ns_foo_table_c5\" ON \"my_ns\".\"foo_table\" (\"c5\")", "CREATE INDEX \"my_ns\".\"index_my_ns_foo_table_c1\" ON \"my_ns\".\"foo_table\" (\"c1\")"); } @@ -715,8 +715,8 @@ public void createTableInternal_IfNotExistsForSqlite_ShouldCreateTableAndIndexes throws SQLException { createTableInternal_IfNotExistsForX_createTableAndIndexesIfNotExists( RdbEngine.SQLITE, - "CREATE TABLE IF NOT EXISTS \"my_ns$foo_table\"(\"c3\" BOOLEAN,\"c1\" TEXT,\"c4\" BLOB,\"c2\" BIGINT,\"c5\" INT,\"c6\" DOUBLE,\"c7\" FLOAT,\"c8\" INT,\"c9\" BIGINT,\"c10\" BIGINT,\"c11\" BIGINT, PRIMARY KEY (\"c3\",\"c1\",\"c4\"))", - "CREATE INDEX IF NOT EXISTS \"index_my_ns_foo_table_c4\" ON \"my_ns$foo_table\" (\"c4\")", + "CREATE TABLE IF NOT EXISTS \"my_ns$foo_table\"(\"c3\" BOOLEAN,\"c1\" TEXT,\"c5\" INT,\"c2\" BIGINT,\"c4\" BLOB,\"c6\" DOUBLE,\"c7\" FLOAT,\"c8\" INT,\"c9\" BIGINT,\"c10\" BIGINT,\"c11\" BIGINT, PRIMARY KEY (\"c3\",\"c1\",\"c5\"))", + "CREATE INDEX IF NOT EXISTS \"index_my_ns_foo_table_c5\" ON \"my_ns$foo_table\" (\"c5\")", "CREATE INDEX IF NOT EXISTS \"index_my_ns_foo_table_c1\" ON \"my_ns$foo_table\" (\"c1\")"); } @@ -725,9 +725,9 @@ public void createTableInternal_IfNotExistsForDb2_ShouldCreateTableAndIndexesIfN throws SQLException { createTableInternal_IfNotExistsForX_createTableAndIndexesIfNotExists( RdbEngine.DB2, - "CREATE TABLE IF NOT EXISTS \"my_ns\".\"foo_table\"(\"c3\" BOOLEAN NOT NULL,\"c1\" VARCHAR(128) NOT NULL,\"c4\" VARBINARY(128) NOT NULL,\"c2\" BIGINT,\"c5\" INT,\"c6\" DOUBLE,\"c7\" REAL,\"c8\" DATE,\"c9\" TIMESTAMP(6),\"c10\" TIMESTAMP(3),\"c11\" TIMESTAMP(3), PRIMARY KEY (\"c3\",\"c1\",\"c4\"))", - "CREATE UNIQUE INDEX \"my_ns.foo_table_clustering_order_idx\" ON \"my_ns\".\"foo_table\" (\"c3\" ASC,\"c1\" DESC,\"c4\" ASC)", - "CREATE INDEX \"my_ns\".\"index_my_ns_foo_table_c4\" ON \"my_ns\".\"foo_table\" (\"c4\")", + "CREATE TABLE IF NOT EXISTS \"my_ns\".\"foo_table\"(\"c3\" BOOLEAN NOT NULL,\"c1\" VARCHAR(128) NOT NULL,\"c5\" INT NOT NULL,\"c2\" BIGINT,\"c4\" BLOB(2G),\"c6\" DOUBLE,\"c7\" REAL,\"c8\" DATE,\"c9\" TIMESTAMP(6),\"c10\" TIMESTAMP(3),\"c11\" TIMESTAMP(3), PRIMARY KEY (\"c3\",\"c1\",\"c5\"))", + "CREATE UNIQUE INDEX \"my_ns.foo_table_clustering_order_idx\" ON \"my_ns\".\"foo_table\" (\"c3\" ASC,\"c1\" DESC,\"c5\" ASC)", + "CREATE INDEX \"my_ns\".\"index_my_ns_foo_table_c5\" ON \"my_ns\".\"foo_table\" (\"c5\")", "CREATE INDEX \"my_ns\".\"index_my_ns_foo_table_c1\" ON \"my_ns\".\"foo_table\" (\"c1\")"); } @@ -747,7 +747,7 @@ private void createTableInternal_IfNotExistsForX_createTableAndIndexesIfNotExist TableMetadata.newBuilder() .addPartitionKey("c3") .addClusteringKey("c1", Order.DESC) - .addClusteringKey("c4", Order.ASC) + .addClusteringKey("c5", Order.ASC) .addColumn("c1", DataType.TEXT) .addColumn("c2", DataType.BIGINT) .addColumn("c3", DataType.BOOLEAN) @@ -760,7 +760,7 @@ private void createTableInternal_IfNotExistsForX_createTableAndIndexesIfNotExist .addColumn("c10", DataType.TIMESTAMP) .addColumn("c11", DataType.TIMESTAMPTZ) .addSecondaryIndex("c1") - .addSecondaryIndex("c4") + .addSecondaryIndex("c5") .build(); List mockedStatements = new ArrayList<>(); @@ -1416,7 +1416,7 @@ public void createTable_ShouldCallCreateTableAndAddTableMetadataCorrectly(RdbEng TableMetadata.newBuilder() .addPartitionKey("c3") .addClusteringKey("c1", Order.DESC) - .addClusteringKey("c4", Order.ASC) + .addClusteringKey("c5", Order.ASC) .addColumn("c1", DataType.TEXT) .addColumn("c2", DataType.BIGINT) .addColumn("c3", DataType.BOOLEAN) @@ -1429,7 +1429,7 @@ public void createTable_ShouldCallCreateTableAndAddTableMetadataCorrectly(RdbEng .addColumn("c10", DataType.TIMESTAMP) .addColumn("c11", DataType.TIMESTAMPTZ) .addSecondaryIndex("c1") - .addSecondaryIndex("c4") + .addSecondaryIndex("c5") .build(); when(connection.createStatement()).thenReturn(mock(Statement.class)); when(dataSource.getConnection()).thenReturn(connection); @@ -1455,7 +1455,7 @@ public void repairTable_ShouldCallCreateTableAndAddTableMetadataCorrectly(RdbEng TableMetadata.newBuilder() .addPartitionKey("c3") .addClusteringKey("c1", Order.DESC) - .addClusteringKey("c4", Order.ASC) + .addClusteringKey("c5", Order.ASC) .addColumn("c1", DataType.TEXT) .addColumn("c2", DataType.BIGINT) .addColumn("c3", DataType.BOOLEAN) @@ -1468,7 +1468,7 @@ public void repairTable_ShouldCallCreateTableAndAddTableMetadataCorrectly(RdbEng .addColumn("c10", DataType.TIMESTAMP) .addColumn("c11", DataType.TIMESTAMPTZ) .addSecondaryIndex("c1") - .addSecondaryIndex("c4") + .addSecondaryIndex("c5") .build(); when(connection.createStatement()).thenReturn(mock(Statement.class)); when(dataSource.getConnection()).thenReturn(connection); @@ -1497,7 +1497,7 @@ public void repairTable_WhenTableAlreadyExistsWithoutIndex_ShouldCreateIndex(Rdb .addColumn("c1", DataType.INT) .addColumn("c2", DataType.TEXT) .addColumn("c3", DataType.BOOLEAN) - .addColumn("c4", DataType.BLOB) + .addColumn("c4", DataType.DATE) .addSecondaryIndex("c3") .addSecondaryIndex("c4") .build(); @@ -4077,6 +4077,70 @@ void hasDifferentClusteringOrders_GivenBothAscAndDescOrders_ShouldReturnTrue() { assertThat(hasDifferentClusteringOrders(metadata2)).isTrue(); } + @Test + void createTableInternal_WithBlobColumnAsKeyOrIndex_ShouldThrowUnsupportedOperationException() { + // Arrange + TableMetadata metadata1 = + TableMetadata.newBuilder().addPartitionKey("pk").addColumn("pk", DataType.BLOB).build(); + TableMetadata metadata2 = + TableMetadata.newBuilder() + .addPartitionKey("pk") + .addClusteringKey("ck") + .addColumn("pk", DataType.INT) + .addColumn("ck", DataType.INT) + .addColumn("ck", DataType.BLOB) + .build(); + TableMetadata metadata3 = + TableMetadata.newBuilder() + .addPartitionKey("pk") + .addColumn("pk", DataType.INT) + .addColumn("col", DataType.BLOB) + .addSecondaryIndex("col") + .build(); + JdbcAdmin admin = createJdbcAdminFor(RdbEngine.DB2); + + // Act Assert + assertThatThrownBy(() -> admin.createTableInternal(connection, "ns", "tbl", metadata1, false)) + .isInstanceOf(UnsupportedOperationException.class) + .hasMessageContainingAll("BLOB", "key"); + assertThatThrownBy(() -> admin.createTableInternal(connection, "ns", "tbl", metadata2, false)) + .isInstanceOf(UnsupportedOperationException.class) + .hasMessageContainingAll("BLOB", "key"); + assertThatThrownBy(() -> admin.createTableInternal(connection, "ns", "tbl", metadata3, false)) + .isInstanceOf(UnsupportedOperationException.class) + .hasMessageContainingAll("BLOB", "index"); + } + + @Test + void createIndex_WithBlobColumnAsKeyOrIndex_ShouldThrowUnsupportedOperationException() + throws SQLException { + // Arrange + String namespace = "my_ns"; + String table = "my_tbl"; + String indexColumn = "index_col"; + JdbcAdmin admin = createJdbcAdminFor(RdbEngine.DB2); + + PreparedStatement selectStatement = mock(PreparedStatement.class); + ResultSet resultSet = + mockResultSet( + new SelectAllFromMetadataTableResultSetMocker.Row( + "pk", DataType.BOOLEAN.toString(), "PARTITION", null, false), + new SelectAllFromMetadataTableResultSetMocker.Row( + indexColumn, DataType.BLOB.toString(), null, null, false)); + when(selectStatement.executeQuery()).thenReturn(resultSet); + when(connection.prepareStatement(any())).thenReturn(selectStatement); + Statement statement = mock(Statement.class); + + when(dataSource.getConnection()).thenReturn(connection); + when(connection.createStatement()).thenReturn(statement); + + // Act Assert + assertThatThrownBy( + () -> admin.createIndex(namespace, table, indexColumn, Collections.emptyMap())) + .isInstanceOf(UnsupportedOperationException.class) + .hasMessageContainingAll("BLOB", "index"); + } + // Utility class used to mock ResultSet for a "select * from" query on the metadata table static class SelectAllFromMetadataTableResultSetMocker implements org.mockito.stubbing.Answer { diff --git a/integration-test/src/main/java/com/scalar/db/api/DistributedStorageAdminIntegrationTestBase.java b/integration-test/src/main/java/com/scalar/db/api/DistributedStorageAdminIntegrationTestBase.java index 761555cc4b..fa2bca176a 100644 --- a/integration-test/src/main/java/com/scalar/db/api/DistributedStorageAdminIntegrationTestBase.java +++ b/integration-test/src/main/java/com/scalar/db/api/DistributedStorageAdminIntegrationTestBase.java @@ -655,31 +655,39 @@ public void createIndex_ForAllDataTypesWithExistingData_ShouldCreateIndexesCorre // Act admin.createIndex(namespace1, getTable4(), getColumnName2(), options); + if (isCreateIndexOnTextColumnEnabled()) { + admin.createIndex(namespace1, getTable4(), getColumnName3(), options); + } admin.createIndex(namespace1, getTable4(), getColumnName4(), options); admin.createIndex(namespace1, getTable4(), getColumnName5(), options); admin.createIndex(namespace1, getTable4(), getColumnName6(), options); if (isIndexOnBooleanColumnSupported()) { admin.createIndex(namespace1, getTable4(), getColumnName7(), options); } + if (isIndexOnBlobColumnSupported()) { + admin.createIndex(namespace1, getTable4(), getColumnName8(), options); + } admin.createIndex(namespace1, getTable4(), getColumnName10(), options); admin.createIndex(namespace1, getTable4(), getColumnName11(), options); admin.createIndex(namespace1, getTable4(), getColumnName12(), options); if (isTimestampTypeSupported()) { admin.createIndex(namespace1, getTable4(), getColumnName13(), options); } - if (isCreateIndexOnTextAndBlobColumnsEnabled()) { - admin.createIndex(namespace1, getTable4(), getColumnName3(), options); - admin.createIndex(namespace1, getTable4(), getColumnName8(), options); - } // Assert assertThat(admin.indexExists(namespace1, getTable4(), getColumnName2())).isTrue(); + if (isCreateIndexOnTextColumnEnabled()) { + assertThat(admin.indexExists(namespace1, getTable4(), getColumnName3())).isTrue(); + } assertThat(admin.indexExists(namespace1, getTable4(), getColumnName4())).isTrue(); assertThat(admin.indexExists(namespace1, getTable4(), getColumnName5())).isTrue(); assertThat(admin.indexExists(namespace1, getTable4(), getColumnName6())).isTrue(); if (isIndexOnBooleanColumnSupported()) { assertThat(admin.indexExists(namespace1, getTable4(), getColumnName7())).isTrue(); } + if (isIndexOnBlobColumnSupported()) { + assertThat(admin.indexExists(namespace1, getTable4(), getColumnName8())).isTrue(); + } assertThat(admin.indexExists(namespace1, getTable4(), getColumnName9())).isTrue(); assertThat(admin.indexExists(namespace1, getTable4(), getColumnName10())).isTrue(); assertThat(admin.indexExists(namespace1, getTable4(), getColumnName11())).isTrue(); @@ -687,10 +695,6 @@ public void createIndex_ForAllDataTypesWithExistingData_ShouldCreateIndexesCorre if (isTimestampTypeSupported()) { assertThat(admin.indexExists(namespace1, getTable4(), getColumnName13())).isTrue(); } - if (isCreateIndexOnTextAndBlobColumnsEnabled()) { - assertThat(admin.indexExists(namespace1, getTable4(), getColumnName3())).isTrue(); - assertThat(admin.indexExists(namespace1, getTable4(), getColumnName8())).isTrue(); - } Set actualSecondaryIndexNames = admin.getTableMetadata(namespace1, getTable4()).getSecondaryIndexNames(); @@ -712,9 +716,13 @@ public void createIndex_ForAllDataTypesWithExistingData_ShouldCreateIndexesCorre assertThat(actualSecondaryIndexNames).contains(getColumnName13()); indexCount++; } - if (isCreateIndexOnTextAndBlobColumnsEnabled()) { - assertThat(actualSecondaryIndexNames).contains(getColumnName3(), getColumnName8()); - indexCount += 2; + if (isCreateIndexOnTextColumnEnabled()) { + assertThat(actualSecondaryIndexNames).contains(getColumnName3()); + indexCount++; + } + if (isIndexOnBlobColumnSupported()) { + assertThat(actualSecondaryIndexNames).contains(getColumnName8()); + indexCount++; } assertThat(actualSecondaryIndexNames).hasSize(indexCount); @@ -829,7 +837,6 @@ public void dropIndex_ForAllDataTypesWithExistingData_ShouldDropIndexCorrectly() .addSecondaryIndex(getColumnName4()) .addSecondaryIndex(getColumnName5()) .addSecondaryIndex(getColumnName6()) - .addSecondaryIndex(getColumnName8()) .addSecondaryIndex(getColumnName9()) .addSecondaryIndex(getColumnName10()) .addSecondaryIndex(getColumnName11()) @@ -841,6 +848,9 @@ public void dropIndex_ForAllDataTypesWithExistingData_ShouldDropIndexCorrectly() metadataBuilder.addColumn(getColumnName13(), DataType.TIMESTAMP); metadataBuilder.addSecondaryIndex(getColumnName13()); } + if (isIndexOnBlobColumnSupported()) { + metadataBuilder.addSecondaryIndex(getColumnName8()); + } admin.createTable(namespace1, getTable4(), metadataBuilder.build(), options); storage = storageFactory.getStorage(); PutBuilder.Buildable put = @@ -878,7 +888,9 @@ public void dropIndex_ForAllDataTypesWithExistingData_ShouldDropIndexCorrectly() if (isIndexOnBooleanColumnSupported()) { admin.dropIndex(namespace1, getTable4(), getColumnName7()); } - admin.dropIndex(namespace1, getTable4(), getColumnName8()); + if (isIndexOnBlobColumnSupported()) { + admin.dropIndex(namespace1, getTable4(), getColumnName8()); + } admin.dropIndex(namespace1, getTable4(), getColumnName10()); admin.dropIndex(namespace1, getTable4(), getColumnName11()); admin.dropIndex(namespace1, getTable4(), getColumnName12()); @@ -1047,11 +1059,15 @@ protected boolean isIndexOnBooleanColumnSupported() { return true; } + protected boolean isIndexOnBlobColumnSupported() { + return true; + } + protected boolean isTimestampTypeSupported() { return true; } - protected boolean isCreateIndexOnTextAndBlobColumnsEnabled() { + protected boolean isCreateIndexOnTextColumnEnabled() { return true; } } diff --git a/integration-test/src/main/java/com/scalar/db/api/DistributedStorageCrossPartitionScanIntegrationTestBase.java b/integration-test/src/main/java/com/scalar/db/api/DistributedStorageCrossPartitionScanIntegrationTestBase.java index af0746e41b..ab9787512c 100644 --- a/integration-test/src/main/java/com/scalar/db/api/DistributedStorageCrossPartitionScanIntegrationTestBase.java +++ b/integration-test/src/main/java/com/scalar/db/api/DistributedStorageCrossPartitionScanIntegrationTestBase.java @@ -924,7 +924,13 @@ public void scan_WithOrderingForNonPrimaryColumns_ShouldReturnProperResult() List> testCallables = new ArrayList<>(); for (DataType firstColumnType : columnTypes.keySet()) { + if (firstColumnType == DataType.BLOB && !isOrderingOnBlobColumnSupported()) { + continue; + } for (DataType secondColumnType : columnTypes.get(firstColumnType)) { + if (secondColumnType == DataType.BLOB && !isOrderingOnBlobColumnSupported()) { + continue; + } testCallables.add( () -> { random.get().setSeed(seed); @@ -1252,4 +1258,8 @@ public String toString() { protected boolean isTimestampTypeSupported() { return true; } + + protected boolean isOrderingOnBlobColumnSupported() { + return true; + } } diff --git a/integration-test/src/main/java/com/scalar/db/api/DistributedTransactionAdminIntegrationTestBase.java b/integration-test/src/main/java/com/scalar/db/api/DistributedTransactionAdminIntegrationTestBase.java index 8fb7037a66..c2cf82214a 100644 --- a/integration-test/src/main/java/com/scalar/db/api/DistributedTransactionAdminIntegrationTestBase.java +++ b/integration-test/src/main/java/com/scalar/db/api/DistributedTransactionAdminIntegrationTestBase.java @@ -559,31 +559,39 @@ public void createIndex_ForAllDataTypesWithExistingData_ShouldCreateIndexesCorre // Act admin.createIndex(namespace1, TABLE4, COL_NAME2, options); + if (isCreateIndexOnTextColumnEnabled()) { + admin.createIndex(namespace1, TABLE4, COL_NAME3, options); + } admin.createIndex(namespace1, TABLE4, COL_NAME4, options); admin.createIndex(namespace1, TABLE4, COL_NAME5, options); admin.createIndex(namespace1, TABLE4, COL_NAME6, options); if (isIndexOnBooleanColumnSupported()) { admin.createIndex(namespace1, TABLE4, COL_NAME7, options); } + if (isIndexOnBlobColumnSupported()) { + admin.createIndex(namespace1, TABLE4, COL_NAME8, options); + } admin.createIndex(namespace1, TABLE4, COL_NAME10, options); admin.createIndex(namespace1, TABLE4, COL_NAME11, options); admin.createIndex(namespace1, TABLE4, COL_NAME12, options); if (isTimestampTypeSupported()) { admin.createIndex(namespace1, TABLE4, COL_NAME13, options); } - if (isCreateIndexOnTextAndBlobColumnsEnabled()) { - admin.createIndex(namespace1, TABLE4, COL_NAME3, options); - admin.createIndex(namespace1, TABLE4, COL_NAME8, options); - } // Assert assertThat(admin.indexExists(namespace1, TABLE4, COL_NAME2)).isTrue(); + if (isCreateIndexOnTextColumnEnabled()) { + assertThat(admin.indexExists(namespace1, TABLE4, COL_NAME3)).isTrue(); + } assertThat(admin.indexExists(namespace1, TABLE4, COL_NAME4)).isTrue(); assertThat(admin.indexExists(namespace1, TABLE4, COL_NAME5)).isTrue(); assertThat(admin.indexExists(namespace1, TABLE4, COL_NAME6)).isTrue(); if (isIndexOnBooleanColumnSupported()) { assertThat(admin.indexExists(namespace1, TABLE4, COL_NAME7)).isTrue(); } + if (isIndexOnBlobColumnSupported()) { + assertThat(admin.indexExists(namespace1, TABLE4, COL_NAME8)).isTrue(); + } assertThat(admin.indexExists(namespace1, TABLE4, COL_NAME9)).isTrue(); assertThat(admin.indexExists(namespace1, TABLE4, COL_NAME10)).isTrue(); assertThat(admin.indexExists(namespace1, TABLE4, COL_NAME11)).isTrue(); @@ -591,10 +599,6 @@ public void createIndex_ForAllDataTypesWithExistingData_ShouldCreateIndexesCorre if (isTimestampTypeSupported()) { assertThat(admin.indexExists(namespace1, TABLE4, COL_NAME13)).isTrue(); } - if (isCreateIndexOnTextAndBlobColumnsEnabled()) { - assertThat(admin.indexExists(namespace1, TABLE4, COL_NAME3)).isTrue(); - assertThat(admin.indexExists(namespace1, TABLE4, COL_NAME8)).isTrue(); - } Set actualSecondaryIndexNames = admin.getTableMetadata(namespace1, TABLE4).getSecondaryIndexNames(); @@ -609,9 +613,13 @@ public void createIndex_ForAllDataTypesWithExistingData_ShouldCreateIndexesCorre assertThat(actualSecondaryIndexNames).contains(COL_NAME13); indexCount++; } - if (isCreateIndexOnTextAndBlobColumnsEnabled()) { - assertThat(actualSecondaryIndexNames).contains(COL_NAME3, COL_NAME8); - indexCount += 2; + if (isCreateIndexOnTextColumnEnabled()) { + assertThat(actualSecondaryIndexNames).contains(COL_NAME3); + indexCount += 1; + } + if (isIndexOnBlobColumnSupported()) { + assertThat(actualSecondaryIndexNames).contains(COL_NAME8); + indexCount += 1; } assertThat(actualSecondaryIndexNames).hasSize(indexCount); @@ -718,7 +726,6 @@ public void dropIndex_ForAllDataTypesWithExistingData_ShouldDropIndexCorrectly() .addSecondaryIndex(COL_NAME4) .addSecondaryIndex(COL_NAME5) .addSecondaryIndex(COL_NAME6) - .addSecondaryIndex(COL_NAME8) .addSecondaryIndex(COL_NAME9) .addSecondaryIndex(COL_NAME9) .addSecondaryIndex(COL_NAME10) @@ -727,6 +734,9 @@ public void dropIndex_ForAllDataTypesWithExistingData_ShouldDropIndexCorrectly() if (isIndexOnBooleanColumnSupported()) { metadataBuilder = metadataBuilder.addSecondaryIndex(COL_NAME7); } + if (isIndexOnBlobColumnSupported()) { + metadataBuilder = metadataBuilder.addSecondaryIndex(COL_NAME8); + } if (isTimestampTypeSupported()) { metadataBuilder.addColumn(COL_NAME13, DataType.TIMESTAMP); metadataBuilder.addSecondaryIndex(COL_NAME13); @@ -767,7 +777,9 @@ public void dropIndex_ForAllDataTypesWithExistingData_ShouldDropIndexCorrectly() if (isIndexOnBooleanColumnSupported()) { admin.dropIndex(namespace1, TABLE4, COL_NAME7); } - admin.dropIndex(namespace1, TABLE4, COL_NAME8); + if (isIndexOnBlobColumnSupported()) { + admin.dropIndex(namespace1, TABLE4, COL_NAME8); + } admin.dropIndex(namespace1, TABLE4, COL_NAME10); admin.dropIndex(namespace1, TABLE4, COL_NAME11); admin.dropIndex(namespace1, TABLE4, COL_NAME12); @@ -1013,11 +1025,15 @@ protected boolean isIndexOnBooleanColumnSupported() { return true; } + protected boolean isIndexOnBlobColumnSupported() { + return true; + } + protected boolean isTimestampTypeSupported() { return true; } - protected boolean isCreateIndexOnTextAndBlobColumnsEnabled() { + protected boolean isCreateIndexOnTextColumnEnabled() { return true; } } From 47dd9d5d082579adf212c2c5f8aabc5c0701efbb Mon Sep 17 00:00:00 2001 From: Vincent Guilpain Date: Thu, 4 Sep 2025 14:51:50 +0900 Subject: [PATCH 2/8] Trigger Build From b199319da988c70b427b8f6dcee677df6359ec5b Mon Sep 17 00:00:00 2001 From: Vincent Guilpain Date: Fri, 19 Sep 2025 09:41:31 +0900 Subject: [PATCH 3/8] Update check for cross partition scan with ordering on blob column --- .../db/common/checker/OperationChecker.java | 19 +--- .../scalar/db/storage/jdbc/JdbcDatabase.java | 4 +- .../db/storage/jdbc/JdbcOperationChecker.java | 29 +++++ .../scalar/db/storage/jdbc/RdbEngineDb2.java | 18 ++++ .../db/storage/jdbc/RdbEngineStrategy.java | 13 +++ .../common/checker/OperationCheckerTest.java | 42 ++++---- .../jdbc/JdbcOperationCheckerTest.java | 46 ++++++++ .../db/storage/jdbc/RdbEngineDb2Test.java | 102 ++++++++++++++++++ 8 files changed, 235 insertions(+), 38 deletions(-) create mode 100644 core/src/main/java/com/scalar/db/storage/jdbc/JdbcOperationChecker.java create mode 100644 core/src/test/java/com/scalar/db/storage/jdbc/JdbcOperationCheckerTest.java create mode 100644 core/src/test/java/com/scalar/db/storage/jdbc/RdbEngineDb2Test.java diff --git a/core/src/main/java/com/scalar/db/common/checker/OperationChecker.java b/core/src/main/java/com/scalar/db/common/checker/OperationChecker.java index a3ef1f4b3e..430915b5e2 100644 --- a/core/src/main/java/com/scalar/db/common/checker/OperationChecker.java +++ b/core/src/main/java/com/scalar/db/common/checker/OperationChecker.java @@ -8,7 +8,6 @@ import com.scalar.db.api.Operation; import com.scalar.db.api.Put; import com.scalar.db.api.Scan; -import com.scalar.db.api.Scan.Ordering; import com.scalar.db.api.ScanAll; import com.scalar.db.api.Selection; import com.scalar.db.api.Selection.Conjunction; @@ -20,14 +19,11 @@ import com.scalar.db.config.DatabaseConfig; import com.scalar.db.exception.storage.ExecutionException; import com.scalar.db.io.Column; -import com.scalar.db.io.DataType; import com.scalar.db.io.Key; -import com.scalar.db.storage.jdbc.JdbcConfig; import com.scalar.db.util.ScalarDbUtils; import java.util.Iterator; import java.util.LinkedHashSet; import java.util.List; -import java.util.Optional; import java.util.function.Supplier; import javax.annotation.concurrent.ThreadSafe; @@ -163,17 +159,7 @@ private void check(ScanAll scanAll) throws ExecutionException { throw new IllegalArgumentException( CoreError.OPERATION_CHECK_ERROR_CROSS_PARTITION_SCAN_ORDERING.buildMessage(scanAll)); } - Optional orderingOnBlobColumn = - scanAll.getOrderings().stream() - .filter( - ordering -> metadata.getColumnDataType(ordering.getColumnName()) == DataType.BLOB) - .findFirst(); - if (orderingOnBlobColumn.isPresent() - && new JdbcConfig(config).getJdbcUrl().startsWith("jdbc:db2:")) { - throw new IllegalArgumentException( - CoreError.DB2_CROSS_PARTITION_SCAN_ORDERING_ON_BLOB_COLUMN_NOT_SUPPORTED.buildMessage( - orderingOnBlobColumn.get())); - } + throwIfCrossPartitionScanOrderingOnBlobColumnNotSupported(scanAll, metadata); checkOrderings(scanAll, metadata); if (!config.isCrossPartitionScanFilteringEnabled() && !scanAll.getConjunctions().isEmpty()) { @@ -183,6 +169,9 @@ && new JdbcConfig(config).getJdbcUrl().startsWith("jdbc:db2:")) { checkConjunctions(scanAll, metadata); } + protected void throwIfCrossPartitionScanOrderingOnBlobColumnNotSupported( + ScanAll scanAll, TableMetadata metadata) {}; + private void checkProjections(Selection selection, TableMetadata metadata) { for (String projection : selection.getProjections()) { if (!metadata.getColumnNames().contains(projection)) { diff --git a/core/src/main/java/com/scalar/db/storage/jdbc/JdbcDatabase.java b/core/src/main/java/com/scalar/db/storage/jdbc/JdbcDatabase.java index 5fca851925..75e7ab92c4 100644 --- a/core/src/main/java/com/scalar/db/storage/jdbc/JdbcDatabase.java +++ b/core/src/main/java/com/scalar/db/storage/jdbc/JdbcDatabase.java @@ -59,8 +59,8 @@ public JdbcDatabase(DatabaseConfig databaseConfig) { TableMetadataManager tableMetadataManager = new TableMetadataManager(jdbcAdmin, databaseConfig.getMetadataCacheExpirationTimeSecs()); OperationChecker operationChecker = - new OperationChecker( - databaseConfig, tableMetadataManager, new StorageInfoProvider(jdbcAdmin)); + new JdbcOperationChecker( + databaseConfig, tableMetadataManager, new StorageInfoProvider(jdbcAdmin), rdbEngine); jdbcService = new JdbcService( diff --git a/core/src/main/java/com/scalar/db/storage/jdbc/JdbcOperationChecker.java b/core/src/main/java/com/scalar/db/storage/jdbc/JdbcOperationChecker.java new file mode 100644 index 0000000000..93288804cf --- /dev/null +++ b/core/src/main/java/com/scalar/db/storage/jdbc/JdbcOperationChecker.java @@ -0,0 +1,29 @@ +package com.scalar.db.storage.jdbc; + +import com.scalar.db.api.ScanAll; +import com.scalar.db.api.TableMetadata; +import com.scalar.db.common.StorageInfoProvider; +import com.scalar.db.common.TableMetadataManager; +import com.scalar.db.common.checker.OperationChecker; +import com.scalar.db.config.DatabaseConfig; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + +public class JdbcOperationChecker extends OperationChecker { + private final RdbEngineStrategy rdbEngine; + + @SuppressFBWarnings("EI_EXPOSE_REP2") + public JdbcOperationChecker( + DatabaseConfig config, + TableMetadataManager tableMetadataManager, + StorageInfoProvider storageInfoProvider, + RdbEngineStrategy rdbEngine) { + super(config, tableMetadataManager, storageInfoProvider); + this.rdbEngine = rdbEngine; + } + + @Override + protected void throwIfCrossPartitionScanOrderingOnBlobColumnNotSupported( + ScanAll scanAll, TableMetadata metadata) { + rdbEngine.throwIfCrossPartitionScanOrderingOnBlobColumnNotSupported(scanAll, metadata); + } +} diff --git a/core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineDb2.java b/core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineDb2.java index 626ab8ae75..421c3969a4 100644 --- a/core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineDb2.java +++ b/core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineDb2.java @@ -6,6 +6,8 @@ import com.google.common.collect.ImmutableMap; import com.ibm.db2.jcc.DB2BaseDataSource; import com.scalar.db.api.LikeExpression; +import com.scalar.db.api.Scan.Ordering; +import com.scalar.db.api.ScanAll; import com.scalar.db.api.TableMetadata; import com.scalar.db.common.CoreError; import com.scalar.db.exception.storage.ExecutionException; @@ -32,6 +34,7 @@ import java.util.Collection; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.stream.Collectors; import java.util.stream.Stream; import javax.annotation.Nullable; @@ -511,4 +514,19 @@ private String getProjection(String columnName, DataType dataType) { } return enclose(columnName); } + + @Override + public void throwIfCrossPartitionScanOrderingOnBlobColumnNotSupported( + ScanAll scanAll, TableMetadata metadata) { + Optional orderingOnBlobColumn = + scanAll.getOrderings().stream() + .filter( + ordering -> metadata.getColumnDataType(ordering.getColumnName()) == DataType.BLOB) + .findFirst(); + if (orderingOnBlobColumn.isPresent()) { + throw new UnsupportedOperationException( + CoreError.DB2_CROSS_PARTITION_SCAN_ORDERING_ON_BLOB_COLUMN_NOT_SUPPORTED.buildMessage( + orderingOnBlobColumn.get())); + } + } } diff --git a/core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineStrategy.java b/core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineStrategy.java index 39edb7ec60..56cfbd6f11 100644 --- a/core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineStrategy.java +++ b/core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineStrategy.java @@ -1,6 +1,7 @@ package com.scalar.db.storage.jdbc; import com.scalar.db.api.LikeExpression; +import com.scalar.db.api.ScanAll; import com.scalar.db.api.TableMetadata; import com.scalar.db.exception.storage.ExecutionException; import com.scalar.db.io.DataType; @@ -246,4 +247,16 @@ default void setConnectionToReadOnly(Connection connection, boolean readOnly) throws SQLException { connection.setReadOnly(readOnly); } + + /** + * Throws an exception if a cross-partition scan operation with ordering on a blob column is + * specified and is not supported in the underlying storage. + * + * @param scanAll the ScanAll operation + * @param metadata the table metadata + * @throws UnsupportedOperationException if the ScanAll operation contains an ordering on a blob + * column, and it is not supported in the underlying storage + */ + default void throwIfCrossPartitionScanOrderingOnBlobColumnNotSupported( + ScanAll scanAll, TableMetadata metadata) {} } diff --git a/core/src/test/java/com/scalar/db/common/checker/OperationCheckerTest.java b/core/src/test/java/com/scalar/db/common/checker/OperationCheckerTest.java index 230d5e18d5..20adf13bc3 100644 --- a/core/src/test/java/com/scalar/db/common/checker/OperationCheckerTest.java +++ b/core/src/test/java/com/scalar/db/common/checker/OperationCheckerTest.java @@ -5,6 +5,8 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.Assertions.catchException; import static org.mockito.Mockito.any; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import com.scalar.db.api.ConditionBuilder; @@ -17,6 +19,7 @@ import com.scalar.db.api.Put; import com.scalar.db.api.Scan; import com.scalar.db.api.Scan.Ordering; +import com.scalar.db.api.ScanAll; import com.scalar.db.api.StorageInfo; import com.scalar.db.api.TableMetadata; import com.scalar.db.api.Update; @@ -32,7 +35,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import java.util.Properties; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -418,18 +420,17 @@ public void whenCheckingScanOperationWithEmptyOrdering_shouldNotThrowAnyExceptio } @Test - public void - whenCheckingScanAllOperationWithCrossPartitionScanEnabledWithOrderingOnBlobColumnWithDb2_shouldThrowIllegalArgumentException() - throws ExecutionException { + public void whenCheckingScanAllOperationWithCrossPartitionScanEnabledWithOrdering_shouldNotThrow() + throws ExecutionException { // Arrange - when(metadataManager.getTableMetadata(any())) - .thenReturn( - TableMetadata.newBuilder() - .addColumn(PKEY1, DataType.BLOB) - .addColumn(COL1, DataType.INT) - .addColumn(COL2, DataType.BLOB) - .addPartitionKey(PKEY1) - .build()); + TableMetadata metadata = + TableMetadata.newBuilder() + .addColumn(PKEY1, DataType.BLOB) + .addColumn(COL1, DataType.INT) + .addColumn(COL2, DataType.BLOB) + .addPartitionKey(PKEY1) + .build(); + when(metadataManager.getTableMetadata(any())).thenReturn(metadata); Scan scan = Scan.newBuilder() .namespace(NAMESPACE) @@ -440,17 +441,16 @@ public void whenCheckingScanOperationWithEmptyOrdering_shouldNotThrowAnyExceptio .build(); when(databaseConfig.isCrossPartitionScanEnabled()).thenReturn(true); when(databaseConfig.isCrossPartitionScanOrderingEnabled()).thenReturn(true); - when(databaseConfig.getContactPoints()) - .thenReturn(Collections.singletonList("jdbc:db2://localhost:50000/test_db")); - when(databaseConfig.getStorage()).thenReturn("jdbc"); - when(databaseConfig.getProperties()).thenReturn(new Properties()); - operationChecker = new OperationChecker(databaseConfig, metadataManager, storageInfoProvider); + operationChecker = + spy(new OperationChecker(databaseConfig, metadataManager, storageInfoProvider)); - // Act Assert - assertThatThrownBy(() -> operationChecker.check(scan)) - .isInstanceOf(IllegalArgumentException.class) - .hasMessageContainingAll("Db2", "ordering", COL2); + // Act + operationChecker.check(scan); + + // Assert + verify(operationChecker) + .throwIfCrossPartitionScanOrderingOnBlobColumnNotSupported((ScanAll) scan, metadata); } @Test diff --git a/core/src/test/java/com/scalar/db/storage/jdbc/JdbcOperationCheckerTest.java b/core/src/test/java/com/scalar/db/storage/jdbc/JdbcOperationCheckerTest.java new file mode 100644 index 0000000000..2bf81e4dda --- /dev/null +++ b/core/src/test/java/com/scalar/db/storage/jdbc/JdbcOperationCheckerTest.java @@ -0,0 +1,46 @@ +package com.scalar.db.storage.jdbc; + +import static org.mockito.Mockito.verify; + +import com.scalar.db.api.ScanAll; +import com.scalar.db.api.TableMetadata; +import com.scalar.db.common.StorageInfoProvider; +import com.scalar.db.common.TableMetadataManager; +import com.scalar.db.config.DatabaseConfig; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +public class JdbcOperationCheckerTest { + + @Mock private DatabaseConfig databaseConfig; + @Mock private TableMetadataManager tableMetadataManager; + @Mock private StorageInfoProvider storageInfoProvider; + @Mock private RdbEngineStrategy rdbEngine; + @Mock private ScanAll scanAll; + @Mock private TableMetadata tableMetadata; + private JdbcOperationChecker operationChecker; + + @BeforeEach + public void setUp() throws Exception { + MockitoAnnotations.openMocks(this).close(); + + operationChecker = + new JdbcOperationChecker( + databaseConfig, tableMetadataManager, storageInfoProvider, rdbEngine); + } + + @Test + public void + throwIfCrossPartitionScanOrderingOnBlobColumnNotSupported_ShouldDelegateToRdbEngine() { + // Arrange + // Act + operationChecker.throwIfCrossPartitionScanOrderingOnBlobColumnNotSupported( + scanAll, tableMetadata); + + // Assert + verify(rdbEngine) + .throwIfCrossPartitionScanOrderingOnBlobColumnNotSupported(scanAll, tableMetadata); + } +} diff --git a/core/src/test/java/com/scalar/db/storage/jdbc/RdbEngineDb2Test.java b/core/src/test/java/com/scalar/db/storage/jdbc/RdbEngineDb2Test.java new file mode 100644 index 0000000000..afc2295300 --- /dev/null +++ b/core/src/test/java/com/scalar/db/storage/jdbc/RdbEngineDb2Test.java @@ -0,0 +1,102 @@ +package com.scalar.db.storage.jdbc; + +import static org.assertj.core.api.Assertions.assertThatCode; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.mockito.Mockito.when; + +import com.scalar.db.api.Scan; +import com.scalar.db.api.ScanAll; +import com.scalar.db.api.TableMetadata; +import com.scalar.db.io.DataType; +import java.util.Arrays; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +public class RdbEngineDb2Test { + + @Mock private ScanAll scanAll; + @Mock private TableMetadata metadata; + + private RdbEngineDb2 rdbEngineDb2; + + @BeforeEach + public void setUp() throws Exception { + MockitoAnnotations.openMocks(this).close(); + rdbEngineDb2 = new RdbEngineDb2(); + } + + @Test + public void + throwIfCrossPartitionScanOrderingOnBlobColumnNotSupported_WithBlobOrdering_ShouldThrowException() { + // Arrange + Scan.Ordering blobOrdering = Scan.Ordering.asc("blob_column"); + Scan.Ordering intOrdering = Scan.Ordering.desc("int_column"); + + when(scanAll.getOrderings()).thenReturn(Arrays.asList(intOrdering, blobOrdering)); + when(metadata.getColumnDataType("blob_column")).thenReturn(DataType.BLOB); + when(metadata.getColumnDataType("int_column")).thenReturn(DataType.INT); + + // Act & Assert + assertThatThrownBy( + () -> + rdbEngineDb2.throwIfCrossPartitionScanOrderingOnBlobColumnNotSupported( + scanAll, metadata)) + .isInstanceOf(UnsupportedOperationException.class) + .hasMessageContaining("blob_column"); + } + + @Test + public void + throwIfCrossPartitionScanOrderingOnBlobColumnNotSupported_WithoutBlobOrdering_ShouldNotThrowException() { + // Arrange + Scan.Ordering intOrdering = Scan.Ordering.asc("int_column"); + Scan.Ordering textOrdering = Scan.Ordering.desc("text_column"); + + when(scanAll.getOrderings()).thenReturn(Arrays.asList(intOrdering, textOrdering)); + when(metadata.getColumnDataType("int_column")).thenReturn(DataType.INT); + when(metadata.getColumnDataType("text_column")).thenReturn(DataType.TEXT); + + // Act & Assert + assertThatCode( + () -> + rdbEngineDb2.throwIfCrossPartitionScanOrderingOnBlobColumnNotSupported( + scanAll, metadata)) + .doesNotThrowAnyException(); + } + + @Test + public void + throwIfCrossPartitionScanOrderingOnBlobColumnNotSupported_WithNoOrderings_ShouldNotThrowException() { + // Arrange + when(scanAll.getOrderings()).thenReturn(Arrays.asList()); + + // Act & Assert + assertThatCode( + () -> + rdbEngineDb2.throwIfCrossPartitionScanOrderingOnBlobColumnNotSupported( + scanAll, metadata)) + .doesNotThrowAnyException(); + } + + @Test + public void + throwIfCrossPartitionScanOrderingOnBlobColumnNotSupported_WithMultipleBlobOrderings_ShouldThrowForFirst() { + // Arrange + Scan.Ordering blobOrdering1 = Scan.Ordering.asc("blob_column1"); + Scan.Ordering blobOrdering2 = Scan.Ordering.desc("blob_column2"); + + when(scanAll.getOrderings()).thenReturn(Arrays.asList(blobOrdering1, blobOrdering2)); + when(metadata.getColumnDataType("blob_column1")).thenReturn(DataType.BLOB); + when(metadata.getColumnDataType("blob_column2")).thenReturn(DataType.BLOB); + + // Act & Assert + assertThatThrownBy( + () -> + rdbEngineDb2.throwIfCrossPartitionScanOrderingOnBlobColumnNotSupported( + scanAll, metadata)) + .isInstanceOf(UnsupportedOperationException.class) + .hasMessageContaining("blob_column1"); + } +} From 396ad319a66c0981b85f8c08081652047c09e8d7 Mon Sep 17 00:00:00 2001 From: Vincent Guilpain Date: Fri, 19 Sep 2025 14:07:32 +0900 Subject: [PATCH 4/8] Apply brfrn169 suggestion --- .../db/common/checker/OperationChecker.java | 8 ++------ .../db/storage/jdbc/JdbcOperationChecker.java | 4 ++-- .../db/common/checker/OperationCheckerTest.java | 15 ++++----------- .../db/storage/jdbc/JdbcOperationCheckerTest.java | 6 ++---- 4 files changed, 10 insertions(+), 23 deletions(-) diff --git a/core/src/main/java/com/scalar/db/common/checker/OperationChecker.java b/core/src/main/java/com/scalar/db/common/checker/OperationChecker.java index 430915b5e2..8a977be66f 100644 --- a/core/src/main/java/com/scalar/db/common/checker/OperationChecker.java +++ b/core/src/main/java/com/scalar/db/common/checker/OperationChecker.java @@ -159,8 +159,7 @@ private void check(ScanAll scanAll) throws ExecutionException { throw new IllegalArgumentException( CoreError.OPERATION_CHECK_ERROR_CROSS_PARTITION_SCAN_ORDERING.buildMessage(scanAll)); } - throwIfCrossPartitionScanOrderingOnBlobColumnNotSupported(scanAll, metadata); - checkOrderings(scanAll, metadata); + checkOrderingsForScanAll(scanAll, metadata); if (!config.isCrossPartitionScanFilteringEnabled() && !scanAll.getConjunctions().isEmpty()) { throw new IllegalArgumentException( @@ -169,9 +168,6 @@ private void check(ScanAll scanAll) throws ExecutionException { checkConjunctions(scanAll, metadata); } - protected void throwIfCrossPartitionScanOrderingOnBlobColumnNotSupported( - ScanAll scanAll, TableMetadata metadata) {}; - private void checkProjections(Selection selection, TableMetadata metadata) { for (String projection : selection.getProjections()) { if (!metadata.getColumnNames().contains(projection)) { @@ -262,7 +258,7 @@ private void checkOrderings(Scan scan, TableMetadata metadata) { } } - private void checkOrderings(ScanAll scanAll, TableMetadata metadata) { + protected void checkOrderingsForScanAll(ScanAll scanAll, TableMetadata metadata) { for (Scan.Ordering ordering : scanAll.getOrderings()) { if (!metadata.getColumnNames().contains(ordering.getColumnName())) { throw new IllegalArgumentException( diff --git a/core/src/main/java/com/scalar/db/storage/jdbc/JdbcOperationChecker.java b/core/src/main/java/com/scalar/db/storage/jdbc/JdbcOperationChecker.java index 93288804cf..8cf440d4a7 100644 --- a/core/src/main/java/com/scalar/db/storage/jdbc/JdbcOperationChecker.java +++ b/core/src/main/java/com/scalar/db/storage/jdbc/JdbcOperationChecker.java @@ -22,8 +22,8 @@ public JdbcOperationChecker( } @Override - protected void throwIfCrossPartitionScanOrderingOnBlobColumnNotSupported( - ScanAll scanAll, TableMetadata metadata) { + protected void checkOrderingsForScanAll(ScanAll scanAll, TableMetadata metadata) { + super.checkOrderingsForScanAll(scanAll, metadata); rdbEngine.throwIfCrossPartitionScanOrderingOnBlobColumnNotSupported(scanAll, metadata); } } diff --git a/core/src/test/java/com/scalar/db/common/checker/OperationCheckerTest.java b/core/src/test/java/com/scalar/db/common/checker/OperationCheckerTest.java index 20adf13bc3..e734368dca 100644 --- a/core/src/test/java/com/scalar/db/common/checker/OperationCheckerTest.java +++ b/core/src/test/java/com/scalar/db/common/checker/OperationCheckerTest.java @@ -4,9 +4,8 @@ import static org.assertj.core.api.Assertions.assertThatCode; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.Assertions.catchException; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.mockito.Mockito.any; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import com.scalar.db.api.ConditionBuilder; @@ -19,7 +18,6 @@ import com.scalar.db.api.Put; import com.scalar.db.api.Scan; import com.scalar.db.api.Scan.Ordering; -import com.scalar.db.api.ScanAll; import com.scalar.db.api.StorageInfo; import com.scalar.db.api.TableMetadata; import com.scalar.db.api.Update; @@ -442,15 +440,10 @@ public void whenCheckingScanAllOperationWithCrossPartitionScanEnabledWithOrderin when(databaseConfig.isCrossPartitionScanEnabled()).thenReturn(true); when(databaseConfig.isCrossPartitionScanOrderingEnabled()).thenReturn(true); - operationChecker = - spy(new OperationChecker(databaseConfig, metadataManager, storageInfoProvider)); - - // Act - operationChecker.check(scan); + operationChecker = new OperationChecker(databaseConfig, metadataManager, storageInfoProvider); - // Assert - verify(operationChecker) - .throwIfCrossPartitionScanOrderingOnBlobColumnNotSupported((ScanAll) scan, metadata); + // Act Assert + assertDoesNotThrow(() -> operationChecker.check(scan)); } @Test diff --git a/core/src/test/java/com/scalar/db/storage/jdbc/JdbcOperationCheckerTest.java b/core/src/test/java/com/scalar/db/storage/jdbc/JdbcOperationCheckerTest.java index 2bf81e4dda..1793086e2e 100644 --- a/core/src/test/java/com/scalar/db/storage/jdbc/JdbcOperationCheckerTest.java +++ b/core/src/test/java/com/scalar/db/storage/jdbc/JdbcOperationCheckerTest.java @@ -32,12 +32,10 @@ public void setUp() throws Exception { } @Test - public void - throwIfCrossPartitionScanOrderingOnBlobColumnNotSupported_ShouldDelegateToRdbEngine() { + public void checkOrderingsForScanAll_ShouldInvokeFurtherCheckOnRdbEngine() { // Arrange // Act - operationChecker.throwIfCrossPartitionScanOrderingOnBlobColumnNotSupported( - scanAll, tableMetadata); + operationChecker.checkOrderingsForScanAll(scanAll, tableMetadata); // Assert verify(rdbEngine) From 897a4b6600b0703e3f17d43541d3f59287388c8c Mon Sep 17 00:00:00 2001 From: Vincent Guilpain Date: Mon, 22 Sep 2025 10:52:19 +0900 Subject: [PATCH 5/8] Rename error codes --- core/src/main/java/com/scalar/db/common/CoreError.java | 4 ++-- .../java/com/scalar/db/storage/jdbc/RdbEngineDb2.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/com/scalar/db/common/CoreError.java b/core/src/main/java/com/scalar/db/common/CoreError.java index 55ab5ef94d..3b830bfd73 100644 --- a/core/src/main/java/com/scalar/db/common/CoreError.java +++ b/core/src/main/java/com/scalar/db/common/CoreError.java @@ -736,13 +736,13 @@ public enum CoreError implements ScalarDbError { "The BOOLEAN type is not supported for index columns in DynamoDB. Column: %s", "", ""), - DB2_INDEX_OR_KEY_ON_BLOB_COLUMN_NOT_SUPPORTED( + JDBC_DB2_INDEX_OR_KEY_ON_BLOB_COLUMN_NOT_SUPPORTED( Category.USER_ERROR, "0227", "With Db2, using a BLOB column as partition key, clustering key or secondary index is not supported.", "", ""), - DB2_CROSS_PARTITION_SCAN_ORDERING_ON_BLOB_COLUMN_NOT_SUPPORTED( + JDBC_DB2_CROSS_PARTITION_SCAN_ORDERING_ON_BLOB_COLUMN_NOT_SUPPORTED( Category.USER_ERROR, "0228", "With Db2, setting an ordering on a BLOB column when using a cross partition scan operation is not supported. Ordering: %s", diff --git a/core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineDb2.java b/core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineDb2.java index 810ea66a53..aed243dc89 100644 --- a/core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineDb2.java +++ b/core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineDb2.java @@ -390,7 +390,7 @@ public String getDataTypeForKey(DataType dataType) { return "VARCHAR(" + keyColumnSize + ") NOT NULL"; case BLOB: throw new UnsupportedOperationException( - CoreError.DB2_INDEX_OR_KEY_ON_BLOB_COLUMN_NOT_SUPPORTED.buildMessage()); + CoreError.JDBC_DB2_INDEX_OR_KEY_ON_BLOB_COLUMN_NOT_SUPPORTED.buildMessage()); default: return getDataTypeForEngine(dataType) + " NOT NULL"; } @@ -404,7 +404,7 @@ public String getDataTypeForSecondaryIndex(DataType dataType) { return "VARCHAR(" + keyColumnSize + ")"; case BLOB: throw new UnsupportedOperationException( - CoreError.DB2_INDEX_OR_KEY_ON_BLOB_COLUMN_NOT_SUPPORTED.buildMessage()); + CoreError.JDBC_DB2_INDEX_OR_KEY_ON_BLOB_COLUMN_NOT_SUPPORTED.buildMessage()); default: return null; } @@ -563,8 +563,8 @@ public void throwIfCrossPartitionScanOrderingOnBlobColumnNotSupported( .findFirst(); if (orderingOnBlobColumn.isPresent()) { throw new UnsupportedOperationException( - CoreError.DB2_CROSS_PARTITION_SCAN_ORDERING_ON_BLOB_COLUMN_NOT_SUPPORTED.buildMessage( - orderingOnBlobColumn.get())); + CoreError.JDBC_DB2_CROSS_PARTITION_SCAN_ORDERING_ON_BLOB_COLUMN_NOT_SUPPORTED + .buildMessage(orderingOnBlobColumn.get())); } } } From 795b2e621348b13346b08a3c2014432a441ae4a4 Mon Sep 17 00:00:00 2001 From: Vincent Guilpain Date: Mon, 22 Sep 2025 10:58:25 +0900 Subject: [PATCH 6/8] Fix unit test --- core/src/test/java/com/scalar/db/storage/jdbc/JdbcAdminTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/core/src/test/java/com/scalar/db/storage/jdbc/JdbcAdminTest.java b/core/src/test/java/com/scalar/db/storage/jdbc/JdbcAdminTest.java index 7165a52b62..ec62a3892b 100644 --- a/core/src/test/java/com/scalar/db/storage/jdbc/JdbcAdminTest.java +++ b/core/src/test/java/com/scalar/db/storage/jdbc/JdbcAdminTest.java @@ -4381,7 +4381,6 @@ void createTableInternal_WithBlobColumnAsKeyOrIndex_ShouldThrowUnsupportedOperat .addPartitionKey("pk") .addClusteringKey("ck") .addColumn("pk", DataType.INT) - .addColumn("ck", DataType.INT) .addColumn("ck", DataType.BLOB) .build(); TableMetadata metadata3 = From bfd71913bba7e1d5879e53c99ed56bb01b1348fd Mon Sep 17 00:00:00 2001 From: Vincent Guilpain Date: Wed, 24 Sep 2025 11:03:39 +0900 Subject: [PATCH 7/8] Add unit test --- .../jdbc/JdbcOperationCheckerTest.java | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/core/src/test/java/com/scalar/db/storage/jdbc/JdbcOperationCheckerTest.java b/core/src/test/java/com/scalar/db/storage/jdbc/JdbcOperationCheckerTest.java index 1793086e2e..efe0061c41 100644 --- a/core/src/test/java/com/scalar/db/storage/jdbc/JdbcOperationCheckerTest.java +++ b/core/src/test/java/com/scalar/db/storage/jdbc/JdbcOperationCheckerTest.java @@ -1,5 +1,7 @@ package com.scalar.db.storage.jdbc; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.verify; import com.scalar.db.api.ScanAll; @@ -7,6 +9,7 @@ import com.scalar.db.common.StorageInfoProvider; import com.scalar.db.common.TableMetadataManager; import com.scalar.db.config.DatabaseConfig; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mock; @@ -32,7 +35,7 @@ public void setUp() throws Exception { } @Test - public void checkOrderingsForScanAll_ShouldInvokeFurtherCheckOnRdbEngine() { + public void checkOrderingsForScanAll_ShouldInvokeAdditionalCheckOnRdbEngine() { // Arrange // Act operationChecker.checkOrderingsForScanAll(scanAll, tableMetadata); @@ -41,4 +44,20 @@ public void checkOrderingsForScanAll_ShouldInvokeFurtherCheckOnRdbEngine() { verify(rdbEngine) .throwIfCrossPartitionScanOrderingOnBlobColumnNotSupported(scanAll, tableMetadata); } + + @Test + public void checkOrderingsForScanAll_WhenAdditionalCheckThrows_ShouldPropagateException() { + // Arrange + Exception exception = new RuntimeException(); + doThrow(exception).when(rdbEngine).throwIfCrossPartitionScanOrderingOnBlobColumnNotSupported(any(), any()); + + // Act + Assertions.assertThatThrownBy( + () -> operationChecker.checkOrderingsForScanAll(scanAll, tableMetadata)) + .isEqualTo(exception); + + // Assert + verify(rdbEngine) + .throwIfCrossPartitionScanOrderingOnBlobColumnNotSupported(scanAll, tableMetadata); + } } From 40007af522b1c83b3da5d2db4bd988fd194a7759 Mon Sep 17 00:00:00 2001 From: Vincent Guilpain Date: Wed, 24 Sep 2025 11:42:38 +0900 Subject: [PATCH 8/8] Fix format --- .../scalar/db/storage/jdbc/JdbcOperationCheckerTest.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/src/test/java/com/scalar/db/storage/jdbc/JdbcOperationCheckerTest.java b/core/src/test/java/com/scalar/db/storage/jdbc/JdbcOperationCheckerTest.java index efe0061c41..0a0f8cdf6e 100644 --- a/core/src/test/java/com/scalar/db/storage/jdbc/JdbcOperationCheckerTest.java +++ b/core/src/test/java/com/scalar/db/storage/jdbc/JdbcOperationCheckerTest.java @@ -45,11 +45,13 @@ public void checkOrderingsForScanAll_ShouldInvokeAdditionalCheckOnRdbEngine() { .throwIfCrossPartitionScanOrderingOnBlobColumnNotSupported(scanAll, tableMetadata); } - @Test + @Test public void checkOrderingsForScanAll_WhenAdditionalCheckThrows_ShouldPropagateException() { // Arrange Exception exception = new RuntimeException(); - doThrow(exception).when(rdbEngine).throwIfCrossPartitionScanOrderingOnBlobColumnNotSupported(any(), any()); + doThrow(exception) + .when(rdbEngine) + .throwIfCrossPartitionScanOrderingOnBlobColumnNotSupported(any(), any()); // Act Assertions.assertThatThrownBy(