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 2009/10/21 20:25:26 UTC
svn commit: r828127 - in
/incubator/cassandra/trunk/src/java/org/apache/cassandra/net: EndPoint.java
MessagingService.java ProtocolHeader.java TcpConnection.java
io/ProtocolHeaderState.java
Author: jbellis
Date: Wed Oct 21 18:25:25 2009
New Revision: 828127
URL: http://svn.apache.org/viewvc?rev=828127&view=rev
Log:
r/m unused "listening" distinction in TcpConnection
patch by jbellis; reviewed by Brandon Williams for CASSANDRA-498
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/EndPoint.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/ProtocolHeader.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/TcpConnection.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/io/ProtocolHeaderState.java
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/net/EndPoint.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/net/EndPoint.java?rev=828127&r1=828126&r2=828127&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/net/EndPoint.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/net/EndPoint.java Wed Oct 21 18:25:25 2009
@@ -36,22 +36,6 @@
private static final long serialVersionUID = -4962625949179835907L;
private static Map<CharBuffer, String> hostNames_ = new HashMap<CharBuffer, String>();
- // use as a kind of magic number to send ourselves a message indicating listening state
- protected static final int sentinelPort_ = 5555;
- protected static EndPoint sentinelLocalEndPoint_;
-
- static
- {
- try
- {
- sentinelLocalEndPoint_ = new EndPoint(FBUtilities.getHostAddress(), EndPoint.sentinelPort_);
- }
- catch (UnknownHostException e)
- {
- throw new AssertionError(e);
- }
- }
-
private String host_;
private int port_;
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java?rev=828127&r1=828126&r2=828127&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java Wed Oct 21 18:25:25 2009
@@ -564,7 +564,7 @@
return n;
}
- public static ByteBuffer packIt(byte[] bytes, boolean compress, boolean stream, boolean listening)
+ public static ByteBuffer packIt(byte[] bytes, boolean compress, boolean stream)
{
byte[] size = toByteArray(bytes.length);
/*
@@ -573,10 +573,7 @@
the serializer type. The 3rd bit indicates if compression
is turned on or off. It is turned off by default. The 4th
bit indicates if we are in streaming mode. It is turned off
- by default. The 5th bit is used to indicate that the sender
- is not listening on any well defined port. This implies the
- receiver needs to cache the connection using the port on the
- socket. The following 3 bits are reserved for future use.
+ by default. The 5th-8th bits are reserved for future use.
The next 8 bits indicate a version number. Remaining 15 bits
are not used currently.
*/
@@ -591,11 +588,7 @@
if ( stream )
n |= 8;
- // set listening 5th bit
- if ( listening )
- n |= 16;
-
- // Setting up the version bit
+ // Setting up the version bit
n |= (version_ << 8);
/* Finished the protocol header setup */
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/net/ProtocolHeader.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/net/ProtocolHeader.java?rev=828127&r1=828126&r2=828127&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/net/ProtocolHeader.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/net/ProtocolHeader.java Wed Oct 21 18:25:25 2009
@@ -27,6 +27,5 @@
public int serializerType_;
public boolean isCompressed_;
public boolean isStreamingMode_;
- public boolean isListening_;
public int version_;
}
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/net/TcpConnection.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/net/TcpConnection.java?rev=828127&r1=828126&r2=828127&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/net/TcpConnection.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/net/TcpConnection.java Wed Oct 21 18:25:25 2009
@@ -164,8 +164,7 @@
byte[] data = serializer_.serialize(message);
if ( data.length > 0 )
{
- boolean listening = !message.getFrom().equals(EndPoint.sentinelLocalEndPoint_);
- ByteBuffer buffer = MessagingService.packIt( data , false, false, listening);
+ ByteBuffer buffer = MessagingService.packIt(data , false, false);
synchronized(this)
{
if (!pendingWrites_.isEmpty() || !socketChannel_.isConnected())
@@ -445,7 +444,7 @@
try
{
- byte[] bytes = new byte[0];
+ byte[] bytes;
while ( (bytes = tcpReader_.read()).length > 0 )
{
ProtocolHeader pH = tcpReader_.getProtocolHeader();
@@ -453,9 +452,8 @@
{
/* first message received */
if (remoteEp_ == null)
- {
- int port = ( pH.isListening_ ) ? DatabaseDescriptor.getStoragePort() : EndPoint.sentinelPort_;
- remoteEp_ = new EndPoint( socketChannel_.socket().getInetAddress().getHostAddress(), port );
+ {
+ remoteEp_ = new EndPoint(socketChannel_.socket().getInetAddress().getHostAddress(), DatabaseDescriptor.getStoragePort());
// put connection into pool if possible
pool_ = MessagingService.getConnectionPool(localEp_, remoteEp_);
pool_.addToPool(TcpConnection.this);
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/net/io/ProtocolHeaderState.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/net/io/ProtocolHeaderState.java?rev=828127&r1=828126&r2=828127&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/net/io/ProtocolHeaderState.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/net/io/ProtocolHeaderState.java Wed Oct 21 18:25:25 2009
@@ -53,9 +53,6 @@
if ( stream_.getProtocolHeader().isStreamingMode_ )
MessagingService.setStreamingMode(true);
- int listening = MessagingService.getBits(pH, 4, 1);
- stream_.getProtocolHeader().isListening_ = (listening == 1) ? true : false;
-
int version = MessagingService.getBits(pH, 15, 8);
stream_.getProtocolHeader().version_ = version;