http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/test/data/migration-sstables/2.1/test/foo-0094ac203e7411e59149ef9f87394ca6/test-foo-tmplink-ka-4-Index.db ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/2.1/test/foo-0094ac203e7411e59149ef9f87394ca6/test-foo-tmplink-ka-4-Index.db b/test/data/migration-sstables/2.1/test/foo-0094ac203e7411e59149ef9f87394ca6/test-foo-tmplink-ka-4-Index.db deleted file mode 100644 index 5d71315..0000000 Binary files a/test/data/migration-sstables/2.1/test/foo-0094ac203e7411e59149ef9f87394ca6/test-foo-tmplink-ka-4-Index.db and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/la-1-big-CompressionInfo.db ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/la-1-big-CompressionInfo.db b/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/la-1-big-CompressionInfo.db deleted file mode 100644 index f7a81f0..0000000 Binary files a/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/la-1-big-CompressionInfo.db and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/la-1-big-Data.db ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/la-1-big-Data.db b/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/la-1-big-Data.db deleted file mode 100644 index 2d5e60a..0000000 Binary files a/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/la-1-big-Data.db and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/la-1-big-Digest.adler32 ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/la-1-big-Digest.adler32 b/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/la-1-big-Digest.adler32 deleted file mode 100644 index deffbd1..0000000 --- a/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/la-1-big-Digest.adler32 +++ /dev/null @@ -1 +0,0 @@ -2055934203 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/la-1-big-Filter.db ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/la-1-big-Filter.db b/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/la-1-big-Filter.db deleted file mode 100644 index a749417..0000000 Binary files a/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/la-1-big-Filter.db and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/la-1-big-Index.db ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/la-1-big-Index.db b/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/la-1-big-Index.db deleted file mode 100644 index d3923ab..0000000 Binary files a/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/la-1-big-Index.db and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/la-1-big-Statistics.db ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/la-1-big-Statistics.db b/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/la-1-big-Statistics.db deleted file mode 100644 index 664bfa5..0000000 Binary files a/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/la-1-big-Statistics.db and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/la-1-big-Summary.db ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/la-1-big-Summary.db b/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/la-1-big-Summary.db deleted file mode 100644 index a74f96f..0000000 Binary files a/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/la-1-big-Summary.db and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/la-1-big-TOC.txt ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/la-1-big-TOC.txt b/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/la-1-big-TOC.txt deleted file mode 100644 index 92dc9fe..0000000 --- a/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/la-1-big-TOC.txt +++ /dev/null @@ -1,8 +0,0 @@ -Statistics.db -Summary.db -TOC.txt -Filter.db -Data.db -CompressionInfo.db -Digest.adler32 -Index.db http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/tmp-la-2-big-Data.db ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/tmp-la-2-big-Data.db b/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/tmp-la-2-big-Data.db deleted file mode 100644 index 2d5e60a..0000000 Binary files a/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/tmp-la-2-big-Data.db and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/tmp-la-2-big-Index.db ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/tmp-la-2-big-Index.db b/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/tmp-la-2-big-Index.db deleted file mode 100644 index d3923ab..0000000 Binary files a/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/tmp-la-2-big-Index.db and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/tmp-lb-3-big-Data.db ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/tmp-lb-3-big-Data.db b/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/tmp-lb-3-big-Data.db deleted file mode 100644 index 2d5e60a..0000000 Binary files a/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/tmp-lb-3-big-Data.db and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/tmp-lb-3-big-Index.db ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/tmp-lb-3-big-Index.db b/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/tmp-lb-3-big-Index.db deleted file mode 100644 index d3923ab..0000000 Binary files a/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/tmp-lb-3-big-Index.db and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/tmplink-la-2-big-Data.db ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/tmplink-la-2-big-Data.db b/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/tmplink-la-2-big-Data.db deleted file mode 100644 index 2d5e60a..0000000 Binary files a/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/tmplink-la-2-big-Data.db and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/tmplink-la-2-big-Index.db ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/tmplink-la-2-big-Index.db b/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/tmplink-la-2-big-Index.db deleted file mode 100644 index d3923ab..0000000 Binary files a/test/data/migration-sstables/2.2/keyspace1/test-dfcc85801bc811e5aa694b06169f4ffa/tmplink-la-2-big-Index.db and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/test/data/migration-sstables/2.2/system/compactions_in_progress-55080ab05d9c388690a4acb25fe1f77b/snapshots/1435108403246-compactions_in_progress/manifest.json ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/2.2/system/compactions_in_progress-55080ab05d9c388690a4acb25fe1f77b/snapshots/1435108403246-compactions_in_progress/manifest.json b/test/data/migration-sstables/2.2/system/compactions_in_progress-55080ab05d9c388690a4acb25fe1f77b/snapshots/1435108403246-compactions_in_progress/manifest.json deleted file mode 100644 index d5fdb4f..0000000 --- a/test/data/migration-sstables/2.2/system/compactions_in_progress-55080ab05d9c388690a4acb25fe1f77b/snapshots/1435108403246-compactions_in_progress/manifest.json +++ /dev/null @@ -1 +0,0 @@ -{"files":[]} http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/test/data/migration-sstables/2.2/system/compactions_in_progress-55080ab05d9c388690a4acb25fe1f77b/snapshots/1435298241281-upgrade-3.0.0-SNAPSHOT-2.2.0-rc1-SNAPSHOT/manifest.json ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/2.2/system/compactions_in_progress-55080ab05d9c388690a4acb25fe1f77b/snapshots/1435298241281-upgrade-3.0.0-SNAPSHOT-2.2.0-rc1-SNAPSHOT/manifest.json b/test/data/migration-sstables/2.2/system/compactions_in_progress-55080ab05d9c388690a4acb25fe1f77b/snapshots/1435298241281-upgrade-3.0.0-SNAPSHOT-2.2.0-rc1-SNAPSHOT/manifest.json deleted file mode 100644 index d5fdb4f..0000000 --- a/test/data/migration-sstables/2.2/system/compactions_in_progress-55080ab05d9c388690a4acb25fe1f77b/snapshots/1435298241281-upgrade-3.0.0-SNAPSHOT-2.2.0-rc1-SNAPSHOT/manifest.json +++ /dev/null @@ -1 +0,0 @@ -{"files":[]} http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/test/data/migration-sstables/2.2/system/compactions_in_progress-55080ab05d9c388690a4acb25fe1f77b/snapshots/1435298241532-compactions_in_progress/manifest.json ---------------------------------------------------------------------- diff --git a/test/data/migration-sstables/2.2/system/compactions_in_progress-55080ab05d9c388690a4acb25fe1f77b/snapshots/1435298241532-compactions_in_progress/manifest.json b/test/data/migration-sstables/2.2/system/compactions_in_progress-55080ab05d9c388690a4acb25fe1f77b/snapshots/1435298241532-compactions_in_progress/manifest.json deleted file mode 100644 index d5fdb4f..0000000 --- a/test/data/migration-sstables/2.2/system/compactions_in_progress-55080ab05d9c388690a4acb25fe1f77b/snapshots/1435298241532-compactions_in_progress/manifest.json +++ /dev/null @@ -1 +0,0 @@ -{"files":[]} http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/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 deleted file mode 100644 index 98d3f41..0000000 Binary files a/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-0-Data.db and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/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 deleted file mode 100644 index 470b056..0000000 --- a/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-0-Digest.sha1 +++ /dev/null @@ -1 +0,0 @@ -9ee805b905aa147afe14d4f37f5ed3be3af53c72 Keyspace1-legacyleveled-ic-0-Data.db \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/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 deleted file mode 100644 index c63729b..0000000 Binary files a/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-0-Filter.db and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/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 deleted file mode 100644 index 6603018..0000000 Binary files a/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-0-Index.db and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/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 deleted file mode 100644 index 5ed9ce0..0000000 Binary files a/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-0-Statistics.db and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/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 deleted file mode 100644 index c1c8fd8..0000000 Binary files a/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-0-Summary.db and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/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 deleted file mode 100644 index 6baaf14..0000000 --- a/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-0-TOC.txt +++ /dev/null @@ -1,7 +0,0 @@ -Filter.db -Summary.db -Data.db -Digest.sha1 -Index.db -TOC.txt -Statistics.db http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/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 deleted file mode 100644 index 98d3f41..0000000 Binary files a/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-1-Data.db and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/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 deleted file mode 100644 index d8db723..0000000 --- a/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-1-Digest.sha1 +++ /dev/null @@ -1 +0,0 @@ -9ee805b905aa147afe14d4f37f5ed3be3af53c72 Keyspace1-legacyleveled-ic-1-Data.db \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/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 deleted file mode 100644 index c63729b..0000000 Binary files a/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-1-Filter.db and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/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 deleted file mode 100644 index 6603018..0000000 Binary files a/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-1-Index.db and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/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 deleted file mode 100644 index 5ed9ce0..0000000 Binary files a/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-1-Statistics.db and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/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 deleted file mode 100644 index c1c8fd8..0000000 Binary files a/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-1-Summary.db and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/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 deleted file mode 100644 index 6baaf14..0000000 --- a/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-1-TOC.txt +++ /dev/null @@ -1,7 +0,0 @@ -Filter.db -Summary.db -Data.db -Digest.sha1 -Index.db -TOC.txt -Statistics.db http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/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 deleted file mode 100644 index 98d3f41..0000000 Binary files a/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-2-Data.db and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/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 deleted file mode 100644 index 31da1c4..0000000 --- a/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-2-Digest.sha1 +++ /dev/null @@ -1 +0,0 @@ -9ee805b905aa147afe14d4f37f5ed3be3af53c72 Keyspace1-legacyleveled-ic-2-Data.db \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/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 deleted file mode 100644 index c63729b..0000000 Binary files a/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-2-Filter.db and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/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 deleted file mode 100644 index 6603018..0000000 Binary files a/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-2-Index.db and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/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 deleted file mode 100644 index 5ed9ce0..0000000 Binary files a/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-2-Statistics.db and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/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 deleted file mode 100644 index c1c8fd8..0000000 Binary files a/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-2-Summary.db and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/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 deleted file mode 100644 index 6baaf14..0000000 --- a/test/data/migration-sstables/ic/Keyspace1/legacyleveled/Keyspace1-legacyleveled-ic-2-TOC.txt +++ /dev/null @@ -1,7 +0,0 @@ -Filter.db -Summary.db -Data.db -Digest.sha1 -Index.db -TOC.txt -Statistics.db http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/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 deleted file mode 100644 index 1fc9c01..0000000 --- a/test/data/migration-sstables/ic/Keyspace1/legacyleveled/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/4a246419/test/long/org/apache/cassandra/cql3/ViewLongTest.java ---------------------------------------------------------------------- diff --git a/test/long/org/apache/cassandra/cql3/ViewLongTest.java b/test/long/org/apache/cassandra/cql3/ViewLongTest.java index a5d17ea..d6bebc6 100644 --- a/test/long/org/apache/cassandra/cql3/ViewLongTest.java +++ b/test/long/org/apache/cassandra/cql3/ViewLongTest.java @@ -128,7 +128,7 @@ public class ViewLongTest extends CQLTester for (int i = 0; i < writers * insertsPerWriter; i++) { - if (executeNet(protocolVersion, "SELECT COUNT(*) FROM system.batchlog").one().getLong(0) == 0) + if (executeNet(protocolVersion, "SELECT COUNT(*) FROM system.batches").one().getLong(0) == 0) break; try { http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/test/long/org/apache/cassandra/utils/LongBloomFilterTest.java ---------------------------------------------------------------------- diff --git a/test/long/org/apache/cassandra/utils/LongBloomFilterTest.java b/test/long/org/apache/cassandra/utils/LongBloomFilterTest.java index c50296d..10dd5a6 100644 --- a/test/long/org/apache/cassandra/utils/LongBloomFilterTest.java +++ b/test/long/org/apache/cassandra/utils/LongBloomFilterTest.java @@ -38,33 +38,23 @@ public class LongBloomFilterTest @Test public void testBigInt() { - testBigInt(false); - testBigInt(true); - } - private static void testBigInt(boolean oldBfHashOrder) - { int size = 10 * 1000 * 1000; - IFilter bf = getFilter(size, FilterTestHelper.spec.bucketsPerElement, false, oldBfHashOrder); + IFilter bf = getFilter(size, FilterTestHelper.spec.bucketsPerElement, false); double fp = testFalsePositives(bf, new KeyGenerator.IntGenerator(size), new KeyGenerator.IntGenerator(size, size * 2)); - logger.info("Bloom filter false positive for oldBfHashOrder={}: {}", oldBfHashOrder, fp); + logger.info("Bloom filter false positive: {}", fp); } @Test public void testBigRandom() { - testBigRandom(false); - testBigRandom(true); - } - private static void testBigRandom(boolean oldBfHashOrder) - { int size = 10 * 1000 * 1000; - IFilter bf = getFilter(size, FilterTestHelper.spec.bucketsPerElement, false, oldBfHashOrder); + IFilter bf = getFilter(size, FilterTestHelper.spec.bucketsPerElement, false); double fp = testFalsePositives(bf, new KeyGenerator.RandomStringGenerator(new Random().nextInt(), size), new KeyGenerator.RandomStringGenerator(new Random().nextInt(), size)); - logger.info("Bloom filter false positive for oldBfHashOrder={}: {}", oldBfHashOrder, fp); + logger.info("Bloom filter false positive: {}", fp); } /** @@ -73,26 +63,21 @@ public class LongBloomFilterTest @Test public void testConstrained() { - testConstrained(false); - testConstrained(true); - } - private static void testConstrained(boolean oldBfHashOrder) - { int size = 10 * 1000 * 1000; - try (IFilter bf = getFilter(size, 0.01, false, oldBfHashOrder)) + try (IFilter bf = getFilter(size, 0.01, false)) { double fp = testFalsePositives(bf, new KeyGenerator.IntGenerator(size), new KeyGenerator.IntGenerator(size, size * 2)); - logger.info("Bloom filter false positive for oldBfHashOrder={}: {}", oldBfHashOrder, fp); + logger.info("Bloom filter false positive: {}", fp); } } - private static void testConstrained(double targetFp, int elements, boolean oldBfHashOrder, int staticBitCount, long ... staticBits) + private static void testConstrained(double targetFp, int elements, int staticBitCount, long ... staticBits) { for (long bits : staticBits) { - try (IFilter bf = getFilter(elements, targetFp, false, oldBfHashOrder);) + try (IFilter bf = getFilter(elements, targetFp, false);) { SequentialHashGenerator gen = new SequentialHashGenerator(staticBitCount, bits); long[] hash = new long[2]; @@ -131,23 +116,17 @@ public class LongBloomFilterTest @Test public void testBffp() { - bffp(false); - bffp(true); - } - - private static void bffp(boolean flipInputs) - { - System.out.println("Bloom filter false posiitive with flipInputs=" + flipInputs); + System.out.println("Bloom filter false posiitive"); long[] staticBits = staticBits(4, 0); - testConstrained(0.01d, 10 << 20, flipInputs, 0, staticBits); - testConstrained(0.01d, 1 << 20, flipInputs, 6, staticBits); - testConstrained(0.01d, 10 << 20, flipInputs, 6, staticBits); - testConstrained(0.01d, 1 << 19, flipInputs, 10, staticBits); - testConstrained(0.01d, 1 << 20, flipInputs, 10, staticBits); - testConstrained(0.01d, 10 << 20, flipInputs, 10, staticBits); - testConstrained(0.1d, 10 << 20, flipInputs, 0, staticBits); - testConstrained(0.1d, 10 << 20, flipInputs, 8, staticBits); - testConstrained(0.1d, 10 << 20, flipInputs, 10, staticBits); + testConstrained(0.01d, 10 << 20, 0, staticBits); + testConstrained(0.01d, 1 << 20, 6, staticBits); + testConstrained(0.01d, 10 << 20, 6, staticBits); + testConstrained(0.01d, 1 << 19, 10, staticBits); + testConstrained(0.01d, 1 << 20, 10, staticBits); + testConstrained(0.01d, 10 << 20, 10, staticBits); + testConstrained(0.1d, 10 << 20, 0, staticBits); + testConstrained(0.1d, 10 << 20, 8, staticBits); + testConstrained(0.1d, 10 << 20, 10, staticBits); } static long[] staticBits(int random, long ... fixed) @@ -180,13 +159,8 @@ public class LongBloomFilterTest @Test public void timeit() { - timeit(false); - timeit(true); - } - private static void timeit(boolean oldBfHashOrder) - { int size = 300 * FilterTestHelper.ELEMENTS; - IFilter bf = getFilter(size, FilterTestHelper.spec.bucketsPerElement, false, oldBfHashOrder); + IFilter bf = getFilter(size, FilterTestHelper.spec.bucketsPerElement, false); double sumfp = 0; for (int i = 0; i < 10; i++) { @@ -196,6 +170,6 @@ public class LongBloomFilterTest bf.clear(); } - logger.info("Bloom filter mean false positive for oldBfHashOrder={}: {}", oldBfHashOrder, sumfp / 10); + logger.info("Bloom filter mean false positive: {}", sumfp / 10); } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/test/unit/org/apache/cassandra/AbstractSerializationsTester.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/AbstractSerializationsTester.java b/test/unit/org/apache/cassandra/AbstractSerializationsTester.java index 3a1f348..04cb083 100644 --- a/test/unit/org/apache/cassandra/AbstractSerializationsTester.java +++ b/test/unit/org/apache/cassandra/AbstractSerializationsTester.java @@ -39,12 +39,6 @@ public class AbstractSerializationsTester protected static final String CUR_VER = System.getProperty("cassandra.version", "3.0"); protected static final Map<String, Integer> VERSION_MAP = new HashMap<String, Integer> () {{ - put("0.7", 1); - put("1.0", 3); - put("1.2", MessagingService.VERSION_12); - put("2.0", MessagingService.VERSION_20); - put("2.1", MessagingService.VERSION_21); - put("2.2", MessagingService.VERSION_22); put("3.0", MessagingService.VERSION_30); }}; http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/test/unit/org/apache/cassandra/batchlog/BatchTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/batchlog/BatchTest.java b/test/unit/org/apache/cassandra/batchlog/BatchTest.java index 4e64ec6..d2db9b9 100644 --- a/test/unit/org/apache/cassandra/batchlog/BatchTest.java +++ b/test/unit/org/apache/cassandra/batchlog/BatchTest.java @@ -106,63 +106,4 @@ public class BatchTest } } } - - /** - * This is just to test decodeMutations() when deserializing, - * since Batch will never be serialized at a version 2.2. - * @throws IOException - */ - @Test - public void testSerializationNonCurrentVersion() throws IOException - { - CFMetaData cfm = Keyspace.open(KEYSPACE).getColumnFamilyStore(CF_STANDARD).metadata; - - long now = FBUtilities.timestampMicros(); - int version = MessagingService.VERSION_22; - UUID uuid = UUIDGen.getTimeUUID(); - - List<Mutation> mutations = new ArrayList<>(10); - for (int i = 0; i < 10; i++) - { - mutations.add(new RowUpdateBuilder(cfm, FBUtilities.timestampMicros(), bytes(i)) - .clustering("name" + i) - .add("val", "val" + i) - .build()); - } - - Batch batch1 = Batch.createLocal(uuid, now, mutations); - assertEquals(uuid, batch1.id); - assertEquals(now, batch1.creationTime); - assertEquals(mutations, batch1.decodedMutations); - - DataOutputBuffer out = new DataOutputBuffer(); - Batch.serializer.serialize(batch1, out, version); - - assertEquals(out.getLength(), Batch.serializer.serializedSize(batch1, version)); - - DataInputPlus dis = new DataInputBuffer(out.getData()); - Batch batch2 = Batch.serializer.deserialize(dis, version); - - assertEquals(batch1.id, batch2.id); - assertEquals(batch1.creationTime, batch2.creationTime); - assertEquals(batch1.decodedMutations.size(), batch2.decodedMutations.size()); - - Iterator<Mutation> it1 = batch1.decodedMutations.iterator(); - Iterator<Mutation> it2 = batch2.decodedMutations.iterator(); - while (it1.hasNext()) - { - // We can't simply test the equality of both mutation string representation, that is do: - // assertEquals(it1.next().toString(), it2.next().toString()); - // because when deserializing from the old format, the returned iterator will always have it's 'columns()' - // method return all the table columns (no matter what's the actual content), and the table contains a - // 'val0' column we're not setting in that test. - // - // And it's actually not easy to fix legacy deserialization as we'd need to know which columns are actually - // set upfront, which would require use to iterate over the whole content first, which would be costly. And - // as the result of 'columns()' is only meant as a superset of the columns in the iterator, we don't bother. - Mutation mut1 = it1.next(); - Mutation mut2 = it2.next(); - assertTrue(mut1 + " != " + mut2, Util.sameContent(mut1, mut2)); - } - } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/test/unit/org/apache/cassandra/batchlog/BatchlogManagerTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/batchlog/BatchlogManagerTest.java b/test/unit/org/apache/cassandra/batchlog/BatchlogManagerTest.java index f192bcf..038255b 100644 --- a/test/unit/org/apache/cassandra/batchlog/BatchlogManagerTest.java +++ b/test/unit/org/apache/cassandra/batchlog/BatchlogManagerTest.java @@ -100,7 +100,6 @@ public class BatchlogManagerTest metadata.updateNormalToken(Util.token("A"), localhost); metadata.updateHostId(UUIDGen.getTimeUUID(), localhost); Keyspace.open(SchemaConstants.SYSTEM_KEYSPACE_NAME).getColumnFamilyStore(SystemKeyspace.BATCHES).truncateBlocking(); - Keyspace.open(SchemaConstants.SYSTEM_KEYSPACE_NAME).getColumnFamilyStore(SystemKeyspace.LEGACY_BATCHLOG).truncateBlocking(); } @Test @@ -129,19 +128,8 @@ public class BatchlogManagerTest } @Test - public void testReplay() throws Exception - { - testReplay(false); - } - - @Test - public void testLegacyReplay() throws Exception - { - testReplay(true); - } - @SuppressWarnings("deprecation") - private static void testReplay(boolean legacy) throws Exception + public void testReplay() throws Exception { long initialAllBatches = BatchlogManager.instance.countAllBatches(); long initialReplayedBatches = BatchlogManager.instance.getTotalBatchesReplayed(); @@ -165,16 +153,7 @@ public class BatchlogManagerTest ? (System.currentTimeMillis() - BatchlogManager.getBatchlogTimeout()) : (System.currentTimeMillis() + BatchlogManager.getBatchlogTimeout()); - if (legacy) - LegacyBatchlogMigrator.store(Batch.createLocal(UUIDGen.getTimeUUID(timestamp, i), timestamp * 1000, mutations), MessagingService.current_version); - else - BatchlogManager.store(Batch.createLocal(UUIDGen.getTimeUUID(timestamp, i), timestamp * 1000, mutations)); - } - - if (legacy) - { - Keyspace.open(SchemaConstants.SYSTEM_KEYSPACE_NAME).getColumnFamilyStore(SystemKeyspace.LEGACY_BATCHLOG).forceBlockingFlush(); - LegacyBatchlogMigrator.migrate(); + BatchlogManager.store(Batch.createLocal(UUIDGen.getTimeUUID(timestamp, i), timestamp * 1000, mutations)); } // Flush the batchlog to disk (see CASSANDRA-6822). @@ -295,104 +274,6 @@ public class BatchlogManagerTest } @Test - @SuppressWarnings("deprecation") - public void testConversion() throws Exception - { - long initialAllBatches = BatchlogManager.instance.countAllBatches(); - long initialReplayedBatches = BatchlogManager.instance.getTotalBatchesReplayed(); - CFMetaData cfm = Schema.instance.getCFMetaData(KEYSPACE1, CF_STANDARD4); - - // Generate 1400 version 2.0 mutations and put them all into the batchlog. - // Half ready to be replayed, half not. - for (int i = 0; i < 1400; i++) - { - Mutation mutation = new RowUpdateBuilder(cfm, FBUtilities.timestampMicros(), ByteBufferUtil.bytes(i)) - .clustering("name" + i) - .add("val", "val" + i) - .build(); - - long timestamp = i < 700 - ? (System.currentTimeMillis() - BatchlogManager.getBatchlogTimeout()) - : (System.currentTimeMillis() + BatchlogManager.getBatchlogTimeout()); - - - Mutation batchMutation = LegacyBatchlogMigrator.getStoreMutation(Batch.createLocal(UUIDGen.getTimeUUID(timestamp, i), - TimeUnit.MILLISECONDS.toMicros(timestamp), - Collections.singleton(mutation)), - MessagingService.VERSION_20); - assertTrue(LegacyBatchlogMigrator.isLegacyBatchlogMutation(batchMutation)); - LegacyBatchlogMigrator.handleLegacyMutation(batchMutation); - } - - // Mix in 100 current version mutations, 50 ready for replay. - for (int i = 1400; i < 1500; i++) - { - Mutation mutation = new RowUpdateBuilder(cfm, FBUtilities.timestampMicros(), ByteBufferUtil.bytes(i)) - .clustering("name" + i) - .add("val", "val" + i) - .build(); - - long timestamp = i < 1450 - ? (System.currentTimeMillis() - BatchlogManager.getBatchlogTimeout()) - : (System.currentTimeMillis() + BatchlogManager.getBatchlogTimeout()); - - - BatchlogManager.store(Batch.createLocal(UUIDGen.getTimeUUID(timestamp, i), - FBUtilities.timestampMicros(), - Collections.singleton(mutation))); - } - - // Flush the batchlog to disk (see CASSANDRA-6822). - Keyspace.open(SchemaConstants.SYSTEM_KEYSPACE_NAME).getColumnFamilyStore(SystemKeyspace.BATCHES).forceBlockingFlush(); - - assertEquals(1500, BatchlogManager.instance.countAllBatches() - initialAllBatches); - assertEquals(0, BatchlogManager.instance.getTotalBatchesReplayed() - initialReplayedBatches); - - UntypedResultSet result = executeInternal(String.format("SELECT count(*) FROM \"%s\".\"%s\"", SchemaConstants.SYSTEM_KEYSPACE_NAME, SystemKeyspace.LEGACY_BATCHLOG)); - assertNotNull(result); - assertEquals("Count in blog legacy", 0, result.one().getLong("count")); - result = executeInternal(String.format("SELECT count(*) FROM \"%s\".\"%s\"", SchemaConstants.SYSTEM_KEYSPACE_NAME, SystemKeyspace.BATCHES)); - assertNotNull(result); - assertEquals("Count in blog", 1500, result.one().getLong("count")); - - // Force batchlog replay and wait for it to complete. - BatchlogManager.instance.performInitialReplay(); - - // Ensure that the first half, and only the first half, got replayed. - assertEquals(750, BatchlogManager.instance.countAllBatches() - initialAllBatches); - assertEquals(750, BatchlogManager.instance.getTotalBatchesReplayed() - initialReplayedBatches); - - for (int i = 0; i < 1500; i++) - { - result = executeInternal(String.format("SELECT * FROM \"%s\".\"%s\" WHERE key = intAsBlob(%d)", KEYSPACE1, CF_STANDARD4, i)); - assertNotNull(result); - if (i < 700 || i >= 1400 && i < 1450) - { - assertEquals(ByteBufferUtil.bytes(i), result.one().getBytes("key")); - assertEquals("name" + i, result.one().getString("name")); - assertEquals("val" + i, result.one().getString("val")); - } - else - { - assertTrue("Present at " + i, result.isEmpty()); - } - } - - // Ensure that no stray mutations got somehow applied. - result = executeInternal(String.format("SELECT count(*) FROM \"%s\".\"%s\"", KEYSPACE1, CF_STANDARD4)); - assertNotNull(result); - assertEquals(750, result.one().getLong("count")); - - // Ensure batchlog is left as expected. - result = executeInternal(String.format("SELECT count(*) FROM \"%s\".\"%s\"", SchemaConstants.SYSTEM_KEYSPACE_NAME, SystemKeyspace.BATCHES)); - assertNotNull(result); - assertEquals("Count in blog after initial replay", 750, result.one().getLong("count")); - result = executeInternal(String.format("SELECT count(*) FROM \"%s\".\"%s\"", SchemaConstants.SYSTEM_KEYSPACE_NAME, SystemKeyspace.LEGACY_BATCHLOG)); - assertNotNull(result); - assertEquals("Count in blog legacy after initial replay ", 0, result.one().getLong("count")); - } - - @Test public void testAddBatch() throws IOException { long initialAllBatches = BatchlogManager.instance.countAllBatches(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/test/unit/org/apache/cassandra/cache/CacheProviderTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cache/CacheProviderTest.java b/test/unit/org/apache/cassandra/cache/CacheProviderTest.java index a4173d6..cd52d35 100644 --- a/test/unit/org/apache/cassandra/cache/CacheProviderTest.java +++ b/test/unit/org/apache/cassandra/cache/CacheProviderTest.java @@ -103,8 +103,8 @@ public class CacheProviderTest { MessageDigest d1 = MessageDigest.getInstance("MD5"); MessageDigest d2 = MessageDigest.getInstance("MD5"); - UnfilteredRowIterators.digest(null, ((CachedBTreePartition) one).unfilteredIterator(), d1, MessagingService.current_version); - UnfilteredRowIterators.digest(null, ((CachedBTreePartition) two).unfilteredIterator(), d2, MessagingService.current_version); + UnfilteredRowIterators.digest(((CachedBTreePartition) one).unfilteredIterator(), d1, MessagingService.current_version); + UnfilteredRowIterators.digest(((CachedBTreePartition) two).unfilteredIterator(), d2, MessagingService.current_version); assertTrue(MessageDigest.isEqual(d1.digest(), d2.digest())); } catch (NoSuchAlgorithmException e) http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/test/unit/org/apache/cassandra/cql3/CQLTester.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/CQLTester.java b/test/unit/org/apache/cassandra/cql3/CQLTester.java index 0ac5628..04ee5df 100644 --- a/test/unit/org/apache/cassandra/cql3/CQLTester.java +++ b/test/unit/org/apache/cassandra/cql3/CQLTester.java @@ -197,6 +197,7 @@ public abstract class CQLTester ThreadAwareSecurityManager.install(); Keyspace.setInitialized(); + SystemKeyspace.persistLocalMetadata(); isServerPrepared = true; } http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/test/unit/org/apache/cassandra/db/PartitionTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/PartitionTest.java b/test/unit/org/apache/cassandra/db/PartitionTest.java index 7216ab7..7f44d51 100644 --- a/test/unit/org/apache/cassandra/db/PartitionTest.java +++ b/test/unit/org/apache/cassandra/db/PartitionTest.java @@ -119,12 +119,6 @@ public class PartitionTest testDigest(MessagingService.current_version); } - @Test - public void testLegacyDigest() throws NoSuchAlgorithmException - { - testDigest(MessagingService.VERSION_22); - } - public void testDigest(int version) throws NoSuchAlgorithmException { ColumnFamilyStore cfs = Keyspace.open(KEYSPACE1).getColumnFamilyStore(CF_TENCOL); @@ -145,16 +139,16 @@ public class PartitionTest MessageDigest digest1 = MessageDigest.getInstance("MD5"); MessageDigest digest2 = MessageDigest.getInstance("MD5"); - UnfilteredRowIterators.digest(cmd1, p1.unfilteredIterator(), digest1, version); - UnfilteredRowIterators.digest(cmd2, p2.unfilteredIterator(), digest2, version); + UnfilteredRowIterators.digest(p1.unfilteredIterator(), digest1, version); + UnfilteredRowIterators.digest(p2.unfilteredIterator(), digest2, version); assertFalse(Arrays.equals(digest1.digest(), digest2.digest())); p1 = Util.getOnlyPartitionUnfiltered(Util.cmd(cfs, "key2").build()); p2 = Util.getOnlyPartitionUnfiltered(Util.cmd(cfs, "key2").build()); digest1 = MessageDigest.getInstance("MD5"); digest2 = MessageDigest.getInstance("MD5"); - UnfilteredRowIterators.digest(cmd1, p1.unfilteredIterator(), digest1, version); - UnfilteredRowIterators.digest(cmd2, p2.unfilteredIterator(), digest2, version); + UnfilteredRowIterators.digest(p1.unfilteredIterator(), digest1, version); + UnfilteredRowIterators.digest(p2.unfilteredIterator(), digest2, version); assertTrue(Arrays.equals(digest1.digest(), digest2.digest())); p1 = Util.getOnlyPartitionUnfiltered(Util.cmd(cfs, "key2").build()); @@ -162,8 +156,8 @@ public class PartitionTest p2 = Util.getOnlyPartitionUnfiltered(Util.cmd(cfs, "key2").build()); digest1 = MessageDigest.getInstance("MD5"); digest2 = MessageDigest.getInstance("MD5"); - UnfilteredRowIterators.digest(cmd1, p1.unfilteredIterator(), digest1, version); - UnfilteredRowIterators.digest(cmd2, p2.unfilteredIterator(), digest2, version); + UnfilteredRowIterators.digest(p1.unfilteredIterator(), digest1, version); + UnfilteredRowIterators.digest(p2.unfilteredIterator(), digest2, version); assertFalse(Arrays.equals(digest1.digest(), digest2.digest())); } finally http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/test/unit/org/apache/cassandra/db/ReadResponseTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/ReadResponseTest.java b/test/unit/org/apache/cassandra/db/ReadResponseTest.java deleted file mode 100644 index 52ab8bb..0000000 --- a/test/unit/org/apache/cassandra/db/ReadResponseTest.java +++ /dev/null @@ -1,99 +0,0 @@ -/* - * 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 - * - * 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.util.*; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import org.apache.cassandra.Util; -import org.apache.cassandra.config.CFMetaData; -import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.cql3.CQLTester; -import org.apache.cassandra.db.rows.Rows; -import org.apache.cassandra.db.rows.UnfilteredRowIterators; -import org.apache.cassandra.db.partitions.ImmutableBTreePartition; -import org.apache.cassandra.db.partitions.UnfilteredPartitionIterator; -import org.apache.cassandra.db.marshal.AsciiType; -import org.apache.cassandra.dht.ByteOrderedPartitioner; -import org.apache.cassandra.dht.IPartitioner; - -import static org.junit.Assert.assertEquals; - -public class ReadResponseTest extends CQLTester -{ - private IPartitioner partitionerToRestore; - - @Before - public void setupPartitioner() - { - // Using an ordered partitioner to be able to predict keys order in the following tests. - partitionerToRestore = DatabaseDescriptor.setPartitionerUnsafe(ByteOrderedPartitioner.instance); - } - - @After - public void resetPartitioner() - { - DatabaseDescriptor.setPartitionerUnsafe(partitionerToRestore); - } - - @Test - public void testLegacyResponseSkipWrongBounds() - { - createTable("CREATE TABLE %s (k text PRIMARY KEY)"); - - ColumnFamilyStore cfs = getCurrentColumnFamilyStore(); - - // Test that if a legacy response contains keys at the boundary of the requested key range that shouldn't be present, those - // are properly skipped. See CASSANDRA-9857 for context. - - List<ImmutableBTreePartition> responses = Arrays.asList(makePartition(cfs.metadata, "k1"), - makePartition(cfs.metadata, "k2"), - makePartition(cfs.metadata, "k3")); - ReadResponse.LegacyRemoteDataResponse response = new ReadResponse.LegacyRemoteDataResponse(responses); - - assertPartitions(response.makeIterator(Util.cmd(cfs).fromKeyExcl("k1").toKeyExcl("k3").build()), "k2"); - assertPartitions(response.makeIterator(Util.cmd(cfs).fromKeyExcl("k0").toKeyExcl("k3").build()), "k1", "k2"); - assertPartitions(response.makeIterator(Util.cmd(cfs).fromKeyExcl("k1").toKeyExcl("k4").build()), "k2", "k3"); - - assertPartitions(response.makeIterator(Util.cmd(cfs).fromKeyIncl("k1").toKeyExcl("k3").build()), "k1", "k2"); - assertPartitions(response.makeIterator(Util.cmd(cfs).fromKeyIncl("k1").toKeyExcl("k4").build()), "k1", "k2", "k3"); - } - - private void assertPartitions(UnfilteredPartitionIterator actual, String... expectedKeys) - { - int i = 0; - while (i < expectedKeys.length && actual.hasNext()) - { - String actualKey = AsciiType.instance.getString(actual.next().partitionKey().getKey()); - assertEquals(expectedKeys[i++], actualKey); - } - - if (i < expectedKeys.length) - throw new AssertionError("Got less results than expected: " + expectedKeys[i] + " is not in the result"); - if (actual.hasNext()) - throw new AssertionError("Got more results than expected: first unexpected key is " + AsciiType.instance.getString(actual.next().partitionKey().getKey())); - } - - private static ImmutableBTreePartition makePartition(CFMetaData metadata, String key) - { - return ImmutableBTreePartition.create(UnfilteredRowIterators.noRowsIterator(metadata, Util.dk(key), Rows.EMPTY_STATIC_ROW, new DeletionTime(0, 0), false)); - } -} http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/test/unit/org/apache/cassandra/db/RowIndexEntryTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/RowIndexEntryTest.java b/test/unit/org/apache/cassandra/db/RowIndexEntryTest.java index 6c8eed5..69e1423 100644 --- a/test/unit/org/apache/cassandra/db/RowIndexEntryTest.java +++ b/test/unit/org/apache/cassandra/db/RowIndexEntryTest.java @@ -256,7 +256,7 @@ public class RowIndexEntryTest extends CQLTester Collection<SSTableFlushObserver> observers, Version version) throws IOException { - assert !iterator.isEmpty() && version.storeRows(); + assert !iterator.isEmpty(); Builder builder = new Builder(iterator, output, header, observers, version.correspondingMessagingVersion()); return builder.build(); @@ -422,7 +422,7 @@ public class RowIndexEntryTest extends CQLTester SequentialWriter writer = new SequentialWriter(tempFile); ColumnIndex columnIndex = RowIndexEntryTest.ColumnIndex.writeAndBuildIndex(partition.unfilteredIterator(), writer, header, Collections.emptySet(), BigFormat.latestVersion); Pre_C_11206_RowIndexEntry withIndex = Pre_C_11206_RowIndexEntry.create(0xdeadbeef, DeletionTime.LIVE, columnIndex); - IndexInfo.Serializer indexSerializer = cfs.metadata.serializers().indexInfoSerializer(BigFormat.latestVersion, header); + IndexInfo.Serializer indexSerializer = IndexInfo.serializer(BigFormat.latestVersion, header); // sanity check assertTrue(columnIndex.columnsIndex.size() >= 3); @@ -567,14 +567,12 @@ public class RowIndexEntryTest extends CQLTester Serializer(CFMetaData metadata, Version version, SerializationHeader header) { - this.idxSerializer = metadata.serializers().indexInfoSerializer(version, header); + this.idxSerializer = IndexInfo.serializer(version, header); this.version = version; } public void serialize(Pre_C_11206_RowIndexEntry rie, DataOutputPlus out) throws IOException { - assert version.storeRows() : "We read old index files but we should never write them"; - out.writeUnsignedVInt(rie.position); out.writeUnsignedVInt(rie.promotedSize(idxSerializer)); @@ -622,35 +620,6 @@ public class RowIndexEntryTest extends CQLTester public Pre_C_11206_RowIndexEntry deserialize(DataInputPlus in) throws IOException { - if (!version.storeRows()) - { - long position = in.readLong(); - - int size = in.readInt(); - if (size > 0) - { - DeletionTime deletionTime = DeletionTime.serializer.deserialize(in); - - int entries = in.readInt(); - List<IndexInfo> columnsIndex = new ArrayList<>(entries); - - long headerLength = 0L; - for (int i = 0; i < entries; i++) - { - IndexInfo info = idxSerializer.deserialize(in); - columnsIndex.add(info); - if (i == 0) - headerLength = info.offset; - } - - return new Pre_C_11206_RowIndexEntry.IndexedEntry(position, deletionTime, headerLength, columnsIndex); - } - else - { - return new Pre_C_11206_RowIndexEntry(position); - } - } - long position = in.readUnsignedVInt(); int size = (int)in.readUnsignedVInt(); @@ -678,7 +647,7 @@ public class RowIndexEntryTest extends CQLTester // should be used instead. static long readPosition(DataInputPlus in, Version version) throws IOException { - return version.storeRows() ? in.readUnsignedVInt() : in.readLong(); + return in.readUnsignedVInt(); } public static void skip(DataInputPlus in, Version version) throws IOException @@ -689,7 +658,7 @@ public class RowIndexEntryTest extends CQLTester private static void skipPromotedIndex(DataInputPlus in, Version version) throws IOException { - int size = version.storeRows() ? (int)in.readUnsignedVInt() : in.readInt(); + int size = (int)in.readUnsignedVInt(); if (size <= 0) return; @@ -698,8 +667,6 @@ public class RowIndexEntryTest extends CQLTester public int serializedSize(Pre_C_11206_RowIndexEntry rie) { - assert version.storeRows() : "We read old index files but we should never write them"; - int indexedSize = 0; if (rie.isIndexed()) { http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/test/unit/org/apache/cassandra/db/ScrubTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/ScrubTest.java b/test/unit/org/apache/cassandra/db/ScrubTest.java index 7e7e145..93ac46e 100644 --- a/test/unit/org/apache/cassandra/db/ScrubTest.java +++ b/test/unit/org/apache/cassandra/db/ScrubTest.java @@ -327,8 +327,7 @@ public class ScrubTest cfs.clearUnsafe(); List<String> keys = Arrays.asList("t", "a", "b", "z", "c", "y", "d"); - String filename = cfs.getSSTablePath(tempDataDir); - Descriptor desc = Descriptor.fromFilename(filename); + Descriptor desc = cfs.newSSTableDescriptor(tempDataDir); LifecycleTransaction txn = LifecycleTransaction.offline(OperationType.WRITE); try (SSTableTxnWriter writer = new SSTableTxnWriter(txn, createTestWriter(desc, (long) keys.size(), cfs.metadata, txn))) @@ -709,41 +708,4 @@ public class ScrubTest rs = QueryProcessor.executeInternal(String.format("SELECT * FROM \"%s\".cf_with_duplicates_3_0", KEYSPACE)); assertEquals(0, rs.size()); } - - @Test - public void testUpgradeSstablesWithDuplicates() throws Exception - { - DatabaseDescriptor.setPartitionerUnsafe(Murmur3Partitioner.instance); - String cf = "cf_with_duplicates_2_0"; - QueryProcessor.process(String.format("CREATE TABLE \"%s\".%s (a int, b int, c int, PRIMARY KEY (a, b))", KEYSPACE, cf), ConsistencyLevel.ONE); - - Keyspace keyspace = Keyspace.open(KEYSPACE); - ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(cf); - - Path legacySSTableRoot = Paths.get(System.getProperty(INVALID_LEGACY_SSTABLE_ROOT_PROP), - "Keyspace1", - cf); - - for (String filename : new String[]{ "lb-1-big-CompressionInfo.db", - "lb-1-big-Data.db", - "lb-1-big-Digest.adler32", - "lb-1-big-Filter.db", - "lb-1-big-Index.db", - "lb-1-big-Statistics.db", - "lb-1-big-Summary.db", - "lb-1-big-TOC.txt" }) - { - Files.copy(Paths.get(legacySSTableRoot.toString(), filename), cfs.getDirectories().getDirectoryForNewSSTables().toPath().resolve(filename)); - } - - cfs.loadNewSSTables(); - - cfs.sstablesRewrite(true, 1); - - UntypedResultSet rs = QueryProcessor.executeInternal(String.format("SELECT * FROM \"%s\".%s", KEYSPACE, cf)); - assertEquals(1, rs.size()); - QueryProcessor.executeInternal(String.format("DELETE FROM \"%s\".%s WHERE a=1 AND b =2", KEYSPACE, cf)); - rs = QueryProcessor.executeInternal(String.format("SELECT * FROM \"%s\".%s", KEYSPACE, cf)); - assertEquals(0, rs.size()); - } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/test/unit/org/apache/cassandra/db/SinglePartitionSliceCommandTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/SinglePartitionSliceCommandTest.java b/test/unit/org/apache/cassandra/db/SinglePartitionSliceCommandTest.java index 3c09c93..95582d5 100644 --- a/test/unit/org/apache/cassandra/db/SinglePartitionSliceCommandTest.java +++ b/test/unit/org/apache/cassandra/db/SinglePartitionSliceCommandTest.java @@ -96,61 +96,6 @@ public class SinglePartitionSliceCommandTest Keyspace.open(KEYSPACE).getColumnFamilyStore(TABLE).truncateBlocking(); } - @Test - public void staticColumnsAreFiltered() throws IOException - { - DecoratedKey key = cfm.decorateKey(ByteBufferUtil.bytes("k")); - - UntypedResultSet rows; - - QueryProcessor.executeInternal("INSERT INTO ks.tbl (k, s, i, v) VALUES ('k', 's', 0, 'v')"); - QueryProcessor.executeInternal("DELETE v FROM ks.tbl WHERE k='k' AND i=0"); - QueryProcessor.executeInternal("DELETE FROM ks.tbl WHERE k='k' AND i=0"); - rows = QueryProcessor.executeInternal("SELECT * FROM ks.tbl WHERE k='k' AND i=0"); - - for (UntypedResultSet.Row row: rows) - { - logger.debug("Current: k={}, s={}, v={}", (row.has("k") ? row.getString("k") : null), (row.has("s") ? row.getString("s") : null), (row.has("v") ? row.getString("v") : null)); - } - - assert rows.isEmpty(); - - ColumnFilter columnFilter = ColumnFilter.selection(PartitionColumns.of(v)); - ByteBuffer zero = ByteBufferUtil.bytes(0); - Slices slices = Slices.with(cfm.comparator, Slice.make(ClusteringBound.inclusiveStartOf(zero), ClusteringBound.inclusiveEndOf(zero))); - ClusteringIndexSliceFilter sliceFilter = new ClusteringIndexSliceFilter(slices, false); - ReadCommand cmd = new SinglePartitionReadCommand(false, MessagingService.VERSION_30, true, cfm, - FBUtilities.nowInSeconds(), - columnFilter, - RowFilter.NONE, - DataLimits.NONE, - key, - sliceFilter); - - DataOutputBuffer out = new DataOutputBuffer((int) ReadCommand.legacyReadCommandSerializer.serializedSize(cmd, MessagingService.VERSION_21)); - ReadCommand.legacyReadCommandSerializer.serialize(cmd, out, MessagingService.VERSION_21); - DataInputPlus in = new DataInputBuffer(out.buffer(), true); - cmd = ReadCommand.legacyReadCommandSerializer.deserialize(in, MessagingService.VERSION_21); - - logger.debug("ReadCommand: {}", cmd); - try (ReadExecutionController controller = cmd.executionController(); - UnfilteredPartitionIterator partitionIterator = cmd.executeLocally(controller)) - { - ReadResponse response = ReadResponse.createDataResponse(partitionIterator, cmd); - - logger.debug("creating response: {}", response); - try (UnfilteredPartitionIterator pIter = response.makeIterator(cmd)) - { - assert pIter.hasNext(); - try (UnfilteredRowIterator partition = pIter.next()) - { - LegacyLayout.LegacyUnfilteredPartition rowIter = LegacyLayout.fromUnfilteredRowIterator(cmd, partition); - Assert.assertEquals(Collections.emptyList(), rowIter.cells); - } - } - } - } - private void checkForS(UnfilteredPartitionIterator pi) { Assert.assertTrue(pi.toString(), pi.hasNext()); http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/test/unit/org/apache/cassandra/db/SystemKeyspaceTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/SystemKeyspaceTest.java b/test/unit/org/apache/cassandra/db/SystemKeyspaceTest.java index e3e4d8a..d188821 100644 --- a/test/unit/org/apache/cassandra/db/SystemKeyspaceTest.java +++ b/test/unit/org/apache/cassandra/db/SystemKeyspaceTest.java @@ -45,8 +45,6 @@ import static org.junit.Assert.assertTrue; public class SystemKeyspaceTest { - public static final String MIGRATION_SSTABLES_ROOT = "migration-sstable-root"; - @BeforeClass public static void prepSnapshotTracker() { @@ -155,81 +153,6 @@ public class SystemKeyspaceTest Keyspace.clearSnapshot(null, SchemaConstants.SYSTEM_KEYSPACE_NAME); } - @Test - public void testMigrateEmptyDataDirs() throws IOException - { - File dataDir = Paths.get(DatabaseDescriptor.getAllDataFileLocations()[0]).toFile(); - if (new File(dataDir, "Emptykeyspace1").exists()) - FileUtils.deleteDirectory(new File(dataDir, "Emptykeyspace1")); - assertTrue(new File(dataDir, "Emptykeyspace1").mkdirs()); - assertEquals(0, numLegacyFiles()); - SystemKeyspace.migrateDataDirs(); - assertEquals(0, numLegacyFiles()); - - assertTrue(new File(dataDir, "Emptykeyspace1/table1").mkdirs()); - assertEquals(0, numLegacyFiles()); - SystemKeyspace.migrateDataDirs(); - assertEquals(0, numLegacyFiles()); - - assertTrue(new File(dataDir, "Emptykeyspace1/wrong_file").createNewFile()); - assertEquals(0, numLegacyFiles()); - SystemKeyspace.migrateDataDirs(); - assertEquals(0, numLegacyFiles()); - - } - - @Test - public void testMigrateDataDirs_2_1() throws IOException - { - testMigrateDataDirs("2.1", 5); // see test data for num legacy files - } - - @Test - public void testMigrateDataDirs_2_2() throws IOException - { - testMigrateDataDirs("2.2", 7); // see test data for num legacy files - } - - private void testMigrateDataDirs(String version, int numLegacyFiles) throws IOException - { - Path migrationSSTableRoot = Paths.get(System.getProperty(MIGRATION_SSTABLES_ROOT), version); - Path dataDir = Paths.get(DatabaseDescriptor.getAllDataFileLocations()[0]); - - FileUtils.copyDirectory(migrationSSTableRoot.toFile(), dataDir.toFile()); - - assertEquals(numLegacyFiles, numLegacyFiles()); - - SystemKeyspace.migrateDataDirs(); - - assertEquals(0, numLegacyFiles()); - } - - private static int numLegacyFiles() - { - int ret = 0; - Iterable<String> dirs = Arrays.asList(DatabaseDescriptor.getAllDataFileLocations()); - for (String dataDir : dirs) - { - File dir = new File(dataDir); - for (File ksdir : dir.listFiles((d, n) -> new File(d, n).isDirectory())) - { - for (File cfdir : ksdir.listFiles((d, n) -> new File(d, n).isDirectory())) - { - if (Descriptor.isLegacyFile(cfdir)) - { - ret++; - } - else - { - File[] legacyFiles = cfdir.listFiles((d, n) -> Descriptor.isLegacyFile(new File(d, n))); - ret += legacyFiles.length; - } - } - } - } - return ret; - } - private String getOlderVersionString() { String version = FBUtilities.getReleaseVersionString(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/test/unit/org/apache/cassandra/db/VerifyTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/VerifyTest.java b/test/unit/org/apache/cassandra/db/VerifyTest.java index 4e55a60..77096b9 100644 --- a/test/unit/org/apache/cassandra/db/VerifyTest.java +++ b/test/unit/org/apache/cassandra/db/VerifyTest.java @@ -31,6 +31,7 @@ import org.apache.cassandra.db.marshal.UUIDType; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.exceptions.WriteTimeoutException; import org.apache.cassandra.io.FSWriteError; +import org.apache.cassandra.io.sstable.Component; import org.apache.cassandra.io.sstable.CorruptSSTableException; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.io.util.FileUtils; @@ -275,11 +276,11 @@ public class VerifyTest SSTableReader sstable = cfs.getLiveSSTables().iterator().next(); - try (RandomAccessFile file = new RandomAccessFile(sstable.descriptor.filenameFor(sstable.descriptor.digestComponent), "rw")) + try (RandomAccessFile file = new RandomAccessFile(sstable.descriptor.filenameFor(Component.DIGEST), "rw")) { Long correctChecksum = Long.valueOf(file.readLine()); - writeChecksum(++correctChecksum, sstable.descriptor.filenameFor(sstable.descriptor.digestComponent)); + writeChecksum(++correctChecksum, sstable.descriptor.filenameFor(Component.DIGEST)); } try (Verifier verifier = new Verifier(cfs, sstable, false)) @@ -318,7 +319,7 @@ public class VerifyTest ChunkCache.instance.invalidateFile(sstable.getFilename()); // Update the Digest to have the right Checksum - writeChecksum(simpleFullChecksum(sstable.getFilename()), sstable.descriptor.filenameFor(sstable.descriptor.digestComponent)); + writeChecksum(simpleFullChecksum(sstable.getFilename()), sstable.descriptor.filenameFor(Component.DIGEST)); try (Verifier verifier = new Verifier(cfs, sstable, false)) { http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/test/unit/org/apache/cassandra/db/commitlog/CommitLogDescriptorTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/commitlog/CommitLogDescriptorTest.java b/test/unit/org/apache/cassandra/db/commitlog/CommitLogDescriptorTest.java index fdedafd..53c6769 100644 --- a/test/unit/org/apache/cassandra/db/commitlog/CommitLogDescriptorTest.java +++ b/test/unit/org/apache/cassandra/db/commitlog/CommitLogDescriptorTest.java @@ -106,10 +106,10 @@ public class CommitLogDescriptorTest public void testDescriptorPersistence() throws IOException { testDescriptorPersistence(new CommitLogDescriptor(11, null, neverEnabledEncryption)); - testDescriptorPersistence(new CommitLogDescriptor(CommitLogDescriptor.VERSION_21, 13, null, neverEnabledEncryption)); - testDescriptorPersistence(new CommitLogDescriptor(CommitLogDescriptor.VERSION_22, 15, null, neverEnabledEncryption)); - testDescriptorPersistence(new CommitLogDescriptor(CommitLogDescriptor.VERSION_22, 17, new ParameterizedClass("LZ4Compressor", null), neverEnabledEncryption)); - testDescriptorPersistence(new CommitLogDescriptor(CommitLogDescriptor.VERSION_22, 19, + testDescriptorPersistence(new CommitLogDescriptor(CommitLogDescriptor.current_version, 13, null, neverEnabledEncryption)); + testDescriptorPersistence(new CommitLogDescriptor(CommitLogDescriptor.current_version, 15, null, neverEnabledEncryption)); + testDescriptorPersistence(new CommitLogDescriptor(CommitLogDescriptor.current_version, 17, new ParameterizedClass("LZ4Compressor", null), neverEnabledEncryption)); + testDescriptorPersistence(new CommitLogDescriptor(CommitLogDescriptor.current_version, 19, new ParameterizedClass("StubbyCompressor", ImmutableMap.of("parameter1", "value1", "flag2", "55", "argument3", "null") ), neverEnabledEncryption)); } @@ -122,7 +122,7 @@ public class CommitLogDescriptorTest for (int i=0; i<65535; ++i) params.put("key"+i, Integer.toString(i, 16)); try { - CommitLogDescriptor desc = new CommitLogDescriptor(CommitLogDescriptor.VERSION_22, + CommitLogDescriptor desc = new CommitLogDescriptor(CommitLogDescriptor.current_version, 21, new ParameterizedClass("LZ4Compressor", params), neverEnabledEncryption); http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/test/unit/org/apache/cassandra/db/commitlog/CommitLogTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/commitlog/CommitLogTest.java b/test/unit/org/apache/cassandra/db/commitlog/CommitLogTest.java index 5476d03..19305ac 100644 --- a/test/unit/org/apache/cassandra/db/commitlog/CommitLogTest.java +++ b/test/unit/org/apache/cassandra/db/commitlog/CommitLogTest.java @@ -152,15 +152,9 @@ public class CommitLogTest } @Test - public void testRecoveryWithEmptyLog20() throws Exception - { - CommitLog.instance.recoverFiles(tmpFile(CommitLogDescriptor.VERSION_20)); - } - - @Test public void testRecoveryWithZeroLog() throws Exception { - testRecovery(new byte[10], null); + testRecovery(new byte[10], CommitLogReplayException.class); } @Test @@ -174,7 +168,7 @@ public class CommitLogTest public void testRecoveryWithShortSize() throws Exception { runExpecting(() -> { - testRecovery(new byte[2], CommitLogDescriptor.VERSION_20); + testRecovery(new byte[2], CommitLogDescriptor.current_version); return null; }, CommitLogReplayException.class); } @@ -531,8 +525,7 @@ public class CommitLogTest { ParameterizedClass commitLogCompression = DatabaseDescriptor.getCommitLogCompression(); EncryptionContext encryptionContext = DatabaseDescriptor.getEncryptionContext(); - runExpecting(() -> testRecovery(logData, CommitLogDescriptor.VERSION_20), expected); - runExpecting(() -> testRecovery(new CommitLogDescriptor(4, commitLogCompression, encryptionContext), logData), expected); + runExpecting(() -> testRecovery(logData, CommitLogDescriptor.current_version), expected); } @Test http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/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 d55b59f..e25d2f1 100644 --- a/test/unit/org/apache/cassandra/db/commitlog/CommitLogUpgradeTest.java +++ b/test/unit/org/apache/cassandra/db/commitlog/CommitLogUpgradeTest.java @@ -98,83 +98,6 @@ public class CommitLogUpgradeTest } @Test - public void test20() throws Exception - { - testRestore(DATA_DIR + "2.0"); - } - - @Test - public void test21() throws Exception - { - 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"); - } - - public void test22_truncated() throws Exception - { - testRestore(DATA_DIR + "2.2-lz4-truncated"); - } - - @Test(expected = CommitLogReplayException.class) - public void test22_bitrot() throws Exception - { - shouldBeKilled = true; - testRestore(DATA_DIR + "2.2-lz4-bitrot"); - } - - @Test - public void test22_bitrot_ignored() throws Exception - { - try - { - System.setProperty(CommitLogReplayer.IGNORE_REPLAY_ERRORS_PROPERTY, "true"); - testRestore(DATA_DIR + "2.2-lz4-bitrot"); - } - finally - { - System.clearProperty(CommitLogReplayer.IGNORE_REPLAY_ERRORS_PROPERTY); - } - } - - @Test(expected = CommitLogReplayException.class) - public void test22_bitrot2() throws Exception - { - shouldBeKilled = true; - testRestore(DATA_DIR + "2.2-lz4-bitrot2"); - } - - @Test - public void test22_bitrot2_ignored() throws Exception - { - try - { - System.setProperty(CommitLogReplayer.IGNORE_REPLAY_ERRORS_PROPERTY, "true"); - testRestore(DATA_DIR + "2.2-lz4-bitrot2"); - } - finally - { - System.clearProperty(CommitLogReplayer.IGNORE_REPLAY_ERRORS_PROPERTY); - } - } - - @Test public void test34_encrypted() throws Exception { testRestore(DATA_DIR + "3.4-encrypted"); http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java b/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java index a2e2754..d46d07a 100644 --- a/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java @@ -164,9 +164,9 @@ public class AntiCompactionTest private SSTableReader writeFile(ColumnFamilyStore cfs, int count) { File dir = cfs.getDirectories().getDirectoryForNewSSTables(); - String filename = cfs.getSSTablePath(dir); + Descriptor desc = cfs.newSSTableDescriptor(dir); - try (SSTableTxnWriter writer = SSTableTxnWriter.create(cfs, filename, 0, 0, new SerializationHeader(true, cfm, cfm.partitionColumns(), EncodingStats.NO_STATS))) + try (SSTableTxnWriter writer = SSTableTxnWriter.create(cfs, desc, 0, 0, new SerializationHeader(true, cfm, cfm.partitionColumns(), EncodingStats.NO_STATS))) { for (int i = 0; i < count; i++) { http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a246419/test/unit/org/apache/cassandra/db/lifecycle/RealTransactionsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/lifecycle/RealTransactionsTest.java b/test/unit/org/apache/cassandra/db/lifecycle/RealTransactionsTest.java index 595610e..b825f52 100644 --- a/test/unit/org/apache/cassandra/db/lifecycle/RealTransactionsTest.java +++ b/test/unit/org/apache/cassandra/db/lifecycle/RealTransactionsTest.java @@ -29,7 +29,6 @@ import org.junit.BeforeClass; import org.junit.Test; import junit.framework.Assert; -import org.apache.cassandra.MockSchema; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.Schema; @@ -65,8 +64,6 @@ public class RealTransactionsTest extends SchemaLoader @BeforeClass public static void setUp() { - MockSchema.cleanup(); - SchemaLoader.prepareServer(); SchemaLoader.createKeyspace(KEYSPACE, KeyspaceParams.simple(1), @@ -160,7 +157,7 @@ public class RealTransactionsTest extends SchemaLoader { long lastCheckObsoletion = System.nanoTime(); File directory = txn.originals().iterator().next().descriptor.directory; - Descriptor desc = Descriptor.fromFilename(cfs.getSSTablePath(directory)); + Descriptor desc = cfs.newSSTableDescriptor(directory); CFMetaData metadata = Schema.instance.getCFMetaData(desc); rewriter.switchWriter(SSTableWriter.create(metadata, desc,
