Make all queries to system.local use WHERE clause

Full scan requests slower even when only one record there is

Author: dkropachev

core/src/main/java/com/datastax/oss/driver/internal/core/channel/ProtocolInitHandler.java

@@ -83,7 +83,7 @@
 class ProtocolInitHandler extends ConnectInitHandler {
   private static final Logger LOG = LoggerFactory.getLogger(ProtocolInitHandler.class);
   private static final Query CLUSTER_NAME_QUERY =
-      new Query("SELECT cluster_name FROM system.local");
+      new Query("SELECT cluster_name FROM system.local WHERE key='local'");
 
   private final InternalDriverContext context;
   private final long timeoutMillis;

core/src/main/java/com/datastax/oss/driver/internal/core/metadata/DefaultTopologyMonitor.java

@@ -170,7 +170,8 @@ public CompletionStage<Iterable<NodeInfo>> refreshNodeList() {
 
     savePort(channel);
 
-    CompletionStage<AdminResult> localQuery = query(channel, "SELECT * FROM system.local");
+    CompletionStage<AdminResult> localQuery =
+        query(channel, "select * from system.local where key='local'");
     CompletionStage<AdminResult> peersV2Query = query(channel, "SELECT * FROM system.peers_v2");
     CompletableFuture<AdminResult> peersQuery = new CompletableFuture<>();
 

core/src/test/java/com/datastax/oss/driver/internal/core/channel/ProtocolInitHandlerTest.java

@@ -434,7 +434,7 @@ public void should_check_cluster_name_if_provided() {
     requestFrame = readOutboundFrame();
     assertThat(requestFrame.message).isInstanceOf(Query.class);
     Query query = (Query) requestFrame.message;
-    assertThat(query.query).isEqualTo("SELECT cluster_name FROM system.local");
+    assertThat(query.query).isEqualTo("SELECT cluster_name FROM system.local WHERE key='local'");
     assertThat(connectFuture).isNotDone();
 
     writeInboundFrame(requestFrame, TestResponses.clusterNameResponse("expectedClusterName"));

core/src/test/java/com/datastax/oss/driver/internal/core/metadata/DefaultTopologyMonitorTest.java

@@ -337,7 +337,7 @@ public void should_refresh_node_list_from_local_and_peers() {
     AdminRow peer3 = mockPeersRow(3, UUID.randomUUID());
     AdminRow peer2 = mockPeersRow(2, node2.getHostId());
     topologyMonitor.stubQueries(
-        new StubbedQuery("SELECT * FROM system.local", mockResult(local)),
+        new StubbedQuery("select * from system.local where key='local'", mockResult(local)),
         new StubbedQuery("SELECT * FROM system.peers_v2", Collections.emptyMap(), null, true),
         new StubbedQuery("SELECT * FROM system.peers", mockResult(peer3, peer2)));
 
@@ -447,7 +447,7 @@ public void should_warn_when_control_host_found_in_system_peers() {
     AdminRow peer2 = mockPeersRow(2, node2.getHostId());
     AdminRow peer1 = mockPeersRow(1, node2.getHostId()); // invalid
     topologyMonitor.stubQueries(
-        new StubbedQuery("SELECT * FROM system.local", mockResult(local)),
+        new StubbedQuery("select * from system.local where key='local'", mockResult(local)),
         new StubbedQuery("SELECT * FROM system.peers_v2", Collections.emptyMap(), null, true),
         new StubbedQuery("SELECT * FROM system.peers", mockResult(peer3, peer2, peer1)));
 
@@ -478,7 +478,7 @@ public void should_warn_when_control_host_found_in_system_peers_v2() {
     AdminRow peer2 = mockPeersRow(2, node2.getHostId());
     AdminRow peer1 = mockPeersRow(1, node2.getHostId()); // invalid
     topologyMonitor.stubQueries(
-        new StubbedQuery("SELECT * FROM system.local", mockResult(local)),
+        new StubbedQuery("select * from system.local where key='local'", mockResult(local)),
         new StubbedQuery("SELECT * FROM system.peers_v2", mockResult(peer3, peer2, peer1)));
 
     // When

examples/src/main/java/com/datastax/oss/driver/examples/astra/AstraReadCassandraVersion.java

@@ -64,7 +64,7 @@ public static void main(String[] args) {
 
       // We use execute to send a query to Cassandra. This returns a ResultSet, which
       // is essentially a collection of Row objects.
-      ResultSet rs = session.execute("select release_version from system.local");
+      ResultSet rs = session.execute("select release_version from system.local WHERE key='local'");
       //  Extract the first row (which is the only one in this case).
       Row row = rs.one();
 

examples/src/main/java/com/datastax/oss/driver/examples/basic/ReadCassandraVersion.java

@@ -45,7 +45,7 @@ public static void main(String[] args) {
     try (CqlSession session = CqlSession.builder().build()) {
       // We use execute to send a query to Cassandra. This returns a ResultSet, which
       // is essentially a collection of Row objects.
-      ResultSet rs = session.execute("select release_version from system.local");
+      ResultSet rs = session.execute("select release_version from system.local where key='local'");
       //  Extract the first row (which is the only one in this case).
       Row row = rs.one();
 

integration-tests/src/test/java/com/datastax/dse/driver/api/core/auth/DseGssApiAuthProviderAlternateIT.java

@@ -74,7 +74,7 @@ public static Object[][] saslSystemProperties() {
                         "keyTab",
                         ads.getUserKeytab().getAbsolutePath()))
                 .build())) {
-      Row row = session.execute("select * from system.local").one();
+      Row row = session.execute("select * from system.local where key='local'").one();
       assertThat(row).isNotNull();
     } finally {
       System.clearProperty(saslSystemProperty);
@@ -104,7 +104,7 @@ public void should_authenticate_using_kerberos_with_keytab_and_alternate_service
                         "keyTab",
                         ads.getUserKeytab().getAbsolutePath()))
                 .build())) {
-      Row row = session.execute("select * from system.local").one();
+      Row row = session.execute("select * from system.local where key='local'").one();
       assertThat(row).isNotNull();
     }
   }

integration-tests/src/test/java/com/datastax/dse/driver/api/core/auth/DseGssApiAuthProviderIT.java

@@ -50,7 +50,7 @@ public class DseGssApiAuthProviderIT {
   @Test
   public void should_authenticate_using_kerberos_with_keytab() {
     try (CqlSession session = ads.newKeyTabSession()) {
-      ResultSet set = session.execute("select * from system.local");
+      ResultSet set = session.execute("select * from system.local where key='local'");
       assertThat(set).isNotNull();
     }
   }
@@ -67,7 +67,7 @@ public void should_authenticate_using_kerberos_with_ticket() throws Exception {
     Assume.assumeTrue(isUnix);
     acquireTicket(ads.getUserPrincipal(), ads.getUserKeytab(), ads.getAdsServer());
     try (CqlSession session = ads.newTicketSession()) {
-      ResultSet set = session.execute("select * from system.local");
+      ResultSet set = session.execute("select * from system.local where key='local'");
       assertThat(set).isNotNull();
     } finally {
       destroyTicket(ads);
@@ -133,7 +133,7 @@ public void should_authenticate_using_kerberos_with_keytab_programmatically() {
             .withAuthProvider(new ProgrammaticDseGssApiAuthProvider(builder.build()))
             .build()) {
 
-      ResultSet set = session.execute("select * from system.local");
+      ResultSet set = session.execute("select * from system.local where key='local'");
       assertThat(set).isNotNull();
     }
   }

integration-tests/src/test/java/com/datastax/dse/driver/api/core/auth/DsePlainTextAuthProviderIT.java

@@ -73,7 +73,7 @@ public void should_connect_dse_plaintext_auth() {
                 .withString(DefaultDriverOption.AUTH_PROVIDER_PASSWORD, "cassandra")
                 .withClass(DefaultDriverOption.AUTH_PROVIDER_CLASS, PlainTextAuthProvider.class)
                 .build())) {
-      session.execute("select * from system.local");
+      session.execute("select * from system.local where key='local'");
     }
   }
 
@@ -84,7 +84,7 @@ public void should_connect_dse_plaintext_auth_programmatically() {
             .addContactEndPoints(ccm.getContactPoints())
             .withAuthCredentials("cassandra", "cassandra")
             .build()) {
-      session.execute("select * from system.local");
+      session.execute("select * from system.local where key='local'");
     }
   }
 

integration-tests/src/test/java/com/datastax/dse/driver/api/core/auth/DseProxyAuthenticationIT.java

@@ -114,7 +114,7 @@ public void should_allow_plain_text_authorized_user_to_login_as_programmatically
             .addContactEndPoints(ads.ccm.getContactPoints())
             .withAuthCredentials("ben", "fakePasswordForBen", "alice")
             .build()) {
-      session.execute("select * from system.local");
+      session.execute("select * from system.local where key='local'");
     }
   }