From cbb15e58a67b408f9cef264638bae7615b7b8e87 Mon Sep 17 00:00:00 2001
From: Sylvain Lebresne <sylvain@datastax.com>
Date: Mon, 16 Jul 2012 18:27:24 +0200
Subject: [PATCH] Regenerate sstable to fix scrub tests

---
 .../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-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 4354 -> 4349 bytes
 .../org/apache/cassandra/db/ScrubTest.java    |  22 +++++++++---------
 8 files changed, 11 insertions(+), 11 deletions(-)
 delete mode 100644 test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Data.db
 delete mode 100644 test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Filter.db
 delete mode 100644 test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Index.db
 create mode 100644 test/data/corrupt-sstables/Keyspace1-Standard3-ia-1-Data.db
 create mode 100644 test/data/corrupt-sstables/Keyspace1-Standard3-ia-1-Filter.db
 create mode 100644 test/data/corrupt-sstables/Keyspace1-Standard3-ia-1-Index.db
 rename test/data/corrupt-sstables/{Keyspace1-Standard3-hd-1-Statistics.db => Keyspace1-Standard3-ia-1-Statistics.db} (96%)

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 45300342a7fd22aa2956205833f6dff2ae38f51b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 498
zcmZQzOk{un4<ID~#LPg<$OsZ^074+B|Ns9#m;vGd<rp}M^K(=E5_3}_0uYiDBp8;M
dQ<}=am;{xeqLEe9H!_*}Mpjba$P{WD2>@F_OlklC

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 1b5e70883cff5ae1411d9d0cea79f013aa566c00..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 256
zcmYjL!4be92#cN%t}izzqc|GRj@8i`P^$5i5CRC`0&oMBL3xd5qqdpxb%SG|*YMcX
z2BiE&Hz>rz?nufBnp0xeL!;H8IpOujKmk`BXu*4j=%G%!rW!NW(KKYL0`<?3nJ0;|
G8t?(^n+Rb5

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 2cbe31921e1ff88e82e8f7edf9b7281b42330ea5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 66
pcmZQzOk{uo#v~{!n1Qhh%3Q|4m<(n9WMHg>Fd2Oq7*n9k`2d;b1!DjJ

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 0000000000000000000000000000000000000000..70e64e08a56d1602b0750271f95e3e55c62cf895
GIT binary patch
literal 354
zcmZQzOk{ungZlsf|2IH6K#Gxpqc}e|)h{tO6(PvLzzGrzOUx-vWnfH#N|2$oihQlf
N<ZG=YUuz1vS^<4mMO**?

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..7e129e3838f07b5ee556bce31f68585a2dd1a3d9
GIT binary patch
literal 256
zcmY+8Q4WJJ3`0%Tk7{4sU=b(j(K1fJk$DbmXqMbMj+0i>OVS$}1Ez&0Ojxk}2aF9P
zq*i{bN!QW}aZ9^)Yw?EK(%dWMmb2H2K=fb6Ht1wG^{C=HKBPu^Xw2u0<xT`QTW%!3
P2z2`RVj_0NyAIR|$yf&`

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..5da29149bbf363998d3716122706706d4f11487b
GIT binary patch
literal 90
rcmZQzOk_X?j7d<QHJE0sf^y3s++-+sBZONC<-UP%Qy^SMbr1~z&fx_5

literal 0
HcmV?d00001

diff --git a/test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Statistics.db b/test/data/corrupt-sstables/Keyspace1-Standard3-ia-1-Statistics.db
similarity index 96%
rename from test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Statistics.db
rename to test/data/corrupt-sstables/Keyspace1-Standard3-ia-1-Statistics.db
index 7231157387af17e813fd0fdb1158725234cb2885..ff68b08e5f7636171a951fc77304e0434586e848 100644
GIT binary patch
delta 75
zcmZot`m4CXn30if@d_@s%_i&<IW6?_i_-NH3lftvQuUG(i;ENUQi>AwQZh>PoGMFF
d{fkmki&9ep5{pVQOEUBGQi~WE7*c?k0RYb}7?=P6

delta 85
zcmeyX*rc?<m~rxQE(J!m%_q1Xux>VCpU7!zlV6msmspUPoRO-RoLF3(n3qzNsF#va
oqUW5SlapAInV0Tgl#*H$P?TDnT2uz)1|$}hWR_&+=cN__05pRj9smFU

diff --git a/test/unit/org/apache/cassandra/db/ScrubTest.java b/test/unit/org/apache/cassandra/db/ScrubTest.java
index d179ff5ee4..c5fc5d7e69 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));
+         *  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();
+         *  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);