You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2014/08/25 16:01:51 UTC
[1/7] git commit: Remove unecessary imports
Repository: cassandra
Updated Branches:
refs/heads/trunk f314c61f8 -> 125f19a88
Remove unecessary imports
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e5bd1c38
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e5bd1c38
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e5bd1c38
Branch: refs/heads/trunk
Commit: e5bd1c38ea0978710f3059e81ba87b98980423d6
Parents: 591a277
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Mon Aug 25 10:55:42 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Mon Aug 25 10:55:42 2014 +0200
----------------------------------------------------------------------
.../unit/org/apache/cassandra/cql3/CreateTriggerStatementTest.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e5bd1c38/test/unit/org/apache/cassandra/cql3/CreateTriggerStatementTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/CreateTriggerStatementTest.java b/test/unit/org/apache/cassandra/cql3/CreateTriggerStatementTest.java
index 1f2988c..39703cc 100644
--- a/test/unit/org/apache/cassandra/cql3/CreateTriggerStatementTest.java
+++ b/test/unit/org/apache/cassandra/cql3/CreateTriggerStatementTest.java
@@ -26,9 +26,7 @@ import org.apache.cassandra.config.Schema;
import org.apache.cassandra.config.TriggerDefinition;
import org.apache.cassandra.db.ColumnFamily;
import org.apache.cassandra.db.Mutation;
-import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.triggers.ITrigger;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
[5/7] git commit: Remove unecessary imports
Posted by sl...@apache.org.
Remove unecessary imports
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3fa5a9ea
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3fa5a9ea
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3fa5a9ea
Branch: refs/heads/trunk
Commit: 3fa5a9ea7a33b3f9347927706a8eba394ab78775
Parents: f314c61
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Mon Aug 25 10:55:42 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Mon Aug 25 15:59:01 2014 +0200
----------------------------------------------------------------------
.../unit/org/apache/cassandra/cql3/CreateTriggerStatementTest.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3fa5a9ea/test/unit/org/apache/cassandra/cql3/CreateTriggerStatementTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/CreateTriggerStatementTest.java b/test/unit/org/apache/cassandra/cql3/CreateTriggerStatementTest.java
index 1f2988c..39703cc 100644
--- a/test/unit/org/apache/cassandra/cql3/CreateTriggerStatementTest.java
+++ b/test/unit/org/apache/cassandra/cql3/CreateTriggerStatementTest.java
@@ -26,9 +26,7 @@ import org.apache.cassandra.config.Schema;
import org.apache.cassandra.config.TriggerDefinition;
import org.apache.cassandra.db.ColumnFamily;
import org.apache.cassandra.db.Mutation;
-import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.triggers.ITrigger;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
[2/7] git commit: Always send Paxos commit to all replicas
Posted by sl...@apache.org.
Always send Paxos commit to all replicas
patch by kohlisankalp; reviewed by slebresne for CASSANDRA-7479
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5d4740c5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d4740c5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5d4740c5
Branch: refs/heads/trunk
Commit: 5d4740c5841c9c3a8d6c24578c1c6fb512524321
Parents: 618441b
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Mon Aug 25 15:55:43 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Mon Aug 25 15:55:43 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 3 +++
.../apache/cassandra/service/StorageProxy.java | 24 +++++++++++++-------
2 files changed, 19 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d4740c5/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9aeeb29..4d5d851 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,6 @@
+2.0.11:
+ * Always send Paxos commit to all replicas (CASSANDRA-7479)
+
2.0.10
* Don't send schema change responses and events for no-op DDL
statements (CASSANDRA-7600)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d4740c5/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java
index c606d75..904d602 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -248,10 +248,7 @@ public class StorageProxy implements StorageProxyMBean
Tracing.trace("CAS precondition is met; proposing client-requested updates for {}", ballot);
if (proposePaxos(proposal, liveEndpoints, requiredParticipants, true, consistencyForPaxos))
{
- if (consistencyForCommit == ConsistencyLevel.ANY)
- sendCommit(proposal, liveEndpoints);
- else
- commitPaxos(proposal, consistencyForCommit);
+ commitPaxos(proposal, consistencyForCommit);
Tracing.trace("CAS successful");
return null;
}
@@ -413,23 +410,34 @@ public class StorageProxy implements StorageProxyMBean
private static void commitPaxos(Commit proposal, ConsistencyLevel consistencyLevel) throws WriteTimeoutException
{
+ boolean shouldBlock = consistencyLevel != ConsistencyLevel.ANY;
Keyspace keyspace = Keyspace.open(proposal.update.metadata().ksName);
Token tk = StorageService.getPartitioner().getToken(proposal.key);
List<InetAddress> naturalEndpoints = StorageService.instance.getNaturalEndpoints(keyspace.getName(), tk);
Collection<InetAddress> pendingEndpoints = StorageService.instance.getTokenMetadata().pendingEndpointsFor(tk, keyspace.getName());
- AbstractReplicationStrategy rs = keyspace.getReplicationStrategy();
- AbstractWriteResponseHandler responseHandler = rs.getWriteResponseHandler(naturalEndpoints, pendingEndpoints, consistencyLevel, null, WriteType.SIMPLE);
+ AbstractWriteResponseHandler responseHandler = null;
+ if (shouldBlock)
+ {
+ AbstractReplicationStrategy rs = keyspace.getReplicationStrategy();
+ responseHandler = rs.getWriteResponseHandler(naturalEndpoints, pendingEndpoints, consistencyLevel, null, WriteType.SIMPLE);
+ }
MessageOut<Commit> message = new MessageOut<Commit>(MessagingService.Verb.PAXOS_COMMIT, proposal, Commit.serializer);
for (InetAddress destination : Iterables.concat(naturalEndpoints, pendingEndpoints))
{
if (FailureDetector.instance.isAlive(destination))
- MessagingService.instance().sendRR(message, destination, responseHandler);
+ {
+ if (shouldBlock)
+ MessagingService.instance().sendRR(message, destination, responseHandler);
+ else
+ MessagingService.instance().sendOneWay(message, destination);
+ }
}
- responseHandler.get();
+ if (shouldBlock)
+ responseHandler.get();
}
/**
[3/7] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Posted by sl...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/63c21a32
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/63c21a32
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/63c21a32
Branch: refs/heads/trunk
Commit: 63c21a32ddb69b5d797a6256d292329b708e4194
Parents: baae9b6 5d4740c
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Mon Aug 25 15:57:43 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Mon Aug 25 15:57:43 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 4 ++++
.../apache/cassandra/service/StorageProxy.java | 24 +++++++++++++-------
2 files changed, 20 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/63c21a32/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index d7c3dea,4d5d851..15e41da
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,10 +1,15 @@@
-2.0.11:
+2.1.0
+ * Correctly remove tmplink files (CASSANDRA-7803)
+ * (cqlsh) Fix column name formatting for functions, CAS operations,
+ and UDT field selections (CASSANDRA-7806)
+ * (cqlsh) Fix COPY FROM handling of null/empty primary key
+ values (CASSANDRA-7792)
+ * Fix ordering of static cells (CASSANDRA-7763)
+Merged from 2.0:
+ * Always send Paxos commit to all replicas (CASSANDRA-7479)
-
-2.0.10
+ * Don't send schema change responses and events for no-op DDL
+ statements (CASSANDRA-7600)
+ * (Hadoop) fix cluster initialisation for a split fetching (CASSANDRA-7774)
* Configure system.paxos with LeveledCompactionStrategy (CASSANDRA-7753)
* Fix ALTER clustering column type from DateType to TimestampType when
using DESC clustering order (CASSANRDA-7797)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/63c21a32/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
[4/7] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by sl...@apache.org.
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/191cedfd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/191cedfd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/191cedfd
Branch: refs/heads/trunk
Commit: 191cedfd53ebaf45c010a4d0a4ceb5d40474a2c8
Parents: e5bd1c3 63c21a3
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Mon Aug 25 15:58:20 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Mon Aug 25 15:58:20 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 4 ++++
.../apache/cassandra/service/StorageProxy.java | 24 +++++++++++++-------
2 files changed, 20 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/191cedfd/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/191cedfd/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
[7/7] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by sl...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/125f19a8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/125f19a8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/125f19a8
Branch: refs/heads/trunk
Commit: 125f19a8887ef308a6285c754824f1226885eef4
Parents: 536a08c 191cedf
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Mon Aug 25 16:01:19 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Mon Aug 25 16:01:19 2014 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------
[6/7] git commit: Always send Paxos commit to all replicas
Posted by sl...@apache.org.
Always send Paxos commit to all replicas
patch by kohlisankalp; reviewed by slebresne for CASSANDRA-7479
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/536a08c2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/536a08c2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/536a08c2
Branch: refs/heads/trunk
Commit: 536a08c29773548203845ad562e278e899b35a4d
Parents: 3fa5a9e
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Mon Aug 25 15:55:43 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Mon Aug 25 16:00:35 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/service/StorageProxy.java | 24 +++++++++++++-------
2 files changed, 17 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/536a08c2/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 2329333..a0ff1d1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -72,6 +72,7 @@ Merged from 1.2:
values (CASSANDRA-7792)
* Fix ordering of static cells (CASSANDRA-7763)
Merged from 2.0:
+ * Always send Paxos commit to all replicas (CASSANDRA-7479)
* Configure system.paxos with LeveledCompactionStrategy (CASSANDRA-7753)
* Fix ALTER clustering column type from DateType to TimestampType when
using DESC clustering order (CASSANRDA-7797)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/536a08c2/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java
index 1c0c482..ff6d89c 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -251,10 +251,7 @@ public class StorageProxy implements StorageProxyMBean
Tracing.trace("CAS precondition is met; proposing client-requested updates for {}", ballot);
if (proposePaxos(proposal, liveEndpoints, requiredParticipants, true, consistencyForPaxos))
{
- if (consistencyForCommit == ConsistencyLevel.ANY)
- sendCommit(proposal, liveEndpoints);
- else
- commitPaxos(proposal, consistencyForCommit);
+ commitPaxos(proposal, consistencyForCommit);
Tracing.trace("CAS successful");
return null;
}
@@ -416,23 +413,34 @@ public class StorageProxy implements StorageProxyMBean
private static void commitPaxos(Commit proposal, ConsistencyLevel consistencyLevel) throws WriteTimeoutException
{
+ boolean shouldBlock = consistencyLevel != ConsistencyLevel.ANY;
Keyspace keyspace = Keyspace.open(proposal.update.metadata().ksName);
Token tk = StorageService.getPartitioner().getToken(proposal.key);
List<InetAddress> naturalEndpoints = StorageService.instance.getNaturalEndpoints(keyspace.getName(), tk);
Collection<InetAddress> pendingEndpoints = StorageService.instance.getTokenMetadata().pendingEndpointsFor(tk, keyspace.getName());
- AbstractReplicationStrategy rs = keyspace.getReplicationStrategy();
- AbstractWriteResponseHandler responseHandler = rs.getWriteResponseHandler(naturalEndpoints, pendingEndpoints, consistencyLevel, null, WriteType.SIMPLE);
+ AbstractWriteResponseHandler responseHandler = null;
+ if (shouldBlock)
+ {
+ AbstractReplicationStrategy rs = keyspace.getReplicationStrategy();
+ responseHandler = rs.getWriteResponseHandler(naturalEndpoints, pendingEndpoints, consistencyLevel, null, WriteType.SIMPLE);
+ }
MessageOut<Commit> message = new MessageOut<Commit>(MessagingService.Verb.PAXOS_COMMIT, proposal, Commit.serializer);
for (InetAddress destination : Iterables.concat(naturalEndpoints, pendingEndpoints))
{
if (FailureDetector.instance.isAlive(destination))
- MessagingService.instance().sendRR(message, destination, responseHandler);
+ {
+ if (shouldBlock)
+ MessagingService.instance().sendRR(message, destination, responseHandler);
+ else
+ MessagingService.instance().sendOneWay(message, destination);
+ }
}
- responseHandler.get();
+ if (shouldBlock)
+ responseHandler.get();
}
/**