Remove deprecated Cluster.submit_schema_refresh

aholmberg · aholmberg · commit 574266d1bf13 · 2015-10-06T10:14:51.000-05:00
diff --git a/cassandra/cluster.py b/cassandra/cluster.py
@@ -1225,24 +1225,6 @@ def _target_type_from_refresh_args(keyspace, table, usertype, function, aggregat
             return SchemaTargetType.KEYSPACE
         return None
 
-    def submit_schema_refresh(self, keyspace=None, table=None, usertype=None, function=None, aggregate=None):
-        """
-        .. deprecated:: 2.6.0
-            Use refresh_*_metadata instead
-
-        Schedule a refresh of the internal representation of the current
-        schema for this cluster.  See :meth:`~.refresh_schema` for description of parameters.
-        """
-        msg = "submit_schema_refresh is deprecated. Use Cluster.refresh_*_metadata instead."
-        warnings.warn(msg, DeprecationWarning)
-        log.warning(msg)
-
-        self._validate_refresh_schema(keyspace, table, usertype, function, aggregate)
-        target_type = self._target_type_from_refresh_args(keyspace, table, usertype, function, aggregate)
-        return self.executor.submit(
-            self.control_connection.refresh_schema, target_type=target_type, keyspace=keyspace, table=table,
-            type=usertype, function=function, aggregate=aggregate)
-
     def refresh_schema_metadata(self, max_schema_agreement_wait=None):
         """
         Synchronously refresh all schema metadata.
diff --git a/tests/integration/standard/test_cluster.py b/tests/integration/standard/test_cluster.py
@@ -254,32 +254,6 @@ def test_cluster_settings(self):
         cluster.set_max_connections_per_host(HostDistance.LOCAL, max_connections_per_host + 1)
         self.assertEqual(cluster.get_max_connections_per_host(HostDistance.LOCAL), max_connections_per_host + 1)
 
-    def test_submit_schema_refresh(self):
-        """
-        Ensure new new schema is refreshed after submit_schema_refresh()
-        """
-
-        cluster = Cluster(protocol_version=PROTOCOL_VERSION)
-        cluster.connect()
-        self.assertNotIn("newkeyspace", cluster.metadata.keyspaces)
-
-        other_cluster = Cluster(protocol_version=PROTOCOL_VERSION)
-        session = other_cluster.connect()
-        execute_until_pass(session,
-            """
-            CREATE KEYSPACE newkeyspace
-            WITH replication = {'class': 'SimpleStrategy', 'replication_factor': '1'}
-            """)
-
-        future = cluster.submit_schema_refresh()
-        future.result()
-
-        self.assertIn("newkeyspace", cluster.metadata.keyspaces)
-
-        execute_until_pass(session, "DROP KEYSPACE newkeyspace")
-        cluster.shutdown()
-        other_cluster.shutdown()
-
     def test_refresh_schema(self):
         cluster = Cluster(protocol_version=PROTOCOL_VERSION)
         session = cluster.connect()
@@ -605,10 +579,6 @@ def test_pool_management(self):
         cluster.refresh_schema_metadata()
         cluster.refresh_schema_metadata(max_schema_agreement_wait=0)
 
-        # submit schema refresh
-        future = cluster.submit_schema_refresh()
-        future.result()
-
         assert_quiescent_pool_state(self, cluster)
 
         cluster.shutdown()
