Updated Branches: refs/heads/trunk 76d97db02 -> 604a38645
remove COPP patch by jbellis; reviewed by brandonwilliams for CASSANDRA-2479 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/604a3864 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/604a3864 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/604a3864 Branch: refs/heads/trunk Commit: 604a38645cbb958d4bb32db8a25b6093ee4cd68e Parents: 76d97db Author: Jonathan Ellis <[email protected]> Authored: Mon Jun 4 16:43:00 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Mon Jun 4 17:23:02 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + NEWS.txt | 3 + .../dht/CollatingOrderPreservingPartitioner.java | 51 -------------- test/conf/cassandra.yaml | 2 +- .../CollatingOrderPreservingPartitionerTest.java | 52 --------------- 5 files changed, 5 insertions(+), 104 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/604a3864/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 03f878d..793a569 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 1.2-dev + * remove COPP (CASSANDRA-2479) * Track tombstone expiration and compact when tombstone content is higher than a configurable threshold, default 20% (CASSANDRA-3442) * update MurmurHash to version 3 (CASSANDRA-2975) http://git-wip-us.apache.org/repos/asf/cassandra/blob/604a3864/NEWS.txt ---------------------------------------------------------------------- diff --git a/NEWS.txt b/NEWS.txt index 843333b..92723fd 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -30,6 +30,9 @@ Upgrading incompatible with the earlier `nodetool removetoken`, and attempts to remove nodes in this way with a mixed 1.1 (or lower) / 1.2 cluster, is not supported. + - The somewhat ill-concieved CollatingOrderPreservingPartitioner + has been removed. Use RandomPartitioner (recommended) or + ByteOrderedPartitioner instead. 1.1.1 http://git-wip-us.apache.org/repos/asf/cassandra/blob/604a3864/src/java/org/apache/cassandra/dht/CollatingOrderPreservingPartitioner.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/dht/CollatingOrderPreservingPartitioner.java b/src/java/org/apache/cassandra/dht/CollatingOrderPreservingPartitioner.java deleted file mode 100644 index 0233fa5..0000000 --- a/src/java/org/apache/cassandra/dht/CollatingOrderPreservingPartitioner.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.cassandra.dht; - -import java.nio.ByteBuffer; -import java.nio.charset.CharacterCodingException; -import java.text.Collator; -import java.util.List; -import java.util.Locale; -import java.util.Map; - -import org.apache.cassandra.utils.ByteBufferUtil; - -public class CollatingOrderPreservingPartitioner extends AbstractByteOrderedPartitioner -{ - static final Collator collator = Collator.getInstance(new Locale("en", "US")); - - public BytesToken getToken(ByteBuffer key) - { - if (key.remaining() == 0) - return MINIMUM; - - String skey; - try - { - skey = ByteBufferUtil.string(key); - } - catch (CharacterCodingException e) - { - throw new RuntimeException("The provided key was not UTF8 encoded.", e); - } - return new BytesToken(ByteBuffer.wrap(collator.getCollationKey(skey).toByteArray())); - } - - public Map<Token, Float> describeOwnership(List<Token> sortedTokens){ throw new UnsupportedOperationException(); } -} http://git-wip-us.apache.org/repos/asf/cassandra/blob/604a3864/test/conf/cassandra.yaml ---------------------------------------------------------------------- diff --git a/test/conf/cassandra.yaml b/test/conf/cassandra.yaml index 3578493..1e722be 100644 --- a/test/conf/cassandra.yaml +++ b/test/conf/cassandra.yaml @@ -6,7 +6,7 @@ cluster_name: Test Cluster in_memory_compaction_limit_in_mb: 1 commitlog_sync: batch commitlog_sync_batch_window_in_ms: 1.0 -partitioner: org.apache.cassandra.dht.CollatingOrderPreservingPartitioner +partitioner: org.apache.cassandra.dht.ByteOrderedPartitioner rpc_timeout_in_ms: 5000 listen_address: 127.0.0.1 storage_port: 7010 http://git-wip-us.apache.org/repos/asf/cassandra/blob/604a3864/test/unit/org/apache/cassandra/dht/CollatingOrderPreservingPartitionerTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/dht/CollatingOrderPreservingPartitionerTest.java b/test/unit/org/apache/cassandra/dht/CollatingOrderPreservingPartitionerTest.java deleted file mode 100644 index 2314530..0000000 --- a/test/unit/org/apache/cassandra/dht/CollatingOrderPreservingPartitionerTest.java +++ /dev/null @@ -1,52 +0,0 @@ -/* -* Licensed to the Apache Software Foundation (ASF) under one -* or more contributor license agreements. See the NOTICE file -* distributed with this work for additional information -* regarding copyright ownership. The ASF licenses this file -* to you under the Apache License, Version 2.0 (the -* "License"); you may not use this file except in compliance -* with the License. You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, -* software distributed under the License is distributed on an -* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -* KIND, either express or implied. See the License for the -* specific language governing permissions and limitations -* under the License. -*/ -package org.apache.cassandra.dht; - -import org.junit.Test; - -public class CollatingOrderPreservingPartitionerTest extends PartitionerTestCase<BytesToken> -{ - public void initPartitioner() - { - partitioner = new CollatingOrderPreservingPartitioner(); - } - - /** - * Test that a non-UTF-8 byte array can still be encoded. - */ - @Test - public void testTokenFactoryStringsNonUTF() - { - Token.TokenFactory factory = this.partitioner.getTokenFactory(); - BytesToken tok = new BytesToken(new byte[]{(byte)0xFF, (byte)0xFF}); - assert tok.compareTo(factory.fromString(factory.toString(tok))) == 0; - } - - @Test - public void testCompare() - { - assert tok("").compareTo(tok("asdf")) < 0; - assert tok("asdf").compareTo(tok("")) > 0; - assert tok("").compareTo(tok("")) == 0; - assert tok("z").compareTo(tok("a")) > 0; - assert tok("a").compareTo(tok("z")) < 0; - assert tok("asdf").compareTo(tok("asdf")) == 0; - assert tok("asdz").compareTo(tok("asdf")) > 0; - } -}
