Skip to content

Commit 412f6f9

Browse files
committed
Fix Cassandra case insensitive issue
1 parent 2c10b36 commit 412f6f9

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

core/src/main/java/com/scalar/db/storage/cassandra/CassandraAdmin.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ private void upsertIntoNamespacesTable(String keyspace) {
139139
String insertQuery =
140140
QueryBuilder.insertInto(
141141
quoteIfNecessary(metadataKeyspace), quoteIfNecessary(NAMESPACES_TABLE))
142-
.value(NAMESPACES_NAME_COL, quoteIfNecessary(keyspace))
142+
.value(NAMESPACES_NAME_COL, keyspace)
143143
.toString();
144144
clusterManager.getSession().execute(insertQuery);
145145
}
@@ -180,7 +180,7 @@ private void deleteFromNamespacesTable(String keyspace) {
180180
String deleteQuery =
181181
QueryBuilder.delete()
182182
.from(quoteIfNecessary(metadataKeyspace), quoteIfNecessary(NAMESPACES_TABLE))
183-
.where(QueryBuilder.eq(NAMESPACES_NAME_COL, quoteIfNecessary(keyspace)))
183+
.where(QueryBuilder.eq(NAMESPACES_NAME_COL, keyspace))
184184
.toString();
185185
clusterManager.getSession().execute(deleteQuery);
186186
}
@@ -349,7 +349,7 @@ public boolean namespaceExists(String namespace) throws ExecutionException {
349349
String query =
350350
QueryBuilder.select(NAMESPACES_NAME_COL)
351351
.from(quoteIfNecessary(metadataKeyspace), quoteIfNecessary(NAMESPACES_TABLE))
352-
.where(QueryBuilder.eq(NAMESPACES_NAME_COL, quoteIfNecessary(namespace)))
352+
.where(QueryBuilder.eq(NAMESPACES_NAME_COL, namespace))
353353
.toString();
354354
ResultSet resultSet = clusterManager.getSession().execute(query);
355355

@@ -396,7 +396,7 @@ public void addNewColumnToTable(
396396
}
397397
try {
398398
String alterTableQuery =
399-
SchemaBuilder.alterTable(namespace, table)
399+
SchemaBuilder.alterTable(quoteIfNecessary(namespace), quoteIfNecessary(table))
400400
.addColumn(columnName)
401401
.type(toCassandraDataType(columnType))
402402
.getQueryString();

core/src/test/java/com/scalar/db/storage/cassandra/CassandraAdminTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ private void verifyInsertIntoKeyspacesTableQuery(String keyspace) {
229229
QueryBuilder.insertInto(
230230
quoteIfNecessary(METADATA_KEYSPACE),
231231
quoteIfNecessary(CassandraAdmin.NAMESPACES_TABLE))
232-
.value(CassandraAdmin.NAMESPACES_NAME_COL, quoteIfNecessary(keyspace))
232+
.value(CassandraAdmin.NAMESPACES_NAME_COL, keyspace)
233233
.toString();
234234
verify(cassandraSession).execute(query);
235235
}
@@ -569,7 +569,7 @@ private void verifyDeleteFromKeyspacesTableQuery(String keyspace) {
569569
.from(
570570
quoteIfNecessary(METADATA_KEYSPACE),
571571
quoteIfNecessary(CassandraAdmin.NAMESPACES_TABLE))
572-
.where(QueryBuilder.eq(CassandraAdmin.NAMESPACES_NAME_COL, quoteIfNecessary(keyspace)))
572+
.where(QueryBuilder.eq(CassandraAdmin.NAMESPACES_NAME_COL, keyspace))
573573
.toString();
574574
verify(cassandraSession).execute(query);
575575
}

integration-test/src/main/java/com/scalar/db/api/DistributedStorageAdminIntegrationTestBase.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ public abstract class DistributedStorageAdminIntegrationTestBase {
3636
LoggerFactory.getLogger(DistributedStorageAdminIntegrationTestBase.class);
3737

3838
private static final String TEST_NAME = "storage_admin";
39-
private static final String NAMESPACE1 = "int_test_" + TEST_NAME + "1";
40-
private static final String NAMESPACE2 = "int_test_" + TEST_NAME + "2";
41-
private static final String NAMESPACE3 = "int_test_" + TEST_NAME + "3";
42-
private static final String TABLE1 = "test_table1";
43-
private static final String TABLE2 = "test_table2";
44-
private static final String TABLE3 = "test_table3";
45-
private static final String TABLE4 = "test_table4";
39+
private static final String NAMESPACE1 = "Int_test_" + TEST_NAME + "1";
40+
private static final String NAMESPACE2 = "Int_test_" + TEST_NAME + "2";
41+
private static final String NAMESPACE3 = "Int_test_" + TEST_NAME + "3";
42+
private static final String TABLE1 = "Test_table1";
43+
private static final String TABLE2 = "Test_table2";
44+
private static final String TABLE3 = "Test_table3";
45+
private static final String TABLE4 = "Test_table4";
4646
private static final String COL_NAME1 = "c1";
4747
private static final String COL_NAME2 = "c2";
4848
private static final String COL_NAME3 = "c3";

0 commit comments

Comments
 (0)