Repository: cassandra Updated Branches: refs/heads/trunk 944608428 -> 820683932
DatabaseDescriptor should set some defaults to prevent NPE's. Set Disk Optimization Strategy and Partitioner in DD.clientInitialization. patch by Jeremiah Jordan; reviewed by Yuki Morishita for CASSANDRA-12667 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/82068393 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/82068393 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/82068393 Branch: refs/heads/trunk Commit: 8206839328e665108e33de8b48926942d46cf12e Parents: 9446084 Author: Jeremiah D Jordan <jerem...@datastax.com> Authored: Mon Sep 19 10:22:24 2016 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Tue Sep 20 08:19:48 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 3 +++ src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java | 4 +--- .../org/apache/cassandra/test/microbench/MutationBench.java | 3 --- .../org/apache/cassandra/io/sstable/StressCQLSSTableWriter.java | 3 --- 5 files changed, 5 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/82068393/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 8b4f84e..74a2372 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.10 + * Fix NPE when using CQLSSTableWriter (CASSANDRA-12667) * Support optional backpressure strategies at the coordinator (CASSANDRA-9318) * Make randompartitioner work with new vnode allocation (CASSANDRA-12647) * Fix cassandra-stress graphing (CASSANDRA-12237) http://git-wip-us.apache.org/repos/asf/cassandra/blob/82068393/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 ce889ff..963d564 100644 --- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java +++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java @@ -44,6 +44,7 @@ import org.apache.cassandra.auth.IRoleManager; import org.apache.cassandra.config.Config.CommitLogSync; import org.apache.cassandra.config.Config.RequestSchedulerId; import org.apache.cassandra.dht.IPartitioner; +import org.apache.cassandra.dht.Murmur3Partitioner; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.io.FSWriteError; import org.apache.cassandra.io.util.DiskOptimizationStrategy; @@ -218,6 +219,8 @@ public class DatabaseDescriptor Config.setClientMode(true); conf = new Config(); + diskOptimizationStrategy = new SpinningDiskOptimizationStrategy(); + partitioner = Murmur3Partitioner.instance; } public static boolean isClientInitialized() http://git-wip-us.apache.org/repos/asf/cassandra/blob/82068393/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java b/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java index 8a9d01d..dd9eb59 100644 --- a/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java +++ b/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java @@ -53,6 +53,7 @@ import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.exceptions.RequestValidationException; import org.apache.cassandra.exceptions.SyntaxException; import org.apache.cassandra.io.sstable.format.SSTableFormat; +import org.apache.cassandra.io.util.SpinningDiskOptimizationStrategy; import org.apache.cassandra.schema.KeyspaceMetadata; import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.schema.Types; @@ -105,9 +106,6 @@ public class CQLSSTableWriter implements Closeable static { DatabaseDescriptor.clientInitialization(false); - // Partitioner is not set in client mode. - if (DatabaseDescriptor.getPartitioner() == null) - DatabaseDescriptor.setPartitionerUnsafe(Murmur3Partitioner.instance); } private final AbstractSSTableSimpleWriter writer; http://git-wip-us.apache.org/repos/asf/cassandra/blob/82068393/test/microbench/org/apache/cassandra/test/microbench/MutationBench.java ---------------------------------------------------------------------- diff --git a/test/microbench/org/apache/cassandra/test/microbench/MutationBench.java b/test/microbench/org/apache/cassandra/test/microbench/MutationBench.java index 8c177cf..20d8ff5 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/MutationBench.java +++ b/test/microbench/org/apache/cassandra/test/microbench/MutationBench.java @@ -65,9 +65,6 @@ public class MutationBench static { DatabaseDescriptor.clientInitialization(false); - // Partitioner is not set in client mode. - if (DatabaseDescriptor.getPartitioner() == null) - DatabaseDescriptor.setPartitionerUnsafe(Murmur3Partitioner.instance); } static String keyspace = "keyspace1"; http://git-wip-us.apache.org/repos/asf/cassandra/blob/82068393/tools/stress/src/org/apache/cassandra/io/sstable/StressCQLSSTableWriter.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/io/sstable/StressCQLSSTableWriter.java b/tools/stress/src/org/apache/cassandra/io/sstable/StressCQLSSTableWriter.java index 4fe05a8..d9bf669 100644 --- a/tools/stress/src/org/apache/cassandra/io/sstable/StressCQLSSTableWriter.java +++ b/tools/stress/src/org/apache/cassandra/io/sstable/StressCQLSSTableWriter.java @@ -99,9 +99,6 @@ public class StressCQLSSTableWriter implements Closeable static { DatabaseDescriptor.clientInitialization(false); - // Partitioner is not set in client mode. - if (DatabaseDescriptor.getPartitioner() == null) - DatabaseDescriptor.setPartitionerUnsafe(Murmur3Partitioner.instance); } private final AbstractSSTableSimpleWriter writer;