Fix to handle an issue where Cassandra does not support renaming non-primary key columns

Author: KodaiD

core/src/integration-test/java/com/scalar/db/storage/cassandra/CassandraAdminCaseSensitivityIntegrationTest.java

@@ -5,6 +5,7 @@
 import java.util.Collections;
 import java.util.Map;
 import java.util.Properties;
+import org.junit.jupiter.api.Disabled;
 
 public class CassandraAdminCaseSensitivityIntegrationTest
     extends DistributedStorageAdminCaseSensitivityIntegrationTestBase {
@@ -27,4 +28,12 @@ protected AdminTestUtils getAdminTestUtils(String testName) {
   protected boolean isTimestampTypeSupported() {
     return false;
   }
+
+  @Override
+  @Disabled("Renaming non-primary key columns is not supported in Cassandra")
+  public void renameColumn_ShouldRenameColumnCorrectly() {}
+
+  @Override
+  @Disabled("Renaming non-primary key columns is not supported in Cassandra")
+  public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() {}
 }

core/src/integration-test/java/com/scalar/db/storage/cassandra/CassandraAdminIntegrationTest.java

@@ -5,6 +5,7 @@
 import java.util.Collections;
 import java.util.Map;
 import java.util.Properties;
+import org.junit.jupiter.api.Disabled;
 
 public class CassandraAdminIntegrationTest extends DistributedStorageAdminIntegrationTestBase {
   @Override
@@ -26,4 +27,12 @@ protected AdminTestUtils getAdminTestUtils(String testName) {
   protected boolean isTimestampTypeSupported() {
     return false;
   }
+
+  @Override
+  @Disabled("Renaming non-primary key columns is not supported in Cassandra")
+  public void renameColumn_ShouldRenameColumnCorrectly() {}
+
+  @Override
+  @Disabled("Renaming non-primary key columns is not supported in Cassandra")
+  public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() {}
 }

core/src/integration-test/java/com/scalar/db/storage/cassandra/CassandraAdminPermissionIntegrationTest.java

@@ -2,9 +2,11 @@
 
 import static com.scalar.db.storage.cassandra.CassandraPermissionTestUtils.MAX_RETRY_COUNT;
 import static com.scalar.db.storage.cassandra.CassandraPermissionTestUtils.SLEEP_BETWEEN_RETRIES_SECONDS;
+import static org.assertj.core.api.Assertions.assertThatCode;
 
 import com.google.common.util.concurrent.Uninterruptibles;
 import com.scalar.db.api.DistributedStorageAdminPermissionIntegrationTestBase;
+import com.scalar.db.exception.storage.ExecutionException;
 import com.scalar.db.util.AdminTestUtils;
 import com.scalar.db.util.PermissionTestUtils;
 import java.util.Collections;
@@ -138,4 +140,17 @@ public void addRawColumnToTable_WithSufficientPermission_ShouldSucceed() {}
   @Override
   @Disabled("Import-related functionality is not supported in Cassandra")
   public void importTable_WithSufficientPermission_ShouldSucceed() {}
+
+  @Test
+  @Override
+  public void renameColumn_WithSufficientPermission_ShouldSucceed() throws ExecutionException {
+    // Arrange
+    createNamespaceByRoot();
+    createTableByRoot();
+
+    // Act Assert
+    // Cassandra does not support renaming non-primary key columns
+    assertThatCode(() -> adminForNormalUser.renameColumn(NAMESPACE, TABLE, COL_NAME1, NEW_COL_NAME))
+        .doesNotThrowAnyException();
+  }
 }

core/src/integration-test/java/com/scalar/db/storage/cassandra/ConsensusCommitAdminIntegrationTestWithCassandra.java

@@ -5,6 +5,7 @@
 import java.util.Collections;
 import java.util.Map;
 import java.util.Properties;
+import org.junit.jupiter.api.Disabled;
 
 public class ConsensusCommitAdminIntegrationTestWithCassandra
     extends ConsensusCommitAdminIntegrationTestBase {
@@ -27,4 +28,12 @@ protected AdminTestUtils getAdminTestUtils(String testName) {
   protected boolean isTimestampTypeSupported() {
     return false;
   }
+
+  @Override
+  @Disabled("Renaming non-primary key columns is not supported in Cassandra")
+  public void renameColumn_ShouldRenameColumnCorrectly() {}
+
+  @Override
+  @Disabled("Renaming non-primary key columns is not supported in Cassandra")
+  public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() {}
 }

core/src/integration-test/java/com/scalar/db/storage/cassandra/SingleCrudOperationTransactionAdminIntegrationTestWithCassandra.java

@@ -4,6 +4,7 @@
 import java.util.Collections;
 import java.util.Map;
 import java.util.Properties;
+import org.junit.jupiter.api.Disabled;
 
 public class SingleCrudOperationTransactionAdminIntegrationTestWithCassandra
     extends SingleCrudOperationTransactionAdminIntegrationTestBase {
@@ -22,4 +23,12 @@ protected Map<String, String> getCreationOptions() {
   protected boolean isTimestampTypeSupported() {
     return false;
   }
+
+  @Override
+  @Disabled("Renaming non-primary key columns is not supported in Cassandra")
+  public void renameColumn_ShouldRenameColumnCorrectly() {}
+
+  @Override
+  @Disabled("Renaming non-primary key columns is not supported in Cassandra")
+  public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly() {}
 }

core/src/main/java/com/scalar/db/common/CoreError.java

@@ -706,6 +706,12 @@ public enum CoreError implements ScalarDbError {
       ""),
   DYNAMO_RENAME_COLUMN_NOT_SUPPORTED(
       Category.USER_ERROR, "0221", "DynamoDB does not support the renaming column feature", "", ""),
+  CASSANDRA_RENAME_NON_PRIMARY_KEY_COLUMN_NOT_SUPPORTED(
+      Category.USER_ERROR,
+      "0222",
+      "Cassandra does not support renaming non-primary key columns",
+      "",
+      ""),
 
   //
   // Errors for the concurrency error category

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

@@ -28,13 +28,13 @@ public abstract class DistributedStorageAdminPermissionIntegrationTestBase {
 
   private static final Logger logger =
       LoggerFactory.getLogger(DistributedStorageAdminPermissionIntegrationTestBase.class);
-  private static final String COL_NAME1 = "c1";
-  private static final String COL_NAME2 = "c2";
-  private static final String COL_NAME3 = "c3";
-  private static final String COL_NAME4 = "c4";
-  private static final String RAW_COL_NAME = "raw_col";
-  private static final String NEW_COL_NAME = "new_col";
-  private static final TableMetadata TABLE_METADATA =
+  protected static final String COL_NAME1 = "c1";
+  protected static final String COL_NAME2 = "c2";
+  protected static final String COL_NAME3 = "c3";
+  protected static final String COL_NAME4 = "c4";
+  protected static final String RAW_COL_NAME = "raw_col";
+  protected static final String NEW_COL_NAME = "new_col";
+  protected static final TableMetadata TABLE_METADATA =
       TableMetadata.newBuilder()
           .addColumn(COL_NAME1, DataType.INT)
           .addColumn(COL_NAME2, DataType.TEXT)
@@ -45,8 +45,8 @@ public abstract class DistributedStorageAdminPermissionIntegrationTestBase {
           .addSecondaryIndex(COL_NAME4)
           .build();
 
-  private DistributedStorageAdmin adminForRootUser;
-  private DistributedStorageAdmin adminForNormalUser;
+  protected DistributedStorageAdmin adminForRootUser;
+  protected DistributedStorageAdmin adminForNormalUser;
   private String normalUserName;
   private String normalUserPassword;
 
@@ -424,12 +424,12 @@ protected void sleepBetweenTests() {
     // Default do nothing
   }
 
-  private void createNamespaceByRoot() throws ExecutionException {
+  protected void createNamespaceByRoot() throws ExecutionException {
     adminForRootUser.createNamespace(NAMESPACE, getCreationOptions());
     waitForNamespaceCreation();
   }
 
-  private void createTableByRoot() throws ExecutionException {
+  protected void createTableByRoot() throws ExecutionException {
     adminForRootUser.createTable(NAMESPACE, TABLE, TABLE_METADATA, getCreationOptions());
     waitForTableCreation();
   }