You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2012/03/26 17:57:38 UTC
[1/18] git commit: merge from 1.1
Updated Branches:
refs/heads/cassandra-1.1 29376ff67 -> 4a4e707ae
refs/heads/cassandra-1.1.0 f11e4f2a1 -> d3c5dbdd6
refs/heads/trunk b1d12db73 -> 1c9637f45
merge from 1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1c9637f4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1c9637f4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1c9637f4
Branch: refs/heads/trunk
Commit: 1c9637f45bce187464dc91f4460dd8a2bb867e5b
Parents: b1d12db 4a4e707
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Mar 26 10:57:21 2012 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Mar 26 10:57:21 2012 -0500
----------------------------------------------------------------------
.../cassandra/config/DatabaseDescriptor.java | 2 +-
.../org/apache/cassandra/utils/MerkleTree.java | 1 +
.../serialization/1.0/db.RangeSliceCommand.bin | Bin 0 -> 777 bytes
test/data/serialization/1.0/db.Row.bin | Bin 0 -> 495 bytes
test/data/serialization/1.0/db.RowMutation.bin | Bin 0 -> 3266 bytes
.../1.0/db.SliceByNamesReadCommand.bin | Bin 0 -> 367 bytes
.../serialization/1.0/db.SliceFromReadCommand.bin | Bin 0 -> 361 bytes
test/data/serialization/1.0/db.Truncation.bin | Bin 0 -> 257 bytes
test/data/serialization/1.0/db.WriteResponse.bin | Bin 0 -> 38 bytes
.../serialization/1.0/db.migration.Keyspace1.bin | 1 +
.../serialization/1.0/db.migration.Keyspace2.bin | 1 +
.../serialization/1.0/db.migration.Keyspace3.bin | 1 +
.../serialization/1.0/db.migration.Keyspace4.bin | 1 +
.../serialization/1.0/db.migration.Keyspace5.bin | 1 +
test/data/serialization/1.0/gms.EndpointState.bin | Bin 0 -> 73 bytes
test/data/serialization/1.0/gms.Gossip.bin | Bin 0 -> 110 bytes
.../data/serialization/1.0/service.TreeRequest.bin | Bin 0 -> 121 bytes
.../serialization/1.0/service.TreeResponse.bin | Bin 0 -> 930 bytes
.../serialization/1.0/streaming.PendingFile.bin | Bin 0 -> 3436 bytes
.../serialization/1.0/streaming.StreamHeader.bin | Bin 0 -> 174421 bytes
.../serialization/1.0/streaming.StreamReply.bin | Bin 0 -> 73 bytes
.../1.0/streaming.StreamRequestMessage.bin | Bin 0 -> 7087 bytes
test/data/serialization/1.0/utils.BloomFilter.bin | Bin 0 -> 2500016 bytes
.../serialization/1.0/utils.EstimatedHistogram.bin | Bin 0 -> 97500 bytes
.../serialization/1.0/utils.LegacyBloomFilter.bin | Bin 0 -> 5000170 bytes
.../cassandra/AbstractSerializationsTester.java | 6 +++-
.../apache/cassandra/net/MessageSerializer.java | 1 -
.../cassandra/service/SerializationsTest.java | 20 +++++++++------
.../apache/cassandra/utils/SerializationsTest.java | 7 +++--
29 files changed, 27 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1c9637f4/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1c9637f4/src/java/org/apache/cassandra/utils/MerkleTree.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1c9637f4/test/unit/org/apache/cassandra/net/MessageSerializer.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/net/MessageSerializer.java
index 33689ac,68e2d4d..e8b7874
--- a/test/unit/org/apache/cassandra/net/MessageSerializer.java
+++ b/test/unit/org/apache/cassandra/net/MessageSerializer.java
@@@ -29,8 -29,7 +29,7 @@@ public class MessageSerializer implemen
{
public void serialize(Message t, DataOutput dos, int version) throws IOException
{
- assert t.getVersion() == version : "internode protocol version mismatch"; // indicates programmer error.
- Header.serializer().serialize( t.header_, dos, version);
+ Header.serializer().serialize(t.header, dos, version);
byte[] bytes = t.getMessageBody();
dos.writeInt(bytes.length);
dos.write(bytes);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1c9637f4/test/unit/org/apache/cassandra/utils/SerializationsTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/utils/SerializationsTest.java
index c30daef,d6eb81a..34733e3
--- a/test/unit/org/apache/cassandra/utils/SerializationsTest.java
+++ b/test/unit/org/apache/cassandra/utils/SerializationsTest.java
@@@ -85,11 -73,12 +85,12 @@@ public class SerializationsTest extend
@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;
+ assert FilterFactory.deserialize(in, FilterFactory.Type.SHA) != null;
in.close();
}