Merge branch 'cassandra-2.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/0132b71a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0132b71a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0132b71a Branch: refs/heads/trunk Commit: 0132b71a05f2e2bfa6fcd5470024644a19a4456f Parents: 7246502 f6fda9c Author: Aleksey Yeschenko <alek...@apache.org> Authored: Wed Sep 11 00:58:23 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Wed Sep 11 00:58:23 2013 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/Keyspace.java | 2 +- .../db/index/PerRowSecondaryIndex.java | 11 +--- .../db/index/SecondaryIndexManager.java | 64 ++++++++++---------- .../db/SecondaryIndexColumnSizeTest.java | 4 +- .../db/index/PerRowSecondaryIndexTest.java | 21 +++---- 6 files changed, 46 insertions(+), 57 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0132b71a/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0132b71a/src/java/org/apache/cassandra/db/Keyspace.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0132b71a/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java index f6db9f9,eff9537..bec5894 --- a/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java +++ b/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java @@@ -491,10 -496,10 +495,10 @@@ public class SecondaryIndexManage groupByIndexType.put(index.getClass().getCanonicalName(), columns); } - columns.add(ix.column_name); + columns.add(ix.column); } - List<SecondaryIndexSearcher> indexSearchers = new ArrayList<SecondaryIndexSearcher>(groupByIndexType.size()); + List<SecondaryIndexSearcher> indexSearchers = new ArrayList<>(groupByIndexType.size()); //create searcher per type for (Set<ByteBuffer> column : groupByIndexType.values())
