Updated Branches: refs/heads/cassandra-1.0 4a49b9dcc -> 24a708040 refs/heads/cassandra-1.1 9483e147e -> 087aa3158 refs/heads/cassandra-1.1.0 4fcb56fa3 -> bd9e40215 refs/heads/trunk be7cbc8dd -> 17ee45930
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/17ee4593 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/17ee4593 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/17ee4593 Branch: refs/heads/trunk Commit: 17ee459309b61fb1f0783ffa95554e14e8dfd926 Parents: be7cbc8 087aa31 Author: Jonathan Ellis <[email protected]> Authored: Tue Feb 28 21:15:41 2012 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Tue Feb 28 21:15:41 2012 -0600 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../cassandra/db/ColumnFamilySerializer.java | 2 +- .../apache/cassandra/db/HintedHandOffManager.java | 18 +++++++- .../cassandra/db/UnknownColumnFamilyException.java | 32 +++++++++++++++ .../db/UnserializableColumnFamilyException.java | 32 --------------- .../apache/cassandra/db/commitlog/CommitLog.java | 2 +- 6 files changed, 51 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/17ee4593/src/java/org/apache/cassandra/db/ColumnFamilySerializer.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/17ee4593/src/java/org/apache/cassandra/db/HintedHandOffManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/17ee4593/src/java/org/apache/cassandra/db/UnknownColumnFamilyException.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/UnknownColumnFamilyException.java index 0000000,7bea9e9..e1b2983 mode 000000,100644..100644 --- a/src/java/org/apache/cassandra/db/UnknownColumnFamilyException.java +++ b/src/java/org/apache/cassandra/db/UnknownColumnFamilyException.java @@@ -1,0 -1,33 +1,32 @@@ -package org.apache.cassandra.db; - -import java.io.IOException; - -/** ++/* + * 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 - * <p/> - * http://www.apache.org/licenses/LICENSE-2.0 - * <p/> ++ * ++ * 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.db; ++ ++import java.io.IOException; + + + public class UnknownColumnFamilyException extends IOException + { + public final int cfId; + + public UnknownColumnFamilyException(String msg, int cfId) + { + super(msg); + this.cfId = cfId; + } + } http://git-wip-us.apache.org/repos/asf/cassandra/blob/17ee4593/src/java/org/apache/cassandra/db/commitlog/CommitLog.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/commitlog/CommitLog.java index ef16c40,69dd0b1..5b3c7b0 --- a/src/java/org/apache/cassandra/db/commitlog/CommitLog.java +++ b/src/java/org/apache/cassandra/db/commitlog/CommitLog.java @@@ -266,9 -267,9 +266,9 @@@ public class CommitLog implements Commi { // assuming version here. We've gone to lengths to make sure what gets written to the CL is in // the current version. so do make sure the CL is drained prior to upgrading a node. - rm = RowMutation.serializer().deserialize(new DataInputStream(bufIn), MessagingService.version_, IColumnSerializer.Flag.LOCAL); + rm = RowMutation.serializer().deserialize(new DataInputStream(bufIn), MessagingService.current_version, IColumnSerializer.Flag.LOCAL); } - catch (UnserializableColumnFamilyException ex) + catch (UnknownColumnFamilyException ex) { AtomicInteger i = invalidMutations.get(ex.cfId); if (i == null)
