This is an automated email from the ASF dual-hosted git repository. aleksey pushed a commit to branch 15202-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 9f56a149a782cf5d683973faa50baf3312c1bcaf Author: Aleksey Yeshchenko <alek...@apache.org> AuthorDate: Wed Jul 31 13:34:02 2019 +0100 Consistent naming for offheap MT toggle param and methods --- src/java/org/apache/cassandra/config/Config.java | 2 +- src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 10 +++++----- src/java/org/apache/cassandra/service/ActiveRepairService.java | 9 ++++----- .../org/apache/cassandra/service/ActiveRepairServiceMBean.java | 3 +++ src/java/org/apache/cassandra/utils/MerkleTree.java | 4 ++-- test/unit/org/apache/cassandra/utils/MerkleTreeTest.java | 2 +- 6 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/java/org/apache/cassandra/config/Config.java b/src/java/org/apache/cassandra/config/Config.java index b56419d..a1fdfdc 100644 --- a/src/java/org/apache/cassandra/config/Config.java +++ b/src/java/org/apache/cassandra/config/Config.java @@ -130,7 +130,7 @@ public class Config public volatile Integer repair_session_max_tree_depth = null; public volatile Integer repair_session_space_in_mb = null; - public volatile boolean prefer_offheap_merkle_trees = true; + public volatile boolean use_offheap_merkle_trees = true; public int storage_port = 7000; public int ssl_storage_port = 7001; diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java index 49761da..43203e5 100644 --- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java +++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java @@ -2908,14 +2908,14 @@ public class DatabaseDescriptor return strictRuntimeChecks; } - public static boolean getOffheapMerkleTreesEnabled() + public static boolean useOffheapMerkleTrees() { - return conf.prefer_offheap_merkle_trees; + return conf.use_offheap_merkle_trees; } - public static void setOffheapMerkleTreesEnabled(boolean value) + public static void useOffheapMerkleTrees(boolean value) { - logger.info("Setting prefer_offheap_merkle_trees to {}", value); - conf.prefer_offheap_merkle_trees = value; + logger.info("Setting use_offheap_merkle_trees to {}", value); + conf.use_offheap_merkle_trees = value; } } diff --git a/src/java/org/apache/cassandra/service/ActiveRepairService.java b/src/java/org/apache/cassandra/service/ActiveRepairService.java index 689771c..409d799 100644 --- a/src/java/org/apache/cassandra/service/ActiveRepairService.java +++ b/src/java/org/apache/cassandra/service/ActiveRepairService.java @@ -71,7 +71,6 @@ import org.apache.cassandra.repair.consistent.LocalSessions; import org.apache.cassandra.repair.messages.*; import org.apache.cassandra.schema.TableId; import org.apache.cassandra.utils.CassandraVersion; -import org.apache.cassandra.utils.MonotonicClock; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.MBeanWrapper; import org.apache.cassandra.utils.Pair; @@ -248,14 +247,14 @@ public class ActiveRepairService implements IEndpointStateChangeSubscriber, IFai return session; } - public boolean getOffheapMerkleTreesEnabled() + public boolean getUseOffheapMerkleTrees() { - return DatabaseDescriptor.getOffheapMerkleTreesEnabled(); + return DatabaseDescriptor.useOffheapMerkleTrees(); } - public void setOffheapMerkleTreesEnabled(boolean enabled) + public void setUseOffheapMerkleTrees(boolean value) { - DatabaseDescriptor.setOffheapMerkleTreesEnabled(enabled); + DatabaseDescriptor.useOffheapMerkleTrees(value); } private <T extends AbstractFuture & diff --git a/src/java/org/apache/cassandra/service/ActiveRepairServiceMBean.java b/src/java/org/apache/cassandra/service/ActiveRepairServiceMBean.java index 283d466..d967280 100644 --- a/src/java/org/apache/cassandra/service/ActiveRepairServiceMBean.java +++ b/src/java/org/apache/cassandra/service/ActiveRepairServiceMBean.java @@ -30,4 +30,7 @@ public interface ActiveRepairServiceMBean public void setRepairSessionSpaceInMegabytes(int sizeInMegabytes); public int getRepairSessionSpaceInMegabytes(); + + public boolean getUseOffheapMerkleTrees(); + public void setUseOffheapMerkleTrees(boolean value); } diff --git a/src/java/org/apache/cassandra/utils/MerkleTree.java b/src/java/org/apache/cassandra/utils/MerkleTree.java index 68be2d1..45d14a6 100644 --- a/src/java/org/apache/cassandra/utils/MerkleTree.java +++ b/src/java/org/apache/cassandra/utils/MerkleTree.java @@ -690,7 +690,7 @@ public class MerkleTree public static MerkleTree deserialize(DataInputPlus in, int version) throws IOException { - return deserialize(in, DatabaseDescriptor.getOffheapMerkleTreesEnabled(), version); + return deserialize(in, DatabaseDescriptor.useOffheapMerkleTrees(), version); } public static MerkleTree deserialize(DataInputPlus in, boolean offHeapRequested, int version) throws IOException @@ -754,7 +754,7 @@ public class MerkleTree */ MerkleTree tryMoveOffHeap() throws IOException { - return root instanceof OnHeapNode && shouldUseOffHeapTrees(partitioner, DatabaseDescriptor.getOffheapMerkleTreesEnabled()) + return root instanceof OnHeapNode && shouldUseOffHeapTrees(partitioner, DatabaseDescriptor.useOffheapMerkleTrees()) ? moveOffHeap() : this; } diff --git a/test/unit/org/apache/cassandra/utils/MerkleTreeTest.java b/test/unit/org/apache/cassandra/utils/MerkleTreeTest.java index 6ce2652..0ec6858 100644 --- a/test/unit/org/apache/cassandra/utils/MerkleTreeTest.java +++ b/test/unit/org/apache/cassandra/utils/MerkleTreeTest.java @@ -71,7 +71,7 @@ public class MerkleTreeTest public void setup() { DatabaseDescriptor.clientInitialization(); - DatabaseDescriptor.setOffheapMerkleTreesEnabled(false); + DatabaseDescriptor.useOffheapMerkleTrees(false); TOKEN_SCALE = new BigInteger("8"); partitioner = RandomPartitioner.instance; --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org