cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ble...@apache.org
Subject [1/3] cassandra git commit: Serialize on disk the proper SSTable compression ratio
Date Fri, 27 Nov 2015 12:17:51 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.1 21a7a1c09 -> 17e13e5cf


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/cassandra-3.1
Commit: e7116f22cccdc91fa1d84e5e910af5c7a4393478
Parents: d44dbe1
Author: Benjamin Lerer <b.lerer@gmail.com>
Authored: Fri Nov 27 13:12:03 2015 +0100
Committer: Benjamin Lerer <b.lerer@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);


Mime
View raw message