You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by dc...@apache.org on 2020/12/19 00:49:21 UTC
[cassandra-dtest] branch trunk updated (7ba3bdd -> f9c46ad)
This is an automated email from the ASF dual-hosted git repository.
dcapwell pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git.
from 7ba3bdd Use the token allocation strategy generator tool for 4.0 vnode clusters, from CASSANDRA-16205
new c1a5982 Fix upgrade python dtest test_static_columns_with_2i - upgrade_tests.cql_tests.TestCQLNodes
new f9c46ad Fix upgrade python dtest test_static_columns_with_2i - upgrade_tests.cql_tests.TestCQLNodes
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
upgrade_tests/cql_tests.py | 5 +++--
upgrade_tests/upgrade_manifest.py | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra-dtest] 02/02: Fix upgrade python dtest
test_static_columns_with_2i - upgrade_tests.cql_tests.TestCQLNodes
Posted by dc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dcapwell pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
commit f9c46ad462d894b3c08b3a547cdfc6ba21b49e53
Author: Adam Holmberg <ad...@datastax.com>
AuthorDate: Fri Dec 18 14:37:18 2020 -0800
Fix upgrade python dtest test_static_columns_with_2i - upgrade_tests.cql_tests.TestCQLNodes
patch by Adam Holmberg; reviewed by Caleb Rackliffe, David Capwell for CASSANDRA-16332
---
upgrade_tests/upgrade_manifest.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/upgrade_tests/upgrade_manifest.py b/upgrade_tests/upgrade_manifest.py
index be481a8..05e566e 100644
--- a/upgrade_tests/upgrade_manifest.py
+++ b/upgrade_tests/upgrade_manifest.py
@@ -136,7 +136,7 @@ indev_3_0_x = VersionMeta(name='indev_3_0_x', family='3.0', variant='indev', ver
current_3_0_x = VersionMeta(name='current_3_0_x', family='3.0', variant='current', version='3.0.23', min_proto_v=3, max_proto_v=4, java_versions=(8,))
indev_3_11_x = VersionMeta(name='indev_3_11_x', family='3.11', variant='indev', version='github:apache/cassandra-3.11', min_proto_v=3, max_proto_v=4, java_versions=(8,))
-current_3_11_x = VersionMeta(name='current_3_11_x', family='3.11', variant='current', version='github:apache/cassandra-3.11', min_proto_v=3, max_proto_v=4, java_versions=(8,))
+current_3_11_x = VersionMeta(name='current_3_11_x', family='3.11', variant='current', version='3.11.9', min_proto_v=3, max_proto_v=4, java_versions=(8,))
indev_trunk = VersionMeta(name='indev_trunk', family='trunk', variant='indev', version='github:apache/trunk', min_proto_v=4, max_proto_v=5, java_versions=(8,))
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra-dtest] 01/02: Fix upgrade python dtest
test_static_columns_with_2i - upgrade_tests.cql_tests.TestCQLNodes
Posted by dc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dcapwell pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
commit c1a59823ef1595a3918e5b476b286f81672eb2cb
Author: Adam Holmberg <ad...@datastax.com>
AuthorDate: Fri Dec 18 14:37:18 2020 -0800
Fix upgrade python dtest test_static_columns_with_2i - upgrade_tests.cql_tests.TestCQLNodes
patch by Adam Holmberg; reviewed by Caleb Rackliffe, David Capwell for CASSANDRA-16332
---
upgrade_tests/cql_tests.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/upgrade_tests/cql_tests.py b/upgrade_tests/cql_tests.py
index 1ce95ba..5c9ec78 100644
--- a/upgrade_tests/cql_tests.py
+++ b/upgrade_tests/cql_tests.py
@@ -4109,6 +4109,7 @@ class TestCQL(UpgradeTester):
def test_static_columns_with_2i(self):
cursor = self.prepare()
+ initial_version = self.cluster.version()
cursor.execute("""
CREATE TABLE test (
@@ -4133,8 +4134,8 @@ class TestCQL(UpgradeTester):
assert_all(cursor, "SELECT * FROM test WHERE v = 1", [[0, 0, 42, 1], [0, 1, 42, 1]])
assert_all(cursor, "SELECT p, s FROM test WHERE v = 1", [[0, 42], [1, 42]])
assert_all(cursor, "SELECT p FROM test WHERE v = 1", [[0], [1]])
- # We don't support that
- assert_invalid(cursor, "SELECT s FROM test WHERE v = 1")
+ if initial_version >= LooseVersion('3.11.7'): # See CASSANDRA-16332. This fails with a known limitation on versions before 3.11.7 (CASSANDRA-14242)
+ assert_all(cursor, "SELECT s FROM test WHERE v = 1", [[42], [42]])
@since('2.1')
def test_static_columns_with_distinct(self):
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org