svn commit: r1067197 - in /cassandra/branches/cassandra-0.7: CHANGES.txt src/java/org/apache/cassandra/thrift/CassandraDaemon.java

[jb...@apache.org]

Author: jbellis
Date: Fri Feb  4 15:30:57 2011
New Revision: 1067197

URL: http://svn.apache.org/viewvc?rev=1067197&view=rev
Log:
revert #1743

Modified:
    cassandra/branches/cassandra-0.7/CHANGES.txt
    cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/thrift/CassandraDaemon.java

Modified: cassandra/branches/cassandra-0.7/CHANGES.txt
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/CHANGES.txt?rev=1067197&r1=1067196&r2=1067197&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.7/CHANGES.txt Fri Feb  4 15:30:57 2011
@@ -3,7 +3,6 @@
    the nagle/delayed ack problem (CASSANDRA-1896)
  * check log4j configuration for changes every 10s (CASSANDRA-1525, 1907)
  * more-efficient cross-DC replication (CASSANDRA-1530, -2051)
- * upgrade to TFastFramedTransport (CASSANDRA-1743)
  * avoid polluting page cache with commitlog or sstable writes
    and seq scan operations (CASSANDRA-1470)
  * add RMI authentication options to nodetool (CASSANDRA-1921)
@@ -52,6 +51,7 @@
  * ignore messages from newer versions, keep track of nodes in gossip 
    regardless of version (CASSANDRA-1970)
 
+
 0.7.0-final
  * fix offsets to ByteBuffer.get (CASSANDRA-1939)
 

Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/thrift/CassandraDaemon.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/thrift/CassandraDaemon.java?rev=1067197&r1=1067196&r2=1067197&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/thrift/CassandraDaemon.java (original)
+++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/thrift/CassandraDaemon.java Fri Feb  4 15:30:57 2011
@@ -18,7 +18,6 @@
 
 package org.apache.cassandra.thrift;
 
-import java.io.IOException;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.util.concurrent.ExecutorService;
@@ -27,11 +26,10 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.thrift.TBinaryProtocol;
 import org.apache.thrift.TProcessorFactory;
 import org.apache.thrift.protocol.TProtocolFactory;
 import org.apache.thrift.server.TServer;
-import org.apache.thrift.transport.TFastFramedTransport;
+import org.apache.thrift.transport.TFramedTransport;
 import org.apache.thrift.transport.TServerSocket;
 import org.apache.thrift.transport.TTransportException;
 import org.apache.thrift.transport.TTransportFactory;
@@ -123,8 +121,8 @@ public class CassandraDaemon extends org
             if (DatabaseDescriptor.isThriftFramed())
             {
                 int tFramedTransportSize = DatabaseDescriptor.getThriftFramedTransportSize();
-                inTransportFactory  = new TFastFramedTransport.Factory(64 * 1024, tFramedTransportSize);
-                outTransportFactory = new TFastFramedTransport.Factory(64 * 1024, tFramedTransportSize);
+                inTransportFactory  = new TFramedTransport.Factory(tFramedTransportSize);
+                outTransportFactory = new TFramedTransport.Factory(tFramedTransportSize);
                 logger.info("Using TFastFramedTransport with a max frame size of {} bytes.", tFramedTransportSize);
             }
             else