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/03/26 23:20:27 UTC
[1/3] git commit: cleanup
Updated Branches:
refs/heads/trunk b114ce74c -> b79b236d0
cleanup
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/175b22c1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/175b22c1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/175b22c1
Branch: refs/heads/trunk
Commit: 175b22c153c9a0dee6f1c61df7ad9f93c1fb0128
Parents: b114ce7
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Mar 26 15:42:58 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Mar 26 15:42:58 2013 -0500
----------------------------------------------------------------------
.../cassandra/net/OutboundTcpConnection.java | 17 +++++++--------
1 files changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/175b22c1/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
index 0cc974f..dce3711 100644
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
@@ -183,12 +183,11 @@ public class OutboundTcpConnection extends Thread
Tracing.instance().stopIfNonLocal(state);
}
- write(qm.message, qm.id, qm.timestamp, out, targetVersion);
+ writeInternal(qm.message, qm.id, qm.timestamp);
+
completed++;
if (active.peek() == null)
- {
out.flush();
- }
}
catch (Exception e)
{
@@ -201,28 +200,28 @@ public class OutboundTcpConnection extends Thread
}
}
- public static void write(MessageOut message, int id, long timestamp, DataOutputStream out, int version) throws IOException
+ private void writeInternal(MessageOut message, int id, long timestamp) throws IOException
{
out.writeInt(MessagingService.PROTOCOL_MAGIC);
- if (version < MessagingService.VERSION_12)
+ if (targetVersion < MessagingService.VERSION_12)
{
- writeHeader(out, version, false);
+ writeHeader(out, targetVersion, false);
// 0.8 included a total message size int. 1.0 doesn't need it but expects it to be there.
out.writeInt(-1);
}
- if (version < MessagingService.VERSION_20)
+ if (targetVersion < MessagingService.VERSION_20)
out.writeUTF(String.valueOf(id));
else
out.writeInt(id);
- if (version >= MessagingService.VERSION_12)
+ if (targetVersion >= MessagingService.VERSION_12)
{
// int cast cuts off the high-order half of the timestamp, which we can assume remains
// the same between now and when the recipient reconstructs it.
out.writeInt((int) timestamp);
}
- message.serialize(out, version);
+ message.serialize(out, targetVersion);
}
private static void writeHeader(DataOutputStream out, int version, boolean compressionEnabled) throws IOException
[3/3] git commit: clean up string concatenation in logging
Posted by jb...@apache.org.
clean up string concatenation in logging
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b79b236d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b79b236d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b79b236d
Branch: refs/heads/trunk
Commit: b79b236d0009ed9c4037642d9cc3325d5f56c521
Parents: 29bea2e
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Mar 26 16:49:02 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Mar 26 16:49:02 2013 -0500
----------------------------------------------------------------------
.../org/apache/cassandra/transport/Message.java | 4 ++--
.../org/apache/cassandra/transport/Server.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b79b236d/src/java/org/apache/cassandra/transport/Message.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/transport/Message.java b/src/java/org/apache/cassandra/transport/Message.java
index d4d3da6..a6602a0 100644
--- a/src/java/org/apache/cassandra/transport/Message.java
+++ b/src/java/org/apache/cassandra/transport/Message.java
@@ -274,14 +274,14 @@ public abstract class Message
ServerConnection connection = (ServerConnection)request.connection();
connection.validateNewMessage(request.type);
- logger.debug("Received: " + request);
+ logger.debug("Received: {}", request);
Response response = request.execute(connection.getQueryState(request.getStreamId()));
response.setStreamId(request.getStreamId());
response.attach(connection);
connection.applyStateTransition(request.type, response.type);
- logger.debug("Responding: " + response);
+ logger.debug("Responding: {}", response);
ctx.getChannel().write(response);
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b79b236d/src/java/org/apache/cassandra/transport/Server.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/transport/Server.java b/src/java/org/apache/cassandra/transport/Server.java
index 68160c6..bf28b2b 100644
--- a/src/java/org/apache/cassandra/transport/Server.java
+++ b/src/java/org/apache/cassandra/transport/Server.java
@@ -132,7 +132,7 @@ public class Server implements CassandraDaemon.Server
}
// Bind and start to accept incoming connections.
- logger.info("Starting listening for CQL clients on " + socket + "...");
+ logger.info("Starting listening for CQL clients on {}...", socket);
Channel channel = bootstrap.bind(socket);
connectionTracker.allChannels.add(channel);
}
@@ -292,7 +292,7 @@ public class Server implements CassandraDaemon.Server
{
// That should not happen, so log an error, but return the
// endpoint address since there's a good change this is right
- logger.error("Problem retrieving RPC address for " + endpoint, e);
+ logger.error("Problem retrieving RPC address for %s", endpoint, e);
return endpoint;
}
}
[2/3] git commit: CHANGES
Posted by jb...@apache.org.
CHANGES
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/29bea2ec
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/29bea2ec
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/29bea2ec
Branch: refs/heads/trunk
Commit: 29bea2ec148f0c6f933b5dab9323391188199370
Parents: 175b22c
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Mar 26 15:43:08 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Mar 26 15:43:08 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/29bea2ec/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 7030397..64d3196 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -24,6 +24,8 @@
* Rebuild BF when loading sstables if bloom_filter_fp_chance
has changed since compaction (CASSANDRA-5015)
* remove row-level bloom filters (CASSANDRA-4885)
+ * Change Kernel Page Cache skipping into row preheating (disabled by default)
+ (CASSANDRA-4937)
1.2.4
@@ -35,8 +37,6 @@
* Improve asynchronous hint delivery (CASSANDRA-5179)
* Fix Guava dependency version (12.0 -> 13.0.1) for Maven (CASSANDRA-5364)
* Validate that provided CQL3 collection value are < 64K (CASSANDRA-5355)
- * Change Kernel Page Cache skipping into row preheating (disabled by default)
- (CASSANDRA-4937)
* Make upgradeSSTable skip current version sstables by default (CASSANDRA-5366)
* Optimize min/max timestamp collection (CASSANDRA-5373)
Merged from 1.1: