You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2015/11/30 17:32:11 UTC
[01/10] cassandra git commit: Add deprecation messages to
StorageServiceMBean.forceRepair* methods
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 0ee8895b2 -> a013f3e05
refs/heads/cassandra-3.0 4c56c89a1 -> 44164bc3a
refs/heads/cassandra-3.1 5de5d06a4 -> b2b4f1550
refs/heads/trunk 4a4afa79c -> 19ff0e412
Add deprecation messages to StorageServiceMBean.forceRepair* methods
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a013f3e0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a013f3e0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a013f3e0
Branch: refs/heads/cassandra-2.2
Commit: a013f3e05aebb3e4b6c4d2a19bbd6f2a95df6208
Parents: 0ee8895
Author: Paulo Motta <pa...@gmail.com>
Authored: Mon Nov 30 07:51:41 2015 -0800
Committer: Yuki Morishita <yu...@apache.org>
Committed: Mon Nov 30 10:30:27 2015 -0600
----------------------------------------------------------------------
.../cassandra/service/StorageServiceMBean.java | 22 +++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a013f3e0/src/java/org/apache/cassandra/service/StorageServiceMBean.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageServiceMBean.java b/src/java/org/apache/cassandra/service/StorageServiceMBean.java
index 00060ae..b7784d6 100644
--- a/src/java/org/apache/cassandra/service/StorageServiceMBean.java
+++ b/src/java/org/apache/cassandra/service/StorageServiceMBean.java
@@ -299,8 +299,11 @@ public interface StorageServiceMBean extends NotificationEmitter
*/
public int repairAsync(String keyspace, Map<String, String> options);
+ /**
+ * @deprecated use {@link #repairAsync(String keyspace, Map options)} instead.
+ */
@Deprecated
- public int forceRepairAsync(String keyspace, boolean isSequential, Collection<String> dataCenters, Collection<String> hosts, boolean primaryRange, boolean repairedAt, String... columnFamilies) throws IOException;
+ public int forceRepairAsync(String keyspace, boolean isSequential, Collection<String> dataCenters, Collection<String> hosts, boolean primaryRange, boolean fullRepair, String... columnFamilies) throws IOException;
/**
* Invoke repair asynchronously.
@@ -309,28 +312,41 @@ public interface StorageServiceMBean extends NotificationEmitter
* type: "repair"
* userObject: int array of length 2, [0]=command number, [1]=ordinal of ActiveRepairService.Status
*
+ * @deprecated use {@link #repairAsync(String keyspace, Map options)} instead.
+ *
* @param parallelismDegree 0: sequential, 1: parallel, 2: DC parallel
* @return Repair command number, or 0 if nothing to repair
*/
@Deprecated
public int forceRepairAsync(String keyspace, int parallelismDegree, Collection<String> dataCenters, Collection<String> hosts, boolean primaryRange, boolean fullRepair, String... columnFamilies);
+ /**
+ * @deprecated use {@link #repairAsync(String keyspace, Map options)} instead.
+ */
@Deprecated
- public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, boolean isSequential, Collection<String> dataCenters, Collection<String> hosts, boolean repairedAt, String... columnFamilies) throws IOException;
+ public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, boolean isSequential, Collection<String> dataCenters, Collection<String> hosts, boolean fullRepair, String... columnFamilies) throws IOException;
/**
* Same as forceRepairAsync, but handles a specified range
*
+ * @deprecated use {@link #repairAsync(String keyspace, Map options)} instead.
+ *
* @param parallelismDegree 0: sequential, 1: parallel, 2: DC parallel
*/
@Deprecated
public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, int parallelismDegree, Collection<String> dataCenters, Collection<String> hosts, boolean fullRepair, String... columnFamilies);
+ /**
+ * @deprecated use {@link #repairAsync(String keyspace, Map options)} instead.
+ */
@Deprecated
public int forceRepairAsync(String keyspace, boolean isSequential, boolean isLocal, boolean primaryRange, boolean fullRepair, String... columnFamilies);
+ /**
+ * @deprecated use {@link #repairAsync(String keyspace, Map options)} instead.
+ */
@Deprecated
- public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, boolean isSequential, boolean isLocal, boolean repairedAt, String... columnFamilies);
+ public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, boolean isSequential, boolean isLocal, boolean fullRepair, String... columnFamilies);
public void forceTerminateAllRepairSessions();
[06/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by yu...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/44164bc3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/44164bc3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/44164bc3
Branch: refs/heads/cassandra-3.0
Commit: 44164bc3ab80db1abe2918245faecce92f2ce74a
Parents: 4c56c89 a013f3e
Author: Yuki Morishita <yu...@apache.org>
Authored: Mon Nov 30 10:31:37 2015 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Mon Nov 30 10:31:37 2015 -0600
----------------------------------------------------------------------
.../cassandra/service/StorageServiceMBean.java | 22 +++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/44164bc3/src/java/org/apache/cassandra/service/StorageServiceMBean.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageServiceMBean.java
index 7f88890,b7784d6..64e60fd
--- a/src/java/org/apache/cassandra/service/StorageServiceMBean.java
+++ b/src/java/org/apache/cassandra/service/StorageServiceMBean.java
@@@ -299,8 -299,11 +299,11 @@@ public interface StorageServiceMBean ex
*/
public int repairAsync(String keyspace, Map<String, String> options);
+ /**
+ * @deprecated use {@link #repairAsync(String keyspace, Map options)} instead.
+ */
@Deprecated
- public int forceRepairAsync(String keyspace, boolean isSequential, Collection<String> dataCenters, Collection<String> hosts, boolean primaryRange, boolean repairedAt, String... tableNames) throws IOException;
- public int forceRepairAsync(String keyspace, boolean isSequential, Collection<String> dataCenters, Collection<String> hosts, boolean primaryRange, boolean fullRepair, String... columnFamilies) throws IOException;
++ public int forceRepairAsync(String keyspace, boolean isSequential, Collection<String> dataCenters, Collection<String> hosts, boolean primaryRange, boolean fullRepair, String... tableNames) throws IOException;
/**
* Invoke repair asynchronously.
@@@ -313,10 -318,13 +318,13 @@@
* @return Repair command number, or 0 if nothing to repair
*/
@Deprecated
- public int forceRepairAsync(String keyspace, int parallelismDegree, Collection<String> dataCenters, Collection<String> hosts, boolean primaryRange, boolean fullRepair, String... columnFamilies);
+ public int forceRepairAsync(String keyspace, int parallelismDegree, Collection<String> dataCenters, Collection<String> hosts, boolean primaryRange, boolean fullRepair, String... tableNames);
+ /**
+ * @deprecated use {@link #repairAsync(String keyspace, Map options)} instead.
+ */
@Deprecated
- public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, boolean isSequential, Collection<String> dataCenters, Collection<String> hosts, boolean repairedAt, String... tableNames) throws IOException;
- public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, boolean isSequential, Collection<String> dataCenters, Collection<String> hosts, boolean fullRepair, String... columnFamilies) throws IOException;
++ public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, boolean isSequential, Collection<String> dataCenters, Collection<String> hosts, boolean fullRepair, String... tableNames) throws IOException;
/**
* Same as forceRepairAsync, but handles a specified range
@@@ -324,13 -334,19 +334,19 @@@
* @param parallelismDegree 0: sequential, 1: parallel, 2: DC parallel
*/
@Deprecated
- public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, int parallelismDegree, Collection<String> dataCenters, Collection<String> hosts, boolean fullRepair, String... columnFamilies);
+ public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, int parallelismDegree, Collection<String> dataCenters, Collection<String> hosts, boolean fullRepair, String... tableNames);
+ /**
+ * @deprecated use {@link #repairAsync(String keyspace, Map options)} instead.
+ */
@Deprecated
- public int forceRepairAsync(String keyspace, boolean isSequential, boolean isLocal, boolean primaryRange, boolean fullRepair, String... columnFamilies);
+ public int forceRepairAsync(String keyspace, boolean isSequential, boolean isLocal, boolean primaryRange, boolean fullRepair, String... tableNames);
+ /**
+ * @deprecated use {@link #repairAsync(String keyspace, Map options)} instead.
+ */
@Deprecated
- public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, boolean isSequential, boolean isLocal, boolean repairedAt, String... tableNames);
- public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, boolean isSequential, boolean isLocal, boolean fullRepair, String... columnFamilies);
++ public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, boolean isSequential, boolean isLocal, boolean fullRepair, String... tableNames);
public void forceTerminateAllRepairSessions();
[10/10] cassandra git commit: Merge branch 'cassandra-3.1' into trunk
Posted by yu...@apache.org.
Merge branch 'cassandra-3.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/19ff0e41
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/19ff0e41
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/19ff0e41
Branch: refs/heads/trunk
Commit: 19ff0e4125eef93dddb5fff995a2695511bf9302
Parents: 4a4afa7 b2b4f15
Author: Yuki Morishita <yu...@apache.org>
Authored: Mon Nov 30 10:31:53 2015 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Mon Nov 30 10:31:53 2015 -0600
----------------------------------------------------------------------
.../cassandra/service/StorageServiceMBean.java | 22 +++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[05/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by yu...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/44164bc3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/44164bc3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/44164bc3
Branch: refs/heads/cassandra-3.1
Commit: 44164bc3ab80db1abe2918245faecce92f2ce74a
Parents: 4c56c89 a013f3e
Author: Yuki Morishita <yu...@apache.org>
Authored: Mon Nov 30 10:31:37 2015 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Mon Nov 30 10:31:37 2015 -0600
----------------------------------------------------------------------
.../cassandra/service/StorageServiceMBean.java | 22 +++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/44164bc3/src/java/org/apache/cassandra/service/StorageServiceMBean.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageServiceMBean.java
index 7f88890,b7784d6..64e60fd
--- a/src/java/org/apache/cassandra/service/StorageServiceMBean.java
+++ b/src/java/org/apache/cassandra/service/StorageServiceMBean.java
@@@ -299,8 -299,11 +299,11 @@@ public interface StorageServiceMBean ex
*/
public int repairAsync(String keyspace, Map<String, String> options);
+ /**
+ * @deprecated use {@link #repairAsync(String keyspace, Map options)} instead.
+ */
@Deprecated
- public int forceRepairAsync(String keyspace, boolean isSequential, Collection<String> dataCenters, Collection<String> hosts, boolean primaryRange, boolean repairedAt, String... tableNames) throws IOException;
- public int forceRepairAsync(String keyspace, boolean isSequential, Collection<String> dataCenters, Collection<String> hosts, boolean primaryRange, boolean fullRepair, String... columnFamilies) throws IOException;
++ public int forceRepairAsync(String keyspace, boolean isSequential, Collection<String> dataCenters, Collection<String> hosts, boolean primaryRange, boolean fullRepair, String... tableNames) throws IOException;
/**
* Invoke repair asynchronously.
@@@ -313,10 -318,13 +318,13 @@@
* @return Repair command number, or 0 if nothing to repair
*/
@Deprecated
- public int forceRepairAsync(String keyspace, int parallelismDegree, Collection<String> dataCenters, Collection<String> hosts, boolean primaryRange, boolean fullRepair, String... columnFamilies);
+ public int forceRepairAsync(String keyspace, int parallelismDegree, Collection<String> dataCenters, Collection<String> hosts, boolean primaryRange, boolean fullRepair, String... tableNames);
+ /**
+ * @deprecated use {@link #repairAsync(String keyspace, Map options)} instead.
+ */
@Deprecated
- public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, boolean isSequential, Collection<String> dataCenters, Collection<String> hosts, boolean repairedAt, String... tableNames) throws IOException;
- public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, boolean isSequential, Collection<String> dataCenters, Collection<String> hosts, boolean fullRepair, String... columnFamilies) throws IOException;
++ public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, boolean isSequential, Collection<String> dataCenters, Collection<String> hosts, boolean fullRepair, String... tableNames) throws IOException;
/**
* Same as forceRepairAsync, but handles a specified range
@@@ -324,13 -334,19 +334,19 @@@
* @param parallelismDegree 0: sequential, 1: parallel, 2: DC parallel
*/
@Deprecated
- public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, int parallelismDegree, Collection<String> dataCenters, Collection<String> hosts, boolean fullRepair, String... columnFamilies);
+ public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, int parallelismDegree, Collection<String> dataCenters, Collection<String> hosts, boolean fullRepair, String... tableNames);
+ /**
+ * @deprecated use {@link #repairAsync(String keyspace, Map options)} instead.
+ */
@Deprecated
- public int forceRepairAsync(String keyspace, boolean isSequential, boolean isLocal, boolean primaryRange, boolean fullRepair, String... columnFamilies);
+ public int forceRepairAsync(String keyspace, boolean isSequential, boolean isLocal, boolean primaryRange, boolean fullRepair, String... tableNames);
+ /**
+ * @deprecated use {@link #repairAsync(String keyspace, Map options)} instead.
+ */
@Deprecated
- public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, boolean isSequential, boolean isLocal, boolean repairedAt, String... tableNames);
- public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, boolean isSequential, boolean isLocal, boolean fullRepair, String... columnFamilies);
++ public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, boolean isSequential, boolean isLocal, boolean fullRepair, String... tableNames);
public void forceTerminateAllRepairSessions();
[02/10] cassandra git commit: Add deprecation messages to
StorageServiceMBean.forceRepair* methods
Posted by yu...@apache.org.
Add deprecation messages to StorageServiceMBean.forceRepair* methods
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a013f3e0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a013f3e0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a013f3e0
Branch: refs/heads/cassandra-3.0
Commit: a013f3e05aebb3e4b6c4d2a19bbd6f2a95df6208
Parents: 0ee8895
Author: Paulo Motta <pa...@gmail.com>
Authored: Mon Nov 30 07:51:41 2015 -0800
Committer: Yuki Morishita <yu...@apache.org>
Committed: Mon Nov 30 10:30:27 2015 -0600
----------------------------------------------------------------------
.../cassandra/service/StorageServiceMBean.java | 22 +++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a013f3e0/src/java/org/apache/cassandra/service/StorageServiceMBean.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageServiceMBean.java b/src/java/org/apache/cassandra/service/StorageServiceMBean.java
index 00060ae..b7784d6 100644
--- a/src/java/org/apache/cassandra/service/StorageServiceMBean.java
+++ b/src/java/org/apache/cassandra/service/StorageServiceMBean.java
@@ -299,8 +299,11 @@ public interface StorageServiceMBean extends NotificationEmitter
*/
public int repairAsync(String keyspace, Map<String, String> options);
+ /**
+ * @deprecated use {@link #repairAsync(String keyspace, Map options)} instead.
+ */
@Deprecated
- public int forceRepairAsync(String keyspace, boolean isSequential, Collection<String> dataCenters, Collection<String> hosts, boolean primaryRange, boolean repairedAt, String... columnFamilies) throws IOException;
+ public int forceRepairAsync(String keyspace, boolean isSequential, Collection<String> dataCenters, Collection<String> hosts, boolean primaryRange, boolean fullRepair, String... columnFamilies) throws IOException;
/**
* Invoke repair asynchronously.
@@ -309,28 +312,41 @@ public interface StorageServiceMBean extends NotificationEmitter
* type: "repair"
* userObject: int array of length 2, [0]=command number, [1]=ordinal of ActiveRepairService.Status
*
+ * @deprecated use {@link #repairAsync(String keyspace, Map options)} instead.
+ *
* @param parallelismDegree 0: sequential, 1: parallel, 2: DC parallel
* @return Repair command number, or 0 if nothing to repair
*/
@Deprecated
public int forceRepairAsync(String keyspace, int parallelismDegree, Collection<String> dataCenters, Collection<String> hosts, boolean primaryRange, boolean fullRepair, String... columnFamilies);
+ /**
+ * @deprecated use {@link #repairAsync(String keyspace, Map options)} instead.
+ */
@Deprecated
- public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, boolean isSequential, Collection<String> dataCenters, Collection<String> hosts, boolean repairedAt, String... columnFamilies) throws IOException;
+ public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, boolean isSequential, Collection<String> dataCenters, Collection<String> hosts, boolean fullRepair, String... columnFamilies) throws IOException;
/**
* Same as forceRepairAsync, but handles a specified range
*
+ * @deprecated use {@link #repairAsync(String keyspace, Map options)} instead.
+ *
* @param parallelismDegree 0: sequential, 1: parallel, 2: DC parallel
*/
@Deprecated
public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, int parallelismDegree, Collection<String> dataCenters, Collection<String> hosts, boolean fullRepair, String... columnFamilies);
+ /**
+ * @deprecated use {@link #repairAsync(String keyspace, Map options)} instead.
+ */
@Deprecated
public int forceRepairAsync(String keyspace, boolean isSequential, boolean isLocal, boolean primaryRange, boolean fullRepair, String... columnFamilies);
+ /**
+ * @deprecated use {@link #repairAsync(String keyspace, Map options)} instead.
+ */
@Deprecated
- public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, boolean isSequential, boolean isLocal, boolean repairedAt, String... columnFamilies);
+ public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, boolean isSequential, boolean isLocal, boolean fullRepair, String... columnFamilies);
public void forceTerminateAllRepairSessions();
[07/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by yu...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/44164bc3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/44164bc3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/44164bc3
Branch: refs/heads/trunk
Commit: 44164bc3ab80db1abe2918245faecce92f2ce74a
Parents: 4c56c89 a013f3e
Author: Yuki Morishita <yu...@apache.org>
Authored: Mon Nov 30 10:31:37 2015 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Mon Nov 30 10:31:37 2015 -0600
----------------------------------------------------------------------
.../cassandra/service/StorageServiceMBean.java | 22 +++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/44164bc3/src/java/org/apache/cassandra/service/StorageServiceMBean.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageServiceMBean.java
index 7f88890,b7784d6..64e60fd
--- a/src/java/org/apache/cassandra/service/StorageServiceMBean.java
+++ b/src/java/org/apache/cassandra/service/StorageServiceMBean.java
@@@ -299,8 -299,11 +299,11 @@@ public interface StorageServiceMBean ex
*/
public int repairAsync(String keyspace, Map<String, String> options);
+ /**
+ * @deprecated use {@link #repairAsync(String keyspace, Map options)} instead.
+ */
@Deprecated
- public int forceRepairAsync(String keyspace, boolean isSequential, Collection<String> dataCenters, Collection<String> hosts, boolean primaryRange, boolean repairedAt, String... tableNames) throws IOException;
- public int forceRepairAsync(String keyspace, boolean isSequential, Collection<String> dataCenters, Collection<String> hosts, boolean primaryRange, boolean fullRepair, String... columnFamilies) throws IOException;
++ public int forceRepairAsync(String keyspace, boolean isSequential, Collection<String> dataCenters, Collection<String> hosts, boolean primaryRange, boolean fullRepair, String... tableNames) throws IOException;
/**
* Invoke repair asynchronously.
@@@ -313,10 -318,13 +318,13 @@@
* @return Repair command number, or 0 if nothing to repair
*/
@Deprecated
- public int forceRepairAsync(String keyspace, int parallelismDegree, Collection<String> dataCenters, Collection<String> hosts, boolean primaryRange, boolean fullRepair, String... columnFamilies);
+ public int forceRepairAsync(String keyspace, int parallelismDegree, Collection<String> dataCenters, Collection<String> hosts, boolean primaryRange, boolean fullRepair, String... tableNames);
+ /**
+ * @deprecated use {@link #repairAsync(String keyspace, Map options)} instead.
+ */
@Deprecated
- public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, boolean isSequential, Collection<String> dataCenters, Collection<String> hosts, boolean repairedAt, String... tableNames) throws IOException;
- public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, boolean isSequential, Collection<String> dataCenters, Collection<String> hosts, boolean fullRepair, String... columnFamilies) throws IOException;
++ public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, boolean isSequential, Collection<String> dataCenters, Collection<String> hosts, boolean fullRepair, String... tableNames) throws IOException;
/**
* Same as forceRepairAsync, but handles a specified range
@@@ -324,13 -334,19 +334,19 @@@
* @param parallelismDegree 0: sequential, 1: parallel, 2: DC parallel
*/
@Deprecated
- public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, int parallelismDegree, Collection<String> dataCenters, Collection<String> hosts, boolean fullRepair, String... columnFamilies);
+ public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, int parallelismDegree, Collection<String> dataCenters, Collection<String> hosts, boolean fullRepair, String... tableNames);
+ /**
+ * @deprecated use {@link #repairAsync(String keyspace, Map options)} instead.
+ */
@Deprecated
- public int forceRepairAsync(String keyspace, boolean isSequential, boolean isLocal, boolean primaryRange, boolean fullRepair, String... columnFamilies);
+ public int forceRepairAsync(String keyspace, boolean isSequential, boolean isLocal, boolean primaryRange, boolean fullRepair, String... tableNames);
+ /**
+ * @deprecated use {@link #repairAsync(String keyspace, Map options)} instead.
+ */
@Deprecated
- public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, boolean isSequential, boolean isLocal, boolean repairedAt, String... tableNames);
- public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, boolean isSequential, boolean isLocal, boolean fullRepair, String... columnFamilies);
++ public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, boolean isSequential, boolean isLocal, boolean fullRepair, String... tableNames);
public void forceTerminateAllRepairSessions();
[03/10] cassandra git commit: Add deprecation messages to
StorageServiceMBean.forceRepair* methods
Posted by yu...@apache.org.
Add deprecation messages to StorageServiceMBean.forceRepair* methods
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a013f3e0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a013f3e0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a013f3e0
Branch: refs/heads/cassandra-3.1
Commit: a013f3e05aebb3e4b6c4d2a19bbd6f2a95df6208
Parents: 0ee8895
Author: Paulo Motta <pa...@gmail.com>
Authored: Mon Nov 30 07:51:41 2015 -0800
Committer: Yuki Morishita <yu...@apache.org>
Committed: Mon Nov 30 10:30:27 2015 -0600
----------------------------------------------------------------------
.../cassandra/service/StorageServiceMBean.java | 22 +++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a013f3e0/src/java/org/apache/cassandra/service/StorageServiceMBean.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageServiceMBean.java b/src/java/org/apache/cassandra/service/StorageServiceMBean.java
index 00060ae..b7784d6 100644
--- a/src/java/org/apache/cassandra/service/StorageServiceMBean.java
+++ b/src/java/org/apache/cassandra/service/StorageServiceMBean.java
@@ -299,8 +299,11 @@ public interface StorageServiceMBean extends NotificationEmitter
*/
public int repairAsync(String keyspace, Map<String, String> options);
+ /**
+ * @deprecated use {@link #repairAsync(String keyspace, Map options)} instead.
+ */
@Deprecated
- public int forceRepairAsync(String keyspace, boolean isSequential, Collection<String> dataCenters, Collection<String> hosts, boolean primaryRange, boolean repairedAt, String... columnFamilies) throws IOException;
+ public int forceRepairAsync(String keyspace, boolean isSequential, Collection<String> dataCenters, Collection<String> hosts, boolean primaryRange, boolean fullRepair, String... columnFamilies) throws IOException;
/**
* Invoke repair asynchronously.
@@ -309,28 +312,41 @@ public interface StorageServiceMBean extends NotificationEmitter
* type: "repair"
* userObject: int array of length 2, [0]=command number, [1]=ordinal of ActiveRepairService.Status
*
+ * @deprecated use {@link #repairAsync(String keyspace, Map options)} instead.
+ *
* @param parallelismDegree 0: sequential, 1: parallel, 2: DC parallel
* @return Repair command number, or 0 if nothing to repair
*/
@Deprecated
public int forceRepairAsync(String keyspace, int parallelismDegree, Collection<String> dataCenters, Collection<String> hosts, boolean primaryRange, boolean fullRepair, String... columnFamilies);
+ /**
+ * @deprecated use {@link #repairAsync(String keyspace, Map options)} instead.
+ */
@Deprecated
- public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, boolean isSequential, Collection<String> dataCenters, Collection<String> hosts, boolean repairedAt, String... columnFamilies) throws IOException;
+ public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, boolean isSequential, Collection<String> dataCenters, Collection<String> hosts, boolean fullRepair, String... columnFamilies) throws IOException;
/**
* Same as forceRepairAsync, but handles a specified range
*
+ * @deprecated use {@link #repairAsync(String keyspace, Map options)} instead.
+ *
* @param parallelismDegree 0: sequential, 1: parallel, 2: DC parallel
*/
@Deprecated
public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, int parallelismDegree, Collection<String> dataCenters, Collection<String> hosts, boolean fullRepair, String... columnFamilies);
+ /**
+ * @deprecated use {@link #repairAsync(String keyspace, Map options)} instead.
+ */
@Deprecated
public int forceRepairAsync(String keyspace, boolean isSequential, boolean isLocal, boolean primaryRange, boolean fullRepair, String... columnFamilies);
+ /**
+ * @deprecated use {@link #repairAsync(String keyspace, Map options)} instead.
+ */
@Deprecated
- public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, boolean isSequential, boolean isLocal, boolean repairedAt, String... columnFamilies);
+ public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, boolean isSequential, boolean isLocal, boolean fullRepair, String... columnFamilies);
public void forceTerminateAllRepairSessions();
[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.1
Posted by yu...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b2b4f155
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b2b4f155
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b2b4f155
Branch: refs/heads/cassandra-3.1
Commit: b2b4f155088a2e505cb74134009c9b51110fc1e0
Parents: 5de5d06 44164bc
Author: Yuki Morishita <yu...@apache.org>
Authored: Mon Nov 30 10:31:46 2015 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Mon Nov 30 10:31:46 2015 -0600
----------------------------------------------------------------------
.../cassandra/service/StorageServiceMBean.java | 22 +++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[09/10] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.1
Posted by yu...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b2b4f155
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b2b4f155
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b2b4f155
Branch: refs/heads/trunk
Commit: b2b4f155088a2e505cb74134009c9b51110fc1e0
Parents: 5de5d06 44164bc
Author: Yuki Morishita <yu...@apache.org>
Authored: Mon Nov 30 10:31:46 2015 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Mon Nov 30 10:31:46 2015 -0600
----------------------------------------------------------------------
.../cassandra/service/StorageServiceMBean.java | 22 +++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[04/10] cassandra git commit: Add deprecation messages to
StorageServiceMBean.forceRepair* methods
Posted by yu...@apache.org.
Add deprecation messages to StorageServiceMBean.forceRepair* methods
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a013f3e0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a013f3e0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a013f3e0
Branch: refs/heads/trunk
Commit: a013f3e05aebb3e4b6c4d2a19bbd6f2a95df6208
Parents: 0ee8895
Author: Paulo Motta <pa...@gmail.com>
Authored: Mon Nov 30 07:51:41 2015 -0800
Committer: Yuki Morishita <yu...@apache.org>
Committed: Mon Nov 30 10:30:27 2015 -0600
----------------------------------------------------------------------
.../cassandra/service/StorageServiceMBean.java | 22 +++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a013f3e0/src/java/org/apache/cassandra/service/StorageServiceMBean.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageServiceMBean.java b/src/java/org/apache/cassandra/service/StorageServiceMBean.java
index 00060ae..b7784d6 100644
--- a/src/java/org/apache/cassandra/service/StorageServiceMBean.java
+++ b/src/java/org/apache/cassandra/service/StorageServiceMBean.java
@@ -299,8 +299,11 @@ public interface StorageServiceMBean extends NotificationEmitter
*/
public int repairAsync(String keyspace, Map<String, String> options);
+ /**
+ * @deprecated use {@link #repairAsync(String keyspace, Map options)} instead.
+ */
@Deprecated
- public int forceRepairAsync(String keyspace, boolean isSequential, Collection<String> dataCenters, Collection<String> hosts, boolean primaryRange, boolean repairedAt, String... columnFamilies) throws IOException;
+ public int forceRepairAsync(String keyspace, boolean isSequential, Collection<String> dataCenters, Collection<String> hosts, boolean primaryRange, boolean fullRepair, String... columnFamilies) throws IOException;
/**
* Invoke repair asynchronously.
@@ -309,28 +312,41 @@ public interface StorageServiceMBean extends NotificationEmitter
* type: "repair"
* userObject: int array of length 2, [0]=command number, [1]=ordinal of ActiveRepairService.Status
*
+ * @deprecated use {@link #repairAsync(String keyspace, Map options)} instead.
+ *
* @param parallelismDegree 0: sequential, 1: parallel, 2: DC parallel
* @return Repair command number, or 0 if nothing to repair
*/
@Deprecated
public int forceRepairAsync(String keyspace, int parallelismDegree, Collection<String> dataCenters, Collection<String> hosts, boolean primaryRange, boolean fullRepair, String... columnFamilies);
+ /**
+ * @deprecated use {@link #repairAsync(String keyspace, Map options)} instead.
+ */
@Deprecated
- public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, boolean isSequential, Collection<String> dataCenters, Collection<String> hosts, boolean repairedAt, String... columnFamilies) throws IOException;
+ public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, boolean isSequential, Collection<String> dataCenters, Collection<String> hosts, boolean fullRepair, String... columnFamilies) throws IOException;
/**
* Same as forceRepairAsync, but handles a specified range
*
+ * @deprecated use {@link #repairAsync(String keyspace, Map options)} instead.
+ *
* @param parallelismDegree 0: sequential, 1: parallel, 2: DC parallel
*/
@Deprecated
public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, int parallelismDegree, Collection<String> dataCenters, Collection<String> hosts, boolean fullRepair, String... columnFamilies);
+ /**
+ * @deprecated use {@link #repairAsync(String keyspace, Map options)} instead.
+ */
@Deprecated
public int forceRepairAsync(String keyspace, boolean isSequential, boolean isLocal, boolean primaryRange, boolean fullRepair, String... columnFamilies);
+ /**
+ * @deprecated use {@link #repairAsync(String keyspace, Map options)} instead.
+ */
@Deprecated
- public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, boolean isSequential, boolean isLocal, boolean repairedAt, String... columnFamilies);
+ public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, boolean isSequential, boolean isLocal, boolean fullRepair, String... columnFamilies);
public void forceTerminateAllRepairSessions();