This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-4.1
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 3d220b5a6e2528b7b9f89074fe48dc6556977dc1
Merge: b053027680 b2093ef321
Author: Brandon Williams <brandonwilli...@apache.org>
AuthorDate: Tue Sep 12 06:12:47 2023 -0500
Merge branch 'cassandra-4.0' into cassandra-4.1
test/unit/org/apache/cassandra/cql3/CQLTester.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --cc test/unit/org/apache/cassandra/cql3/CQLTester.java
index eb7c39d6d6,dc2f334c08..9f01746393
--- a/test/unit/org/apache/cassandra/cql3/CQLTester.java
+++ b/test/unit/org/apache/cassandra/cql3/CQLTester.java
@@@ -145,13 -119,11 +145,13 @@@ public abstract class CQLTeste
protected static int jmxPort;
protected static MBeanServerConnection jmxConnection;
- protected static final int nativePort;
+ protected static int nativePort;
protected static final InetAddress nativeAddr;
protected static final Set<InetAddressAndPort> remoteAddrs = new
HashSet<>();
- private static final Map<ProtocolVersion, Cluster> clusters = new
HashMap<>();
- protected static final Map<ProtocolVersion, Session> sessions = new
HashMap<>();
+ private static final Map<Pair<User, ProtocolVersion>, Cluster> clusters =
new HashMap<>();
+ private static final Map<Pair<User, ProtocolVersion>, Session> sessions =
new HashMap<>();
+
+ private static Consumer<Cluster.Builder> clusterBuilderConfigurator;
public static final List<ProtocolVersion> PROTOCOL_VERSIONS = new
ArrayList<>(ProtocolVersion.SUPPORTED.size());
@@@ -558,53 -469,56 +557,54 @@@
clusters.clear();
sessions.clear();
- initializeNetwork(server -> {}, clusterConfigurator);
+ clusterBuilderConfigurator = clusterConfigurator;
+
+ startServer(serverConfigurator);
}
- private static void initializeNetwork(Consumer<Server.Builder> decorator,
Consumer<Cluster.Builder> clusterConfigurator)
+ private static void startServer(Consumer<Server.Builder> decorator)
{
- startServer(decorator);
++ nativePort = getAutomaticallyAllocatedPort(nativeAddr);
+ Server.Builder serverBuilder = new
Server.Builder().withHost(nativeAddr).withPort(nativePort);
+ decorator.accept(serverBuilder);
+ server = serverBuilder.build();
+ ClientMetrics.instance.init(Collections.singleton(server));
+ server.start();
+ }
- for (ProtocolVersion version : PROTOCOL_VERSIONS)
- {
- if (clusters.containsKey(version))
- continue;
+ private static Cluster initClientCluster(User user, ProtocolVersion
version)
+ {
+ SocketOptions socketOptions =
+ new
SocketOptions().setConnectTimeoutMillis(Integer.getInteger("cassandra.test.driver.connection_timeout_ms",
+
DEFAULT_CONNECT_TIMEOUT_MILLIS)) // default is 5000
+
.setReadTimeoutMillis(Integer.getInteger("cassandra.test.driver.read_timeout_ms",
+
DEFAULT_READ_TIMEOUT_MILLIS)); // default is 12000
- SocketOptions socketOptions = new SocketOptions()
-
.setConnectTimeoutMillis(Integer.getInteger("cassandra.test.driver.connection_timeout_ms",
DEFAULT_CONNECT_TIMEOUT_MILLIS)) // default is 5000
-
.setReadTimeoutMillis(Integer.getInteger("cassandra.test.driver.read_timeout_ms",
DEFAULT_READ_TIMEOUT_MILLIS)); // default is 12000
+ logger.info("Timeouts: {} / {}",
socketOptions.getConnectTimeoutMillis(), socketOptions.getReadTimeoutMillis());
- logger.info("Timeouts: {} / {}",
socketOptions.getConnectTimeoutMillis(), socketOptions.getReadTimeoutMillis());
+ Cluster.Builder builder = Cluster.builder()
+ .withoutJMXReporting()
+ .addContactPoints(nativeAddr)
+ .withClusterName("Test Cluster")
+ .withPort(nativePort)
+ .withSocketOptions(socketOptions)
+
.withNettyOptions(IMMEDIATE_CONNECTION_SHUTDOWN_NETTY_OPTIONS);
- Cluster.Builder builder = Cluster.builder()
- .withoutJMXReporting()
- .addContactPoints(nativeAddr)
- .withClusterName("Test Cluster")
- .withPort(nativePort)
- .withSocketOptions(socketOptions)
-
.withNettyOptions(IMMEDIATE_CONNECTION_SHUTDOWN_NETTY_OPTIONS);
+ if (user != null)
+ builder.withCredentials(user.username, user.password);
- if (clusterConfigurator != null)
- clusterConfigurator.accept(builder);
+ if (version.isBeta())
+ builder = builder.allowBetaProtocolVersion();
+ else
+ builder =
builder.withProtocolVersion(com.datastax.driver.core.ProtocolVersion.fromInt(version.asInt()));
- if (version.isBeta())
- builder = builder.allowBetaProtocolVersion();
- else
- builder =
builder.withProtocolVersion(com.datastax.driver.core.ProtocolVersion.fromInt(version.asInt()));
+ clusterBuilderConfigurator.accept(builder);
- Cluster cluster = builder.build();
- clusters.put(version, cluster);
- sessions.put(version, cluster.connect());
+ Cluster cluster = builder.build();
- logger.info("Started Java Driver instance for protocol version
{}", version);
- }
- }
+ logger.info("Started Java Driver instance for protocol version {}",
version);
- private static void startServer(Consumer<Server.Builder> decorator)
- {
- nativePort = getAutomaticallyAllocatedPort(nativeAddr);
- Server.Builder serverBuilder = new
Server.Builder().withHost(nativeAddr).withPort(nativePort);
- decorator.accept(serverBuilder);
- server = serverBuilder.build();
- ClientMetrics.instance.init(Collections.singleton(server));
- server.start();
+ return cluster;
}
protected void dropPerTestKeyspace() throws Throwable
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
