cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [3/7] git commit: merge from 1.2
Date Thu, 19 Sep 2013 15:22:56 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/fb7b71f6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fb7b71f6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fb7b71f6

Branch: refs/heads/trunk
Commit: fb7b71f6b1b8b8581f64ee86de5fdc2c7eabe590
Parents: 7453e6f df046d6
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Thu Sep 19 10:21:05 2013 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Thu Sep 19 10:21:05 2013 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |  2 +
 .../cassandra/config/DatabaseDescriptor.java    | 10 +++++
 .../apache/cassandra/service/CacheService.java  | 42 ++++++++++++++++----
 .../cassandra/service/CacheServiceMBean.java    |  6 +++
 .../org/apache/cassandra/tools/NodeCmd.java     |  8 +++-
 .../org/apache/cassandra/tools/NodeProbe.java   | 16 ++++++++
 .../apache/cassandra/tools/NodeToolHelp.yaml    |  3 ++
 7 files changed, 78 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb7b71f6/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index fcc33f2,27e6f24..ae6eedc
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,37 -1,8 +1,39 @@@
 -1.2.11
 +2.0.2
 + * Make ThriftServer more easlly extensible (CASSANDRA-6058)
++Merged from 1.2:
+  * Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
  
  
 -1.2.10
 +2.0.1
 + * add file_cache_size_in_mb setting (CASSANDRA-5661)
 + * Improve error message when yaml contains invalid properties (CASSANDRA-5958)
 + * Improve leveled compaction's ability to find non-overlapping L0 compactions
 +   to work on concurrently (CASSANDRA-5921)
 + * 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)
 + * Upgrade Thrift to 0.9.1 (CASSANDRA-5923)
 + * Require superuser status for adding triggers (CASSANDRA-5963)
 + * Make standalone scrubber handle old and new style leveled manifest
 +   (CASSANDRA-6005)
 + * Fix paxos bugs (CASSANDRA-6012, 6013, 6023)
 + * Fix paged ranges with multiple replicas (CASSANDRA-6004)
 + * Fix potential AssertionError during tracing (CASSANDRA-6041)
 + * Fix NPE in sstablesplit (CASSANDRA-6027)
 + * Migrate pre-2.0 key/value/column aliases to system.schema_columns
 +   (CASSANDRA-6009)
 + * Paging filter empty rows too agressively (CASSANDRA-6040)
 + * Support variadic parameters for IN clauses (CASSANDRA-4210)
 + * cqlsh: return the result of CAS writes (CASSANDRA-5796)
 + * Fix validation of IN clauses with 2ndary indexes (CASSANDRA-6050)
 + * Support named bind variables in CQL (CASSANDRA-6033)
 +Merged from 1.2:
   * Avoid second-guessing out-of-space state (CASSANDRA-5605)
   * Tuning knobs for dealing with large blobs and many CFs (CASSANDRA-5982)
   * (Hadoop) Fix CQLRW for thrift tables (CASSANDRA-6002)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb7b71f6/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index b3eeca6,22de2d6..42459e4
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@@ -1207,11 -1276,16 +1212,16 @@@ public class DatabaseDescripto
          return conf.row_cache_keys_to_save;
      }
  
 -    public static void setRowCacheKeysToSave(int rowCacheKeysToSave)
 +    public static IAllocator getoffHeapMemoryAllocator()
      {
 -        conf.row_cache_keys_to_save = rowCacheKeysToSave;
 +        return memoryAllocator;
      }
  
 -    public static IRowCacheProvider getRowCacheProvider()
++    public static void setRowCacheKeysToSave(int rowCacheKeysToSave)
+     {
 -        return rowCacheProvider;
++        conf.row_cache_keys_to_save = rowCacheKeysToSave;
+     }
+ 
      public static int getStreamingSocketTimeout()
      {
          return conf.streaming_socket_timeout_in_ms;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb7b71f6/src/java/org/apache/cassandra/service/CacheService.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb7b71f6/src/java/org/apache/cassandra/service/CacheServiceMBean.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb7b71f6/src/java/org/apache/cassandra/tools/NodeCmd.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/tools/NodeCmd.java
index 2d31232,26cc50e..1ae5de8
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@@ -162,8 -162,10 +162,9 @@@ public class NodeCm
          RANGEKEYSAMPLE,
          REBUILD_INDEX,
          RESETLOCALSCHEMA,
 -        PREDICTCONSISTENCY,
          ENABLEBACKUP,
-         DISABLEBACKUP
+         DISABLEBACKUP,
+         SETCACHEKEYSTOSAVE
      }
  
  

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

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


Mime
View raw message