Merge branch cassandra-2.2 into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5135905a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5135905a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5135905a Branch: refs/heads/cassandra-3.0 Commit: 5135905a0f38fe5048cbd02f44d11a2784b99bc1 Parents: 04a75a6 e22faeb Author: Benjamin Lerer <b.le...@gmail.com> Authored: Mon Apr 11 09:45:53 2016 +0200 Committer: Benjamin Lerer <b.le...@gmail.com> Committed: Mon Apr 11 09:46:07 2016 +0200 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/commitlog/CommitLog.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5135905a/src/java/org/apache/cassandra/db/commitlog/CommitLog.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/commitlog/CommitLog.java index 851c84e,7592f48..b488013 --- a/src/java/org/apache/cassandra/db/commitlog/CommitLog.java +++ b/src/java/org/apache/cassandra/db/commitlog/CommitLog.java @@@ -256,12 -256,12 +256,12 @@@ public class CommitLog implements Commi { assert mutation != null; - long size = Mutation.serializer.serializedSize(mutation, MessagingService.current_version); + int size = (int) Mutation.serializer.serializedSize(mutation, MessagingService.current_version); - long totalSize = size + ENTRY_OVERHEAD_SIZE; + int totalSize = size + ENTRY_OVERHEAD_SIZE; if (totalSize > MAX_MUTATION_SIZE) { - throw new IllegalArgumentException(String.format("Mutation of %s bytes is too large for the maxiumum size of %s", + throw new IllegalArgumentException(String.format("Mutation of %s bytes is too large for the maximum size of %s", totalSize, MAX_MUTATION_SIZE)); }
