Merge branch 'p/4122/03_group_stream_out_ranges' into refs/top-bases/p/4125/01_admin_tools
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ddb1b21b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ddb1b21b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ddb1b21b Branch: refs/heads/vnodes Commit: ddb1b21b45c4bc7bf48c08595fe7303a2b3d3d76 Parents: e905fff 550d11a Author: Eric Evans <[email protected]> Authored: Mon Jul 16 13:28:36 2012 -0500 Committer: Eric Evans <[email protected]> Committed: Mon Jul 16 13:28:36 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 3 +- pylib/cqlshlib/cql3handling.py | 28 ++- pylib/cqlshlib/cqlhandling.py | 6 +- .../org/apache/cassandra/cql3/CFDefinition.java | 28 ++- src/java/org/apache/cassandra/cql3/CFPropDefs.java | 40 --- .../apache/cassandra/cql3/ColumnIdentifier.java | 12 +- src/java/org/apache/cassandra/cql3/Cql.g | 167 ++++++++--- src/java/org/apache/cassandra/cql3/Operation.java | 91 +++++-- src/java/org/apache/cassandra/cql3/ParsedType.java | 129 ++++++++ .../org/apache/cassandra/cql3/QueryProcessor.java | 6 +- src/java/org/apache/cassandra/cql3/Term.java | 73 +++-- .../apache/cassandra/cql3/UpdateParameters.java | 64 ++++ src/java/org/apache/cassandra/cql3/Value.java | 121 ++++++++ .../cql3/statements/AlterTableStatement.java | 35 ++- .../cassandra/cql3/statements/BatchStatement.java | 4 +- .../cassandra/cql3/statements/ColumnGroupMap.java | 175 +++++++++++ .../statements/CreateColumnFamilyStatement.java | 55 +++- .../cassandra/cql3/statements/DeleteStatement.java | 147 ++++++--- .../cql3/statements/ModificationStatement.java | 61 ++++- .../cassandra/cql3/statements/SelectStatement.java | 164 ++++------- .../apache/cassandra/cql3/statements/Selector.java | 78 +++++- .../cassandra/cql3/statements/UpdateStatement.java | 225 +++++++++----- .../org/apache/cassandra/db/ColumnFamilyStore.java | 2 +- .../apache/cassandra/db/SliceFromReadCommand.java | 3 +- .../apache/cassandra/db/filter/ColumnCounter.java | 108 +++++++ .../apache/cassandra/db/filter/ExtendedFilter.java | 8 + .../cassandra/db/filter/SliceQueryFilter.java | 62 +++- .../db/marshal/AbstractCompositeType.java | 11 +- .../apache/cassandra/db/marshal/AbstractType.java | 23 ++ .../cassandra/db/marshal/CollectionType.java | 135 +++++++++ .../db/marshal/ColumnToCollectionType.java | 135 +++++++++ .../apache/cassandra/db/marshal/CompositeType.java | 44 ++- .../org/apache/cassandra/db/marshal/EmptyType.java | 67 ++++ .../org/apache/cassandra/db/marshal/ListType.java | 235 +++++++++++++++ .../org/apache/cassandra/db/marshal/MapType.java | 130 ++++++++ .../org/apache/cassandra/db/marshal/SetType.java | 134 ++++++++ .../apache/cassandra/db/marshal/TypeParser.java | 91 ++++++- src/java/org/apache/cassandra/utils/UUIDGen.java | 26 ++- .../Keyspace1-Standard3-hd-1-Data.db | Bin 498 -> 0 bytes .../Keyspace1-Standard3-hd-1-Filter.db | Bin 256 -> 0 bytes .../Keyspace1-Standard3-hd-1-Index.db | Bin 66 -> 0 bytes .../Keyspace1-Standard3-hd-1-Statistics.db | Bin 4354 -> 0 bytes .../Keyspace1-Standard3-ia-1-Data.db | Bin 0 -> 354 bytes .../Keyspace1-Standard3-ia-1-Filter.db | Bin 0 -> 256 bytes .../Keyspace1-Standard3-ia-1-Index.db | Bin 0 -> 90 bytes .../Keyspace1-Standard3-ia-1-Statistics.db | Bin 0 -> 4349 bytes .../serialization/1.2/db.RangeSliceCommand.bin | Bin 717 -> 733 bytes test/data/serialization/1.2/db.Row.bin | Bin 527 -> 527 bytes test/data/serialization/1.2/db.RowMutation.bin | Bin 3410 -> 3410 bytes .../serialization/1.2/db.SliceFromReadCommand.bin | Bin 385 -> 409 bytes test/data/serialization/1.2/gms.EndpointState.bin | Bin 110 -> 110 bytes .../serialization/1.2/service.TreeResponse.bin | Bin 930 -> 930 bytes test/data/serialization/1.2/utils.BloomFilter.bin | Bin 2500016 -> 2500016 bytes test/unit/org/apache/cassandra/db/ScrubTest.java | 24 +- 54 files changed, 2486 insertions(+), 464 deletions(-) ----------------------------------------------------------------------
