Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e7ff361c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e7ff361c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e7ff361c Branch: refs/heads/trunk Commit: e7ff361c83313737031c372de84ef282eedc8c50 Parents: 8f6e652 97cbf6a Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Oct 29 11:12:03 2013 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Oct 29 11:12:03 2013 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + NEWS.txt | 10 + doc/native_protocol_v2.spec | 8 +- .../org/apache/cassandra/config/CFMetaData.java | 3 +- .../apache/cassandra/cql3/QueryProcessor.java | 2 +- .../cql3/statements/ModificationStatement.java | 4 +- .../cql3/statements/UpdateStatement.java | 9 +- .../io/sstable/AbstractSSTableSimpleWriter.java | 19 + .../cassandra/io/sstable/CQLSSTableWriter.java | 476 +++++++++++++++++++ .../io/sstable/SSTableSimpleUnsortedWriter.java | 2 +- .../io/sstable/SSTableSimpleWriter.java | 2 +- .../cassandra/io/sstable/SSTableWriter.java | 37 +- .../unit/org/apache/cassandra/SchemaLoader.java | 14 +- .../io/sstable/CQLSSTableWriterTest.java | 115 +++++ 14 files changed, 675 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e7ff361c/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e7ff361c/NEWS.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e7ff361c/src/java/org/apache/cassandra/config/CFMetaData.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e7ff361c/test/unit/org/apache/cassandra/SchemaLoader.java ----------------------------------------------------------------------
