cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbros...@apache.org
Subject [2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0.0
Date Tue, 20 Aug 2013 21:55:51 GMT
Merge branch 'cassandra-1.2' into cassandra-2.0.0


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

Branch: refs/heads/cassandra-2.0
Commit: 33fda2db610202d7ed8e75afe6a0ac8e30003834
Parents: 3a7d9f8 dbb55eb
Author: Dave Brosius <dbrosius@apache.org>
Authored: Tue Aug 20 17:52:43 2013 -0400
Committer: Dave Brosius <dbrosius@apache.org>
Committed: Tue Aug 20 17:52:43 2013 -0400

----------------------------------------------------------------------
 CHANGES.txt                                                    | 3 +++
 src/java/org/apache/cassandra/db/ColumnFamilyStore.java        | 6 ++++--
 src/java/org/apache/cassandra/service/StorageService.java      | 4 ++--
 src/java/org/apache/cassandra/service/StorageServiceMBean.java | 4 ++--
 src/java/org/apache/cassandra/tools/NodeCmd.java               | 5 ++++-
 src/java/org/apache/cassandra/tools/NodeProbe.java             | 4 ++--
 6 files changed, 17 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/33fda2db/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/33fda2db/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/33fda2db/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index a23db0c,9339132..3ef9d4b
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -2076,15 -2149,15 +2076,15 @@@ public class StorageService extends Not
          }
      }
  
-     public void scrub(String keyspaceName, String... columnFamilies) throws IOException,
ExecutionException, InterruptedException
 -    public void scrub(boolean disableSnapshot, String tableName, String... columnFamilies)
throws IOException, ExecutionException, InterruptedException
++    public void scrub(boolean disableSnapshot, String keyspaceName, String... columnFamilies)
throws IOException, ExecutionException, InterruptedException
      {
 -        for (ColumnFamilyStore cfStore : getValidColumnFamilies(false, false, tableName,
columnFamilies))
 +        for (ColumnFamilyStore cfStore : getValidColumnFamilies(false, false, keyspaceName,
columnFamilies))
-             cfStore.scrub();
+             cfStore.scrub(disableSnapshot);
      }
  
 -    public void upgradeSSTables(String tableName, boolean excludeCurrentVersion, String...
columnFamilies) throws IOException, ExecutionException, InterruptedException
 +    public void upgradeSSTables(String keyspaceName, boolean excludeCurrentVersion, String...
columnFamilies) throws IOException, ExecutionException, InterruptedException
      {
 -        for (ColumnFamilyStore cfStore : getValidColumnFamilies(true, true, tableName, columnFamilies))
 +        for (ColumnFamilyStore cfStore : getValidColumnFamilies(true, true, keyspaceName,
columnFamilies))
              cfStore.sstablesRewrite(excludeCurrentVersion);
      }
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/33fda2db/src/java/org/apache/cassandra/service/StorageServiceMBean.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageServiceMBean.java
index a84bcf4,15f2113..0eb2f49
--- a/src/java/org/apache/cassandra/service/StorageServiceMBean.java
+++ b/src/java/org/apache/cassandra/service/StorageServiceMBean.java
@@@ -229,9 -234,9 +229,9 @@@ public interface StorageServiceMBean ex
       * Scrub (deserialize + reserialize at the latest version, skipping bad rows if any)
the given keyspace.
       * If columnFamilies array is empty, all CFs are scrubbed.
       *
--     * Scrubbed CFs will be snapshotted first.
++     * Scrubbed CFs will be snapshotted first, if disableSnapshot is false
       */
-     public void scrub(String keyspaceName, String... columnFamilies) throws IOException,
ExecutionException, InterruptedException;
 -    public void scrub(boolean disableSnapshot, String tableName, String... columnFamilies)
throws IOException, ExecutionException, InterruptedException;
++    public void scrub(boolean disableSnapshot, String keyspaceName, String... columnFamilies)
throws IOException, ExecutionException, InterruptedException;
  
      /**
       * Rewrite all sstables to the latest version.

http://git-wip-us.apache.org/repos/asf/cassandra/blob/33fda2db/src/java/org/apache/cassandra/tools/NodeCmd.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/33fda2db/src/java/org/apache/cassandra/tools/NodeProbe.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/tools/NodeProbe.java
index 0da2944,a9b0bb5..c633406
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@@ -183,39 -182,39 +183,39 @@@ public class NodeProb
          jmxc.close();
      }
  
 -    public void forceTableCleanup(String tableName, String... columnFamilies) throws IOException,
ExecutionException, InterruptedException
 +    public void forceKeyspaceCleanup(String keyspaceName, String... columnFamilies) throws
IOException, ExecutionException, InterruptedException
      {
 -        ssProxy.forceTableCleanup(tableName, columnFamilies);
 +        ssProxy.forceKeyspaceCleanup(keyspaceName, columnFamilies);
      }
  
-     public void scrub(String keyspaceName, String... columnFamilies) throws IOException,
ExecutionException, InterruptedException
 -    public void scrub(boolean disableSnapshot, String tableName, String... columnFamilies)
throws IOException, ExecutionException, InterruptedException
++    public void scrub(boolean disableSnapshot, String keyspaceName, String... columnFamilies)
throws IOException, ExecutionException, InterruptedException
      {
-         ssProxy.scrub(keyspaceName, columnFamilies);
 -        ssProxy.scrub(disableSnapshot, tableName, columnFamilies);
++        ssProxy.scrub(disableSnapshot, keyspaceName, columnFamilies);
      }
  
 -    public void upgradeSSTables(String tableName, boolean excludeCurrentVersion, String...
columnFamilies) throws IOException, ExecutionException, InterruptedException
 +    public void upgradeSSTables(String keyspaceName, boolean excludeCurrentVersion, String...
columnFamilies) throws IOException, ExecutionException, InterruptedException
      {
 -        ssProxy.upgradeSSTables(tableName, excludeCurrentVersion, columnFamilies);
 +        ssProxy.upgradeSSTables(keyspaceName, excludeCurrentVersion, columnFamilies);
      }
  
 -    public void forceTableCompaction(String tableName, String... columnFamilies) throws
IOException, ExecutionException, InterruptedException
 +    public void forceKeyspaceCompaction(String keyspaceName, String... columnFamilies) throws
IOException, ExecutionException, InterruptedException
      {
 -        ssProxy.forceTableCompaction(tableName, columnFamilies);
 +        ssProxy.forceKeyspaceCompaction(keyspaceName, columnFamilies);
      }
  
 -    public void forceTableFlush(String tableName, String... columnFamilies) throws IOException,
ExecutionException, InterruptedException
 +    public void forceKeyspaceFlush(String keyspaceName, String... columnFamilies) throws
IOException, ExecutionException, InterruptedException
      {
 -        ssProxy.forceTableFlush(tableName, columnFamilies);
 +        ssProxy.forceKeyspaceFlush(keyspaceName, columnFamilies);
      }
  
 -    public void forceTableRepair(String tableName, boolean isSequential, boolean isLocal,
String... columnFamilies) throws IOException
 +    public void forceKeyspaceRepair(String keyspaceName, boolean isSequential, boolean isLocal,
String... columnFamilies) throws IOException
      {
 -        ssProxy.forceTableRepair(tableName, isSequential, isLocal, columnFamilies);
 +        ssProxy.forceKeyspaceRepair(keyspaceName, isSequential, isLocal, columnFamilies);
      }
  
 -    public void forceRepairAsync(final PrintStream out, final String tableName, boolean
isSequential, boolean isLocal, boolean primaryRange, String... columnFamilies) throws IOException
 +    public void forceRepairAsync(final PrintStream out, final String keyspaceName, boolean
isSequential, boolean isLocal, boolean primaryRange, String... columnFamilies) throws IOException
      {
 -        RepairRunner runner = new RepairRunner(out, tableName, columnFamilies);
 +        RepairRunner runner = new RepairRunner(out, keyspaceName, columnFamilies);
          try
          {
              ssProxy.addNotificationListener(runner, null, null);


Mime
View raw message