Repository: cassandra Updated Branches: refs/heads/cassandra-2.1.0 1c3de2737 -> 95d289b84
Update java driver to 2.0.4 (for hadoop) patch by alexliu68; reviewed by slebresne for CASSANDRA-7618 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5151fd5b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5151fd5b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5151fd5b Branch: refs/heads/cassandra-2.1.0 Commit: 5151fd5bcc369540d83914cdcb5cc01f4d739f96 Parents: 21db1a0 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Aug 5 10:16:35 2014 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Aug 5 10:18:58 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + build.xml | 2 +- .../org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java | 8 ++++---- 3 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5151fd5b/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 3471bcc..20330f8 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.0.10 + * Update java driver (for hadoop) (CASSANDRA-7618) * Fix truncate to always flush (CASSANDRA-7511) * Remove shuffle and taketoken (CASSANDRA-7601) * Switch liveRatio-related log messages to DEBUG (CASSANDRA-7467) http://git-wip-us.apache.org/repos/asf/cassandra/blob/5151fd5b/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 68907df..4b64570 100644 --- a/build.xml +++ b/build.xml @@ -387,7 +387,7 @@ <dependency groupId="edu.stanford.ppl" artifactId="snaptree" version="0.1" /> <dependency groupId="org.mindrot" artifactId="jbcrypt" version="0.3m" /> <dependency groupId="io.netty" artifactId="netty" version="3.6.6.Final" /> - <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core" version="2.0.1" /> + <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core" version="2.0.4" /> <dependency groupId="net.sf.supercsv" artifactId="super-csv" version="2.1.0" /> </dependencyManagement> <developer id="alakshman" name="Avinash Lakshman"/> http://git-wip-us.apache.org/repos/asf/cassandra/blob/5151fd5b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java index b375ce2..741f599 100644 --- a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java +++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java @@ -422,15 +422,15 @@ public class CqlConfigHelper poolingOptions.setCoreConnectionsPerHost(HostDistance.LOCAL, coreConnections.get()); if (maxConnections.isPresent()) poolingOptions.setMaxConnectionsPerHost(HostDistance.LOCAL, maxConnections.get()); - if (maxSimultaneousRequests.isPresent()) - poolingOptions.setMaxSimultaneousRequestsPerConnectionThreshold(HostDistance.LOCAL, maxSimultaneousRequests.get()); if (minSimultaneousRequests.isPresent()) poolingOptions.setMinSimultaneousRequestsPerConnectionThreshold(HostDistance.LOCAL, minSimultaneousRequests.get()); + if (maxSimultaneousRequests.isPresent()) + poolingOptions.setMaxSimultaneousRequestsPerConnectionThreshold(HostDistance.LOCAL, maxSimultaneousRequests.get()); poolingOptions.setCoreConnectionsPerHost(HostDistance.REMOTE, 0) .setMaxConnectionsPerHost(HostDistance.REMOTE, 0) - .setMaxSimultaneousRequestsPerConnectionThreshold(HostDistance.REMOTE, 0) - .setMinSimultaneousRequestsPerConnectionThreshold(HostDistance.REMOTE, 0); + .setMinSimultaneousRequestsPerConnectionThreshold(HostDistance.REMOTE, 0) + .setMaxSimultaneousRequestsPerConnectionThreshold(HostDistance.REMOTE, 0); return poolingOptions; }
