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();