Skip to content

Commit ea2b70f

Browse files
Remove experimental options from tablets implementation
Since 6.0.0 tablets are no longer experimental, so there is no need for stating that it is. Also to test tablets we use scylladb version where there is no need to pass 'consistent-topology-changes' and 'tablets' in 'experimental_features' configuration option.
1 parent 6f26306 commit ea2b70f

File tree

4 files changed

+5
-10
lines changed

4 files changed

+5
-10
lines changed

cassandra/query.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,8 @@ class Statement(object):
254254
table = None
255255
"""
256256
The string name of the table this query acts on. This is used when the tablet
257-
experimental feature is enabled and in the same time :class`~.TokenAwarePolicy`
258-
is configured in the profile load balancing policy.
257+
feature is enabled and in the same time :class`~.TokenAwarePolicy` is configured
258+
in the profile load balancing policy.
259259
"""
260260

261261
custom_payload = None

cassandra/tablets.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# Experimental, this interface and use may change
21
from threading import Lock
32

43

@@ -34,7 +33,6 @@ def from_row(first_token, last_token, replicas):
3433
return None
3534

3635

37-
# Experimental, this interface and use may change
3836
class Tablets(object):
3937
_lock = None
4038
_tablets = {}

tests/integration/__init__.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,7 @@ def start_cluster_wait_for_up(cluster):
506506

507507

508508
def use_cluster(cluster_name, nodes, ipformat=None, start=True, workloads=None, set_keyspace=True, ccm_options=None,
509-
configuration_options=None, dse_options=None, use_single_interface=USE_SINGLE_INTERFACE, use_tablets=False):
509+
configuration_options=None, dse_options=None, use_single_interface=USE_SINGLE_INTERFACE):
510510
configuration_options = configuration_options or {}
511511
dse_options = dse_options or {}
512512
workloads = workloads or []
@@ -616,10 +616,7 @@ def use_cluster(cluster_name, nodes, ipformat=None, start=True, workloads=None,
616616
# CDC is causing an issue (can't start cluster with multiple seeds)
617617
# Selecting only features we need for tests, i.e. anything but CDC.
618618
CCM_CLUSTER = CCMScyllaCluster(path, cluster_name, **ccm_options)
619-
if use_tablets:
620-
CCM_CLUSTER.set_configuration_options({'experimental_features': ['lwt', 'udf', 'consistent-topology-changes', 'tablets'], 'start_native_transport': True})
621-
else:
622-
CCM_CLUSTER.set_configuration_options({'experimental_features': ['lwt', 'udf'], 'start_native_transport': True})
619+
CCM_CLUSTER.set_configuration_options({'experimental_features': ['lwt', 'udf'], 'start_native_transport': True})
623620

624621
CCM_CLUSTER.set_configuration_options({'skip_wait_for_gossip_to_settle': 0})
625622
# Permit IS NOT NULL restriction on non-primary key columns of a materialized view

tests/integration/experiments/test_tablets.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from tests.unit.test_host_connection_pool import LOGGER
1010

1111
def setup_module():
12-
use_cluster('tablets', [3], start=True, use_tablets=True)
12+
use_cluster('tablets', [3], start=True)
1313

1414
class TestTabletsIntegration(unittest.TestCase):
1515
@classmethod

0 commit comments

Comments
 (0)