Updated Branches: refs/heads/cassandra-1.1 de80c6c6d -> bf4d6fbbd refs/heads/cassandra-1.1.0 d49113fad -> 97aa922a7 refs/heads/trunk 8f9b37c3d -> 8cd1792e1
Merge branch 'cassandra-1.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/8cd1792e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8cd1792e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8cd1792e Branch: refs/heads/trunk Commit: 8cd1792e1e40b418b2a232d00150cb78afe87b1c Parents: 8f9b37c bf4d6fb Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Apr 11 13:25:28 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Apr 11 13:25:28 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 + examples/hadoop_word_count/README.txt | 13 ++ examples/hadoop_word_count/bin/word_count | 1 + examples/hadoop_word_count/conf/log4j.properties | 15 ++ examples/hadoop_word_count/src/WordCount.java | 3 +- .../cassandra/cql3/statements/SelectStatement.java | 64 ++++++- .../org/apache/cassandra/db/ColumnFamilyStore.java | 10 +- src/java/org/apache/cassandra/db/Memtable.java | 86 +++++---- .../org/apache/cassandra/db/RangeSliceCommand.java | 23 ++- .../apache/cassandra/db/filter/ExtendedFilter.java | 30 +++- .../cassandra/db/filter/SliceQueryFilter.java | 3 +- .../cassandra/db/index/keys/KeysSearcher.java | 2 +- .../cassandra/hadoop/ColumnFamilyInputFormat.java | 25 ++- .../cassandra/hadoop/ColumnFamilyRecordReader.java | 139 ++++++++------ .../apache/cassandra/hadoop/ColumnFamilySplit.java | 9 +- .../cassandra/service/RangeSliceVerbHandler.java | 2 +- .../org/apache/cassandra/service/StorageProxy.java | 3 +- .../apache/cassandra/thrift/CassandraServer.java | 7 +- .../apache/cassandra/thrift/ThriftValidation.java | 19 +-- .../apache/cassandra/db/ColumnFamilyStoreTest.java | 92 +++++++++- 20 files changed, 378 insertions(+), 170 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8cd1792e/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8cd1792e/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8cd1792e/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8cd1792e/src/java/org/apache/cassandra/db/Memtable.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8cd1792e/src/java/org/apache/cassandra/db/RangeSliceCommand.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8cd1792e/src/java/org/apache/cassandra/db/filter/ExtendedFilter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8cd1792e/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java index d688d14,1a4a912..9901130 --- a/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java +++ b/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java @@@ -37,9 -41,10 +37,10 @@@ import org.apache.cassandra.io.util.Fil public class SliceQueryFilter implements IFilter { - private static Logger logger = LoggerFactory.getLogger(SliceQueryFilter.class); + private static final Logger logger = LoggerFactory.getLogger(SliceQueryFilter.class); - public final ByteBuffer start; public final ByteBuffer finish; + public volatile ByteBuffer start; + public volatile ByteBuffer finish; public final boolean reversed; public volatile int count; http://git-wip-us.apache.org/repos/asf/cassandra/blob/8cd1792e/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8cd1792e/src/java/org/apache/cassandra/hadoop/ColumnFamilyInputFormat.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/hadoop/ColumnFamilyInputFormat.java index dc137a5,354903d..03a61f0 --- a/src/java/org/apache/cassandra/hadoop/ColumnFamilyInputFormat.java +++ b/src/java/org/apache/cassandra/hadoop/ColumnFamilyInputFormat.java @@@ -210,16 -217,24 +213,24 @@@ public class ColumnFamilyInputFormat ex for (String endpoint: range.rpc_endpoints) { String endpoint_address = endpoint; - if (endpoint_address == null || endpoint_address.equals("0.0.0.0")) - endpoint_address = range.endpoints.get(endpointIndex); - endpoints[endpointIndex++] = InetAddress.getByName(endpoint_address).getHostName(); + if (endpoint_address == null || endpoint_address.equals("0.0.0.0")) + endpoint_address = range.endpoints.get(endpointIndex); + endpoints[endpointIndex++] = InetAddress.getByName(endpoint_address).getHostName(); } + Token.TokenFactory factory = partitioner.getTokenFactory(); for (int i = 1; i < tokens.size(); i++) { - ColumnFamilySplit split = new ColumnFamilySplit(tokens.get(i - 1), tokens.get(i), endpoints); - logger.debug("adding " + split); - splits.add(split); + Token left = factory.fromString(tokens.get(i - 1)); + Token right = factory.fromString(tokens.get(i)); + Range<Token> range = new Range<Token>(left, right, partitioner); + List<Range<Token>> ranges = range.isWrapAround() ? range.unwrap() : ImmutableList.of(range); + for (Range<Token> subrange : ranges) + { + ColumnFamilySplit split = new ColumnFamilySplit(factory.toString(subrange.left), factory.toString(subrange.right), endpoints); + logger.debug("adding " + split); + splits.add(split); + } } return splits; } http://git-wip-us.apache.org/repos/asf/cassandra/blob/8cd1792e/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8cd1792e/src/java/org/apache/cassandra/hadoop/ColumnFamilySplit.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8cd1792e/src/java/org/apache/cassandra/service/RangeSliceVerbHandler.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8cd1792e/src/java/org/apache/cassandra/service/StorageProxy.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8cd1792e/src/java/org/apache/cassandra/thrift/CassandraServer.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8cd1792e/src/java/org/apache/cassandra/thrift/ThriftValidation.java ----------------------------------------------------------------------