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/d0fae099 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d0fae099 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d0fae099 Branch: refs/heads/trunk Commit: d0fae0999b038012462560f30e18a464deb8ce91 Parents: c198b76 d30e328 Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Oct 9 07:36:08 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Oct 9 07:36:08 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/net/IncomingTcpConnection.java | 5 +++++ 2 files changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d0fae099/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 2b37a39,aa43124..87a5cda --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -42,43 -17,10 +42,44 @@@ Merged from 1.2 * Optimize auth setup (CASSANDRA-6122) * Trace index selection (CASSANDRA-6001) * Update sstablesPerReadHistogram to use biased sampling (CASSANDRA-6164) + * Log UnknownColumnfamilyException when closing socket (CASSANDRA-5725) -1.2.10 +2.0.1 + * Fix bug that could allow reading deleted data temporarily (CASSANDRA-6025) + * Improve memory use defaults (CASSANDRA-5069) + * Make ThriftServer more easlly extensible (CASSANDRA-6058) + * Remove Hadoop dependency from ITransportFactory (CASSANDRA-6062) + * add file_cache_size_in_mb setting (CASSANDRA-5661) + * Improve error message when yaml contains invalid properties (CASSANDRA-5958) + * Improve leveled compaction's ability to find non-overlapping L0 compactions + to work on concurrently (CASSANDRA-5921) + * Notify indexer of columns shadowed by range tombstones (CASSANDRA-5614) + * Log Merkle tree stats (CASSANDRA-2698) + * Switch from crc32 to adler32 for compressed sstable checksums (CASSANDRA-5862) + * Improve offheap memcpy performance (CASSANDRA-5884) + * Use a range aware scanner for cleanup (CASSANDRA-2524) + * Cleanup doesn't need to inspect sstables that contain only local data + (CASSANDRA-5722) + * Add ability for CQL3 to list partition keys (CASSANDRA-4536) + * Improve native protocol serialization (CASSANDRA-5664) + * Upgrade Thrift to 0.9.1 (CASSANDRA-5923) + * Require superuser status for adding triggers (CASSANDRA-5963) + * Make standalone scrubber handle old and new style leveled manifest + (CASSANDRA-6005) + * Fix paxos bugs (CASSANDRA-6012, 6013, 6023) + * Fix paged ranges with multiple replicas (CASSANDRA-6004) + * Fix potential AssertionError during tracing (CASSANDRA-6041) + * Fix NPE in sstablesplit (CASSANDRA-6027) + * Migrate pre-2.0 key/value/column aliases to system.schema_columns + (CASSANDRA-6009) + * Paging filter empty rows too agressively (CASSANDRA-6040) + * Support variadic parameters for IN clauses (CASSANDRA-4210) + * cqlsh: return the result of CAS writes (CASSANDRA-5796) + * Fix validation of IN clauses with 2ndary indexes (CASSANDRA-6050) + * Support named bind variables in CQL (CASSANDRA-6033) +Merged from 1.2: + * Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980) * Avoid second-guessing out-of-space state (CASSANDRA-5605) * Tuning knobs for dealing with large blobs and many CFs (CASSANDRA-5982) * (Hadoop) Fix CQLRW for thrift tables (CASSANDRA-6002) http://git-wip-us.apache.org/repos/asf/cassandra/blob/d0fae099/src/java/org/apache/cassandra/net/IncomingTcpConnection.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/net/IncomingTcpConnection.java index 52de099,3b24a7f..f0449c4 --- a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java +++ b/src/java/org/apache/cassandra/net/IncomingTcpConnection.java @@@ -27,7 -27,11 +27,8 @@@ import org.slf4j.LoggerFactory import org.xerial.snappy.SnappyInputStream; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.gms.Gossiper; -import org.apache.cassandra.io.util.FastByteArrayInputStream; -import org.apache.cassandra.streaming.IncomingStreamReader; -import org.apache.cassandra.streaming.StreamHeader; + import org.apache.cassandra.db.UnknownColumnFamilyException; +import org.apache.cassandra.gms.Gossiper; public class IncomingTcpConnection extends Thread {
