From 564d30ad8e058ef4af9b834659e5c5b66ea5d6d2 Mon Sep 17 00:00:00 2001 From: dhingarkan Date: Tue, 30 Sep 2025 17:22:57 +0900 Subject: [PATCH] Fix Accord transaction error message when altering a table patch by Motoki Unno; reviewed by Dmitry Konstantinov, Stefan Miklosovic for CASSANDRA-20580 --- CHANGES.txt | 1 + .../cassandra/cql3/statements/schema/AlterTableStatement.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.txt b/CHANGES.txt index 2bbecfca5a..46e8b5fc1e 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 6.0-alpha2 + * Fix Accord transaction error message when altering a table (CASSANDRA-20580) * Depend only on platform-specific Zstd JNI native libraries (CASSANDRA-21483) * Expose immediately-executed tasks in the queries virtual table (CASSANDRA-21471) * Avoid potential deadlock between GlobalLogFollower and GossipStage (CASSANDRA-21384) diff --git a/src/java/org/apache/cassandra/cql3/statements/schema/AlterTableStatement.java b/src/java/org/apache/cassandra/cql3/statements/schema/AlterTableStatement.java index aee1496cb5..09501c8446 100644 --- a/src/java/org/apache/cassandra/cql3/statements/schema/AlterTableStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/schema/AlterTableStatement.java @@ -653,7 +653,7 @@ public abstract class AlterTableStatement extends AlterSchemaStatement boolean forceMigrationChange = modeChange && explicitlySetMigrationFrom && next.transactionalMigrationFrom != newMigrateFrom; if (modeChange && next.transactionalMode.accordIsEnabled && !DatabaseDescriptor.getAccordTransactionsEnabled()) - throw ire(format("Cannot change transactional mode to %s for %s.%s with accord_transactions_enabled set to false", + throw ire(format("Cannot change transactional mode to %s for %s.%s with accord.enabled set to false", next.transactionalMode, keyspaceName, tableName)); // user is manually updating migration mode, don't interfere