cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject git commit: ninja fix LegacySSTable test with new versioned files from 2.0
Date Wed, 09 Jul 2014 20:22:02 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1.0 0b8fb5bb9 -> ae374107b


ninja fix LegacySSTable test with new versioned files from 2.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ae374107
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ae374107
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ae374107

Branch: refs/heads/cassandra-2.1.0
Commit: ae374107b7bcebf90efa75306d8dc493ccffa296
Parents: 0b8fb5b
Author: Jake Luciani <jake@apache.org>
Authored: Wed Jul 9 16:21:36 2014 -0400
Committer: Jake Luciani <jake@apache.org>
Committed: Wed Jul 9 16:21:36 2014 -0400

----------------------------------------------------------------------
 .../ic/Keyspace1/Keyspace1-Standard1-ic-0-Data.db  | Bin 45000 -> 0 bytes
 .../Keyspace1/Keyspace1-Standard1-ic-0-Digest.sha1 |   1 -
 .../Keyspace1/Keyspace1-Standard1-ic-0-Filter.db   | Bin 1136 -> 0 bytes
 .../ic/Keyspace1/Keyspace1-Standard1-ic-0-Index.db | Bin 15300 -> 0 bytes
 .../Keyspace1-Standard1-ic-0-Statistics.db         | Bin 4361 -> 0 bytes
 .../Keyspace1/Keyspace1-Standard1-ic-0-Summary.db  | Bin 202 -> 0 bytes
 .../ic/Keyspace1/Keyspace1-Standard1-ic-0-TOC.txt  |   7 -------
 .../jb/Keyspace1/Keyspace1-Standard1-jb-0-CRC.db   | Bin 0 -> 8 bytes
 .../jb/Keyspace1/Keyspace1-Standard1-jb-0-Data.db  | Bin 0 -> 36000 bytes
 .../Keyspace1/Keyspace1-Standard1-jb-0-Digest.sha1 |   1 +
 .../Keyspace1/Keyspace1-Standard1-jb-0-Filter.db   | Bin 0 -> 1136 bytes
 .../jb/Keyspace1/Keyspace1-Standard1-jb-0-Index.db | Bin 0 -> 15300 bytes
 .../Keyspace1-Standard1-jb-0-Statistics.db         | Bin 0 -> 4395 bytes
 .../Keyspace1/Keyspace1-Standard1-jb-0-Summary.db  | Bin 0 -> 202 bytes
 .../jb/Keyspace1/Keyspace1-Standard1-jb-0-TOC.txt  |   8 ++++++++
 .../cassandra/io/sstable/LegacySSTableTest.java    |   9 +++++++++
 16 files changed, 18 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae374107/test/data/legacy-sstables/ic/Keyspace1/Keyspace1-Standard1-ic-0-Data.db
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/ic/Keyspace1/Keyspace1-Standard1-ic-0-Data.db b/test/data/legacy-sstables/ic/Keyspace1/Keyspace1-Standard1-ic-0-Data.db
deleted file mode 100644
index f134aee..0000000
Binary files a/test/data/legacy-sstables/ic/Keyspace1/Keyspace1-Standard1-ic-0-Data.db and
/dev/null differ

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae374107/test/data/legacy-sstables/ic/Keyspace1/Keyspace1-Standard1-ic-0-Digest.sha1
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/ic/Keyspace1/Keyspace1-Standard1-ic-0-Digest.sha1 b/test/data/legacy-sstables/ic/Keyspace1/Keyspace1-Standard1-ic-0-Digest.sha1
deleted file mode 100644
index 91b9562..0000000
--- a/test/data/legacy-sstables/ic/Keyspace1/Keyspace1-Standard1-ic-0-Digest.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c22f034592ec31b1998083a34c1593538e8f1ea1  Keyspace1-Standard1-ic-0-Data.db
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae374107/test/data/legacy-sstables/ic/Keyspace1/Keyspace1-Standard1-ic-0-Filter.db
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/ic/Keyspace1/Keyspace1-Standard1-ic-0-Filter.db b/test/data/legacy-sstables/ic/Keyspace1/Keyspace1-Standard1-ic-0-Filter.db
deleted file mode 100644
index a3a807c..0000000
Binary files a/test/data/legacy-sstables/ic/Keyspace1/Keyspace1-Standard1-ic-0-Filter.db and
/dev/null differ

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae374107/test/data/legacy-sstables/ic/Keyspace1/Keyspace1-Standard1-ic-0-Index.db
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/ic/Keyspace1/Keyspace1-Standard1-ic-0-Index.db b/test/data/legacy-sstables/ic/Keyspace1/Keyspace1-Standard1-ic-0-Index.db
deleted file mode 100644
index 715913b..0000000
Binary files a/test/data/legacy-sstables/ic/Keyspace1/Keyspace1-Standard1-ic-0-Index.db and
/dev/null differ

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae374107/test/data/legacy-sstables/ic/Keyspace1/Keyspace1-Standard1-ic-0-Statistics.db
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/ic/Keyspace1/Keyspace1-Standard1-ic-0-Statistics.db
b/test/data/legacy-sstables/ic/Keyspace1/Keyspace1-Standard1-ic-0-Statistics.db
deleted file mode 100644
index e9d5d4b..0000000
Binary files a/test/data/legacy-sstables/ic/Keyspace1/Keyspace1-Standard1-ic-0-Statistics.db
and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae374107/test/data/legacy-sstables/ic/Keyspace1/Keyspace1-Standard1-ic-0-Summary.db
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/ic/Keyspace1/Keyspace1-Standard1-ic-0-Summary.db b/test/data/legacy-sstables/ic/Keyspace1/Keyspace1-Standard1-ic-0-Summary.db
deleted file mode 100644
index c1bc2e2..0000000
Binary files a/test/data/legacy-sstables/ic/Keyspace1/Keyspace1-Standard1-ic-0-Summary.db
and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae374107/test/data/legacy-sstables/ic/Keyspace1/Keyspace1-Standard1-ic-0-TOC.txt
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/ic/Keyspace1/Keyspace1-Standard1-ic-0-TOC.txt b/test/data/legacy-sstables/ic/Keyspace1/Keyspace1-Standard1-ic-0-TOC.txt
deleted file mode 100644
index 34b61c7..0000000
--- a/test/data/legacy-sstables/ic/Keyspace1/Keyspace1-Standard1-ic-0-TOC.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Data.db
-TOC.txt
-Index.db
-Summary.db
-Filter.db
-Statistics.db
-Digest.sha1

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae374107/test/data/legacy-sstables/jb/Keyspace1/Keyspace1-Standard1-jb-0-CRC.db
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/jb/Keyspace1/Keyspace1-Standard1-jb-0-CRC.db b/test/data/legacy-sstables/jb/Keyspace1/Keyspace1-Standard1-jb-0-CRC.db
new file mode 100644
index 0000000..0b6dab4
Binary files /dev/null and b/test/data/legacy-sstables/jb/Keyspace1/Keyspace1-Standard1-jb-0-CRC.db
differ

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae374107/test/data/legacy-sstables/jb/Keyspace1/Keyspace1-Standard1-jb-0-Data.db
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/jb/Keyspace1/Keyspace1-Standard1-jb-0-Data.db b/test/data/legacy-sstables/jb/Keyspace1/Keyspace1-Standard1-jb-0-Data.db
new file mode 100644
index 0000000..7d9407e
Binary files /dev/null and b/test/data/legacy-sstables/jb/Keyspace1/Keyspace1-Standard1-jb-0-Data.db
differ

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae374107/test/data/legacy-sstables/jb/Keyspace1/Keyspace1-Standard1-jb-0-Digest.sha1
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/jb/Keyspace1/Keyspace1-Standard1-jb-0-Digest.sha1 b/test/data/legacy-sstables/jb/Keyspace1/Keyspace1-Standard1-jb-0-Digest.sha1
new file mode 100644
index 0000000..963bd9b
--- /dev/null
+++ b/test/data/legacy-sstables/jb/Keyspace1/Keyspace1-Standard1-jb-0-Digest.sha1
@@ -0,0 +1 @@
+4a9f1896a599e4b3ff5d19600901de1a0b851bc1  Keyspace1-Standard1-jb-0-Data.db
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae374107/test/data/legacy-sstables/jb/Keyspace1/Keyspace1-Standard1-jb-0-Filter.db
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/jb/Keyspace1/Keyspace1-Standard1-jb-0-Filter.db b/test/data/legacy-sstables/jb/Keyspace1/Keyspace1-Standard1-jb-0-Filter.db
new file mode 100644
index 0000000..a3a807c
Binary files /dev/null and b/test/data/legacy-sstables/jb/Keyspace1/Keyspace1-Standard1-jb-0-Filter.db
differ

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae374107/test/data/legacy-sstables/jb/Keyspace1/Keyspace1-Standard1-jb-0-Index.db
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/jb/Keyspace1/Keyspace1-Standard1-jb-0-Index.db b/test/data/legacy-sstables/jb/Keyspace1/Keyspace1-Standard1-jb-0-Index.db
new file mode 100644
index 0000000..ee9f5fb
Binary files /dev/null and b/test/data/legacy-sstables/jb/Keyspace1/Keyspace1-Standard1-jb-0-Index.db
differ

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae374107/test/data/legacy-sstables/jb/Keyspace1/Keyspace1-Standard1-jb-0-Statistics.db
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/jb/Keyspace1/Keyspace1-Standard1-jb-0-Statistics.db
b/test/data/legacy-sstables/jb/Keyspace1/Keyspace1-Standard1-jb-0-Statistics.db
new file mode 100644
index 0000000..daec1c3
Binary files /dev/null and b/test/data/legacy-sstables/jb/Keyspace1/Keyspace1-Standard1-jb-0-Statistics.db
differ

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae374107/test/data/legacy-sstables/jb/Keyspace1/Keyspace1-Standard1-jb-0-Summary.db
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/jb/Keyspace1/Keyspace1-Standard1-jb-0-Summary.db b/test/data/legacy-sstables/jb/Keyspace1/Keyspace1-Standard1-jb-0-Summary.db
new file mode 100644
index 0000000..83c68ce
Binary files /dev/null and b/test/data/legacy-sstables/jb/Keyspace1/Keyspace1-Standard1-jb-0-Summary.db
differ

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae374107/test/data/legacy-sstables/jb/Keyspace1/Keyspace1-Standard1-jb-0-TOC.txt
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/jb/Keyspace1/Keyspace1-Standard1-jb-0-TOC.txt b/test/data/legacy-sstables/jb/Keyspace1/Keyspace1-Standard1-jb-0-TOC.txt
new file mode 100644
index 0000000..d3aa557
--- /dev/null
+++ b/test/data/legacy-sstables/jb/Keyspace1/Keyspace1-Standard1-jb-0-TOC.txt
@@ -0,0 +1,8 @@
+Index.db
+TOC.txt
+Summary.db
+Filter.db
+Statistics.db
+Data.db
+CRC.db
+Digest.sha1

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae374107/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java b/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java
index 2dc07ec..5341a4b 100644
--- a/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java
@@ -143,9 +143,18 @@ public class LegacySSTableTest extends SchemaLoader
     @Test
     public void testVersions() throws Throwable
     {
+        boolean notSkipped = false;
+
         for (File version : LEGACY_SSTABLE_ROOT.listFiles())
+        {
             if (Descriptor.Version.validate(version.getName()) && new Descriptor.Version(version.getName()).isCompatible())
+            {
+                notSkipped = true;
                 testVersion(version.getName());
+            }
+        }
+
+        assert notSkipped;
     }
 
     public void testVersion(String version) throws Throwable


Mime
View raw message