diff --git a/db/column_family.cc b/db/column_family.cc index ca3be7855..d472d8d7f 100644 --- a/db/column_family.cc +++ b/db/column_family.cc @@ -135,6 +135,10 @@ Status CheckConcurrentWritesSupported(const ColumnFamilyOptions& cf_options) { "Delete filtering (filter_deletes) is not compatible with concurrent " "memtable writes (allow_concurrent_memtable_writes)"); } + if (!cf_options.memtable_factory->IsInsertConcurrentlySupported()) { + return Status::InvalidArgument( + "Memtable doesn't concurrent writes (allow_concurrent_memtable_write)"); + } return Status::OK(); } diff --git a/db/db_test.cc b/db/db_test.cc index c6be57a99..569f6e334 100644 --- a/db/db_test.cc +++ b/db/db_test.cc @@ -5736,8 +5736,30 @@ TEST_F(DBTest, TableOptionsSanitizeTest) { options.prefix_extractor.reset(NewFixedPrefixTransform(1)); ASSERT_OK(TryReopen(options)); } + #endif // ROCKSDB_LITE +TEST_F(DBTest, ConcurrentMemtableNotSupported) { + Options options = CurrentOptions(); + options.allow_concurrent_memtable_write = true; + options.soft_pending_compaction_bytes_limit = 0; + options.hard_pending_compaction_bytes_limit = 100; + options.create_if_missing = true; + + DestroyDB(dbname_, options); + options.memtable_factory.reset(NewHashLinkListRepFactory(4, 0, 3, true, 4)); + ASSERT_NOK(TryReopen(options)); + + options.memtable_factory.reset(new SkipListFactory); + ASSERT_OK(TryReopen(options)); + + ColumnFamilyOptions cf_options(options); + cf_options.memtable_factory.reset( + NewHashLinkListRepFactory(4, 0, 3, true, 4)); + ColumnFamilyHandle* handle; + ASSERT_NOK(db_->CreateColumnFamily(cf_options, "name", &handle)); +} + TEST_F(DBTest, SanitizeNumThreads) { for (int attempt = 0; attempt < 2; attempt++) { const size_t kTotalTasks = 8; diff --git a/include/rocksdb/memtablerep.h b/include/rocksdb/memtablerep.h index 6cd92d823..75717907d 100644 --- a/include/rocksdb/memtablerep.h +++ b/include/rocksdb/memtablerep.h @@ -188,10 +188,6 @@ class MemTableRep { // Default: true virtual bool IsSnapshotSupported() const { return true; } - // Return true if the current MemTableRep supports concurrent inserts - // Default: false - virtual bool IsInsertConcurrentlySupported() const { return false; } - protected: // When *key is an internal key concatenated with the value, returns the // user key. @@ -210,6 +206,10 @@ class MemTableRepFactory { const SliceTransform*, Logger* logger) = 0; virtual const char* Name() const = 0; + + // Return true if the current MemTableRep supports concurrent inserts + // Default: false + virtual bool IsInsertConcurrentlySupported() const { return false; } }; // This uses a skip list to store keys. It is the default. @@ -229,6 +229,8 @@ class SkipListFactory : public MemTableRepFactory { Logger* logger) override; virtual const char* Name() const override { return "SkipListFactory"; } + bool IsInsertConcurrentlySupported() const override { return true; } + private: const size_t lookahead_; }; diff --git a/memtable/skiplistrep.cc b/memtable/skiplistrep.cc index 7108008a8..3588b568a 100644 --- a/memtable/skiplistrep.cc +++ b/memtable/skiplistrep.cc @@ -25,8 +25,6 @@ public: transform_(transform), lookahead_(lookahead) { } - virtual bool IsInsertConcurrentlySupported() const override { return true; } - virtual KeyHandle Allocate(const size_t len, char** buf) override { *buf = skip_list_.AllocateKey(len); return static_cast(*buf); diff --git a/tools/db_crashtest.py b/tools/db_crashtest.py index 449d85427..a10ee6c24 100644 --- a/tools/db_crashtest.py +++ b/tools/db_crashtest.py @@ -24,7 +24,7 @@ default_params = { "disable_data_sync": 0, "disable_wal": 0, "filter_deletes": lambda: random.randint(0, 1), - "allow_concurrent_memtable_write": lambda: random.randint(0, 1), + "allow_concurrent_memtable_write": 0, "iterpercent": 10, "max_background_compactions": 20, "max_bytes_for_level_base": 10485760,