From be5f5f84b00cf8a752180ca637f5a4dca3b616e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wojciech=20B=C4=85czkowski?= Date: Tue, 8 Oct 2024 12:45:09 +0200 Subject: [PATCH] Review adjustments --- .../oss/driver/api/core/config/DefaultDriverOption.java | 2 +- .../internal/core/metadata/LoadBalancingPolicyWrapper.java | 2 +- core/src/main/resources/reference.conf | 2 +- .../datastax/oss/driver/core/resolver/MockResolverIT.java | 6 ------ 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/config/DefaultDriverOption.java b/core/src/main/java/com/datastax/oss/driver/api/core/config/DefaultDriverOption.java index b218c088a9c..241185d121b 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/config/DefaultDriverOption.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/config/DefaultDriverOption.java @@ -675,7 +675,7 @@ public enum DefaultDriverOption implements DriverOption { *

Value-type: boolean */ CONTROL_CONNECTION_RECONNECT_CONTACT_POINTS( - "advanced.control-connection.reconnection.fallback-to-original-contacts"), + "advanced.control-connection.reconnection.fallback-to-original-contact-points"), /** * Whether `Session.prepare` calls should be sent to all nodes in the cluster. diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/LoadBalancingPolicyWrapper.java b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/LoadBalancingPolicyWrapper.java index cd7fbba2cfc..0d470939573 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/LoadBalancingPolicyWrapper.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/LoadBalancingPolicyWrapper.java @@ -169,7 +169,7 @@ public Queue newQueryPlan() { @NonNull public Queue newControlReconnectionQueryPlan() { // First try the original way - Queue regularQueryPlan = newQueryPlan(); + Queue regularQueryPlan = newQueryPlan(null, DriverExecutionProfile.DEFAULT_NAME, null); if (!regularQueryPlan.isEmpty()) return regularQueryPlan; if (context diff --git a/core/src/main/resources/reference.conf b/core/src/main/resources/reference.conf index c1482f55ad9..601543790a0 100644 --- a/core/src/main/resources/reference.conf +++ b/core/src/main/resources/reference.conf @@ -2122,7 +2122,7 @@ datastax-java-driver { # Required: yes # Modifiable at runtime: yes, the new value will be used for checks issued after the change. # Overridable in a profile: no - fallback-to-original-contacts = false + fallback-to-original-contact-points = false } } diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/core/resolver/MockResolverIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/core/resolver/MockResolverIT.java index d351821dc51..491419e4998 100644 --- a/integration-tests/src/test/java/com/datastax/oss/driver/core/resolver/MockResolverIT.java +++ b/integration-tests/src/test/java/com/datastax/oss/driver/core/resolver/MockResolverIT.java @@ -353,12 +353,6 @@ public void cannot_reconnect_with_resolved_socket() { break; } } - /* - ResultSet rs = session.execute("SELECT * FROM system.local"); - assertThat(rs).isNotNull(); - Row row = rs.one(); - assertThat(row).isNotNull(); - */ nodes = session.getMetadata().getNodes().values(); assertThat(nodes).hasSize(3); Iterator iterator = nodes.iterator();