You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sn...@apache.org on 2015/09/13 14:20:28 UTC
[1/3] cassandra git commit: ninja-fix failing LegacySSTableTest
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 4b4d69f77 -> 16497fd93
refs/heads/trunk d7d7db934 -> 8564f09c1
ninja-fix failing LegacySSTableTest
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/16497fd9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/16497fd9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/16497fd9
Branch: refs/heads/cassandra-3.0
Commit: 16497fd93f01780e279dcd671f55efb96d3921ef
Parents: 4b4d69f
Author: Robert Stupp <sn...@snazy.de>
Authored: Sun Sep 13 14:18:46 2015 +0200
Committer: Robert Stupp <sn...@snazy.de>
Committed: Sun Sep 13 14:18:46 2015 +0200
----------------------------------------------------------------------
.../legacy_ma_clust/ma-1-big-CompressionInfo.db | Bin 83 -> 83 bytes
.../legacy_ma_clust/ma-1-big-Data.db | Bin 5032 -> 5045 bytes
.../legacy_ma_clust/ma-1-big-Digest.crc32 | 2 +-
.../legacy_ma_clust/ma-1-big-Statistics.db | Bin 7045 -> 7045 bytes
.../legacy_ma_clust/ma-1-big-TOC.txt | 10 +++++-----
.../ma-1-big-CompressionInfo.db | Bin 75 -> 75 bytes
.../legacy_ma_clust_counter/ma-1-big-Data.db | Bin 4427 -> 4428 bytes
.../ma-1-big-Digest.crc32 | 2 +-
.../ma-1-big-Statistics.db | Bin 7054 -> 7054 bytes
.../legacy_ma_clust_counter/ma-1-big-TOC.txt | 10 +++++-----
.../legacy_ma_simple/ma-1-big-Data.db | Bin 85 -> 85 bytes
.../legacy_ma_simple/ma-1-big-Digest.crc32 | 2 +-
.../legacy_ma_simple/ma-1-big-Statistics.db | Bin 4598 -> 4598 bytes
.../legacy_ma_simple/ma-1-big-TOC.txt | 10 +++++-----
.../legacy_ma_simple_counter/ma-1-big-Data.db | Bin 106 -> 106 bytes
.../ma-1-big-Digest.crc32 | 2 +-
.../ma-1-big-Statistics.db | Bin 4607 -> 4607 bytes
.../legacy_ma_simple_counter/ma-1-big-TOC.txt | 10 +++++-----
18 files changed, 24 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/16497fd9/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-CompressionInfo.db
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-CompressionInfo.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-CompressionInfo.db
index ba05e4b..4955d4b 100644
Binary files a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-CompressionInfo.db and b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-CompressionInfo.db differ
http://git-wip-us.apache.org/repos/asf/cassandra/blob/16497fd9/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-Data.db
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-Data.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-Data.db
index 633d0ff..f4ce9a9 100644
Binary files a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-Data.db and b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-Data.db differ
http://git-wip-us.apache.org/repos/asf/cassandra/blob/16497fd9/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-Digest.crc32
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-Digest.crc32 b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-Digest.crc32
index 6900022..7eb78a6 100644
--- a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-Digest.crc32
+++ b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-Digest.crc32
@@ -1 +1 @@
-1839244592
\ No newline at end of file
+3136403356
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cassandra/blob/16497fd9/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-Statistics.db
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-Statistics.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-Statistics.db
index 96f0d3a..7fdadbd 100644
Binary files a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-Statistics.db and b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-Statistics.db differ
http://git-wip-us.apache.org/repos/asf/cassandra/blob/16497fd9/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-TOC.txt
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-TOC.txt b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-TOC.txt
index 00915e9..a6eda71 100644
--- a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-TOC.txt
+++ b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-TOC.txt
@@ -1,8 +1,8 @@
-CompressionInfo.db
-Digest.crc32
+Data.db
Statistics.db
+Index.db
+Digest.crc32
+Filter.db
Summary.db
TOC.txt
-Data.db
-Filter.db
-Index.db
+CompressionInfo.db
http://git-wip-us.apache.org/repos/asf/cassandra/blob/16497fd9/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-CompressionInfo.db
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-CompressionInfo.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-CompressionInfo.db
index 8e679e9..11c796b 100644
Binary files a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-CompressionInfo.db and b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-CompressionInfo.db differ
http://git-wip-us.apache.org/repos/asf/cassandra/blob/16497fd9/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-Data.db
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-Data.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-Data.db
index da15165..54c6779 100644
Binary files a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-Data.db and b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-Data.db differ
http://git-wip-us.apache.org/repos/asf/cassandra/blob/16497fd9/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-Digest.crc32
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-Digest.crc32 b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-Digest.crc32
index f348e92..00efe75 100644
--- a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-Digest.crc32
+++ b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-Digest.crc32
@@ -1 +1 @@
-248029051
\ No newline at end of file
+4233302171
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cassandra/blob/16497fd9/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-Statistics.db
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-Statistics.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-Statistics.db
index 14736e2..1e23010 100644
Binary files a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-Statistics.db and b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-Statistics.db differ
http://git-wip-us.apache.org/repos/asf/cassandra/blob/16497fd9/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-TOC.txt
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-TOC.txt b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-TOC.txt
index 00915e9..a6eda71 100644
--- a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-TOC.txt
+++ b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-TOC.txt
@@ -1,8 +1,8 @@
-CompressionInfo.db
-Digest.crc32
+Data.db
Statistics.db
+Index.db
+Digest.crc32
+Filter.db
Summary.db
TOC.txt
-Data.db
-Filter.db
-Index.db
+CompressionInfo.db
http://git-wip-us.apache.org/repos/asf/cassandra/blob/16497fd9/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-Data.db
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-Data.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-Data.db
index 6412d9a..e1c7a53 100644
Binary files a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-Data.db and b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-Data.db differ
http://git-wip-us.apache.org/repos/asf/cassandra/blob/16497fd9/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-Digest.crc32
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-Digest.crc32 b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-Digest.crc32
index af43929..0c67ac7 100644
--- a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-Digest.crc32
+++ b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-Digest.crc32
@@ -1 +1 @@
-844143857
\ No newline at end of file
+2379822960
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cassandra/blob/16497fd9/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-Statistics.db
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-Statistics.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-Statistics.db
index b9fae83..96552fd 100644
Binary files a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-Statistics.db and b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-Statistics.db differ
http://git-wip-us.apache.org/repos/asf/cassandra/blob/16497fd9/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-TOC.txt
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-TOC.txt b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-TOC.txt
index 00915e9..a6eda71 100644
--- a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-TOC.txt
+++ b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-TOC.txt
@@ -1,8 +1,8 @@
-CompressionInfo.db
-Digest.crc32
+Data.db
Statistics.db
+Index.db
+Digest.crc32
+Filter.db
Summary.db
TOC.txt
-Data.db
-Filter.db
-Index.db
+CompressionInfo.db
http://git-wip-us.apache.org/repos/asf/cassandra/blob/16497fd9/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-Data.db
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-Data.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-Data.db
index 8a51930..afc7092 100644
Binary files a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-Data.db and b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-Data.db differ
http://git-wip-us.apache.org/repos/asf/cassandra/blob/16497fd9/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-Digest.crc32
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-Digest.crc32 b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-Digest.crc32
index 74b2a1e..15dd21c 100644
--- a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-Digest.crc32
+++ b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-Digest.crc32
@@ -1 +1 @@
-305582155
\ No newline at end of file
+2816492267
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cassandra/blob/16497fd9/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-Statistics.db
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-Statistics.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-Statistics.db
index c4fa2cf..9e0a949 100644
Binary files a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-Statistics.db and b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-Statistics.db differ
http://git-wip-us.apache.org/repos/asf/cassandra/blob/16497fd9/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-TOC.txt
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-TOC.txt b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-TOC.txt
index 00915e9..a6eda71 100644
--- a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-TOC.txt
+++ b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-TOC.txt
@@ -1,8 +1,8 @@
-CompressionInfo.db
-Digest.crc32
+Data.db
Statistics.db
+Index.db
+Digest.crc32
+Filter.db
Summary.db
TOC.txt
-Data.db
-Filter.db
-Index.db
+CompressionInfo.db
[2/3] cassandra git commit: ninja-fix failing LegacySSTableTest
Posted by sn...@apache.org.
ninja-fix failing LegacySSTableTest
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/16497fd9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/16497fd9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/16497fd9
Branch: refs/heads/trunk
Commit: 16497fd93f01780e279dcd671f55efb96d3921ef
Parents: 4b4d69f
Author: Robert Stupp <sn...@snazy.de>
Authored: Sun Sep 13 14:18:46 2015 +0200
Committer: Robert Stupp <sn...@snazy.de>
Committed: Sun Sep 13 14:18:46 2015 +0200
----------------------------------------------------------------------
.../legacy_ma_clust/ma-1-big-CompressionInfo.db | Bin 83 -> 83 bytes
.../legacy_ma_clust/ma-1-big-Data.db | Bin 5032 -> 5045 bytes
.../legacy_ma_clust/ma-1-big-Digest.crc32 | 2 +-
.../legacy_ma_clust/ma-1-big-Statistics.db | Bin 7045 -> 7045 bytes
.../legacy_ma_clust/ma-1-big-TOC.txt | 10 +++++-----
.../ma-1-big-CompressionInfo.db | Bin 75 -> 75 bytes
.../legacy_ma_clust_counter/ma-1-big-Data.db | Bin 4427 -> 4428 bytes
.../ma-1-big-Digest.crc32 | 2 +-
.../ma-1-big-Statistics.db | Bin 7054 -> 7054 bytes
.../legacy_ma_clust_counter/ma-1-big-TOC.txt | 10 +++++-----
.../legacy_ma_simple/ma-1-big-Data.db | Bin 85 -> 85 bytes
.../legacy_ma_simple/ma-1-big-Digest.crc32 | 2 +-
.../legacy_ma_simple/ma-1-big-Statistics.db | Bin 4598 -> 4598 bytes
.../legacy_ma_simple/ma-1-big-TOC.txt | 10 +++++-----
.../legacy_ma_simple_counter/ma-1-big-Data.db | Bin 106 -> 106 bytes
.../ma-1-big-Digest.crc32 | 2 +-
.../ma-1-big-Statistics.db | Bin 4607 -> 4607 bytes
.../legacy_ma_simple_counter/ma-1-big-TOC.txt | 10 +++++-----
18 files changed, 24 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/16497fd9/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-CompressionInfo.db
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-CompressionInfo.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-CompressionInfo.db
index ba05e4b..4955d4b 100644
Binary files a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-CompressionInfo.db and b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-CompressionInfo.db differ
http://git-wip-us.apache.org/repos/asf/cassandra/blob/16497fd9/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-Data.db
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-Data.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-Data.db
index 633d0ff..f4ce9a9 100644
Binary files a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-Data.db and b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-Data.db differ
http://git-wip-us.apache.org/repos/asf/cassandra/blob/16497fd9/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-Digest.crc32
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-Digest.crc32 b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-Digest.crc32
index 6900022..7eb78a6 100644
--- a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-Digest.crc32
+++ b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-Digest.crc32
@@ -1 +1 @@
-1839244592
\ No newline at end of file
+3136403356
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cassandra/blob/16497fd9/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-Statistics.db
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-Statistics.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-Statistics.db
index 96f0d3a..7fdadbd 100644
Binary files a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-Statistics.db and b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-Statistics.db differ
http://git-wip-us.apache.org/repos/asf/cassandra/blob/16497fd9/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-TOC.txt
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-TOC.txt b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-TOC.txt
index 00915e9..a6eda71 100644
--- a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-TOC.txt
+++ b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-TOC.txt
@@ -1,8 +1,8 @@
-CompressionInfo.db
-Digest.crc32
+Data.db
Statistics.db
+Index.db
+Digest.crc32
+Filter.db
Summary.db
TOC.txt
-Data.db
-Filter.db
-Index.db
+CompressionInfo.db
http://git-wip-us.apache.org/repos/asf/cassandra/blob/16497fd9/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-CompressionInfo.db
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-CompressionInfo.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-CompressionInfo.db
index 8e679e9..11c796b 100644
Binary files a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-CompressionInfo.db and b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-CompressionInfo.db differ
http://git-wip-us.apache.org/repos/asf/cassandra/blob/16497fd9/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-Data.db
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-Data.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-Data.db
index da15165..54c6779 100644
Binary files a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-Data.db and b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-Data.db differ
http://git-wip-us.apache.org/repos/asf/cassandra/blob/16497fd9/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-Digest.crc32
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-Digest.crc32 b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-Digest.crc32
index f348e92..00efe75 100644
--- a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-Digest.crc32
+++ b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-Digest.crc32
@@ -1 +1 @@
-248029051
\ No newline at end of file
+4233302171
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cassandra/blob/16497fd9/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-Statistics.db
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-Statistics.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-Statistics.db
index 14736e2..1e23010 100644
Binary files a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-Statistics.db and b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-Statistics.db differ
http://git-wip-us.apache.org/repos/asf/cassandra/blob/16497fd9/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-TOC.txt
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-TOC.txt b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-TOC.txt
index 00915e9..a6eda71 100644
--- a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-TOC.txt
+++ b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-TOC.txt
@@ -1,8 +1,8 @@
-CompressionInfo.db
-Digest.crc32
+Data.db
Statistics.db
+Index.db
+Digest.crc32
+Filter.db
Summary.db
TOC.txt
-Data.db
-Filter.db
-Index.db
+CompressionInfo.db
http://git-wip-us.apache.org/repos/asf/cassandra/blob/16497fd9/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-Data.db
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-Data.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-Data.db
index 6412d9a..e1c7a53 100644
Binary files a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-Data.db and b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-Data.db differ
http://git-wip-us.apache.org/repos/asf/cassandra/blob/16497fd9/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-Digest.crc32
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-Digest.crc32 b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-Digest.crc32
index af43929..0c67ac7 100644
--- a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-Digest.crc32
+++ b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-Digest.crc32
@@ -1 +1 @@
-844143857
\ No newline at end of file
+2379822960
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cassandra/blob/16497fd9/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-Statistics.db
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-Statistics.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-Statistics.db
index b9fae83..96552fd 100644
Binary files a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-Statistics.db and b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-Statistics.db differ
http://git-wip-us.apache.org/repos/asf/cassandra/blob/16497fd9/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-TOC.txt
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-TOC.txt b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-TOC.txt
index 00915e9..a6eda71 100644
--- a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-TOC.txt
+++ b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-TOC.txt
@@ -1,8 +1,8 @@
-CompressionInfo.db
-Digest.crc32
+Data.db
Statistics.db
+Index.db
+Digest.crc32
+Filter.db
Summary.db
TOC.txt
-Data.db
-Filter.db
-Index.db
+CompressionInfo.db
http://git-wip-us.apache.org/repos/asf/cassandra/blob/16497fd9/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-Data.db
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-Data.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-Data.db
index 8a51930..afc7092 100644
Binary files a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-Data.db and b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-Data.db differ
http://git-wip-us.apache.org/repos/asf/cassandra/blob/16497fd9/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-Digest.crc32
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-Digest.crc32 b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-Digest.crc32
index 74b2a1e..15dd21c 100644
--- a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-Digest.crc32
+++ b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-Digest.crc32
@@ -1 +1 @@
-305582155
\ No newline at end of file
+2816492267
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cassandra/blob/16497fd9/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-Statistics.db
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-Statistics.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-Statistics.db
index c4fa2cf..9e0a949 100644
Binary files a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-Statistics.db and b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-Statistics.db differ
http://git-wip-us.apache.org/repos/asf/cassandra/blob/16497fd9/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-TOC.txt
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-TOC.txt b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-TOC.txt
index 00915e9..a6eda71 100644
--- a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-TOC.txt
+++ b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-TOC.txt
@@ -1,8 +1,8 @@
-CompressionInfo.db
-Digest.crc32
+Data.db
Statistics.db
+Index.db
+Digest.crc32
+Filter.db
Summary.db
TOC.txt
-Data.db
-Filter.db
-Index.db
+CompressionInfo.db
[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by sn...@apache.org.
Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8564f09c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8564f09c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8564f09c
Branch: refs/heads/trunk
Commit: 8564f09c17f2d2280251031602efbf4b1b3dfc94
Parents: d7d7db9 16497fd
Author: Robert Stupp <sn...@snazy.de>
Authored: Sun Sep 13 14:19:39 2015 +0200
Committer: Robert Stupp <sn...@snazy.de>
Committed: Sun Sep 13 14:19:39 2015 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------