Test fixes for 1.0 message serialization format
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/56302cec Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/56302cec Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/56302cec Branch: refs/heads/cassandra-1.1.0 Commit: 56302ceccf0571b1f2c7373fe9331d9b7d1b05b4 Parents: 9597641 Author: Jonathan Ellis <[email protected]> Authored: Mon Mar 26 10:39:54 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Mon Mar 26 10:51:45 2012 -0500 ---------------------------------------------------------------------- .../cassandra/config/DatabaseDescriptor.java | 2 +- .../org/apache/cassandra/utils/MerkleTree.java | 1 + .../cassandra/service/SerializationsTest.java | 5 +++++ .../apache/cassandra/utils/SerializationsTest.java | 5 +++-- 4 files changed, 10 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/56302cec/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java index f981adf..839e228 100644 --- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java +++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java @@ -197,7 +197,7 @@ public class DatabaseDescriptor } try { - partitioner = FBUtilities.newPartitioner(conf.partitioner); + partitioner = FBUtilities.newPartitioner(System.getProperty("cassandra.partitioner", conf.partitioner)); } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/cassandra/blob/56302cec/src/java/org/apache/cassandra/utils/MerkleTree.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/MerkleTree.java b/src/java/org/apache/cassandra/utils/MerkleTree.java index e8cc0e4..c220369 100644 --- a/src/java/org/apache/cassandra/utils/MerkleTree.java +++ b/src/java/org/apache/cassandra/utils/MerkleTree.java @@ -73,6 +73,7 @@ public class MerkleTree implements Serializable */ public transient Range fullRange; + // TODO This is broken; Token serialization assumes system partitioner, so if this doesn't match all hell breaks loose private transient IPartitioner partitioner; private long maxsize; http://git-wip-us.apache.org/repos/asf/cassandra/blob/56302cec/test/unit/org/apache/cassandra/service/SerializationsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/service/SerializationsTest.java b/test/unit/org/apache/cassandra/service/SerializationsTest.java index b13bf7f..3792673 100644 --- a/test/unit/org/apache/cassandra/service/SerializationsTest.java +++ b/test/unit/org/apache/cassandra/service/SerializationsTest.java @@ -40,6 +40,11 @@ import org.apache.cassandra.utils.MerkleTree; public class SerializationsTest extends AbstractSerializationsTester { + static + { + System.setProperty("cassandra.partitioner", "RandomPartitioner"); + } + private static MessageSerializer messageSerializer = new MessageSerializer(); public static Range FULL_RANGE = new Range(StorageService.getPartitioner().getMinimumToken(), StorageService.getPartitioner().getMinimumToken()); http://git-wip-us.apache.org/repos/asf/cassandra/blob/56302cec/test/unit/org/apache/cassandra/utils/SerializationsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/utils/SerializationsTest.java b/test/unit/org/apache/cassandra/utils/SerializationsTest.java index eebed99..c35a5f5 100644 --- a/test/unit/org/apache/cassandra/utils/SerializationsTest.java +++ b/test/unit/org/apache/cassandra/utils/SerializationsTest.java @@ -73,8 +73,9 @@ public class SerializationsTest extends AbstractSerializationsTester @Test public void testLegacyBloomFilterRead() throws IOException { - if (EXECUTE_WRITES) - testLegacyBloomFilterWrite(); + // We never write out a new LBF. Copy the data file from 0.7 instead. + // if (EXECUTE_WRITES) + // testLegacyBloomFilterWrite(); DataInputStream in = getInput("utils.LegacyBloomFilter.bin"); assert LegacyBloomFilter.serializer().deserialize(in) != null;
