cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [1/2] cassandra git commit: Remove (unsupported) offheap_objects option
Date Wed, 07 Oct 2015 08:48:57 GMT
Repository: cassandra
Updated Branches:
  refs/heads/trunk 587fe51b1 -> 07782aa4a


Remove (unsupported) offheap_objects option

patch by slebresne; reviewed by aweisberg for CASSANDRA-10437

The 'objects offheap' allocator is currently not implemented for
Cassandra 3.0. The option will be re-introduced by CASSANDRA-9472
in a future release but in the meantime, the patch properly remove
the (now broken) option.


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

Branch: refs/heads/trunk
Commit: 566799f567b319fdc62c94adfb8ffe4b96085649
Parents: 15334f4
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Wed Oct 7 10:45:40 2015 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Wed Oct 7 10:45:40 2015 +0200

----------------------------------------------------------------------
 NEWS.txt                                                     | 2 ++
 conf/cassandra.yaml                                          | 1 -
 src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 3 ++-
 test/conf/cassandra_pig.yaml                                 | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/566799f5/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index a7e56ec..18d61a3 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -44,6 +44,8 @@ New features
 
 Upgrading
 ---------
+   - The 'memtable_allocation_type: offheap_objects' option has been removed. It should
+     be re-introduced in a future release and you can follow CASSANDRA-9472 to know more.
    - The LIMIT clause applies now only to the number of rows returned to the user,
      not to the number of row queried. By consequence, queries using aggregates will not
      be impacted by the LIMIT clause anymore.

http://git-wip-us.apache.org/repos/asf/cassandra/blob/566799f5/conf/cassandra.yaml
----------------------------------------------------------------------
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index 4fd249f..33ca4a8 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -403,7 +403,6 @@ concurrent_materialized_view_writes: 32
 # Options are:
 #   heap_buffers:    on heap nio buffers
 #   offheap_buffers: off heap (direct) nio buffers
-#   offheap_objects: native memory, eliminating nio buffer heap overhead
 memtable_allocation_type: heap_buffers
 
 # Total space to use for commit logs on disk.

http://git-wip-us.apache.org/repos/asf/cassandra/blob/566799f5/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 7c062a1..ccc3dd1 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -1824,7 +1824,8 @@ public class DatabaseDescriptor
                 }
                 return new SlabPool(heapLimit, offHeapLimit, conf.memtable_cleanup_threshold,
new ColumnFamilyStore.FlushLargestColumnFamily());
             case offheap_objects:
-                return new NativePool(heapLimit, offHeapLimit, conf.memtable_cleanup_threshold,
new ColumnFamilyStore.FlushLargestColumnFamily());
+                throw new ConfigurationException("offheap_objects are not available in 3.0.
They should be re-introduced in a future release, see https://issues.apache.org/jira/browse/CASSANDRA-9472
for details");
+                // return new NativePool(heapLimit, offHeapLimit, conf.memtable_cleanup_threshold,
new ColumnFamilyStore.FlushLargestColumnFamily());
             default:
                 throw new AssertionError();
         }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/566799f5/test/conf/cassandra_pig.yaml
----------------------------------------------------------------------
diff --git a/test/conf/cassandra_pig.yaml b/test/conf/cassandra_pig.yaml
index 286434b..ce71410 100644
--- a/test/conf/cassandra_pig.yaml
+++ b/test/conf/cassandra_pig.yaml
@@ -3,7 +3,7 @@
 # Consider the effects on 'o.a.c.i.s.LegacySSTableTest' before changing schemas in this file.
 #
 cluster_name: Test Cluster
-memtable_allocation_type: offheap_objects
+memtable_allocation_type: heap_buffers
 commitlog_sync: batch
 commitlog_sync_batch_window_in_ms: 1.0
 commitlog_segment_size_in_mb: 5


Mime
View raw message