cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject [1/2] git commit: Copy compaction options to make sure they are reloaded.
Date Tue, 27 May 2014 08:30:11 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 7f930e027 -> 8602fe8ce


Copy compaction options to make sure they are reloaded.

Patch by pauloricardomg; reviewed by marcuse for CASSANDRA-7290


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

Branch: refs/heads/cassandra-2.1
Commit: 9376fddccf202ec0506f2a94eb0a4f6bdf4a2852
Parents: ea5b624
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Tue May 27 10:24:48 2014 +0200
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Tue May 27 10:24:48 2014 +0200

----------------------------------------------------------------------
 CHANGES.txt                                                       | 1 +
 .../cassandra/db/compaction/AbstractCompactionStrategy.java       | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9376fddc/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index b8c3963..42a1148 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,7 @@
  * Add missing iso8601 patterns for date strings (6973)
  * Support selecting multiple rows in a partition using IN (CASSANDRA-6875)
  * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274)
+ * Copy compaction options to make sure they are reloaded (CASSANDRA-7290)
 
 2.0.8
  * Always reallocate buffers in HSHA (CASSANDRA-6285)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9376fddc/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java
index 276802f..0a857b3 100644
--- a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java
+++ b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java
@@ -20,6 +20,7 @@ package org.apache.cassandra.db.compaction;
 import java.util.*;
 
 import com.google.common.base.Predicate;
+import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterables;
 import com.google.common.util.concurrent.RateLimiter;
 import org.slf4j.Logger;
@@ -76,7 +77,7 @@ public abstract class AbstractCompactionStrategy
     {
         assert cfs != null;
         this.cfs = cfs;
-        this.options = options;
+        this.options = ImmutableMap.copyOf(options);
 
         /* checks must be repeated here, as user supplied strategies might not call validateOptions
directly */
 


Mime
View raw message