You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by bl...@apache.org on 2015/11/27 13:19:48 UTC
[1/4] cassandra git commit: Serialize on disk the proper SSTable
compression ratio
Repository: cassandra
Updated Branches:
refs/heads/trunk f5e6f4edd -> d00d091c6
Serialize on disk the proper SSTable compression ratio
patch by Benjamin Lerer; reviewed by Marcus Eriksson for CASSANDRA-10775
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e7116f22
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e7116f22
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e7116f22
Branch: refs/heads/trunk
Commit: e7116f22cccdc91fa1d84e5e910af5c7a4393478
Parents: d44dbe1
Author: Benjamin Lerer <b....@gmail.com>
Authored: Fri Nov 27 13:12:03 2015 +0100
Committer: Benjamin Lerer <b....@gmail.com>
Committed: Fri Nov 27 13:12:03 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/io/sstable/format/big/BigTableWriter.java | 4 +---
2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e7116f22/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 39ce927..7281bd3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.4
+ * Serialize on disk the proper SSTable compression ratio (CASSANDRA-10775)
* Reject index queries while the index is building (CASSANDRA-8505)
* CQL.textile syntax incorrectly includes optional keyspace for aggregate SFUNC and FINALFUNC (CASSANDRA-10747)
* Fix JSON update with prepared statements (CASSANDRA-10631)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e7116f22/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java b/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java
index 01e939c..d064e69 100644
--- a/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java
@@ -368,13 +368,11 @@ public class BigTableWriter extends SSTableWriter
// finalise our state on disk, including renaming
protected void doPrepare()
{
- Map<MetadataType, MetadataComponent> metadataComponents = finalizeMetadata();
-
iwriter.prepareToCommit();
// write sstable statistics
dataFile.setDescriptor(descriptor).prepareToCommit();
- writeMetadata(descriptor, metadataComponents);
+ writeMetadata(descriptor, finalizeMetadata());
// save the table of components
SSTable.appendTOC(descriptor, components);
[4/4] cassandra git commit: Merge branch 'cassandra-3.1' into trunk
Posted by bl...@apache.org.
Merge branch 'cassandra-3.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d00d091c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d00d091c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d00d091c
Branch: refs/heads/trunk
Commit: d00d091c6329c4c3d3b157e2dc3e4eb5ff1ac0d1
Parents: f5e6f4e 17e13e5
Author: Benjamin Lerer <b....@gmail.com>
Authored: Fri Nov 27 13:19:15 2015 +0100
Committer: Benjamin Lerer <b....@gmail.com>
Committed: Fri Nov 27 13:19:21 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/io/sstable/format/big/BigTableWriter.java | 4 +---
2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d00d091c/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d00d091c/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java
----------------------------------------------------------------------
[3/4] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.1
Posted by bl...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/17e13e5c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/17e13e5c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/17e13e5c
Branch: refs/heads/trunk
Commit: 17e13e5cf5aaf45c403a96de8d38cda091c20d2e
Parents: 21a7a1c c35af2a
Author: Benjamin Lerer <b....@gmail.com>
Authored: Fri Nov 27 13:17:29 2015 +0100
Committer: Benjamin Lerer <b....@gmail.com>
Committed: Fri Nov 27 13:17:46 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/io/sstable/format/big/BigTableWriter.java | 4 +---
2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/17e13e5c/CHANGES.txt
----------------------------------------------------------------------
[2/4] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by bl...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c35af2a7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c35af2a7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c35af2a7
Branch: refs/heads/trunk
Commit: c35af2a7a16b4df2032c5134abc535d73e561d0b
Parents: b166f5f e7116f2
Author: Benjamin Lerer <b....@gmail.com>
Authored: Fri Nov 27 13:16:29 2015 +0100
Committer: Benjamin Lerer <b....@gmail.com>
Committed: Fri Nov 27 13:16:29 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/io/sstable/format/big/BigTableWriter.java | 4 +---
2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c35af2a7/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 472ed45,7281bd3..97c0eae
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,16 -1,5 +1,17 @@@
-2.2.4
+3.0.1
+ * Fix SELECT statement with IN restrictions on partition key,
+ ORDER BY and LIMIT (CASSANDRA-10729)
+ * Improve stress performance over 1k threads (CASSANDRA-7217)
+ * Wait for migration responses to complete before bootstrapping (CASSANDRA-10731)
+ * Unable to create a function with argument of type Inet (CASSANDRA-10741)
+ * Fix backward incompatibiliy in CqlInputFormat (CASSANDRA-10717)
+ * Correctly preserve deletion info on updated rows when notifying indexers
+ of single-row deletions (CASSANDRA-10694)
+ * Notify indexers of partition delete during cleanup (CASSANDRA-10685)
+ * Keep the file open in trySkipCache (CASSANDRA-10669)
+ * Updated trigger example (CASSANDRA-10257)
+Merged from 2.2:
+ * Serialize on disk the proper SSTable compression ratio (CASSANDRA-10775)
* Reject index queries while the index is building (CASSANDRA-8505)
* CQL.textile syntax incorrectly includes optional keyspace for aggregate SFUNC and FINALFUNC (CASSANDRA-10747)
* Fix JSON update with prepared statements (CASSANDRA-10631)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c35af2a7/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java
----------------------------------------------------------------------