Add upgrade tests for lz4 and snappy compressed 2.2 commit logs patch by Branimir Lambov; reviewed by Aleksey Yeschenko for CASSANDRA-9790
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5f4cc45c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5f4cc45c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5f4cc45c Branch: refs/heads/trunk Commit: 5f4cc45cdb9c4da3bd78c1714738dd39b4768ace Parents: fb34b79 Author: Branimir Lambov <[email protected]> Authored: Wed Jul 29 19:33:45 2015 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Wed Jul 29 20:25:48 2015 +0300 ---------------------------------------------------------------------- .../2.2-lz4/CommitLog-5-1438186885380.log | Bin 0 -> 839051 bytes .../2.2-lz4/CommitLog-5-1438186885381.log | Bin 0 -> 100 bytes test/data/legacy-commitlog/2.2-lz4/hash.txt | 5 +++++ .../2.2-snappy/CommitLog-5-1438186915514.log | Bin 0 -> 820332 bytes .../2.2-snappy/CommitLog-5-1438186915515.log | Bin 0 -> 99 bytes test/data/legacy-commitlog/2.2-snappy/hash.txt | 5 +++++ .../2.2/CommitLog-5-1438186815314.log | Bin 0 -> 2097152 bytes .../2.2/CommitLog-5-1438186815315.log | Bin 0 -> 2097152 bytes test/data/legacy-commitlog/2.2/hash.txt | 5 +++++ .../db/commitlog/CommitLogUpgradeTest.java | 18 ++++++++++++++++++ 10 files changed, 33 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f4cc45c/test/data/legacy-commitlog/2.2-lz4/CommitLog-5-1438186885380.log ---------------------------------------------------------------------- diff --git a/test/data/legacy-commitlog/2.2-lz4/CommitLog-5-1438186885380.log b/test/data/legacy-commitlog/2.2-lz4/CommitLog-5-1438186885380.log new file mode 100644 index 0000000..b98304a Binary files /dev/null and b/test/data/legacy-commitlog/2.2-lz4/CommitLog-5-1438186885380.log differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f4cc45c/test/data/legacy-commitlog/2.2-lz4/CommitLog-5-1438186885381.log ---------------------------------------------------------------------- diff --git a/test/data/legacy-commitlog/2.2-lz4/CommitLog-5-1438186885381.log b/test/data/legacy-commitlog/2.2-lz4/CommitLog-5-1438186885381.log new file mode 100644 index 0000000..adac94f Binary files /dev/null and b/test/data/legacy-commitlog/2.2-lz4/CommitLog-5-1438186885381.log differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f4cc45c/test/data/legacy-commitlog/2.2-lz4/hash.txt ---------------------------------------------------------------------- diff --git a/test/data/legacy-commitlog/2.2-lz4/hash.txt b/test/data/legacy-commitlog/2.2-lz4/hash.txt new file mode 100644 index 0000000..20aa6e5 --- /dev/null +++ b/test/data/legacy-commitlog/2.2-lz4/hash.txt @@ -0,0 +1,5 @@ +#CommitLog upgrade test, version 2.2.0-SNAPSHOT +#Wed Jul 29 19:21:31 EEST 2015 +cells=6052 +hash=1274136076 +cfid=dc32ce20-360d-11e5-826c-afadad37221d http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f4cc45c/test/data/legacy-commitlog/2.2-snappy/CommitLog-5-1438186915514.log ---------------------------------------------------------------------- diff --git a/test/data/legacy-commitlog/2.2-snappy/CommitLog-5-1438186915514.log b/test/data/legacy-commitlog/2.2-snappy/CommitLog-5-1438186915514.log new file mode 100644 index 0000000..e69dfb7 Binary files /dev/null and b/test/data/legacy-commitlog/2.2-snappy/CommitLog-5-1438186915514.log differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f4cc45c/test/data/legacy-commitlog/2.2-snappy/CommitLog-5-1438186915515.log ---------------------------------------------------------------------- diff --git a/test/data/legacy-commitlog/2.2-snappy/CommitLog-5-1438186915515.log b/test/data/legacy-commitlog/2.2-snappy/CommitLog-5-1438186915515.log new file mode 100644 index 0000000..3e06675 Binary files /dev/null and b/test/data/legacy-commitlog/2.2-snappy/CommitLog-5-1438186915515.log differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f4cc45c/test/data/legacy-commitlog/2.2-snappy/hash.txt ---------------------------------------------------------------------- diff --git a/test/data/legacy-commitlog/2.2-snappy/hash.txt b/test/data/legacy-commitlog/2.2-snappy/hash.txt new file mode 100644 index 0000000..f3dd72e --- /dev/null +++ b/test/data/legacy-commitlog/2.2-snappy/hash.txt @@ -0,0 +1,5 @@ +#CommitLog upgrade test, version 2.2.0-SNAPSHOT +#Wed Jul 29 19:22:01 EEST 2015 +cells=6051 +hash=881633109 +cfid=ee2fe860-360d-11e5-951c-afadad37221d http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f4cc45c/test/data/legacy-commitlog/2.2/CommitLog-5-1438186815314.log ---------------------------------------------------------------------- diff --git a/test/data/legacy-commitlog/2.2/CommitLog-5-1438186815314.log b/test/data/legacy-commitlog/2.2/CommitLog-5-1438186815314.log new file mode 100644 index 0000000..5032519 Binary files /dev/null and b/test/data/legacy-commitlog/2.2/CommitLog-5-1438186815314.log differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f4cc45c/test/data/legacy-commitlog/2.2/CommitLog-5-1438186815315.log ---------------------------------------------------------------------- diff --git a/test/data/legacy-commitlog/2.2/CommitLog-5-1438186815315.log b/test/data/legacy-commitlog/2.2/CommitLog-5-1438186815315.log new file mode 100644 index 0000000..34a02fe Binary files /dev/null and b/test/data/legacy-commitlog/2.2/CommitLog-5-1438186815315.log differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f4cc45c/test/data/legacy-commitlog/2.2/hash.txt ---------------------------------------------------------------------- diff --git a/test/data/legacy-commitlog/2.2/hash.txt b/test/data/legacy-commitlog/2.2/hash.txt new file mode 100644 index 0000000..64f9dbb --- /dev/null +++ b/test/data/legacy-commitlog/2.2/hash.txt @@ -0,0 +1,5 @@ +#CommitLog upgrade test, version 2.2.0-SNAPSHOT +#Wed Jul 29 19:20:21 EEST 2015 +cells=6366 +hash=-802535821 +cfid=b28a7000-360d-11e5-ae92-afadad37221d http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f4cc45c/test/unit/org/apache/cassandra/db/commitlog/CommitLogUpgradeTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/commitlog/CommitLogUpgradeTest.java b/test/unit/org/apache/cassandra/db/commitlog/CommitLogUpgradeTest.java index d8784d9..7fd3943 100644 --- a/test/unit/org/apache/cassandra/db/commitlog/CommitLogUpgradeTest.java +++ b/test/unit/org/apache/cassandra/db/commitlog/CommitLogUpgradeTest.java @@ -68,6 +68,24 @@ public class CommitLogUpgradeTest testRestore(DATA_DIR + "2.1"); } + @Test + public void test22() throws Exception + { + testRestore(DATA_DIR + "2.2"); + } + + @Test + public void test22_LZ4() throws Exception + { + testRestore(DATA_DIR + "2.2-lz4"); + } + + @Test + public void test22_Snappy() throws Exception + { + testRestore(DATA_DIR + "2.2-snappy"); + } + @BeforeClass static public void initialize() throws FileNotFoundException, IOException, InterruptedException {
