Repository: cassandra Updated Branches: refs/heads/trunk 45c92ba91 -> 217306669
Increase commitlog version patch by Benjamin Lerer; reviewed by Joel Knighton for CASSANDRA-13161 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/21730666 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/21730666 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/21730666 Branch: refs/heads/trunk Commit: 21730666929886be5300c782319a852e46b22763 Parents: 45c92ba Author: Benjamin Lerer <b.le...@gmail.com> Authored: Mon Feb 6 13:20:54 2017 +0100 Committer: Benjamin Lerer <b.le...@gmail.com> Committed: Mon Feb 6 13:20:54 2017 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/db/commitlog/CommitLogDescriptor.java | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/21730666/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index ee9c14e..b339e6e 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 4.0 + * Increase commitlog version (CASSANDRA-13161) * Make TableMetadata immutable, optimize Schema (CASSANDRA-9425) * Refactor ColumnCondition (CASSANDRA-12981) * Parallelize streaming of different keyspaces (CASSANDRA-4663) http://git-wip-us.apache.org/repos/asf/cassandra/blob/21730666/src/java/org/apache/cassandra/db/commitlog/CommitLogDescriptor.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogDescriptor.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogDescriptor.java index 0ab191d..dd9414a 100644 --- a/src/java/org/apache/cassandra/db/commitlog/CommitLogDescriptor.java +++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogDescriptor.java @@ -59,13 +59,14 @@ public class CommitLogDescriptor // We don't support anything pre-3.0 public static final int VERSION_30 = 6; + public static final int VERSION_40 = 7; /** * Increment this number if there is a changes in the commit log disc layout or MessagingVersion changes. * Note: make sure to handle {@link #getMessagingVersion()} */ @VisibleForTesting - public static final int current_version = VERSION_30; + public static final int current_version = VERSION_40; final int version; public final long id; @@ -206,6 +207,8 @@ public class CommitLogDescriptor { case VERSION_30: return MessagingService.VERSION_30; + case VERSION_40: + return MessagingService.VERSION_40; default: throw new IllegalStateException("Unknown commitlog version " + version); }
