This is an automated email from the ASF dual-hosted git repository.
samt pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
The following commit(s) were added to refs/heads/trunk by this push:
new 13b26564 Fix dtest failing after CASSANDRA-19592
13b26564 is described below
commit 13b265647b510b5caaa1b3dd978b165e4e512214
Author: Alex Petrov <[email protected]>
AuthorDate: Tue May 7 11:39:20 2024 +0200
Fix dtest failing after CASSANDRA-19592
Patch by Alex Petrov; reviewed by Sam Tunnicliffe for CASSANDRA-19592
---
cqlsh_tests/test_cqlsh.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/cqlsh_tests/test_cqlsh.py b/cqlsh_tests/test_cqlsh.py
index 8a1b03d5..3619aa76 100644
--- a/cqlsh_tests/test_cqlsh.py
+++ b/cqlsh_tests/test_cqlsh.py
@@ -1455,8 +1455,8 @@ CREATE TYPE test.address_type (
def get_index_output(self, index, ks, table, col):
# a quoted index name (e.g. "FooIndex") is only correctly echoed by
DESCRIBE
# from 3.0.14 & 3.11
+ version = self.cluster.version()
if index[0] == '"' and index[-1] == '"':
- version = self.cluster.version()
if version >= LooseVersion('3.11'):
pass
elif LooseVersion('3.1') > version >= LooseVersion('3.0.14'):
@@ -1467,7 +1467,8 @@ CREATE TYPE test.address_type (
if self.dtest_config.latest_config:
return "CREATE CUSTOM INDEX {} ON {}.{} ({}) USING
'sai';".format(index, ks, table, col)
else:
- return "CREATE INDEX {} ON {}.{} ({});".format(index, ks, table,
col)
+ suffix = " USING 'legacy_local_table'" if version >=
LooseVersion('5.1') else ""
+ return "CREATE INDEX {} ON {}.{} ({}){};".format(index, ks, table,
col, suffix)
def get_users_by_state_mv_output(self):
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
