cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [15/15] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Date Fri, 21 Aug 2015 23:48:46 GMT
Merge branch 'cassandra-3.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/8e897f0e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8e897f0e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8e897f0e

Branch: refs/heads/trunk
Commit: 8e897f0e14e68e982241f1dbdffc5c3c42bd7563
Parents: 6fd6c62 0626be8
Author: Sam Tunnicliffe <sam@beobal.com>
Authored: Sat Aug 22 00:44:46 2015 +0100
Committer: Sam Tunnicliffe <sam@beobal.com>
Committed: Sat Aug 22 00:44:46 2015 +0100

----------------------------------------------------------------------
 NEWS.txt                                        |   4 +
 .../org/apache/cassandra/config/CFMetaData.java |   8 +-
 .../org/apache/cassandra/config/Schema.java     |  10 +-
 .../apache/cassandra/cql3/UpdateParameters.java |  24 +-
 .../ForwardingPrimaryKeyRestrictions.java       |   9 +-
 .../restrictions/MultiColumnRestriction.java    |  45 +-
 .../restrictions/PrimaryKeyRestrictionSet.java  |   2 +-
 .../cql3/restrictions/Restriction.java          |   2 +-
 .../cql3/restrictions/RestrictionSet.java       |   2 +-
 .../cql3/restrictions/Restrictions.java         |   2 +-
 .../restrictions/SingleColumnRestriction.java   |  36 +-
 .../restrictions/StatementRestrictions.java     |   7 +-
 .../cassandra/cql3/restrictions/TermSlice.java  |  15 +-
 .../cql3/restrictions/TokenRestriction.java     |   6 +-
 .../cql3/statements/AlterTableStatement.java    |  22 +-
 .../cql3/statements/CreateIndexStatement.java   |  56 +-
 .../cql3/statements/DeleteStatement.java        |  16 +-
 .../cql3/statements/IndexPropDefs.java          |  11 +-
 .../cassandra/cql3/statements/IndexTarget.java  |  48 +-
 .../cql3/statements/SelectStatement.java        |  24 +-
 .../cql3/statements/UpdateStatement.java        |  16 +-
 .../apache/cassandra/db/ColumnFamilyStore.java  | 111 ++-
 src/java/org/apache/cassandra/db/Keyspace.java  | 108 ++-
 src/java/org/apache/cassandra/db/Memtable.java  |  30 +-
 .../cassandra/db/PartitionRangeReadCommand.java |  15 +-
 .../org/apache/cassandra/db/ReadCommand.java    |  25 +-
 .../org/apache/cassandra/db/ReadOrderGroup.java |  12 +-
 .../org/apache/cassandra/db/SystemKeyspace.java |  45 +-
 .../db/compaction/CompactionIterator.java       |  59 +-
 .../db/compaction/CompactionManager.java        |  46 +-
 .../apache/cassandra/db/filter/RowFilter.java   |  14 +-
 .../AbstractSimplePerColumnSecondaryIndex.java  | 251 ------
 .../db/index/PerColumnSecondaryIndex.java       | 116 ---
 .../db/index/PerRowSecondaryIndex.java          |  56 --
 .../cassandra/db/index/SecondaryIndex.java      | 429 ---------
 .../db/index/SecondaryIndexBuilder.java         |  85 --
 .../db/index/SecondaryIndexManager.java         | 792 ----------------
 .../db/index/SecondaryIndexSearcher.java        | 244 -----
 .../db/index/composites/CompositesIndex.java    | 168 ----
 .../CompositesIndexIncludingCollectionKey.java  |  60 --
 .../CompositesIndexOnClusteringKey.java         | 137 ---
 .../CompositesIndexOnCollectionKey.java         |  58 --
 .../CompositesIndexOnCollectionKeyAndValue.java |  59 --
 .../CompositesIndexOnCollectionValue.java       | 101 ---
 .../CompositesIndexOnPartitionKey.java          | 106 ---
 .../composites/CompositesIndexOnRegular.java    |  75 --
 .../db/index/composites/CompositesSearcher.java | 218 -----
 .../cassandra/db/index/keys/KeysIndex.java      |  90 --
 .../cassandra/db/index/keys/KeysSearcher.java   | 191 ----
 .../db/partitions/AtomicBTreePartition.java     |  77 +-
 .../db/partitions/PartitionUpdate.java          |  15 +-
 .../org/apache/cassandra/db/rows/Cells.java     |  50 +-
 src/java/org/apache/cassandra/db/rows/Rows.java |  27 +-
 src/java/org/apache/cassandra/index/Index.java  | 388 ++++++++
 .../apache/cassandra/index/IndexRegistry.java   |  22 +
 .../cassandra/index/SecondaryIndexBuilder.java  |  84 ++
 .../cassandra/index/SecondaryIndexManager.java  | 900 +++++++++++++++++++
 .../index/internal/CassandraIndex.java          | 755 ++++++++++++++++
 .../index/internal/CassandraIndexFunctions.java | 186 ++++
 .../index/internal/CassandraIndexSearcher.java  | 172 ++++
 .../cassandra/index/internal/IndexEntry.java    |  34 +
 .../composites/ClusteringColumnIndex.java       | 100 +++
 .../composites/CollectionEntryIndex.java        |  68 ++
 .../internal/composites/CollectionKeyIndex.java |  64 ++
 .../composites/CollectionKeyIndexBase.java      |  78 ++
 .../composites/CollectionValueIndex.java        | 107 +++
 .../internal/composites/CompositesSearcher.java | 249 +++++
 .../internal/composites/PartitionKeyIndex.java  |  95 ++
 .../internal/composites/RegularColumnIndex.java |  96 ++
 .../index/internal/keys/KeysIndex.java          |  62 ++
 .../index/internal/keys/KeysSearcher.java       | 188 ++++
 .../index/transactions/CleanupTransaction.java  |  52 ++
 .../transactions/CompactionTransaction.java     |  44 +
 .../index/transactions/IndexTransaction.java    |  57 ++
 .../index/transactions/UpdateTransaction.java   |  77 ++
 .../io/sstable/format/SSTableReader.java        |  17 +-
 .../apache/cassandra/schema/IndexMetadata.java  | 100 ++-
 .../org/apache/cassandra/schema/Indexes.java    |  27 +-
 .../cassandra/schema/LegacySchemaMigrator.java  |   6 +-
 .../apache/cassandra/schema/SchemaKeyspace.java |   3 +-
 .../apache/cassandra/service/DataResolver.java  |  12 +-
 .../apache/cassandra/service/StorageProxy.java  |  45 +-
 .../cassandra/streaming/StreamReceiveTask.java  |  15 +-
 .../cassandra/thrift/CassandraServer.java       |  12 +-
 .../cassandra/thrift/ThriftConversion.java      |  41 +-
 .../cassandra/thrift/ThriftValidation.java      |  17 +-
 .../unit/org/apache/cassandra/SchemaLoader.java |  40 +-
 test/unit/org/apache/cassandra/Util.java        |  13 +-
 .../validation/entities/SecondaryIndexTest.java |  97 +-
 .../miscellaneous/CrcCheckChanceTest.java       |   6 +-
 .../org/apache/cassandra/db/CleanupTest.java    |  14 +-
 .../apache/cassandra/db/DirectoriesTest.java    |  27 +-
 .../apache/cassandra/db/RangeTombstoneTest.java | 137 +--
 .../unit/org/apache/cassandra/db/ScrubTest.java |  19 +-
 .../apache/cassandra/db/SecondaryIndexTest.java |  86 +-
 .../db/index/PerRowSecondaryIndexTest.java      | 304 -------
 .../org/apache/cassandra/index/StubIndex.java   | 186 ++++
 .../index/internal/CassandraIndexTest.java      | 718 +++++++++++++++
 .../cassandra/io/sstable/SSTableReaderTest.java |  63 +-
 .../org/apache/cassandra/schema/DefsTest.java   |  19 +-
 .../schema/LegacySchemaMigratorTest.java        |   4 +-
 101 files changed, 5737 insertions(+), 4404 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8e897f0e/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------


Mime
View raw message