cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject cassandra git commit: Use the correct repairedAt value when closing writer
Date Wed, 07 Jan 2015 13:12:36 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 55750e07d -> 2afe0e880


Use the correct repairedAt value when closing writer

Patch by marcuse; reviewed by benedict for CASSANDRA-8570


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2afe0e88
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2afe0e88
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2afe0e88

Branch: refs/heads/cassandra-2.1
Commit: 2afe0e8803752b38aa6c803b818e21434034678a
Parents: 55750e0
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Wed Jan 7 13:52:31 2015 +0100
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Wed Jan 7 14:07:48 2015 +0100

----------------------------------------------------------------------
 CHANGES.txt                                                 | 1 +
 src/java/org/apache/cassandra/io/sstable/SSTableWriter.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2afe0e88/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 372972d..1f93bf5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.3
+ * Use the correct repairedAt value when closing writer (CASSANDRA-8570)
  * (cqlsh) Handle a schema mismatch being detected on startup (CASSANDRA-8512)
  * Properly calculate expected write size during compaction (CASSANDRA-8532)
  * Invalidate affected prepared statements when a table's columns

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2afe0e88/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java b/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
index b0365ad..5f78132 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
@@ -463,7 +463,7 @@ public class SSTableWriter extends SSTable
     {
         Pair<Descriptor, StatsMetadata> p;
 
-        p = close(finishType, repairedAt);
+        p = close(finishType, repairedAt < 0 ? this.repairedAt : repairedAt);
         Descriptor desc = p.left;
         StatsMetadata metadata = p.right;
 


Mime
View raw message