From c60b114a611d27e895b5daf22725f30ddf64ecfc Mon Sep 17 00:00:00 2001
From: Connor McCoy <connormccoy@google.com>
Date: Mon, 28 Sep 2015 11:45:36 -0700
Subject: [PATCH] [cassandra-cql] Make CassandraCQLClient consistent.
The CassandraCQL client defines a number of
* Changes the default port to 9042 (this is the default CQL port).
* Changes property "host" from a space-separated list to property
"hosts", a comma-separated list.
* Updates a few messages.
---
.../java/com/yahoo/ycsb/db/CassandraCQLClient.java | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/cassandra/src/main/java/com/yahoo/ycsb/db/CassandraCQLClient.java b/cassandra/src/main/java/com/yahoo/ycsb/db/CassandraCQLClient.java
index cac33342..90e27d76 100755
--- a/cassandra/src/main/java/com/yahoo/ycsb/db/CassandraCQLClient.java
+++ b/cassandra/src/main/java/com/yahoo/ycsb/db/CassandraCQLClient.java
@@ -69,6 +69,10 @@ public class CassandraCQLClient extends DB {
public static final String USERNAME_PROPERTY = "cassandra.username";
public static final String PASSWORD_PROPERTY = "cassandra.password";
+ public static final String HOSTS_PROPERTY = "hosts";
+ public static final String PORT_PROPERTY = "port";
+
+
public static final String READ_CONSISTENCY_LEVEL_PROPERTY = "cassandra.readconsistencylevel";
public static final String READ_CONSISTENCY_LEVEL_PROPERTY_DEFAULT = "ONE";
public static final String WRITE_CONSISTENCY_LEVEL_PROPERTY = "cassandra.writeconsistencylevel";
@@ -102,14 +106,14 @@ public class CassandraCQLClient extends DB {
_debug = Boolean.parseBoolean(getProperties().getProperty("debug", "false"));
- String host = getProperties().getProperty("host");
+ String host = getProperties().getProperty(HOSTS_PROPERTY);
if (host == null) {
- throw new DBException("Required property \"host\" missing for CassandraClient");
+ throw new DBException(String.format("Required property \"%s\" missing for CassandraCQLClient", HOSTS_PROPERTY));
}
- String hosts[] = host.split(" ");
- String port = getProperties().getProperty("port", "9160");
+ String hosts[] = host.split(",");
+ String port = getProperties().getProperty("port", "9042");
if (port == null) {
- throw new DBException("Required property \"port\" missing for CassandraClient");
+ throw new DBException(String.format("Required property \"%s\" missing for CassandraCQLClient", PORT_PROPERTY));
}
String username = getProperties().getProperty(USERNAME_PROPERTY);
--
GitLab