cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbros...@apache.org
Subject cassandra git commit: push down allocations to where they are needed
Date Fri, 08 Jan 2016 04:07:54 GMT
Repository: cassandra
Updated Branches:
  refs/heads/trunk 15da29f0f -> 67330bec1


push down allocations to where they are needed


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

Branch: refs/heads/trunk
Commit: 67330bec1d26e378ac47ffc65b50201f620cbe0d
Parents: 15da29f
Author: Dave Brosius <dbrosius@mebigfatguy.com>
Authored: Thu Jan 7 23:07:11 2016 -0500
Committer: Dave Brosius <dbrosius@mebigfatguy.com>
Committed: Thu Jan 7 23:07:11 2016 -0500

----------------------------------------------------------------------
 .../cassandra/db/compaction/CompactionStrategyManager.java     | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/67330bec/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java b/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java
index 067a0c1..a9d42eb 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java
@@ -178,11 +178,11 @@ public class CompactionStrategyManager implements INotificationConsumer
         if (!cfs.getPartitioner().splitter().isPresent())
             return 0;
 
-        Directories.DataDirectory[] directories = locations.getWriteableLocations();
-
         List<PartitionPosition> boundaries = StorageService.getDiskBoundaries(cfs,
locations.getWriteableLocations());
         if (boundaries == null)
         {
+            Directories.DataDirectory[] directories = locations.getWriteableLocations();
+
             // try to figure out location based on sstable directory:
             for (int i = 0; i < directories.length; i++)
             {
@@ -196,8 +196,6 @@ public class CompactionStrategyManager implements INotificationConsumer
         int pos = Collections.binarySearch(boundaries, sstable.first);
         assert pos < 0; // boundaries are .minkeybound and .maxkeybound so they should
never be equal
         return -pos - 1;
-
-
     }
 
     public void shutdown()


Mime
View raw message