Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2cba3fc9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2cba3fc9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2cba3fc9 Branch: refs/heads/trunk Commit: 2cba3fc95117b74b7cfb82d39c0ddb8b1829536d Parents: 25272a4 9b9bf45 Author: Sylvain Lebresne <[email protected]> Authored: Tue Sep 9 18:39:53 2014 -0700 Committer: Sylvain Lebresne <[email protected]> Committed: Tue Sep 9 18:39:53 2014 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/db/ArrayBackedSortedColumns.java | 5 ++ .../io/sstable/AbstractSSTableSimpleWriter.java | 11 ++- .../cassandra/io/sstable/CQLSSTableWriter.java | 81 ++++++++++++++++---- .../io/sstable/SSTableSimpleUnsortedWriter.java | 38 ++++++--- .../io/sstable/CQLSSTableWriterTest.java | 39 ++++++++++ 6 files changed, 143 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2cba3fc9/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2cba3fc9/src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2cba3fc9/src/java/org/apache/cassandra/io/sstable/AbstractSSTableSimpleWriter.java ----------------------------------------------------------------------
