cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [1/2] git commit: Update java-driver to 2.0 final for stress
Date Tue, 04 Mar 2014 11:09:12 GMT
Repository: cassandra
Updated Branches:
  refs/heads/trunk 21c7252d6 -> 87318ef9f


Update java-driver to 2.0 final for stress

patch by djatnieks; reviewed by slebresne for CASSANDRA-6777


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ce94010b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ce94010b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ce94010b

Branch: refs/heads/trunk
Commit: ce94010b9bd8502a99664104592a857010c0e780
Parents: 947e10f
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Tue Mar 4 12:07:49 2014 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Tue Mar 4 12:07:49 2014 +0100

----------------------------------------------------------------------
 .../cassandra-driver-core-2.0.0-rc3-SNAPSHOT.jar  | Bin 515357 -> 0 bytes
 tools/lib/cassandra-driver-core-2.0.0.jar         | Bin 0 -> 519527 bytes
 .../cassandra/stress/settings/StressSettings.java |   6 +++---
 .../cassandra/stress/util/SmartThriftClient.java  |   2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ce94010b/tools/lib/cassandra-driver-core-2.0.0-rc3-SNAPSHOT.jar
----------------------------------------------------------------------
diff --git a/tools/lib/cassandra-driver-core-2.0.0-rc3-SNAPSHOT.jar b/tools/lib/cassandra-driver-core-2.0.0-rc3-SNAPSHOT.jar
deleted file mode 100644
index 54a175f..0000000
Binary files a/tools/lib/cassandra-driver-core-2.0.0-rc3-SNAPSHOT.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ce94010b/tools/lib/cassandra-driver-core-2.0.0.jar
----------------------------------------------------------------------
diff --git a/tools/lib/cassandra-driver-core-2.0.0.jar b/tools/lib/cassandra-driver-core-2.0.0.jar
new file mode 100644
index 0000000..f4343c3
Binary files /dev/null and b/tools/lib/cassandra-driver-core-2.0.0.jar differ

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ce94010b/tools/stress/src/org/apache/cassandra/stress/settings/StressSettings.java
----------------------------------------------------------------------
diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/StressSettings.java b/tools/stress/src/org/apache/cassandra/stress/settings/StressSettings.java
index 7782989..865f864 100644
--- a/tools/stress/src/org/apache/cassandra/stress/settings/StressSettings.java
+++ b/tools/stress/src/org/apache/cassandra/stress/settings/StressSettings.java
@@ -104,7 +104,7 @@ public class StressSettings implements Serializable
                 client.set_cql_version(mode.cqlVersion.connectVersion);
 
             if (setKeyspace)
-                client.set_keyspace("Keyspace1");
+                client.set_keyspace(schema.keyspace);
         }
         catch (InvalidRequestException e)
         {
@@ -126,7 +126,7 @@ public class StressSettings implements Serializable
             String currentNode = node.randomNode();
             SimpleClient client = new SimpleClient(currentNode, port.nativePort);
             client.connect(false);
-            client.execute("USE \"Keyspace1\";", org.apache.cassandra.db.ConsistencyLevel.ONE);
+            client.execute("USE \"" + schema.keyspace + "\";", org.apache.cassandra.db.ConsistencyLevel.ONE);
             return client;
         }
         catch (Exception e)
@@ -153,7 +153,7 @@ public class StressSettings implements Serializable
                 EncryptionOptions.ClientEncryptionOptions encOptions = transport.getEncryptionOptions();
                 JavaDriverClient c = new JavaDriverClient(currentNode, port.nativePort, encOptions);
                 c.connect(mode.compression());
-                c.execute("USE \"Keyspace1\";", org.apache.cassandra.db.ConsistencyLevel.ONE);
+                c.execute("USE \"" + schema.keyspace + "\";", org.apache.cassandra.db.ConsistencyLevel.ONE);
                 return client = c;
             }
         }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ce94010b/tools/stress/src/org/apache/cassandra/stress/util/SmartThriftClient.java
----------------------------------------------------------------------
diff --git a/tools/stress/src/org/apache/cassandra/stress/util/SmartThriftClient.java b/tools/stress/src/org/apache/cassandra/stress/util/SmartThriftClient.java
index 35c2626..48d8b64 100644
--- a/tools/stress/src/org/apache/cassandra/stress/util/SmartThriftClient.java
+++ b/tools/stress/src/org/apache/cassandra/stress/util/SmartThriftClient.java
@@ -107,7 +107,7 @@ public class SmartThriftClient implements ThriftClient
 
     private Client get(ByteBuffer pk)
     {
-        Set<Host> hosts = metadata.getReplicas(keyspace, pk);
+        Set<Host> hosts = metadata.getReplicas(metadata.quote(keyspace), pk);
         int count = roundrobin.incrementAndGet() % hosts.size();
         if (count < 0)
             count = -count;


Mime
View raw message