You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2012/03/13 14:10:29 UTC
[1/7] git commit: Merge branch 'cassandra-1.1.0' into cassandra-1.1
Updated Branches:
refs/heads/cassandra-1.1 3db0a75d5 -> 073038c84
Merge branch 'cassandra-1.1.0' into cassandra-1.1
Conflicts:
CHANGES.txt
NEWS.txt
src/java/org/apache/cassandra/config/KSMetaData.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/073038c8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/073038c8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/073038c8
Branch: refs/heads/cassandra-1.1
Commit: 073038c84bb0015cc93af3e8b69045d3b32091bb
Parents: 3db0a75 ccb0028
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Mar 13 14:10:07 2012 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Mar 13 14:10:07 2012 +0100
----------------------------------------------------------------------
CHANGES.txt | 2 +
src/java/org/apache/cassandra/config/Avro.java | 193 ++++
.../org/apache/cassandra/config/CFMetaData.java | 727 +++++++--------
.../apache/cassandra/config/ColumnDefinition.java | 220 ++---
.../org/apache/cassandra/config/KSMetaData.java | 242 ++----
.../cassandra/cql/CreateColumnFamilyStatement.java | 2 +-
.../apache/cassandra/cql/DropIndexStatement.java | 2 +-
.../org/apache/cassandra/cql/QueryProcessor.java | 4 +-
.../org/apache/cassandra/cql3/QueryProcessor.java | 29 +
.../apache/cassandra/cql3/UntypedResultSet.java | 110 +++
.../cql3/statements/AlterTableStatement.java | 2 +-
.../statements/CreateColumnFamilyStatement.java | 2 +-
.../cql3/statements/CreateIndexStatement.java | 2 +-
.../cql3/statements/DropIndexStatement.java | 2 +-
.../cql3/statements/ModificationStatement.java | 1 -
.../cassandra/cql3/statements/SelectStatement.java | 19 +-
.../cassandra/cql3/statements/UpdateStatement.java | 29 +-
src/java/org/apache/cassandra/db/Column.java | 48 +-
src/java/org/apache/cassandra/db/DefsTable.java | 71 +-
.../org/apache/cassandra/db/DeletedColumn.java | 5 +
src/java/org/apache/cassandra/db/RowMutation.java | 19 +
.../apache/cassandra/db/marshal/AbstractType.java | 8 +-
.../cassandra/db/marshal/DynamicCompositeType.java | 5 +
.../cassandra/db/migration/AddColumnFamily.java | 4 +-
.../apache/cassandra/db/migration/AddKeyspace.java | 4 +-
.../cassandra/db/migration/DropColumnFamily.java | 4 +-
.../cassandra/db/migration/DropKeyspace.java | 4 +-
.../apache/cassandra/db/migration/Migration.java | 12 +-
.../cassandra/db/migration/MigrationHelper.java | 258 +-----
.../cassandra/db/migration/UpdateColumnFamily.java | 14 +-
.../cassandra/db/migration/UpdateKeyspace.java | 13 +-
.../io/compress/CompressionParameters.java | 15 -
.../apache/cassandra/service/MigrationManager.java | 2 +-
.../apache/cassandra/thrift/CassandraServer.java | 4 +-
.../org/apache/cassandra/utils/ByteBufferUtil.java | 5 +-
.../org/apache/cassandra/utils/FBUtilities.java | 41 +
.../apache/cassandra/config/CFMetaDataTest.java | 15 +-
.../unit/org/apache/cassandra/config/DefsTest.java | 590 ++++++++++++
test/unit/org/apache/cassandra/db/DefsTest.java | 622 ------------
39 files changed, 1676 insertions(+), 1675 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/073038c8/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/073038c8/src/java/org/apache/cassandra/config/KSMetaData.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/073038c8/src/java/org/apache/cassandra/cql/QueryProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/073038c8/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/073038c8/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/073038c8/src/java/org/apache/cassandra/db/DefsTable.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/073038c8/src/java/org/apache/cassandra/db/RowMutation.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/073038c8/src/java/org/apache/cassandra/service/MigrationManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/073038c8/src/java/org/apache/cassandra/thrift/CassandraServer.java
----------------------------------------------------------------------