cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [5/6] git commit: merge from 1.2
Date Thu, 29 Aug 2013 04:15:00 GMT
merge from 1.2


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

Branch: refs/heads/cassandra-2.0
Commit: 8d4b51d5aef8ac958b73fb53f7b4072f5208eae8
Parents: 299c950 254d315
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Wed Aug 28 23:14:35 2013 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Wed Aug 28 23:14:35 2013 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |  2 ++
 .../cassandra/locator/EndpointSnitchInfo.java   |  5 ++++
 .../locator/EndpointSnitchInfoMBean.java        |  8 +++++++
 .../apache/cassandra/service/StorageProxy.java  |  5 ++++
 .../cassandra/service/StorageProxyMBean.java    |  6 +++++
 .../cassandra/service/StorageService.java       | 12 ++++++++++
 .../cassandra/service/StorageServiceMBean.java  |  5 ++++
 .../org/apache/cassandra/tools/NodeCmd.java     | 25 ++++++++++++++++++++
 .../org/apache/cassandra/tools/NodeProbe.java   | 10 ++++++++
 .../apache/cassandra/tools/NodeToolHelp.yaml    |  3 +++
 10 files changed, 81 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d4b51d5/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index fd598e3,9ef0651..5621436
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,6 +1,16 @@@
 -1.2.10
 - * Add snitch, schema version, cluster, partitioner to JMX (CASSANDRA-5881)
 +2.0.1
 + * Notify indexer of columns shadowed by range tombstones (CASSANDRA-5614)
 + * Log Merkle tree stats (CASSANDRA-2698)
 + * Switch from crc32 to adler32 for compressed sstable checksums (CASSANDRA-5862)
 + * Improve offheap memcpy performance (CASSANDRA-5884)
 + * Use a range aware scanner for cleanup (CASSANDRA-2524)
 + * Cleanup doesn't need to inspect sstables that contain only local data 
 +   (CASSANDRA-5722)
 + * Add ability for CQL3 to list partition keys (CASSANDRA-4536)
 + * Improve native protocol serialization (CASSANDRA-5664)
 +Merged from 1.2:
+  * Fix CqlRecordWriter with composite keys (CASSANDRA-5949)
++ * Add snitch, schema version, cluster, partitioner to JMX (CASSANDRA-5881)
   * Allow disabling SlabAllocator (CASSANDRA-5935)
   * Make user-defined compaction JMX blocking (CASSANDRA-4952)
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d4b51d5/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageProxy.java
index fb5cbe4,ec27891..f8ab988
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@@ -1536,15 -1266,20 +1536,20 @@@ public class StorageProxy implements St
          return trim(command, rows);
      }
  
 -    private static List<Row> trim(RangeSliceCommand command, List<Row> rows)
 +    private static List<Row> trim(AbstractRangeCommand command, List<Row> rows)
      {
 -        // When countCQL3Rows, we let the caller trim the result.
 -        if (command.countCQL3Rows)
 +        // When maxIsColumns, we let the caller trim the result.
 +        if (command.countCQL3Rows())
              return rows;
          else
 -            return rows.size() > command.maxResults ? rows.subList(0, command.maxResults)
: rows;
 +            return rows.size() > command.limit() ? rows.subList(0, command.limit()) :
rows;
      }
  
+     public Map<String, List<String>> getSchemaVersions()
+     {
+         return this.describeSchemaVersions();
+     }
+ 
      /**
       * initiate a request/response session with each live node to check whether or not everybody
is using the same
       * migration id. This is useful for determining if a schema change has propagated through
the cluster. Disagreement

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d4b51d5/src/java/org/apache/cassandra/service/StorageProxyMBean.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageProxyMBean.java
index 05b9c78,f00b94f..98c1850
--- a/src/java/org/apache/cassandra/service/StorageProxyMBean.java
+++ b/src/java/org/apache/cassandra/service/StorageProxyMBean.java
@@@ -17,6 -17,11 +17,9 @@@
   */
  package org.apache.cassandra.service;
  
+ import java.util.List;
+ import java.util.Map;
+ 
 -import org.apache.cassandra.metrics.ReadRepairMetrics;
 -
  public interface StorageProxyMBean
  {
      /**

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d4b51d5/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 3ef9d4b,2c3a1c8..ff8a96e
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -3624,19 -3923,15 +3624,31 @@@ public class StorageService extends Not
          rangeXferExecutor.tearDown();
      }
  
 +    public void disableAutoCompaction(String ks, String... columnFamilies) throws IOException
 +    {
 +        for (ColumnFamilyStore cfs : getValidColumnFamilies(true, true, ks, columnFamilies))
 +        {
 +            cfs.disableAutoCompaction();
 +        }
 +    }
 +
 +    public void enableAutoCompaction(String ks, String... columnFamilies) throws IOException
 +    {
 +        for (ColumnFamilyStore cfs : getValidColumnFamilies(true, true, ks, columnFamilies))
 +        {
 +            cfs.enableAutoCompaction();
 +        }
 +    }
++
+     /** Returns the name of the cluster */
+     public String getClusterName()
+     {
+         return DatabaseDescriptor.getClusterName();
+     }
+ 
+     /** Returns the cluster partitioner */
+     public String getPartitionerName()
+     {
+         return DatabaseDescriptor.getPartitionerName();
+     }
  }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d4b51d5/src/java/org/apache/cassandra/service/StorageServiceMBean.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageServiceMBean.java
index 0eb2f49,2c63b46..ee6317b
--- a/src/java/org/apache/cassandra/service/StorageServiceMBean.java
+++ b/src/java/org/apache/cassandra/service/StorageServiceMBean.java
@@@ -466,8 -471,8 +466,13 @@@ public interface StorageServiceMBean ex
      /** Disable processing of queued range transfers. */
      public void disableScheduledRangeXfers();
  
 +    void disableAutoCompaction(String ks, String ... columnFamilies) throws IOException;
 +    void enableAutoCompaction(String ks, String ... columnFamilies) throws IOException;
 +
 +    public void deliverHints(String host) throws UnknownHostException;
++
+     /** Returns the name of the cluster */
+     public String getClusterName();
+     /** Returns the cluster partitioner */
+     public String getPartitionerName();
  }

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d4b51d5/src/java/org/apache/cassandra/tools/NodeProbe.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d4b51d5/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml
----------------------------------------------------------------------


Mime
View raw message