You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2016/04/25 11:12:04 UTC
camel git commit: Moving Cassandra support to 3.x
Repository: camel
Updated Branches:
refs/heads/master 99bb63da0 -> f9ef95155
Moving Cassandra support to 3.x
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f9ef9515
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f9ef9515
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f9ef9515
Branch: refs/heads/master
Commit: f9ef951555c70cdfdd5320a65121e1d3597d988c
Parents: 99bb63d
Author: Andrea Cosentino <an...@gmail.com>
Authored: Mon Apr 25 11:06:59 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Mon Apr 25 11:11:46 2016 +0200
----------------------------------------------------------------------
.../utils/cassandra/CassandraLoadBalancingPolicies.java | 2 +-
.../src/test/resources/camel-cassandra.yaml | 6 ++++++
parent/pom.xml | 8 ++++----
3 files changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f9ef9515/components/camel-cassandraql/src/main/java/org/apache/camel/utils/cassandra/CassandraLoadBalancingPolicies.java
----------------------------------------------------------------------
diff --git a/components/camel-cassandraql/src/main/java/org/apache/camel/utils/cassandra/CassandraLoadBalancingPolicies.java b/components/camel-cassandraql/src/main/java/org/apache/camel/utils/cassandra/CassandraLoadBalancingPolicies.java
index 30b735c..d6225bd 100644
--- a/components/camel-cassandraql/src/main/java/org/apache/camel/utils/cassandra/CassandraLoadBalancingPolicies.java
+++ b/components/camel-cassandraql/src/main/java/org/apache/camel/utils/cassandra/CassandraLoadBalancingPolicies.java
@@ -37,7 +37,7 @@ public class CassandraLoadBalancingPolicies {
loadBalancingPolicy = new TokenAwarePolicy(new RoundRobinPolicy());
break;
case dcAwareRoundRobinPolicy:
- loadBalancingPolicy = new DCAwareRoundRobinPolicy();
+ loadBalancingPolicy = DCAwareRoundRobinPolicy.builder().build();
break;
default:
throw new IllegalArgumentException("Cassandra load balancing policy can be " + roundRobinPolicy + " ," + tokenAwarePolicy
http://git-wip-us.apache.org/repos/asf/camel/blob/f9ef9515/components/camel-cassandraql/src/test/resources/camel-cassandra.yaml
----------------------------------------------------------------------
diff --git a/components/camel-cassandraql/src/test/resources/camel-cassandra.yaml b/components/camel-cassandraql/src/test/resources/camel-cassandra.yaml
index 2a2a3a3..91124ca 100644
--- a/components/camel-cassandraql/src/test/resources/camel-cassandra.yaml
+++ b/components/camel-cassandraql/src/test/resources/camel-cassandra.yaml
@@ -50,6 +50,12 @@ hinted_handoff_throttle_in_kb: 1024
# cross-dc handoff tends to be slower
max_hints_delivery_threads: 2
+# Directory where Cassandra should store hints.
+# If not set, the default directory is $CASSANDRA_HOME/data/hints.
+# hints_directory: /var/lib/cassandra/hints
+hints_directory: target/camel-cassandra/hints
+
+
# Maximum throttle in KBs per second, total. This will be
# reduced proportionally to the number of nodes in the cluster.
batchlog_replay_throttle_in_kb: 1024
http://git-wip-us.apache.org/repos/asf/camel/blob/f9ef9515/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 3a881ff8..ae9a232 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -84,10 +84,10 @@
<caffeine-version>2.3.0</caffeine-version>
<californium-version>1.0.0-M3</californium-version>
<camel-test-spring-artifactId>camel-test-spring</camel-test-spring-artifactId>
- <cassandra-driver-version>2.1.9</cassandra-driver-version>
- <cassandra-driver-guava-version>16.0.1</cassandra-driver-guava-version>
- <cassandra-version>2.2.2</cassandra-version>
- <cassandra-unit-version>2.2.2.1</cassandra-unit-version>
+ <cassandra-driver-version>3.0.0</cassandra-driver-version>
+ <cassandra-driver-guava-version>18.0</cassandra-driver-guava-version>
+ <cassandra-version>3.5</cassandra-version>
+ <cassandra-unit-version>3.0.0.1</cassandra-unit-version>
<castor-version>1.3.3</castor-version>
<castor-bundle-version>1.3.3_1</castor-bundle-version>
<cdi-api-1.0-version>1.0-SP4</cdi-api-1.0-version>