Refactor: simplify tablet check by removing redundant table_has_tablets call

Co-authored-by: mykaul <4655593+mykaul@users.noreply.github.com>

Author: Copilot

cassandra/policies.py

@@ -520,13 +520,12 @@ def make_query_plan(self, working_keyspace=None, query=None):
         child_plan = list(child.make_query_plan(keyspace, query))
 
         replicas = []
-        if self._cluster_metadata._tablets.table_has_tablets(keyspace, query.table):
-            tablet = self._cluster_metadata._tablets.get_tablet_for_key(
+        tablet = self._cluster_metadata._tablets.get_tablet_for_key(
             keyspace, query.table, self._cluster_metadata.token_map.token_class.from_key(query.routing_key))
 
-            if tablet is not None:
-                replicas_mapped = set(map(lambda r: r[0], tablet.replicas))
-                replicas = [host for host in child_plan if host.host_id in replicas_mapped]
+        if tablet is not None:
+            replicas_mapped = set(map(lambda r: r[0], tablet.replicas))
+            replicas = [host for host in child_plan if host.host_id in replicas_mapped]
         else:
             replicas = self._cluster_metadata.get_replicas(keyspace, query.routing_key)
 

tests/unit/test_policies.py

@@ -584,7 +584,7 @@ def test_wrap_round_robin(self):
         cluster = Mock(spec=Cluster)
         cluster.metadata = Mock(spec=Metadata)
         cluster.metadata._tablets = Mock(spec=Tablets)
-        cluster.metadata._tablets.table_has_tablets.return_value = []
+        cluster.metadata._tablets.get_tablet_for_key.return_value = None
         hosts = [Host(DefaultEndPoint(str(i)), SimpleConvictionPolicy) for i in range(4)]
         for host in hosts:
             host.set_up()
@@ -617,7 +617,7 @@ def test_wrap_dc_aware(self):
         cluster = Mock(spec=Cluster)
         cluster.metadata = Mock(spec=Metadata)
         cluster.metadata._tablets = Mock(spec=Tablets)
-        cluster.metadata._tablets.table_has_tablets.return_value = []
+        cluster.metadata._tablets.get_tablet_for_key.return_value = None
         hosts = [Host(DefaultEndPoint(str(i)), SimpleConvictionPolicy) for i in range(4)]
         for host in hosts:
             host.set_up()
@@ -666,7 +666,7 @@ def test_wrap_rack_aware(self):
         cluster = Mock(spec=Cluster)
         cluster.metadata = Mock(spec=Metadata)
         cluster.metadata._tablets = Mock(spec=Tablets)
-        cluster.metadata._tablets.table_has_tablets.return_value = []
+        cluster.metadata._tablets.get_tablet_for_key.return_value = None
         hosts = [Host(DefaultEndPoint(str(i)), SimpleConvictionPolicy) for i in range(8)]
         for host in hosts:
             host.set_up()
@@ -811,7 +811,7 @@ def test_statement_keyspace(self):
         cluster.metadata._tablets = Mock(spec=Tablets)
         replicas = hosts[2:]
         cluster.metadata.get_replicas.return_value = replicas
-        cluster.metadata._tablets.table_has_tablets.return_value = []
+        cluster.metadata._tablets.get_tablet_for_key.return_value = None
 
         child_policy = Mock()
         child_policy.make_query_plan.return_value = hosts
@@ -904,7 +904,7 @@ def _prepare_cluster_with_vnodes(self):
         cluster.metadata._tablets = Mock(spec=Tablets)
         cluster.metadata.all_hosts.return_value = hosts
         cluster.metadata.get_replicas.return_value = hosts[2:]
-        cluster.metadata._tablets.table_has_tablets.return_value = False
+        cluster.metadata._tablets.get_tablet_for_key.return_value = None
         return cluster
 
     def _prepare_cluster_with_tablets(self):
@@ -916,7 +916,6 @@ def _prepare_cluster_with_tablets(self):
         cluster.metadata._tablets = Mock(spec=Tablets)
         cluster.metadata.all_hosts.return_value = hosts
         cluster.metadata.get_replicas.return_value = hosts[2:]
-        cluster.metadata._tablets.table_has_tablets.return_value = True
         cluster.metadata._tablets.get_tablet_for_key.return_value = Tablet(replicas=[(h.host_id, 0) for h in hosts[2:]])
         return cluster
 
@@ -931,8 +930,6 @@ def _assert_shuffle(self, patched_shuffle, cluster, keyspace, routing_key):
         policy = TokenAwarePolicy(child_policy, shuffle_replicas=True)
         policy.populate(cluster, hosts)
 
-        is_tablets = cluster.metadata._tablets.table_has_tablets()
-
         cluster.metadata.get_replicas.reset_mock()
         child_policy.make_query_plan.reset_mock()
         query = Statement(routing_key=routing_key)
@@ -964,7 +961,7 @@ def test_child_make_query_plan_called_once(self):
         cluster = Mock(spec=Cluster)
         cluster.metadata = Mock(spec=Metadata)
         cluster.metadata._tablets = Mock(spec=Tablets)
-        cluster.metadata._tablets.table_has_tablets.return_value = False
+        cluster.metadata._tablets.get_tablet_for_key.return_value = None  # No tablets for this table
         replicas = hosts[2:]
         cluster.metadata.get_replicas.return_value = replicas
 
@@ -996,7 +993,6 @@ def test_child_make_query_plan_called_once(self):
         child_policy.make_query_plan.assert_called_once_with(None, query)
 
         # Test case 4: With tablets (should call once)
-        cluster.metadata._tablets.table_has_tablets.return_value = True
         tablet = Mock(spec=Tablet)
         tablet.replicas = [(hosts[0].host_id, None), (hosts[1].host_id, None)]
         cluster.metadata._tablets.get_tablet_for_key.return_value = tablet
@@ -1695,7 +1691,7 @@ def get_replicas(keyspace, packed_key):
 
         cluster.metadata.get_replicas.side_effect = get_replicas
         cluster.metadata._tablets = Mock(spec=Tablets)
-        cluster.metadata._tablets.table_has_tablets.return_value = []
+        cluster.metadata._tablets.get_tablet_for_key.return_value = None
 
         child_policy = TokenAwarePolicy(RoundRobinPolicy())