From 56302ceccf0571b1f2c7373fe9331d9b7d1b05b4 Mon Sep 17 00:00:00 2001
From: Jonathan Ellis <jbellis@gmail.com>
Date: Mon, 26 Mar 2012 10:39:54 -0500
Subject: [PATCH] Test fixes for 1.0 message serialization format

---
 src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 2 +-
 src/java/org/apache/cassandra/utils/MerkleTree.java          | 1 +
 .../org/apache/cassandra/service/SerializationsTest.java     | 5 +++++
 test/unit/org/apache/cassandra/utils/SerializationsTest.java | 5 +++--
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index f981adf7e2..839e228214 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)
             {
diff --git a/src/java/org/apache/cassandra/utils/MerkleTree.java b/src/java/org/apache/cassandra/utils/MerkleTree.java
index e8cc0e4a33..c2203693c5 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;
diff --git a/test/unit/org/apache/cassandra/service/SerializationsTest.java b/test/unit/org/apache/cassandra/service/SerializationsTest.java
index b13bf7fd3c..379267328d 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());
diff --git a/test/unit/org/apache/cassandra/utils/SerializationsTest.java b/test/unit/org/apache/cassandra/utils/SerializationsTest.java
index eebed99f1b..c35a5f5200 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;