This is an automated email from the ASF dual-hosted git repository.
dcapwell pushed a commit to branch cep-15-accord
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cep-15-accord by this push:
new 9ca1e1ac2d Ninja for CASSANDRA-19305: Disable EphemeralRead by default
to get benchmarks stable
9ca1e1ac2d is described below
commit 9ca1e1ac2dd9d1841e22e3205e3feb8236b26487
Author: ci worker <[email protected]>
AuthorDate: Thu Mar 28 20:03:39 2024 -0700
Ninja for CASSANDRA-19305: Disable EphemeralRead by default to get
benchmarks stable
---
src/java/org/apache/cassandra/config/AccordSpec.java | 1 +
src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 4 ++++
.../org/apache/cassandra/cql3/statements/TransactionStatement.java | 6 ++++--
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/java/org/apache/cassandra/config/AccordSpec.java
b/src/java/org/apache/cassandra/config/AccordSpec.java
index e76745a233..ab80ec4b32 100644
--- a/src/java/org/apache/cassandra/config/AccordSpec.java
+++ b/src/java/org/apache/cassandra/config/AccordSpec.java
@@ -69,4 +69,5 @@ public class AccordSpec
* default transactional mode for tables created by this node when no
transactional mode has been specified in the DDL
*/
public TransactionalMode default_transactional_mode =
TransactionalMode.off;
+ public boolean ephemeralReadEnabled = false;
}
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 7273f3c5c7..8e98f91b69 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -5379,4 +5379,8 @@ public class DatabaseDescriptor
{
return conf.sai_sstable_indexes_per_query_fail_threshold;
}
+
+ public static boolean getAccordEphemeralReadEnabledEnabled() {
+ return conf.accord.ephemeralReadEnabled;
+ }
}
diff --git
a/src/java/org/apache/cassandra/cql3/statements/TransactionStatement.java
b/src/java/org/apache/cassandra/cql3/statements/TransactionStatement.java
index fa09b8ec7e..68a8fd13f2 100644
--- a/src/java/org/apache/cassandra/cql3/statements/TransactionStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/TransactionStatement.java
@@ -331,8 +331,10 @@ public class TransactionStatement implements
CQLStatement.CompositeCQLStatement,
List<TxnNamedRead> reads = createNamedReads(options, state,
ImmutableMap.of(), keySet::add);
Keys txnKeys = toKeys(keySet);
TxnRead read = createTxnRead(reads, txnKeys, null);
- Txn.Kind kind = txnKeys.size() == 1 &&
transactionalModeForSingleKey(txnKeys) == TransactionalMode.full
- ? EphemeralRead : Read;
+ Txn.Kind kind = txnKeys.size() == 1
+ && transactionalModeForSingleKey(txnKeys) ==
TransactionalMode.full
+ &&
DatabaseDescriptor.getAccordEphemeralReadEnabledEnabled()
+ ? EphemeralRead : Read;
return new Txn.InMemory(kind, txnKeys, read, TxnQuery.ALL, null);
}
else
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
