You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2012/07/27 17:19:39 UTC
[42/50] [abbrv] git commit: Regenerate sstable to fix scrub tests
Regenerate sstable to fix scrub tests
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cbb15e58
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cbb15e58
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cbb15e58
Branch: refs/heads/cassandra-1.1
Commit: cbb15e58a67b408f9cef264638bae7615b7b8e87
Parents: 91bdf7f
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Mon Jul 16 18:27:24 2012 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Mon Jul 16 18:27:24 2012 +0200
----------------------------------------------------------------------
.../Keyspace1-Standard3-hd-1-Data.db | Bin 498 -> 0 bytes
.../Keyspace1-Standard3-hd-1-Filter.db | Bin 256 -> 0 bytes
.../Keyspace1-Standard3-hd-1-Index.db | Bin 66 -> 0 bytes
.../Keyspace1-Standard3-hd-1-Statistics.db | Bin 4354 -> 0 bytes
.../Keyspace1-Standard3-ia-1-Data.db | Bin 0 -> 354 bytes
.../Keyspace1-Standard3-ia-1-Filter.db | Bin 0 -> 256 bytes
.../Keyspace1-Standard3-ia-1-Index.db | Bin 0 -> 90 bytes
.../Keyspace1-Standard3-ia-1-Statistics.db | Bin 0 -> 4349 bytes
test/unit/org/apache/cassandra/db/ScrubTest.java | 24 +++++++-------
9 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cbb15e58/test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Data.db
----------------------------------------------------------------------
diff --git a/test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Data.db b/test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Data.db
deleted file mode 100644
index 4530034..0000000
Binary files a/test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Data.db and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cbb15e58/test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Filter.db
----------------------------------------------------------------------
diff --git a/test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Filter.db b/test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Filter.db
deleted file mode 100644
index 1b5e708..0000000
Binary files a/test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Filter.db and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cbb15e58/test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Index.db
----------------------------------------------------------------------
diff --git a/test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Index.db b/test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Index.db
deleted file mode 100644
index 2cbe319..0000000
Binary files a/test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Index.db and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cbb15e58/test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Statistics.db
----------------------------------------------------------------------
diff --git a/test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Statistics.db b/test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Statistics.db
deleted file mode 100644
index 7231157..0000000
Binary files a/test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Statistics.db and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cbb15e58/test/data/corrupt-sstables/Keyspace1-Standard3-ia-1-Data.db
----------------------------------------------------------------------
diff --git a/test/data/corrupt-sstables/Keyspace1-Standard3-ia-1-Data.db b/test/data/corrupt-sstables/Keyspace1-Standard3-ia-1-Data.db
new file mode 100644
index 0000000..70e64e0
Binary files /dev/null and b/test/data/corrupt-sstables/Keyspace1-Standard3-ia-1-Data.db differ
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cbb15e58/test/data/corrupt-sstables/Keyspace1-Standard3-ia-1-Filter.db
----------------------------------------------------------------------
diff --git a/test/data/corrupt-sstables/Keyspace1-Standard3-ia-1-Filter.db b/test/data/corrupt-sstables/Keyspace1-Standard3-ia-1-Filter.db
new file mode 100644
index 0000000..7e129e3
Binary files /dev/null and b/test/data/corrupt-sstables/Keyspace1-Standard3-ia-1-Filter.db differ
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cbb15e58/test/data/corrupt-sstables/Keyspace1-Standard3-ia-1-Index.db
----------------------------------------------------------------------
diff --git a/test/data/corrupt-sstables/Keyspace1-Standard3-ia-1-Index.db b/test/data/corrupt-sstables/Keyspace1-Standard3-ia-1-Index.db
new file mode 100644
index 0000000..5da2914
Binary files /dev/null and b/test/data/corrupt-sstables/Keyspace1-Standard3-ia-1-Index.db differ
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cbb15e58/test/data/corrupt-sstables/Keyspace1-Standard3-ia-1-Statistics.db
----------------------------------------------------------------------
diff --git a/test/data/corrupt-sstables/Keyspace1-Standard3-ia-1-Statistics.db b/test/data/corrupt-sstables/Keyspace1-Standard3-ia-1-Statistics.db
new file mode 100644
index 0000000..ff68b08
Binary files /dev/null and b/test/data/corrupt-sstables/Keyspace1-Standard3-ia-1-Statistics.db differ
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cbb15e58/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 d179ff5..c5fc5d7 100644
--- a/test/unit/org/apache/cassandra/db/ScrubTest.java
+++ b/test/unit/org/apache/cassandra/db/ScrubTest.java
@@ -182,20 +182,20 @@ public class ScrubTest extends SchemaLoader
ColumnFamilyStore cfs = table.getColumnFamilyStore(columnFamily);
/*
- * Code used to generate an outOfOrder sstable. The test must be run without assertions for this to work.
+ * Code used to generate an outOfOrder sstable. The test for out-of-order key in SSTableWriter must also be commented out.
* The test also assumes an ordered partitioner.
*
- * ColumnFamily cf = ColumnFamily.create(TABLE, columnFamily);
- * cf.addColumn(new Column(ByteBufferUtil.bytes("someName"), ByteBufferUtil.bytes("someValue"), 0L));
-
- * SSTableWriter writer = cfs.createCompactionWriter((long)DatabaseDescriptor.getIndexInterval(), new File("."), Collections.<SSTableReader>emptyList());
- * writer.append(Util.dk("a"), cf);
- * writer.append(Util.dk("b"), cf);
- * writer.append(Util.dk("z"), cf);
- * writer.append(Util.dk("c"), cf);
- * writer.append(Util.dk("y"), cf);
- * writer.append(Util.dk("d"), cf);
- * writer.closeAndOpenReader();
+ * ColumnFamily cf = ColumnFamily.create(TABLE, columnFamily);
+ * cf.addColumn(new Column(ByteBufferUtil.bytes("someName"), ByteBufferUtil.bytes("someValue"), 0L));
+
+ * SSTableWriter writer = cfs.createCompactionWriter((long)DatabaseDescriptor.getIndexInterval(), new File("."), Collections.<SSTableReader>emptyList());
+ * writer.append(Util.dk("a"), cf);
+ * writer.append(Util.dk("b"), cf);
+ * writer.append(Util.dk("z"), cf);
+ * writer.append(Util.dk("c"), cf);
+ * writer.append(Util.dk("y"), cf);
+ * writer.append(Util.dk("d"), cf);
+ * writer.closeAndOpenReader();
*/
copySSTables(columnFamily);