From 2d30aaae47a2c4ecd5c01a90d58efa953940238b Mon Sep 17 00:00:00 2001 From: Maysam Yabandeh Date: Tue, 12 Sep 2017 14:48:19 -0700 Subject: [PATCH] Exclude incompatible options in test Summary: options.enable_pipelined_write and options.concurrent_prepare are incompatible and should not be set together. Closes https://github.com/facebook/rocksdb/pull/2875 Differential Revision: D5818358 Pulled By: maysamyabandeh fbshipit-source-id: dad862508f00817ab302f8b61729accf38315fb8 --- db/write_callback_test.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/db/write_callback_test.cc b/db/write_callback_test.cc index d2bf30a09..431ceca16 100644 --- a/db/write_callback_test.cc +++ b/db/write_callback_test.cc @@ -137,6 +137,11 @@ TEST_F(WriteCallbackTest, WriteWithCallbackTest) { options.allow_concurrent_memtable_write = allow_parallel; options.enable_pipelined_write = enable_pipelined_write; options.concurrent_prepare = two_queues; + if (options.enable_pipelined_write && + options.concurrent_prepare) { + // This combination is not supported + continue; + } ReadOptions read_options; DB* db;