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/4d75ed20 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4d75ed20 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4d75ed20 Branch: refs/heads/trunk Commit: 4d75ed206c4df5f9cb880b8a1133f4b5ccdd6ecf Parents: 1debf25 63b1ef4 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu Feb 20 17:51:44 2014 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu Feb 20 17:51:44 2014 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + doc/cql3/CQL.textile | 29 +- .../org/apache/cassandra/config/CFMetaData.java | 30 +- .../cassandra/config/ColumnDefinition.java | 16 + src/java/org/apache/cassandra/cql3/CQL3Row.java | 7 +- .../apache/cassandra/cql3/ColumnCondition.java | 183 ++++++++++ .../org/apache/cassandra/cql3/Constants.java | 8 +- src/java/org/apache/cassandra/cql3/Cql.g | 29 +- src/java/org/apache/cassandra/cql3/Lists.java | 12 +- src/java/org/apache/cassandra/cql3/Maps.java | 14 +- src/java/org/apache/cassandra/cql3/Sets.java | 12 +- .../cql3/statements/AlterTableStatement.java | 30 +- .../cql3/statements/BatchStatement.java | 162 +++++++-- .../cql3/statements/CQL3CasConditions.java | 164 +++++++++ .../cql3/statements/CreateIndexStatement.java | 9 + .../cql3/statements/CreateTableStatement.java | 41 ++- .../cql3/statements/DeleteStatement.java | 23 +- .../cql3/statements/ModificationStatement.java | 330 ++++++++++--------- .../cql3/statements/SelectStatement.java | 238 +++++++++++-- .../cassandra/cql3/statements/Selection.java | 29 +- .../cql3/statements/UpdateStatement.java | 20 +- .../org/apache/cassandra/db/CFRowAdder.java | 10 +- .../cassandra/db/composites/AbstractCType.java | 7 +- .../db/composites/AbstractCellNameType.java | 188 +++++++---- .../db/composites/AbstractComposite.java | 17 +- .../AbstractCompoundCellNameType.java | 37 ++- .../db/composites/BoundedComposite.java | 5 + .../cassandra/db/composites/CellNameType.java | 21 +- .../cassandra/db/composites/Composite.java | 2 + .../cassandra/db/composites/Composites.java | 5 + .../cassandra/db/composites/CompoundCType.java | 14 +- .../db/composites/CompoundComposite.java | 16 +- .../db/composites/CompoundDenseCellName.java | 2 +- .../composites/CompoundDenseCellNameType.java | 14 +- .../db/composites/CompoundSparseCellName.java | 34 +- .../composites/CompoundSparseCellNameType.java | 98 ++++-- .../db/composites/SimpleDenseCellNameType.java | 5 +- .../db/composites/SimpleSparseCellNameType.java | 7 +- .../cassandra/db/filter/ExtendedFilter.java | 10 +- .../CompositesIndexOnCollectionKey.java | 2 +- .../CompositesIndexOnCollectionValue.java | 2 +- .../composites/CompositesIndexOnRegular.java | 2 +- .../db/index/composites/CompositesSearcher.java | 25 +- .../db/marshal/AbstractCompositeType.java | 47 +-- .../cassandra/db/marshal/CompositeType.java | 72 +++- .../db/marshal/DynamicCompositeType.java | 6 + .../hadoop/pig/AbstractCassandraStorage.java | 3 +- .../apache/cassandra/service/CASConditions.java | 3 +- 48 files changed, 1552 insertions(+), 489 deletions(-) ----------------------------------------------------------------------
