cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject [3/4] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Date Mon, 24 Nov 2014 09:39:32 GMT
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/db/compaction/CompactionTask.java


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

Branch: refs/heads/trunk
Commit: cd4f729e9d2328564a77ac7bc52a392edd3d2b82
Parents: be0b451 0d01c36
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Mon Nov 24 10:37:13 2014 +0100
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Mon Nov 24 10:37:13 2014 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 src/java/org/apache/cassandra/db/Memtable.java  |  6 +++--
 .../cassandra/db/compaction/CompactionTask.java |  9 ++++----
 .../cassandra/io/util/DiskAwareRunnable.java    | 23 ++------------------
 4 files changed, 11 insertions(+), 28 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd4f729e/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd4f729e/src/java/org/apache/cassandra/db/Memtable.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd4f729e/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionTask.java
index 808626b,0e8900d..1abb4ee
--- a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
@@@ -181,7 -173,7 +181,7 @@@ public class CompactionTask extends Abs
                          return;
                      }
  
-                     writer.switchWriter(createCompactionWriter(sstableDirectory, keysPerSSTable,
minRepairedAt, sstableFormat));
 -                    writer.switchWriter(createCompactionWriter(cfs.directories.getLocationForDisk(getWriteDirectory(estimatedTotalKeys/estimatedSSTables)),
keysPerSSTable, minRepairedAt));
++                    writer.switchWriter(createCompactionWriter(cfs.directories.getLocationForDisk(getWriteDirectory(estimatedTotalKeys/estimatedSSTables)),
keysPerSSTable, minRepairedAt, sstableFormat));
                      while (iter.hasNext())
                      {
                          if (ci.isStopRequested())
@@@ -193,7 -185,7 +193,7 @@@
                              totalKeysWritten++;
                              if (newSSTableSegmentThresholdReached(writer.currentWriter()))
                              {
-                                 writer.switchWriter(createCompactionWriter(sstableDirectory,
keysPerSSTable, minRepairedAt, sstableFormat));
 -                                writer.switchWriter(createCompactionWriter(cfs.directories.getLocationForDisk(getWriteDirectory(estimatedTotalKeys/estimatedSSTables)),
keysPerSSTable, minRepairedAt));
++                                writer.switchWriter(createCompactionWriter(cfs.directories.getLocationForDisk(getWriteDirectory(estimatedTotalKeys/estimatedSSTables)),
keysPerSSTable, minRepairedAt, sstableFormat));
                              }
                          }
  


Mime
View raw message