Updated Branches: refs/heads/trunk e15664d08 -> 6a0d02c76
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6a0d02c7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6a0d02c7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6a0d02c7 Branch: refs/heads/trunk Commit: 6a0d02c761cb19f8486ea1a1dd905843524bcdb3 Parents: e15664d a4452ee Author: Sylvain Lebresne <[email protected]> Authored: Wed Nov 21 14:04:30 2012 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Wed Nov 21 14:04:30 2012 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/cql3/statements/SelectStatement.java | 11 ++--- .../cassandra/db/AbstractColumnContainer.java | 9 +-- .../apache/cassandra/db/CollationController.java | 5 +- .../org/apache/cassandra/db/ColumnFamilyStore.java | 8 ++-- .../org/apache/cassandra/db/RangeSliceCommand.java | 20 ++++---- src/java/org/apache/cassandra/db/Row.java | 11 ++-- .../org/apache/cassandra/db/SliceQueryPager.java | 5 +- .../apache/cassandra/db/filter/ExtendedFilter.java | 38 +++++++------- .../cassandra/db/filter/IDiskAtomFilter.java | 12 +++-- .../cassandra/db/filter/NamesQueryFilter.java | 41 ++++++++++++++- .../cassandra/db/filter/SliceQueryFilter.java | 12 ++++- .../cassandra/db/index/SecondaryIndexManager.java | 4 +- .../cassandra/db/index/SecondaryIndexSearcher.java | 2 +- .../db/index/composites/CompositesSearcher.java | 8 ++-- .../cassandra/db/index/keys/KeysSearcher.java | 4 +- .../cassandra/service/RangeSliceVerbHandler.java | 4 +- .../cassandra/service/RowRepairResolver.java | 6 +- .../org/apache/cassandra/service/StorageProxy.java | 24 +++++---- .../apache/cassandra/db/ColumnFamilyStoreTest.java | 2 +- 20 files changed, 139 insertions(+), 88 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6a0d02c7/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6a0d02c7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------
