You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/10/04 05:18:15 UTC
[1/6] git commit: one more consistencyLevel to pass along
Updated Branches:
refs/heads/cassandra-1.2 6025ba85b -> adb3a0dd7
refs/heads/cassandra-2.0 ff7d341ef -> ef69bd532
refs/heads/trunk 188a8b36e -> 53ac6b203
one more consistencyLevel to pass along
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/adb3a0dd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/adb3a0dd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/adb3a0dd
Branch: refs/heads/cassandra-1.2
Commit: adb3a0dd7139b65b9dbe79f6b42d299fab259f8e
Parents: 6025ba8
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Oct 3 22:15:35 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Oct 3 22:15:35 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageProxy.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/adb3a0dd/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 f925fa7..ec33723 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -646,7 +646,7 @@ public class StorageProxy implements StorageProxyMBean
while (iter.hasNext())
{
target = iter.next();
- MessagingService.instance().sendRR(message, target, handler);
+ MessagingService.instance().sendRR(message, target, handler, message.getTimeout(), handler.consistencyLevel);
}
return;
}
[4/6] git commit: merge from 1.2
Posted by jb...@apache.org.
merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ef69bd53
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ef69bd53
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ef69bd53
Branch: refs/heads/trunk
Commit: ef69bd532f066a7b78f10db093e266b3eff90ed6
Parents: ff7d341 adb3a0d
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Oct 3 22:17:49 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Oct 3 22:17:49 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageProxy.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ef69bd53/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageProxy.java
index d16bef9,ec33723..8d01281
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@@ -963,29 -637,35 +963,30 @@@ public class StorageProxy implements St
Iterator<InetAddress> iter = targets.iterator();
InetAddress target = iter.next();
- // direct writes to local DC or old Cassandra versions
- if (localDC || MessagingService.instance().getVersion(target) < MessagingService.VERSION_11)
+ // Add the other destinations of the same message as a FORWARD_HEADER entry
+ DataOutputBuffer out = new DataOutputBuffer();
+ try
{
- // yes, the loop and non-loop code here are the same; this is clunky but we want to avoid
- // creating a second iterator since we already have a perfectly good one
- MessagingService.instance().sendRR(message, target, handler, message.getTimeout(), handler.consistencyLevel);
+ out.writeInt(targets.size() - 1);
while (iter.hasNext())
{
- target = iter.next();
- MessagingService.instance().sendRR(message, target, handler, message.getTimeout(), handler.consistencyLevel);
+ InetAddress destination = iter.next();
+ CompactEndpointSerializationHelper.serialize(destination, out);
+ int id = MessagingService.instance().addCallback(handler, message, destination, message.getTimeout(), handler.consistencyLevel);
+ out.writeInt(id);
+ logger.trace("Adding FWD message to {}@{}", id, destination);
}
- return;
+ message = message.withParameter(RowMutation.FORWARD_TO, out.getData());
+ // send the combined message + forward headers
- int id = MessagingService.instance().sendRR(message, target, handler);
++ int id = MessagingService.instance().addCallback(handler, message, target, message.getTimeout(), handler.consistencyLevel);
++ MessagingService.instance().sendOneWay(message, id, target);
+ logger.trace("Sending message to {}@{}", id, target);
}
-
- // Add all the other destinations of the same message as a FORWARD_HEADER entry
- FastByteArrayOutputStream bos = new FastByteArrayOutputStream();
- DataOutputStream dos = new DataOutputStream(bos);
- dos.writeInt(targets.size() - 1);
- while (iter.hasNext())
+ catch (IOException e)
{
- InetAddress destination = iter.next();
- CompactEndpointSerializationHelper.serialize(destination, dos);
- String id = MessagingService.instance().addCallback(handler, message, destination, message.getTimeout(), handler.consistencyLevel);
- dos.writeUTF(id);
+ // DataOutputBuffer is in-memory, doesn't throw IOException
+ throw new AssertionError(e);
}
- message = message.withParameter(RowMutation.FORWARD_TO, bos.toByteArray());
- // send the combined message + forward headers
- Tracing.trace("Enqueuing message to {}", target);
- MessagingService.instance().sendRR(message, target, handler);
}
private static void insertLocal(final RowMutation rm, final AbstractWriteResponseHandler responseHandler)
[6/6] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by jb...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/53ac6b20
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/53ac6b20
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/53ac6b20
Branch: refs/heads/trunk
Commit: 53ac6b20348c1c291536fa183ba2bb9611ca93fa
Parents: 188a8b3 ef69bd5
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Oct 3 22:17:55 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Oct 3 22:17:55 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageProxy.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/53ac6b20/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
[5/6] git commit: merge from 1.2
Posted by jb...@apache.org.
merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ef69bd53
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ef69bd53
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ef69bd53
Branch: refs/heads/cassandra-2.0
Commit: ef69bd532f066a7b78f10db093e266b3eff90ed6
Parents: ff7d341 adb3a0d
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Oct 3 22:17:49 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Oct 3 22:17:49 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageProxy.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ef69bd53/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageProxy.java
index d16bef9,ec33723..8d01281
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@@ -963,29 -637,35 +963,30 @@@ public class StorageProxy implements St
Iterator<InetAddress> iter = targets.iterator();
InetAddress target = iter.next();
- // direct writes to local DC or old Cassandra versions
- if (localDC || MessagingService.instance().getVersion(target) < MessagingService.VERSION_11)
+ // Add the other destinations of the same message as a FORWARD_HEADER entry
+ DataOutputBuffer out = new DataOutputBuffer();
+ try
{
- // yes, the loop and non-loop code here are the same; this is clunky but we want to avoid
- // creating a second iterator since we already have a perfectly good one
- MessagingService.instance().sendRR(message, target, handler, message.getTimeout(), handler.consistencyLevel);
+ out.writeInt(targets.size() - 1);
while (iter.hasNext())
{
- target = iter.next();
- MessagingService.instance().sendRR(message, target, handler, message.getTimeout(), handler.consistencyLevel);
+ InetAddress destination = iter.next();
+ CompactEndpointSerializationHelper.serialize(destination, out);
+ int id = MessagingService.instance().addCallback(handler, message, destination, message.getTimeout(), handler.consistencyLevel);
+ out.writeInt(id);
+ logger.trace("Adding FWD message to {}@{}", id, destination);
}
- return;
+ message = message.withParameter(RowMutation.FORWARD_TO, out.getData());
+ // send the combined message + forward headers
- int id = MessagingService.instance().sendRR(message, target, handler);
++ int id = MessagingService.instance().addCallback(handler, message, target, message.getTimeout(), handler.consistencyLevel);
++ MessagingService.instance().sendOneWay(message, id, target);
+ logger.trace("Sending message to {}@{}", id, target);
}
-
- // Add all the other destinations of the same message as a FORWARD_HEADER entry
- FastByteArrayOutputStream bos = new FastByteArrayOutputStream();
- DataOutputStream dos = new DataOutputStream(bos);
- dos.writeInt(targets.size() - 1);
- while (iter.hasNext())
+ catch (IOException e)
{
- InetAddress destination = iter.next();
- CompactEndpointSerializationHelper.serialize(destination, dos);
- String id = MessagingService.instance().addCallback(handler, message, destination, message.getTimeout(), handler.consistencyLevel);
- dos.writeUTF(id);
+ // DataOutputBuffer is in-memory, doesn't throw IOException
+ throw new AssertionError(e);
}
- message = message.withParameter(RowMutation.FORWARD_TO, bos.toByteArray());
- // send the combined message + forward headers
- Tracing.trace("Enqueuing message to {}", target);
- MessagingService.instance().sendRR(message, target, handler);
}
private static void insertLocal(final RowMutation rm, final AbstractWriteResponseHandler responseHandler)
[3/6] git commit: one more consistencyLevel to pass along
Posted by jb...@apache.org.
one more consistencyLevel to pass along
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/adb3a0dd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/adb3a0dd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/adb3a0dd
Branch: refs/heads/trunk
Commit: adb3a0dd7139b65b9dbe79f6b42d299fab259f8e
Parents: 6025ba8
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Oct 3 22:15:35 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Oct 3 22:15:35 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageProxy.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/adb3a0dd/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 f925fa7..ec33723 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -646,7 +646,7 @@ public class StorageProxy implements StorageProxyMBean
while (iter.hasNext())
{
target = iter.next();
- MessagingService.instance().sendRR(message, target, handler);
+ MessagingService.instance().sendRR(message, target, handler, message.getTimeout(), handler.consistencyLevel);
}
return;
}
[2/6] git commit: one more consistencyLevel to pass along
Posted by jb...@apache.org.
one more consistencyLevel to pass along
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/adb3a0dd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/adb3a0dd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/adb3a0dd
Branch: refs/heads/cassandra-2.0
Commit: adb3a0dd7139b65b9dbe79f6b42d299fab259f8e
Parents: 6025ba8
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Oct 3 22:15:35 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Oct 3 22:15:35 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageProxy.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/adb3a0dd/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 f925fa7..ec33723 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -646,7 +646,7 @@ public class StorageProxy implements StorageProxyMBean
while (iter.hasNext())
{
target = iter.next();
- MessagingService.instance().sendRR(message, target, handler);
+ MessagingService.instance().sendRR(message, target, handler, message.getTimeout(), handler.consistencyLevel);
}
return;
}