Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B9FCDD712 for ; Tue, 17 Jul 2012 17:33:09 +0000 (UTC) Received: (qmail 97685 invoked by uid 500); 17 Jul 2012 17:33:05 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 97578 invoked by uid 500); 17 Jul 2012 17:33:05 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 96725 invoked by uid 99); 17 Jul 2012 17:33:04 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Jul 2012 17:33:04 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 431E714D4B; Tue, 17 Jul 2012 17:33:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: eevans@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [14/50] git commit: Merge commit 'refs/top-bases/p/4127/01_migration_path' into p/4127/01_migration_path Message-Id: <20120717173304.431E714D4B@tyr.zones.apache.org> Date: Tue, 17 Jul 2012 17:33:04 +0000 (UTC) Merge commit 'refs/top-bases/p/4127/01_migration_path' into p/4127/01_migration_path Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/92ef65fe Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/92ef65fe Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/92ef65fe Branch: refs/heads/vnodes Commit: 92ef65fec777fd4a512e9d71661d6660b8be1435 Parents: c87b7bb 89924db Author: Eric Evans Authored: Mon Jul 16 13:28:37 2012 -0500 Committer: Eric Evans Committed: Mon Jul 16 13:28:37 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(-) ----------------------------------------------------------------------