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/18 12:37:21 UTC
[1/2] cassandra git commit: Ninja fix failing LegacySSTableTest
Repository: cassandra
Updated Branches:
refs/heads/trunk 0c3575fab -> 46c0a55ea
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/1b823ec2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1b823ec2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1b823ec2
Branch: refs/heads/trunk
Commit: 1b823ec2c1c79142625967a5dd43f8b0c4b419c0
Parents: 64e2f5d
Author: Robert Stupp <sn...@snazy.de>
Authored: Fri Sep 18 12:36:26 2015 +0200
Committer: Robert Stupp <sn...@snazy.de>
Committed: Fri Sep 18 12:36:26 2015 +0200
----------------------------------------------------------------------
.../legacy_ma_clust/ma-1-big-CompressionInfo.db | Bin 83 -> 83 bytes
.../legacy_ma_clust/ma-1-big-Data.db | Bin 5049 -> 5036 bytes
.../legacy_ma_clust/ma-1-big-Digest.crc32 | 2 +-
.../legacy_ma_clust/ma-1-big-Index.db | Bin 157553 -> 157553 bytes
.../legacy_ma_clust/ma-1-big-Statistics.db | Bin 7045 -> 7048 bytes
.../legacy_ma_clust/ma-1-big-TOC.txt | 8 ++++----
.../ma-1-big-CompressionInfo.db | Bin 75 -> 75 bytes
.../legacy_ma_clust_counter/ma-1-big-Data.db | Bin 4393 -> 4344 bytes
.../ma-1-big-Digest.crc32 | 2 +-
.../legacy_ma_clust_counter/ma-1-big-Index.db | Bin 157553 -> 157553 bytes
.../ma-1-big-Statistics.db | Bin 7054 -> 7057 bytes
.../legacy_ma_clust_counter/ma-1-big-TOC.txt | 8 ++++----
.../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 -> 4601 bytes
.../legacy_ma_simple/ma-1-big-TOC.txt | 8 ++++----
.../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 -> 4610 bytes
.../legacy_ma_simple_counter/ma-1-big-TOC.txt | 8 ++++----
20 files changed, 20 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b823ec2/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 3ef3cfe..20e807d 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/1b823ec2/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 32c6650..d078596 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/1b823ec2/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 dccca14..7e4d733 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 @@
-8667123
\ No newline at end of file
+311755797
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b823ec2/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-Index.db
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-Index.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-Index.db
index 7acec1c..c53bc1f 100644
Binary files a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-Index.db and b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-Index.db differ
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b823ec2/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 9c43cdf..3787bb6 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/1b823ec2/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 a6eda71..a60cc4c 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 @@
-Data.db
Statistics.db
-Index.db
+TOC.txt
Digest.crc32
+Index.db
Filter.db
-Summary.db
-TOC.txt
CompressionInfo.db
+Data.db
+Summary.db
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b823ec2/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 d9beadf..1359cbd 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/1b823ec2/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 a3add4a..7efdc8e 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/1b823ec2/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 ff76dda..f8c3a90 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 @@
-1871673227
\ No newline at end of file
+3537046718
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b823ec2/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-Index.db
----------------------------------------------------------------------
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-Index.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-Index.db
index 0e0bf4d..0c06cfa 100644
Binary files a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-Index.db and b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-Index.db differ
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b823ec2/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 6a9adbf..35040b7 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/1b823ec2/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 a6eda71..a60cc4c 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 @@
-Data.db
Statistics.db
-Index.db
+TOC.txt
Digest.crc32
+Index.db
Filter.db
-Summary.db
-TOC.txt
CompressionInfo.db
+Data.db
+Summary.db
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b823ec2/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 3312ada..2946bcf 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/1b823ec2/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 8960de1..c04848b 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 @@
-4191595388
\ No newline at end of file
+859600834
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b823ec2/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 cad7de8..ef4654e 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/1b823ec2/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 a6eda71..a60cc4c 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 @@
-Data.db
Statistics.db
-Index.db
+TOC.txt
Digest.crc32
+Index.db
Filter.db
-Summary.db
-TOC.txt
CompressionInfo.db
+Data.db
+Summary.db
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b823ec2/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 221484e..da52ebf 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/1b823ec2/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 6ac1679..44f3daf 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 @@
-2738692503
\ No newline at end of file
+2282193559
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b823ec2/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 a0ee5b7..c76fa95 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/1b823ec2/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 a6eda71..a60cc4c 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 @@
-Data.db
Statistics.db
-Index.db
+TOC.txt
Digest.crc32
+Index.db
Filter.db
-Summary.db
-TOC.txt
CompressionInfo.db
+Data.db
+Summary.db
[2/2] 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/46c0a55e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/46c0a55e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/46c0a55e
Branch: refs/heads/trunk
Commit: 46c0a55ea5d2f1412de8a1134da8ae5bc34c3cb3
Parents: 0c3575f 1b823ec
Author: Robert Stupp <sn...@snazy.de>
Authored: Fri Sep 18 12:36:48 2015 +0200
Committer: Robert Stupp <sn...@snazy.de>
Committed: Fri Sep 18 12:36:48 2015 +0200
----------------------------------------------------------------------
.../legacy_ma_clust/ma-1-big-CompressionInfo.db | Bin 83 -> 83 bytes
.../legacy_ma_clust/ma-1-big-Data.db | Bin 5049 -> 5036 bytes
.../legacy_ma_clust/ma-1-big-Digest.crc32 | 2 +-
.../legacy_ma_clust/ma-1-big-Index.db | Bin 157553 -> 157553 bytes
.../legacy_ma_clust/ma-1-big-Statistics.db | Bin 7045 -> 7048 bytes
.../legacy_ma_clust/ma-1-big-TOC.txt | 8 ++++----
.../ma-1-big-CompressionInfo.db | Bin 75 -> 75 bytes
.../legacy_ma_clust_counter/ma-1-big-Data.db | Bin 4393 -> 4344 bytes
.../ma-1-big-Digest.crc32 | 2 +-
.../legacy_ma_clust_counter/ma-1-big-Index.db | Bin 157553 -> 157553 bytes
.../ma-1-big-Statistics.db | Bin 7054 -> 7057 bytes
.../legacy_ma_clust_counter/ma-1-big-TOC.txt | 8 ++++----
.../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 -> 4601 bytes
.../legacy_ma_simple/ma-1-big-TOC.txt | 8 ++++----
.../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 -> 4610 bytes
.../legacy_ma_simple_counter/ma-1-big-TOC.txt | 8 ++++----
20 files changed, 20 insertions(+), 20 deletions(-)
----------------------------------------------------------------------