You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/08/06 21:28:24 UTC
[1/6] git commit: fix build
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 bb0112be1 -> 368b63f06
refs/heads/trunk 9e43a2f8a -> fe30c2c23
fix build
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a1924ba3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a1924ba3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a1924ba3
Branch: refs/heads/trunk
Commit: a1924ba3946c9f7f0cc67ef119768b2d9251bc63
Parents: 821a2fe
Author: Brandon Williams <br...@apache.org>
Authored: Wed Aug 6 14:27:20 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Aug 6 14:27:20 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/a1924ba3/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))
[6/6] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by br...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fe30c2c2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fe30c2c2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fe30c2c2
Branch: refs/heads/trunk
Commit: fe30c2c23b7b12c3b3a9a4bb246362922193bf95
Parents: 87dc93e 368b63f
Author: Brandon Williams <br...@apache.org>
Authored: Wed Aug 6 14:28:17 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Aug 6 14:28:17 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/6] git commit: fix build
Posted by br...@apache.org.
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 <br...@apache.org>
Authored: Wed Aug 6 14:27:20 2014 -0500
Committer: Brandon Williams <br...@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))
[4/6] git commit: fix build
Posted by br...@apache.org.
fix build
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/368b63f0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/368b63f0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/368b63f0
Branch: refs/heads/trunk
Commit: 368b63f06d86edbcbdd87e0fddd7ca662da6b367
Parents: bb0112b
Author: Brandon Williams <br...@apache.org>
Authored: Wed Aug 6 14:27:20 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Aug 6 14:28:00 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/368b63f0/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))
[3/6] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by br...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/87dc93ec
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/87dc93ec
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/87dc93ec
Branch: refs/heads/trunk
Commit: 87dc93ec403822fb21c574803f0c1bafe3ce6b1d
Parents: 41f3677 a1924ba
Author: Brandon Williams <br...@apache.org>
Authored: Wed Aug 6 14:27:51 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Aug 6 14:27:51 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[5/6] git commit: fix build
Posted by br...@apache.org.
fix build
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/368b63f0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/368b63f0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/368b63f0
Branch: refs/heads/cassandra-2.1
Commit: 368b63f06d86edbcbdd87e0fddd7ca662da6b367
Parents: bb0112b
Author: Brandon Williams <br...@apache.org>
Authored: Wed Aug 6 14:27:20 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Aug 6 14:28:00 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/368b63f0/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))