cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [1/3] git commit: Avoid incremental compaction on Windows patch by Josh McKenzie; reviewed by jbellis for CASSANDRA-7365
Date Thu, 12 Jun 2014 19:58:30 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 b4b3d8012 -> 61b13b0e6
  refs/heads/trunk 7349ec2aa -> 542e71c26


Avoid incremental compaction on Windows
patch by Josh McKenzie; reviewed by jbellis for CASSANDRA-7365


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

Branch: refs/heads/cassandra-2.1
Commit: 61b13b0e6a8396e77f37f5c86b33fbaf9e4546c3
Parents: b4b3d80
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Thu Jun 12 14:57:12 2014 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Thu Jun 12 14:58:16 2014 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/61b13b0e/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 1b320fb..199a0ea 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.0
+ * Avoid incremental compaction on Windows (CASSANDRA-7365)
  * Fix exception when querying a composite-keyed table with a collection index
    (CASSANDRA-7372)
  * Use node's host id in place of counter ids (CASSANDRA-7366)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/61b13b0e/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java b/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java
index 4f8548c..4055b42 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java
@@ -36,6 +36,7 @@ import org.apache.cassandra.db.RowIndexEntry;
 import org.apache.cassandra.db.compaction.AbstractCompactedRow;
 import org.apache.cassandra.db.compaction.OperationType;
 import org.apache.cassandra.utils.CLibrary;
+import org.apache.cassandra.utils.FBUtilities;
 
 /**
  * Wraps one or more writers as output for rewriting one or more readers: every sstable_preemptive_open_interval_in_mb
@@ -158,7 +159,7 @@ public class SSTableRewriter
 
     private void maybeReopenEarly(DecoratedKey key)
     {
-        if (writer.getFilePointer() - currentlyOpenedEarlyAt > preemptiveOpenInterval)
+        if (FBUtilities.isUnix() && writer.getFilePointer() - currentlyOpenedEarlyAt
> preemptiveOpenInterval)
         {
             if (isOffline)
             {


Mime
View raw message