[1/3] cassandra git commit: Fixup missed nit from CASSANDRA-9965
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 929438b8b - 2dfcb221c
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-3.0
Commit: 76e8eb853f4534703f5a0b6754b514e62915d65a
Parents: 5aca7d7
Author: Marcus Eriksson marc...@apache.org
Authored: Mon Aug 10 09:25:41 2015 +0200
Committer: Marcus Eriksson marc...@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(MapString, String options)
+public void setCompactionParameters(MapString, String options)
{
try
{
@@ -280,7 +280,7 @@ public class ColumnFamilyStore implements
ColumnFamilyStoreMBean
}
}
-public MapString, String getLocalCompactionStrategy()
+public MapString, String getCompactionParameters()
{
MapString, 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
[1/4] cassandra git commit: Fixup missed nit from CASSANDRA-9965
Repository: cassandra
Updated Branches:
refs/heads/trunk a1f331f17 - f03783bef
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/trunk
Commit: 76e8eb853f4534703f5a0b6754b514e62915d65a
Parents: 5aca7d7
Author: Marcus Eriksson marc...@apache.org
Authored: Mon Aug 10 09:25:41 2015 +0200
Committer: Marcus Eriksson marc...@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(MapString, String options)
+public void setCompactionParameters(MapString, String options)
{
try
{
@@ -280,7 +280,7 @@ public class ColumnFamilyStore implements
ColumnFamilyStoreMBean
}
}
-public MapString, String getLocalCompactionStrategy()
+public MapString, String getCompactionParameters()
{
MapString, 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
*/
-
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 marc...@apache.org
Authored: Mon Aug 10 09:25:41 2015 +0200
Committer: Marcus Eriksson marc...@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(MapString, String options)
+public void setCompactionParameters(MapString, String options)
{
try
{
@@ -280,7 +280,7 @@ public class ColumnFamilyStore implements
ColumnFamilyStoreMBean
}
}
-public MapString, String getLocalCompactionStrategy()
+public MapString, String getCompactionParameters()
{
MapString, 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
[1/2] cassandra git commit: Fixup missed nit from CASSANDRA-9965
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 9c3b967e7 - 2dd8101ae
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.2
Commit: 76e8eb853f4534703f5a0b6754b514e62915d65a
Parents: 5aca7d7
Author: Marcus Eriksson marc...@apache.org
Authored: Mon Aug 10 09:25:41 2015 +0200
Committer: Marcus Eriksson marc...@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(MapString, String options)
+public void setCompactionParameters(MapString, String options)
{
try
{
@@ -280,7 +280,7 @@ public class ColumnFamilyStore implements
ColumnFamilyStoreMBean
}
}
-public MapString, String getLocalCompactionStrategy()
+public MapString, String getCompactionParameters()
{
MapString, 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
