cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [2/6] git commit: fix build
Date Wed, 06 Aug 2014 19:28:25 GMT
fix build


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

Branch: refs/heads/trunk
Commit: 41f3677841b0e959b912091e4ad36d8f388649fa
Parents: 9e43a2f
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Wed Aug 6 14:27:20 2014 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Wed Aug 6 14:27:47 2014 -0500

----------------------------------------------------------------------
 .../apache/cassandra/hadoop/cql3/CqlConfigHelper.java  | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/41f36778/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..7a5fd47 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;
     }  
@@ -519,6 +519,11 @@ public class CqlConfigHelper
             }
 
             @Override
+            public void onSuspected(Host host)
+            {
+            }
+
+            @Override
             public HostDistance distance(Host host)
             {
                 if (host.getAddress().getHostName().equals(stickHost))


Mime
View raw message