Use new ic legacy sstables for legacy leveled manifest test
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/32f4e2cc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/32f4e2cc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/32f4e2cc Branch: refs/heads/trunk Commit: 32f4e2ccec259c3a7c9527b538d53464c52cfc11 Parents: 85b0d15 Author: Marcus Eriksson <[email protected]> Authored: Thu Apr 25 18:17:53 2013 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Thu Apr 25 18:20:12 2013 +0200 ---------------------------------------------------------------------- ...Keyspace1-legacyleveled-hf-0-CompressionInfo.db | Bin 46 -> 0 bytes .../Keyspace1/Keyspace1-legacyleveled-hf-0-Data.db | Bin 70 -> 0 bytes .../Keyspace1-legacyleveled-hf-0-Filter.db | Bin 16 -> 0 bytes .../Keyspace1-legacyleveled-hf-0-Index.db | Bin 14 -> 0 bytes .../Keyspace1-legacyleveled-hf-0-Statistics.db | Bin 4340 -> 0 bytes .../Keyspace1/Keyspace1-legacyleveled-hf-0-TOC.txt | 6 --- ...Keyspace1-legacyleveled-hf-1-CompressionInfo.db | Bin 46 -> 0 bytes .../Keyspace1/Keyspace1-legacyleveled-hf-1-Data.db | Bin 70 -> 0 bytes .../Keyspace1-legacyleveled-hf-1-Filter.db | Bin 16 -> 0 bytes .../Keyspace1-legacyleveled-hf-1-Index.db | Bin 14 -> 0 bytes .../Keyspace1-legacyleveled-hf-1-Statistics.db | Bin 4340 -> 0 bytes ...Keyspace1-legacyleveled-hf-2-CompressionInfo.db | Bin 46 -> 0 bytes .../Keyspace1/Keyspace1-legacyleveled-hf-2-Data.db | Bin 70 -> 0 bytes .../Keyspace1-legacyleveled-hf-2-Filter.db | Bin 16 -> 0 bytes .../Keyspace1-legacyleveled-hf-2-Index.db | Bin 14 -> 0 bytes .../Keyspace1-legacyleveled-hf-2-Statistics.db | Bin 4340 -> 0 bytes .../hf/Keyspace1/legacyleveled.json | 27 --------------- .../Keyspace1-legacyleveled-ic-0-Data.db | Bin 0 -> 530 bytes .../Keyspace1-legacyleveled-ic-0-Digest.sha1 | 1 + .../Keyspace1-legacyleveled-ic-0-Filter.db | Bin 0 -> 24 bytes .../Keyspace1-legacyleveled-ic-0-Index.db | Bin 0 -> 180 bytes .../Keyspace1-legacyleveled-ic-0-Statistics.db | Bin 0 -> 4361 bytes .../Keyspace1-legacyleveled-ic-0-Summary.db | Bin 0 -> 92 bytes .../Keyspace1-legacyleveled-ic-0-TOC.txt | 7 ++++ .../Keyspace1-legacyleveled-ic-1-Data.db | Bin 0 -> 530 bytes .../Keyspace1-legacyleveled-ic-1-Digest.sha1 | 1 + .../Keyspace1-legacyleveled-ic-1-Filter.db | Bin 0 -> 24 bytes .../Keyspace1-legacyleveled-ic-1-Index.db | Bin 0 -> 180 bytes .../Keyspace1-legacyleveled-ic-1-Statistics.db | Bin 0 -> 4361 bytes .../Keyspace1-legacyleveled-ic-1-Summary.db | Bin 0 -> 92 bytes .../Keyspace1-legacyleveled-ic-1-TOC.txt | 7 ++++ .../Keyspace1-legacyleveled-ic-2-Data.db | Bin 0 -> 530 bytes .../Keyspace1-legacyleveled-ic-2-Digest.sha1 | 1 + .../Keyspace1-legacyleveled-ic-2-Filter.db | Bin 0 -> 24 bytes .../Keyspace1-legacyleveled-ic-2-Index.db | Bin 0 -> 180 bytes .../Keyspace1-legacyleveled-ic-2-Statistics.db | Bin 0 -> 4361 bytes .../Keyspace1-legacyleveled-ic-2-Summary.db | Bin 0 -> 92 bytes .../Keyspace1-legacyleveled-ic-2-TOC.txt | 7 ++++ .../ic/Keyspace1/legacyleveled/legacyleveled.json | 27 +++++++++++++++ .../db/compaction/LegacyLeveledManifestTest.java | 19 +++++----- 40 files changed, 61 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f4e2cc/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-0-CompressionInfo.db ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-0-CompressionInfo.db b/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-0-CompressionInfo.db deleted file mode 100644 index af783d6..0000000 Binary files a/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-0-CompressionInfo.db and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f4e2cc/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-0-Data.db ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-0-Data.db b/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-0-Data.db deleted file mode 100644 index 854a1c9..0000000 Binary files a/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-0-Data.db and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f4e2cc/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-0-Filter.db ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-0-Filter.db b/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-0-Filter.db deleted file mode 100644 index 210481f..0000000 Binary files a/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-0-Filter.db and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f4e2cc/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-0-Index.db ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-0-Index.db b/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-0-Index.db deleted file mode 100644 index 52c9a6c..0000000 Binary files a/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-0-Index.db and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f4e2cc/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-0-Statistics.db ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-0-Statistics.db b/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-0-Statistics.db deleted file mode 100644 index 295a303..0000000 Binary files a/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-0-Statistics.db and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f4e2cc/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-0-TOC.txt ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-0-TOC.txt b/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-0-TOC.txt deleted file mode 100644 index f8e8810..0000000 --- a/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-0-TOC.txt +++ /dev/null @@ -1,6 +0,0 @@ -CompressionInfo.db -Index.db -TOC.txt -Filter.db -Statistics.db -Data.db http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f4e2cc/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-1-CompressionInfo.db ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-1-CompressionInfo.db b/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-1-CompressionInfo.db deleted file mode 100644 index af783d6..0000000 Binary files a/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-1-CompressionInfo.db and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f4e2cc/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-1-Data.db ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-1-Data.db b/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-1-Data.db deleted file mode 100644 index 854a1c9..0000000 Binary files a/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-1-Data.db and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f4e2cc/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-1-Filter.db ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-1-Filter.db b/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-1-Filter.db deleted file mode 100644 index 210481f..0000000 Binary files a/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-1-Filter.db and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f4e2cc/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-1-Index.db ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-1-Index.db b/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-1-Index.db deleted file mode 100644 index 52c9a6c..0000000 Binary files a/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-1-Index.db and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f4e2cc/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-1-Statistics.db ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-1-Statistics.db b/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-1-Statistics.db deleted file mode 100644 index 295a303..0000000 Binary files a/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-1-Statistics.db and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f4e2cc/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-2-CompressionInfo.db ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-2-CompressionInfo.db b/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-2-CompressionInfo.db deleted file mode 100644 index af783d6..0000000 Binary files a/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-2-CompressionInfo.db and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f4e2cc/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-2-Data.db ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-2-Data.db b/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-2-Data.db deleted file mode 100644 index 854a1c9..0000000 Binary files a/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-2-Data.db and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f4e2cc/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-2-Filter.db ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-2-Filter.db b/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-2-Filter.db deleted file mode 100644 index 210481f..0000000 Binary files a/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-2-Filter.db and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f4e2cc/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-2-Index.db ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-2-Index.db b/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-2-Index.db deleted file mode 100644 index 52c9a6c..0000000 Binary files a/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-2-Index.db and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f4e2cc/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-2-Statistics.db ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-2-Statistics.db b/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-2-Statistics.db deleted file mode 100644 index 295a303..0000000 Binary files a/test/data/migration-sstables/hf/Keyspace1/Keyspace1-legacyleveled-hf-2-Statistics.db and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f4e2cc/test/data/migration-sstables/hf/Keyspace1/legacyleveled.json ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/hf/Keyspace1/legacyleveled.json b/test/data/migration-sstables/hf/Keyspace1/legacyleveled.json deleted file mode 100644 index 1fc9c01..0000000 --- a/test/data/migration-sstables/hf/Keyspace1/legacyleveled.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "generations" : [ { - "generation" : 0, - "members" : [ 0 ] - }, { - "generation" : 1, - "members" : [ 1 ] - }, { - "generation" : 2, - "members" : [ 2 ] - }, { - "generation" : 3, - "members" : [ ] - }, { - "generation" : 4, - "members" : [ ] - }, { - "generation" : 5, - "members" : [ ] - }, { - "generation" : 6, - "members" : [ ] - }, { - "generation" : 7, - "members" : [ ] - } ] -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f4e2cc/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-0-Data.db ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-0-Data.db b/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-0-Data.db new file mode 100644 index 0000000..98d3f41 Binary files /dev/null and b/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-0-Data.db differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f4e2cc/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-0-Digest.sha1 ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-0-Digest.sha1 b/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-0-Digest.sha1 new file mode 100644 index 0000000..470b056 --- /dev/null +++ b/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-0-Digest.sha1 @@ -0,0 +1 @@ +9ee805b905aa147afe14d4f37f5ed3be3af53c72 Keyspace1-legacyleveled-ic-0-Data.db \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f4e2cc/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-0-Filter.db ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-0-Filter.db b/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-0-Filter.db new file mode 100644 index 0000000..c63729b Binary files /dev/null and b/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-0-Filter.db differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f4e2cc/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-0-Index.db ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-0-Index.db b/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-0-Index.db new file mode 100644 index 0000000..6603018 Binary files /dev/null and b/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-0-Index.db differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f4e2cc/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-0-Statistics.db ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-0-Statistics.db b/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-0-Statistics.db new file mode 100644 index 0000000..5ed9ce0 Binary files /dev/null and b/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-0-Statistics.db differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f4e2cc/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-0-Summary.db ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-0-Summary.db b/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-0-Summary.db new file mode 100644 index 0000000..c1c8fd8 Binary files /dev/null and b/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-0-Summary.db differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f4e2cc/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-0-TOC.txt ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-0-TOC.txt b/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-0-TOC.txt new file mode 100644 index 0000000..6baaf14 --- /dev/null +++ b/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-0-TOC.txt @@ -0,0 +1,7 @@ +Filter.db +Summary.db +Data.db +Digest.sha1 +Index.db +TOC.txt +Statistics.db http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f4e2cc/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-1-Data.db ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-1-Data.db b/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-1-Data.db new file mode 100644 index 0000000..98d3f41 Binary files /dev/null and b/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-1-Data.db differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f4e2cc/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-1-Digest.sha1 ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-1-Digest.sha1 b/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-1-Digest.sha1 new file mode 100644 index 0000000..d8db723 --- /dev/null +++ b/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-1-Digest.sha1 @@ -0,0 +1 @@ +9ee805b905aa147afe14d4f37f5ed3be3af53c72 Keyspace1-legacyleveled-ic-1-Data.db \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f4e2cc/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-1-Filter.db ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-1-Filter.db b/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-1-Filter.db new file mode 100644 index 0000000..c63729b Binary files /dev/null and b/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-1-Filter.db differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f4e2cc/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-1-Index.db ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-1-Index.db b/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-1-Index.db new file mode 100644 index 0000000..6603018 Binary files /dev/null and b/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-1-Index.db differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f4e2cc/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-1-Statistics.db ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-1-Statistics.db b/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-1-Statistics.db new file mode 100644 index 0000000..5ed9ce0 Binary files /dev/null and b/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-1-Statistics.db differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f4e2cc/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-1-Summary.db ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-1-Summary.db b/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-1-Summary.db new file mode 100644 index 0000000..c1c8fd8 Binary files /dev/null and b/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-1-Summary.db differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f4e2cc/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-1-TOC.txt ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-1-TOC.txt b/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-1-TOC.txt new file mode 100644 index 0000000..6baaf14 --- /dev/null +++ b/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-1-TOC.txt @@ -0,0 +1,7 @@ +Filter.db +Summary.db +Data.db +Digest.sha1 +Index.db +TOC.txt +Statistics.db http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f4e2cc/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-2-Data.db ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-2-Data.db b/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-2-Data.db new file mode 100644 index 0000000..98d3f41 Binary files /dev/null and b/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-2-Data.db differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f4e2cc/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-2-Digest.sha1 ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-2-Digest.sha1 b/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-2-Digest.sha1 new file mode 100644 index 0000000..31da1c4 --- /dev/null +++ b/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-2-Digest.sha1 @@ -0,0 +1 @@ +9ee805b905aa147afe14d4f37f5ed3be3af53c72 Keyspace1-legacyleveled-ic-2-Data.db \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f4e2cc/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-2-Filter.db ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-2-Filter.db b/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-2-Filter.db new file mode 100644 index 0000000..c63729b Binary files /dev/null and b/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-2-Filter.db differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f4e2cc/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-2-Index.db ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-2-Index.db b/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-2-Index.db new file mode 100644 index 0000000..6603018 Binary files /dev/null and b/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-2-Index.db differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f4e2cc/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-2-Statistics.db ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-2-Statistics.db b/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-2-Statistics.db new file mode 100644 index 0000000..5ed9ce0 Binary files /dev/null and b/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-2-Statistics.db differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f4e2cc/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-2-Summary.db ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-2-Summary.db b/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-2-Summary.db new file mode 100644 index 0000000..c1c8fd8 Binary files /dev/null and b/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-2-Summary.db differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f4e2cc/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-2-TOC.txt ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-2-TOC.txt b/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-2-TOC.txt new file mode 100644 index 0000000..6baaf14 --- /dev/null +++ b/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-2-TOC.txt @@ -0,0 +1,7 @@ +Filter.db +Summary.db +Data.db +Digest.sha1 +Index.db +TOC.txt +Statistics.db http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f4e2cc/test/data/migration-sstables/ic/Keyspace1/legacyleveled/legacyleveled.json ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/ic/Keyspace1/legacyleveled/legacyleveled.json b/test/data/migration-sstables/ic/Keyspace1/legacyleveled/legacyleveled.json new file mode 100644 index 0000000..1fc9c01 --- /dev/null +++ b/test/data/migration-sstables/ic/Keyspace1/legacyleveled/legacyleveled.json @@ -0,0 +1,27 @@ +{ + "generations" : [ { + "generation" : 0, + "members" : [ 0 ] + }, { + "generation" : 1, + "members" : [ 1 ] + }, { + "generation" : 2, + "members" : [ 2 ] + }, { + "generation" : 3, + "members" : [ ] + }, { + "generation" : 4, + "members" : [ ] + }, { + "generation" : 5, + "members" : [ ] + }, { + "generation" : 6, + "members" : [ ] + }, { + "generation" : 7, + "members" : [ ] + } ] +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f4e2cc/test/unit/org/apache/cassandra/db/compaction/LegacyLeveledManifestTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/compaction/LegacyLeveledManifestTest.java b/test/unit/org/apache/cassandra/db/compaction/LegacyLeveledManifestTest.java index deb326b..f751091 100644 --- a/test/unit/org/apache/cassandra/db/compaction/LegacyLeveledManifestTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/LegacyLeveledManifestTest.java @@ -14,18 +14,19 @@ import org.apache.cassandra.io.sstable.SSTableMetadata; import org.apache.cassandra.io.util.FileUtils; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import static org.apache.cassandra.db.compaction.LegacyLeveledManifestTestHelper.*; public class LegacyLeveledManifestTest { + private final static String LEGACY_VERSION = "ic"; + private File destDir; @Before public void setup() { - String root = System.getProperty("migration-sstable-root"); - File rootDir = new File(root + File.separator + "hf" + File.separator + "Keyspace1"); - destDir = Directories.create("Keyspace1", "legacyleveled").getDirectoryForNewSSTables(0); + destDir = Directories.create(KS, CF).getDirectoryForNewSSTables(0); FileUtils.createDirectory(destDir); - for (File srcFile : rootDir.listFiles()) + for (File srcFile : getLegacySSTableDir(LEGACY_VERSION).listFiles()) { File destFile = new File(destDir, srcFile.getName()); FileUtils.createHardLink(srcFile,destFile); @@ -41,17 +42,17 @@ public class LegacyLeveledManifestTest @Test public void migrateTest() throws IOException { - assertTrue(LegacyLeveledManifest.manifestNeedsMigration("Keyspace1", "legacyleveled")); + assertTrue(LegacyLeveledManifest.manifestNeedsMigration(KS, CF)); } @Test public void doMigrationTest() throws IOException, InterruptedException { - LegacyLeveledManifest.migrateManifests("Keyspace1","legacyleveled"); + LegacyLeveledManifest.migrateManifests(KS, CF); for (int i = 0; i <= 2; i++) { - Descriptor descriptor = Descriptor.fromFilename(destDir+File.separator+"Keyspace1-legacyleveled-hf-"+i+"-Statistics.db"); + Descriptor descriptor = Descriptor.fromFilename(destDir+File.separator+KS+"-"+CF+"-"+LEGACY_VERSION+"-"+i+"-Statistics.db"); SSTableMetadata metadata = SSTableMetadata.serializer.deserialize(descriptor); assertEquals(metadata.sstableLevel, i); } @@ -67,11 +68,11 @@ public class LegacyLeveledManifestTest Map<Descriptor, SSTableMetadata> beforeMigration = new HashMap<Descriptor, SSTableMetadata>(); for (int i = 0; i <= 2; i++) { - Descriptor descriptor = Descriptor.fromFilename(destDir+File.separator+"Keyspace1-legacyleveled-hf-"+i+"-Statistics.db"); + Descriptor descriptor = Descriptor.fromFilename(destDir+File.separator+KS+"-"+CF+"-"+LEGACY_VERSION+"-"+i+"-Statistics.db"); beforeMigration.put(descriptor, SSTableMetadata.serializer.deserialize(descriptor, false)); } - LegacyLeveledManifest.migrateManifests("Keyspace1","legacyleveled"); + LegacyLeveledManifest.migrateManifests(KS, CF); for (Map.Entry<Descriptor, SSTableMetadata> entry : beforeMigration.entrySet()) {
