You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2015/08/10 09:34:24 UTC
cassandra git commit: Fixup missed nit from CASSANDRA-9965
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 5aca7d79a -> 76e8eb853
Fixup missed nit from CASSANDRA-9965
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/76e8eb85
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/76e8eb85
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/76e8eb85
Branch: refs/heads/cassandra-2.1
Commit: 76e8eb853f4534703f5a0b6754b514e62915d65a
Parents: 5aca7d7
Author: Marcus Eriksson <ma...@apache.org>
Authored: Mon Aug 10 09:25:41 2015 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Mon Aug 10 09:25:41 2015 +0200
----------------------------------------------------------------------
NEWS.txt | 2 +-
src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 12 ++++++------
.../org/apache/cassandra/db/ColumnFamilyStoreMBean.java | 12 ++++++------
.../cassandra/db/compaction/CompactionsCQLTest.java | 10 +++++-----
4 files changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/76e8eb85/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index f6e2665..297bf40 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -25,7 +25,7 @@ Upgrading
performance implications. This can be enabled again with the
commitlog_segment_recycling option in your cassandra.yaml
- JMX methods set/getCompactionStrategyClass have been deprecated, use
- set/getLocalCompactionStrategy/set/getLocalCompactionStrategyJson instead
+ set/getCompactionParameters/set/getCompactionParametersJson instead
2.1.8
=====
http://git-wip-us.apache.org/repos/asf/cassandra/blob/76e8eb85/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index f8d796e..7364528 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -252,17 +252,17 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
};
}
- public void setLocalCompactionStrategyJson(String options)
+ public void setCompactionParametersJson(String options)
{
- setLocalCompactionStrategy(FBUtilities.fromJsonMap(options));
+ setCompactionParameters(FBUtilities.fromJsonMap(options));
}
- public String getLocalCompactionStrategyJson()
+ public String getCompactionParametersJson()
{
- return FBUtilities.json(getLocalCompactionStrategy());
+ return FBUtilities.json(getCompactionParameters());
}
- public void setLocalCompactionStrategy(Map<String, String> options)
+ public void setCompactionParameters(Map<String, String> options)
{
try
{
@@ -280,7 +280,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
}
}
- public Map<String, String> getLocalCompactionStrategy()
+ public Map<String, String> getCompactionParameters()
{
Map<String, String> options = new HashMap<>(compactionStrategyWrapper.options);
options.put("class", compactionStrategyWrapper.getName());
http://git-wip-us.apache.org/repos/asf/cassandra/blob/76e8eb85/src/java/org/apache/cassandra/db/ColumnFamilyStoreMBean.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStoreMBean.java b/src/java/org/apache/cassandra/db/ColumnFamilyStoreMBean.java
index e292be4..b2ab1e1 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStoreMBean.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStoreMBean.java
@@ -311,24 +311,24 @@ public interface ColumnFamilyStoreMBean
public void setMaximumCompactionThreshold(int threshold);
/**
- * Sets the compaction strategy locally for this node
+ * Sets the compaction parameters locally for this node
*
* Note that this will be set until an ALTER with compaction = {..} is executed or the node is restarted
*
* @param options compaction options with the same syntax as when doing ALTER ... WITH compaction = {..}
*/
- public void setLocalCompactionStrategyJson(String options);
- public String getLocalCompactionStrategyJson();
+ public void setCompactionParametersJson(String options);
+ public String getCompactionParametersJson();
/**
- * Sets the compaction strategy locally for this node
+ * Sets the compaction parameters locally for this node
*
* Note that this will be set until an ALTER with compaction = {..} is executed or the node is restarted
*
* @param options compaction options map
*/
- public void setLocalCompactionStrategy(Map<String, String> options);
- public Map<String, String> getLocalCompactionStrategy();
+ public void setCompactionParameters(Map<String, String> options);
+ public Map<String, String> getCompactionParameters();
/**
* Sets the compaction strategy by class name
* @param className the name of the compaction strategy class
http://git-wip-us.apache.org/repos/asf/cassandra/blob/76e8eb85/test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java b/test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java
index 2798689..46ade76 100644
--- a/test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java
@@ -151,7 +151,7 @@ public class CompactionsCQLTest extends CQLTester
createTable("CREATE TABLE %s (id text PRIMARY KEY)");
Map<String, String> localOptions = new HashMap<>();
localOptions.put("class", "DateTieredCompactionStrategy");
- getCurrentColumnFamilyStore().setLocalCompactionStrategy(localOptions);
+ getCurrentColumnFamilyStore().setCompactionParameters(localOptions);
WrappingCompactionStrategy wrappingCompactionStrategy = (WrappingCompactionStrategy) getCurrentColumnFamilyStore().getCompactionStrategy();
assertTrue(verifyStrategies(wrappingCompactionStrategy, DateTieredCompactionStrategy.class));
// altering something non-compaction related
@@ -172,12 +172,12 @@ public class CompactionsCQLTest extends CQLTester
Map<String, String> localOptions = new HashMap<>();
localOptions.put("class", "DateTieredCompactionStrategy");
localOptions.put("enabled", "false");
- getCurrentColumnFamilyStore().setLocalCompactionStrategy(localOptions);
+ getCurrentColumnFamilyStore().setCompactionParameters(localOptions);
assertFalse(getCurrentColumnFamilyStore().getCompactionStrategy().isEnabled());
localOptions.clear();
localOptions.put("class", "DateTieredCompactionStrategy");
// localOptions.put("enabled", "true"); - this is default!
- getCurrentColumnFamilyStore().setLocalCompactionStrategy(localOptions);
+ getCurrentColumnFamilyStore().setCompactionParameters(localOptions);
assertTrue(getCurrentColumnFamilyStore().getCompactionStrategy().isEnabled());
}
@@ -192,7 +192,7 @@ public class CompactionsCQLTest extends CQLTester
getCurrentColumnFamilyStore().disableAutoCompaction();
assertFalse(getCurrentColumnFamilyStore().getCompactionStrategy().isEnabled());
- getCurrentColumnFamilyStore().setLocalCompactionStrategy(localOptions);
+ getCurrentColumnFamilyStore().setCompactionParameters(localOptions);
assertTrue(getCurrentColumnFamilyStore().getCompactionStrategy().isEnabled());
}
@@ -206,7 +206,7 @@ public class CompactionsCQLTest extends CQLTester
Map<String, String> localOptions = new HashMap<>();
localOptions.put("class","SizeTieredCompactionStrategy");
localOptions.put("sstable_size_in_mb","1234"); // not for STCS
- getCurrentColumnFamilyStore().setLocalCompactionStrategy(localOptions);
+ getCurrentColumnFamilyStore().setCompactionParameters(localOptions);
}
public boolean verifyStrategies(WrappingCompactionStrategy wrappingStrategy, Class<? extends AbstractCompactionStrategy> expected)