Release 4.3.1

Fix BlockBasedTableTest.NoopTransformSeek failure
Summary: table_test is failing because we are creating a temp InternalComparator 14:27:28 [ RUN ] BlockBasedTableTest.NoopTransformSeek 14:27:28 pure virtual method called 14:27:28 terminate called without an active exception 14:27:28 /bin/sh: line 7: 2346261 Aborted (core dumped) ./$t Test Plan: make table_test -j64 && ./table_test --gtest_filter="BlockBasedTableTest.NoopTransformSeek" Reviewers: igor, sdong, anthony, rven Reviewed By: rven Subscribers: dhruba Differential Revision: https://reviews.facebook.net/D52671
2026-11-06 11:02:36 -05:00 · 2016-01-26 19:07:19 -08:00 · 2016-01-26 18:51:31 -08:00 · 2016-01-26 18:45:03 -08:00 · 2016-01-26 18:44:56 -08:00 · 2016-01-26 18:44:47 -08:00
287 changed files with 5208 additions and 15294 deletions
@@ -34,7 +34,7 @@ before_script:
 # as EnvPosixTest::AllocateTest expects within the Travis OpenVZ environment.
 script:
  - if [[ "${TRAVIS_OS_NAME}" == 'linux' ]]; then OPT=-DTRAVIS CLANG_FORMAT_DIFF=/tmp/clang-format-diff.py make format || true; fi
-  - OPT=-DTRAVIS V=1 make -j4 check && OPT=-DTRAVIS V=1 make clean jclean rocksdbjava jtest && make clean && OPT="-DTRAVIS -DROCKSDB_LITE" V=1 make -j4 static_lib
+  - OPT=-DTRAVIS V=1 make -j4 check && OPT=-DTRAVIS V=1 make clean jclean rocksdbjava jtest && make clean && OPT="-DTRAVIS -DROCKSDB_LITE" V=1 make -j4 check

 notifications:
    email:
@@ -13,8 +13,8 @@
 #        cd build
 # 3. Run cmake to generate project files for Windows, add more options to enable required third-party libraries.
 #    See thirdparty.inc for more information.
-#        sample command: cmake -G "Visual Studio 12 Win64" -DGFLAGS=1 -DSNAPPY=1 -DJEMALLOC=1 -DJNI=1 ..
-#        OR for VS Studio 15 cmake -G "Visual Studio 14 Win64" -DGFLAGS=1 -DSNAPPY=1 -DJEMALLOC=1 -DJNI=1 ..
+#        sample command: cmake -G "Visual Studio 12 Win64" -DGFLAGS=1 -DSNAPPY=1 -DJEMALLOC=1 ..
+#        OR for VS Studio 15 cmake -G "Visual Studio 14 Win64" -DGFLAGS=1 -DSNAPPY=1 -DJEMALLOC=1 ..
 # 4. Then build the project in debug mode (you may want to add /m[:<N>] flag to run msbuild in <N> parallel threads
 #                                          or simply /m ot use all avail cores)
 #        msbuild rocksdb.sln
@@ -30,9 +30,10 @@ cmake_minimum_required(VERSION 2.6)
 project(rocksdb)

 include(${CMAKE_CURRENT_SOURCE_DIR}/thirdparty.inc)
-execute_process(COMMAND powershell -Command "Get-Date -format MM_dd_yyyy" OUTPUT_VARIABLE DATE)
-execute_process(COMMAND powershell -Command "Get-Date -format HH:mm:ss" OUTPUT_VARIABLE TIME)
-string(REGEX REPLACE "(..)_(..)_..(..).*" "\\1/\\2/\\3" DATE ${DATE})
+
+execute_process(COMMAND $ENV{COMSPEC} " /C date /T" OUTPUT_VARIABLE DATE)
+execute_process(COMMAND $ENV{COMSPEC} " /C time /T" OUTPUT_VARIABLE TIME)
+string(REGEX REPLACE "(..)/(..)/..(..).*" "\\1/\\2/\\3" DATE ${DATE})
 string(REGEX REPLACE "(..):(.....).*" " \\1:\\2" TIME ${TIME})
 string(CONCAT GIT_DATE_TIME ${DATE} ${TIME})

@@ -59,7 +60,7 @@ add_custom_target(GenerateBuildVersion DEPENDS ${BUILD_VERSION_CC})

 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zi /nologo  /EHsc /GS /Gd /GR /GF /fp:precise /Zc:wchar_t /Zc:forScope /errorReport:queue")

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /FC /d2Zi+ /W3 /WX /wd4127 /wd4800 /wd4996 /wd4351")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /FC /d2Zi+ /W3 /WX /wd4127 /wd4244 /wd4267 /wd4800 /wd4996")

 # Used to run CI build and tests so we can run faster
 set(OPTIMIZE_DEBUG_DEFAULT 0)        # Debug build is unoptimized by default use -DOPTDBG=1 to optimize
@@ -98,7 +99,6 @@ add_subdirectory(third-party/gtest-1.7.0/fused-src/gtest)

 # Main library source code
 set(SOURCES
-        db/auto_roll_logger.cc
        db/builder.cc
        db/c.cc
        db/column_family.cc
@@ -114,7 +114,6 @@ set(SOURCES
        db/db_impl_debug.cc
        db/db_impl_experimental.cc
        db/db_impl_readonly.cc
-        db/db_info_dumper.cc
        db/db_iter.cc
        db/event_helpers.cc
        db/experimental.cc
@@ -146,12 +145,9 @@ set(SOURCES
        db/write_batch_base.cc
        db/write_controller.cc
        db/write_thread.cc
-        db/xfunc_test_points.cc
        memtable/hash_cuckoo_rep.cc
        memtable/hash_linklist_rep.cc
        memtable/hash_skiplist_rep.cc
-        memtable/skiplistrep.cc
-        memtable/vectorrep.cc
        port/stack_trace.cc
        port/win/env_win.cc
        port/win/port_win.cc
@@ -177,6 +173,7 @@ set(SOURCES
        table/merger.cc
        table/sst_file_writer.cc
        table/meta_blocks.cc
+        table/mock_table.cc
        table/plain_table_builder.cc
        table/plain_table_factory.cc
        table/plain_table_index.cc
@@ -187,22 +184,22 @@ set(SOURCES
        tools/sst_dump_tool.cc
        tools/dump/db_dump_tool.cc
        util/arena.cc
+        util/auto_roll_logger.cc
        util/bloom.cc
        util/build_version.cc
        util/cache.cc
        util/coding.cc
        util/compaction_job_stats_impl.cc
        util/comparator.cc
-        util/concurrent_arena.cc
        util/crc32c.cc
-        util/delete_scheduler.cc
+        util/db_info_dumper.cc
+        util/delete_scheduler_impl.cc
        util/dynamic_bloom.cc
        util/env.cc
        util/env_hdfs.cc
        util/event_logger.cc
        util/file_util.cc
        util/file_reader_writer.cc
-        util/sst_file_manager_impl.cc
        util/filter_policy.cc
        util/hash.cc
        util/histogram.cc
@@ -213,6 +210,7 @@ set(SOURCES
        util/logging.cc
        util/log_buffer.cc
        util/memenv.cc
+        util/mock_env.cc
        util/murmurhash.cc
        util/mutable_cf_options.cc
        util/options.cc
@@ -224,6 +222,7 @@ set(SOURCES
        util/perf_level.cc
        util/random.cc
        util/rate_limiter.cc
+        util/skiplistrep.cc
        util/slice.cc
        util/statistics.cc
        util/status.cc
@@ -237,15 +236,14 @@ set(SOURCES
        util/thread_status_updater.cc
        util/thread_status_util.cc
        util/thread_status_util_debug.cc
+        util/vectorrep.cc
        util/xfunc.cc
        util/xxhash.cc
        utilities/backupable/backupable_db.cc
        utilities/checkpoint/checkpoint.cc
-        utilities/compaction_filters/remove_emptyvalue_compactionfilter.cc
        utilities/document/document_db.cc
        utilities/document/json_document.cc
        utilities/document/json_document_builder.cc
-        utilities/env_mirror.cc
        utilities/flashcache/flashcache.cc
        utilities/geodb/geodb_impl.cc
        utilities/leveldb_options/leveldb_options.cc
@@ -275,8 +273,6 @@ set(SOURCES
 # and linked to tests. Add test only code that is not #ifdefed for Release here.
 set(TESTUTIL_SOURCE
    db/db_test_util.cc
-    table/mock_table.cc
-    util/mock_env.cc
    util/thread_status_updater_debug.cc
 )

@@ -289,17 +285,6 @@ set_target_properties(rocksdb${ARTIFACT_SUFFIX} PROPERTIES COMPILE_FLAGS "-DROCK
 add_dependencies(rocksdb${ARTIFACT_SUFFIX} GenerateBuildVersion)
 target_link_libraries(rocksdb${ARTIFACT_SUFFIX} ${LIBS})

-if (DEFINED JNI)
-  if (${JNI} EQUAL 1)
-    message(STATUS "JNI library is enabled")
-    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/java)
-  else()
-    message(STATUS "JNI library is disabled")
-  endif()
-else()
-  message(STATUS "JNI library is disabled")
-endif()
-
 set(APPS
        db/db_bench.cc
        db/memtablerep_bench.cc
@@ -316,28 +301,25 @@ set(APPS
 set(C_TESTS db/c_test.c)

 set(TESTS
-        db/auto_roll_logger_test.cc
        db/column_family_test.cc
        db/compact_files_test.cc
-        db/compaction_iterator_test.cc
        db/compaction_job_test.cc
        db/compaction_job_stats_test.cc
        db/compaction_picker_test.cc
        db/comparator_db_test.cc
        db/corruption_test.cc
        db/cuckoo_table_db_test.cc
+        db/db_iter_test.cc
+        db/db_test.cc
        db/db_compaction_filter_test.cc
        db/db_compaction_test.cc
        db/db_dynamic_level_test.cc
        db/db_inplace_update_test.cc
-        db/db_iter_test.cc
        db/db_log_iter_test.cc
-        db/db_properties_test.cc
-        db/db_table_properties_test.cc
-        db/db_tailing_iter_test.cc
-        db/db_test.cc
        db/db_universal_compaction_test.cc
        db/db_wal_test.cc
+        db/db_tailing_iter_test.cc
+        db/db_table_properties_test.cc
        db/dbformat_test.cc
        db/deletefile_test.cc
        db/fault_injection_test.cc
@@ -378,11 +360,11 @@ set(TESTS
        tools/sst_dump_test.cc
        util/arena_test.cc
        util/autovector_test.cc
+        util/auto_roll_logger_test.cc
        util/bloom_test.cc
        util/cache_test.cc
        util/coding_test.cc
        util/crc32c_test.cc
-        util/delete_scheduler_test.cc
        util/dynamic_bloom_test.cc
        util/env_test.cc
        util/event_logger_test.cc
@@ -1,30 +1,4 @@
 # Rocksdb Change Log
-## Unreleased
-
-## 4.5.1 (3/25/2016)
-### Bug Fixes
-* Fix failures caused by the destorying order of singleton objects.
-
-## 4.5.0 (2/5/2016)
-### Public API Changes
-* Add a new perf context level between kEnableCount and kEnableTime. Level 2 now does not include timers for mutexes.
-* Statistics of mutex operation durations will not be measured by default. If you want to have them enabled, you need to set Statistics::stats_level_ to kAll.
-* DBOptions::delete_scheduler and NewDeleteScheduler() are removed, please use DBOptions::sst_file_manager and NewSstFileManager() instead
-
-### New Features
-* ldb tool now supports operations to non-default column families.
-* Add kPersistedTier to ReadTier.  This option allows Get and MultiGet to read only the persited data and skip mem-tables if writes were done with disableWAL = true.
-* Add DBOptions::sst_file_manager. Use NewSstFileManager() in include/rocksdb/sst_file_manager.h to create a SstFileManager that can be used to track the total size of SST files and control the SST files deletion rate.  
-
-## 4.4.0 (1/14/2016)
-### Public API Changes
-* Change names in CompactionPri and add a new one.
-* Deprecate options.soft_rate_limit and add options.soft_pending_compaction_bytes_limit.
-* If options.max_write_buffer_number > 3, writes will be slowed down when writing to the last write buffer to delay a full stop.
-* Introduce CompactionJobInfo::compaction_reason, this field include the reason to trigger the compaction.
-* After slow down is triggered, if estimated pending compaction bytes keep increasing, slowdown more.
-* Increase default options.delayed_write_rate to 2MB/s.
-* Added a new parameter --path to ldb tool. --path accepts the name of either MANIFEST, SST or a WAL file. Either --db or --path can be used when calling ldb.

 ## 4.3.0 (12/8/2015)
 ### New Features
@@ -38,8 +12,8 @@

 ## 4.2.0 (11/9/2015)
 ### New Features
-* Introduce CreateLoggerFromOptions(), this function create a Logger for provided DBOptions.
-* Add GetAggregatedIntProperty(), which returns the sum of the GetIntProperty of all the column families.
+* Introduce CreateLoggerFromOptions(), this function create a Logger for provided DBOptions. 
+* Add GetAggregatedIntProperty(), which returns the sum of the GetIntProperty of all the column families. 
 * Add MemoryUtil in rocksdb/utilities/memory.h.  It currently offers a way to get the memory usage by type from a list rocksdb instances.

 ### Public API Changes
@@ -236,7 +210,7 @@
 * Support Multiple DB paths in universal style compactions
 * Add feature of storing plain table index and bloom filter in SST file.
 * CompactRange() will never output compacted files to level 0. This used to be the case when all the compaction input files were at level 0.
-* Added iterate_upper_bound to define the extent upto which the forward iterator will return entries. This will prevent iterating over delete markers and overwritten entries for edge cases where you want to break out the iterator anyways. This may improve performance in case there are a large number of delete markers or overwritten entries.
+* Added iterate_upper_bound to define the extent upto which the forward iterator will return entries. This will prevent iterating over delete markers and overwritten entries for edge cases where you want to break out the iterator anyways. This may improve perfomance in case there are a large number of delete markers or overwritten entries.

 ### Public API changes
 * DBOptions.db_paths now is a vector of a DBPath structure which indicates both of path and target size
@@ -21,7 +21,7 @@ depend on gflags. You will need to have gflags installed to run `make all`. This
 use binaries compiled by `make all` in production.

 * By default the binary we produce is optimized for the platform you're compiling on
-(-march=native or the equivalent). If you want to build a portable binary, add 'PORTABLE=1' before
+(-march=native). If you want to build a portable binary, add 'PORTABLE=1' before
 your make commands, like this: `PORTABLE=1 make static_lib`

 ## Dependencies
@@ -84,12 +84,10 @@ endif
 # compile with -O2 if debug level is not 2
 ifneq ($(DEBUG_LEVEL), 2)
 OPT += -O2 -fno-omit-frame-pointer
-ifeq (,$(findstring ppc64,$(MACHINE))) # ppc64[le] doesn't support -momit-leaf-frame-pointer
-ifneq ($(MACHINE),armv7l)
+ifneq ($(MACHINE),ppc64) # ppc64 doesn't support -momit-leaf-frame-pointer
 OPT += -momit-leaf-frame-pointer
 endif
 endif
-endif

 # if we're compiling for release, compile without debug code (-DNDEBUG) and
 # don't treat warnings as errors
@@ -145,9 +143,6 @@ else
 OPT += -DNDEBUG
 endif

-ifeq ($(PLATFORM), OS_SOLARIS)
-	PLATFORM_CXXFLAGS += -D _GLIBCXX_USE_C99
-endif
 ifneq ($(filter -DROCKSDB_LITE,$(OPT)),)
 	# found
 	CFLAGS += -fno-exceptions
@@ -192,6 +187,10 @@ default: all
 WARNING_FLAGS = -W -Wextra -Wall -Wsign-compare -Wshadow \
  -Wno-unused-parameter

+ifndef DISABLE_WARNING_AS_ERROR
+	WARNING_FLAGS += -Werror
+endif
+
 CFLAGS += $(WARNING_FLAGS) -I. -I./include $(PLATFORM_CCFLAGS) $(OPT)
 CXXFLAGS += $(WARNING_FLAGS) -I. -I./include $(PLATFORM_CXXFLAGS) $(OPT) -Woverloaded-virtual -Wnon-virtual-dtor -Wno-missing-field-initializers

@@ -249,7 +248,6 @@ TESTS = \
 	db_tailing_iter_test \
 	db_universal_compaction_test \
 	db_wal_test \
-	db_properties_test \
 	db_table_properties_test \
 	block_hash_index_test \
 	autovector_test \
@@ -462,7 +460,7 @@ test_names = \
      -e '/^(\s*)(\S+)/; !$$1 and do {$$p=$$2; break};'			\
      -e 'print qq! $$p$$2!'

-ifneq (,$(filter check parallel_check,$(MAKECMDGOALS)),)
+ifeq ($(MAKECMDGOALS),check)
 # Use /dev/shm if it has the sticky bit set (otherwise, /tmp),
 # and create a randomly-named rocksdb.XXXX directory therein.
 # We'll use that directory in the "make check" rules.
@@ -618,48 +616,6 @@ valgrind_check: $(TESTS)
 		fi; \
 	done

-
-ifneq ($(PAR_TEST),)
-parloop:
-	ret_bad=0;							\
-	for t in $(PAR_TEST); do		\
-		echo "===== Running $$t in parallel $(NUM_PAR)";\
-		if [ $(db_test) -eq 1 ]; then \
-			seq $(J) | v="$$t" parallel --gnu 's=$(TMPD)/rdb-{};  export TEST_TMPDIR=$$s;' \
-				'timeout 2m ./db_test --gtest_filter=$$v >> $$s/log-{} 2>1'; \
-		else\
-			seq $(J) | v="./$$t" parallel --gnu 's=$(TMPD)/rdb-{};' \
-			     'export TEST_TMPDIR=$$s; timeout 10m $$v >> $$s/log-{} 2>1'; \
-		fi; \
-		ret_code=$$?; \
-		if [ $$ret_code -ne 0 ]; then \
-			ret_bad=$$ret_code; \
-			echo $$t exited with $$ret_code; \
-		fi; \
-	done; \
-	exit $$ret_bad;
-endif
-
-all_tests:=$(shell $(test_names))
-
-parallel_check: $(TESTS)
-	$(AM_V_GEN)if test "$(J)" > 1                                  \
-	    && (parallel --gnu --help 2>/dev/null) |                    \
-	        grep -q 'GNU Parallel';                                 \
-	then                                                            \
-	    echo Running in parallel $(J);			\
-	else                                                            \
-	    echo "Need to have GNU Parallel and J > 1"; exit 1;		\
-	fi;								\
-	ret_bad=0;							\
-	echo $(J);\
-	echo Test Dir: $(TMPD); \
-        seq $(J) | parallel --gnu 's=$(TMPD)/rdb-{}; rm -rf $$s; mkdir $$s'; \
-	$(MAKE)  PAR_TEST="$(all_tests)" TMPD=$(TMPD) \
-		J=$(J) db_test=1 parloop; \
-	$(MAKE) PAR_TEST="$(filter-out db_test, $(TESTS))" \
-		TMPD=$(TMPD) J=$(J) db_test=0 parloop;
-
 analyze: clean
 	$(CLANG_SCAN_BUILD) --use-analyzer=$(CLANG_ANALYZER) \
 		--use-c++=$(CXX) --use-cc=$(CC) --status-bugs \
@@ -696,7 +652,7 @@ clean:

 tags:
 	ctags * -R
-	cscope -b `find . -name '*.cc'` `find . -name '*.h'` `find . -name '*.c'`
+	cscope -b `find . -name '*.cc'` `find . -name '*.h'`

 format:
 	build_tools/format-diff.sh
@@ -813,9 +769,6 @@ db_universal_compaction_test: db/db_universal_compaction_test.o db/db_test_util.
 db_wal_test: db/db_wal_test.o db/db_test_util.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(AM_LINK)

-db_properties_test: db/db_properties_test.o db/db_test_util.o $(LIBOBJECTS) $(TESTHARNESS)
-	$(AM_LINK)
-
 db_table_properties_test: db/db_table_properties_test.o db/db_test_util.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(AM_LINK)

@@ -852,9 +805,6 @@ json_document_test: utilities/document/json_document_test.o $(LIBOBJECTS) $(TEST
 spatial_db_test: utilities/spatialdb/spatial_db_test.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(AM_LINK)

-env_mirror_test: utilities/env_mirror_test.o $(LIBOBJECTS) $(TESTHARNESS)
-	$(AM_LINK)
-
 ttl_test: utilities/ttl/ttl_test.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(AM_LINK)

@@ -981,7 +931,7 @@ cuckoo_table_reader_test: table/cuckoo_table_reader_test.o $(LIBOBJECTS) $(TESTH
 cuckoo_table_db_test: db/cuckoo_table_db_test.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(AM_LINK)

-listener_test: db/listener_test.o db/db_test_util.o $(LIBOBJECTS) $(TESTHARNESS)
+listener_test: db/listener_test.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(AM_LINK)

 thread_list_test: util/thread_list_test.o $(LIBOBJECTS) $(TESTHARNESS)
@@ -1017,7 +967,7 @@ manual_compaction_test: db/manual_compaction_test.o $(LIBOBJECTS) $(TESTHARNESS)
 filelock_test: util/filelock_test.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(AM_LINK)

-auto_roll_logger_test: db/auto_roll_logger_test.o $(LIBOBJECTS) $(TESTHARNESS)
+auto_roll_logger_test: util/auto_roll_logger_test.o $(LIBOBJECTS) $(TESTHARNESS)
 	$(AM_LINK)

 memtable_list_test: db/memtable_list_test.o $(LIBOBJECTS) $(TESTHARNESS)
@@ -1083,11 +1033,7 @@ install: install-static
 # ---------------------------------------------------------------------------

 JAVA_INCLUDE = -I$(JAVA_HOME)/include/ -I$(JAVA_HOME)/include/linux
-ifeq ($(PLATFORM), OS_SOLARIS)
-	ARCH := $(shell isainfo -b)
-else
-	ARCH := $(shell getconf LONG_BIT)
-endif
+ARCH := $(shell getconf LONG_BIT)
 ROCKSDBJNILIB = librocksdbjni-linux$(ARCH).so
 ROCKSDB_JAR = rocksdbjni-$(ROCKSDB_MAJOR).$(ROCKSDB_MINOR).$(ROCKSDB_PATCH)-linux$(ARCH).jar
 ROCKSDB_JAR_ALL = rocksdbjni-$(ROCKSDB_MAJOR).$(ROCKSDB_MINOR).$(ROCKSDB_PATCH).jar
@@ -1095,19 +1041,14 @@ ROCKSDB_JAVADOCS_JAR = rocksdbjni-$(ROCKSDB_MAJOR).$(ROCKSDB_MINOR).$(ROCKSDB_PA
 ROCKSDB_SOURCES_JAR = rocksdbjni-$(ROCKSDB_MAJOR).$(ROCKSDB_MINOR).$(ROCKSDB_PATCH)-sources.jar

 ifeq ($(PLATFORM), OS_MACOSX)
-	ROCKSDBJNILIB = librocksdbjni-osx.jnilib
-	ROCKSDB_JAR = rocksdbjni-$(ROCKSDB_MAJOR).$(ROCKSDB_MINOR).$(ROCKSDB_PATCH)-osx.jar
+ROCKSDBJNILIB = librocksdbjni-osx.jnilib
+ROCKSDB_JAR = rocksdbjni-$(ROCKSDB_MAJOR).$(ROCKSDB_MINOR).$(ROCKSDB_PATCH)-osx.jar
 ifneq ("$(wildcard $(JAVA_HOME)/include/darwin)","")
 	JAVA_INCLUDE = -I$(JAVA_HOME)/include -I $(JAVA_HOME)/include/darwin
 else
 	JAVA_INCLUDE = -I/System/Library/Frameworks/JavaVM.framework/Headers/
 endif
 endif
-ifeq ($(PLATFORM), OS_SOLARIS)
-	ROCKSDBJNILIB = librocksdbjni-solaris$(ARCH).so
-	ROCKSDB_JAR = rocksdbjni-$(ROCKSDB_MAJOR).$(ROCKSDB_MINOR).$(ROCKSDB_PATCH)-solaris$(ARCH).jar
-	JAVA_INCLUDE = -I$(JAVA_HOME)/include/ -I$(JAVA_HOME)/include/solaris
-endif

 libz.a:
 	-rm -rf zlib-1.2.8
@@ -1201,10 +1142,11 @@ jtest: rocksdbjava
 jdb_bench:
 	cd java;$(MAKE) db_bench;

-commit_prereq: build_tools/rocksdb-lego-determinator \
-               build_tools/precommit_checker.py
-	build_tools/precommit_checker.py unit unit_481 clang_unit tsan asan lite
+commit-prereq:
+	$(MAKE) clean && $(MAKE) all check;
 	$(MAKE) clean && $(MAKE) jclean && $(MAKE) rocksdbjava;
+	$(MAKE) clean && USE_CLANG=1 $(MAKE) all;
+	$(MAKE) clean && OPT=-DROCKSDB_LITE $(MAKE) static_lib;

 xfunc:
 	for xftest in $(XFUNC_TESTS); do \
@@ -37,18 +37,3 @@ Check out our RocksDB Protobuf merge operator at: https://github.com/vladb38/roc

 ## Santanader UK/Cloudera Profession Services
 Check out their blog post: http://blog.cloudera.com/blog/2015/08/inside-santanders-near-real-time-data-ingest-architecture/
-
-## Airbnb
-Airbnb is using RocksDB as a storage engine for their personalized search service. You can learn more about it here: https://www.youtube.com/watch?v=ASQ6XMtogMs
-
-## Pinterest
-Pinterest's Object Retrieval System uses RocksDB for storage: https://www.youtube.com/watch?v=MtFEVEs_2Vo
-
-## Smyte
-[Smyte](https://www.smyte.com/) uses RocksDB as the storage layer for their core key-value storage, high-performance counters and time-windowed HyperLogLog services.
-
-## Rakuten Marketing
-[Rakuten Marketing](https://marketing.rakuten.com/) uses RocksDB as the disk cache layer for the real-time bidding service in their Performance DSP.
-
-## VWO, Wingify
-[VWO's](https://vwo.com/) Smart Code checker and URL helper uses RocksDB to store all the URLs where VWO's Smart Code is installed.
@@ -10,184 +10,13 @@ class FacebookArcanistConfiguration extends ArcanistConfiguration {
                                 ArcanistBaseWorkflow $workflow,
                                 $error_code) {
    if ($command == 'diff' && !$workflow->isRawDiffSource()) {
-      $this->startTestsInJenkins($workflow);
-      $this->startTestsInSandcastle($workflow);
+      $this->maybePushToJenkins($workflow);
    }
  }

-  //////////////////////////////////////////////////////////////////////
-  /*  Run tests in sandcastle */
-  function postURL($diffID, $url) {
-    $cmd = 'echo \'{"diff_id": "' . $diffID . '", '
-           . '"name":"click here for sandcastle tests for D' . $diffID . '", '
-           . '"link":"' . $url . '"}\' | '
-           . 'http_proxy=fwdproxy.any.facebook.com:8080 '
-           . 'https_proxy=fwdproxy.any.facebook.com:8080 arc call-conduit '
-           . 'differential.updateunitresults';
-    shell_exec($cmd);
-  }
-
-  function updateTestCommand($diffID, $test, $status) {
-    $cmd = 'echo \'{"diff_id": "' . $diffID . '", '
-           . '"name":"' . $test . '", '
-           . '"result":"' . $status . '"}\' | '
-           . 'http_proxy=fwdproxy.any.facebook.com:8080 '
-           . 'https_proxy=fwdproxy.any.facebook.com:8080 arc call-conduit '
-           . 'differential.updateunitresults';
-    return $cmd;
-  }
-
-  function updateTest($diffID, $test) {
-    shell_exec($this->updateTestCommand($diffID, $test, "waiting"));
-  }
-
-  function getSteps($diffID, $username, $test) {
-    $arcrc_content = exec("cat ~/.arcrc | gzip -f | base64 -w0");
-
-    // Sandcastle machines don't have arc setup. We copy the user certificate
-    // and authenticate using that in sandcastle
-    $setup = array(
-      "name" => "Setup arcrc",
-      "shell" => "echo " . $arcrc_content . " | base64 --decode"
-                 . " | gzip -d > ~/.arcrc",
-      "user" => "root"
-    );
-
-    // arc demands certain permission on its config
-    $fix_permission = array(
-      "name" => "Fix environment",
-      "shell" => "chmod 600 ~/.arcrc",
-      "user" => "root"
-    );
-
-    // fbcode is a sub-repo. We cannot patch until we add it to ignore otherwise
-    // git thinks it is uncommited change
-    $fix_git_ignore = array(
-      "name" => "Fix git ignore",
-      "shell" => "echo fbcode >> .git/info/exclude",
-      "user" => "root"
-    );
-
-    // Patch the code (keep your fingures crossed)
-    $patch = array(
-      "name" => "Patch " . $diffID,
-      "shell" => "HTTPS_PROXY=fwdproxy:8080 arc --arcrc-file ~/.arcrc "
-                  . "patch --diff " . $diffID,
-      "user" => "root"
-    );
-
-    // Clean up the user arc config we are using
-    $cleanup = array(
-      "name" => "Arc cleanup",
-      "shell" => "rm -f ~/.arcrc",
-      "user" => "root"
-    );
-
-    // Construct the steps in the order of execution
-    $steps[] = $setup;
-    $steps[] = $fix_permission;
-    $steps[] = $fix_git_ignore;
-    $steps[] = $patch;
-
-    // Run the actual command
-    $this->updateTest($diffID, $test);
-    $cmd = $this->updateTestCommand($diffID, $test, "running") . ";"
-           . "(./build_tools/precommit_checker.py " . $test
-           . "&& "
-           . $this->updateTestCommand($diffID, $test, "pass") . ")"
-           . "|| " . $this->updateTestCommand($diffID, $test, "fail")
-           . "; cat /tmp/precommit-check.log"
-           . "; for f in `ls t/log-*`; do echo \$f; cat \$f; done";
-
-    $run_test = array(
-      "name" => "Run " . $test,
-      "shell" => $cmd,
-      "user" => "root",
-    );
-
-    $steps[] = $run_test;
-    $steps[] = $cleanup;
-
-    return $steps;
-  }
-
-  function startTestsInSandcastle($workflow) {
-    // extract information we need from workflow or CLI
-    $diffID = $workflow->getDiffId();
-    $username = exec("whoami");
-
-    if ($diffID == null || $username == null) {
-      // there is no diff and we can't extract username
-      // we cannot schedule sandcasstle job
-      return;
-    }
-
-    if (strcmp(getenv("ROCKSDB_CHECK_ALL"), 1) == 0) {
-      // extract all tests from the CI definition
-      $output = file_get_contents("build_tools/rocksdb-lego-determinator");
-      preg_match_all('/[ ]{2}([a-zA-Z0-9_]+)[\)]{1}/', $output, $matches);
-      $tests = $matches[1];
-    } else {
-      // manually list of tests we want to run in sandcastle
-      $tests = array(
-        "unit", "unit_481", "clang_unit", "tsan", "asan", "lite", "valgrind"
-      );
-    }
-
-    // construct a job definition for each test and add it to the master plan
-    foreach ($tests as $test) {
-      $arg[] = array(
-        "name" => "RocksDB diff " . $diffID . " test " . $test,
-        "steps" => $this->getSteps($diffID, $username, $test)
-      );
-    }
-
-    // we cannot submit the parallel execution master plan to sandcastle
-    // we need supply the job plan as a determinator
-    // so we construct a small job that will spit out the master job plan
-    // which sandcastle will parse and execute
-    // Why compress ? Otherwise we run over the max string size.
-    $cmd = "echo " . base64_encode(json_encode($arg))
-           . " | gzip -f | base64 -w0";
-    $arg_encoded = shell_exec($cmd);
-
-    $command = array(
-      "name" => "Run diff " . $diffID . "for user " . $username,
-      "steps" => array()
-    );
-
-    $command["steps"][] = array(
-      "name" => "Generate determinator",
-      "shell" => "echo " . $arg_encoded . " | base64 --decode | gzip -d"
-                 . " | base64 --decode",
-      "determinator" => true,
-      "user" => "root"
-    );
-
-    // submit to sandcastle
-    $url = 'https://interngraph.intern.facebook.com/sandcastle/generate?'
-            .'command=SandcastleUniversalCommand'
-            .'&vcs=rocksdb-git&revision=origin%2Fmaster&type=lego'
-            .'&user=krad&alias=rocksdb-precommit'
-            .'&command-args=' . urlencode(json_encode($command));
-
-    $cmd = 'https_proxy= HTTPS_PROXY= curl -s -k -F app=659387027470559 '
-            . '-F token=AeO_3f2Ya3TujjnxGD4 "' . $url . '"';
-
-    $output = shell_exec($cmd);
-
-    // extract sandcastle URL from the response
-    preg_match('/url": "(.+)"/', $output, $sandcastle_url);
-
-    echo "\nSandcastle URL: " . $sandcastle_url[1] . "\n";
-
-    // Ask phabricator to display it on the diff UI
-    $this->postURL($diffID, $sandcastle_url[1]);
-  }
-
  //////////////////////////////////////////////////////////////////////
  /* Send off builds to jenkins */
-  function startTestsInJenkins($workflow) {
+  function maybePushToJenkins($workflow) {
    $diffID = $workflow->getDiffID();
    if ($diffID === null) {
      return;
@@ -202,4 +31,5 @@ class FacebookArcanistConfiguration extends ArcanistConfiguration {
               ."buildWithParameters?token=AUTH&DIFF_ID=$diffID";
    system("curl --noproxy '*' \"$url\" > /dev/null 2>&1");
  }
+
 }
@@ -52,7 +52,12 @@ if [ -z "$ROCKSDB_NO_FBCODE" -a -d /mnt/gvfs/third-party ]; then
    FBCODE_BUILD="true"
    # If we're compiling with TSAN we need pic build
    PIC_BUILD=$COMPILE_WITH_TSAN
-    source "$PWD/build_tools/fbcode_config.sh"
+    if [ -z "$ROCKSDB_FBCODE_BUILD_WITH_481" ]; then
+      source "$PWD/build_tools/fbcode_config.sh"
+    else
+      # we need this to build with MySQL. Don't use for other purposes.
+      source "$PWD/build_tools/fbcode_config4.8.1.sh"
+    fi
 fi

 # Delete existing output, if it exists
@@ -354,13 +359,7 @@ if test "$USE_SSE"; then
  # if Intel SSE instruction set is supported, set USE_SSE=1
  COMMON_FLAGS="$COMMON_FLAGS -msse -msse4.2 "
 elif test -z "$PORTABLE"; then
-  if test -n "`echo $TARGET_ARCHITECTURE | grep ^ppc64`"; then
-    # Tune for this POWER processor, treating '+' models as base models
-    POWER=`LD_SHOW_AUXV=1 /bin/true | grep AT_PLATFORM | grep -E -o power[0-9]+`
-    COMMON_FLAGS="$COMMON_FLAGS -mcpu=$POWER -mtune=$POWER "
-  else
-    COMMON_FLAGS="$COMMON_FLAGS -march=native "
-  fi
+  COMMON_FLAGS="$COMMON_FLAGS -march=native "
 fi

 PLATFORM_CCFLAGS="$PLATFORM_CCFLAGS $COMMON_FLAGS"
@@ -1,19 +0,0 @@
-# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
-GCC_BASE=/mnt/gvfs/third-party2/gcc/7331085db891a2ef4a88a48a751d834e8d68f4cb/7.x/centos7-native/b2ef2b6
-CLANG_BASE=/mnt/gvfs/third-party2/llvm-fb/963d9aeda70cc4779885b1277484fe7544a04e3e/9.0.0/platform007/9e92d53/
-LIBGCC_BASE=/mnt/gvfs/third-party2/libgcc/6ace84e956873d53638c738b6f65f3f469cca74c/7.x/platform007/5620abc
-GLIBC_BASE=/mnt/gvfs/third-party2/glibc/192b0f42d63dcf6210d6ceae387b49af049e6e0c/2.26/platform007/f259413
-SNAPPY_BASE=/mnt/gvfs/third-party2/snappy/7f9bdaada18f59bc27ec2b0871eb8a6144343aef/1.1.3/platform007/ca4da3d
-ZLIB_BASE=/mnt/gvfs/third-party2/zlib/2d9f0b9a4274cc21f61272a9e89bdb859bce8f1f/1.2.8/platform007/ca4da3d
-BZIP2_BASE=/mnt/gvfs/third-party2/bzip2/dc49a21c5fceec6456a7a28a94dcd16690af1337/1.0.6/platform007/ca4da3d
-LZ4_BASE=/mnt/gvfs/third-party2/lz4/0f607f8fc442ea7d6b876931b1898bb573d5e5da/1.9.1/platform007/ca4da3d
-ZSTD_BASE=/mnt/gvfs/third-party2/zstd/ca22bc441a4eb709e9e0b1f9fec9750fed7b31c5/1.4.x/platform007/15a3614
-GFLAGS_BASE=/mnt/gvfs/third-party2/gflags/0b9929d2588991c65a57168bf88aff2db87c5d48/2.2.0/platform007/ca4da3d
-JEMALLOC_BASE=/mnt/gvfs/third-party2/jemalloc/c26f08f47ac35fc31da2633b7da92d6b863246eb/master/platform007/c26c002
-NUMA_BASE=/mnt/gvfs/third-party2/numa/3f3fb57a5ccc5fd21c66416c0b83e0aa76a05376/2.0.11/platform007/ca4da3d
-LIBUNWIND_BASE=/mnt/gvfs/third-party2/libunwind/40c73d874898b386a71847f1b99115d93822d11f/1.4/platform007/6f3e0a9
-TBB_BASE=/mnt/gvfs/third-party2/tbb/4ce8e8dba77cdbd81b75d6f0c32fd7a1b76a11ec/2018_U5/platform007/ca4da3d
-KERNEL_HEADERS_BASE=/mnt/gvfs/third-party2/kernel-headers/fb251ecd2f5ae16f8671f7014c246e52a748fe0b/fb/platform007/da39a3e
-BINUTILS_BASE=/mnt/gvfs/third-party2/binutils/ab9f09bba370e7066cafd4eb59752db93f2e8312/2.29.1/platform007/15a3614
-VALGRIND_BASE=/mnt/gvfs/third-party2/valgrind/d42d152a15636529b0861ec493927200ebebca8e/3.15.0/platform007/ca4da3d
-LUA_BASE=/mnt/gvfs/third-party2/lua/f0cd714433206d5139df61659eb7b28b1dea6683/5.3.4/platform007/5007832
@@ -1,16 +0,0 @@
-GCC_BASE=/mnt/gvfs/third-party2/gcc/ebc96bc2fb751b5a0300b8d91a95bdf24ac1d88b/4.8.1/centos6-native/cc6c9dc
-CLANG_BASE=/mnt/vol/engshare/fbcode/third-party2/clang/3.7.1/centos6-native/9d9ecb9/
-LIBGCC_BASE=/mnt/gvfs/third-party2/libgcc/5710d6a0fb0d12820aac0bffcd7fcb8646e7fff7/4.8.1/gcc-4.8.1-glibc-2.17/8aac7fc
-GLIBC_BASE=/mnt/gvfs/third-party2/glibc/0600c95b31226b5e535614c590677d87c62d8016/2.17/gcc-4.8.1-glibc-2.17/99df8fc
-SNAPPY_BASE=/mnt/gvfs/third-party2/snappy/cbf6f1f209e5bd160bdc5d971744e039f36b1566/1.1.3/gcc-4.8.1-glibc-2.17/c3f970a
-ZLIB_BASE=/mnt/gvfs/third-party2/zlib/6d39cb54708049f527e713ad19f2aadb9d3667e8/1.2.8/gcc-4.8.1-glibc-2.17/c3f970a
-BZIP2_BASE=/mnt/gvfs/third-party2/bzip2/2ddd45f0853bfc8bb1c27f0f447236a1a26c338a/1.0.6/gcc-4.8.1-glibc-2.17/c3f970a
-LZ4_BASE=/mnt/gvfs/third-party2/lz4/6858fac689e0f92e584224d91bdb0e39f6c8320d/r131/gcc-4.8.1-glibc-2.17/c3f970a
-ZSTD_BASE=/mnt/gvfs/third-party2/zstd/69d56740ffb89d8bc81ded8ec428c01a813ea948/0.4.7/gcc-4.8.1-glibc-2.17/c3f970a
-GFLAGS_BASE=/mnt/gvfs/third-party2/gflags/c7275a4ceae0aca0929e56964a31dafc53c1ee96/2.1.1/gcc-4.8.1-glibc-2.17/c3f970a
-JEMALLOC_BASE=/mnt/gvfs/third-party2/jemalloc/5f0be745ddc0f86f22c8c8bb64b6b1163c93df91/4.0.3/gcc-4.8.1-glibc-2.17/8d31e51
-NUMA_BASE=/mnt/gvfs/third-party2/numa/ae54a5ed22cdabb1c6446dce4e8ffae5b4446d73/2.0.8/gcc-4.8.1-glibc-2.17/c3f970a
-LIBUNWIND_BASE=/mnt/gvfs/third-party2/libunwind/121f1a75c4414683aea8c70b761bfaf187f7c1a3/trunk/gcc-4.8.1-glibc-2.17/675d945
-KERNEL_HEADERS_BASE=/mnt/gvfs/third-party2/kernel-headers/1a48835975c66d30e47770ec419758ed3b9ba010/3.10.62-62_fbk17_03959_ge29cc63/gcc-4.8.1-glibc-2.17/da39a3e
-BINUTILS_BASE=/mnt/gvfs/third-party2/binutils/75670d0d8ef4891fd1ec2a7513ef01cd002c823b/2.25/centos6-native/da39a3e
-VALGRIND_BASE=/mnt/gvfs/third-party2/valgrind/af85c56f424cd5edfc2c97588299b44ecdec96bb/3.8.1/gcc-4.8.1-glibc-2.17/c3f970a
@@ -6,147 +6,128 @@
 # Environment variables that change the behavior of this script:
 # PIC_BUILD -- if true, it will only take pic versions of libraries from fbcode. libraries that don't have pic variant will not be included

-
-BASEDIR=`dirname $BASH_SOURCE`
-source "$BASEDIR/dependencies.sh"
-
 CFLAGS=""

-# libgcc
-LIBGCC_INCLUDE="$LIBGCC_BASE/include/c++/7.3.0"
-LIBGCC_LIBS=" -L $LIBGCC_BASE/lib"
+# location of libgcc
+LIBGCC_BASE="/mnt/gvfs/third-party2/libgcc/0473c80518a10d6efcbe24c5eeca3fb4ec9b519c/4.9.x/gcc-4.9-glibc-2.20/e1a7e4e"
+LIBGCC_INCLUDE="$LIBGCC_BASE/include"
+LIBGCC_LIBS=" -L $LIBGCC_BASE/libs"

-# glibc
-GLIBC_INCLUDE="$GLIBC_BASE/include"
-GLIBC_LIBS=" -L $GLIBC_BASE/lib"
+# location of glibc
+GLIBC_REV=7397bed99280af5d9543439cdb7d018af7542720
+GLIBC_INCLUDE="/mnt/gvfs/third-party2/glibc/$GLIBC_REV/2.20/gcc-4.9-glibc-2.20/99df8fc/include"
+GLIBC_LIBS=" -L /mnt/gvfs/third-party2/glibc/$GLIBC_REV/2.20/gcc-4.9-glibc-2.20/99df8fc/lib"
+
+SNAPPY_INCLUDE=" -I /mnt/gvfs/third-party2/snappy/b0f269b3ca47770121aa159b99e1d8d2ab260e1f/1.0.3/gcc-4.9-glibc-2.20/c32916f/include/"

-# snappy
-SNAPPY_INCLUDE=" -I $SNAPPY_BASE/include/"
 if test -z $PIC_BUILD; then
-  SNAPPY_LIBS=" $SNAPPY_BASE/lib/libsnappy.a"
+  SNAPPY_LIBS=" /mnt/gvfs/third-party2/snappy/b0f269b3ca47770121aa159b99e1d8d2ab260e1f/1.0.3/gcc-4.9-glibc-2.20/c32916f/lib/libsnappy.a"
 else
-  SNAPPY_LIBS=" $SNAPPY_BASE/lib/libsnappy_pic.a"
+  SNAPPY_LIBS=" /mnt/gvfs/third-party2/snappy/b0f269b3ca47770121aa159b99e1d8d2ab260e1f/1.0.3/gcc-4.9-glibc-2.20/c32916f/lib/libsnappy_pic.a"
 fi
+
 CFLAGS+=" -DSNAPPY"

 if test -z $PIC_BUILD; then
  # location of zlib headers and libraries
-  ZLIB_INCLUDE=" -I $ZLIB_BASE/include/"
-  ZLIB_LIBS=" $ZLIB_BASE/lib/libz.a"
+  ZLIB_INCLUDE=" -I /mnt/gvfs/third-party2/zlib/feb983d9667f4cf5e9da07ce75abc824764b67a1/1.2.8/gcc-4.9-glibc-2.20/4230243/include/"
+  ZLIB_LIBS=" /mnt/gvfs/third-party2/zlib/feb983d9667f4cf5e9da07ce75abc824764b67a1/1.2.8/gcc-4.9-glibc-2.20/4230243/lib/libz.a"
  CFLAGS+=" -DZLIB"

  # location of bzip headers and libraries
-  BZIP_INCLUDE=" -I $BZIP2_BASE/include/"
-  BZIP_LIBS=" $BZIP2_BASE/lib/libbz2.a"
+  BZIP_INCLUDE=" -I /mnt/gvfs/third-party2/bzip2/af004cceebb2dfd173ca29933ea5915e727aad2f/1.0.6/gcc-4.9-glibc-2.20/4230243/include/"
+  BZIP_LIBS=" /mnt/gvfs/third-party2/bzip2/af004cceebb2dfd173ca29933ea5915e727aad2f/1.0.6/gcc-4.9-glibc-2.20/4230243/lib/libbz2.a"
  CFLAGS+=" -DBZIP2"

-  LZ4_INCLUDE=" -I $LZ4_BASE/include/"
-  LZ4_LIBS=" $LZ4_BASE/lib/liblz4.a"
+  LZ4_INCLUDE=" -I /mnt/gvfs/third-party2/lz4/79d2943e2dd7208a3e0b06cf95e9f85f05fe9e1b/r124/gcc-4.9-glibc-2.20/4230243/include/"
+  LZ4_LIBS=" /mnt/gvfs/third-party2/lz4/79d2943e2dd7208a3e0b06cf95e9f85f05fe9e1b/r124/gcc-4.9-glibc-2.20/4230243/lib/liblz4.a"
  CFLAGS+=" -DLZ4"
-fi

-ZSTD_INCLUDE=" -I $ZSTD_BASE/include/"
-if test -z $PIC_BUILD; then
-  ZSTD_LIBS=" $ZSTD_BASE/lib/libzstd.a"
-else
-  ZSTD_LIBS=" $ZSTD_BASE/lib/libzstd_pic.a"
+  ZSTD_REV=810b81b4705def5243e998b54701f3c504e4009e
+  ZSTD_INCLUDE=" -I /mnt/gvfs/third-party2/zstd/$ZSTD_REV/0.4.2/gcc-4.8.1-glibc-2.17/c3f970a/include"
+  ZSTD_LIBS=" /mnt/gvfs/third-party2/zstd/$ZSTD_REV/0.4.2/gcc-4.8.1-glibc-2.17/c3f970a/lib/libzstd.a"
+  CFLAGS+=" -DZSTD"
 fi
-CFLAGS+=" -DZSTD"

 # location of gflags headers and libraries
-GFLAGS_INCLUDE=" -I $GFLAGS_BASE/include/"
+GFLAGS_INCLUDE=" -I /mnt/gvfs/third-party2/gflags/0fa60e2b88de3e469db6c482d6e6dac72f5d65f9/1.6/gcc-4.9-glibc-2.20/4230243/include/"
 if test -z $PIC_BUILD; then
-  GFLAGS_LIBS=" $GFLAGS_BASE/lib/libgflags.a"
+  GFLAGS_LIBS=" /mnt/gvfs/third-party2/gflags/0fa60e2b88de3e469db6c482d6e6dac72f5d65f9/1.6/gcc-4.9-glibc-2.20/4230243/lib/libgflags.a"
 else
-  GFLAGS_LIBS=" $GFLAGS_BASE/lib/libgflags_pic.a"
+  GFLAGS_LIBS=" /mnt/gvfs/third-party2/gflags/0fa60e2b88de3e469db6c482d6e6dac72f5d65f9/1.6/gcc-4.9-glibc-2.20/4230243/lib/libgflags_pic.a"
 fi
-CFLAGS+=" -DGFLAGS=gflags"
+CFLAGS+=" -DGFLAGS=google"

 # location of jemalloc
-JEMALLOC_INCLUDE=" -I $JEMALLOC_BASE/include/"
-JEMALLOC_LIB=" $JEMALLOC_BASE/lib/libjemalloc.a"
+JEMALLOC_INCLUDE=" -I /mnt/gvfs/third-party2/jemalloc/bcd68e5e419efa4e61b9486d6854564d6d75a0b5/3.6.0/gcc-4.9-glibc-2.20/2aafc78/include/"
+JEMALLOC_LIB=" /mnt/gvfs/third-party2/jemalloc/bcd68e5e419efa4e61b9486d6854564d6d75a0b5/3.6.0/gcc-4.9-glibc-2.20/2aafc78/lib/libjemalloc.a"

 if test -z $PIC_BUILD; then
  # location of numa
-  NUMA_INCLUDE=" -I $NUMA_BASE/include/"
-  NUMA_LIB=" $NUMA_BASE/lib/libnuma.a"
+  NUMA_INCLUDE=" -I /mnt/gvfs/third-party2/numa/bbefc39ecbf31d0ca184168eb613ef8d397790ee/2.0.8/gcc-4.9-glibc-2.20/4230243/include/"
+  NUMA_LIB=" /mnt/gvfs/third-party2/numa/bbefc39ecbf31d0ca184168eb613ef8d397790ee/2.0.8/gcc-4.9-glibc-2.20/4230243/lib/libnuma.a"
  CFLAGS+=" -DNUMA"

  # location of libunwind
-  LIBUNWIND="$LIBUNWIND_BASE/lib/libunwind.a"
+  LIBUNWIND="/mnt/gvfs/third-party2/libunwind/1de3b75e0afedfe5585b231bbb340ec7a1542335/1.1/gcc-4.9-glibc-2.20/34235e8/lib/libunwind.a"
 fi

-# location of TBB
-TBB_INCLUDE=" -isystem $TBB_BASE/include/"
-if test -z $PIC_BUILD; then
-  TBB_LIBS="$TBB_BASE/lib/libtbb.a"
-else
-  TBB_LIBS="$TBB_BASE/lib/libtbb_pic.a"
-fi
-CFLAGS+=" -DTBB"
-
 # use Intel SSE support for checksum calculations
 export USE_SSE=1

-BINUTILS="$BINUTILS_BASE/bin"
+BINUTILS="/mnt/gvfs/third-party2/binutils/0b6ad0c88ddd903333a48ae8bff134efac468e4a/2.25/centos6-native/da39a3e/bin"
 AR="$BINUTILS/ar"

-DEPS_INCLUDE="$SNAPPY_INCLUDE $ZLIB_INCLUDE $BZIP_INCLUDE $LZ4_INCLUDE $ZSTD_INCLUDE $GFLAGS_INCLUDE $NUMA_INCLUDE $TBB_INCLUDE"
+DEPS_INCLUDE="$SNAPPY_INCLUDE $ZLIB_INCLUDE $BZIP_INCLUDE $LZ4_INCLUDE $ZSTD_INCLUDE $GFLAGS_INCLUDE $NUMA_INCLUDE"

+GCC_BASE="/mnt/gvfs/third-party2/gcc/1c67a0b88f64d4d9ced0382d141c76aaa7d62fba/4.9.x/centos6-native/1317bc4"
 STDLIBS="-L $GCC_BASE/lib64"

-CLANG_BIN="$CLANG_BASE/bin"
-CLANG_LIB="$CLANG_BASE/lib"
-CLANG_SRC="$CLANG_BASE/../../src"
-
+CLANG_BASE="/mnt/gvfs/third-party2/clang/d81444dd214df3d2466734de45bb264a0486acc3/dev"
+CLANG_BIN="$CLANG_BASE/centos6-native/af4b1a0/bin"
 CLANG_ANALYZER="$CLANG_BIN/clang++"
-CLANG_SCAN_BUILD="$CLANG_SRC/llvm/tools/clang/tools/scan-build/bin/scan-build"
+CLANG_SCAN_BUILD="$CLANG_BASE/src/clang/tools/scan-build/scan-build"

 if [ -z "$USE_CLANG" ]; then
  # gcc
  CC="$GCC_BASE/bin/gcc"
  CXX="$GCC_BASE/bin/g++"
-
+  
  CFLAGS+=" -B$BINUTILS/gold"
-  CFLAGS+=" -isystem $LIBGCC_INCLUDE"
  CFLAGS+=" -isystem $GLIBC_INCLUDE"
-  JEMALLOC=1
+  CFLAGS+=" -isystem $LIBGCC_INCLUDE"
 else
-  # clang
-  CLANG_INCLUDE="$CLANG_LIB/clang/stable/include"
+  # clang 
+  CLANG_INCLUDE="$CLANG_BASE/gcc-4.9-glibc-2.20/74c386f/lib/clang/dev/include/"
  CC="$CLANG_BIN/clang"
  CXX="$CLANG_BIN/clang++"

-  KERNEL_HEADERS_INCLUDE="$KERNEL_HEADERS_BASE/include"
+  KERNEL_HEADERS_INCLUDE="/mnt/gvfs/third-party2/kernel-headers/ffd14f660a43c4b92717986b1bba66722ef089d0/3.2.18_70_fbk11_00129_gc8882d0/gcc-4.9-glibc-2.20/da39a3e/include"

  CFLAGS+=" -B$BINUTILS/gold -nostdinc -nostdlib"
-  CFLAGS+=" -isystem $LIBGCC_BASE/include/c++/7.x "
-  CFLAGS+=" -isystem $LIBGCC_BASE/include/c++/7.x/x86_64-facebook-linux "
+  CFLAGS+=" -isystem $LIBGCC_BASE/include/c++/4.9.x "
+  CFLAGS+=" -isystem $LIBGCC_BASE/include/c++/4.9.x/x86_64-facebook-linux "
  CFLAGS+=" -isystem $GLIBC_INCLUDE"
  CFLAGS+=" -isystem $LIBGCC_INCLUDE"
  CFLAGS+=" -isystem $CLANG_INCLUDE"
  CFLAGS+=" -isystem $KERNEL_HEADERS_INCLUDE/linux "
  CFLAGS+=" -isystem $KERNEL_HEADERS_INCLUDE "
-  CFLAGS+=" -Wno-expansion-to-defined "
  CXXFLAGS="-nostdinc++"
 fi

 CFLAGS+=" $DEPS_INCLUDE"
-CFLAGS+=" -DROCKSDB_PLATFORM_POSIX -DROCKSDB_LIB_IO_POSIX -DROCKSDB_FALLOCATE_PRESENT -DROCKSDB_MALLOC_USABLE_SIZE -DROCKSDB_RANGESYNC_PRESENT -DROCKSDB_SCHED_GETCPU_PRESENT -DROCKSDB_SUPPORT_THREAD_LOCAL -DHAVE_SSE42"
+CFLAGS+=" -DROCKSDB_PLATFORM_POSIX -DROCKSDB_LIB_IO_POSIX -DROCKSDB_FALLOCATE_PRESENT -DROCKSDB_MALLOC_USABLE_SIZE"
 CXXFLAGS+=" $CFLAGS"

-EXEC_LDFLAGS=" $SNAPPY_LIBS $ZLIB_LIBS $BZIP_LIBS $LZ4_LIBS $ZSTD_LIBS $GFLAGS_LIBS $NUMA_LIB $TBB_LIBS"
-EXEC_LDFLAGS+=" -B$BINUTILS/gold"
-EXEC_LDFLAGS+=" -Wl,--dynamic-linker,/usr/local/fbcode/platform007/lib/ld.so"
+EXEC_LDFLAGS=" $SNAPPY_LIBS $ZLIB_LIBS $BZIP_LIBS $LZ4_LIBS $ZSTD_LIBS $GFLAGS_LIBS $NUMA_LIB"
+EXEC_LDFLAGS+=" -Wl,--dynamic-linker,/usr/local/fbcode/gcc-4.9-glibc-2.20/lib/ld.so"
 EXEC_LDFLAGS+=" $LIBUNWIND"
-EXEC_LDFLAGS+=" -Wl,-rpath=/usr/local/fbcode/platform007/lib"
-# required by libtbb
-EXEC_LDFLAGS+=" -ldl"
+EXEC_LDFLAGS+=" -Wl,-rpath=/usr/local/fbcode/gcc-4.9-glibc-2.20/lib"

 PLATFORM_LDFLAGS="$LIBGCC_LIBS $GLIBC_LIBS $STDLIBS -lgcc -lstdc++"

-EXEC_LDFLAGS_SHARED="$SNAPPY_LIBS $ZLIB_LIBS $BZIP_LIBS $LZ4_LIBS $ZSTD_LIBS $GFLAGS_LIBS $TBB_LIBS"
+EXEC_LDFLAGS_SHARED="$SNAPPY_LIBS $ZLIB_LIBS $BZIP_LIBS $LZ4_LIBS $ZSTD_LIBS $GFLAGS_LIBS"

-VALGRIND_VER="$VALGRIND_BASE/bin/"
+VALGRIND_VER="/mnt/gvfs/third-party2/valgrind/6c45ef049cbf11c2df593addb712cd891049e737/3.10.0/gcc-4.9-glibc-2.20/4230243/bin/"

-export CC CXX AR CFLAGS CXXFLAGS EXEC_LDFLAGS EXEC_LDFLAGS_SHARED VALGRIND_VER JEMALLOC_LIB JEMALLOC_INCLUDE CLANG_ANALYZER CLANG_SCAN_BUILD 
+export CC CXX AR CFLAGS CXXFLAGS EXEC_LDFLAGS EXEC_LDFLAGS_SHARED VALGRIND_VER JEMALLOC_LIB JEMALLOC_INCLUDE CLANG_ANALYZER CLANG_SCAN_BUILD
@@ -4,77 +4,85 @@
 # fbcode settings.  It uses the latest g++ compiler and also
 # uses jemalloc

-BASEDIR=`dirname $BASH_SOURCE`
-source "$BASEDIR/dependencies_4.8.1.sh"
-
 # location of libgcc
+LIBGCC_BASE="/mnt/gvfs/third-party2/libgcc/d00277f4559e261ed0a81f30f23c0ce5564e359e/4.8.1/gcc-4.8.1-glibc-2.17/8aac7fc"
 LIBGCC_INCLUDE="$LIBGCC_BASE/include"
 LIBGCC_LIBS=" -L $LIBGCC_BASE/libs"

 # location of glibc
-GLIBC_INCLUDE="$GLIBC_BASE/include"
-GLIBC_LIBS=" -L $GLIBC_BASE/lib"
+GLIBC_REV=0600c95b31226b5e535614c590677d87c62d8016
+GLIBC_INCLUDE="/mnt/gvfs/third-party2/glibc/$GLIBC_REV/2.17/gcc-4.8.1-glibc-2.17/99df8fc/include"
+GLIBC_LIBS=" -L /mnt/gvfs/third-party2/glibc/$GLIBC_REV/2.17/gcc-4.8.1-glibc-2.17/99df8fc/lib"

 # location of snappy headers and libraries
-SNAPPY_INCLUDE=" -I $SNAPPY_BASE/include"
-SNAPPY_LIBS=" $SNAPPY_BASE/lib/libsnappy.a"
+SNAPPY_REV=cbf6f1f209e5bd160bdc5d971744e039f36b1566
+SNAPPY_INCLUDE=" -I /mnt/gvfs/third-party2/snappy/$SNAPPY_REV/1.1.3/gcc-4.8.1-glibc-2.17/c3f970a/include"
+SNAPPY_LIBS=" /mnt/gvfs/third-party2/snappy/$SNAPPY_REV/1.1.3/gcc-4.8.1-glibc-2.17/c3f970a/lib/libsnappy.a"

 # location of zlib headers and libraries
-ZLIB_INCLUDE=" -I $ZLIB_BASE/include"
-ZLIB_LIBS=" $ZLIB_BASE/lib/libz.a"
+ZLIB_REV=6d39cb54708049f527e713ad19f2aadb9d3667e8
+ZLIB_INCLUDE=" -I /mnt/gvfs/third-party2/zlib/$ZLIB_REV/1.2.8/gcc-4.8.1-glibc-2.17/c3f970a/include"
+ZLIB_LIBS=" /mnt/gvfs/third-party2/zlib/$ZLIB_REV/1.2.8/gcc-4.8.1-glibc-2.17/c3f970a/lib/libz.a"

 # location of bzip headers and libraries
-BZIP2_INCLUDE=" -I $BZIP2_BASE/include/"
-BZIP2_LIBS=" $BZIP2_BASE/lib/libbz2.a"
+BZIP_REV=d6c789bfc2ec4c51a63d66df2878926b8158cde8
+BZIP_INCLUDE=" -I /mnt/gvfs/third-party2/bzip2/$BZIP_REV/1.0.6/gcc-4.8.1-glibc-2.17/c3f970a/include/"
+BZIP_LIBS=" /mnt/gvfs/third-party2/bzip2/$BZIP_REV/1.0.6/gcc-4.8.1-glibc-2.17/c3f970a/lib/libbz2.a"

-LZ4_INCLUDE=" -I $LZ4_BASE/include"
-LZ4_LIBS=" $LZ4_BASE/lib/liblz4.a"
+LZ4_REV=6858fac689e0f92e584224d91bdb0e39f6c8320d
+LZ4_INCLUDE=" -I /mnt/gvfs/third-party2/lz4/$LZ4_REV/r131/gcc-4.8.1-glibc-2.17/c3f970a/include"
+LZ4_LIBS=" /mnt/gvfs/third-party2/lz4/$LZ4_REV/r131/gcc-4.8.1-glibc-2.17/c3f970a/lib/liblz4.a"

-ZSTD_INCLUDE=" -I $ZSTD_BASE/include"
-ZSTD_LIBS=" $ZSTD_BASE/lib/libzstd.a"
+ZSTD_REV=810b81b4705def5243e998b54701f3c504e4009e
+ZSTD_INCLUDE=" -I /mnt/gvfs/third-party2/zstd/$ZSTD_REV/0.4.2/gcc-4.8.1-glibc-2.17/c3f970a/include"
+ZSTD_LIBS=" /mnt/gvfs/third-party2/zstd/$ZSTD_REV/0.4.2/gcc-4.8.1-glibc-2.17/c3f970a/lib/libzstd.a"

 # location of gflags headers and libraries
-GFLAGS_INCLUDE=" -I $GFLAGS_BASE/include/"
-GFLAGS_LIBS=" $GFLAGS_BASE/lib/libgflags.a"
+GFLAGS_REV=c7275a4ceae0aca0929e56964a31dafc53c1ee96
+GFLAGS_INCLUDE=" -I /mnt/gvfs/third-party2/gflags/$GFLAGS_REV/2.1.1/gcc-4.8.1-glibc-2.17/c3f970a/include/"
+GFLAGS_LIBS=" /mnt/gvfs/third-party2/gflags/$GFLAGS_REV/2.1.1/gcc-4.8.1-glibc-2.17/c3f970a/lib/libgflags.a"

 # location of jemalloc
-JEMALLOC_INCLUDE=" -I $JEMALLOC_BASE/include"
-JEMALLOC_LIB="$JEMALLOC_BASE/lib/libjemalloc.a"
+JEMALLOC_REV=c370265e58c4b6602e798df23335a1e9913dae52
+JEMALLOC_INCLUDE=" -I /mnt/gvfs/third-party2/jemalloc/$JEMALLOC_REV/4.0.3/gcc-4.8.1-glibc-2.17/8d31e51/include"
+JEMALLOC_LIB="/mnt/gvfs/third-party2/jemalloc/$JEMALLOC_REV/4.0.3/gcc-4.8.1-glibc-2.17/8d31e51/lib/libjemalloc.a"

 # location of numa
-NUMA_INCLUDE=" -I $NUMA_BASE/include/"
-NUMA_LIB=" $NUMA_BASE/lib/libnuma.a"
+NUMA_REV=ae54a5ed22cdabb1c6446dce4e8ffae5b4446d73
+NUMA_INCLUDE=" -I /mnt/gvfs/third-party2/numa/$NUMA_REV/2.0.8/gcc-4.8.1-glibc-2.17/c3f970a/include/"
+NUMA_LIB=" /mnt/gvfs/third-party2/numa/$NUMA_REV/2.0.8/gcc-4.8.1-glibc-2.17/c3f970a/lib/libnuma.a"

 # location of libunwind
-LIBUNWIND="$LIBUNWIND_BASE/lib/libunwind.a"
+LIBUNWIND_REV=121f1a75c4414683aea8c70b761bfaf187f7c1a3
+LIBUNWIND="/mnt/gvfs/third-party2/libunwind/$LIBUNWIND_REV/trunk/gcc-4.8.1-glibc-2.17/675d945/lib/libunwind.a"

 # use Intel SSE support for checksum calculations
 export USE_SSE=1

-BINUTILS="$BINUTILS_BASE/bin"
+BINUTILS="/mnt/gvfs/third-party2/binutils/75670d0d8ef4891fd1ec2a7513ef01cd002c823b/2.25/centos6-native/da39a3e/bin"
 AR="$BINUTILS/ar"

-DEPS_INCLUDE="$SNAPPY_INCLUDE $ZLIB_INCLUDE $BZIP2_INCLUDE $LZ4_INCLUDE $ZSTD_INCLUDE $GFLAGS_INCLUDE $NUMA_INCLUDE"
+DEPS_INCLUDE="$SNAPPY_INCLUDE $ZLIB_INCLUDE $BZIP_INCLUDE $LZ4_INCLUDE $ZSTD_INCLUDE $GFLAGS_INCLUDE $NUMA_INCLUDE"

+GCC_BASE="/mnt/gvfs/third-party2/gcc/c0064002d2609ab649603f769f0bd110bbe48029/4.8.1/centos6-native/cc6c9dc"
 STDLIBS="-L $GCC_BASE/lib64"

 if [ -z "$USE_CLANG" ]; then
  # gcc
  CC="$GCC_BASE/bin/gcc"
  CXX="$GCC_BASE/bin/g++"
-
+  
  CFLAGS="-B$BINUTILS/gold -m64 -mtune=generic"
  CFLAGS+=" -isystem $GLIBC_INCLUDE"
  CFLAGS+=" -isystem $LIBGCC_INCLUDE"
 else
-  # clang
-  CLANG_BIN="$CLANG_BASE/bin"
-  CLANG_LIB="$CLANG_BASE/lib"
-  CLANG_INCLUDE="$CLANG_LIB/clang/*/include"
-  CC="$CLANG_BIN/clang"
-  CXX="$CLANG_BIN/clang++"
+  # clang 
+  CLANG_BASE="/mnt/gvfs/third-party2/clang/ab054e9a490a8fd4537c0b6ec56e5c91c0f81c91/3.4"
+  CLANG_INCLUDE="$CLANG_BASE/gcc-4.8.1-glibc-2.17/fb0f730/lib/clang/3.4/include"
+  CC="$CLANG_BASE/centos6-native/9cefd8a/bin/clang"
+  CXX="$CLANG_BASE/centos6-native/9cefd8a/bin/clang++"

-  KERNEL_HEADERS_INCLUDE="$KERNEL_HEADERS_BASE/include/"
+  KERNEL_HEADERS_INCLUDE="/mnt/gvfs/third-party2/kernel-headers/1a48835975c66d30e47770ec419758ed3b9ba010/3.10.62-62_fbk17_03959_ge29cc63/gcc-4.8.1-glibc-2.17/da39a3e/include/"

  CFLAGS="-B$BINUTILS/gold -nostdinc -nostdlib"
  CFLAGS+=" -isystem $LIBGCC_BASE/include/c++/4.8.1 "
@@ -92,15 +100,16 @@ CFLAGS+=" -DROCKSDB_PLATFORM_POSIX -DROCKSDB_LIB_IO_POSIX -DROCKSDB_FALLOCATE_PR
 CFLAGS+=" -DSNAPPY -DGFLAGS=google -DZLIB -DBZIP2 -DLZ4 -DZSTD -DNUMA"
 CXXFLAGS+=" $CFLAGS"

-EXEC_LDFLAGS=" $SNAPPY_LIBS $ZLIB_LIBS $BZIP2_LIBS $LZ4_LIBS $ZSTD_LIBS $GFLAGS_LIBS $NUMA_LIB"
+EXEC_LDFLAGS=" $SNAPPY_LIBS $ZLIB_LIBS $BZIP_LIBS $LZ4_LIBS $ZSTD_LIBS $GFLAGS_LIBS $NUMA_LIB"
 EXEC_LDFLAGS+=" -Wl,--dynamic-linker,/usr/local/fbcode/gcc-4.8.1-glibc-2.17/lib/ld.so"
 EXEC_LDFLAGS+=" $LIBUNWIND"
 EXEC_LDFLAGS+=" -Wl,-rpath=/usr/local/fbcode/gcc-4.8.1-glibc-2.17/lib"

 PLATFORM_LDFLAGS="$LIBGCC_LIBS $GLIBC_LIBS $STDLIBS -lgcc -lstdc++"

-EXEC_LDFLAGS_SHARED="$SNAPPY_LIBS $ZLIB_LIBS $BZIP2_LIBS $LZ4_LIBS $ZSTD_LIBS $GFLAGS_LIBS"
+EXEC_LDFLAGS_SHARED="$SNAPPY_LIBS $ZLIB_LIBS $BZIP_LIBS $LZ4_LIBS $ZSTD_LIBS $GFLAGS_LIBS"

-VALGRIND_VER="$VALGRIND_BASE/bin/"
+VALGRIND_REV=af85c56f424cd5edfc2c97588299b44ecdec96bb
+VALGRIND_VER="/mnt/gvfs/third-party2/valgrind/$VALGRIND_REV/3.8.1/gcc-4.8.1-glibc-2.17/c3f970a/bin/"

 export CC CXX AR CFLAGS CXXFLAGS EXEC_LDFLAGS EXEC_LDFLAGS_SHARED VALGRIND_VER JEMALLOC_LIB JEMALLOC_INCLUDE
@@ -1,198 +0,0 @@
-#!/usr/local/fbcode/gcc-4.8.1-glibc-2.17-fb/bin/python2.7
-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-import argparse
-import commands
-import subprocess
-import sys
-import re
-import os
-import time
-
-#
-# Simple logger
-#
-
-
-class Log:
-
-    LOG_FILE = "/tmp/precommit-check.log"
-
-    def __init__(self):
-        self.filename = Log.LOG_FILE
-        self.f = open(self.filename, 'w+', 0)
-
-    def caption(self, str):
-        line = "\n##### %s #####\n" % str
-        if self.f:
-            self.f.write("%s \n" % line)
-        else:
-            print(line)
-
-    def error(self, str):
-        data = "\n\n##### ERROR ##### %s" % str
-        if self.f:
-            self.f.write("%s \n" % data)
-        else:
-            print(data)
-
-    def log(self, str):
-        if self.f:
-            self.f.write("%s \n" % str)
-        else:
-            print(str)
-
-#
-# Shell Environment
-#
-
-
-class Env(object):
-
-    def __init__(self, tests):
-        self.tests = tests
-        self.log = Log()
-
-    def shell(self, cmd, path=os.getcwd()):
-        if path:
-            os.chdir(path)
-
-        self.log.log("==== shell session ===========================")
-        self.log.log("%s> %s" % (path, cmd))
-        status = subprocess.call("cd %s; %s" % (path, cmd), shell=True,
-                                 stdout=self.log.f, stderr=self.log.f)
-        self.log.log("status = %s" % status)
-        self.log.log("============================================== \n\n")
-        return status
-
-    def GetOutput(self, cmd, path=os.getcwd()):
-        if path:
-            os.chdir(path)
-
-        self.log.log("==== shell session ===========================")
-        self.log.log("%s> %s" % (path, cmd))
-        status, out = commands.getstatusoutput(cmd)
-        self.log.log("status = %s" % status)
-        self.log.log("out = %s" % out)
-        self.log.log("============================================== \n\n")
-        return status, out
-
-#
-# Pre-commit checker
-#
-
-
-class PreCommitChecker(Env):
-
-    def __init__(self, tests):
-        Env.__init__(self, tests)
-
-    #
-    #   Get commands for a given job from the determinator file
-    #
-    def get_commands(self, test):
-        status, out = self.GetOutput(
-            "build_tools/rocksdb-lego-determinator %s" % test, ".")
-        return status, out
-
-    #
-    # Run a specific CI job
-    #
-    def run_test(self, test):
-        self.log.caption("Running test %s locally" % test)
-
-        # get commands for the CI job determinator
-        status, cmds = self.get_commands(test)
-        if status != 0:
-            self.log.error("Error getting commands for test %s" % test)
-            return False
-
-        # Parse the JSON to extract the commands to run
-        cmds = re.findall("'shell':'([^\']*)'", cmds)
-
-        if len(cmds) == 0:
-            self.log.log("No commands found")
-            return False
-
-        # Run commands
-        for cmd in cmds:
-            # Replace J=<..> with the local environment variable
-            if "J" in os.environ:
-                cmd = cmd.replace("J=1", "J=%s" % os.environ["J"])
-                cmd = cmd.replace("make ", "make -j%s " % os.environ["J"])
-            # Run the command
-            status = self.shell(cmd, ".")
-            if status != 0:
-                self.log.error("Error running command %s for test %s"
-                               % (cmd, test))
-                return False
-
-        return True
-
-    #
-    # Run specified CI jobs
-    #
-    def run_tests(self):
-        if not self.tests:
-            self.log.error("Invalid args. Please provide tests")
-            return False
-
-        self.print_separator()
-        self.print_row("TEST", "RESULT")
-        self.print_separator()
-
-        for test in self.tests:
-            start_time = time.time()
-            self.print_test(test)
-            result = self.run_test(test)
-            elapsed_min = (time.time() - start_time) / 60
-            if not result:
-                self.log.error("Error running test %s" % test)
-                self.print_result("FAIL (%dm)" % elapsed_min)
-                return False
-            self.print_result("PASS (%dm)" % elapsed_min)
-
-        self.print_separator()
-        return True
-
-    #
-    # Print a line
-    #
-    def print_separator(self):
-        print("".ljust(60, "-"))
-
-    #
-    # Print two colums
-    #
-    def print_row(self, c0, c1):
-        print("%s%s" % (c0.ljust(40), c1.ljust(20)))
-
-    def print_test(self, test):
-        print(test.ljust(40), end="")
-        sys.stdout.flush()
-
-    def print_result(self, result):
-        print(result.ljust(20))
-
-#
-# Main
-#
-parser = argparse.ArgumentParser(description='RocksDB pre-commit checker.')
-
-# <test ....>
-parser.add_argument('test', nargs='+',
-                    help='CI test(s) to run. e.g: unit punit asan tsan')
-
-print("Please follow log %s" % Log.LOG_FILE)
-
-args = parser.parse_args()
-checker = PreCommitChecker(args.test)
-
-if not checker.run_tests():
-    print("Error running tests. Please check log file %s" % Log.LOG_FILE)
-    sys.exit(1)
-
-sys.exit(0)
@@ -243,7 +243,7 @@ make release
    --bloom_bits=10 \
    --num=$((NUM / 4)) \
    --reads=$((NUM / 4)) \
-    --benchmark_write_rate_limit=$(( 110 * 1024 )) \
+    --writes_per_second=1000 \
    --write_buffer_size=100000000 \
    --cache_size=6442450944 \
    --cache_numshardbits=6 \
@@ -329,7 +329,7 @@ common_in_mem_args="--db=/dev/shm/rocksdb \
    --use_existing_db=1 \
    --duration=600 \
    --threads=32 \
-    --benchmark_write_rate_limit=9502720 > ${STAT_FILE}.readwhilewriting_in_ram
+    --writes_per_second=81920 > ${STAT_FILE}.readwhilewriting_in_ram

 # Seekrandomwhilewriting
 ./db_bench \
@@ -342,7 +342,7 @@ common_in_mem_args="--db=/dev/shm/rocksdb \
    --use_tailing_iterator=1 \
    --duration=600 \
    --threads=32 \
-    --benchmark_write_rate_limit=9502720 > ${STAT_FILE}.seekwhilewriting_in_ram
+    --writes_per_second=81920 > ${STAT_FILE}.seekwhilewriting_in_ram

 # measure fillseq with bunch of column families
 ./db_bench \
@@ -68,7 +68,7 @@ CLANG="USE_CLANG=1"
 LITE="OPT=-DROCKSDB_LITE"
 TSAN="COMPILE_WITH_TSAN=1"
 DISABLE_JEMALLOC="DISABLE_JEMALLOC=1"
-PARSER="'parser':'egrep \'Failure|^#|Abort|Expected|Actual|GoogleTestFailure|^==\''"
+PARSER="'parser':'egrep \'Failure|^#|Abort\''"

 ARTIFACTS=" 'artifacts': [
    {
@@ -1,5 +1,5 @@
 # This script enables you running RocksDB tests by running
-# All the tests in parallel and utilizing all the cores
+# All the tests in paralell and utilizing all the cores
 # For db_test the script first lists and parses the tests
 # and then fires them up in parallel using async PS Job functionality
 # Run the script from the enlistment
@@ -258,7 +258,7 @@ function RunJobs($TestToLog, [int]$ConcurrencyVal, [bool]$AddForRerun)
            Write-Warning $message
            $log_content | Write-Warning
        } else {
-            # Scan the log. If we find PASSED and no occurrence of FAILED
+            # Scan the log. If we find PASSED and no occurence of FAILED
            # then it is a success
            [bool]$pass_found = $false
            ForEach($l in $log_content) {
@@ -315,4 +315,4 @@ if(!$success) {
    exit 12345
 }

- 
+ 
@@ -1,127 +0,0 @@
-#!/bin/sh
-#
-# Update dependencies.sh file with the latest avaliable versions
-
-BASEDIR=$(dirname $0)
-OUTPUT=""
-
-function log_variable()
-{
-  echo "$1=${!1}" >> "$OUTPUT"
-}
-
-
-TP2_LATEST="/mnt/vol/engshare/fbcode/third-party2"
-## $1 => lib name
-## $2 => lib version (if not provided, will try to pick latest)
-## $3 => platform (if not provided, will try to pick latest gcc)
-##
-## get_lib_base will set a variable named ${LIB_NAME}_BASE to the lib location
-function get_lib_base()
-{
-  local lib_name=$1
-  local lib_version=$2
-  local lib_platform=$3
-
-  local result="$TP2_LATEST/$lib_name/"
-  
-  # Lib Version
-  if [ -z "$lib_version" ] || [ "$lib_version" = "LATEST" ]; then
-    # version is not provided, use latest
-    result=`ls -dr1v $result/*/ | head -n1`
-  else
-    result="$result/$lib_version/"
-  fi
-  
-  # Lib Platform
-  if [ -z "$lib_platform" ]; then
-    # platform is not provided, use latest gcc
-    result=`ls -dr1v $result/gcc-*[^fb]/ | head -n1`
-  else
-    result="$result/$lib_platform/"
-  fi
-  
-  result=`ls -1d $result/*/ | head -n1`
-  
-  # lib_name => LIB_NAME_BASE
-  local __res_var=${lib_name^^}"_BASE"
-  __res_var=`echo $__res_var | tr - _`
-  # LIB_NAME_BASE=$result
-  eval $__res_var=`readlink -f $result`
-  
-  log_variable $__res_var
-}
-
-###########################################################
-#                   4.9.x dependencies                    #
-###########################################################
-
-OUTPUT="$BASEDIR/dependencies.sh"
-
-rm -f "$OUTPUT"
-touch "$OUTPUT"
-
-echo "Writing dependencies to $OUTPUT"
-
-# Compilers locations
-GCC_BASE=`readlink -f $TP2_LATEST/gcc/4.9.x/centos6-native/*/`
-CLANG_BASE=`readlink -f $TP2_LATEST/llvm-fb/stable/centos6-native/*/`
-
-log_variable GCC_BASE
-log_variable CLANG_BASE
-
-# Libraries locations
-get_lib_base libgcc     4.9.x
-get_lib_base glibc      2.20 
-get_lib_base snappy     LATEST
-get_lib_base zlib       LATEST
-get_lib_base bzip2      LATEST
-get_lib_base lz4        LATEST
-get_lib_base zstd       LATEST
-get_lib_base gflags     LATEST
-get_lib_base jemalloc   LATEST
-get_lib_base numa       LATEST
-get_lib_base libunwind  LATEST
-
-get_lib_base kernel-headers LATEST 
-get_lib_base binutils   LATEST centos6-native 
-get_lib_base valgrind   LATEST
-
-git diff $OUTPUT
-
-###########################################################
-#                   4.8.1 dependencies                    #
-###########################################################
-
-OUTPUT="$BASEDIR/dependencies_4.8.1.sh"
-
-rm -f "$OUTPUT"
-touch "$OUTPUT"
-
-echo "Writing 4.8.1 dependencies to $OUTPUT"
-
-# Compilers locations
-GCC_BASE=`readlink -f $TP2_LATEST/gcc/4.8.1/centos6-native/*/`
-CLANG_BASE=`readlink -f $TP2_LATEST/llvm-fb/stable/centos6-native/*/`
-
-log_variable GCC_BASE
-log_variable CLANG_BASE
-
-# Libraries locations
-get_lib_base libgcc     4.8.1  gcc-4.8.1-glibc-2.17
-get_lib_base glibc      2.17   gcc-4.8.1-glibc-2.17  
-get_lib_base snappy     LATEST gcc-4.8.1-glibc-2.17
-get_lib_base zlib       LATEST gcc-4.8.1-glibc-2.17
-get_lib_base bzip2      LATEST gcc-4.8.1-glibc-2.17
-get_lib_base lz4        LATEST gcc-4.8.1-glibc-2.17
-get_lib_base zstd       LATEST gcc-4.8.1-glibc-2.17
-get_lib_base gflags     LATEST gcc-4.8.1-glibc-2.17
-get_lib_base jemalloc   LATEST gcc-4.8.1-glibc-2.17
-get_lib_base numa       LATEST gcc-4.8.1-glibc-2.17
-get_lib_base libunwind  LATEST gcc-4.8.1-glibc-2.17
-
-get_lib_base kernel-headers LATEST gcc-4.8.1-glibc-2.17 
-get_lib_base binutils   LATEST centos6-native 
-get_lib_base valgrind   3.8.1  gcc-4.8.1-glibc-2.17
-
-git diff $OUTPUT
@@ -59,7 +59,6 @@ Status BuildTable(
    const std::vector<std::unique_ptr<IntTblPropCollectorFactory>>*
        int_tbl_prop_collector_factories,
    uint32_t column_family_id, std::vector<SequenceNumber> snapshots,
-    SequenceNumber earliest_write_conflict_snapshot,
    const CompressionType compression,
    const CompressionOptions& compression_opts, bool paranoid_file_checks,
    InternalStats* internal_stats, const Env::IOPriority io_priority,
@@ -97,8 +96,7 @@ Status BuildTable(
                      snapshots.empty() ? 0 : snapshots.back());

    CompactionIterator c_iter(iter, internal_comparator.user_comparator(),
-                              &merge, kMaxSequenceNumber, &snapshots,
-                              earliest_write_conflict_snapshot, env,
+                              &merge, kMaxSequenceNumber, &snapshots, env,
                              true /* internal key corruption is not ok */);
    c_iter.SeekToFirst();
    for (; c_iter.Valid(); c_iter.Next()) {
@@ -56,7 +56,6 @@ extern Status BuildTable(
    const std::vector<std::unique_ptr<IntTblPropCollectorFactory>>*
        int_tbl_prop_collector_factories,
    uint32_t column_family_id, std::vector<SequenceNumber> snapshots,
-    SequenceNumber earliest_write_conflict_snapshot,
    const CompressionType compression,
    const CompressionOptions& compression_opts, bool paranoid_file_checks,
    InternalStats* internal_stats,
@@ -1766,11 +1766,6 @@ void rocksdb_options_set_memtable_prefix_bloom_probes(
  opt->rep.memtable_prefix_bloom_probes = v;
 }

-void rocksdb_options_set_memtable_prefix_bloom_huge_page_tlb_size(
-    rocksdb_options_t* opt, size_t v) {
-  opt->rep.memtable_prefix_bloom_huge_page_tlb_size = v;
-}
-
 void rocksdb_options_set_hash_skip_list_rep(
    rocksdb_options_t *opt, size_t bucket_count,
    int32_t skiplist_height, int32_t skiplist_branching_factor) {
@@ -1970,7 +1965,7 @@ void rocksdb_filterpolicy_destroy(rocksdb_filterpolicy_t* filter) {
  delete filter;
 }

-rocksdb_filterpolicy_t* rocksdb_filterpolicy_create_bloom_format(int bits_per_key, bool original_format) {
+rocksdb_filterpolicy_t* rocksdb_filterpolicy_create_bloom(int bits_per_key) {
  // Make a rocksdb_filterpolicy_t, but override all of its methods so
  // they delegate to a NewBloomFilterPolicy() instead of user
  // supplied C functions.
@@ -1988,21 +1983,13 @@ rocksdb_filterpolicy_t* rocksdb_filterpolicy_create_bloom_format(int bits_per_ke
    static void DoNothing(void*) { }
  };
  Wrapper* wrapper = new Wrapper;
-  wrapper->rep_ = NewBloomFilterPolicy(bits_per_key, original_format);
+  wrapper->rep_ = NewBloomFilterPolicy(bits_per_key);
  wrapper->state_ = nullptr;
  wrapper->delete_filter_ = nullptr;
  wrapper->destructor_ = &Wrapper::DoNothing;
  return wrapper;
 }

-rocksdb_filterpolicy_t* rocksdb_filterpolicy_create_bloom_full(int bits_per_key) {
-  return rocksdb_filterpolicy_create_bloom_format(bits_per_key, false);
-}
-
-rocksdb_filterpolicy_t* rocksdb_filterpolicy_create_bloom(int bits_per_key) {
-  return rocksdb_filterpolicy_create_bloom_format(bits_per_key, true);
-}
-
 rocksdb_mergeoperator_t* rocksdb_mergeoperator_create(
    void* state, void (*destructor)(void*),
    char* (*full_merge)(void*, const char* key, size_t key_length,
@@ -68,20 +68,6 @@ const std::string& ColumnFamilyHandleImpl::GetName() const {
  return cfd()->GetName();
 }

-Status ColumnFamilyHandleImpl::GetDescriptor(ColumnFamilyDescriptor* desc) {
-#ifndef ROCKSDB_LITE
-  // accessing mutable cf-options requires db mutex.
-  InstrumentedMutexLock l(mutex_);
-  *desc = ColumnFamilyDescriptor(
-      cfd()->GetName(),
-      BuildColumnFamilyOptions(*cfd()->options(),
-                               *cfd()->GetLatestMutableCFOptions()));
-  return Status::OK();
-#else
-  return Status::NotSupported();
-#endif  // !ROCKSDB_LITE
-}
-
 const Comparator* ColumnFamilyHandleImpl::user_comparator() const {
  return cfd()->user_comparator();
 }
@@ -124,24 +110,6 @@ Status CheckCompressionSupported(const ColumnFamilyOptions& cf_options) {
  return Status::OK();
 }

-Status CheckConcurrentWritesSupported(const ColumnFamilyOptions& cf_options) {
-  if (cf_options.inplace_update_support) {
-    return Status::InvalidArgument(
-        "In-place memtable updates (inplace_update_support) is not compatible "
-        "with concurrent writes (allow_concurrent_memtable_write)");
-  }
-  if (cf_options.filter_deletes) {
-    return Status::InvalidArgument(
-        "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();
-}
-
 ColumnFamilyOptions SanitizeOptions(const DBOptions& db_options,
                                    const InternalKeyComparator* icmp,
                                    const ColumnFamilyOptions& src) {
@@ -243,17 +211,6 @@ ColumnFamilyOptions SanitizeOptions(const DBOptions& db_options,
         result.level0_slowdown_writes_trigger,
         result.level0_file_num_compaction_trigger);
  }
-
-  if (result.soft_pending_compaction_bytes_limit == 0) {
-    result.soft_pending_compaction_bytes_limit =
-        result.hard_pending_compaction_bytes_limit;
-  } else if (result.hard_pending_compaction_bytes_limit > 0 &&
-             result.soft_pending_compaction_bytes_limit >
-                 result.hard_pending_compaction_bytes_limit) {
-    result.soft_pending_compaction_bytes_limit =
-        result.hard_pending_compaction_bytes_limit;
-  }
-
  if (result.level_compaction_dynamic_level_bytes) {
    if (result.compaction_style != kCompactionStyleLevel ||
        db_options.db_paths.size() > 1U) {
@@ -358,8 +315,7 @@ ColumnFamilyData::ColumnFamilyData(
      log_number_(0),
      column_family_set_(column_family_set),
      pending_flush_(false),
-      pending_compaction_(false),
-      prev_compaction_needed_bytes_(0) {
+      pending_compaction_(false) {
  Ref();

  // Convert user defined table properties collector factories to internal ones.
@@ -477,81 +433,13 @@ void ColumnFamilyData::SetDropped() {
  column_family_set_->RemoveColumnFamily(this);
 }

-const double kSlowdownRatio = 1.2;
-
-namespace {
-std::unique_ptr<WriteControllerToken> SetupDelay(
-    uint64_t max_write_rate, WriteController* write_controller,
-    uint64_t compaction_needed_bytes, uint64_t prev_compaction_neeed_bytes,
-    bool auto_comapctions_disabled) {
-  const uint64_t kMinWriteRate = 1024u;  // Minimum write rate 1KB/s.
-
-  uint64_t write_rate = write_controller->delayed_write_rate();
-
-  if (auto_comapctions_disabled) {
-    // When auto compaction is disabled, always use the value user gave.
-    write_rate = max_write_rate;
-  } else if (write_controller->NeedsDelay() && max_write_rate > kMinWriteRate) {
-    // If user gives rate less than kMinWriteRate, don't adjust it.
-    //
-    // If already delayed, need to adjust based on previous compaction debt.
-    // When there are two or more column families require delay, we always
-    // increase or reduce write rate based on information for one single
-    // column family. It is likely to be OK but we can improve if there is a
-    // problem.
-    // Ignore compaction_needed_bytes = 0 case because compaction_needed_bytes
-    // is only available in level-based compaction
-    //
-    // If the compaction debt stays the same as previously, we also further slow
-    // down. It usually means a mem table is full. It's mainly for the case
-    // where both of flush and compaction are much slower than the speed we
-    // insert to mem tables, so we need to actively slow down before we get
-    // feedback signal from compaction and flushes to avoid the full stop
-    // because of hitting the max write buffer number.
-    if (prev_compaction_neeed_bytes > 0 &&
-        prev_compaction_neeed_bytes <= compaction_needed_bytes) {
-      write_rate = static_cast<uint64_t>(static_cast<double>(write_rate) /
-                                         kSlowdownRatio);
-      if (write_rate < kMinWriteRate) {
-        write_rate = kMinWriteRate;
-      }
-    } else if (prev_compaction_neeed_bytes > compaction_needed_bytes) {
-      // We are speeding up by ratio of kSlowdownRatio when we have paid
-      // compaction debt. But we'll never speed up to faster than the write rate
-      // given by users.
-      write_rate = static_cast<uint64_t>(static_cast<double>(write_rate) *
-                                         kSlowdownRatio);
-      if (write_rate > max_write_rate) {
-        write_rate = max_write_rate;
-      }
-    }
-  }
-  return write_controller->GetDelayToken(write_rate);
-}
-
-int GetL0ThresholdSpeedupCompaction(int level0_file_num_compaction_trigger,
-                                    int level0_slowdown_writes_trigger) {
-  // SanitizeOptions() ensures it.
-  assert(level0_file_num_compaction_trigger <= level0_slowdown_writes_trigger);
-
-  // 1/4 of the way between L0 compaction trigger threshold and slowdown
-  // condition.
-  // Or twice as compaction trigger, if it is smaller.
-  return std::min(level0_file_num_compaction_trigger * 2,
-                  level0_file_num_compaction_trigger +
-                      (level0_slowdown_writes_trigger -
-                       level0_file_num_compaction_trigger) /
-                          4);
-}
-}  // namespace
-
 void ColumnFamilyData::RecalculateWriteStallConditions(
      const MutableCFOptions& mutable_cf_options) {
  if (current_ != nullptr) {
    auto* vstorage = current_->storage_info();
+    const double score = vstorage->max_compaction_score();
+    const int max_level = vstorage->max_compaction_score_level();
    auto write_controller = column_family_set_->write_controller_;
-    uint64_t compaction_needed_bytes =
-        vstorage->estimated_compaction_needed_bytes();

    if (imm()->NumNotFlushed() >= mutable_cf_options.max_write_buffer_number) {
      write_controller_token_ = write_controller->GetStopToken();
@@ -573,88 +461,37 @@ void ColumnFamilyData::RecalculateWriteStallConditions(
          "[%s] Stopping writes because we have %d level-0 files",
          name_.c_str(), vstorage->l0_delay_trigger_count());
    } else if (mutable_cf_options.hard_pending_compaction_bytes_limit > 0 &&
-               compaction_needed_bytes >=
+               vstorage->estimated_compaction_needed_bytes() >=
                   mutable_cf_options.hard_pending_compaction_bytes_limit) {
      write_controller_token_ = write_controller->GetStopToken();
      internal_stats_->AddCFStats(
          InternalStats::HARD_PENDING_COMPACTION_BYTES_LIMIT, 1);
      Log(InfoLogLevel::WARN_LEVEL, ioptions_.info_log,
-          "[%s] Stopping writes because of estimated pending compaction "
-          "bytes %" PRIu64,
-          name_.c_str(), compaction_needed_bytes);
-    } else if (mutable_cf_options.max_write_buffer_number > 3 &&
-               imm()->NumNotFlushed() >=
-                   mutable_cf_options.max_write_buffer_number - 1) {
-      write_controller_token_ =
-          SetupDelay(ioptions_.delayed_write_rate, write_controller,
-                     compaction_needed_bytes, prev_compaction_needed_bytes_,
-                     mutable_cf_options.disable_auto_compactions);
-      internal_stats_->AddCFStats(InternalStats::MEMTABLE_SLOWDOWN, 1);
-      Log(InfoLogLevel::WARN_LEVEL, ioptions_.info_log,
-          "[%s] Stalling writes because we have %d immutable memtables "
-          "(waiting for flush), max_write_buffer_number is set to %d "
-          "rate %" PRIu64,
-          name_.c_str(), imm()->NumNotFlushed(),
-          mutable_cf_options.max_write_buffer_number,
-          write_controller->delayed_write_rate());
+          "[%s] Stopping writes because estimated pending compaction "
+          "bytes exceed %" PRIu64,
+          name_.c_str(), vstorage->estimated_compaction_needed_bytes());
    } else if (mutable_cf_options.level0_slowdown_writes_trigger >= 0 &&
               vstorage->l0_delay_trigger_count() >=
                   mutable_cf_options.level0_slowdown_writes_trigger) {
-      write_controller_token_ =
-          SetupDelay(ioptions_.delayed_write_rate, write_controller,
-                     compaction_needed_bytes, prev_compaction_needed_bytes_,
-                     mutable_cf_options.disable_auto_compactions);
+      write_controller_token_ = write_controller->GetDelayToken();
      internal_stats_->AddCFStats(InternalStats::LEVEL0_SLOWDOWN_TOTAL, 1);
      if (compaction_picker_->IsLevel0CompactionInProgress()) {
        internal_stats_->AddCFStats(
            InternalStats::LEVEL0_SLOWDOWN_WITH_COMPACTION, 1);
      }
      Log(InfoLogLevel::WARN_LEVEL, ioptions_.info_log,
-          "[%s] Stalling writes because we have %d level-0 files "
-          "rate %" PRIu64,
-          name_.c_str(), vstorage->l0_delay_trigger_count(),
-          write_controller->delayed_write_rate());
-    } else if (mutable_cf_options.soft_pending_compaction_bytes_limit > 0 &&
-               vstorage->estimated_compaction_needed_bytes() >=
-                   mutable_cf_options.soft_pending_compaction_bytes_limit) {
-      write_controller_token_ =
-          SetupDelay(ioptions_.delayed_write_rate, write_controller,
-                     compaction_needed_bytes, prev_compaction_needed_bytes_,
-                     mutable_cf_options.disable_auto_compactions);
-      internal_stats_->AddCFStats(
-          InternalStats::SOFT_PENDING_COMPACTION_BYTES_LIMIT, 1);
-      Log(InfoLogLevel::WARN_LEVEL, ioptions_.info_log,
-          "[%s] Stalling writes because of estimated pending compaction "
-          "bytes %" PRIu64 " rate %" PRIu64,
-          name_.c_str(), vstorage->estimated_compaction_needed_bytes(),
-          write_controller->delayed_write_rate());
-    } else if (vstorage->l0_delay_trigger_count() >=
-               GetL0ThresholdSpeedupCompaction(
-                   mutable_cf_options.level0_file_num_compaction_trigger,
-                   mutable_cf_options.level0_slowdown_writes_trigger)) {
-      write_controller_token_ = write_controller->GetCompactionPressureToken();
-      Log(InfoLogLevel::WARN_LEVEL, ioptions_.info_log,
-          "[%s] Increasing compaction threads because we have %d level-0 "
-          "files ",
+          "[%s] Stalling writes because we have %d level-0 files",
          name_.c_str(), vstorage->l0_delay_trigger_count());
-    } else if (vstorage->estimated_compaction_needed_bytes() >=
-               mutable_cf_options.soft_pending_compaction_bytes_limit / 4) {
-      // Increase compaction threads if bytes needed for compaction exceeds
-      // 1/4 of threshold for slowing down.
-      // If soft pending compaction byte limit is not set, always speed up
-      // compaction.
-      write_controller_token_ = write_controller->GetCompactionPressureToken();
-      if (mutable_cf_options.soft_pending_compaction_bytes_limit > 0) {
-        Log(InfoLogLevel::WARN_LEVEL, ioptions_.info_log,
-            "[%s] Increasing compaction threads because of estimated pending "
-            "compaction "
-            "bytes %" PRIu64,
-            name_.c_str(), vstorage->estimated_compaction_needed_bytes());
-      }
+    } else if (mutable_cf_options.soft_rate_limit > 0.0 &&
+               score > mutable_cf_options.soft_rate_limit) {
+      write_controller_token_ = write_controller->GetDelayToken();
+      internal_stats_->RecordLevelNSlowdown(max_level, true);
+      Log(InfoLogLevel::WARN_LEVEL, ioptions_.info_log,
+          "[%s] Stalling writes because we hit soft limit on level %d",
+          name_.c_str(), max_level);
    } else {
      write_controller_token_.reset();
    }
-    prev_compaction_needed_bytes_ = compaction_needed_bytes;
  }
 }

@@ -708,12 +545,13 @@ const int ColumnFamilyData::kCompactAllLevels = -1;
 const int ColumnFamilyData::kCompactToBaseLevel = -2;

 Compaction* ColumnFamilyData::CompactRange(
-    const MutableCFOptions& mutable_cf_options, int input_level,
-    int output_level, uint32_t output_path_id, const InternalKey* begin,
-    const InternalKey* end, InternalKey** compaction_end, bool* conflict) {
+    const MutableCFOptions& mutable_cf_options,
+    int input_level, int output_level, uint32_t output_path_id,
+    const InternalKey* begin, const InternalKey* end,
+    InternalKey** compaction_end) {
  auto* result = compaction_picker_->CompactRange(
      GetName(), mutable_cf_options, current_->storage_info(), input_level,
-      output_level, output_path_id, begin, end, compaction_end, conflict);
+      output_level, output_path_id, begin, end, compaction_end);
  if (result != nullptr) {
    result->SetInputVersion(current_);
  }
@@ -999,6 +837,13 @@ ColumnFamilyHandle* ColumnFamilyMemTablesImpl::GetColumnFamilyHandle() {
  return &handle_;
 }

+void ColumnFamilyMemTablesImpl::CheckMemtableFull() {
+  if (current_ != nullptr && current_->mem()->ShouldScheduleFlush()) {
+    flush_scheduler_->ScheduleFlush(current_);
+    current_->mem()->MarkFlushScheduled();
+  }
+}
+
 uint32_t GetColumnFamilyID(ColumnFamilyHandle* column_family) {
  uint32_t column_family_id = 0;
  if (column_family != nullptr) {
@@ -19,10 +19,12 @@
 #include "db/write_controller.h"
 #include "db/table_cache.h"
 #include "db/table_properties_collector.h"
+#include "db/flush_scheduler.h"
 #include "rocksdb/compaction_job_stats.h"
 #include "rocksdb/db.h"
 #include "rocksdb/env.h"
 #include "rocksdb/options.h"
+#include "util/instrumented_mutex.h"
 #include "util/mutable_cf_options.h"
 #include "util/thread_local.h"

@@ -42,8 +44,6 @@ class LogBuffer;
 class InstrumentedMutex;
 class InstrumentedMutexLock;

-extern const double kSlowdownRatio;
-
 // ColumnFamilyHandleImpl is the class that clients use to access different
 // column families. It has non-trivial destructor, which gets called when client
 // is done using the column family
@@ -59,7 +59,6 @@ class ColumnFamilyHandleImpl : public ColumnFamilyHandle {

  virtual uint32_t GetID() const override;
  virtual const std::string& GetName() const override;
-  virtual Status GetDescriptor(ColumnFamilyDescriptor* desc) override;

 private:
  ColumnFamilyData* cfd_;
@@ -133,9 +132,6 @@ struct SuperVersion {

 extern Status CheckCompressionSupported(const ColumnFamilyOptions& cf_options);

-extern Status CheckConcurrentWritesSupported(
-    const ColumnFamilyOptions& cf_options);
-
 extern ColumnFamilyOptions SanitizeOptions(const DBOptions& db_options,
                                           const InternalKeyComparator* icmp,
                                           const ColumnFamilyOptions& src);
@@ -160,16 +156,14 @@ class ColumnFamilyData {
  // thread-safe
  const std::string& GetName() const { return name_; }

-  // Ref() can only be called from a context where the caller can guarantee
-  // that ColumnFamilyData is alive (while holding a non-zero ref already,
-  // holding a DB mutex, or as the leader in a write batch group).
+  // Ref() can only be called whily holding a DB mutex or during a
+  // single-threaded write.
  void Ref() { refs_.fetch_add(1, std::memory_order_relaxed); }
-
-  // Unref decreases the reference count, but does not handle deletion
-  // when the count goes to 0.  If this method returns true then the
-  // caller should delete the instance immediately, or later, by calling
-  // FreeDeadColumnFamilies().  Unref() can only be called while holding
-  // a DB mutex, or during single-threaded recovery.
+  // will just decrease reference count to 0, but will not delete it. returns
+  // true if the ref count was decreased to zero. in that case, it can be
+  // deleted by the caller immediately, or later, by calling
+  // FreeDeadColumnFamilies()
+  // Unref() can only be called while holding a DB mutex
  bool Unref() {
    int old_refs = refs_.fetch_sub(1, std::memory_order_relaxed);
    assert(old_refs > 0);
@@ -230,7 +224,7 @@ class ColumnFamilyData {
  MemTable* mem() { return mem_; }
  Version* current() { return current_; }
  Version* dummy_versions() { return dummy_versions_; }
-  void SetCurrent(Version* _current);
+  void SetCurrent(Version* current);
  uint64_t GetNumLiveVersions() const;  // REQUIRE: DB mutex held
  uint64_t GetTotalSstFilesSize() const;  // REQUIRE: DB mutex held
  void SetMemtable(MemTable* new_mem) { mem_ = new_mem; }
@@ -255,11 +249,11 @@ class ColumnFamilyData {
  // A flag to tell a manual compaction's output is base level.
  static const int kCompactToBaseLevel;
  // REQUIRES: DB mutex held
-  Compaction* CompactRange(const MutableCFOptions& mutable_cf_options,
-                           int input_level, int output_level,
-                           uint32_t output_path_id, const InternalKey* begin,
-                           const InternalKey* end, InternalKey** compaction_end,
-                           bool* manual_conflict);
+  Compaction* CompactRange(
+      const MutableCFOptions& mutable_cf_options,
+      int input_level, int output_level, uint32_t output_path_id,
+      const InternalKey* begin, const InternalKey* end,
+      InternalKey** compaction_end);

  CompactionPicker* compaction_picker() { return compaction_picker_.get(); }
  // thread-safe
@@ -311,14 +305,6 @@ class ColumnFamilyData {
  bool pending_flush() { return pending_flush_; }
  bool pending_compaction() { return pending_compaction_; }

-  // Recalculate some small conditions, which are changed only during
-  // compaction, adding new memtable and/or
-  // recalculation of compaction score. These values are used in
-  // DBImpl::MakeRoomForWrite function to decide, if it need to make
-  // a write stall
-  void RecalculateWriteStallConditions(
-      const MutableCFOptions& mutable_cf_options);
-
 private:
  friend class ColumnFamilySet;
  ColumnFamilyData(uint32_t id, const std::string& name,
@@ -328,6 +314,14 @@ class ColumnFamilyData {
                   const DBOptions* db_options, const EnvOptions& env_options,
                   ColumnFamilySet* column_family_set);

+  // Recalculate some small conditions, which are changed only during
+  // compaction, adding new memtable and/or
+  // recalculation of compaction score. These values are used in
+  // DBImpl::MakeRoomForWrite function to decide, if it need to make
+  // a write stall
+  void RecalculateWriteStallConditions(
+      const MutableCFOptions& mutable_cf_options);
+
  uint32_t id_;
  const std::string name_;
  Version* dummy_versions_;  // Head of circular doubly-linked list of versions.
@@ -388,8 +382,6 @@ class ColumnFamilyData {
  // If true --> this ColumnFamily is currently present in
  // DBImpl::compaction_queue_
  bool pending_compaction_;
-
-  uint64_t prev_compaction_needed_bytes_;
 };

 // ColumnFamilySet has interesting thread-safety requirements
@@ -501,18 +493,15 @@ class ColumnFamilySet {
 // memtables of different column families (specified by ID in the write batch)
 class ColumnFamilyMemTablesImpl : public ColumnFamilyMemTables {
 public:
-  explicit ColumnFamilyMemTablesImpl(ColumnFamilySet* column_family_set)
-      : column_family_set_(column_family_set), current_(nullptr) {}
-
-  // Constructs a ColumnFamilyMemTablesImpl equivalent to one constructed
-  // with the arguments used to construct *orig.
-  explicit ColumnFamilyMemTablesImpl(ColumnFamilyMemTablesImpl* orig)
-      : column_family_set_(orig->column_family_set_), current_(nullptr) {}
+  explicit ColumnFamilyMemTablesImpl(ColumnFamilySet* column_family_set,
+                                     FlushScheduler* flush_scheduler)
+      : column_family_set_(column_family_set),
+        current_(nullptr),
+        flush_scheduler_(flush_scheduler) {}

  // sets current_ to ColumnFamilyData with column_family_id
  // returns false if column family doesn't exist
-  // REQUIRES: use this function of DBImpl::column_family_memtables_ should be
-  //           under a DB mutex OR from a write thread
+  // REQUIRES: under a DB mutex OR from a write thread
  bool Seek(uint32_t column_family_id) override;

  // Returns log number of the selected column family
@@ -520,23 +509,20 @@ class ColumnFamilyMemTablesImpl : public ColumnFamilyMemTables {
  uint64_t GetLogNumber() const override;

  // REQUIRES: Seek() called first
-  // REQUIRES: use this function of DBImpl::column_family_memtables_ should be
-  //           under a DB mutex OR from a write thread
+  // REQUIRES: under a DB mutex OR from a write thread
  virtual MemTable* GetMemTable() const override;

  // Returns column family handle for the selected column family
-  // REQUIRES: use this function of DBImpl::column_family_memtables_ should be
-  //           under a DB mutex OR from a write thread
+  // REQUIRES: under a DB mutex OR from a write thread
  virtual ColumnFamilyHandle* GetColumnFamilyHandle() override;

-  // Cannot be called while another thread is calling Seek().
-  // REQUIRES: use this function of DBImpl::column_family_memtables_ should be
-  //           under a DB mutex OR from a write thread
-  virtual ColumnFamilyData* current() override { return current_; }
+  // REQUIRES: under a DB mutex OR from a write thread
+  virtual void CheckMemtableFull() override;

 private:
  ColumnFamilySet* column_family_set_;
  ColumnFamilyData* current_;
+  FlushScheduler* flush_scheduler_;
  ColumnFamilyHandleInternal handle_;
 };

@@ -7,7 +7,6 @@

 #include <mutex>
 #include <string>
-#include <thread>
 #include <vector>

 #include "rocksdb/db.h"
@@ -108,7 +107,6 @@ TEST_F(CompactFilesTest, L0ConflictsFiles) {
      break;
    }
  }
-  rocksdb::SyncPoint::GetInstance()->DisableProcessing();
  delete db;
 }

@@ -143,6 +141,9 @@ TEST_F(CompactFilesTest, ObsoleteFiles) {
  }

  auto l0_files = collector->GetFlushedFiles();
+  CompactionOptions compact_opt;
+  compact_opt.compression = kNoCompression;
+  compact_opt.output_file_size_limit = kWriteBufferSize * 5;
  ASSERT_OK(db->CompactFiles(CompactionOptions(), l0_files, 1));

  // verify all compaction input files are deleted
@@ -152,62 +153,6 @@ TEST_F(CompactFilesTest, ObsoleteFiles) {
  delete db;
 }

-TEST_F(CompactFilesTest, CapturingPendingFiles) {
-  Options options;
-  options.create_if_missing = true;
-  // Disable RocksDB background compaction.
-  options.compaction_style = kCompactionStyleNone;
-  // Always do full scans for obsolete files (needed to reproduce the issue).
-  options.delete_obsolete_files_period_micros = 0;
-
-  // Add listener.
-  FlushedFileCollector* collector = new FlushedFileCollector();
-  options.listeners.emplace_back(collector);
-
-  DB* db = nullptr;
-  DestroyDB(db_name_, options);
-  Status s = DB::Open(options, db_name_, &db);
-  assert(s.ok());
-  assert(db);
-
-  // Create 5 files.
-  for (int i = 0; i < 5; ++i) {
-    db->Put(WriteOptions(), "key" + ToString(i), "value");
-    db->Flush(FlushOptions());
-  }
-
-  auto l0_files = collector->GetFlushedFiles();
-  EXPECT_EQ(5, l0_files.size());
-
-  rocksdb::SyncPoint::GetInstance()->LoadDependency({
-      {"CompactFilesImpl:2", "CompactFilesTest.CapturingPendingFiles:0"},
-      {"CompactFilesTest.CapturingPendingFiles:1", "CompactFilesImpl:3"},
-  });
-  rocksdb::SyncPoint::GetInstance()->EnableProcessing();
-
-  // Start compacting files.
-  std::thread compaction_thread(
-      [&] { EXPECT_OK(db->CompactFiles(CompactionOptions(), l0_files, 1)); });
-
-  // In the meantime flush another file.
-  TEST_SYNC_POINT("CompactFilesTest.CapturingPendingFiles:0");
-  db->Put(WriteOptions(), "key5", "value");
-  db->Flush(FlushOptions());
-  TEST_SYNC_POINT("CompactFilesTest.CapturingPendingFiles:1");
-
-  compaction_thread.join();
-
-  rocksdb::SyncPoint::GetInstance()->DisableProcessing();
-
-  delete db;
-
-  // Make sure we can reopen the DB.
-  s = DB::Open(options, db_name_, &db);
-  ASSERT_TRUE(s.ok());
-  assert(db);
-  delete db;
-}
-
 }  // namespace rocksdb

 int main(int argc, char** argv) {
@@ -46,7 +46,7 @@ void Compaction::GetBoundaryKeys(
    Slice* largest_user_key) {
  bool initialized = false;
  const Comparator* ucmp = vstorage->InternalComparator()->user_comparator();
-  for (size_t i = 0; i < inputs.size(); ++i) {
+  for (uint32_t i = 0; i < inputs.size(); ++i) {
    if (inputs[i].files.empty()) {
      continue;
    }
@@ -128,8 +128,8 @@ bool Compaction::TEST_IsBottommostLevel(
 bool Compaction::IsFullCompaction(
    VersionStorageInfo* vstorage,
    const std::vector<CompactionInputFiles>& inputs) {
-  size_t num_files_in_compaction = 0;
-  size_t total_num_files = 0;
+  int num_files_in_compaction = 0;
+  int total_num_files = 0;
  for (int l = 0; l < vstorage->num_levels(); l++) {
    total_num_files += vstorage->NumLevelFiles(l);
  }
@@ -147,8 +147,7 @@ Compaction::Compaction(VersionStorageInfo* vstorage,
                       uint32_t _output_path_id, CompressionType _compression,
                       std::vector<FileMetaData*> _grandparents,
                       bool _manual_compaction, double _score,
-                       bool _deletion_compaction,
-                       CompactionReason _compaction_reason)
+                       bool _deletion_compaction)
    : start_level_(_inputs[0].level),
      output_level_(_output_level),
      max_output_file_size_(_target_file_size),
@@ -168,12 +167,8 @@ Compaction::Compaction(VersionStorageInfo* vstorage,
      score_(_score),
      bottommost_level_(IsBottommostLevel(output_level_, vstorage, inputs_)),
      is_full_compaction_(IsFullCompaction(vstorage, inputs_)),
-      is_manual_compaction_(_manual_compaction),
-      compaction_reason_(_compaction_reason) {
+      is_manual_compaction_(_manual_compaction) {
  MarkFilesBeingCompacted(true);
-  if (is_manual_compaction_) {
-    compaction_reason_ = CompactionReason::kManualCompaction;
-  }

 #ifndef NDEBUG
  for (size_t i = 1; i < inputs_.size(); ++i) {
@@ -189,9 +184,6 @@ Compaction::Compaction(VersionStorageInfo* vstorage,
                                &arena_);
    }
  }
-
-  Slice smallest_user_key;
-  GetBoundaryKeys(vstorage, inputs_, &smallest_user_key, &largest_user_key_);
 }

 Compaction::~Compaction() {
@@ -319,7 +311,7 @@ bool Compaction::ShouldStopBefore(const Slice& internal_key) {
 // Mark (or clear) each file that is being compacted
 void Compaction::MarkFilesBeingCompacted(bool mark_as_compacted) {
  for (size_t i = 0; i < num_input_levels(); i++) {
-    for (size_t j = 0; j < inputs_[i].size(); j++) {
+    for (unsigned int j = 0; j < inputs_[i].size(); j++) {
      assert(mark_as_compacted ? !inputs_[i][j]->being_compacted :
                                  inputs_[i][j]->being_compacted);
      inputs_[i][j]->being_compacted = mark_as_compacted;
@@ -379,7 +371,7 @@ int InputSummary(const std::vector<FileMetaData*>& files, char* output,
                 int len) {
  *output = '\0';
  int write = 0;
-  for (size_t i = 0; i < files.size(); i++) {
+  for (unsigned int i = 0; i < files.size(); i++) {
    int sz = len - write;
    int ret;
    char sztxt[16];
@@ -436,7 +428,7 @@ uint64_t Compaction::OutputFilePreallocationSize() {
  }
  // Over-estimate slightly so we don't end up just barely crossing
  // the threshold
-  return preallocation_size + (preallocation_size / 10);
+  return preallocation_size * 1.1;
 }

 std::unique_ptr<CompactionFilter> Compaction::CreateCompactionFilter() const {
@@ -41,8 +41,7 @@ class Compaction {
             uint32_t output_path_id, CompressionType compression,
             std::vector<FileMetaData*> grandparents,
             bool manual_compaction = false, double score = -1,
-             bool deletion_compaction = false,
-             CompactionReason compaction_reason = CompactionReason::kUnknown);
+             bool deletion_compaction = false);

  // No copying allowed
  Compaction(const Compaction&) = delete;
@@ -219,10 +218,6 @@ class Compaction {
    output_table_properties_ = std::move(tp);
  }

-  Slice GetLargestUserKey() const { return largest_user_key_; }
-
-  CompactionReason compaction_reason() { return compaction_reason_; }
-
 private:
  // mark (or clear) all files that are being compacted
  void MarkFilesBeingCompacted(bool mark_as_compacted);
@@ -289,12 +284,6 @@ class Compaction {

  // table properties of output files
  TablePropertiesCollection output_table_properties_;
-
-  // largest user keys in compaction
-  Slice largest_user_key_;
-
-  // Reason for compaction
-  CompactionReason compaction_reason_;
 };

 // Utility function
@@ -13,14 +13,12 @@ namespace rocksdb {
 CompactionIterator::CompactionIterator(
    InternalIterator* input, const Comparator* cmp, MergeHelper* merge_helper,
    SequenceNumber last_sequence, std::vector<SequenceNumber>* snapshots,
-    SequenceNumber earliest_write_conflict_snapshot, Env* env,
-    bool expect_valid_internal_key, Compaction* compaction,
+    Env* env, bool expect_valid_internal_key, Compaction* compaction,
    const CompactionFilter* compaction_filter, LogBuffer* log_buffer)
    : input_(input),
      cmp_(cmp),
      merge_helper_(merge_helper),
      snapshots_(snapshots),
-      earliest_write_conflict_snapshot_(earliest_write_conflict_snapshot),
      env_(env),
      expect_valid_internal_key_(expect_valid_internal_key),
      compaction_(compaction),
@@ -97,11 +95,6 @@ void CompactionIterator::Next() {
    NextFromInput();
  }

-  if (valid_) {
-    // Record that we've ouputted a record for the current key.
-    has_outputted_key_ = true;
-  }
-
  PrepareOutput();
 }

@@ -148,10 +141,8 @@ void CompactionIterator::NextFromInput() {
      key_ = current_key_.SetKey(key_, &ikey_);
      current_user_key_ = ikey_.user_key;
      has_current_user_key_ = true;
-      has_outputted_key_ = false;
      current_user_key_sequence_ = kMaxSequenceNumber;
      current_user_key_snapshot_ = 0;
-
      // apply the compaction filter to the first occurrence of the user key
      if (compaction_filter_ != nullptr && ikey_.type == kTypeValue &&
          (visible_at_tip_ || ikey_.sequence > latest_snapshot_ ||
@@ -205,99 +196,31 @@ void CompactionIterator::NextFromInput() {
        visible_at_tip_ ? visible_at_tip_ : findEarliestVisibleSnapshot(
                                                ikey_.sequence, &prev_snapshot);

-    if (clear_and_output_next_key_) {
-      // In the previous iteration we encountered a single delete that we could
-      // not compact out.  We will keep this Put, but can drop it's data.
-      // (See Optimization 3, below.)
-      assert(ikey_.type == kTypeValue);
-      assert(current_user_key_snapshot_ == last_snapshot);
-
-      value_.clear();
-      valid_ = true;
-      clear_and_output_next_key_ = false;
-    } else if (ikey_.type == kTypeSingleDeletion) {
-      // We can compact out a SingleDelete if:
-      // 1) We encounter the corresponding PUT -OR- we know that this key
-      //    doesn't appear past this output level
-      // =AND=
-      // 2) We've already returned a record in this snapshot -OR-
-      //    there are no earlier earliest_write_conflict_snapshot.
-      //
-      // Rule 1 is needed for SingleDelete correctness.  Rule 2 is needed to
-      // allow Transactions to do write-conflict checking (if we compacted away
-      // all keys, then we wouldn't know that a write happened in this
-      // snapshot).  If there is no earlier snapshot, then we know that there
-      // are no active transactions that need to know about any writes.
-      //
-      // Optimization 3:
-      // If we encounter a SingleDelete followed by a PUT and Rule 2 is NOT
-      // true, then we must output a SingleDelete.  In this case, we will decide
-      // to also output the PUT.  While we are compacting less by outputting the
-      // PUT now, hopefully this will lead to better compaction in the future
-      // when Rule 2 is later true (Ie, We are hoping we can later compact out
-      // both the SingleDelete and the Put, while we couldn't if we only
-      // outputted the SingleDelete now).
-      // In this case, we can save space by removing the PUT's value as it will
-      // never be read.
-      //
-      // Deletes and Merges are not supported on the same key that has a
-      // SingleDelete as it is not possible to correctly do any partial
-      // compaction of such a combination of operations.  The result of mixing
-      // those operations for a given key is documented as being undefined.  So
-      // we can choose how to handle such a combinations of operations.  We will
-      // try to compact out as much as we can in these cases.
-
-      // The easiest way to process a SingleDelete during iteration is to peek
-      // ahead at the next key.
+    if (ikey_.type == kTypeSingleDeletion) {
      ParsedInternalKey next_ikey;
      input_->Next();

-      // Check whether the next key exists, is not corrupt, and is the same key
+      // Check whether the current key is valid, not corrupt and the same
      // as the single delete.
      if (input_->Valid() && ParseInternalKey(input_->key(), &next_ikey) &&
          cmp_->Equal(ikey_.user_key, next_ikey.user_key)) {
-        // Check whether the next key belongs to the same snapshot as the
-        // SingleDelete.
+        // Mixing single deletes and merges is not supported. Consecutive
+        // single deletes are not valid.
+        if (next_ikey.type != kTypeValue) {
+          assert(false);
+          status_ =
+              Status::InvalidArgument("Put expected after single delete.");
+          break;
+        }
+
+        // Check whether the current key belongs to the same snapshot as the
+        // single delete.
        if (prev_snapshot == 0 || next_ikey.sequence > prev_snapshot) {
-          if (next_ikey.type == kTypeSingleDeletion) {
-            // We encountered two SingleDeletes in a row.  This could be due to
-            // unexpected user input.
-            // Skip the first SingleDelete and let the next iteration decide how
-            // to handle the second SingleDelete
-
-            // First SingleDelete has been skipped since we already called
-            // input_->Next().
-            ++iter_stats_.num_record_drop_obsolete;
-          } else if ((ikey_.sequence <= earliest_write_conflict_snapshot_) ||
-                     has_outputted_key_) {
-            // Found a matching value, we can drop the single delete and the
-            // value.  It is safe to drop both records since we've already
-            // outputted a key in this snapshot, or there is no earlier
-            // snapshot (Rule 2 above).
-
-            // Note: it doesn't matter whether the second key is a Put or if it
-            // is an unexpected Merge or Delete.  We will compact it out
-            // either way.
-            ++iter_stats_.num_record_drop_hidden;
-            ++iter_stats_.num_record_drop_obsolete;
-            // Already called input_->Next() once.  Call it a second time to
-            // skip past the second key.
-            input_->Next();
-          } else {
-            // Found a matching value, but we cannot drop both keys since
-            // there is an earlier snapshot and we need to leave behind a record
-            // to know that a write happened in this snapshot (Rule 2 above).
-            // Clear the value and output the SingleDelete. (The value will be
-            // outputted on the next iteration.)
-            ++iter_stats_.num_record_drop_hidden;
-
-            // Setting valid_ to true will output the current SingleDelete
-            valid_ = true;
-
-            // Set up the Put to be outputted in the next iteration.
-            // (Optimization 3).
-            clear_and_output_next_key_ = true;
-          }
+          // Found the matching value, we can drop the single delete and the
+          // value.
+          ++iter_stats_.num_record_drop_hidden;
+          ++iter_stats_.num_record_drop_obsolete;
+          input_->Next();
        } else {
          // We hit the next snapshot without hitting a put, so the iterator
          // returns the single delete.
@@ -312,14 +235,11 @@ void CompactionIterator::NextFromInput() {
        // iteration. If the next key is corrupt, we return before the
        // comparison, so the value of has_current_user_key does not matter.
        has_current_user_key_ = false;
-        if (compaction_ != nullptr && ikey_.sequence <= earliest_snapshot_ &&
+        if (compaction_ != nullptr &&
            compaction_->KeyNotExistsBeyondOutputLevel(ikey_.user_key,
                                                       &level_ptrs_)) {
-          // Key doesn't exist outside of this range.
-          // Can compact out this SingleDelete.
          ++iter_stats_.num_record_drop_obsolete;
        } else {
-          // Output SingleDelete
          valid_ = true;
        }
      }
@@ -333,10 +253,6 @@ void CompactionIterator::NextFromInput() {
      // same key, then this kv is not visible in any snapshot.
      // Hidden by an newer entry for same user key
      // TODO: why not > ?
-      //
-      // Note: Dropping this key will not affect TransactionDB write-conflict
-      // checking since there has already been a record returned for this key
-      // in this snapshot.
      assert(last_sequence >= current_user_key_sequence_);
      ++iter_stats_.num_record_drop_hidden;  // (A)
      input_->Next();
@@ -355,9 +271,6 @@ void CompactionIterator::NextFromInput() {
      //     smaller sequence numbers will be dropped in the next
      //     few iterations of this loop (by rule (A) above).
      // Therefore this deletion marker is obsolete and can be dropped.
-      //
-      // Note:  Dropping this Delete will not affect TransactionDB
-      // write-conflict checking since it is earlier than any snapshot.
      ++iter_stats_.num_record_drop_obsolete;
      input_->Next();
    } else if (ikey_.type == kTypeMerge) {
@@ -406,14 +319,9 @@ void CompactionIterator::PrepareOutput() {
  // Zeroing out the sequence number leads to better compression.
  // If this is the bottommost level (no files in lower levels)
  // and the earliest snapshot is larger than this seqno
-  // and the userkey differs from the last userkey in compaction
  // then we can squash the seqno to zero.
-
-  // This is safe for TransactionDB write-conflict checking since transactions
-  // only care about sequence number larger than any active snapshots.
  if (bottommost_level_ && valid_ && ikey_.sequence < earliest_snapshot_ &&
-      ikey_.type != kTypeMerge &&
-      !cmp_->Equal(compaction_->GetLargestUserKey(), ikey_.user_key)) {
+      ikey_.type != kTypeMerge) {
    assert(ikey_.type != kTypeDeletion && ikey_.type != kTypeSingleDeletion);
    ikey_.sequence = 0;
    current_key_.UpdateInternalKey(0, ikey_.type);
@@ -39,8 +39,7 @@ class CompactionIterator {
 public:
  CompactionIterator(InternalIterator* input, const Comparator* cmp,
                     MergeHelper* merge_helper, SequenceNumber last_sequence,
-                     std::vector<SequenceNumber>* snapshots,
-                     SequenceNumber earliest_write_conflict_snapshot, Env* env,
+                     std::vector<SequenceNumber>* snapshots, Env* env,
                     bool expect_valid_internal_key,
                     Compaction* compaction = nullptr,
                     const CompactionFilter* compaction_filter = nullptr,
@@ -89,7 +88,6 @@ class CompactionIterator {
  const Comparator* cmp_;
  MergeHelper* merge_helper_;
  const std::vector<SequenceNumber>* snapshots_;
-  const SequenceNumber earliest_write_conflict_snapshot_;
  Env* env_;
  bool expect_valid_internal_key_;
  Compaction* compaction_;
@@ -127,14 +125,6 @@ class CompactionIterator {
  Slice current_user_key_;
  SequenceNumber current_user_key_sequence_;
  SequenceNumber current_user_key_snapshot_;
-
-  // True if the iterator has already returned a record for the current key.
-  bool has_outputted_key_ = false;
-
-  // truncated the value of the next key and output it without applying any
-  // compaction rules.  This is used for outputting a put after a single delete.
-  bool clear_and_output_next_key_ = false;
-
  MergeOutputIterator merge_out_iter_;
  std::string compaction_filter_value_;
  // "level_ptrs" holds indices that remember which file of an associated
@@ -20,9 +20,9 @@ class CompactionIteratorTest : public testing::Test {
                                        nullptr, 0U, false, 0));
    iter_.reset(new test::VectorIterator(ks, vs));
    iter_->SeekToFirst();
-    c_iter_.reset(new CompactionIterator(
-        iter_.get(), cmp_, merge_helper_.get(), last_sequence, &snapshots_,
-        kMaxSequenceNumber, Env::Default(), false));
+    c_iter_.reset(new CompactionIterator(iter_.get(), cmp_, merge_helper_.get(),
+                                         last_sequence, &snapshots_,
+                                         Env::Default(), false));
  }

  const Comparator* cmp_;
@@ -51,7 +51,6 @@
 #include "util/iostats_context_imp.h"
 #include "util/log_buffer.h"
 #include "util/logging.h"
-#include "util/sst_file_manager_impl.h"
 #include "util/mutexlock.h"
 #include "util/perf_context_imp.h"
 #include "util/stop_watch.h"
@@ -213,7 +212,6 @@ CompactionJob::CompactionJob(
    std::atomic<bool>* shutting_down, LogBuffer* log_buffer,
    Directory* db_directory, Directory* output_directory, Statistics* stats,
    std::vector<SequenceNumber> existing_snapshots,
-    SequenceNumber earliest_write_conflict_snapshot,
    std::shared_ptr<Cache> table_cache, EventLogger* event_logger,
    bool paranoid_file_checks, bool measure_io_stats, const std::string& dbname,
    CompactionJobStats* compaction_job_stats)
@@ -232,15 +230,12 @@ CompactionJob::CompactionJob(
      output_directory_(output_directory),
      stats_(stats),
      existing_snapshots_(std::move(existing_snapshots)),
-      earliest_write_conflict_snapshot_(earliest_write_conflict_snapshot),
      table_cache_(std::move(table_cache)),
      event_logger_(event_logger),
      paranoid_file_checks_(paranoid_file_checks),
      measure_io_stats_(measure_io_stats) {
  assert(log_buffer_ != nullptr);
-  const auto* cfd = compact_->compaction->column_family_data();
-  ThreadStatusUtil::SetColumnFamily(cfd, cfd->ioptions()->env,
-                                    cfd->options()->enable_thread_tracking);
+  ThreadStatusUtil::SetColumnFamily(compact_->compaction->column_family_data());
  ThreadStatusUtil::SetThreadOperation(ThreadStatus::OP_COMPACTION);
  ReportStartedCompaction(compaction);
 }
@@ -252,9 +247,8 @@ CompactionJob::~CompactionJob() {

 void CompactionJob::ReportStartedCompaction(
    Compaction* compaction) {
-  const auto* cfd = compact_->compaction->column_family_data();
-  ThreadStatusUtil::SetColumnFamily(cfd, cfd->ioptions()->env,
-                                    cfd->options()->enable_thread_tracking);
+  ThreadStatusUtil::SetColumnFamily(
+      compact_->compaction->column_family_data());

  ThreadStatusUtil::SetThreadOperationProperty(
      ThreadStatus::COMPACTION_JOB_ID,
@@ -338,6 +332,11 @@ struct RangeWithSize {
      : range(a, b), size(s) {}
 };

+bool SliceCompare(const Comparator* cmp, const Slice& a, const Slice& b) {
+  // Returns true if a < b
+  return cmp->Compare(ExtractUserKey(a), ExtractUserKey(b)) < 0;
+}
+
 // Generates a histogram representing potential divisions of key ranges from
 // the input. It adds the starting and/or ending keys of certain input files
 // to the working set and then finds the approximate size of data in between
@@ -346,13 +345,14 @@ struct RangeWithSize {
 void CompactionJob::GenSubcompactionBoundaries() {
  auto* c = compact_->compaction;
  auto* cfd = c->column_family_data();
-  const Comparator* cfd_comparator = cfd->user_comparator();
-  std::vector<Slice> bounds;
+  std::set<Slice, std::function<bool(const Slice& a, const Slice& b)> > bounds(
+      std::bind(&SliceCompare, cfd->user_comparator(), std::placeholders::_1,
+                std::placeholders::_2));
  int start_lvl = c->start_level();
  int out_lvl = c->output_level();

  // Add the starting and/or ending key of certain input files as a potential
-  // boundary
+  // boundary (because we're inserting into a set, it avoids duplicates)
  for (size_t lvl_idx = 0; lvl_idx < c->num_input_levels(); lvl_idx++) {
    int lvl = c->level(lvl_idx);
    if (lvl >= start_lvl && lvl <= out_lvl) {
@@ -367,37 +367,27 @@ void CompactionJob::GenSubcompactionBoundaries() {
        // For level 0 add the starting and ending key of each file since the
        // files may have greatly differing key ranges (not range-partitioned)
        for (size_t i = 0; i < num_files; i++) {
-          bounds.emplace_back(flevel->files[i].smallest_key);
-          bounds.emplace_back(flevel->files[i].largest_key);
+          bounds.emplace(flevel->files[i].smallest_key);
+          bounds.emplace(flevel->files[i].largest_key);
        }
      } else {
        // For all other levels add the smallest/largest key in the level to
        // encompass the range covered by that level
-        bounds.emplace_back(flevel->files[0].smallest_key);
-        bounds.emplace_back(flevel->files[num_files - 1].largest_key);
+        bounds.emplace(flevel->files[0].smallest_key);
+        bounds.emplace(flevel->files[num_files - 1].largest_key);
        if (lvl == out_lvl) {
          // For the last level include the starting keys of all files since
          // the last level is the largest and probably has the widest key
          // range. Since it's range partitioned, the ending key of one file
          // and the starting key of the next are very close (or identical).
          for (size_t i = 1; i < num_files; i++) {
-            bounds.emplace_back(flevel->files[i].smallest_key);
+            bounds.emplace(flevel->files[i].smallest_key);
          }
        }
      }
    }
  }

-  std::sort(bounds.begin(), bounds.end(),
-    [cfd_comparator] (const Slice& a, const Slice& b) -> bool {
-      return cfd_comparator->Compare(ExtractUserKey(a), ExtractUserKey(b)) < 0;
-    });
-  // Remove duplicated entries from bounds
-  bounds.erase(std::unique(bounds.begin(), bounds.end(),
-    [cfd_comparator] (const Slice& a, const Slice& b) -> bool {
-      return cfd_comparator->Compare(ExtractUserKey(a), ExtractUserKey(b)) == 0;
-    }), bounds.end());
-
  // Combine consecutive pairs of boundaries into ranges with an approximate
  // size of data covered by keys in that range
  uint64_t sum = 0;
@@ -419,9 +409,9 @@ void CompactionJob::GenSubcompactionBoundaries() {

  // Group the ranges into subcompactions
  const double min_file_fill_percent = 4.0 / 5;
-  uint64_t max_output_files = static_cast<uint64_t>(std::ceil(
+  uint64_t max_output_files = std::ceil(
      sum / min_file_fill_percent /
-      cfd->GetCurrentMutableCFOptions()->MaxFileSizeForLevel(out_lvl)));
+      cfd->GetCurrentMutableCFOptions()->MaxFileSizeForLevel(out_lvl));
  uint64_t subcompactions =
      std::min({static_cast<uint64_t>(ranges.size()),
                static_cast<uint64_t>(db_options_.max_subcompactions),
@@ -434,12 +424,12 @@ void CompactionJob::GenSubcompactionBoundaries() {
    // sizes becomes >= the expected mean size of a subcompaction
    sum = 0;
    for (size_t i = 0; i < ranges.size() - 1; i++) {
-      sum += ranges[i].size;
      if (subcompactions == 1) {
        // If there's only one left to schedule then it goes to the end so no
        // need to put an end boundary
-        continue;
+        break;
      }
+      sum += ranges[i].size;
      if (sum >= mean) {
        boundaries_.emplace_back(ExtractUserKey(ranges[i].range.limit));
        sizes_.emplace_back(sum);
@@ -499,16 +489,11 @@ Status CompactionJob::Run() {
  }

  TablePropertiesCollection tp;
-  auto sfm =
-      static_cast<SstFileManagerImpl*>(db_options_.sst_file_manager.get());
  for (const auto& state : compact_->sub_compact_states) {
    for (const auto& output : state.outputs) {
      auto fn = TableFileName(db_options_.db_paths, output.meta.fd.GetNumber(),
                              output.meta.fd.GetPathId());
      tp[fn] = output.table_properties;
-      if (sfm && output.meta.fd.GetPathId() == 0) {
-        sfm->OnAddFile(fn);
-      }
    }
  }
  compact_->compaction->SetOutputTableProperties(std::move(tp));
@@ -653,8 +638,8 @@ void CompactionJob::ProcessKeyValueCompaction(SubcompactionState* sub_compact) {
  Status status;
  sub_compact->c_iter.reset(new CompactionIterator(
      input.get(), cfd->user_comparator(), &merge, versions_->LastSequence(),
-      &existing_snapshots_, earliest_write_conflict_snapshot_, env_, false,
-      sub_compact->compaction, compaction_filter));
+      &existing_snapshots_, env_, false, sub_compact->compaction,
+      compaction_filter));
  auto c_iter = sub_compact->c_iter.get();
  c_iter->SeekToFirst();
  const auto& c_iter_stats = c_iter->iter_stats();
@@ -58,7 +58,6 @@ class CompactionJob {
                Directory* db_directory, Directory* output_directory,
                Statistics* stats,
                std::vector<SequenceNumber> existing_snapshots,
-                SequenceNumber earliest_write_conflict_snapshot,
                std::shared_ptr<Cache> table_cache, EventLogger* event_logger,
                bool paranoid_file_checks, bool measure_io_stats,
                const std::string& dbname,
@@ -135,12 +134,6 @@ class CompactionJob {
  // entirely within s1 and s2, then the earlier version of k1 can be safely
  // deleted because that version is not visible in any snapshot.
  std::vector<SequenceNumber> existing_snapshots_;
-
-  // This is the earliest snapshot that could be used for write-conflict
-  // checking by a transaction.  For any user-key newer than this snapshot, we
-  // should make sure not to remove evidence that a write occurred.
-  SequenceNumber earliest_write_conflict_snapshot_;
-
  std::shared_ptr<Cache> table_cache_;

  EventLogger* event_logger_;
@@ -551,9 +551,8 @@ uint64_t EstimatedFileSize(
  const size_t kFooterSize = 512;

  uint64_t data_size =
-    static_cast<uint64_t>(
      num_records * (key_size + value_size * compression_ratio +
-                     kPerKeyOverhead));
+                     kPerKeyOverhead);

  return data_size + kFooterSize
         + num_records * bloom_bits_per_key / 8      // filter block
@@ -162,12 +162,9 @@ class CompactionJobTest : public testing::Test {
        auto key = ToString(i * kMatchingKeys + k);
        auto value = ToString(i * kKeysPerFile + k);
        InternalKey internal_key(key, ++sequence_number, kTypeValue);
-
        // This is how the key will look like once it's written in bottommost
        // file
-        InternalKey bottommost_internal_key(
-            key, (key == "9999") ? sequence_number : 0, kTypeValue);
-
+        InternalKey bottommost_internal_key(key, 0, kTypeValue);
        if (corrupt_id(k)) {
          test::CorruptKeyType(&internal_key);
          test::CorruptKeyType(&bottommost_internal_key);
@@ -220,11 +217,9 @@ class CompactionJobTest : public testing::Test {
    cfd_ = versions_->GetColumnFamilySet()->GetDefault();
  }

-  void RunCompaction(
-      const std::vector<std::vector<FileMetaData*>>& input_files,
-      const stl_wrappers::KVMap& expected_results,
-      const std::vector<SequenceNumber>& snapshots = {},
-      SequenceNumber earliest_write_conflict_snapshot = kMaxSequenceNumber) {
+  void RunCompaction(const std::vector<std::vector<FileMetaData*>>& input_files,
+                     const stl_wrappers::KVMap& expected_results,
+                     const std::vector<SequenceNumber>& snapshots = {}) {
    auto cfd = versions_->GetColumnFamilySet()->GetDefault();

    size_t num_input_files = 0;
@@ -248,11 +243,11 @@ class CompactionJobTest : public testing::Test {
    LogBuffer log_buffer(InfoLogLevel::INFO_LEVEL, db_options_.info_log.get());
    mutex_.Lock();
    EventLogger event_logger(db_options_.info_log.get());
-    CompactionJob compaction_job(
-        0, &compaction, db_options_, env_options_, versions_.get(),
-        &shutting_down_, &log_buffer, nullptr, nullptr, nullptr, snapshots,
-        earliest_write_conflict_snapshot, table_cache_, &event_logger, false,
-        false, dbname_, &compaction_job_stats_);
+    CompactionJob compaction_job(0, &compaction, db_options_, env_options_,
+                                 versions_.get(), &shutting_down_, &log_buffer,
+                                 nullptr, nullptr, nullptr, snapshots,
+                                 table_cache_, &event_logger, false, false,
+                                 dbname_, &compaction_job_stats_);

    VerifyInitializationOfCompactionJobStats(compaction_job_stats_);

@@ -351,7 +346,7 @@ TEST_F(CompactionJobTest, SimpleOverwrite) {

  auto expected_results =
      mock::MakeMockFile({{KeyStr("a", 0U, kTypeValue), "val2"},
-                          {KeyStr("b", 4U, kTypeValue), "val3"}});
+                          {KeyStr("b", 0U, kTypeValue), "val3"}});

  SetLastSequence(4U);
  auto files = cfd_->current()->storage_info()->LevelFiles(0);
@@ -404,7 +399,7 @@ TEST_F(CompactionJobTest, SimpleMerge) {

  auto expected_results =
      mock::MakeMockFile({{KeyStr("a", 0U, kTypeValue), "3,4,5"},
-                          {KeyStr("b", 2U, kTypeValue), "1,2"}});
+                          {KeyStr("b", 0U, kTypeValue), "1,2"}});

  SetLastSequence(5U);
  auto files = cfd_->current()->storage_info()->LevelFiles(0);
@@ -564,144 +559,34 @@ TEST_F(CompactionJobTest, SimpleSingleDelete) {
 TEST_F(CompactionJobTest, SingleDeleteSnapshots) {
  NewDB();

-  auto file1 = mock::MakeMockFile({
-      {KeyStr("A", 12U, kTypeSingleDeletion), ""},
-      {KeyStr("a", 12U, kTypeSingleDeletion), ""},
-      {KeyStr("b", 21U, kTypeSingleDeletion), ""},
-      {KeyStr("c", 22U, kTypeSingleDeletion), ""},
-      {KeyStr("d", 9U, kTypeSingleDeletion), ""},
-      {KeyStr("f", 21U, kTypeSingleDeletion), ""},
-      {KeyStr("j", 11U, kTypeSingleDeletion), ""},
-      {KeyStr("j", 9U, kTypeSingleDeletion), ""},
-      {KeyStr("k", 12U, kTypeSingleDeletion), ""},
-      {KeyStr("k", 11U, kTypeSingleDeletion), ""},
-      {KeyStr("l", 3U, kTypeSingleDeletion), ""},
-      {KeyStr("l", 2U, kTypeSingleDeletion), ""},
-  });
+  auto file1 = mock::MakeMockFile({{KeyStr("A", 12U, kTypeSingleDeletion), ""},
+                                   {KeyStr("a", 12U, kTypeSingleDeletion), ""},
+                                   {KeyStr("b", 21U, kTypeSingleDeletion), ""},
+                                   {KeyStr("c", 22U, kTypeSingleDeletion), ""},
+                                   {KeyStr("d", 9U, kTypeSingleDeletion), ""}});
  AddMockFile(file1);

-  auto file2 = mock::MakeMockFile({
-      {KeyStr("0", 2U, kTypeSingleDeletion), ""},
-      {KeyStr("a", 11U, kTypeValue), "val1"},
-      {KeyStr("b", 11U, kTypeValue), "val2"},
-      {KeyStr("c", 21U, kTypeValue), "val3"},
-      {KeyStr("d", 8U, kTypeValue), "val4"},
-      {KeyStr("e", 2U, kTypeSingleDeletion), ""},
-      {KeyStr("f", 1U, kTypeValue), "val1"},
-      {KeyStr("g", 11U, kTypeSingleDeletion), ""},
-      {KeyStr("h", 2U, kTypeSingleDeletion), ""},
-      {KeyStr("m", 12U, kTypeValue), "val1"},
-      {KeyStr("m", 11U, kTypeSingleDeletion), ""},
-      {KeyStr("m", 8U, kTypeValue), "val2"},
-  });
+  auto file2 = mock::MakeMockFile({{KeyStr("0", 2U, kTypeSingleDeletion), ""},
+                                   {KeyStr("a", 11U, kTypeValue), "val1"},
+                                   {KeyStr("b", 11U, kTypeValue), "val2"},
+                                   {KeyStr("c", 21U, kTypeValue), "val3"},
+                                   {KeyStr("d", 8U, kTypeValue), "val4"},
+                                   {KeyStr("e", 2U, kTypeSingleDeletion), ""}});
  AddMockFile(file2);

-  auto file3 = mock::MakeMockFile({
-      {KeyStr("A", 1U, kTypeValue), "val"},
-      {KeyStr("e", 1U, kTypeValue), "val"},
-  });
+  auto file3 = mock::MakeMockFile({{KeyStr("A", 1U, kTypeValue), "val"},
+                                   {KeyStr("e", 1U, kTypeValue), "val"}});
  AddMockFile(file3, 2);

-  auto expected_results = mock::MakeMockFile({
-      {KeyStr("A", 12U, kTypeSingleDeletion), ""},
-      {KeyStr("a", 12U, kTypeSingleDeletion), ""},
-      {KeyStr("a", 11U, kTypeValue), ""},
-      {KeyStr("b", 21U, kTypeSingleDeletion), ""},
-      {KeyStr("b", 11U, kTypeValue), "val2"},
-      {KeyStr("c", 22U, kTypeSingleDeletion), ""},
-      {KeyStr("c", 21U, kTypeValue), ""},
-      {KeyStr("e", 2U, kTypeSingleDeletion), ""},
-      {KeyStr("f", 21U, kTypeSingleDeletion), ""},
-      {KeyStr("f", 1U, kTypeValue), "val1"},
-      {KeyStr("g", 11U, kTypeSingleDeletion), ""},
-      {KeyStr("j", 11U, kTypeSingleDeletion), ""},
-      {KeyStr("k", 11U, kTypeSingleDeletion), ""},
-      {KeyStr("m", 12U, kTypeValue), "val1"},
-      {KeyStr("m", 11U, kTypeSingleDeletion), ""},
-      {KeyStr("m", 8U, kTypeValue), "val2"},
-  });
+  auto expected_results =
+      mock::MakeMockFile({{KeyStr("A", 12U, kTypeSingleDeletion), ""},
+                          {KeyStr("b", 21U, kTypeSingleDeletion), ""},
+                          {KeyStr("b", 11U, kTypeValue), "val2"},
+                          {KeyStr("e", 2U, kTypeSingleDeletion), ""}});

  SetLastSequence(22U);
  auto files = cfd_->current()->storage_info()->LevelFiles(0);
-  RunCompaction({files}, expected_results, {10U, 20U}, 10U);
-}
-
-TEST_F(CompactionJobTest, EarliestWriteConflictSnapshot) {
-  NewDB();
-
-  // Test multiple snapshots where the earliest snapshot is not a
-  // write-conflic-snapshot.
-
-  auto file1 = mock::MakeMockFile({
-      {KeyStr("A", 24U, kTypeSingleDeletion), ""},
-      {KeyStr("A", 23U, kTypeValue), "val"},
-      {KeyStr("B", 24U, kTypeSingleDeletion), ""},
-      {KeyStr("B", 23U, kTypeValue), "val"},
-      {KeyStr("D", 24U, kTypeSingleDeletion), ""},
-      {KeyStr("G", 32U, kTypeSingleDeletion), ""},
-      {KeyStr("G", 31U, kTypeValue), "val"},
-      {KeyStr("G", 24U, kTypeSingleDeletion), ""},
-      {KeyStr("G", 23U, kTypeValue), "val2"},
-      {KeyStr("H", 31U, kTypeValue), "val"},
-      {KeyStr("H", 24U, kTypeSingleDeletion), ""},
-      {KeyStr("H", 23U, kTypeValue), "val"},
-      {KeyStr("I", 35U, kTypeSingleDeletion), ""},
-      {KeyStr("I", 34U, kTypeValue), "val2"},
-      {KeyStr("I", 33U, kTypeSingleDeletion), ""},
-      {KeyStr("I", 32U, kTypeValue), "val3"},
-      {KeyStr("I", 31U, kTypeSingleDeletion), ""},
-      {KeyStr("J", 34U, kTypeValue), "val"},
-      {KeyStr("J", 33U, kTypeSingleDeletion), ""},
-      {KeyStr("J", 25U, kTypeValue), "val2"},
-      {KeyStr("J", 24U, kTypeSingleDeletion), ""},
-  });
-  AddMockFile(file1);
-
-  auto file2 = mock::MakeMockFile({
-      {KeyStr("A", 14U, kTypeSingleDeletion), ""},
-      {KeyStr("A", 13U, kTypeValue), "val2"},
-      {KeyStr("C", 14U, kTypeSingleDeletion), ""},
-      {KeyStr("C", 13U, kTypeValue), "val"},
-      {KeyStr("E", 12U, kTypeSingleDeletion), ""},
-      {KeyStr("F", 4U, kTypeSingleDeletion), ""},
-      {KeyStr("F", 3U, kTypeValue), "val"},
-      {KeyStr("G", 14U, kTypeSingleDeletion), ""},
-      {KeyStr("G", 13U, kTypeValue), "val3"},
-      {KeyStr("H", 14U, kTypeSingleDeletion), ""},
-      {KeyStr("H", 13U, kTypeValue), "val2"},
-      {KeyStr("I", 13U, kTypeValue), "val4"},
-      {KeyStr("I", 12U, kTypeSingleDeletion), ""},
-      {KeyStr("I", 11U, kTypeValue), "val5"},
-      {KeyStr("J", 15U, kTypeValue), "val3"},
-      {KeyStr("J", 14U, kTypeSingleDeletion), ""},
-  });
-  AddMockFile(file2);
-
-  auto expected_results = mock::MakeMockFile({
-      {KeyStr("A", 24U, kTypeSingleDeletion), ""},
-      {KeyStr("A", 23U, kTypeValue), ""},
-      {KeyStr("B", 24U, kTypeSingleDeletion), ""},
-      {KeyStr("B", 23U, kTypeValue), ""},
-      {KeyStr("D", 24U, kTypeSingleDeletion), ""},
-      {KeyStr("E", 12U, kTypeSingleDeletion), ""},
-      {KeyStr("G", 32U, kTypeSingleDeletion), ""},
-      {KeyStr("G", 31U, kTypeValue), ""},
-      {KeyStr("H", 31U, kTypeValue), "val"},
-      {KeyStr("I", 35U, kTypeSingleDeletion), ""},
-      {KeyStr("I", 34U, kTypeValue), ""},
-      {KeyStr("I", 31U, kTypeSingleDeletion), ""},
-      {KeyStr("I", 13U, kTypeValue), "val4"},
-      {KeyStr("J", 34U, kTypeValue), "val"},
-      {KeyStr("J", 33U, kTypeSingleDeletion), ""},
-      {KeyStr("J", 25U, kTypeValue), "val2"},
-      {KeyStr("J", 24U, kTypeSingleDeletion), ""},
-      {KeyStr("J", 15U, kTypeValue), "val3"},
-      {KeyStr("J", 14U, kTypeSingleDeletion), ""},
-  });
-
-  SetLastSequence(24U);
-  auto files = cfd_->current()->storage_info()->LevelFiles(0);
-  RunCompaction({files}, expected_results, {10U, 20U, 30U}, 20U);
+  RunCompaction({files}, expected_results, {10U, 20U});
 }

 TEST_F(CompactionJobTest, SingleDeleteZeroSeq) {
@@ -719,7 +604,7 @@ TEST_F(CompactionJobTest, SingleDeleteZeroSeq) {
  AddMockFile(file2);

  auto expected_results = mock::MakeMockFile({
-      {KeyStr("dummy", 5U, kTypeValue), "val2"},
+      {KeyStr("dummy", 0U, kTypeValue), "val2"},
  });

  SetLastSequence(22U);
@@ -731,22 +616,9 @@ TEST_F(CompactionJobTest, MultiSingleDelete) {
  // Tests three scenarios involving multiple single delete/put pairs:
  //
  // A: Put Snapshot SDel Put SDel -> Put Snapshot SDel
-  // B: Snapshot Put SDel Put SDel Snapshot -> Snapshot SDel Snapshot
+  // B: Put SDel Put SDel -> (Removed)
  // C: SDel Put SDel Snapshot Put -> Snapshot Put
-  // D: (Put) SDel Snapshot Put SDel -> (Put) SDel Snapshot SDel
-  // E: Put SDel Snapshot Put SDel -> Snapshot SDel
-  // F: Put SDel Put Sdel Snapshot -> removed
-  // G: Snapshot SDel Put SDel Put -> Snapshot Put SDel
-  // H: (Put) Put SDel Put Sdel Snapshot -> Removed
-  // I: (Put) Snapshot Put SDel Put SDel -> SDel
-  // J: Put Put SDel Put SDel SDel Snapshot Put Put SDel SDel Put
-  //      -> Snapshot Put
-  // K: SDel SDel Put SDel Put Put Snapshot SDel Put SDel SDel Put SDel
-  //      -> Snapshot Put Snapshot SDel
-  // L: SDel Put Del Put SDel Snapshot Del Put Del SDel Put SDel
-  //      -> Snapshot SDel
-  // M: (Put) SDel Put Del Put SDel Snapshot Put Del SDel Put SDel Del
-  //      -> SDel Snapshot Del
+  // D: (Put) SDel Snapshot Put SDel -> (Put) SDel Snapshot
  NewDB();

  auto file1 = mock::MakeMockFile({
@@ -758,34 +630,6 @@ TEST_F(CompactionJobTest, MultiSingleDelete) {
      {KeyStr("C", 14U, kTypeValue), "val3"},
      {KeyStr("D", 12U, kTypeSingleDeletion), ""},
      {KeyStr("D", 11U, kTypeValue), "val4"},
-      {KeyStr("G", 15U, kTypeValue), "val"},
-      {KeyStr("G", 14U, kTypeSingleDeletion), ""},
-      {KeyStr("G", 13U, kTypeValue), "val"},
-      {KeyStr("I", 14U, kTypeSingleDeletion), ""},
-      {KeyStr("I", 13U, kTypeValue), "val"},
-      {KeyStr("J", 15U, kTypeValue), "val"},
-      {KeyStr("J", 14U, kTypeSingleDeletion), ""},
-      {KeyStr("J", 13U, kTypeSingleDeletion), ""},
-      {KeyStr("J", 12U, kTypeValue), "val"},
-      {KeyStr("J", 11U, kTypeValue), "val"},
-      {KeyStr("K", 16U, kTypeSingleDeletion), ""},
-      {KeyStr("K", 15U, kTypeValue), "val1"},
-      {KeyStr("K", 14U, kTypeSingleDeletion), ""},
-      {KeyStr("K", 13U, kTypeSingleDeletion), ""},
-      {KeyStr("K", 12U, kTypeValue), "val2"},
-      {KeyStr("K", 11U, kTypeSingleDeletion), ""},
-      {KeyStr("L", 16U, kTypeSingleDeletion), ""},
-      {KeyStr("L", 15U, kTypeValue), "val"},
-      {KeyStr("L", 14U, kTypeSingleDeletion), ""},
-      {KeyStr("L", 13U, kTypeDeletion), ""},
-      {KeyStr("L", 12U, kTypeValue), "val"},
-      {KeyStr("L", 11U, kTypeDeletion), ""},
-      {KeyStr("M", 16U, kTypeDeletion), ""},
-      {KeyStr("M", 15U, kTypeSingleDeletion), ""},
-      {KeyStr("M", 14U, kTypeValue), "val"},
-      {KeyStr("M", 13U, kTypeSingleDeletion), ""},
-      {KeyStr("M", 12U, kTypeDeletion), ""},
-      {KeyStr("M", 11U, kTypeValue), "val"},
  });
  AddMockFile(file1);

@@ -797,87 +641,24 @@ TEST_F(CompactionJobTest, MultiSingleDelete) {
      {KeyStr("C", 9U, kTypeValue), "val6"},
      {KeyStr("C", 8U, kTypeSingleDeletion), ""},
      {KeyStr("D", 10U, kTypeSingleDeletion), ""},
-      {KeyStr("E", 12U, kTypeSingleDeletion), ""},
-      {KeyStr("E", 11U, kTypeValue), "val"},
-      {KeyStr("E", 5U, kTypeSingleDeletion), ""},
-      {KeyStr("E", 4U, kTypeValue), "val"},
-      {KeyStr("F", 6U, kTypeSingleDeletion), ""},
-      {KeyStr("F", 5U, kTypeValue), "val"},
-      {KeyStr("F", 4U, kTypeSingleDeletion), ""},
-      {KeyStr("F", 3U, kTypeValue), "val"},
-      {KeyStr("G", 12U, kTypeSingleDeletion), ""},
-      {KeyStr("H", 6U, kTypeSingleDeletion), ""},
-      {KeyStr("H", 5U, kTypeValue), "val"},
-      {KeyStr("H", 4U, kTypeSingleDeletion), ""},
-      {KeyStr("H", 3U, kTypeValue), "val"},
-      {KeyStr("I", 12U, kTypeSingleDeletion), ""},
-      {KeyStr("I", 11U, kTypeValue), "val"},
-      {KeyStr("J", 6U, kTypeSingleDeletion), ""},
-      {KeyStr("J", 5U, kTypeSingleDeletion), ""},
-      {KeyStr("J", 4U, kTypeValue), "val"},
-      {KeyStr("J", 3U, kTypeSingleDeletion), ""},
-      {KeyStr("J", 2U, kTypeValue), "val"},
-      {KeyStr("K", 8U, kTypeValue), "val3"},
-      {KeyStr("K", 7U, kTypeValue), "val4"},
-      {KeyStr("K", 6U, kTypeSingleDeletion), ""},
-      {KeyStr("K", 5U, kTypeValue), "val5"},
-      {KeyStr("K", 2U, kTypeSingleDeletion), ""},
-      {KeyStr("K", 1U, kTypeSingleDeletion), ""},
-      {KeyStr("L", 5U, kTypeSingleDeletion), ""},
-      {KeyStr("L", 4U, kTypeValue), "val"},
-      {KeyStr("L", 3U, kTypeDeletion), ""},
-      {KeyStr("L", 2U, kTypeValue), "val"},
-      {KeyStr("L", 1U, kTypeSingleDeletion), ""},
-      {KeyStr("M", 10U, kTypeSingleDeletion), ""},
-      {KeyStr("M", 7U, kTypeValue), "val"},
-      {KeyStr("M", 5U, kTypeDeletion), ""},
-      {KeyStr("M", 4U, kTypeValue), "val"},
-      {KeyStr("M", 3U, kTypeSingleDeletion), ""},
  });
  AddMockFile(file2);

  auto file3 = mock::MakeMockFile({
-      {KeyStr("D", 1U, kTypeValue), "val"},
-      {KeyStr("H", 1U, kTypeValue), "val"},
-      {KeyStr("I", 2U, kTypeValue), "val"},
+      {KeyStr("D", 11U, kTypeValue), "val"},
  });
  AddMockFile(file3, 2);

-  auto file4 = mock::MakeMockFile({
-      {KeyStr("M", 1U, kTypeValue), "val"},
+  auto expected_results = mock::MakeMockFile({
+      {KeyStr("A", 12U, kTypeSingleDeletion), ""},
+      {KeyStr("A", 10U, kTypeValue), "val"},
+      {KeyStr("C", 14U, kTypeValue), "val3"},
+      {KeyStr("D", 10U, kTypeSingleDeletion), ""},
  });
-  AddMockFile(file4, 2);
-
-  auto expected_results =
-      mock::MakeMockFile({{KeyStr("A", 14U, kTypeSingleDeletion), ""},
-                          {KeyStr("A", 13U, kTypeValue), ""},
-                          {KeyStr("A", 12U, kTypeSingleDeletion), ""},
-                          {KeyStr("A", 10U, kTypeValue), "val"},
-                          {KeyStr("B", 14U, kTypeSingleDeletion), ""},
-                          {KeyStr("B", 13U, kTypeValue), ""},
-                          {KeyStr("C", 14U, kTypeValue), "val3"},
-                          {KeyStr("D", 12U, kTypeSingleDeletion), ""},
-                          {KeyStr("D", 11U, kTypeValue), ""},
-                          {KeyStr("D", 10U, kTypeSingleDeletion), ""},
-                          {KeyStr("E", 12U, kTypeSingleDeletion), ""},
-                          {KeyStr("E", 11U, kTypeValue), ""},
-                          {KeyStr("G", 15U, kTypeValue), "val"},
-                          {KeyStr("G", 12U, kTypeSingleDeletion), ""},
-                          {KeyStr("I", 14U, kTypeSingleDeletion), ""},
-                          {KeyStr("I", 13U, kTypeValue), ""},
-                          {KeyStr("J", 15U, kTypeValue), "val"},
-                          {KeyStr("K", 16U, kTypeSingleDeletion), ""},
-                          {KeyStr("K", 15U, kTypeValue), ""},
-                          {KeyStr("K", 11U, kTypeSingleDeletion), ""},
-                          {KeyStr("K", 8U, kTypeValue), "val3"},
-                          {KeyStr("L", 16U, kTypeSingleDeletion), ""},
-                          {KeyStr("L", 15U, kTypeValue), ""},
-                          {KeyStr("M", 16U, kTypeDeletion), ""},
-                          {KeyStr("M", 3U, kTypeSingleDeletion), ""}});

  SetLastSequence(22U);
  auto files = cfd_->current()->storage_info()->LevelFiles(0);
-  RunCompaction({files}, expected_results, {10U}, 10U);
+  RunCompaction({files}, expected_results, {10U});
 }

 // This test documents the behavior where a corrupt key follows a deletion or a
@@ -903,7 +684,7 @@ TEST_F(CompactionJobTest, CorruptionAfterDeletion) {
      mock::MakeMockFile({{test::KeyStr("A", 0U, kTypeValue), "val3"},
                          {test::KeyStr("a", 0U, kTypeValue, true), "val"},
                          {test::KeyStr("b", 0U, kTypeValue, true), "val"},
-                          {test::KeyStr("c", 1U, kTypeValue), "val2"}});
+                          {test::KeyStr("c", 0U, kTypeValue), "val2"}});

  SetLastSequence(6U);
  auto files = cfd_->current()->storage_info()->LevelFiles(0);
@@ -243,7 +243,7 @@ bool CompactionPicker::ExpandWhileOverlapping(const std::string& cf_name,
 // Returns true if any one of specified files are being compacted
 bool CompactionPicker::FilesInCompaction(
    const std::vector<FileMetaData*>& files) {
-  for (size_t i = 0; i < files.size(); i++) {
+  for (unsigned int i = 0; i < files.size(); i++) {
    if (files[i]->being_compacted) {
      return true;
    }
@@ -455,7 +455,7 @@ Compaction* CompactionPicker::CompactRange(
    const std::string& cf_name, const MutableCFOptions& mutable_cf_options,
    VersionStorageInfo* vstorage, int input_level, int output_level,
    uint32_t output_path_id, const InternalKey* begin, const InternalKey* end,
-    InternalKey** compaction_end, bool* manual_conflict) {
+    InternalKey** compaction_end) {
  // CompactionPickerFIFO has its own implementation of compact range
  assert(ioptions_.compaction_style != kCompactionStyleFIFO);

@@ -481,12 +481,6 @@ Compaction* CompactionPicker::CompactRange(
      return nullptr;
    }

-    if ((start_level == 0) && (!level0_compactions_in_progress_.empty())) {
-      *manual_conflict = true;
-      // Only one level 0 compaction allowed
-      return nullptr;
-    }
-
    std::vector<CompactionInputFiles> inputs(vstorage->num_levels() -
                                             start_level);
    for (int level = start_level; level < vstorage->num_levels(); level++) {
@@ -495,21 +489,13 @@ Compaction* CompactionPicker::CompactRange(
      for (FileMetaData* f : vstorage->LevelFiles(level)) {
        files.push_back(f);
      }
-      if (FilesInCompaction(files)) {
-        *manual_conflict = true;
-        return nullptr;
-      }
    }
-    Compaction* c = new Compaction(
+    return new Compaction(
        vstorage, mutable_cf_options, std::move(inputs), output_level,
        mutable_cf_options.MaxFileSizeForLevel(output_level),
        /* max_grandparent_overlap_bytes */ LLONG_MAX, output_path_id,
        GetCompressionType(ioptions_, output_level, 1),
        /* grandparents */ {}, /* is manual */ true);
-    if (start_level == 0) {
-      level0_compactions_in_progress_.insert(c);
-    }
-    return c;
  }

  CompactionInputFiles inputs;
@@ -528,13 +514,6 @@ Compaction* CompactionPicker::CompactRange(
    return nullptr;
  }

-  if ((input_level == 0) && (!level0_compactions_in_progress_.empty())) {
-    // Only one level 0 compaction allowed
-    TEST_SYNC_POINT("CompactionPicker::CompactRange:Conflict");
-    *manual_conflict = true;
-    return nullptr;
-  }
-
  // Avoid compacting too much in one shot in case the range is large.
  // But we cannot do this for level-0 since level-0 files can overlap
  // and we must not pick one file and drop another older file if the
@@ -557,10 +536,9 @@ Compaction* CompactionPicker::CompactRange(
  assert(output_path_id < static_cast<uint32_t>(ioptions_.db_paths.size()));

  if (ExpandWhileOverlapping(cf_name, vstorage, &inputs) == false) {
-    // manual compaction is now multi-threaded, so it can
+    // manual compaction is currently single-threaded, so it should never
    // happen that ExpandWhileOverlapping fails
-    // we handle it higher in RunManualCompaction
-    *manual_conflict = true;
+    assert(false);
    return nullptr;
  }

@@ -579,10 +557,9 @@ Compaction* CompactionPicker::CompactRange(
    int parent_index = -1;
    if (!SetupOtherInputs(cf_name, mutable_cf_options, vstorage, &inputs,
                          &output_level_inputs, &parent_index, -1)) {
-      // manual compaction is now multi-threaded, so it can
+      // manual compaction is currently single-threaded, so it should never
      // happen that SetupOtherInputs fails
-      // we handle it higher in RunManualCompaction
-      *manual_conflict = true;
+      assert(false);
      return nullptr;
    }
  }
@@ -591,12 +568,6 @@ Compaction* CompactionPicker::CompactRange(
  if (!output_level_inputs.empty()) {
    compaction_inputs.push_back(output_level_inputs);
  }
-  for (size_t i = 0; i < compaction_inputs.size(); i++) {
-    if (FilesInCompaction(compaction_inputs[i].files)) {
-      *manual_conflict = true;
-      return nullptr;
-    }
-  }

  std::vector<FileMetaData*> grandparents;
  GetGrandparents(vstorage, inputs, output_level_inputs, &grandparents);
@@ -609,9 +580,6 @@ Compaction* CompactionPicker::CompactRange(
      std::move(grandparents), /* is manual compaction */ true);

  TEST_SYNC_POINT_CALLBACK("CompactionPicker::CompactRange:Return", compaction);
-  if (input_level == 0) {
-    level0_compactions_in_progress_.insert(compaction);
-  }
  return compaction;
 }

@@ -916,40 +884,22 @@ Compaction* LevelCompactionPicker::PickCompaction(
  int base_index = -1;
  CompactionInputFiles inputs;
  double score = 0;
-  CompactionReason compaction_reason = CompactionReason::kUnknown;

  // Find the compactions by size on all levels.
-  bool skipped_l0 = false;
  for (int i = 0; i < NumberLevels() - 1; i++) {
    score = vstorage->CompactionScore(i);
    level = vstorage->CompactionScoreLevel(i);
    assert(i == 0 || score <= vstorage->CompactionScore(i - 1));
    if (score >= 1) {
-      if (skipped_l0 && level == vstorage->base_level()) {
-        // If L0->base_level compaction is pending, don't schedule further
-        // compaction from base level. Otherwise L0->base_level compaction
-        // may starve.
-        continue;
-      }
      output_level = (level == 0) ? vstorage->base_level() : level + 1;
      if (PickCompactionBySize(vstorage, level, output_level, &inputs,
                               &parent_index, &base_index) &&
          ExpandWhileOverlapping(cf_name, vstorage, &inputs)) {
        // found the compaction!
-        if (level == 0) {
-          // L0 score = `num L0 files` / `level0_file_num_compaction_trigger`
-          compaction_reason = CompactionReason::kLevelL0FilesNum;
-        } else {
-          // L1+ score = `Level files size` / `MaxBytesForLevel`
-          compaction_reason = CompactionReason::kLevelMaxLevelSize;
-        }
        break;
      } else {
        // didn't find the compaction, clear the inputs
        inputs.clear();
-        if (level == 0) {
-          skipped_l0 = true;
-        }
      }
    }
  }
@@ -962,9 +912,6 @@ Compaction* LevelCompactionPicker::PickCompaction(
    parent_index = base_index = -1;
    PickFilesMarkedForCompactionExperimental(cf_name, vstorage, &inputs, &level,
                                             &output_level);
-    if (!inputs.empty()) {
-      compaction_reason = CompactionReason::kFilesMarkedForCompaction;
-    }
  }
  if (inputs.empty()) {
    return nullptr;
@@ -1015,8 +962,7 @@ Compaction* LevelCompactionPicker::PickCompaction(
      mutable_cf_options.MaxGrandParentOverlapBytes(level),
      GetPathId(ioptions_, mutable_cf_options, output_level),
      GetCompressionType(ioptions_, output_level, vstorage->base_level()),
-      std::move(grandparents), is_manual, score,
-      false /* deletion_compaction */, compaction_reason);
+      std::move(grandparents), is_manual, score);

  // If it's level 0 compaction, make sure we don't execute any other level 0
  // compactions in parallel
@@ -1087,7 +1033,6 @@ bool LevelCompactionPicker::PickCompactionBySize(VersionStorageInfo* vstorage,
  // could be made better by looking at key-ranges that are
  // being compacted at level 0.
  if (level == 0 && !level0_compactions_in_progress_.empty()) {
-    TEST_SYNC_POINT("LevelCompactionPicker::PickCompactionBySize:0");
    return false;
  }

@@ -1164,19 +1109,18 @@ void UniversalCompactionPicker::SortedRun::Dump(char* out_buf,
 }

 void UniversalCompactionPicker::SortedRun::DumpSizeInfo(
-    char* out_buf, size_t out_buf_size, size_t sorted_run_count) const {
+    char* out_buf, size_t out_buf_size, int sorted_run_count) const {
  if (level == 0) {
    assert(file != nullptr);
    snprintf(out_buf, out_buf_size,
-             "file %" PRIu64 "[%" ROCKSDB_PRIszt
-             "] "
+             "file %" PRIu64
+             "[%d] "
             "with size %" PRIu64 " (compensated size %" PRIu64 ")",
             file->fd.GetNumber(), sorted_run_count, file->fd.GetFileSize(),
             file->compensated_file_size);
  } else {
    snprintf(out_buf, out_buf_size,
-             "level %d[%" ROCKSDB_PRIszt
-             "] "
+             "level %d[%d] "
             "with size %" PRIu64 " (compensated size %" PRIu64 ")",
             level, sorted_run_count, size, compensated_file_size);
  }
@@ -1458,21 +1402,16 @@ Compaction* UniversalCompactionPicker::PickCompactionUniversalReadAmp(

  const SortedRun* sr = nullptr;
  bool done = false;
-  size_t start_index = 0;
+  int start_index = 0;
  unsigned int candidate_count = 0;

  unsigned int max_files_to_compact = std::min(max_merge_width,
                                       max_number_of_files_to_compact);
  min_merge_width = std::max(min_merge_width, 2U);

-  // Caller checks the size before executing this function. This invariant is
-  // important because otherwise we may have a possible integer underflow when
-  // dealing with unsigned types.
-  assert(sorted_runs.size() > 0);
-
  // Considers a candidate file only if it is smaller than the
  // total size accumulated so far.
-  for (size_t loop = 0; loop < sorted_runs.size(); loop++) {
+  for (unsigned int loop = 0; loop < sorted_runs.size(); loop++) {
    candidate_count = 0;

    // Skip files that are already being compacted
@@ -1504,7 +1443,7 @@ Compaction* UniversalCompactionPicker::PickCompactionUniversalReadAmp(
    }

    // Check if the succeeding files need compaction.
-    for (size_t i = loop + 1;
+    for (unsigned int i = loop + 1;
         candidate_count < max_files_to_compact && i < sorted_runs.size();
         i++) {
      const SortedRun* succeeding_sr = &sorted_runs[i];
@@ -1546,7 +1485,7 @@ Compaction* UniversalCompactionPicker::PickCompactionUniversalReadAmp(
      done = true;
      break;
    } else {
-      for (size_t i = loop;
+      for (unsigned int i = loop;
           i < loop + candidate_count && i < sorted_runs.size(); i++) {
        const SortedRun* skipping_sr = &sorted_runs[i];
        char file_num_buf[256];
@@ -1559,7 +1498,7 @@ Compaction* UniversalCompactionPicker::PickCompactionUniversalReadAmp(
  if (!done || candidate_count <= 1) {
    return nullptr;
  }
-  size_t first_index_after = start_index + candidate_count;
+  unsigned int first_index_after = start_index + candidate_count;
  // Compression is enabled if files compacted earlier already reached
  // size ratio of compression.
  bool enable_compression = true;
@@ -1600,7 +1539,7 @@ Compaction* UniversalCompactionPicker::PickCompactionUniversalReadAmp(
  for (size_t i = 0; i < inputs.size(); ++i) {
    inputs[i].level = start_level + static_cast<int>(i);
  }
-  for (size_t i = start_index; i < first_index_after; i++) {
+  for (unsigned int i = start_index; i < first_index_after; i++) {
    auto& picking_sr = sorted_runs[i];
    if (picking_sr.level == 0) {
      FileMetaData* picking_file = picking_sr.file;
@@ -1617,18 +1556,11 @@ Compaction* UniversalCompactionPicker::PickCompactionUniversalReadAmp(
                file_num_buf);
  }

-  CompactionReason compaction_reason;
-  if (max_number_of_files_to_compact == UINT_MAX) {
-    compaction_reason = CompactionReason::kUniversalSortedRunNum;
-  } else {
-    compaction_reason = CompactionReason::kUniversalSizeRatio;
-  }
  return new Compaction(
      vstorage, mutable_cf_options, std::move(inputs), output_level,
      mutable_cf_options.MaxFileSizeForLevel(output_level), LLONG_MAX, path_id,
      GetCompressionType(ioptions_, start_level, 1, enable_compression),
-      /* grandparents */ {}, /* is manual */ false, score,
-      false /* deletion_compaction */, compaction_reason);
+      /* grandparents */ {}, /* is manual */ false, score);
 }

 // Look at overall size amplification. If size amplification
@@ -1647,11 +1579,11 @@ Compaction* UniversalCompactionPicker::PickCompactionUniversalSizeAmp(

  unsigned int candidate_count = 0;
  uint64_t candidate_size = 0;
-  size_t start_index = 0;
+  unsigned int start_index = 0;
  const SortedRun* sr = nullptr;

  // Skip files that are already being compacted
-  for (size_t loop = 0; loop < sorted_runs.size() - 1; loop++) {
+  for (unsigned int loop = 0; loop < sorted_runs.size() - 1; loop++) {
    sr = &sorted_runs[loop];
    if (!sr->being_compacted) {
      start_index = loop;         // Consider this as the first candidate.
@@ -1671,14 +1603,13 @@ Compaction* UniversalCompactionPicker::PickCompactionUniversalSizeAmp(
  {
    char file_num_buf[kFormatFileNumberBufSize];
    sr->Dump(file_num_buf, sizeof(file_num_buf), true);
-    LogToBuffer(log_buffer,
-                "[%s] Universal: First candidate %s[%" ROCKSDB_PRIszt "] %s",
+    LogToBuffer(log_buffer, "[%s] Universal: First candidate %s[%d] %s",
                cf_name.c_str(), file_num_buf, start_index,
                " to reduce size amp.\n");
  }

  // keep adding up all the remaining files
-  for (size_t loop = start_index; loop < sorted_runs.size() - 1; loop++) {
+  for (unsigned int loop = start_index; loop < sorted_runs.size() - 1; loop++) {
    sr = &sorted_runs[loop];
    if (sr->being_compacted) {
      char file_num_buf[kFormatFileNumberBufSize];
@@ -1718,7 +1649,7 @@ Compaction* UniversalCompactionPicker::PickCompactionUniversalSizeAmp(

  // Estimate total file size
  uint64_t estimated_total_size = 0;
-  for (size_t loop = start_index; loop < sorted_runs.size(); loop++) {
+  for (unsigned int loop = start_index; loop < sorted_runs.size(); loop++) {
    estimated_total_size += sorted_runs[loop].size;
  }
  uint32_t path_id = GetPathId(ioptions_, estimated_total_size);
@@ -1729,7 +1660,7 @@ Compaction* UniversalCompactionPicker::PickCompactionUniversalSizeAmp(
    inputs[i].level = start_level + static_cast<int>(i);
  }
  // We always compact all the files, so always compress.
-  for (size_t loop = start_index; loop < sorted_runs.size(); loop++) {
+  for (unsigned int loop = start_index; loop < sorted_runs.size(); loop++) {
    auto& picking_sr = sorted_runs[loop];
    if (picking_sr.level == 0) {
      FileMetaData* f = picking_sr.file;
@@ -1741,7 +1672,7 @@ Compaction* UniversalCompactionPicker::PickCompactionUniversalSizeAmp(
      }
    }
    char file_num_buf[256];
-    picking_sr.DumpSizeInfo(file_num_buf, sizeof(file_num_buf), loop);
+    sr->DumpSizeInfo(file_num_buf, sizeof(file_num_buf), loop);
    LogToBuffer(log_buffer, "[%s] Universal: size amp picking %s",
                cf_name.c_str(), file_num_buf);
  }
@@ -1752,9 +1683,7 @@ Compaction* UniversalCompactionPicker::PickCompactionUniversalSizeAmp(
      mutable_cf_options.MaxFileSizeForLevel(vstorage->num_levels() - 1),
      /* max_grandparent_overlap_bytes */ LLONG_MAX, path_id,
      GetCompressionType(ioptions_, vstorage->num_levels() - 1, 1),
-      /* grandparents */ {}, /* is manual */ false, score,
-      false /* deletion_compaction */,
-      CompactionReason::kUniversalSizeAmplification);
+      /* grandparents */ {}, /* is manual */ false, score);
 }

 bool FIFOCompactionPicker::NeedsCompaction(const VersionStorageInfo* vstorage)
@@ -1813,7 +1742,7 @@ Compaction* FIFOCompactionPicker::PickCompaction(
  Compaction* c = new Compaction(
      vstorage, mutable_cf_options, std::move(inputs), 0, 0, 0, 0,
      kNoCompression, {}, /* is manual */ false, vstorage->CompactionScore(0),
-      /* is deletion compaction */ true, CompactionReason::kFIFOMaxSize);
+      /* is deletion compaction */ true);
  level0_compactions_in_progress_.insert(c);
  return c;
 }
@@ -1822,7 +1751,7 @@ Compaction* FIFOCompactionPicker::CompactRange(
    const std::string& cf_name, const MutableCFOptions& mutable_cf_options,
    VersionStorageInfo* vstorage, int input_level, int output_level,
    uint32_t output_path_id, const InternalKey* begin, const InternalKey* end,
-    InternalKey** compaction_end, bool* manual_conflict) {
+    InternalKey** compaction_end) {
  assert(input_level == 0);
  assert(output_level == 0);
  *compaction_end = nullptr;
@@ -60,7 +60,7 @@ class CompactionPicker {
      const std::string& cf_name, const MutableCFOptions& mutable_cf_options,
      VersionStorageInfo* vstorage, int input_level, int output_level,
      uint32_t output_path_id, const InternalKey* begin, const InternalKey* end,
-      InternalKey** compaction_end, bool* manual_conflict);
+      InternalKey** compaction_end);

  // The maximum allowed output level.  Default value is NumberLevels() - 1.
  virtual int MaxOutputLevel() const {
@@ -251,7 +251,7 @@ class UniversalCompactionPicker : public CompactionPicker {

    // sorted_run_count is added into the string to print
    void DumpSizeInfo(char* out_buf, size_t out_buf_size,
-                      size_t sorted_run_count) const;
+                      int sorted_run_count) const;

    int level;
    // `file` Will be null for level > 0. For level = 0, the sorted run is
@@ -302,7 +302,7 @@ class FIFOCompactionPicker : public CompactionPicker {
      const std::string& cf_name, const MutableCFOptions& mutable_cf_options,
      VersionStorageInfo* vstorage, int input_level, int output_level,
      uint32_t output_path_id, const InternalKey* begin, const InternalKey* end,
-      InternalKey** compaction_end, bool* manual_conflict) override;
+      InternalKey** compaction_end) override;

  // The maximum allowed output level.  Always returns 0.
  virtual int MaxOutputLevel() const override {
@@ -329,13 +329,11 @@ class NullCompactionPicker : public CompactionPicker {
  }

  // Always return "nullptr"
-  Compaction* CompactRange(const std::string& cf_name,
-                           const MutableCFOptions& mutable_cf_options,
-                           VersionStorageInfo* vstorage, int input_level,
-                           int output_level, uint32_t output_path_id,
-                           const InternalKey* begin, const InternalKey* end,
-                           InternalKey** compaction_end,
-                           bool* manual_conflict) override {
+  Compaction* CompactRange(
+      const std::string& cf_name, const MutableCFOptions& mutable_cf_options,
+      VersionStorageInfo* vstorage, int input_level, int output_level,
+      uint32_t output_path_id, const InternalKey* begin, const InternalKey* end,
+      InternalKey** compaction_end) override {
    return nullptr;
  }

@@ -580,101 +580,6 @@ TEST_F(CompactionPickerTest, OverlappingUserKeys3) {
  ASSERT_EQ(7U, compaction->input(1, 1)->fd.GetNumber());
 }

-TEST_F(CompactionPickerTest, NotScheduleL1IfL0WithHigherPri1) {
-  NewVersionStorage(6, kCompactionStyleLevel);
-  mutable_cf_options_.level0_file_num_compaction_trigger = 2;
-  mutable_cf_options_.max_bytes_for_level_base = 900000000U;
-
-  // 6 L0 files, score 3.
-  Add(0, 1U, "000", "400", 1U);
-  Add(0, 2U, "001", "400", 1U, 0, 0);
-  Add(0, 3U, "001", "400", 1000000000U, 0, 0);
-  Add(0, 31U, "001", "400", 1000000000U, 0, 0);
-  Add(0, 32U, "001", "400", 1000000000U, 0, 0);
-  Add(0, 33U, "001", "400", 1000000000U, 0, 0);
-
-  // L1 total size 2GB, score 2.2. If one file being comapcted, score 1.1.
-  Add(1, 4U, "050", "300", 1000000000U, 0, 0);
-  file_map_[4u].first->being_compacted = true;
-  Add(1, 5U, "301", "350", 1000000000U, 0, 0);
-
-  // Output level overlaps with the beginning and the end of the chain
-  Add(2, 6U, "050", "100", 1U);
-  Add(2, 7U, "300", "400", 1U);
-
-  // No compaction should be scheduled, if L0 has higher priority than L1
-  // but L0->L1 compaction is blocked by a file in L1 being compacted.
-  UpdateVersionStorageInfo();
-  ASSERT_EQ(0, vstorage_->CompactionScoreLevel(0));
-  ASSERT_EQ(1, vstorage_->CompactionScoreLevel(1));
-  std::unique_ptr<Compaction> compaction(level_compaction_picker.PickCompaction(
-      cf_name_, mutable_cf_options_, vstorage_.get(), &log_buffer_));
-  ASSERT_TRUE(compaction.get() == nullptr);
-}
-
-TEST_F(CompactionPickerTest, NotScheduleL1IfL0WithHigherPri2) {
-  NewVersionStorage(6, kCompactionStyleLevel);
-  mutable_cf_options_.level0_file_num_compaction_trigger = 2;
-  mutable_cf_options_.max_bytes_for_level_base = 900000000U;
-
-  // 6 L0 files, score 3.
-  Add(0, 1U, "000", "400", 1U);
-  Add(0, 2U, "001", "400", 1U, 0, 0);
-  Add(0, 3U, "001", "400", 1000000000U, 0, 0);
-  Add(0, 31U, "001", "400", 1000000000U, 0, 0);
-  Add(0, 32U, "001", "400", 1000000000U, 0, 0);
-  Add(0, 33U, "001", "400", 1000000000U, 0, 0);
-
-  // L1 total size 2GB, score 2.2. If one file being comapcted, score 1.1.
-  Add(1, 4U, "050", "300", 1000000000U, 0, 0);
-  Add(1, 5U, "301", "350", 1000000000U, 0, 0);
-
-  // Output level overlaps with the beginning and the end of the chain
-  Add(2, 6U, "050", "100", 1U);
-  Add(2, 7U, "300", "400", 1U);
-
-  // If no file in L1 being compacted, L0->L1 compaction will be scheduled.
-  UpdateVersionStorageInfo();  // being_compacted flag is cleared here.
-  ASSERT_EQ(0, vstorage_->CompactionScoreLevel(0));
-  ASSERT_EQ(1, vstorage_->CompactionScoreLevel(1));
-  std::unique_ptr<Compaction> compaction(level_compaction_picker.PickCompaction(
-      cf_name_, mutable_cf_options_, vstorage_.get(), &log_buffer_));
-  ASSERT_TRUE(compaction.get() != nullptr);
-}
-
-TEST_F(CompactionPickerTest, NotScheduleL1IfL0WithHigherPri3) {
-  NewVersionStorage(6, kCompactionStyleLevel);
-  mutable_cf_options_.level0_file_num_compaction_trigger = 2;
-  mutable_cf_options_.max_bytes_for_level_base = 900000000U;
-
-  // 6 L0 files, score 3.
-  Add(0, 1U, "000", "400", 1U);
-  Add(0, 2U, "001", "400", 1U, 0, 0);
-  Add(0, 3U, "001", "400", 1000000000U, 0, 0);
-  Add(0, 31U, "001", "400", 1000000000U, 0, 0);
-  Add(0, 32U, "001", "400", 1000000000U, 0, 0);
-  Add(0, 33U, "001", "400", 1000000000U, 0, 0);
-
-  // L1 score more than 6.
-  Add(1, 4U, "050", "300", 1000000000U, 0, 0);
-  file_map_[4u].first->being_compacted = true;
-  Add(1, 5U, "301", "350", 1000000000U, 0, 0);
-  Add(1, 51U, "351", "400", 6000000000U, 0, 0);
-
-  // Output level overlaps with the beginning and the end of the chain
-  Add(2, 6U, "050", "100", 1U);
-  Add(2, 7U, "300", "400", 1U);
-
-  // If score in L1 is larger than L0, L1 compaction goes through despite
-  // there is pending L0 compaction.
-  UpdateVersionStorageInfo();
-  ASSERT_EQ(1, vstorage_->CompactionScoreLevel(0));
-  ASSERT_EQ(0, vstorage_->CompactionScoreLevel(1));
-  std::unique_ptr<Compaction> compaction(level_compaction_picker.PickCompaction(
-      cf_name_, mutable_cf_options_, vstorage_.get(), &log_buffer_));
-  ASSERT_TRUE(compaction.get() != nullptr);
-}
-
 TEST_F(CompactionPickerTest, EstimateCompactionBytesNeeded1) {
  int num_levels = ioptions_.num_levels;
  ioptions_.level_compaction_dynamic_level_bytes = false;
@@ -18,13 +18,6 @@ namespace rocksdb {
 void CancelAllBackgroundWork(DB* db, bool wait) {
  (dynamic_cast<DBImpl*>(db))->CancelAllBackgroundWork(wait);
 }
-
-Status DeleteFilesInRange(DB* db, ColumnFamilyHandle* column_family,
-                          const Slice* begin, const Slice* end) {
-  return (dynamic_cast<DBImpl*>(db))
-      ->DeleteFilesInRange(column_family, begin, end);
-}
-
 }  // namespace rocksdb

 #endif  // ROCKSDB_LITE
@@ -11,7 +11,6 @@

 #include "rocksdb/db.h"

-#include <inttypes.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/stat.h>
@@ -105,8 +104,8 @@ class CorruptionTest : public testing::Test {
  }

  void Check(int min_expected, int max_expected) {
-    uint64_t next_expected = 0;
-    uint64_t missed = 0;
+    unsigned int next_expected = 0;
+    int missed = 0;
    int bad_keys = 0;
    int bad_values = 0;
    int correct = 0;
@@ -127,7 +126,7 @@ class CorruptionTest : public testing::Test {
        continue;
      }
      missed += (key - next_expected);
-      next_expected = key + 1;
+      next_expected = static_cast<unsigned int>(key + 1);
      if (iter->value() != Value(static_cast<int>(key), &value_space)) {
        bad_values++;
      } else {
@@ -137,9 +136,8 @@ class CorruptionTest : public testing::Test {
    delete iter;

    fprintf(stderr,
-      "expected=%d..%d; got=%d; bad_keys=%d; bad_values=%d; missed=%llu\n",
-            min_expected, max_expected, correct, bad_keys, bad_values,
-            static_cast<unsigned long long>(missed));
+            "expected=%d..%d; got=%d; bad_keys=%d; bad_values=%d; missed=%d\n",
+            min_expected, max_expected, correct, bad_keys, bad_values, missed);
    ASSERT_LE(min_expected, correct);
    ASSERT_GE(max_expected, correct);
  }
@@ -185,7 +183,7 @@ class CorruptionTest : public testing::Test {
    FileType type;
    std::string fname;
    int picked_number = -1;
-    for (size_t i = 0; i < filenames.size(); i++) {
+    for (unsigned int i = 0; i < filenames.size(); i++) {
      if (ParseFileName(filenames[i], &number, &type) &&
          type == filetype &&
          static_cast<int>(number) > picked_number) {  // Pick latest file
@@ -39,7 +39,6 @@ int main() {
 #include <condition_variable>
 #include <mutex>
 #include <thread>
-#include <unordered_map>

 #include "db/db_impl.h"
 #include "db/version_set.h"
@@ -420,6 +419,10 @@ static class std::shared_ptr<rocksdb::Statistics> dbstats;
 DEFINE_int64(writes, -1, "Number of write operations to do. If negative, do"
             " --num reads.");

+DEFINE_int32(writes_per_second, 0, "Per-thread rate limit on writes and merges "
+             "  per second. No limit when <= 0. Only for the readwhilewriting "
+             "  and readwhilemerging tests.");
+
 DEFINE_bool(sync, false, "Sync all writes to disk");

 DEFINE_bool(disable_data_sync, false, "If true, do not wait until data is"
@@ -628,34 +631,17 @@ static bool ValidateRateLimit(const char* flagname, double value) {
  }
  return true;
 }
-DEFINE_double(soft_rate_limit, 0.0, "DEPRECATED");
+DEFINE_double(soft_rate_limit, 0.0, "");

 DEFINE_double(hard_rate_limit, 0.0, "DEPRECATED");

-DEFINE_uint64(soft_pending_compaction_bytes_limit, 64ull * 1024 * 1024 * 1024,
-              "Slowdown writes if pending compaction bytes exceed this number");
-
 DEFINE_uint64(hard_pending_compaction_bytes_limit, 128ull * 1024 * 1024 * 1024,
              "Stop writes if pending compaction bytes exceed this number");

-DEFINE_uint64(delayed_write_rate, 8388608u,
+DEFINE_uint64(delayed_write_rate, 2097152u,
              "Limited bytes allowed to DB when soft_rate_limit or "
              "level0_slowdown_writes_trigger triggers");

-DEFINE_bool(allow_concurrent_memtable_write, false,
-            "Allow multi-writers to update mem tables in parallel.");
-
-DEFINE_bool(enable_write_thread_adaptive_yield, false,
-            "Use a yielding spin loop for brief writer thread waits.");
-
-DEFINE_uint64(
-    write_thread_max_yield_usec, 100,
-    "Maximum microseconds for enable_write_thread_adaptive_yield operation.");
-
-DEFINE_uint64(write_thread_slow_yield_usec, 3,
-              "The threshold at which a slow yield is considered a signal that "
-              "other processes or threads want the core.");
-
 DEFINE_int32(rate_limit_delay_max_milliseconds, 1000,
             "When hard_rate_limit is set then this is the max time a put will"
             " be stalled.");
@@ -664,8 +650,7 @@ DEFINE_uint64(rate_limiter_bytes_per_sec, 0, "Set options.rate_limiter value.");

 DEFINE_uint64(
    benchmark_write_rate_limit, 0,
-    "If non-zero, db_bench will rate-limit the writes going into RocksDB. This "
-    "is the global rate in bytes/second.");
+    "If non-zero, db_bench will rate-limit the writes going into RocksDB");

 DEFINE_int32(max_grandparent_overlap_factor, 10, "Control maximum bytes of "
             "overlaps in grandparent (i.e., level+2) before we stop building a"
@@ -756,6 +741,11 @@ DEFINE_bool(identity_as_first_hash, false, "the first hash function of cuckoo "
            "table becomes an identity function. This is only valid when key "
            "is 8 bytes");

+enum PutOrMerge {
+  kPut,
+  kMerge
+};
+
 enum RepFactory {
  kSkipList,
  kPrefixHash,
@@ -1173,49 +1163,19 @@ class ReporterAgent {
  bool stop_;
 };

-enum OperationType : unsigned char {
-  kRead = 0,
-  kWrite,
-  kDelete,
-  kSeek,
-  kMerge,
-  kUpdate,
-  kCompress,
-  kUncompress,
-  kCrc,
-  kHash,
-  kOthers
-};
-
-static std::unordered_map<OperationType, std::string, std::hash<unsigned char>>
-                          OperationTypeString = {
-  {kRead, "read"},
-  {kWrite, "write"},
-  {kDelete, "delete"},
-  {kSeek, "seek"},
-  {kMerge, "merge"},
-  {kUpdate, "update"},
-  {kCompress, "compress"},
-  {kCompress, "uncompress"},
-  {kCrc, "crc"},
-  {kHash, "hash"},
-  {kOthers, "op"}
-};
-
 class Stats {
 private:
  int id_;
-  uint64_t start_;
-  uint64_t finish_;
+  double start_;
+  double finish_;
  double seconds_;
-  uint64_t done_;
-  uint64_t last_report_done_;
-  uint64_t next_report_;
-  uint64_t bytes_;
-  uint64_t last_op_finish_;
-  uint64_t last_report_finish_;
-  std::unordered_map<OperationType, HistogramImpl,
-                     std::hash<unsigned char>> hist_;
+  int64_t done_;
+  int64_t last_report_done_;
+  int64_t next_report_;
+  int64_t bytes_;
+  double last_op_finish_;
+  double last_report_finish_;
+  HistogramImpl hist_;
  std::string message_;
  bool exclude_from_merge_;
  ReporterAgent* reporter_agent_;  // does not own
@@ -1231,7 +1191,7 @@ class Stats {
    id_ = id;
    next_report_ = FLAGS_stats_interval ? FLAGS_stats_interval : 100;
    last_op_finish_ = start_;
-    hist_.clear();
+    hist_.Clear();
    done_ = 0;
    last_report_done_ = 0;
    bytes_ = 0;
@@ -1248,15 +1208,7 @@ class Stats {
    if (other.exclude_from_merge_)
      return;

-    for (auto it = other.hist_.begin(); it != other.hist_.end(); ++it) {
-      auto this_it = hist_.find(it->first);
-      if (this_it != hist_.end()) {
-        this_it->second.Merge(other.hist_.at(it->first));
-      } else {
-        hist_.insert({ it->first, it->second });
-      }
-    }
-
+    hist_.Merge(other.hist_);
    done_ += other.done_;
    bytes_ += other.bytes_;
    seconds_ += other.seconds_;
@@ -1309,29 +1261,16 @@ class Stats {
    }
  }

-  void ResetLastOpTime() {
-    // Set to now to avoid latency from calls to SleepForMicroseconds
-    last_op_finish_ = FLAGS_env->NowMicros();
-  }
-
-  void FinishedOps(DBWithColumnFamilies* db_with_cfh, DB* db, int64_t num_ops,
-                   enum OperationType op_type = kOthers) {
+  void FinishedOps(DBWithColumnFamilies* db_with_cfh, DB* db, int64_t num_ops) {
    if (reporter_agent_) {
      reporter_agent_->ReportFinishedOps(num_ops);
    }
    if (FLAGS_histogram) {
-      uint64_t now = FLAGS_env->NowMicros();
-      uint64_t micros = now - last_op_finish_;
-
-      if (hist_.find(op_type) == hist_.end())
-      {
-        HistogramImpl hist_temp;
-        hist_.insert({op_type, hist_temp});
-      }
-      hist_[op_type].Add(micros);
-
+      double now = FLAGS_env->NowMicros();
+      double micros = now - last_op_finish_;
+      hist_.Add(micros);
      if (micros > 20000 && !FLAGS_stats_interval) {
-        fprintf(stderr, "long op: %" PRIu64 " micros%30s\r", micros, "");
+        fprintf(stderr, "long op: %.1f micros%30s\r", micros, "");
        fflush(stderr);
      }
      last_op_finish_ = now;
@@ -1349,7 +1288,7 @@ class Stats {
        else                            next_report_ += 100000;
        fprintf(stderr, "... finished %" PRIu64 " ops%30s\r", done_, "");
      } else {
-        uint64_t now = FLAGS_env->NowMicros();
+        double now = FLAGS_env->NowMicros();
        int64_t usecs_since_last = now - last_report_finish_;

        // Determine whether to print status where interval is either
@@ -1365,7 +1304,7 @@ class Stats {
          fprintf(stderr,
                  "%s ... thread %d: (%" PRIu64 ",%" PRIu64 ") ops and "
                  "(%.1f,%.1f) ops/second in (%.6f,%.6f) seconds\n",
-                  FLAGS_env->TimeToString(now/1000000).c_str(),
+                  FLAGS_env->TimeToString((uint64_t) now/1000000).c_str(),
                  id_,
                  done_ - last_report_done_, done_,
                  (done_ - last_report_done_) /
@@ -1458,11 +1397,7 @@ class Stats {
            (extra.empty() ? "" : " "),
            extra.c_str());
    if (FLAGS_histogram) {
-      for (auto it = hist_.begin(); it != hist_.end(); ++it) {
-        fprintf(stdout, "Microseconds per %s:\n%s\n",
-                OperationTypeString[it->first].c_str(),
-                it->second.ToString().c_str());
-      }
+      fprintf(stdout, "Microseconds per op:\n%s\n", hist_.ToString().c_str());
    }
    if (FLAGS_report_file_operations) {
      ReportFileOpEnv* env = static_cast<ReportFileOpEnv*>(FLAGS_env);
@@ -1519,7 +1454,7 @@ struct ThreadState {

 class Duration {
 public:
-  Duration(uint64_t max_seconds, int64_t max_ops, int64_t ops_per_stage = 0) {
+  Duration(int max_seconds, int64_t max_ops, int64_t ops_per_stage = 0) {
    max_seconds_ = max_seconds;
    max_ops_= max_ops;
    ops_per_stage_ = (ops_per_stage > 0) ? ops_per_stage : max_ops;
@@ -1536,8 +1471,8 @@ class Duration {
    if (max_seconds_) {
      // Recheck every appx 1000 ops (exact iff increment is factor of 1000)
      if ((ops_/1000) != ((ops_-increment)/1000)) {
-        uint64_t now = FLAGS_env->NowMicros();
-        return ((now - start_at_) / 1000000) >= max_seconds_;
+        double now = FLAGS_env->NowMicros();
+        return ((now - start_at_) / 1000000.0) >= max_seconds_;
      } else {
        return false;
      }
@@ -1547,11 +1482,11 @@ class Duration {
  }

 private:
-  uint64_t max_seconds_;
+  int max_seconds_;
  int64_t max_ops_;
  int64_t ops_per_stage_;
  int64_t ops_;
-  uint64_t start_at_;
+  double start_at_;
 };

 class Benchmark {
@@ -1635,8 +1570,7 @@ class Benchmark {
            (((FLAGS_key_size + FLAGS_value_size * FLAGS_compression_ratio)
              * num_)
             / 1048576.0));
-    fprintf(stdout, "Write rate: %" PRIu64 " bytes/second\n",
-            FLAGS_benchmark_write_rate_limit);
+    fprintf(stdout, "Writes per second: %d\n", FLAGS_writes_per_second);
    if (FLAGS_enable_numa) {
      fprintf(stderr, "Running in NUMA enabled mode.\n");
 #ifndef NUMA
@@ -1650,8 +1584,9 @@ class Benchmark {
 #endif
    }

-    auto compression = CompressionTypeToString(FLAGS_compression_type_e);
-    fprintf(stdout, "Compression: %s\n", compression.c_str());
+    const char* compression =
+        CompressionTypeToString(FLAGS_compression_type_e).c_str();
+    fprintf(stdout, "Compression: %s\n", compression);

    switch (FLAGS_rep_factory) {
      case kPrefixHash:
@@ -1672,7 +1607,7 @@ class Benchmark {
    }
    fprintf(stdout, "Perf Level: %d\n", FLAGS_perf_level);

-    PrintWarnings(compression.c_str());
+    PrintWarnings(compression);
    fprintf(stdout, "------------------------------------------------\n");
  }

@@ -1724,11 +1659,7 @@ class Benchmark {

 #if defined(__linux)
    time_t now = time(nullptr);
-    char buf[52];
-    // Lint complains about ctime() usage, so replace it with ctime_r(). The
-    // requirement is to provide a buffer which is at least 26 bytes.
-    fprintf(stderr, "Date:       %s",
-            ctime_r(&now, buf));  // ctime_r() adds newline
+    fprintf(stderr, "Date:       %s", ctime(&now));  // ctime() adds newline

    FILE* cpuinfo = fopen("/proc/cpuinfo", "r");
    if (cpuinfo != nullptr) {
@@ -1809,7 +1740,7 @@ class Benchmark {

    std::vector<std::string> files;
    FLAGS_env->GetChildren(FLAGS_db, &files);
-    for (size_t i = 0; i < files.size(); i++) {
+    for (unsigned int i = 0; i < files.size(); i++) {
      if (Slice(files[i]).starts_with("heap-")) {
        FLAGS_env->DeleteFile(FLAGS_db + "/" + files[i]);
      }
@@ -2207,7 +2138,7 @@ class Benchmark {
    uint32_t crc = 0;
    while (bytes < 500 * 1048576) {
      crc = crc32c::Value(data.data(), size);
-      thread->stats.FinishedOps(nullptr, nullptr, 1, kCrc);
+      thread->stats.FinishedOps(nullptr, nullptr, 1);
      bytes += size;
    }
    // Print so result is not dead
@@ -2226,7 +2157,7 @@ class Benchmark {
    unsigned int xxh32 = 0;
    while (bytes < 500 * 1048576) {
      xxh32 = XXH32(data.data(), size, 0);
-      thread->stats.FinishedOps(nullptr, nullptr, 1, kHash);
+      thread->stats.FinishedOps(nullptr, nullptr, 1);
      bytes += size;
    }
    // Print so result is not dead
@@ -2247,7 +2178,7 @@ class Benchmark {
        ptr = ap.load(std::memory_order_acquire);
      }
      count++;
-      thread->stats.FinishedOps(nullptr, nullptr, 1, kOthers);
+      thread->stats.FinishedOps(nullptr, nullptr, 1);
    }
    if (ptr == nullptr) exit(1); // Disable unused variable warning.
  }
@@ -2262,11 +2193,10 @@ class Benchmark {

    // Compress 1G
    while (ok && bytes < int64_t(1) << 30) {
-      compressed.clear();
      ok = CompressSlice(input, &compressed);
      produced += compressed.size();
      bytes += input.size();
-      thread->stats.FinishedOps(nullptr, nullptr, 1, kCompress);
+      thread->stats.FinishedOps(nullptr, nullptr, 1);
    }

    if (!ok) {
@@ -2291,19 +2221,12 @@ class Benchmark {
    while (ok && bytes < 1024 * 1048576) {
      char *uncompressed = nullptr;
      switch (FLAGS_compression_type_e) {
-        case rocksdb::kSnappyCompression: {
-          // get size and allocate here to make comparison fair
-          size_t ulength = 0;
-          if (!Snappy_GetUncompressedLength(compressed.data(),
-                                            compressed.size(), &ulength)) {
-            ok = false;
-            break;
-          }
-          uncompressed = new char[ulength];
-          ok = Snappy_Uncompress(compressed.data(), compressed.size(),
-                                 uncompressed);
-          break;
-        }
+      case rocksdb::kSnappyCompression:
+        // allocate here to make comparison fair
+        uncompressed = new char[input.size()];
+        ok = Snappy_Uncompress(compressed.data(), compressed.size(),
+                               uncompressed);
+        break;
      case rocksdb::kZlibCompression:
        uncompressed = Zlib_Uncompress(compressed.data(), compressed.size(),
                                       &decompress_size, 2);
@@ -2334,7 +2257,7 @@ class Benchmark {
      }
      delete[] uncompressed;
      bytes += input.size();
-      thread->stats.FinishedOps(nullptr, nullptr, 1, kUncompress);
+      thread->stats.FinishedOps(nullptr, nullptr, 1);
    }

    if (!ok) {
@@ -2396,7 +2319,8 @@ class Benchmark {
        fprintf(stderr, "Open flash device failed\n");
        exit(1);
      }
-      flashcache_aware_env_ = NewFlashcacheAwareEnv(FLAGS_env, cachedev_fd_);
+      flashcache_aware_env_ =
+          std::move(NewFlashcacheAwareEnv(FLAGS_env, cachedev_fd_));
      if (flashcache_aware_env_.get() == nullptr) {
        fprintf(stderr, "Failed to open flashcache device at %s\n",
                FLAGS_flashcache_dev.c_str());
@@ -2564,17 +2488,9 @@ class Benchmark {
    }
    options.soft_rate_limit = FLAGS_soft_rate_limit;
    options.hard_rate_limit = FLAGS_hard_rate_limit;
-    options.soft_pending_compaction_bytes_limit =
-        FLAGS_soft_pending_compaction_bytes_limit;
    options.hard_pending_compaction_bytes_limit =
        FLAGS_hard_pending_compaction_bytes_limit;
    options.delayed_write_rate = FLAGS_delayed_write_rate;
-    options.allow_concurrent_memtable_write =
-        FLAGS_allow_concurrent_memtable_write;
-    options.enable_write_thread_adaptive_yield =
-        FLAGS_enable_write_thread_adaptive_yield;
-    options.write_thread_max_yield_usec = FLAGS_write_thread_max_yield_usec;
-    options.write_thread_slow_yield_usec = FLAGS_write_thread_slow_yield_usec;
    options.rate_limit_delay_max_milliseconds =
      FLAGS_rate_limit_delay_max_milliseconds;
    options.table_cache_numshardbits = FLAGS_table_cache_numshardbits;
@@ -2849,22 +2765,14 @@ class Benchmark {
          }
        }
      }
-
      size_t id = thread->rand.Next() % num_key_gens;
      DBWithColumnFamilies* db_with_cfh = SelectDBWithCfh(id);
      batch.Clear();
-
-      if (thread->shared->write_rate_limiter.get() != nullptr) {
-        thread->shared->write_rate_limiter->Request(
-            entries_per_batch_ * (value_size_ + key_size_),
-            Env::IO_HIGH);
-        // Set time at which last op finished to Now() to hide latency and
-        // sleep from rate limiter. Also, do the check once per batch, not
-        // once per write.
-        thread->stats.ResetLastOpTime();
-      }
-
      for (int64_t j = 0; j < entries_per_batch_; j++) {
+        if (thread->shared->write_rate_limiter.get() != nullptr) {
+          thread->shared->write_rate_limiter->Request(value_size_ + key_size_,
+                                                      Env::IO_HIGH);
+        }
        int64_t rand_num = key_gens[id]->Next();
        GenerateKeyFromInt(rand_num, FLAGS_num, &key);
        if (FLAGS_num_column_families <= 1) {
@@ -2880,7 +2788,7 @@ class Benchmark {
      }
      s = db_with_cfh->db->Write(write_options_, &batch);
      thread->stats.FinishedOps(db_with_cfh, db_with_cfh->db,
-                                entries_per_batch_, kWrite);
+                                entries_per_batch_);
      if (!s.ok()) {
        fprintf(stderr, "put error: %s\n", s.ToString().c_str());
        exit(1);
@@ -2908,7 +2816,7 @@ class Benchmark {
    int64_t bytes = 0;
    for (iter->SeekToFirst(); i < reads_ && iter->Valid(); iter->Next()) {
      bytes += iter->key().size() + iter->value().size();
-      thread->stats.FinishedOps(nullptr, db, 1, kRead);
+      thread->stats.FinishedOps(nullptr, db, 1);
      ++i;
    }
    delete iter;
@@ -2931,7 +2839,7 @@ class Benchmark {
    int64_t bytes = 0;
    for (iter->SeekToLast(); i < reads_ && iter->Valid(); iter->Prev()) {
      bytes += iter->key().size() + iter->value().size();
-      thread->stats.FinishedOps(nullptr, db, 1, kRead);
+      thread->stats.FinishedOps(nullptr, db, 1);
      ++i;
    }
    delete iter;
@@ -2971,7 +2879,7 @@ class Benchmark {
          ++nonexist;
        }
      }
-      thread->stats.FinishedOps(nullptr, db, 100, kRead);
+      thread->stats.FinishedOps(nullptr, db, 100);
    } while (!duration.Done(100));

    char msg[100];
@@ -3039,7 +2947,7 @@ class Benchmark {
        fprintf(stderr, "Get returned an error: %s\n", s.ToString().c_str());
        abort();
      }
-      thread->stats.FinishedOps(db_with_cfh, db_with_cfh->db, 1, kRead);
+      thread->stats.FinishedOps(db_with_cfh, db_with_cfh->db, 1);
    }

    char msg[100];
@@ -3064,7 +2972,7 @@ class Benchmark {
    std::vector<std::unique_ptr<const char[]> > key_guards;
    std::vector<std::string> values(entries_per_batch_);
    while (static_cast<int64_t>(keys.size()) < entries_per_batch_) {
-      key_guards.push_back(std::unique_ptr<const char[]>());
+      key_guards.push_back(std::move(std::unique_ptr<const char[]>()));
      keys.push_back(AllocateKey(&key_guards.back()));
    }

@@ -3087,7 +2995,7 @@ class Benchmark {
          abort();
        }
      }
-      thread->stats.FinishedOps(nullptr, db, entries_per_batch_, kRead);
+      thread->stats.FinishedOps(nullptr, db, entries_per_batch_);
    }

    char msg[100];
@@ -3103,7 +3011,7 @@ class Benchmark {
      DB* db = SelectDB(thread);
      Iterator* iter = db->NewIterator(options);
      delete iter;
-      thread->stats.FinishedOps(nullptr, db, 1, kOthers);
+      thread->stats.FinishedOps(nullptr, db, 1);
    }
  }

@@ -3111,7 +3019,7 @@ class Benchmark {
    if (thread->tid > 0) {
      IteratorCreation(thread);
    } else {
-      BGWriter(thread, kWrite);
+      BGWriter(thread, kPut);
    }
  }

@@ -3180,7 +3088,7 @@ class Benchmark {
        assert(iter_to_use->status().ok());
      }

-      thread->stats.FinishedOps(&db_, db_.db, 1, kSeek);
+      thread->stats.FinishedOps(&db_, db_.db, 1);
    }
    delete single_iter;
    for (auto iter : multi_iters) {
@@ -3201,7 +3109,7 @@ class Benchmark {
    if (thread->tid > 0) {
      SeekRandom(thread);
    } else {
-      BGWriter(thread, kWrite);
+      BGWriter(thread, kPut);
    }
  }

@@ -3229,7 +3137,7 @@ class Benchmark {
        batch.Delete(key);
      }
      auto s = db->Write(write_options_, &batch);
-      thread->stats.FinishedOps(nullptr, db, entries_per_batch_, kDelete);
+      thread->stats.FinishedOps(nullptr, db, entries_per_batch_);
      if (!s.ok()) {
        fprintf(stderr, "del error: %s\n", s.ToString().c_str());
        exit(1);
@@ -3250,7 +3158,7 @@ class Benchmark {
    if (thread->tid > 0) {
      ReadRandom(thread);
    } else {
-      BGWriter(thread, kWrite);
+      BGWriter(thread, kPut);
    }
  }

@@ -3262,16 +3170,19 @@ class Benchmark {
    }
  }

-  void BGWriter(ThreadState* thread, enum OperationType write_merge) {
+  void BGWriter(ThreadState* thread, enum PutOrMerge write_merge) {
    // Special thread that keeps writing until other threads are done.
    RandomGenerator gen;
+    double last = FLAGS_env->NowMicros();
+    int writes_per_second_by_10 = 0;
+    int num_writes = 0;
    int64_t bytes = 0;

-    std::unique_ptr<RateLimiter> write_rate_limiter;
-    if (FLAGS_benchmark_write_rate_limit > 0) {
-      write_rate_limiter.reset(
-          NewGenericRateLimiter(FLAGS_benchmark_write_rate_limit));
-    }
+    // --writes_per_second rate limit is enforced per 100 milliseconds
+    // intervals to avoid a burst of writes at the start of each second.
+
+    if (FLAGS_writes_per_second > 0)
+      writes_per_second_by_10 = FLAGS_writes_per_second / 10;

    // Don't merge stats from this thread with the readers.
    thread->stats.SetExcludeFromMerge();
@@ -3292,7 +3203,7 @@ class Benchmark {
      GenerateKeyFromInt(thread->rand.Next() % FLAGS_num, FLAGS_num, &key);
      Status s;

-      if (write_merge == kWrite) {
+      if (write_merge == kPut) {
          s = db->Put(write_options_, key, gen.Generate(value_size_));
      } else {
          s = db->Merge(write_options_, key, gen.Generate(value_size_));
@@ -3303,12 +3214,20 @@ class Benchmark {
        exit(1);
      }
      bytes += key.size() + value_size_;
-      thread->stats.FinishedOps(&db_, db_.db, 1, kWrite);
+      thread->stats.FinishedOps(&db_, db_.db, 1);

-      if (FLAGS_benchmark_write_rate_limit > 0) {
-        write_rate_limiter->Request(
-            entries_per_batch_ * (value_size_ + key_size_),
-            Env::IO_HIGH);
+      ++num_writes;
+      if (writes_per_second_by_10 && num_writes >= writes_per_second_by_10) {
+        double now = FLAGS_env->NowMicros();
+        double usecs_since_last = now - last;
+
+        num_writes = 0;
+        last = now;
+
+        if (usecs_since_last < 100000.0) {
+          FLAGS_env->SleepForMicroseconds(100000.0 - usecs_since_last);
+          last = FLAGS_env->NowMicros();
+        }
      }
    }
    thread->stats.AddBytes(bytes);
@@ -3436,7 +3355,6 @@ class Benchmark {
        }
        get_weight--;
        gets_done++;
-        thread->stats.FinishedOps(&db_, db_.db, 1, kRead);
      } else if (put_weight > 0) {
        // then do all the corresponding number of puts
        // for all the gets we have done earlier
@@ -3447,7 +3365,6 @@ class Benchmark {
        }
        put_weight--;
        puts_done++;
-        thread->stats.FinishedOps(&db_, db_.db, 1, kWrite);
      } else if (delete_weight > 0) {
        Status s = DeleteMany(db, write_options_, key);
        if (!s.ok()) {
@@ -3456,8 +3373,9 @@ class Benchmark {
        }
        delete_weight--;
        deletes_done++;
-        thread->stats.FinishedOps(&db_, db_.db, 1, kDelete);
      }
+
+      thread->stats.FinishedOps(&db_, db_.db, 1);
    }
    char msg[100];
    snprintf(msg, sizeof(msg),
@@ -3504,7 +3422,6 @@ class Benchmark {
        }
        get_weight--;
        reads_done++;
-        thread->stats.FinishedOps(nullptr, db, 1, kRead);
      } else  if (put_weight > 0) {
        // then do all the corresponding number of puts
        // for all the gets we have done earlier
@@ -3515,8 +3432,8 @@ class Benchmark {
        }
        put_weight--;
        writes_done++;
-        thread->stats.FinishedOps(nullptr, db, 1, kWrite);
      }
+      thread->stats.FinishedOps(nullptr, db, 1);
    }
    char msg[100];
    snprintf(msg, sizeof(msg), "( reads:%" PRIu64 " writes:%" PRIu64 \
@@ -3558,7 +3475,7 @@ class Benchmark {
        exit(1);
      }
      bytes += key.size() + value_size_;
-      thread->stats.FinishedOps(nullptr, db, 1, kUpdate);
+      thread->stats.FinishedOps(nullptr, db, 1);
    }
    char msg[100];
    snprintf(msg, sizeof(msg),
@@ -3613,7 +3530,7 @@ class Benchmark {
        exit(1);
      }
      bytes += key.size() + value.size();
-      thread->stats.FinishedOps(nullptr, db, 1, kUpdate);
+      thread->stats.FinishedOps(nullptr, db, 1);
    }

    char msg[100];
@@ -3651,7 +3568,7 @@ class Benchmark {
        exit(1);
      }
      bytes += key.size() + value_size_;
-      thread->stats.FinishedOps(nullptr, db, 1, kMerge);
+      thread->stats.FinishedOps(nullptr, db, 1);
    }

    // Print some statistics
@@ -3693,8 +3610,9 @@ class Benchmark {
          fprintf(stderr, "merge error: %s\n", s.ToString().c_str());
          exit(1);
        }
+
        num_merges++;
-        thread->stats.FinishedOps(nullptr, db, 1, kMerge);
+
      } else {
        Status s = db->Get(options, key, &value);
        if (value.length() > max_length)
@@ -3707,9 +3625,12 @@ class Benchmark {
        } else if (!s.IsNotFound()) {
          num_hits++;
        }
+
        num_gets++;
-        thread->stats.FinishedOps(nullptr, db, 1, kRead);
+
      }
+
+      thread->stats.FinishedOps(nullptr, db, 1);
    }

    char msg[100];
@@ -3736,7 +3657,7 @@ class Benchmark {
      GenerateKeyFromInt(i, FLAGS_num, &key);
      iter->Seek(key);
      assert(iter->Valid() && iter->key() == key);
-      thread->stats.FinishedOps(nullptr, db, 1, kSeek);
+      thread->stats.FinishedOps(nullptr, db, 1);

      for (int j = 0; j < FLAGS_seek_nexts && i + 1 < FLAGS_num; ++j) {
        if (!FLAGS_reverse_iterator) {
@@ -3746,12 +3667,12 @@ class Benchmark {
        }
        GenerateKeyFromInt(++i, FLAGS_num, &key);
        assert(iter->Valid() && iter->key() == key);
-        thread->stats.FinishedOps(nullptr, db, 1, kSeek);
+        thread->stats.FinishedOps(nullptr, db, 1);
      }

      iter->Seek(key);
      assert(iter->Valid() && iter->key() == key);
-      thread->stats.FinishedOps(nullptr, db, 1, kSeek);
+      thread->stats.FinishedOps(nullptr, db, 1);
    }
  }

@@ -3905,11 +3826,15 @@ class Benchmark {
        }
      }

-      delete txn;
-      delete batch;
+      if (txn) {
+        delete txn;
+      }
+      if (batch) {
+        delete batch;
+      }

      if (!failed) {
-        thread->stats.FinishedOps(nullptr, db, 1, kOthers);
+        thread->stats.FinishedOps(nullptr, db, 1);
      }

      transactions_done++;
@@ -4035,7 +3960,7 @@ class Benchmark {
        exit(1);
      }

-      thread->stats.FinishedOps(nullptr, db, 1, kOthers);
+      thread->stats.FinishedOps(nullptr, db, 1);
    }

    char msg[200];
@@ -4088,7 +4013,7 @@ int main(int argc, char** argv) {

  std::vector<std::string> fanout = rocksdb::StringSplit(
      FLAGS_max_bytes_for_level_multiplier_additional, ',');
-  for (size_t j = 0; j < fanout.size(); j++) {
+  for (unsigned int j= 0; j < fanout.size(); j++) {
    FLAGS_max_bytes_for_level_multiplier_additional_v.push_back(
 #ifndef CYGWIN
        std::stoi(fanout[j]));
@@ -583,7 +583,7 @@ TEST_F(DBTestCompactionFilter, CompactionFilterContextManual) {
      iter->Next();
    }
    ASSERT_EQ(total, 700);
-    ASSERT_EQ(count, 2);
+    ASSERT_EQ(count, 1);
  }
 }
 #endif  // ROCKSDB_LITE
@@ -10,7 +10,6 @@
 #include "db/db_test_util.h"
 #include "port/stack_trace.h"
 #include "rocksdb/experimental.h"
-#include "rocksdb/utilities/convenience.h"
 #include "util/sync_point.h"
 namespace rocksdb {

@@ -22,13 +21,11 @@ class DBCompactionTest : public DBTestBase {
  DBCompactionTest() : DBTestBase("/db_compaction_test") {}
 };

-class DBCompactionTestWithParam
-    : public DBTestBase,
-      public testing::WithParamInterface<std::tuple<uint32_t, bool>> {
+class DBCompactionTestWithParam : public DBTestBase,
+                                public testing::WithParamInterface<uint32_t> {
 public:
  DBCompactionTestWithParam() : DBTestBase("/db_compaction_test") {
-    max_subcompactions_ = std::get<0>(GetParam());
-    exclusive_manual_compaction_ = std::get<1>(GetParam());
+    max_subcompactions_ = GetParam();
  }

  // Required if inheriting from testing::WithParamInterface<>
@@ -36,7 +33,6 @@ class DBCompactionTestWithParam
  static void TearDownTestCase() {}

  uint32_t max_subcompactions_;
-  bool exclusive_manual_compaction_;
 };

 namespace {
@@ -69,32 +65,6 @@ class OnFileDeletionListener : public EventListener {
  std::string expected_file_name_;
 };

-class FlushedFileCollector : public EventListener {
- public:
-  FlushedFileCollector() {}
-  ~FlushedFileCollector() {}
-
-  virtual void OnFlushCompleted(DB* db, const FlushJobInfo& info) override {
-    std::lock_guard<std::mutex> lock(mutex_);
-    flushed_files_.push_back(info.file_path);
-  }
-
-  std::vector<std::string> GetFlushedFiles() {
-    std::lock_guard<std::mutex> lock(mutex_);
-    std::vector<std::string> result;
-    for (auto fname : flushed_files_) {
-      result.push_back(fname);
-    }
-    return result;
-  }
-
-  void ClearFlushedFiles() { flushed_files_.clear(); }
-
- private:
-  std::vector<std::string> flushed_files_;
-  std::mutex mutex_;
-};
-
 static const int kCDTValueSize = 1000;
 static const int kCDTKeysPerBuffer = 4;
 static const int kCDTNumLevels = 8;
@@ -190,7 +160,7 @@ const SstFileMetaData* PickFileRandomly(
      auto result = rand->Uniform(file_id);
      return &(level_meta.files[result]);
    }
-    file_id -= static_cast<uint32_t>(level_meta.files.size());
+    file_id -= level_meta.files.size();
  }
  assert(false);
  return nullptr;
@@ -533,104 +503,6 @@ TEST_P(DBCompactionTestWithParam, CompactionTrigger) {
  ASSERT_EQ(NumTableFilesAtLevel(1, 1), 1);
 }

-TEST_F(DBCompactionTest, BGCompactionsAllowed) {
-  // Create several column families. Make compaction triggers in all of them
-  // and see number of compactions scheduled to be less than allowed.
-  const int kNumKeysPerFile = 100;
-
-  Options options;
-  options.write_buffer_size = 110 << 10;  // 110KB
-  options.arena_block_size = 4 << 10;
-  options.num_levels = 3;
-  // Should speed up compaction when there are 4 files.
-  options.level0_file_num_compaction_trigger = 2;
-  options.level0_slowdown_writes_trigger = 20;
-  options.soft_pending_compaction_bytes_limit = 1 << 30;  // Infinitely large
-  options.base_background_compactions = 1;
-  options.max_background_compactions = 3;
-  options.memtable_factory.reset(new SpecialSkipListFactory(kNumKeysPerFile));
-  options = CurrentOptions(options);
-
-  // Block all threads in thread pool.
-  const size_t kTotalTasks = 4;
-  env_->SetBackgroundThreads(4, Env::LOW);
-  test::SleepingBackgroundTask sleeping_tasks[kTotalTasks];
-  for (size_t i = 0; i < kTotalTasks; i++) {
-    env_->Schedule(&test::SleepingBackgroundTask::DoSleepTask,
-                   &sleeping_tasks[i], Env::Priority::LOW);
-    sleeping_tasks[i].WaitUntilSleeping();
-  }
-
-  CreateAndReopenWithCF({"one", "two", "three"}, options);
-
-  Random rnd(301);
-  for (int cf = 0; cf < 4; cf++) {
-    for (int num = 0; num < options.level0_file_num_compaction_trigger; num++) {
-      for (int i = 0; i < kNumKeysPerFile; i++) {
-        ASSERT_OK(Put(cf, Key(i), ""));
-      }
-      // put extra key to trigger flush
-      ASSERT_OK(Put(cf, "", ""));
-      dbfull()->TEST_WaitForFlushMemTable(handles_[cf]);
-      ASSERT_EQ(NumTableFilesAtLevel(0, cf), num + 1);
-    }
-  }
-
-  // Now all column families qualify compaction but only one should be
-  // scheduled, because no column family hits speed up condition.
-  ASSERT_EQ(1, env_->GetThreadPoolQueueLen(Env::Priority::LOW));
-
-  // Create two more files for one column family, which triggers speed up
-  // condition, three compactions will be scheduled.
-  for (int num = 0; num < options.level0_file_num_compaction_trigger; num++) {
-    for (int i = 0; i < kNumKeysPerFile; i++) {
-      ASSERT_OK(Put(2, Key(i), ""));
-    }
-    // put extra key to trigger flush
-    ASSERT_OK(Put(2, "", ""));
-    dbfull()->TEST_WaitForFlushMemTable(handles_[2]);
-    ASSERT_EQ(options.level0_file_num_compaction_trigger + num + 1,
-              NumTableFilesAtLevel(0, 2));
-  }
-  ASSERT_EQ(3, env_->GetThreadPoolQueueLen(Env::Priority::LOW));
-
-  // Unblock all threads to unblock all compactions.
-  for (size_t i = 0; i < kTotalTasks; i++) {
-    sleeping_tasks[i].WakeUp();
-    sleeping_tasks[i].WaitUntilDone();
-  }
-  dbfull()->TEST_WaitForCompact();
-
-  // Verify number of compactions allowed will come back to 1.
-
-  for (size_t i = 0; i < kTotalTasks; i++) {
-    sleeping_tasks[i].Reset();
-    env_->Schedule(&test::SleepingBackgroundTask::DoSleepTask,
-                   &sleeping_tasks[i], Env::Priority::LOW);
-    sleeping_tasks[i].WaitUntilSleeping();
-  }
-  for (int cf = 0; cf < 4; cf++) {
-    for (int num = 0; num < options.level0_file_num_compaction_trigger; num++) {
-      for (int i = 0; i < kNumKeysPerFile; i++) {
-        ASSERT_OK(Put(cf, Key(i), ""));
-      }
-      // put extra key to trigger flush
-      ASSERT_OK(Put(cf, "", ""));
-      dbfull()->TEST_WaitForFlushMemTable(handles_[cf]);
-      ASSERT_EQ(NumTableFilesAtLevel(0, cf), num + 1);
-    }
-  }
-
-  // Now all column families qualify compaction but only one should be
-  // scheduled, because no column family hits speed up condition.
-  ASSERT_EQ(1, env_->GetThreadPoolQueueLen(Env::Priority::LOW));
-
-  for (size_t i = 0; i < kTotalTasks; i++) {
-    sleeping_tasks[i].WakeUp();
-    sleeping_tasks[i].WaitUntilDone();
-  }
-}
-
 TEST_P(DBCompactionTestWithParam, CompactionsGenerateMultipleFiles) {
  Options options;
  options.write_buffer_size = 100000000;        // Large write buffer
@@ -688,61 +560,6 @@ TEST_F(DBCompactionTest, MinorCompactionsHappen) {
  } while (ChangeCompactOptions());
 }

-TEST_F(DBCompactionTest, ZeroSeqIdCompaction) {
-  Options options;
-  options.compaction_style = kCompactionStyleLevel;
-  options.level0_file_num_compaction_trigger = 3;
-
-  FlushedFileCollector* collector = new FlushedFileCollector();
-  options.listeners.emplace_back(collector);
-
-  // compaction options
-  CompactionOptions compact_opt;
-  compact_opt.compression = kNoCompression;
-  compact_opt.output_file_size_limit = 4096;
-  const size_t key_len =
-    static_cast<size_t>(compact_opt.output_file_size_limit) / 5;
-
-  options = CurrentOptions(options);
-  DestroyAndReopen(options);
-
-  std::vector<const Snapshot*> snaps;
-
-  // create first file and flush to l0
-  for (auto& key : {"1", "2", "3", "3", "3", "3"}) {
-    Put(key, std::string(key_len, 'A'));
-    snaps.push_back(dbfull()->GetSnapshot());
-  }
-  Flush();
-  dbfull()->TEST_WaitForFlushMemTable();
-
-  // create second file and flush to l0
-  for (auto& key : {"3", "4", "5", "6", "7", "8"}) {
-    Put(key, std::string(key_len, 'A'));
-    snaps.push_back(dbfull()->GetSnapshot());
-  }
-  Flush();
-  dbfull()->TEST_WaitForFlushMemTable();
-
-  // move both files down to l1
-  dbfull()->CompactFiles(compact_opt, collector->GetFlushedFiles(), 1);
-
-  // release snap so that first instance of key(3) can have seqId=0
-  for (auto snap : snaps) {
-    dbfull()->ReleaseSnapshot(snap);
-  }
-
-  // create 3 files in l0 so to trigger compaction
-  for (int i = 0; i < options.level0_file_num_compaction_trigger; i++) {
-    Put("2", std::string(1, 'A'));
-    Flush();
-    dbfull()->TEST_WaitForFlushMemTable();
-  }
-
-  dbfull()->TEST_WaitForCompact();
-  ASSERT_OK(Put("", ""));
-}
-
 // Check that writes done during a memtable compaction are recovered
 // if the database is shutdown during the memtable compaction.
 TEST_F(DBCompactionTest, RecoverDuringMemtableCompaction) {
@@ -800,11 +617,8 @@ TEST_P(DBCompactionTestWithParam, TrivialMoveOneFile) {
  ASSERT_EQ(metadata.size(), 1U);
  LiveFileMetaData level0_file = metadata[0];  // L0 file meta

-  CompactRangeOptions cro;
-  cro.exclusive_manual_compaction = exclusive_manual_compaction_;
-
  // Compaction will initiate a trivial move from L0 to L1
-  dbfull()->CompactRange(cro, nullptr, nullptr);
+  dbfull()->CompactRange(CompactRangeOptions(), nullptr, nullptr);

  // File moved From L0 to L1
  ASSERT_EQ(NumTableFilesAtLevel(0, 0), 0);  // 0 files in L0
@@ -856,7 +670,7 @@ TEST_P(DBCompactionTestWithParam, TrivialMoveNonOverlappingFiles) {

  Random rnd(301);
  std::map<int32_t, std::string> values;
-  for (size_t i = 0; i < ranges.size(); i++) {
+  for (uint32_t i = 0; i < ranges.size(); i++) {
    for (int32_t j = ranges[i].first; j <= ranges[i].second; j++) {
      values[j] = RandomString(&rnd, value_size);
      ASSERT_OK(Put(Key(j), values[j]));
@@ -868,17 +682,14 @@ TEST_P(DBCompactionTestWithParam, TrivialMoveNonOverlappingFiles) {
  ASSERT_EQ(level0_files, ranges.size());    // Multiple files in L0
  ASSERT_EQ(NumTableFilesAtLevel(1, 0), 0);  // No files in L1

-  CompactRangeOptions cro;
-  cro.exclusive_manual_compaction = exclusive_manual_compaction_;
-
  // Since data is non-overlapping we expect compaction to initiate
  // a trivial move
-  db_->CompactRange(cro, nullptr, nullptr);
+  db_->CompactRange(CompactRangeOptions(), nullptr, nullptr);
  // We expect that all the files were trivially moved from L0 to L1
  ASSERT_EQ(NumTableFilesAtLevel(0, 0), 0);
  ASSERT_EQ(NumTableFilesAtLevel(1, 0) /* level1_files */, level0_files);

-  for (size_t i = 0; i < ranges.size(); i++) {
+  for (uint32_t i = 0; i < ranges.size(); i++) {
    for (int32_t j = ranges[i].first; j <= ranges[i].second; j++) {
      ASSERT_EQ(Get(Key(j)), values[j]);
    }
@@ -902,7 +713,7 @@ TEST_P(DBCompactionTestWithParam, TrivialMoveNonOverlappingFiles) {
    {500, 560},  // this range overlap with the next one
    {551, 599},
  };
-  for (size_t i = 0; i < ranges.size(); i++) {
+  for (uint32_t i = 0; i < ranges.size(); i++) {
    for (int32_t j = ranges[i].first; j <= ranges[i].second; j++) {
      values[j] = RandomString(&rnd, value_size);
      ASSERT_OK(Put(Key(j), values[j]));
@@ -910,9 +721,9 @@ TEST_P(DBCompactionTestWithParam, TrivialMoveNonOverlappingFiles) {
    ASSERT_OK(Flush());
  }

-  db_->CompactRange(cro, nullptr, nullptr);
+  db_->CompactRange(CompactRangeOptions(), nullptr, nullptr);

-  for (size_t i = 0; i < ranges.size(); i++) {
+  for (uint32_t i = 0; i < ranges.size(); i++) {
    for (int32_t j = ranges[i].first; j <= ranges[i].second; j++) {
      ASSERT_EQ(Get(Key(j)), values[j]);
    }
@@ -966,7 +777,6 @@ TEST_P(DBCompactionTestWithParam, TrivialMoveTargetLevel) {
  CompactRangeOptions compact_options;
  compact_options.change_level = true;
  compact_options.target_level = 6;
-  compact_options.exclusive_manual_compaction = exclusive_manual_compaction_;
  ASSERT_OK(db_->CompactRange(compact_options, nullptr, nullptr));
  // 2 files in L6
  ASSERT_EQ("0,0,0,0,0,0,2", FilesPerLevel(0));
@@ -982,382 +792,6 @@ TEST_P(DBCompactionTestWithParam, TrivialMoveTargetLevel) {
  }
 }

-TEST_P(DBCompactionTestWithParam, ManualCompactionPartial) {
-  int32_t trivial_move = 0;
-  int32_t non_trivial_move = 0;
-  rocksdb::SyncPoint::GetInstance()->SetCallBack(
-      "DBImpl::BackgroundCompaction:TrivialMove",
-      [&](void* arg) { trivial_move++; });
-  rocksdb::SyncPoint::GetInstance()->SetCallBack(
-      "DBImpl::BackgroundCompaction:NonTrivial",
-      [&](void* arg) { non_trivial_move++; });
-  bool first = true;
-  bool second = true;
-  rocksdb::SyncPoint::GetInstance()->LoadDependency(
-      {{"DBCompaction::ManualPartial:4", "DBCompaction::ManualPartial:1"},
-       {"DBCompaction::ManualPartial:2", "DBCompaction::ManualPartial:3"}});
-  rocksdb::SyncPoint::GetInstance()->SetCallBack(
-      "DBImpl::BackgroundCompaction:NonTrivial:AfterRun", [&](void* arg) {
-        if (first) {
-          TEST_SYNC_POINT("DBCompaction::ManualPartial:4");
-          first = false;
-          TEST_SYNC_POINT("DBCompaction::ManualPartial:3");
-        } else if (second) {
-          TEST_SYNC_POINT("DBCompaction::ManualPartial:2");
-        }
-      });
-
-  rocksdb::SyncPoint::GetInstance()->EnableProcessing();
-
-  Options options = CurrentOptions();
-  options.write_buffer_size = 10 * 1024 * 1024;
-  options.num_levels = 7;
-  options.max_subcompactions = max_subcompactions_;
-  options.level0_file_num_compaction_trigger = 3;
-  options.max_background_compactions = 3;
-  options.target_file_size_base = 1 << 23;  // 8 MB
-
-  DestroyAndReopen(options);
-  int32_t value_size = 10 * 1024;  // 10 KB
-
-  // Add 2 non-overlapping files
-  Random rnd(301);
-  std::map<int32_t, std::string> values;
-
-  // file 1 [0 => 100]
-  for (int32_t i = 0; i < 100; i++) {
-    values[i] = RandomString(&rnd, value_size);
-    ASSERT_OK(Put(Key(i), values[i]));
-  }
-  ASSERT_OK(Flush());
-
-  // file 2 [100 => 300]
-  for (int32_t i = 100; i < 300; i++) {
-    values[i] = RandomString(&rnd, value_size);
-    ASSERT_OK(Put(Key(i), values[i]));
-  }
-  ASSERT_OK(Flush());
-
-  // 2 files in L0
-  ASSERT_EQ("2", FilesPerLevel(0));
-  CompactRangeOptions compact_options;
-  compact_options.change_level = true;
-  compact_options.target_level = 6;
-  compact_options.exclusive_manual_compaction = exclusive_manual_compaction_;
-  // Trivial move the two non-overlapping files to level 6
-  ASSERT_OK(db_->CompactRange(compact_options, nullptr, nullptr));
-  // 2 files in L6
-  ASSERT_EQ("0,0,0,0,0,0,2", FilesPerLevel(0));
-
-  ASSERT_EQ(trivial_move, 1);
-  ASSERT_EQ(non_trivial_move, 0);
-
-  // file 3 [ 0 => 200]
-  for (int32_t i = 0; i < 200; i++) {
-    values[i] = RandomString(&rnd, value_size);
-    ASSERT_OK(Put(Key(i), values[i]));
-  }
-  ASSERT_OK(Flush());
-
-  // 1 files in L0
-  ASSERT_EQ("1,0,0,0,0,0,2", FilesPerLevel(0));
-  ASSERT_OK(dbfull()->TEST_CompactRange(0, nullptr, nullptr, nullptr, false));
-  ASSERT_OK(dbfull()->TEST_CompactRange(1, nullptr, nullptr, nullptr, false));
-  ASSERT_OK(dbfull()->TEST_CompactRange(2, nullptr, nullptr, nullptr, false));
-  ASSERT_OK(dbfull()->TEST_CompactRange(3, nullptr, nullptr, nullptr, false));
-  ASSERT_OK(dbfull()->TEST_CompactRange(4, nullptr, nullptr, nullptr, false));
-  // 2 files in L6, 1 file in L5
-  ASSERT_EQ("0,0,0,0,0,1,2", FilesPerLevel(0));
-
-  ASSERT_EQ(trivial_move, 6);
-  ASSERT_EQ(non_trivial_move, 0);
-
-  std::thread threads([&] {
-    compact_options.change_level = false;
-    compact_options.exclusive_manual_compaction = false;
-    std::string begin_string = Key(0);
-    std::string end_string = Key(199);
-    Slice begin(begin_string);
-    Slice end(end_string);
-    ASSERT_OK(db_->CompactRange(compact_options, &begin, &end));
-  });
-
-  TEST_SYNC_POINT("DBCompaction::ManualPartial:1");
-  // file 4 [300 => 400)
-  for (int32_t i = 300; i <= 400; i++) {
-    values[i] = RandomString(&rnd, value_size);
-    ASSERT_OK(Put(Key(i), values[i]));
-  }
-  ASSERT_OK(Flush());
-
-  // file 5 [400 => 500)
-  for (int32_t i = 400; i <= 500; i++) {
-    values[i] = RandomString(&rnd, value_size);
-    ASSERT_OK(Put(Key(i), values[i]));
-  }
-  ASSERT_OK(Flush());
-
-  // file 6 [500 => 600)
-  for (int32_t i = 500; i <= 600; i++) {
-    values[i] = RandomString(&rnd, value_size);
-    ASSERT_OK(Put(Key(i), values[i]));
-  }
-  ASSERT_OK(Flush());
-
-  // 3 files in L0
-  ASSERT_EQ("3,0,0,0,0,1,2", FilesPerLevel(0));
-  // 1 file in L6, 1 file in L1
-  dbfull()->TEST_WaitForFlushMemTable();
-  dbfull()->TEST_WaitForCompact();
-  ASSERT_EQ("0,1,0,0,0,0,1", FilesPerLevel(0));
-  threads.join();
-
-  for (int32_t i = 0; i < 600; i++) {
-    ASSERT_EQ(Get(Key(i)), values[i]);
-  }
-}
-
-TEST_F(DBCompactionTest, ManualPartialFill) {
-  int32_t trivial_move = 0;
-  int32_t non_trivial_move = 0;
-  rocksdb::SyncPoint::GetInstance()->SetCallBack(
-      "DBImpl::BackgroundCompaction:TrivialMove",
-      [&](void* arg) { trivial_move++; });
-  rocksdb::SyncPoint::GetInstance()->SetCallBack(
-      "DBImpl::BackgroundCompaction:NonTrivial",
-      [&](void* arg) { non_trivial_move++; });
-  bool first = true;
-  bool second = true;
-  rocksdb::SyncPoint::GetInstance()->LoadDependency(
-      {{"DBCompaction::PartialFill:4", "DBCompaction::PartialFill:1"},
-       {"DBCompaction::PartialFill:2", "DBCompaction::PartialFill:3"}});
-  rocksdb::SyncPoint::GetInstance()->SetCallBack(
-      "DBImpl::BackgroundCompaction:NonTrivial:AfterRun", [&](void* arg) {
-        if (first) {
-          TEST_SYNC_POINT("DBCompaction::PartialFill:4");
-          first = false;
-          TEST_SYNC_POINT("DBCompaction::PartialFill:3");
-        } else if (second) {
-        }
-      });
-
-  rocksdb::SyncPoint::GetInstance()->EnableProcessing();
-
-  Options options = CurrentOptions();
-  options.write_buffer_size = 10 * 1024 * 1024;
-  options.max_bytes_for_level_multiplier = 2;
-  options.num_levels = 4;
-  options.level0_file_num_compaction_trigger = 3;
-  options.max_background_compactions = 3;
-
-  DestroyAndReopen(options);
-  int32_t value_size = 10 * 1024;  // 10 KB
-
-  // Add 2 non-overlapping files
-  Random rnd(301);
-  std::map<int32_t, std::string> values;
-
-  // file 1 [0 => 100]
-  for (int32_t i = 0; i < 100; i++) {
-    values[i] = RandomString(&rnd, value_size);
-    ASSERT_OK(Put(Key(i), values[i]));
-  }
-  ASSERT_OK(Flush());
-
-  // file 2 [100 => 300]
-  for (int32_t i = 100; i < 300; i++) {
-    values[i] = RandomString(&rnd, value_size);
-    ASSERT_OK(Put(Key(i), values[i]));
-  }
-  ASSERT_OK(Flush());
-
-  // 2 files in L0
-  ASSERT_EQ("2", FilesPerLevel(0));
-  CompactRangeOptions compact_options;
-  compact_options.change_level = true;
-  compact_options.target_level = 2;
-  ASSERT_OK(db_->CompactRange(compact_options, nullptr, nullptr));
-  // 2 files in L2
-  ASSERT_EQ("0,0,2", FilesPerLevel(0));
-
-  ASSERT_EQ(trivial_move, 1);
-  ASSERT_EQ(non_trivial_move, 0);
-
-  // file 3 [ 0 => 200]
-  for (int32_t i = 0; i < 200; i++) {
-    values[i] = RandomString(&rnd, value_size);
-    ASSERT_OK(Put(Key(i), values[i]));
-  }
-  ASSERT_OK(Flush());
-
-  // 2 files in L2, 1 in L0
-  ASSERT_EQ("1,0,2", FilesPerLevel(0));
-  ASSERT_OK(dbfull()->TEST_CompactRange(0, nullptr, nullptr, nullptr, false));
-  // 2 files in L2, 1 in L1
-  ASSERT_EQ("0,1,2", FilesPerLevel(0));
-
-  ASSERT_EQ(trivial_move, 2);
-  ASSERT_EQ(non_trivial_move, 0);
-
-  std::thread threads([&] {
-    compact_options.change_level = false;
-    compact_options.exclusive_manual_compaction = false;
-    std::string begin_string = Key(0);
-    std::string end_string = Key(199);
-    Slice begin(begin_string);
-    Slice end(end_string);
-    ASSERT_OK(db_->CompactRange(compact_options, &begin, &end));
-  });
-
-  TEST_SYNC_POINT("DBCompaction::PartialFill:1");
-  // Many files 4 [300 => 4300)
-  for (int32_t i = 0; i <= 5; i++) {
-    for (int32_t j = 300; j < 4300; j++) {
-      if (j == 2300) {
-        ASSERT_OK(Flush());
-        dbfull()->TEST_WaitForFlushMemTable();
-      }
-      values[j] = RandomString(&rnd, value_size);
-      ASSERT_OK(Put(Key(j), values[j]));
-    }
-  }
-
-  // Verify level sizes
-  uint64_t target_size = 4 * options.max_bytes_for_level_base;
-  for (int32_t i = 1; i < options.num_levels; i++) {
-    ASSERT_LE(SizeAtLevel(i), target_size);
-    target_size *= options.max_bytes_for_level_multiplier;
-  }
-
-  TEST_SYNC_POINT("DBCompaction::PartialFill:2");
-  dbfull()->TEST_WaitForFlushMemTable();
-  dbfull()->TEST_WaitForCompact();
-  threads.join();
-
-  for (int32_t i = 0; i < 4300; i++) {
-    ASSERT_EQ(Get(Key(i)), values[i]);
-  }
-}
-
-TEST_F(DBCompactionTest, DeleteFileRange) {
-  Options options = CurrentOptions();
-  options.write_buffer_size = 10 * 1024 * 1024;
-  options.max_bytes_for_level_multiplier = 2;
-  options.num_levels = 4;
-  options.level0_file_num_compaction_trigger = 3;
-  options.max_background_compactions = 3;
-
-  DestroyAndReopen(options);
-  int32_t value_size = 10 * 1024;  // 10 KB
-
-  // Add 2 non-overlapping files
-  Random rnd(301);
-  std::map<int32_t, std::string> values;
-
-  // file 1 [0 => 100]
-  for (int32_t i = 0; i < 100; i++) {
-    values[i] = RandomString(&rnd, value_size);
-    ASSERT_OK(Put(Key(i), values[i]));
-  }
-  ASSERT_OK(Flush());
-
-  // file 2 [100 => 300]
-  for (int32_t i = 100; i < 300; i++) {
-    values[i] = RandomString(&rnd, value_size);
-    ASSERT_OK(Put(Key(i), values[i]));
-  }
-  ASSERT_OK(Flush());
-
-  // 2 files in L0
-  ASSERT_EQ("2", FilesPerLevel(0));
-  CompactRangeOptions compact_options;
-  compact_options.change_level = true;
-  compact_options.target_level = 2;
-  ASSERT_OK(db_->CompactRange(compact_options, nullptr, nullptr));
-  // 2 files in L2
-  ASSERT_EQ("0,0,2", FilesPerLevel(0));
-
-  // file 3 [ 0 => 200]
-  for (int32_t i = 0; i < 200; i++) {
-    values[i] = RandomString(&rnd, value_size);
-    ASSERT_OK(Put(Key(i), values[i]));
-  }
-  ASSERT_OK(Flush());
-
-  // Many files 4 [300 => 4300)
-  for (int32_t i = 0; i <= 5; i++) {
-    for (int32_t j = 300; j < 4300; j++) {
-      if (j == 2300) {
-        ASSERT_OK(Flush());
-        dbfull()->TEST_WaitForFlushMemTable();
-      }
-      values[j] = RandomString(&rnd, value_size);
-      ASSERT_OK(Put(Key(j), values[j]));
-    }
-  }
-  ASSERT_OK(Flush());
-  dbfull()->TEST_WaitForFlushMemTable();
-  dbfull()->TEST_WaitForCompact();
-
-  // Verify level sizes
-  uint64_t target_size = 4 * options.max_bytes_for_level_base;
-  for (int32_t i = 1; i < options.num_levels; i++) {
-    ASSERT_LE(SizeAtLevel(i), target_size);
-    target_size *= options.max_bytes_for_level_multiplier;
-  }
-
-  size_t old_num_files = CountFiles();
-  std::string begin_string = Key(1000);
-  std::string end_string = Key(2000);
-  Slice begin(begin_string);
-  Slice end(end_string);
-  ASSERT_OK(DeleteFilesInRange(db_, db_->DefaultColumnFamily(), &begin, &end));
-
-  int32_t deleted_count = 0;
-  for (int32_t i = 0; i < 4300; i++) {
-    if (i < 1000 || i > 2000) {
-      ASSERT_EQ(Get(Key(i)), values[i]);
-    } else {
-      ReadOptions roptions;
-      std::string result;
-      Status s = db_->Get(roptions, Key(i), &result);
-      ASSERT_TRUE(s.IsNotFound() || s.ok());
-      if (s.IsNotFound()) {
-        deleted_count++;
-      }
-    }
-  }
-  ASSERT_GT(deleted_count, 0);
-  begin_string = Key(5000);
-  end_string = Key(6000);
-  Slice begin1(begin_string);
-  Slice end1(end_string);
-  // Try deleting files in range which contain no keys
-  ASSERT_OK(
-      DeleteFilesInRange(db_, db_->DefaultColumnFamily(), &begin1, &end1));
-
-  // Push data from level 0 to level 1 to force all data to be deleted
-  // Note that we don't delete level 0 files
-  compact_options.change_level = true;
-  compact_options.target_level = 1;
-  ASSERT_OK(dbfull()->TEST_CompactRange(0, nullptr, nullptr));
-
-  ASSERT_OK(
-      DeleteFilesInRange(db_, db_->DefaultColumnFamily(), nullptr, nullptr));
-
-  int32_t deleted_count2 = 0;
-  for (int32_t i = 0; i < 4300; i++) {
-    ReadOptions roptions;
-    std::string result;
-    Status s = db_->Get(roptions, Key(i), &result);
-    ASSERT_TRUE(s.IsNotFound());
-    deleted_count2++;
-  }
-  ASSERT_GT(deleted_count2, deleted_count);
-  size_t new_num_files = CountFiles();
-  ASSERT_GT(old_num_files, new_num_files);
-}
-
 TEST_P(DBCompactionTestWithParam, TrivialMoveToLastLevelWithFiles) {
  int32_t trivial_move = 0;
  int32_t non_trivial_move = 0;
@@ -1391,7 +825,6 @@ TEST_P(DBCompactionTestWithParam, TrivialMoveToLastLevelWithFiles) {
  CompactRangeOptions compact_options;
  compact_options.change_level = true;
  compact_options.target_level = 3;
-  compact_options.exclusive_manual_compaction = exclusive_manual_compaction_;
  ASSERT_OK(db_->CompactRange(compact_options, nullptr, nullptr));
  ASSERT_EQ("0,0,0,1", FilesPerLevel(0));
  ASSERT_EQ(trivial_move, 1);
@@ -1405,10 +838,8 @@ TEST_P(DBCompactionTestWithParam, TrivialMoveToLastLevelWithFiles) {
  ASSERT_OK(Flush());

  ASSERT_EQ("1,0,0,1", FilesPerLevel(0));
-  CompactRangeOptions cro;
-  cro.exclusive_manual_compaction = exclusive_manual_compaction_;
  // Compaction will do L0=>L1 L1=>L2 L2=>L3 (3 trivial moves)
-  ASSERT_OK(db_->CompactRange(cro, nullptr, nullptr));
+  ASSERT_OK(db_->CompactRange(CompactRangeOptions(), nullptr, nullptr));
  ASSERT_EQ("0,0,0,2", FilesPerLevel(0));
  ASSERT_EQ(trivial_move, 4);
  ASSERT_EQ(non_trivial_move, 0);
@@ -1712,7 +1143,6 @@ TEST_P(DBCompactionTestWithParam, ConvertCompactionStyle) {
  compact_options.target_level = 0;
  compact_options.bottommost_level_compaction =
      BottommostLevelCompaction::kForce;
-  compact_options.exclusive_manual_compaction = exclusive_manual_compaction_;
  dbfull()->CompactRange(compact_options, handles_[1], nullptr, nullptr);

  // Only 1 file in L0
@@ -1846,9 +1276,7 @@ TEST_P(DBCompactionTestWithParam, ManualCompaction) {

    uint64_t prev_block_cache_add =
        options.statistics->getTickerCount(BLOCK_CACHE_ADD);
-    CompactRangeOptions cro;
-    cro.exclusive_manual_compaction = exclusive_manual_compaction_;
-    db_->CompactRange(cro, handles_[1], nullptr, nullptr);
+    db_->CompactRange(CompactRangeOptions(), handles_[1], nullptr, nullptr);
    // Verify manual compaction doesn't fill block cache
    ASSERT_EQ(prev_block_cache_add,
              options.statistics->getTickerCount(BLOCK_CACHE_ADD));
@@ -1927,7 +1355,6 @@ TEST_P(DBCompactionTestWithParam, ManualLevelCompactionOutputPathId) {
    ASSERT_EQ(1, GetSstFileCount(options.db_paths[0].path));
    CompactRangeOptions compact_options;
    compact_options.target_path_id = 1;
-    compact_options.exclusive_manual_compaction = exclusive_manual_compaction_;
    db_->CompactRange(compact_options, handles_[1], nullptr, nullptr);

    ASSERT_EQ("0,1", FilesPerLevel(1));
@@ -1996,7 +1423,7 @@ TEST_P(DBCompactionTestWithParam, DISABLED_CompactFilesOnLevelCompaction) {
    std::set<std::string> overlapping_file_names;
    std::vector<std::string> compaction_input_file_names;
    for (int f = 0; f < file_picked; ++f) {
-      int level = 0;
+      int level;
      auto file_meta = PickFileRandomly(cf_meta, &rnd, &level);
      compaction_input_file_names.push_back(file_meta->name);
      GetOverlappingFileNumbersForLevelCompaction(
@@ -2296,25 +1723,6 @@ TEST_P(DBCompactionTestWithParam, CompressLevelCompaction) {
  Destroy(options);
 }

-TEST_F(DBCompactionTest, SanitizeCompactionOptionsTest) {
-  Options options = CurrentOptions();
-  options.max_background_compactions = 5;
-  options.soft_pending_compaction_bytes_limit = 0;
-  options.hard_pending_compaction_bytes_limit = 100;
-  options.create_if_missing = true;
-  DestroyAndReopen(options);
-  ASSERT_EQ(5, db_->GetOptions().base_background_compactions);
-  ASSERT_EQ(100, db_->GetOptions().soft_pending_compaction_bytes_limit);
-
-  options.base_background_compactions = 4;
-  options.max_background_compactions = 3;
-  options.soft_pending_compaction_bytes_limit = 200;
-  options.hard_pending_compaction_bytes_limit = 150;
-  DestroyAndReopen(options);
-  ASSERT_EQ(3, db_->GetOptions().base_background_compactions);
-  ASSERT_EQ(150, db_->GetOptions().soft_pending_compaction_bytes_limit);
-}
-
 // This tests for a bug that could cause two level0 compactions running
 // concurrently
 // TODO(aekmekji): Make sure that the reason this fails when run with
@@ -2459,57 +1867,7 @@ TEST_P(DBCompactionTestWithParam, ForceBottommostLevelCompaction) {
 }

 INSTANTIATE_TEST_CASE_P(DBCompactionTestWithParam, DBCompactionTestWithParam,
-                        ::testing::Values(std::make_tuple(1, true),
-                                          std::make_tuple(1, false),
-                                          std::make_tuple(4, true),
-                                          std::make_tuple(4, false)));
-
-class CompactionPriTest : public DBTestBase,
-                          public testing::WithParamInterface<uint32_t> {
- public:
-  CompactionPriTest() : DBTestBase("/compaction_pri_test") {
-    compaction_pri_ = GetParam();
-  }
-
-  // Required if inheriting from testing::WithParamInterface<>
-  static void SetUpTestCase() {}
-  static void TearDownTestCase() {}
-
-  uint32_t compaction_pri_;
-};
-
-TEST_P(CompactionPriTest, Test) {
-  Options options;
-  options.write_buffer_size = 16 * 1024;
-  options.compaction_pri = static_cast<CompactionPri>(compaction_pri_);
-  options.hard_pending_compaction_bytes_limit = 256 * 1024;
-  options.max_bytes_for_level_base = 64 * 1024;
-  options.max_bytes_for_level_multiplier = 4;
-  options.compression = kNoCompression;
-  options = CurrentOptions(options);
-  DestroyAndReopen(options);
-
-  Random rnd(301);
-  const int kNKeys = 5000;
-  int keys[kNKeys];
-  for (int i = 0; i < kNKeys; i++) {
-    keys[i] = i;
-  }
-  std::random_shuffle(std::begin(keys), std::end(keys));
-
-  for (int i = 0; i < kNKeys; i++) {
-    ASSERT_OK(Put(Key(keys[i]), RandomString(&rnd, 102)));
-  }
-
-  dbfull()->TEST_WaitForCompact();
-  for (int i = 0; i < kNKeys; i++) {
-    ASSERT_NE("NOT_FOUND", Get(Key(i)));
-  }
-}
-
-INSTANTIATE_TEST_CASE_P(CompactionPriTest, CompactionPriTest,
-                        ::testing::Values(0, 1, 2));
-
+                        ::testing::Values(1, 4));
 #endif // !defined(ROCKSDB_LITE)
 }  // namespace rocksdb

@@ -188,8 +188,6 @@ class DBImpl : public DB {
      const TransactionLogIterator::ReadOptions&
          read_options = TransactionLogIterator::ReadOptions()) override;
  virtual Status DeleteFile(std::string name) override;
-  Status DeleteFilesInRange(ColumnFamilyHandle* column_family,
-                            const Slice* begin, const Slice* end);

  virtual void GetLiveFilesMetaData(
      std::vector<LiveFileMetaData>* metadata) override;
@@ -228,30 +226,13 @@ class DBImpl : public DB {
                                                   bool include_history);

  // For a given key, check to see if there are any records for this key
-  // in the memtables, including memtable history.  If cache_only is false,
-  // SST files will also be checked.
-  //
-  // If a key is found, *found_record_for_key will be set to true and
-  // *seq will will be set to the stored sequence number for the latest
-  // operation on this key or kMaxSequenceNumber if unknown.
-  // If no key is found, *found_record_for_key will be set to false.
-  //
-  // Note: If cache_only=false, it is possible for *seq to be set to 0 if
-  // the sequence number has been cleared from the record.  If the caller is
-  // holding an active db snapshot, we know the missing sequence must be less
-  // than the snapshot's sequence number (sequence numbers are only cleared
-  // when there are no earlier active snapshots).
-  //
-  // If NotFound is returned and found_record_for_key is set to false, then no
-  // record for this key was found.  If the caller is holding an active db
-  // snapshot, we know that no key could have existing after this snapshot
-  // (since we do not compact keys that have an earlier snapshot).
-  //
-  // Returns OK or NotFound on success,
-  // other status on unexpected error.
-  Status GetLatestSequenceForKey(SuperVersion* sv, const Slice& key,
-                                 bool cache_only, SequenceNumber* seq,
-                                 bool* found_record_for_key);
+  // in the memtables, including memtable history.
+
+  // On success, *seq will contain the sequence number for the
+  // latest such change or kMaxSequenceNumber if no records were present.
+  // Returns OK on success, other status on error reading memtables.
+  Status GetLatestSequenceForKeyFromMemtable(SuperVersion* sv, const Slice& key,
+                                             SequenceNumber* seq);

  using DB::AddFile;
  virtual Status AddFile(ColumnFamilyHandle* column_family,
@@ -262,12 +243,6 @@ class DBImpl : public DB {

 #endif  // ROCKSDB_LITE

-  // Similar to GetSnapshot(), but also lets the db know that this snapshot
-  // will be used for transaction write-conflict checking.  The DB can then
-  // make sure not to compact any keys that would prevent a write-conflict from
-  // being detected.
-  const Snapshot* GetSnapshotForWriteConflictBoundary();
-
  // checks if all live files exist on file system and that their file sizes
  // match to our in-memory records
  virtual Status CheckConsistency();
@@ -277,7 +252,6 @@ class DBImpl : public DB {
  Status RunManualCompaction(ColumnFamilyData* cfd, int input_level,
                             int output_level, uint32_t output_path_id,
                             const Slice* begin, const Slice* end,
-                             bool exclusive,
                             bool disallow_trivial_move = false);

  // Return an internal iterator over the current state of the database.
@@ -343,14 +317,12 @@ class DBImpl : public DB {

  Cache* TEST_table_cache() { return table_cache_.get(); }

-  WriteController& TEST_write_controler() { return write_controller_; }
+  const WriteController& TEST_write_controler() const {
+    return write_controller_;
+  }

 #endif  // NDEBUG

-  // Return maximum background compaction alowed to be scheduled based on
-  // compaction status.
-  int BGCompactionsAllowed() const;
-
  // Returns the list of live files in 'live' and the list
  // of all files in the filesystem in 'candidate_files'.
  // If force == false and the last call was less than
@@ -559,13 +531,12 @@ class DBImpl : public DB {
  void MaybeScheduleFlushOrCompaction();
  void SchedulePendingFlush(ColumnFamilyData* cfd);
  void SchedulePendingCompaction(ColumnFamilyData* cfd);
-  static void BGWorkCompaction(void* arg);
+  static void BGWorkCompaction(void* db);
  static void BGWorkFlush(void* db);
-  static void UnscheduleCallback(void* arg);
-  void BackgroundCallCompaction(void* arg);
+  void BackgroundCallCompaction();
  void BackgroundCallFlush();
  Status BackgroundCompaction(bool* madeProgress, JobContext* job_context,
-                              LogBuffer* log_buffer, void* m = 0);
+                              LogBuffer* log_buffer);
  Status BackgroundFlush(bool* madeProgress, JobContext* job_context,
                         LogBuffer* log_buffer);

@@ -593,8 +564,6 @@ class DBImpl : public DB {
  // helper function to call after some of the logs_ were synced
  void MarkLogsSynced(uint64_t up_to, bool synced_dir, const Status& status);

-  const Snapshot* GetSnapshotImpl(bool is_write_conflict_boundary);
-
  // table_cache_ provides its own synchronization
  std::shared_ptr<Cache> table_cache_;

@@ -611,7 +580,7 @@ class DBImpl : public DB {
  std::atomic<bool> shutting_down_;
  // This condition variable is signaled on these conditions:
  // * whenever bg_compaction_scheduled_ goes down to 0
-  // * if AnyManualCompaction, whenever a compaction finishes, even if it hasn't
+  // * if bg_manual_only_ > 0, whenever a compaction finishes, even if it hasn't
  // made any progress
  // * whenever a compaction made any progress
  // * whenever bg_flush_scheduled_ value decreases (i.e. whenever a flush is
@@ -769,6 +738,11 @@ class DBImpl : public DB {
  // stores the number of compactions are currently running
  int num_running_compactions_;

+  // If non-zero, MaybeScheduleFlushOrCompaction() will only schedule manual
+  // compactions (if manual_compaction_ is not null). This mechanism enables
+  // manual compactions to wait until all other compactions are finished.
+  int bg_manual_only_;
+
  // number of background memtable flush jobs, submitted to the HIGH pool
  int bg_flush_scheduled_;

@@ -781,25 +755,15 @@ class DBImpl : public DB {
    int input_level;
    int output_level;
    uint32_t output_path_id;
-    Status status;
    bool done;
+    Status status;
    bool in_progress;             // compaction request being processed?
-    bool incomplete;              // only part of requested range compacted
-    bool exclusive;               // current behavior of only one manual
-    bool disallow_trivial_move;   // Force actual compaction to run
    const InternalKey* begin;     // nullptr means beginning of key range
    const InternalKey* end;       // nullptr means end of key range
-    InternalKey* manual_end;      // how far we are compacting
    InternalKey tmp_storage;      // Used to keep track of compaction progress
-    InternalKey tmp_storage1;     // Used to keep track of compaction progress
-    Compaction* compaction;
-  };
-  std::deque<ManualCompaction*> manual_compaction_dequeue_;
-
-  struct CompactionArg {
-    DBImpl* db;
-    ManualCompaction* m;
+    bool disallow_trivial_move;   // Force actual compaction to run
  };
+  ManualCompaction* manual_compaction_;

  // Have we encountered a background error in paranoid mode?
  Status bg_error_;
@@ -822,10 +786,7 @@ class DBImpl : public DB {
  // they're unique
  std::atomic<int> next_job_id_;

-  // A flag indicating whether the current rocksdb database has any
-  // data that is not yet persisted into either WAL or SST file.
-  // Used when disableWAL is true.
-  bool has_unpersisted_data_;
+  bool flush_on_destroy_; // Used when disableWAL is true.

  static const int KEEP_LOG_FILE_NUM = 1000;
  // MSVC version 1800 still does not have constexpr for ::max()
@@ -896,16 +857,9 @@ class DBImpl : public DB {
                 bool* value_found = nullptr);

  bool GetIntPropertyInternal(ColumnFamilyData* cfd,
-                              const DBPropertyInfo& property_info,
-                              bool is_locked, uint64_t* value);
-
-  bool HasPendingManualCompaction();
-  bool HasExclusiveManualCompaction();
-  void AddManualCompaction(ManualCompaction* m);
-  void RemoveManualCompaction(ManualCompaction* m);
-  bool ShouldntRunManualCompaction(ManualCompaction* m);
-  bool HaveManualCompaction(ColumnFamilyData* cfd);
-  bool MCOverlap(ManualCompaction* m, ManualCompaction* m1);
+                              DBPropertyType property_type,
+                              bool need_out_of_mutex, bool is_locked,
+                              uint64_t* value);
 };

 // Sanitize db options.  The caller should delete result.info_log if
@@ -70,7 +70,7 @@ Status DBImpl::TEST_CompactRange(int level, const Slice* begin,
       cfd->ioptions()->compaction_style == kCompactionStyleFIFO)
          ? level
          : level + 1;
-  return RunManualCompaction(cfd, level, output_level, 0, begin, end, true,
+  return RunManualCompaction(cfd, level, output_level, 0, begin, end,
                             disallow_trivial_move);
 }

@@ -76,8 +76,7 @@ class DBIter: public Iterator {
        current_entry_is_merged_(false),
        statistics_(ioptions.statistics),
        iterate_upper_bound_(iterate_upper_bound),
-        prefix_same_as_start_(prefix_same_as_start),
-        iter_pinned_(false) {
+        prefix_same_as_start_(prefix_same_as_start) {
    RecordTick(statistics_, NO_ITERATORS);
    prefix_extractor_ = ioptions.prefix_extractor;
    max_skip_ = max_sequential_skip_in_iterations;
@@ -93,9 +92,6 @@ class DBIter: public Iterator {
  virtual void SetIter(InternalIterator* iter) {
    assert(iter_ == nullptr);
    iter_ = iter;
-    if (iter_ && iter_pinned_) {
-      iter_->PinData();
-    }
  }
  virtual bool Valid() const override { return valid_; }
  virtual Slice key() const override {
@@ -114,32 +110,6 @@ class DBIter: public Iterator {
      return status_;
    }
  }
-  virtual Status PinData() {
-    Status s;
-    if (iter_) {
-      s = iter_->PinData();
-    }
-    if (s.ok()) {
-      // Even if iter_ is nullptr, we set iter_pinned_ to true so that when
-      // iter_ is updated using SetIter, we Pin it.
-      iter_pinned_ = true;
-    }
-    return s;
-  }
-  virtual Status ReleasePinnedData() {
-    Status s;
-    if (iter_) {
-      s = iter_->ReleasePinnedData();
-    }
-    if (s.ok()) {
-      iter_pinned_ = false;
-    }
-    return s;
-  }
-  virtual bool IsKeyPinned() const override {
-    assert(valid_);
-    return iter_pinned_ && saved_key_.IsKeyPinned();
-  }

  virtual void Next() override;
  virtual void Prev() override;
@@ -189,9 +159,6 @@ class DBIter: public Iterator {
  const Slice* iterate_upper_bound_;
  IterKey prefix_start_;
  bool prefix_same_as_start_;
-  bool iter_pinned_;
-  // List of operands for merge operator.
-  std::deque<std::string> merge_operands_;

  // No copying allowed
  DBIter(const DBIter&);
@@ -290,21 +257,18 @@ void DBIter::FindNextUserEntryInternal(bool skipping) {
            case kTypeSingleDeletion:
              // Arrange to skip all upcoming entries for this key since
              // they are hidden by this deletion.
-              saved_key_.SetKey(ikey.user_key,
-                                !iter_->IsKeyPinned() /* copy */);
+              saved_key_.SetKey(ikey.user_key);
              skipping = true;
              num_skipped = 0;
              PERF_COUNTER_ADD(internal_delete_skipped_count, 1);
              break;
            case kTypeValue:
              valid_ = true;
-              saved_key_.SetKey(ikey.user_key,
-                                !iter_->IsKeyPinned() /* copy */);
+              saved_key_.SetKey(ikey.user_key);
              return;
            case kTypeMerge:
              // By now, we are sure the current ikey is going to yield a value
-              saved_key_.SetKey(ikey.user_key,
-                                !iter_->IsKeyPinned() /* copy */);
+              saved_key_.SetKey(ikey.user_key);
              current_entry_is_merged_ = true;
              valid_ = true;
              MergeValuesNewToOld();  // Go to a different state machine
@@ -464,8 +428,7 @@ void DBIter::PrevInternal() {
  ParsedInternalKey ikey;

  while (iter_->Valid()) {
-    saved_key_.SetKey(ExtractUserKey(iter_->key()),
-                      !iter_->IsKeyPinned() /* copy */);
+    saved_key_.SetKey(ExtractUserKey(iter_->key()));
    if (FindValueForCurrentKey()) {
      valid_ = true;
      if (!iter_->Valid()) {
@@ -495,7 +458,8 @@ void DBIter::PrevInternal() {
 // saved_value_
 bool DBIter::FindValueForCurrentKey() {
  assert(iter_->Valid());
-  merge_operands_.clear();
+  // Contains operands for merge operator.
+  std::deque<std::string> operands;
  // last entry before merge (could be kTypeDeletion, kTypeSingleDeletion or
  // kTypeValue)
  ValueType last_not_merge_type = kTypeDeletion;
@@ -515,19 +479,19 @@ bool DBIter::FindValueForCurrentKey() {
    last_key_entry_type = ikey.type;
    switch (last_key_entry_type) {
      case kTypeValue:
-        merge_operands_.clear();
+        operands.clear();
        saved_value_ = iter_->value().ToString();
        last_not_merge_type = kTypeValue;
        break;
      case kTypeDeletion:
      case kTypeSingleDeletion:
-        merge_operands_.clear();
+        operands.clear();
        last_not_merge_type = last_key_entry_type;
        PERF_COUNTER_ADD(internal_delete_skipped_count, 1);
        break;
      case kTypeMerge:
        assert(user_merge_operator_ != nullptr);
-        merge_operands_.push_back(iter_->value().ToString());
+        operands.push_back(iter_->value().ToString());
        break;
      default:
        assert(false);
@@ -549,9 +513,8 @@ bool DBIter::FindValueForCurrentKey() {
      if (last_not_merge_type == kTypeDeletion) {
        StopWatchNano timer(env_, statistics_ != nullptr);
        PERF_TIMER_GUARD(merge_operator_time_nanos);
-        user_merge_operator_->FullMerge(saved_key_.GetKey(), nullptr,
-                                        merge_operands_, &saved_value_,
-                                        logger_);
+        user_merge_operator_->FullMerge(saved_key_.GetKey(), nullptr, operands,
+                                        &saved_value_, logger_);
        RecordTick(statistics_, MERGE_OPERATION_TOTAL_TIME,
                   timer.ElapsedNanos());
      } else {
@@ -562,8 +525,7 @@ bool DBIter::FindValueForCurrentKey() {
          StopWatchNano timer(env_, statistics_ != nullptr);
          PERF_TIMER_GUARD(merge_operator_time_nanos);
          user_merge_operator_->FullMerge(saved_key_.GetKey(), &temp_slice,
-                                          merge_operands_, &saved_value_,
-                                          logger_);
+                                          operands, &saved_value_, logger_);
          RecordTick(statistics_, MERGE_OPERATION_TOTAL_TIME,
                     timer.ElapsedNanos());
        }
@@ -782,7 +744,7 @@ void DBIter::SeekToLast() {
  // it will seek to the last key before the
  // ReadOptions.iterate_upper_bound
  if (iter_->Valid() && iterate_upper_bound_ != nullptr) {
-    saved_key_.SetKey(*iterate_upper_bound_, false /* copy */);
+    saved_key_.SetKey(*iterate_upper_bound_);
    std::string last_key;
    AppendInternalKey(&last_key,
                      ParsedInternalKey(saved_key_.GetKey(), kMaxSequenceNumber,
@@ -819,15 +781,10 @@ Iterator* NewDBIterator(Env* env, const ImmutableCFOptions& ioptions,
                        const SequenceNumber& sequence,
                        uint64_t max_sequential_skip_in_iterations,
                        const Slice* iterate_upper_bound,
-                        bool prefix_same_as_start, bool pin_data) {
-  DBIter* db_iter =
-      new DBIter(env, ioptions, user_key_comparator, internal_iter, sequence,
-                 false, max_sequential_skip_in_iterations, iterate_upper_bound,
-                 prefix_same_as_start);
-  if (pin_data) {
-    db_iter->PinData();
-  }
-  return db_iter;
+                        bool prefix_same_as_start) {
+  return new DBIter(env, ioptions, user_key_comparator, internal_iter, sequence,
+                    false, max_sequential_skip_in_iterations,
+                    iterate_upper_bound, prefix_same_as_start);
 }

 ArenaWrappedDBIter::~ArenaWrappedDBIter() { db_iter_->~DBIter(); }
@@ -849,13 +806,6 @@ inline void ArenaWrappedDBIter::Prev() { db_iter_->Prev(); }
 inline Slice ArenaWrappedDBIter::key() const { return db_iter_->key(); }
 inline Slice ArenaWrappedDBIter::value() const { return db_iter_->value(); }
 inline Status ArenaWrappedDBIter::status() const { return db_iter_->status(); }
-inline Status ArenaWrappedDBIter::PinData() { return db_iter_->PinData(); }
-inline Status ArenaWrappedDBIter::ReleasePinnedData() {
-  return db_iter_->ReleasePinnedData();
-}
-inline bool ArenaWrappedDBIter::IsKeyPinned() const {
-  return db_iter_->IsKeyPinned();
-}
 void ArenaWrappedDBIter::RegisterCleanup(CleanupFunction function, void* arg1,
                                         void* arg2) {
  db_iter_->RegisterCleanup(function, arg1, arg2);
@@ -865,8 +815,7 @@ ArenaWrappedDBIter* NewArenaWrappedDbIterator(
    Env* env, const ImmutableCFOptions& ioptions,
    const Comparator* user_key_comparator, const SequenceNumber& sequence,
    uint64_t max_sequential_skip_in_iterations,
-    const Slice* iterate_upper_bound, bool prefix_same_as_start,
-    bool pin_data) {
+    const Slice* iterate_upper_bound, bool prefix_same_as_start) {
  ArenaWrappedDBIter* iter = new ArenaWrappedDBIter();
  Arena* arena = iter->GetArena();
  auto mem = arena->AllocateAligned(sizeof(DBIter));
@@ -876,9 +825,6 @@ ArenaWrappedDBIter* NewArenaWrappedDbIterator(
                       iterate_upper_bound, prefix_same_as_start);

  iter->SetDBIter(db_iter);
-  if (pin_data) {
-    iter->PinData();
-  }

  return iter;
 }
@@ -30,8 +30,7 @@ extern Iterator* NewDBIterator(Env* env, const ImmutableCFOptions& options,
                               const SequenceNumber& sequence,
                               uint64_t max_sequential_skip_in_iterations,
                               const Slice* iterate_upper_bound = nullptr,
-                               bool prefix_same_as_start = false,
-                               bool pin_data = false);
+                               bool prefix_same_as_start = false);

 // A wrapper iterator which wraps DB Iterator and the arena, with which the DB
 // iterator is supposed be allocated. This class is used as an entry point of
@@ -64,9 +63,6 @@ class ArenaWrappedDBIter : public Iterator {
  virtual Status status() const override;

  void RegisterCleanup(CleanupFunction function, void* arg1, void* arg2);
-  virtual Status PinData();
-  virtual Status ReleasePinnedData();
-  virtual bool IsKeyPinned() const override;

 private:
  DBIter* db_iter_;
@@ -79,6 +75,6 @@ extern ArenaWrappedDBIter* NewArenaWrappedDbIterator(
    const Comparator* user_key_comparator, const SequenceNumber& sequence,
    uint64_t max_sequential_skip_in_iterations,
    const Slice* iterate_upper_bound = nullptr,
-    bool prefix_same_as_start = false, bool pin_data = false);
+    bool prefix_same_as_start = false);

 }  // namespace rocksdb
@@ -27,7 +27,7 @@ class DBTestXactLogIterator : public DBTestBase {
    Status status = dbfull()->GetUpdatesSince(seq, &iter);
    EXPECT_OK(status);
    EXPECT_TRUE(iter->Valid());
-    return iter;
+    return std::move(iter);
  }
 };

@@ -168,7 +168,7 @@ TEST_F(DBTestTailingIterator, TailingIteratorTrimSeekToNext) {
    char buf3[32];
    char buf4[32];
    snprintf(buf1, sizeof(buf1), "00a0%016d", i * 5);
-    snprintf(buf3, sizeof(buf3), "00b0%016d", i * 5);
+    snprintf(buf3, sizeof(buf1), "00b0%016d", i * 5);

    Slice key(buf1, 20);
    ASSERT_OK(Put(1, key, value));
@@ -181,7 +181,7 @@ TEST_F(DBTestTailingIterator, TailingIteratorTrimSeekToNext) {
      if (i == 299) {
        file_iters_deleted = true;
      }
-      snprintf(buf4, sizeof(buf4), "00a0%016d", i * 5 / 2);
+      snprintf(buf4, sizeof(buf1), "00a0%016d", i * 5 / 2);
      Slice target(buf4, 20);
      iterh->Seek(target);
      ASSERT_TRUE(iter->Valid());
@@ -73,69 +73,63 @@ DBTestBase::~DBTestBase() {
  delete env_;
 }

-bool DBTestBase::ShouldSkipOptions(int option_config, int skip_mask) {
-#ifdef ROCKSDB_LITE
-    // These options are not supported in ROCKSDB_LITE
-  if (option_config == kHashSkipList ||
-      option_config == kPlainTableFirstBytePrefix ||
-      option_config == kPlainTableCappedPrefix ||
-      option_config == kPlainTableCappedPrefixNonMmap ||
-      option_config == kPlainTableAllBytesPrefix ||
-      option_config == kVectorRep || option_config == kHashLinkList ||
-      option_config == kHashCuckoo || option_config == kUniversalCompaction ||
-      option_config == kUniversalCompactionMultiLevel ||
-      option_config == kUniversalSubcompactions ||
-      option_config == kFIFOCompaction ||
-      option_config == kConcurrentSkipList) {
-    return true;
-    }
-#endif
-
-    if ((skip_mask & kSkipDeletesFilterFirst) &&
-        option_config == kDeletesFilterFirst) {
-      return true;
-    }
-    if ((skip_mask & kSkipUniversalCompaction) &&
-        (option_config == kUniversalCompaction ||
-         option_config == kUniversalCompactionMultiLevel)) {
-      return true;
-    }
-    if ((skip_mask & kSkipMergePut) && option_config == kMergePut) {
-      return true;
-    }
-    if ((skip_mask & kSkipNoSeekToLast) &&
-        (option_config == kHashLinkList || option_config == kHashSkipList)) {
-      return true;
-    }
-    if ((skip_mask & kSkipPlainTable) &&
-        (option_config == kPlainTableAllBytesPrefix ||
-         option_config == kPlainTableFirstBytePrefix ||
-         option_config == kPlainTableCappedPrefix ||
-         option_config == kPlainTableCappedPrefixNonMmap)) {
-      return true;
-    }
-    if ((skip_mask & kSkipHashIndex) &&
-        (option_config == kBlockBasedTableWithPrefixHashIndex ||
-         option_config == kBlockBasedTableWithWholeKeyHashIndex)) {
-      return true;
-    }
-    if ((skip_mask & kSkipHashCuckoo) && (option_config == kHashCuckoo)) {
-      return true;
-    }
-    if ((skip_mask & kSkipFIFOCompaction) && option_config == kFIFOCompaction) {
-      return true;
-    }
-    if ((skip_mask & kSkipMmapReads) && option_config == kWalDirAndMmapReads) {
-      return true;
-    }
-    return false;
-}
-
 // Switch to a fresh database with the next option configuration to
 // test.  Return false if there are no more configurations to test.
 bool DBTestBase::ChangeOptions(int skip_mask) {
  for (option_config_++; option_config_ < kEnd; option_config_++) {
-    if (ShouldSkipOptions(option_config_, skip_mask)) {
+#ifdef ROCKSDB_LITE
+    // These options are not supported in ROCKSDB_LITE
+    if (option_config_ == kHashSkipList ||
+        option_config_ == kPlainTableFirstBytePrefix ||
+        option_config_ == kPlainTableCappedPrefix ||
+        option_config_ == kPlainTableCappedPrefixNonMmap ||
+        option_config_ == kPlainTableAllBytesPrefix ||
+        option_config_ == kVectorRep || option_config_ == kHashLinkList ||
+        option_config_ == kHashCuckoo ||
+        option_config_ == kUniversalCompaction ||
+        option_config_ == kUniversalCompactionMultiLevel ||
+        option_config_ == kUniversalSubcompactions ||
+        option_config_ == kFIFOCompaction) {
+      continue;
+    }
+#endif
+
+    if ((skip_mask & kSkipDeletesFilterFirst) &&
+        option_config_ == kDeletesFilterFirst) {
+      continue;
+    }
+    if ((skip_mask & kSkipUniversalCompaction) &&
+        (option_config_ == kUniversalCompaction ||
+         option_config_ == kUniversalCompactionMultiLevel)) {
+      continue;
+    }
+    if ((skip_mask & kSkipMergePut) && option_config_ == kMergePut) {
+      continue;
+    }
+    if ((skip_mask & kSkipNoSeekToLast) &&
+        (option_config_ == kHashLinkList || option_config_ == kHashSkipList)) {
+      continue;
+    }
+    if ((skip_mask & kSkipPlainTable) &&
+        (option_config_ == kPlainTableAllBytesPrefix ||
+         option_config_ == kPlainTableFirstBytePrefix ||
+         option_config_ == kPlainTableCappedPrefix ||
+         option_config_ == kPlainTableCappedPrefixNonMmap)) {
+      continue;
+    }
+    if ((skip_mask & kSkipHashIndex) &&
+        (option_config_ == kBlockBasedTableWithPrefixHashIndex ||
+         option_config_ == kBlockBasedTableWithWholeKeyHashIndex)) {
+      continue;
+    }
+    if ((skip_mask & kSkipHashCuckoo) && (option_config_ == kHashCuckoo)) {
+      continue;
+    }
+    if ((skip_mask & kSkipFIFOCompaction) &&
+        option_config_ == kFIFOCompaction) {
+      continue;
+    }
+    if ((skip_mask & kSkipMmapReads) && option_config_ == kWalDirAndMmapReads) {
      continue;
    }
    break;
@@ -339,10 +333,6 @@ Options DBTestBase::CurrentOptions(
      options.prefix_extractor.reset(NewNoopTransform());
      break;
    }
-    case kBlockBasedTableWithIndexRestartInterval: {
-      table_options.index_block_restart_interval = 8;
-      break;
-    }
    case kOptimizeFiltersForHits: {
      options.optimize_filters_for_hits = true;
      set_block_based_table_factory = true;
@@ -366,11 +356,6 @@ Options DBTestBase::CurrentOptions(
      options.max_subcompactions = 4;
      break;
    }
-    case kConcurrentSkipList: {
-      options.allow_concurrent_memtable_write = true;
-      options.enable_write_thread_adaptive_yield = true;
-      break;
-    }

    default:
      break;
@@ -676,14 +661,14 @@ uint64_t DBTestBase::SizeAtLevel(int level) {
  return sum;
 }

-size_t DBTestBase::TotalLiveFiles(int cf) {
+int DBTestBase::TotalLiveFiles(int cf) {
  ColumnFamilyMetaData cf_meta;
  if (cf == 0) {
    db_->GetColumnFamilyMetaData(&cf_meta);
  } else {
    db_->GetColumnFamilyMetaData(handles_[cf], &cf_meta);
  }
-  size_t num_files = 0;
+  int num_files = 0;
  for (auto& level : cf_meta.levels) {
    num_files += level.files.size();
  }
@@ -1015,22 +1000,4 @@ void DBTestBase::CopyFile(const std::string& source,
  ASSERT_OK(destfile->Close());
 }

-std::unordered_map<std::string, uint64_t> DBTestBase::GetAllSSTFiles() {
-  std::unordered_map<std::string, uint64_t> res;
-
-  std::vector<std::string> files;
-  env_->GetChildren(dbname_, &files);
-  for (auto& file_name : files) {
-    uint64_t number;
-    FileType type;
-    std::string file_path = dbname_ + "/" + file_name;
-    if (ParseFileName(file_name, &number, &type) && type == kTableFile) {
-      uint64_t file_size = 0;
-      env_->GetFileSize(file_path, &file_size);
-      res[file_path] = file_size;
-    }
-  }
-  return res;
-}
-
 }  // namespace rocksdb
@@ -19,7 +19,6 @@
 #endif

 #include <algorithm>
-#include <map>
 #include <set>
 #include <string>
 #include <thread>
@@ -28,6 +27,7 @@
 #include <vector>

 #include "db/db_impl.h"
+#include "db/db_test_util.h"
 #include "db/dbformat.h"
 #include "db/filename.h"
 #include "memtable/hash_linklist_rep.h"
@@ -525,11 +525,9 @@ class DBTestBase : public testing::Test {
    kOptimizeFiltersForHits = 27,
    kRowCache = 28,
    kRecycleLogFiles = 29,
-    kConcurrentSkipList = 30,
-    kEnd = 31,
-    kLevelSubcompactions = 31,
-    kUniversalSubcompactions = 32,
-    kBlockBasedTableWithIndexRestartInterval = 33,
+    kLevelSubcompactions = 30,
+    kUniversalSubcompactions = 31,
+    kEnd = 30
  };
  int option_config_;

@@ -575,8 +573,6 @@ class DBTestBase : public testing::Test {
    return std::string(buf);
  }

-  static bool ShouldSkipOptions(int option_config, int skip_mask = kNoSkip);
-
  // Switch to a fresh database with the next option configuration to
  // test.  Return false if there are no more configurations to test.
  bool ChangeOptions(int skip_mask = kNoSkip);
@@ -665,7 +661,7 @@ class DBTestBase : public testing::Test {

  uint64_t SizeAtLevel(int level);

-  size_t TotalLiveFiles(int cf = 0);
+  int TotalLiveFiles(int cf = 0);

  size_t CountLiveFiles();
 #endif  // ROCKSDB_LITE
@@ -753,8 +749,6 @@ class DBTestBase : public testing::Test {

  void CopyFile(const std::string& source, const std::string& destination,
                uint64_t size = 0);
-
-  std::unordered_map<std::string, uint64_t> GetAllSSTFiles();
 };

 }  // namespace rocksdb
@@ -14,11 +14,6 @@

 namespace rocksdb {

-static uint64_t TestGetTickerCount(const Options& options,
-                                   Tickers ticker_type) {
-  return options.statistics->getTickerCount(ticker_type);
-}
-
 static std::string CompressibleString(Random* rnd, int len) {
  std::string r;
  test::CompressibleString(rnd, 0.8, len, &r);
@@ -27,16 +22,12 @@ static std::string CompressibleString(Random* rnd, int len) {

 class DBTestUniversalCompactionBase
    : public DBTestBase,
-      public ::testing::WithParamInterface<std::tuple<int, bool>> {
+      public ::testing::WithParamInterface<int> {
 public:
  explicit DBTestUniversalCompactionBase(
      const std::string& path) : DBTestBase(path) {}
-  virtual void SetUp() override {
-    num_levels_ = std::get<0>(GetParam());
-    exclusive_manual_compaction_ = std::get<1>(GetParam());
-  }
+  virtual void SetUp() override { num_levels_ = GetParam(); }
  int num_levels_;
-  bool exclusive_manual_compaction_;
 };

 class DBTestUniversalCompaction : public DBTestUniversalCompactionBase {
@@ -159,72 +150,6 @@ TEST_P(DBTestUniversalCompaction, UniversalCompactionSingleSortedRun) {
  }
 }

-TEST_P(DBTestUniversalCompaction, OptimizeFiltersForHits) {
-  Options options;
-  options = CurrentOptions(options);
-  options.compaction_style = kCompactionStyleUniversal;
-  options.compaction_options_universal.size_ratio = 5;
-  options.num_levels = num_levels_;
-  options.write_buffer_size = 105 << 10;  // 105KB
-  options.arena_block_size = 4 << 10;
-  options.target_file_size_base = 32 << 10;  // 32KB
-  // trigger compaction if there are >= 4 files
-  options.level0_file_num_compaction_trigger = 4;
-  BlockBasedTableOptions bbto;
-  bbto.cache_index_and_filter_blocks = true;
-  bbto.filter_policy.reset(NewBloomFilterPolicy(10, false));
-  bbto.whole_key_filtering = true;
-  options.table_factory.reset(NewBlockBasedTableFactory(bbto));
-  options.optimize_filters_for_hits = true;
-  options.statistics = rocksdb::CreateDBStatistics();
-  options.memtable_factory.reset(new SpecialSkipListFactory(3));
-
-  DestroyAndReopen(options);
-
-  // block compaction from happening
-  env_->SetBackgroundThreads(1, Env::LOW);
-  test::SleepingBackgroundTask sleeping_task_low;
-  env_->Schedule(&test::SleepingBackgroundTask::DoSleepTask, &sleeping_task_low,
-                 Env::Priority::LOW);
-
-  for (int num = 0; num < options.level0_file_num_compaction_trigger; num++) {
-    Put(Key(num * 10), "val");
-    if (num) {
-      dbfull()->TEST_WaitForFlushMemTable();
-    }
-    Put(Key(30 + num * 10), "val");
-    Put(Key(60 + num * 10), "val");
-  }
-  Put("", "");
-  dbfull()->TEST_WaitForFlushMemTable();
-
-  // Query set of non existing keys
-  for (int i = 5; i < 90; i += 10) {
-    ASSERT_EQ(Get(Key(i)), "NOT_FOUND");
-  }
-
-  // Make sure bloom filter is used at least once.
-  ASSERT_GT(TestGetTickerCount(options, BLOOM_FILTER_USEFUL), 0);
-  auto prev_counter = TestGetTickerCount(options, BLOOM_FILTER_USEFUL);
-
-  // Make sure bloom filter is used for all but the last L0 file when looking
-  // up a non-existent key that's in the range of all L0 files.
-  ASSERT_EQ(Get(Key(35)), "NOT_FOUND");
-  ASSERT_EQ(prev_counter + NumTableFilesAtLevel(0) - 1,
-            TestGetTickerCount(options, BLOOM_FILTER_USEFUL));
-  prev_counter = TestGetTickerCount(options, BLOOM_FILTER_USEFUL);
-
-  // Unblock compaction and wait it for happening.
-  sleeping_task_low.WakeUp();
-  dbfull()->TEST_WaitForCompact();
-
-  // The same queries will not trigger bloom filter
-  for (int i = 5; i < 90; i += 10) {
-    ASSERT_EQ(Get(Key(i)), "NOT_FOUND");
-  }
-  ASSERT_EQ(prev_counter, TestGetTickerCount(options, BLOOM_FILTER_USEFUL));
-}
-
 // TODO(kailiu) The tests on UniversalCompaction has some issues:
 //  1. A lot of magic numbers ("11" or "12").
 //  2. Made assumption on the memtable flush conditions, which may change from
@@ -481,7 +406,6 @@ TEST_P(DBTestUniversalCompaction, UniversalCompactionTargetLevel) {
  CompactRangeOptions compact_options;
  compact_options.change_level = true;
  compact_options.target_level = 4;
-  compact_options.exclusive_manual_compaction = exclusive_manual_compaction_;
  db_->CompactRange(compact_options, nullptr, nullptr);
  ASSERT_EQ("0,0,0,0,1", FilesPerLevel(0));
 }
@@ -574,8 +498,7 @@ TEST_P(DBTestUniversalCompactionMultiLevels, UniversalCompactionTrivialMove) {

 INSTANTIATE_TEST_CASE_P(DBTestUniversalCompactionMultiLevels,
                        DBTestUniversalCompactionMultiLevels,
-                        ::testing::Combine(::testing::Values(3, 20),
-                                           ::testing::Bool()));
+                        ::testing::Values(3, 20));

 class DBTestUniversalCompactionParallel :
    public DBTestUniversalCompactionBase {
@@ -648,8 +571,7 @@ TEST_P(DBTestUniversalCompactionParallel, UniversalCompactionParallel) {

 INSTANTIATE_TEST_CASE_P(DBTestUniversalCompactionParallel,
                        DBTestUniversalCompactionParallel,
-                        ::testing::Combine(::testing::Values(1, 10),
-                                           ::testing::Bool()));
+                        ::testing::Values(1, 10));

 TEST_P(DBTestUniversalCompaction, UniversalCompactionOptions) {
  Options options;
@@ -1141,7 +1063,6 @@ TEST_P(DBTestUniversalCompaction, IncreaseUniversalCompactionNumLevels) {
  CompactRangeOptions compact_options;
  compact_options.change_level = true;
  compact_options.target_level = 0;
-  compact_options.exclusive_manual_compaction = exclusive_manual_compaction_;
  dbfull()->CompactRange(compact_options, handles_[1], nullptr, nullptr);
  // Need to restart it once to remove higher level records in manifest.
  ReopenWithColumnFamilies({"default", "pikachu"}, options);
@@ -1265,8 +1186,7 @@ TEST_P(DBTestUniversalCompaction, UniversalCompactionSecondPathRatio) {
 }

 INSTANTIATE_TEST_CASE_P(UniversalCompactionNumLevels, DBTestUniversalCompaction,
-                        ::testing::Combine(::testing::Values(1, 3, 5),
-                                           ::testing::Bool()));
+                        ::testing::Values(1, 3, 5));

 class DBTestUniversalManualCompactionOutputPathId
    : public DBTestUniversalCompactionBase {
@@ -1298,7 +1218,6 @@ TEST_P(DBTestUniversalManualCompactionOutputPathId,
  // Full compaction to DB path 0
  CompactRangeOptions compact_options;
  compact_options.target_path_id = 1;
-  compact_options.exclusive_manual_compaction = exclusive_manual_compaction_;
  db_->CompactRange(compact_options, handles_[1], nullptr, nullptr);
  ASSERT_EQ(1, TotalLiveFiles(1));
  ASSERT_EQ(0, GetSstFileCount(options.db_paths[0].path));
@@ -1321,7 +1240,6 @@ TEST_P(DBTestUniversalManualCompactionOutputPathId,

  // Full compaction to DB path 0
  compact_options.target_path_id = 0;
-  compact_options.exclusive_manual_compaction = exclusive_manual_compaction_;
  db_->CompactRange(compact_options, handles_[1], nullptr, nullptr);
  ASSERT_EQ(1, TotalLiveFiles(1));
  ASSERT_EQ(1, GetSstFileCount(options.db_paths[0].path));
@@ -1329,15 +1247,13 @@ TEST_P(DBTestUniversalManualCompactionOutputPathId,

  // Fail when compacting to an invalid path ID
  compact_options.target_path_id = 2;
-  compact_options.exclusive_manual_compaction = exclusive_manual_compaction_;
  ASSERT_TRUE(db_->CompactRange(compact_options, handles_[1], nullptr, nullptr)
                  .IsInvalidArgument());
 }

 INSTANTIATE_TEST_CASE_P(DBTestUniversalManualCompactionOutputPathId,
                        DBTestUniversalManualCompactionOutputPathId,
-                        ::testing::Combine(::testing::Values(1, 8),
-                                           ::testing::Bool()));
+                        ::testing::Values(1, 8));

 }  // namespace rocksdb

@@ -271,8 +271,7 @@ inline LookupKey::~LookupKey() {

 class IterKey {
 public:
-  IterKey()
-      : buf_(space_), buf_size_(sizeof(space_)), key_(buf_), key_size_(0) {}
+  IterKey() : key_(space_), buf_size_(sizeof(space_)), key_size_(0) {}

  ~IterKey() { ResetBuffer(); }

@@ -294,41 +293,31 @@ class IterKey {
  void TrimAppend(const size_t shared_len, const char* non_shared_data,
                  const size_t non_shared_len) {
    assert(shared_len <= key_size_);
-    size_t total_size = shared_len + non_shared_len;

-    if (IsKeyPinned() /* key is not in buf_ */) {
-      // Copy the key from external memory to buf_ (copy shared_len bytes)
-      EnlargeBufferIfNeeded(total_size);
-      memcpy(buf_, key_, shared_len);
-    } else if (total_size > buf_size_) {
+    size_t total_size = shared_len + non_shared_len;
+    if (total_size <= buf_size_) {
+      key_size_ = total_size;
+    } else {
      // Need to allocate space, delete previous space
      char* p = new char[total_size];
      memcpy(p, key_, shared_len);

-      if (buf_ != space_) {
-        delete[] buf_;
+      if (key_ != space_) {
+        delete[] key_;
      }

-      buf_ = p;
+      key_ = p;
+      key_size_ = total_size;
      buf_size_ = total_size;
    }

-    memcpy(buf_ + shared_len, non_shared_data, non_shared_len);
-    key_ = buf_;
-    key_size_ = total_size;
+    memcpy(key_ + shared_len, non_shared_data, non_shared_len);
  }

-  Slice SetKey(const Slice& key, bool copy = true) {
+  Slice SetKey(const Slice& key) {
    size_t size = key.size();
-    if (copy) {
-      // Copy key to buf_
-      EnlargeBufferIfNeeded(size);
-      memcpy(buf_, key.data(), size);
-      key_ = buf_;
-    } else {
-      // Update key_ to point to external memory
-      key_ = key.data();
-    }
+    EnlargeBufferIfNeeded(size);
+    memcpy(key_, key.data(), size);
    key_size_ = size;
    return Slice(key_, key_size_);
  }
@@ -346,14 +335,11 @@ class IterKey {
  // Update the sequence number in the internal key.  Guarantees not to
  // invalidate slices to the key (and the user key).
  void UpdateInternalKey(uint64_t seq, ValueType t) {
-    assert(!IsKeyPinned());
    assert(key_size_ >= 8);
    uint64_t newval = (seq << 8) | t;
-    EncodeFixed64(&buf_[key_size_ - 8], newval);
+    EncodeFixed64(&key_[key_size_ - 8], newval);
  }

-  bool IsKeyPinned() const { return (key_ != buf_); }
-
  void SetInternalKey(const Slice& key_prefix, const Slice& user_key,
                      SequenceNumber s,
                      ValueType value_type = kValueTypeForSeek) {
@@ -361,12 +347,10 @@ class IterKey {
    size_t usize = user_key.size();
    EnlargeBufferIfNeeded(psize + usize + sizeof(uint64_t));
    if (psize > 0) {
-      memcpy(buf_, key_prefix.data(), psize);
+      memcpy(key_, key_prefix.data(), psize);
    }
-    memcpy(buf_ + psize, user_key.data(), usize);
-    EncodeFixed64(buf_ + usize + psize, PackSequenceAndType(s, value_type));
-
-    key_ = buf_;
+    memcpy(key_ + psize, user_key.data(), usize);
+    EncodeFixed64(key_ + usize + psize, PackSequenceAndType(s, value_type));
    key_size_ = psize + usize + sizeof(uint64_t);
  }

@@ -393,22 +377,20 @@ class IterKey {
  void EncodeLengthPrefixedKey(const Slice& key) {
    auto size = key.size();
    EnlargeBufferIfNeeded(size + static_cast<size_t>(VarintLength(size)));
-    char* ptr = EncodeVarint32(buf_, static_cast<uint32_t>(size));
+    char* ptr = EncodeVarint32(key_, static_cast<uint32_t>(size));
    memcpy(ptr, key.data(), size);
-    key_ = buf_;
  }

 private:
-  char* buf_;
+  char* key_;
  size_t buf_size_;
-  const char* key_;
  size_t key_size_;
  char space_[32];  // Avoid allocation for short keys

  void ResetBuffer() {
-    if (buf_ != space_) {
-      delete[] buf_;
-      buf_ = space_;
+    if (key_ != space_) {
+      delete[] key_;
+      key_ = space_;
    }
    buf_size_ = sizeof(space_);
    key_size_ = 0;
@@ -425,7 +407,7 @@ class IterKey {
    if (key_size > buf_size_) {
      // Need to enlarge the buffer.
      ResetBuffer();
-      buf_ = new char[key_size];
+      key_ = new char[key_size];
      buf_size_ = key_size;
    }
  }
@@ -74,7 +74,6 @@ class DeleteFileTest : public testing::Test {

  void CloseDB() {
    delete db_;
-    db_ = nullptr;
  }

  void AddKeys(int numkeys, int startkey = 0) {
@@ -8,10 +8,7 @@
 namespace rocksdb {

 namespace {
-template<class T>
-inline T SafeDivide(T a, T b) {
-  return b == 0 ? 0 : a / b;
-}
+inline double SafeDivide(double a, double b) { return b == 0.0 ? 0 : a / b; }
 }  // namespace

 void EventHelpers::AppendCurrentTime(JSONWriter* jwriter) {
@@ -645,17 +645,18 @@ class FaultInjectionTest : public testing::Test,
    return test::RandomString(&r, kValueSize, storage);
  }

+  Status OpenDB() {
+    delete db_;
+    db_ = NULL;
+    env_->ResetState();
+    return DB::Open(options_, dbname_, &db_);
+  }
+
  void CloseDB() {
    delete db_;
    db_ = NULL;
  }

-  Status OpenDB() {
-    CloseDB();
-    env_->ResetState();
-    return DB::Open(options_, dbname_, &db_);
-  }
-
  void DeleteAllData() {
    Iterator* iter = db_->NewIterator(ReadOptions());
    WriteOptions options;
@@ -783,7 +784,6 @@ TEST_P(FaultInjectionTest, WriteOptionSyncTest) {
  // Block the job queue to prevent flush job from running.
  env_->Schedule(&test::SleepingBackgroundTask::DoSleepTask, &sleeping_task_low,
                 Env::Priority::HIGH);
-  sleeping_task_low.WaitUntilSleeping();

  WriteOptions write_options;
  write_options.sync = false;
@@ -867,7 +867,6 @@ TEST_P(FaultInjectionTest, ManualLogSyncTest) {
  // Block the job queue to prevent flush job from running.
  env_->Schedule(&test::SleepingBackgroundTask::DoSleepTask, &sleeping_task_low,
                 Env::Priority::HIGH);
-  sleeping_task_low.WaitUntilSleeping();

  WriteOptions write_options;
  write_options.sync = false;
@@ -26,9 +26,9 @@ struct FileLevel;
 // The file tree structure in Version is prebuilt and the range of each file
 // is known. On Version::Get(), it uses binary search to find a potential file
 // and then check if a target key can be found in the file by comparing the key
-// to each file's smallest and largest key. The results of these comparisons
+// to each file's smallest and largest key. The results of these comparisions
 // can be reused beyond checking if a key falls into a file's range.
-// With some pre-calculated knowledge, each key comparison that has been done
+// With some pre-calculated knowledge, each key comparision that has been done
 // can serve as a hint to narrow down further searches: if a key compared to
 // be smaller than a file's smallest or largest, that comparison can be used
 // to find out the right bound of next binary search. Similarly, if a key
@@ -48,7 +48,7 @@ class FileIndexer {
  size_t LevelIndexSize(size_t level) const;

  // Return a file index range in the next level to search for a key based on
-  // smallest and largest key comparison for the current file specified by
+  // smallest and largest key comparision for the current file specified by
  // level and file_index. When *left_index < *right_index, both index should
  // be valid and fit in the vector size.
  void GetNextLevelIndex(const size_t level, const size_t file_index,
@@ -62,7 +62,6 @@ FlushJob::FlushJob(const std::string& dbname, ColumnFamilyData* cfd,
                   InstrumentedMutex* db_mutex,
                   std::atomic<bool>* shutting_down,
                   std::vector<SequenceNumber> existing_snapshots,
-                   SequenceNumber earliest_write_conflict_snapshot,
                   JobContext* job_context, LogBuffer* log_buffer,
                   Directory* db_directory, Directory* output_file_directory,
                   CompressionType output_compression, Statistics* stats,
@@ -76,7 +75,6 @@ FlushJob::FlushJob(const std::string& dbname, ColumnFamilyData* cfd,
      db_mutex_(db_mutex),
      shutting_down_(shutting_down),
      existing_snapshots_(std::move(existing_snapshots)),
-      earliest_write_conflict_snapshot_(earliest_write_conflict_snapshot),
      job_context_(job_context),
      log_buffer_(log_buffer),
      db_directory_(db_directory),
@@ -94,8 +92,7 @@ FlushJob::~FlushJob() {
 }

 void FlushJob::ReportStartedFlush() {
-  ThreadStatusUtil::SetColumnFamily(cfd_, cfd_->ioptions()->env,
-                                    cfd_->options()->enable_thread_tracking);
+  ThreadStatusUtil::SetColumnFamily(cfd_);
  ThreadStatusUtil::SetThreadOperation(ThreadStatus::OP_FLUSH);
  ThreadStatusUtil::SetThreadOperationProperty(
      ThreadStatus::COMPACTION_JOB_ID,
@@ -238,8 +235,8 @@ Status FlushJob::WriteLevel0Table(const autovector<MemTable*>& mems,
                     cfd_->table_cache(), iter.get(), meta,
                     cfd_->internal_comparator(),
                     cfd_->int_tbl_prop_collector_factories(), cfd_->GetID(),
-                     existing_snapshots_, earliest_write_conflict_snapshot_,
-                     output_compression_, cfd_->ioptions()->compression_opts,
+                     existing_snapshots_, output_compression_,
+                     cfd_->ioptions()->compression_opts,
                     mutable_cf_options_.paranoid_file_checks,
                     cfd_->internal_stats(), Env::IO_HIGH, &table_properties_);
      info.table_properties = table_properties_;
@@ -271,7 +268,6 @@ Status FlushJob::WriteLevel0Table(const autovector<MemTable*>& mems,
    if (!db_options_.disableDataSync && output_file_directory_ != nullptr) {
      output_file_directory_->Fsync();
    }
-    TEST_SYNC_POINT("FlushJob::WriteLevel0Table");
    db_mutex_->Lock();
  }
  base->Unref();
@@ -58,7 +58,6 @@ class FlushJob {
           const EnvOptions& env_options, VersionSet* versions,
           InstrumentedMutex* db_mutex, std::atomic<bool>* shutting_down,
           std::vector<SequenceNumber> existing_snapshots,
-           SequenceNumber earliest_write_conflict_snapshot,
           JobContext* job_context, LogBuffer* log_buffer,
           Directory* db_directory, Directory* output_file_directory,
           CompressionType output_compression, Statistics* stats,
@@ -84,7 +83,6 @@ class FlushJob {
  InstrumentedMutex* db_mutex_;
  std::atomic<bool>* shutting_down_;
  std::vector<SequenceNumber> existing_snapshots_;
-  SequenceNumber earliest_write_conflict_snapshot_;
  JobContext* job_context_;
  LogBuffer* log_buffer_;
  Directory* db_directory_;
@@ -92,8 +92,8 @@ TEST_F(FlushJobTest, Empty) {
  FlushJob flush_job(dbname_, versions_->GetColumnFamilySet()->GetDefault(),
                     db_options_, *cfd->GetLatestMutableCFOptions(),
                     env_options_, versions_.get(), &mutex_, &shutting_down_,
-                     {}, kMaxSequenceNumber, &job_context, nullptr, nullptr,
-                     nullptr, kNoCompression, nullptr, &event_logger);
+                     {}, &job_context, nullptr, nullptr, nullptr,
+                     kNoCompression, nullptr, &event_logger);
  ASSERT_OK(flush_job.Run());
  job_context.Clean();
 }
@@ -131,8 +131,8 @@ TEST_F(FlushJobTest, NonEmpty) {
  FlushJob flush_job(dbname_, versions_->GetColumnFamilySet()->GetDefault(),
                     db_options_, *cfd->GetLatestMutableCFOptions(),
                     env_options_, versions_.get(), &mutex_, &shutting_down_,
-                     {}, kMaxSequenceNumber, &job_context, nullptr, nullptr,
-                     nullptr, kNoCompression, nullptr, &event_logger);
+                     {}, &job_context, nullptr, nullptr, nullptr,
+                     kNoCompression, nullptr, &event_logger);
  FileMetaData fd;
  mutex_.Lock();
  ASSERT_OK(flush_job.Run(&fd));
@@ -195,8 +195,8 @@ TEST_F(FlushJobTest, Snapshots) {
  FlushJob flush_job(dbname_, versions_->GetColumnFamilySet()->GetDefault(),
                     db_options_, *cfd->GetLatestMutableCFOptions(),
                     env_options_, versions_.get(), &mutex_, &shutting_down_,
-                     snapshots, kMaxSequenceNumber, &job_context, nullptr,
-                     nullptr, nullptr, kNoCompression, nullptr, &event_logger);
+                     snapshots, &job_context, nullptr, nullptr, nullptr,
+                     kNoCompression, nullptr, &event_logger);
  mutex_.Lock();
  ASSERT_OK(flush_job.Run());
  mutex_.Unlock();
@@ -13,69 +13,51 @@ namespace rocksdb {

 void FlushScheduler::ScheduleFlush(ColumnFamilyData* cfd) {
 #ifndef NDEBUG
-  {
-    std::lock_guard<std::mutex> lock(checking_mutex_);
-    assert(checking_set_.count(cfd) == 0);
-    checking_set_.insert(cfd);
-  }
+  assert(column_families_set_.find(cfd) == column_families_set_.end());
+  column_families_set_.insert(cfd);
 #endif  // NDEBUG
  cfd->Ref();
-  Node* node = new Node{cfd, head_.load(std::memory_order_relaxed)};
-  while (!head_.compare_exchange_strong(
-      node->next, node, std::memory_order_relaxed, std::memory_order_relaxed)) {
-    // failing CAS updates the first param, so we are already set for
-    // retry.  TakeNextColumnFamily won't happen until after another
-    // inter-thread synchronization, so we don't even need release
-    // semantics for this CAS
-  }
+  column_families_.push_back(cfd);
 }

-ColumnFamilyData* FlushScheduler::TakeNextColumnFamily() {
-  while (true) {
-    if (Empty()) {
-      return nullptr;
+ColumnFamilyData* FlushScheduler::GetNextColumnFamily() {
+  ColumnFamilyData* cfd = nullptr;
+  while (column_families_.size() > 0) {
+    cfd = column_families_.front();
+    column_families_.pop_front();
+    if (cfd->IsDropped()) {
+      if (cfd->Unref()) {
+        delete cfd;
+        cfd = nullptr;
+      }
+    } else {
+      break;
    }
-
-    // dequeue the head
-    Node* node = head_.load(std::memory_order_relaxed);
-    head_.store(node->next, std::memory_order_relaxed);
-    ColumnFamilyData* cfd = node->column_family;
-    delete node;
-
+  }
 #ifndef NDEBUG
-    {
-      auto iter = checking_set_.find(cfd);
-      assert(iter != checking_set_.end());
-      checking_set_.erase(iter);
-    }
-#endif  // NDEBUG
-
-    if (!cfd->IsDropped()) {
-      // success
-      return cfd;
-    }
-
-    // no longer relevant, retry
-    if (cfd->Unref()) {
-      delete cfd;
-    }
+  if (cfd != nullptr) {
+    auto itr = column_families_set_.find(cfd);
+    assert(itr != column_families_set_.end());
+    column_families_set_.erase(itr);
  }
+#endif  // NDEBUG
+  return cfd;
 }

-bool FlushScheduler::Empty() {
-  auto rv = head_.load(std::memory_order_relaxed) == nullptr;
-  assert(rv == checking_set_.empty());
-  return rv;
-}
+bool FlushScheduler::Empty() { return column_families_.empty(); }

 void FlushScheduler::Clear() {
-  ColumnFamilyData* cfd;
-  while ((cfd = TakeNextColumnFamily()) != nullptr) {
+  for (auto cfd : column_families_) {
+#ifndef NDEBUG
+    auto itr = column_families_set_.find(cfd);
+    assert(itr != column_families_set_.end());
+    column_families_set_.erase(itr);
+#endif  // NDEBUG
    if (cfd->Unref()) {
      delete cfd;
    }
  }
-  assert(Empty());
+  column_families_.clear();
 }

 }  // namespace rocksdb
@@ -6,42 +6,34 @@
 #pragma once

 #include <stdint.h>
-#include <atomic>
-#include <mutex>
+#include <deque>
 #include <set>
+#include <vector>

 namespace rocksdb {

 class ColumnFamilyData;

-// Unless otherwise noted, all methods on FlushScheduler should be called
-// only with the DB mutex held or from a single-threaded recovery context.
+// This class is thread-compatible. It's should only be accessed from single
+// write thread (between BeginWrite() and EndWrite())
 class FlushScheduler {
 public:
-  FlushScheduler() : head_(nullptr) {}
+  FlushScheduler() = default;
+  ~FlushScheduler() = default;

-  // May be called from multiple threads at once, but not concurrent with
-  // any other method calls on this instance
  void ScheduleFlush(ColumnFamilyData* cfd);
-
-  // Removes and returns Ref()-ed column family. Client needs to Unref().
-  // Filters column families that have been dropped.
-  ColumnFamilyData* TakeNextColumnFamily();
+  // Returns Ref()-ed column family. Client needs to Unref()
+  // REQUIRES: db mutex is held (exception is single-threaded recovery)
+  ColumnFamilyData* GetNextColumnFamily();

  bool Empty();

  void Clear();

 private:
-  struct Node {
-    ColumnFamilyData* column_family;
-    Node* next;
-  };
-
-  std::atomic<Node*> head_;
+  std::deque<ColumnFamilyData*> column_families_;
 #ifndef NDEBUG
-  std::mutex checking_mutex_;
-  std::set<ColumnFamilyData*> checking_set_;
+  std::set<ColumnFamilyData*> column_families_set_;
 #endif  // NDEBUG
 };

@@ -262,7 +262,7 @@ void ForwardIterator::SeekInternal(const Slice& internal_key,
    }
    const VersionStorageInfo* vstorage = sv_->current->storage_info();
    const std::vector<FileMetaData*>& l0 = vstorage->LevelFiles(0);
-    for (size_t i = 0; i < l0.size(); ++i) {
+    for (uint32_t i = 0; i < l0.size(); ++i) {
      if (!l0_iters_[i]) {
        continue;
      }
@@ -521,7 +521,7 @@ void ForwardIterator::RenewIterators() {
  const auto& l0_files = vstorage->LevelFiles(0);
  const auto* vstorage_new = svnew->current->storage_info();
  const auto& l0_files_new = vstorage_new->LevelFiles(0);
-  size_t iold, inew;
+  uint32_t iold, inew;
  bool found;
  std::vector<InternalIterator*> l0_iters_new;
  l0_iters_new.reserve(l0_files_new.size());
@@ -589,7 +589,7 @@ void ForwardIterator::BuildLevelIterators(const VersionStorageInfo* vstorage) {

 void ForwardIterator::ResetIncompleteIterators() {
  const auto& l0_files = sv_->current->storage_info()->LevelFiles(0);
-  for (size_t i = 0; i < l0_iters_.size(); ++i) {
+  for (uint32_t i = 0; i < l0_iters_.size(); ++i) {
    assert(i < l0_files.size());
    if (!l0_iters_[i] || !l0_iters_[i]->status().IsIncomplete()) {
      continue;
@@ -680,7 +680,7 @@ bool ForwardIterator::NeedToSeekImmutable(const Slice& target) {
 void ForwardIterator::DeleteCurrentIter() {
  const VersionStorageInfo* vstorage = sv_->current->storage_info();
  const std::vector<FileMetaData*>& l0 = vstorage->LevelFiles(0);
-  for (size_t i = 0; i < l0.size(); ++i) {
+  for (uint32_t i = 0; i < l0.size(); ++i) {
    if (!l0_iters_[i]) {
      continue;
    }
@@ -712,7 +712,7 @@ bool ForwardIterator::TEST_CheckDeletedIters(int* pdeleted_iters,

  const VersionStorageInfo* vstorage = sv_->current->storage_info();
  const std::vector<FileMetaData*>& l0 = vstorage->LevelFiles(0);
-  for (size_t i = 0; i < l0.size(); ++i) {
+  for (uint32_t i = 0; i < l0.size(); ++i) {
    if (!l0_iters_[i]) {
      retval = true;
      deleted_iters++;
@@ -20,12 +20,10 @@
 //
 // Thread safety -------------
 //
-// Writes via Insert require external synchronization, most likely a mutex.
-// InsertConcurrently can be safely called concurrently with reads and
-// with other concurrent inserts.  Reads require a guarantee that the
-// InlineSkipList will not be destroyed while the read is in progress.
-// Apart from that, reads progress without any internal locking or
-// synchronization.
+// Writes require external synchronization, most likely a mutex.  Reads
+// require a guarantee that the InlineSkipList will not be destroyed while
+// the read is in progress.  Apart from that, reads progress without any
+// internal locking or synchronization.
 //
 // Invariants:
 //
@@ -65,21 +63,16 @@ class InlineSkipList {
                          int32_t max_height = 12,
                          int32_t branching_factor = 4);

-  // Allocates a key and a skip-list node, returning a pointer to the key
-  // portion of the node.  This method is thread-safe if the allocator
-  // is thread-safe.
+  // Allocates a key and a skip-list node, returning a pointer to the
+  // key portion of the node.
  char* AllocateKey(size_t key_size);

  // Inserts a key allocated by AllocateKey, after the actual key value
  // has been filled in.
  //
  // REQUIRES: nothing that compares equal to key is currently in the list.
-  // REQUIRES: no concurrent calls to INSERT
  void Insert(const char* key);

-  // Like Insert, but external synchronization is not required.
-  void InsertConcurrently(const char* key);
-
  // Returns true iff an entry that compares equal to key is in the list.
  bool Contains(const char* key) const;

@@ -131,8 +124,6 @@ class InlineSkipList {
  };

 private:
-  enum MaxPossibleHeightEnum : uint16_t { kMaxPossibleHeight = 32 };
-
  const uint16_t kMaxHeight_;
  const uint16_t kBranching_;
  const uint32_t kScaledInverseBranching_;
@@ -147,13 +138,12 @@ class InlineSkipList {
  // values are ok.
  std::atomic<int> max_height_;  // Height of the entire list

-  // Used for optimizing sequential insert patterns.  Tricky.  prev_height_
-  // of zero means prev_ is undefined.  Otherwise: prev_[i] for i up
-  // to max_height_ - 1 (inclusive) is the predecessor of prev_[0], and
-  // prev_height_ is the height of prev_[0].  prev_[0] can only be equal
-  // to head when max_height_ and prev_height_ are both 1.
+  // Used for optimizing sequential insert patterns.  Tricky.  prev_[i] for
+  // i up to max_height_ is the predecessor of prev_[0] and prev_height_
+  // is the height of prev_[0].  prev_[0] can only be equal to head before
+  // insertion, in which case max_height_ and prev_height_ are 1.
  Node** prev_;
-  std::atomic<int32_t> prev_height_;
+  int32_t prev_height_;

  inline int GetMaxHeight() const {
    return max_height_.load(std::memory_order_relaxed);
@@ -185,15 +175,6 @@ class InlineSkipList {
  // Return head_ if list is empty.
  Node* FindLast() const;

-  // Traverses a single level of the list, setting *out_prev to the last
-  // node before the key and *out_next to the first node after. Assumes
-  // that the key is not present in the skip list. On entry, before should
-  // point to a node that is before the key, and after should point to
-  // a node that is after the key.  after should be nullptr if a good after
-  // node isn't conveniently available.
-  void FindLevelSplice(const char* key, Node* before, Node* after, int level,
-                       Node** out_prev, Node** out_next);
-
  // No copying allowed
  InlineSkipList(const InlineSkipList&);
  InlineSkipList& operator=(const InlineSkipList&);
@@ -242,11 +223,6 @@ struct InlineSkipList<Comparator>::Node {
    next_[-n].store(x, std::memory_order_release);
  }

-  bool CASNext(int n, Node* expected, Node* x) {
-    assert(n >= 0);
-    return next_[-n].compare_exchange_strong(expected, x);
-  }
-
  // No-barrier variants that can be safely used in a few locations.
  Node* NoBarrier_Next(int n) {
    assert(n >= 0);
@@ -329,13 +305,11 @@ int InlineSkipList<Comparator>::RandomHeight() {

  // Increase height with probability 1 in kBranching
  int height = 1;
-  while (height < kMaxHeight_ && height < kMaxPossibleHeight &&
-         rnd->Next() < kScaledInverseBranching_) {
+  while (height < kMaxHeight_ && rnd->Next() < kScaledInverseBranching_) {
    height++;
  }
  assert(height > 0);
  assert(height <= kMaxHeight_);
-  assert(height <= kMaxPossibleHeight);
  return height;
 }

@@ -466,7 +440,7 @@ InlineSkipList<Comparator>::InlineSkipList(const Comparator cmp,
      max_height_(1),
      prev_height_(1) {
  assert(max_height > 0 && kMaxHeight_ == static_cast<uint32_t>(max_height));
-  assert(branching_factor > 1 &&
+  assert(branching_factor > 0 &&
         kBranching_ == static_cast<uint32_t>(branching_factor));
  assert(kScaledInverseBranching_ > 0);
  // Allocate the prev_ Node* array, directly from the passed-in allocator.
@@ -511,22 +485,16 @@ InlineSkipList<Comparator>::AllocateNode(size_t key_size, int height) {

 template <class Comparator>
 void InlineSkipList<Comparator>::Insert(const char* key) {
-  // InsertConcurrently often can't maintain the prev_ invariants, so
-  // it just sets prev_height_ to zero, letting us know that we should
-  // ignore it.  A relaxed load suffices here because write thread
-  // synchronization separates Insert calls from InsertConcurrently calls.
-  auto prev_height = prev_height_.load(std::memory_order_relaxed);
-
  // fast path for sequential insertion
-  if (prev_height > 0 && !KeyIsAfterNode(key, prev_[0]->NoBarrier_Next(0)) &&
+  if (!KeyIsAfterNode(key, prev_[0]->NoBarrier_Next(0)) &&
      (prev_[0] == head_ || KeyIsAfterNode(key, prev_[0]))) {
-    assert(prev_[0] != head_ || (prev_height == 1 && GetMaxHeight() == 1));
+    assert(prev_[0] != head_ || (prev_height_ == 1 && GetMaxHeight() == 1));

    // Outside of this method prev_[1..max_height_] is the predecessor
    // of prev_[0], and prev_height_ refers to prev_[0].  Inside Insert
    // prev_[0..max_height - 1] is the predecessor of key.  Switch from
    // the external state to the internal
-    for (int i = 1; i < prev_height; i++) {
+    for (int i = 1; i < prev_height_; i++) {
      prev_[i] = prev_[0];
    }
  } else {
@@ -566,82 +534,7 @@ void InlineSkipList<Comparator>::Insert(const char* key) {
    prev_[i]->SetNext(i, x);
  }
  prev_[0] = x;
-  prev_height_.store(height, std::memory_order_relaxed);
-}
-
-template <class Comparator>
-void InlineSkipList<Comparator>::FindLevelSplice(const char* key, Node* before,
-                                                 Node* after, int level,
-                                                 Node** out_prev,
-                                                 Node** out_next) {
-  while (true) {
-    Node* next = before->Next(level);
-    assert(before == head_ || next == nullptr ||
-           KeyIsAfterNode(next->Key(), before));
-    assert(before == head_ || KeyIsAfterNode(key, before));
-    if (next == after || !KeyIsAfterNode(key, next)) {
-      // found it
-      *out_prev = before;
-      *out_next = next;
-      return;
-    }
-    before = next;
-  }
-}
-
-template <class Comparator>
-void InlineSkipList<Comparator>::InsertConcurrently(const char* key) {
-  Node* x = reinterpret_cast<Node*>(const_cast<char*>(key)) - 1;
-  int height = x->UnstashHeight();
-  assert(height >= 1 && height <= kMaxHeight_);
-
-  // We don't have a lock-free algorithm for updating prev_, but we do have
-  // the option of invalidating the entire sequential-insertion cache.
-  // prev_'s invariant is that prev_[i] (i > 0) is the predecessor of
-  // prev_[0] at that level.  We're only going to violate that if height
-  // > 1 and key lands after prev_[height - 1] but before prev_[0].
-  // Comparisons are pretty expensive, so an easier version is to just
-  // clear the cache if height > 1.  We only write to prev_height_ if the
-  // nobody else has, to avoid invalidating the root of the skip list in
-  // all of the other CPU caches.
-  if (height > 1 && prev_height_.load(std::memory_order_relaxed) != 0) {
-    prev_height_.store(0, std::memory_order_relaxed);
-  }
-
-  int max_height = max_height_.load(std::memory_order_relaxed);
-  while (height > max_height) {
-    if (max_height_.compare_exchange_strong(max_height, height)) {
-      // successfully updated it
-      max_height = height;
-      break;
-    }
-    // else retry, possibly exiting the loop because somebody else
-    // increased it
-  }
-  assert(max_height <= kMaxPossibleHeight);
-
-  Node* prev[kMaxPossibleHeight + 1];
-  Node* next[kMaxPossibleHeight + 1];
-  prev[max_height] = head_;
-  next[max_height] = nullptr;
-  for (int i = max_height - 1; i >= 0; --i) {
-    FindLevelSplice(key, prev[i + 1], next[i + 1], i, &prev[i], &next[i]);
-  }
-  for (int i = 0; i < height; ++i) {
-    while (true) {
-      x->NoBarrier_SetNext(i, next[i]);
-      if (prev[i]->CASNext(i, next[i], x)) {
-        // success
-        break;
-      }
-      // CAS failed, we need to recompute prev and next. It is unlikely
-      // to be helpful to try to use a different level as we redo the
-      // search, because it should be unlikely that lots of nodes have
-      // been inserted between prev[i] and next[i]. No point in using
-      // next[i] as the after hint, because we know it is stale.
-      FindLevelSplice(key, prev[i], nullptr, i, &prev[i], &next[i]);
-    }
-  }
+  prev_height_ = height;
 }

 template <class Comparator>
@@ -10,7 +10,7 @@
 #include "db/inlineskiplist.h"
 #include <set>
 #include "rocksdb/env.h"
-#include "util/concurrent_arena.h"
+#include "util/arena.h"
 #include "util/hash.h"
 #include "util/random.h"
 #include "util/testharness.h"
@@ -67,7 +67,7 @@ TEST_F(InlineSkipTest, InsertAndLookup) {
  const int R = 5000;
  Random rnd(1000);
  std::set<Key> keys;
-  ConcurrentArena arena;
+  Arena arena;
  TestComparator cmp;
  InlineSkipList<TestComparator> list(cmp, &arena);
  for (int i = 0; i < N; i++) {
@@ -167,10 +167,9 @@ TEST_F(InlineSkipTest, InsertAndLookup) {
 // check that it is either expected given the initial snapshot or has
 // been concurrently added since the iterator started.
 class ConcurrentTest {
- public:
-  static const uint32_t K = 8;
-
 private:
+  static const uint32_t K = 4;
+
  static uint64_t key(Key key) { return (key >> 40); }
  static uint64_t gen(Key key) { return (key >> 8) & 0xffffffffu; }
  static uint64_t hash(Key key) { return key & 0xff; }
@@ -223,7 +222,7 @@ class ConcurrentTest {
  // Current state of the test
  State current_;

-  ConcurrentArena arena_;
+  Arena arena_;

  // InlineSkipList is not protected by mu_.  We just use a single writer
  // thread to modify it.
@@ -232,7 +231,7 @@ class ConcurrentTest {
 public:
  ConcurrentTest() : list_(TestComparator(), &arena_) {}

-  // REQUIRES: No concurrent calls to WriteStep or ConcurrentWriteStep
+  // REQUIRES: External synchronization
  void WriteStep(Random* rnd) {
    const uint32_t k = rnd->Next() % K;
    const int g = current_.Get(k) + 1;
@@ -243,17 +242,6 @@ class ConcurrentTest {
    current_.Set(k, g);
  }

-  // REQUIRES: No concurrent calls for the same k
-  void ConcurrentWriteStep(uint32_t k) {
-    const int g = current_.Get(k) + 1;
-    const Key new_key = MakeKey(k, g);
-    char* buf = list_.AllocateKey(sizeof(Key));
-    memcpy(buf, &new_key, sizeof(Key));
-    list_.InsertConcurrently(buf);
-    ASSERT_EQ(g, current_.Get(k) + 1);
-    current_.Set(k, g);
-  }
-
  void ReadStep(Random* rnd) {
    // Remember the initial committed state of the skiplist.
    State initial_state;
@@ -316,7 +304,7 @@ const uint32_t ConcurrentTest::K;

 // Simple test that does single-threaded testing of the ConcurrentTest
 // scaffolding.
-TEST_F(InlineSkipTest, ConcurrentReadWithoutThreads) {
+TEST_F(InlineSkipTest, ConcurrentWithoutThreads) {
  ConcurrentTest test;
  Random rnd(test::RandomSeed());
  for (int i = 0; i < 10000; i++) {
@@ -325,33 +313,16 @@ TEST_F(InlineSkipTest, ConcurrentReadWithoutThreads) {
  }
 }

-TEST_F(InlineSkipTest, ConcurrentInsertWithoutThreads) {
-  ConcurrentTest test;
-  Random rnd(test::RandomSeed());
-  for (int i = 0; i < 10000; i++) {
-    test.ReadStep(&rnd);
-    uint32_t base = rnd.Next();
-    for (int j = 0; j < 4; ++j) {
-      test.ConcurrentWriteStep((base + j) % ConcurrentTest::K);
-    }
-  }
-}
-
 class TestState {
 public:
  ConcurrentTest t_;
  int seed_;
  std::atomic<bool> quit_flag_;
-  std::atomic<uint32_t> next_writer_;

  enum ReaderState { STARTING, RUNNING, DONE };

  explicit TestState(int s)
-      : seed_(s),
-        quit_flag_(false),
-        state_(STARTING),
-        pending_writers_(0),
-        state_cv_(&mu_) {}
+      : seed_(s), quit_flag_(false), state_(STARTING), state_cv_(&mu_) {}

  void Wait(ReaderState s) {
    mu_.Lock();
@@ -368,27 +339,9 @@ class TestState {
    mu_.Unlock();
  }

-  void AdjustPendingWriters(int delta) {
-    mu_.Lock();
-    pending_writers_ += delta;
-    if (pending_writers_ == 0) {
-      state_cv_.Signal();
-    }
-    mu_.Unlock();
-  }
-
-  void WaitForPendingWriters() {
-    mu_.Lock();
-    while (pending_writers_ != 0) {
-      state_cv_.Wait();
-    }
-    mu_.Unlock();
-  }
-
 private:
  port::Mutex mu_;
  ReaderState state_;
-  int pending_writers_;
  port::CondVar state_cv_;
 };

@@ -404,14 +357,7 @@ static void ConcurrentReader(void* arg) {
  state->Change(TestState::DONE);
 }

-static void ConcurrentWriter(void* arg) {
-  TestState* state = reinterpret_cast<TestState*>(arg);
-  uint32_t k = state->next_writer_++ % ConcurrentTest::K;
-  state->t_.ConcurrentWriteStep(k);
-  state->AdjustPendingWriters(-1);
-}
-
-static void RunConcurrentRead(int run) {
+static void RunConcurrent(int run) {
  const int seed = test::RandomSeed() + (run * 100);
  Random rnd(seed);
  const int N = 1000;
@@ -423,7 +369,7 @@ static void RunConcurrentRead(int run) {
    TestState state(seed + 1);
    Env::Default()->Schedule(ConcurrentReader, &state);
    state.Wait(TestState::RUNNING);
-    for (int k = 0; k < kSize; ++k) {
+    for (int k = 0; k < kSize; k++) {
      state.t_.WriteStep(&rnd);
    }
    state.quit_flag_.store(true, std::memory_order_release);
@@ -431,41 +377,11 @@ static void RunConcurrentRead(int run) {
  }
 }

-static void RunConcurrentInsert(int run, int write_parallelism = 4) {
-  Env::Default()->SetBackgroundThreads(1 + write_parallelism,
-                                       Env::Priority::LOW);
-  const int seed = test::RandomSeed() + (run * 100);
-  Random rnd(seed);
-  const int N = 1000;
-  const int kSize = 1000;
-  for (int i = 0; i < N; i++) {
-    if ((i % 100) == 0) {
-      fprintf(stderr, "Run %d of %d\n", i, N);
-    }
-    TestState state(seed + 1);
-    Env::Default()->Schedule(ConcurrentReader, &state);
-    state.Wait(TestState::RUNNING);
-    for (int k = 0; k < kSize; k += write_parallelism) {
-      state.next_writer_ = rnd.Next();
-      state.AdjustPendingWriters(write_parallelism);
-      for (int p = 0; p < write_parallelism; ++p) {
-        Env::Default()->Schedule(ConcurrentWriter, &state);
-      }
-      state.WaitForPendingWriters();
-    }
-    state.quit_flag_.store(true, std::memory_order_release);
-    state.Wait(TestState::DONE);
-  }
-}
-
-TEST_F(InlineSkipTest, ConcurrentRead1) { RunConcurrentRead(1); }
-TEST_F(InlineSkipTest, ConcurrentRead2) { RunConcurrentRead(2); }
-TEST_F(InlineSkipTest, ConcurrentRead3) { RunConcurrentRead(3); }
-TEST_F(InlineSkipTest, ConcurrentRead4) { RunConcurrentRead(4); }
-TEST_F(InlineSkipTest, ConcurrentRead5) { RunConcurrentRead(5); }
-TEST_F(InlineSkipTest, ConcurrentInsert1) { RunConcurrentInsert(1); }
-TEST_F(InlineSkipTest, ConcurrentInsert2) { RunConcurrentInsert(2); }
-TEST_F(InlineSkipTest, ConcurrentInsert3) { RunConcurrentInsert(3); }
+TEST_F(InlineSkipTest, Concurrent1) { RunConcurrent(1); }
+TEST_F(InlineSkipTest, Concurrent2) { RunConcurrent(2); }
+TEST_F(InlineSkipTest, Concurrent3) { RunConcurrent(3); }
+TEST_F(InlineSkipTest, Concurrent4) { RunConcurrent(4); }
+TEST_F(InlineSkipTest, Concurrent5) { RunConcurrent(5); }

 }  // namespace rocksdb

@@ -15,7 +15,6 @@
 #include <inttypes.h>
 #include <string>
 #include <algorithm>
-#include <utility>
 #include <vector>
 #include "db/column_family.h"

@@ -36,7 +35,8 @@ void PrintLevelStatsHeader(char* buf, size_t len, const std::string& cf_name) {
      "\n** Compaction Stats [%s] **\n"
      "Level    Files   Size(MB) Score Read(GB)  Rn(GB) Rnp1(GB) "
      "Write(GB) Wnew(GB) Moved(GB) W-Amp Rd(MB/s) Wr(MB/s) "
-      "Comp(sec) Comp(cnt) Avg(sec) KeyIn KeyDrop\n"
+      "Comp(sec) Comp(cnt) Avg(sec) "
+      "Stall(cnt)  KeyIn KeyDrop\n"
      "--------------------------------------------------------------------"
      "-----------------------------------------------------------"
      "--------------------------------------\n",
@@ -44,9 +44,9 @@ void PrintLevelStatsHeader(char* buf, size_t len, const std::string& cf_name) {
 }

 void PrintLevelStats(char* buf, size_t len, const std::string& name,
-  int num_files, int being_compacted, double total_file_size,
-  double score, double w_amp,
-  const InternalStats::CompactionStats& stats) {
+    int num_files, int being_compacted, double total_file_size, double score,
+    double w_amp, uint64_t stalls,
+    const InternalStats::CompactionStats& stats) {
  uint64_t bytes_read =
      stats.bytes_read_non_output_levels + stats.bytes_read_output_level;
  int64_t bytes_new =
@@ -70,6 +70,8 @@ void PrintLevelStats(char* buf, size_t len, const std::string& name,
           "%9.0f "                    /* Comp(sec) */
           "%9d "                      /* Comp(cnt) */
           "%8.3f "                    /* Avg(sec) */
+           "%10" PRIu64
+           " "      /* Stall(cnt) */
           "%7s "   /* KeyIn */
           "%6s\n", /* KeyDrop */
           name.c_str(),
@@ -80,23 +82,9 @@ void PrintLevelStats(char* buf, size_t len, const std::string& name,
           bytes_read / kMB / elapsed, stats.bytes_written / kMB / elapsed,
           stats.micros / kMicrosInSec, stats.count,
           stats.count == 0 ? 0 : stats.micros / kMicrosInSec / stats.count,
-           num_input_records.c_str(), num_dropped_records.c_str());
+           stalls, num_input_records.c_str(), num_dropped_records.c_str());
 }
-
-// Assumes that trailing numbers represent an optional argument. This requires
-// property names to not end with numbers.
-std::pair<Slice, Slice> GetPropertyNameAndArg(const Slice& property) {
-  Slice name = property, arg = property;
-  size_t sfx_len = 0;
-  while (sfx_len < property.size() &&
-         isdigit(property[property.size() - sfx_len - 1])) {
-    ++sfx_len;
-  }
-  name.remove_suffix(sfx_len);
-  arg.remove_prefix(property.size() - sfx_len);
-  return {name, arg};
 }
-}  // anonymous namespace

 static const std::string rocksdb_prefix = "rocksdb.";

@@ -114,8 +102,9 @@ static const std::string compaction_pending = "compaction-pending";
 static const std::string background_errors = "background-errors";
 static const std::string cur_size_active_mem_table =
                          "cur-size-active-mem-table";
-static const std::string cur_size_all_mem_tables = "cur-size-all-mem-tables";
-static const std::string size_all_mem_tables = "size-all-mem-tables";
+static const std::string cur_size_unflushed_mem_tables =
+    "cur-size-all-mem-tables";
+static const std::string cur_size_all_mem_tables = "size-all-mem-tables";
 static const std::string num_entries_active_mem_table =
                          "num-entries-active-mem-table";
 static const std::string num_entries_imm_mem_tables =
@@ -150,11 +139,8 @@ const std::string DB::Properties::kStats = rocksdb_prefix + allstats;
 const std::string DB::Properties::kSSTables = rocksdb_prefix + sstables;
 const std::string DB::Properties::kCFStats = rocksdb_prefix + cfstats;
 const std::string DB::Properties::kDBStats = rocksdb_prefix + dbstats;
-const std::string DB::Properties::kLevelStats = rocksdb_prefix + levelstats;
 const std::string DB::Properties::kNumImmutableMemTable =
                      rocksdb_prefix + num_immutable_mem_table;
-const std::string DB::Properties::kNumImmutableMemTableFlushed =
-    rocksdb_prefix + num_immutable_mem_table_flushed;
 const std::string DB::Properties::kMemTableFlushPending =
                      rocksdb_prefix + mem_table_flush_pending;
 const std::string DB::Properties::kCompactionPending =
@@ -168,9 +154,9 @@ const std::string DB::Properties::kBackgroundErrors =
 const std::string DB::Properties::kCurSizeActiveMemTable =
                      rocksdb_prefix + cur_size_active_mem_table;
 const std::string DB::Properties::kCurSizeAllMemTables =
-    rocksdb_prefix + cur_size_all_mem_tables;
+    rocksdb_prefix + cur_size_unflushed_mem_tables;
 const std::string DB::Properties::kSizeAllMemTables =
-    rocksdb_prefix + size_all_mem_tables;
+    rocksdb_prefix + cur_size_all_mem_tables;
 const std::string DB::Properties::kNumEntriesActiveMemTable =
                      rocksdb_prefix + num_entries_active_mem_table;
 const std::string DB::Properties::kNumEntriesImmMemTables =
@@ -195,7 +181,6 @@ const std::string DB::Properties::kEstimateLiveDataSize =
                      rocksdb_prefix + estimate_live_data_size;
 const std::string DB::Properties::kTotalSstFilesSize =
                      rocksdb_prefix + total_sst_files_size;
-const std::string DB::Properties::kBaseLevel = rocksdb_prefix + base_level;
 const std::string DB::Properties::kEstimatePendingCompactionBytes =
    rocksdb_prefix + estimate_pending_comp_bytes;
 const std::string DB::Properties::kAggregatedTableProperties =
@@ -203,360 +188,294 @@ const std::string DB::Properties::kAggregatedTableProperties =
 const std::string DB::Properties::kAggregatedTablePropertiesAtLevel =
    rocksdb_prefix + aggregated_table_properties_at_level;

-const std::unordered_map<std::string,
-                         DBPropertyInfo> InternalStats::ppt_name_to_info = {
-    {DB::Properties::kNumFilesAtLevelPrefix,
-     {false, &InternalStats::HandleNumFilesAtLevel, nullptr}},
-    {DB::Properties::kLevelStats,
-     {false, &InternalStats::HandleLevelStats, nullptr}},
-    {DB::Properties::kStats, {false, &InternalStats::HandleStats, nullptr}},
-    {DB::Properties::kCFStats, {false, &InternalStats::HandleCFStats, nullptr}},
-    {DB::Properties::kDBStats, {false, &InternalStats::HandleDBStats, nullptr}},
-    {DB::Properties::kSSTables,
-     {false, &InternalStats::HandleSsTables, nullptr}},
-    {DB::Properties::kAggregatedTableProperties,
-     {false, &InternalStats::HandleAggregatedTableProperties, nullptr}},
-    {DB::Properties::kAggregatedTablePropertiesAtLevel,
-     {false, &InternalStats::HandleAggregatedTablePropertiesAtLevel, nullptr}},
-    {DB::Properties::kNumImmutableMemTable,
-     {false, nullptr, &InternalStats::HandleNumImmutableMemTable}},
-    {DB::Properties::kNumImmutableMemTableFlushed,
-     {false, nullptr, &InternalStats::HandleNumImmutableMemTableFlushed}},
-    {DB::Properties::kMemTableFlushPending,
-     {false, nullptr, &InternalStats::HandleMemTableFlushPending}},
-    {DB::Properties::kCompactionPending,
-     {false, nullptr, &InternalStats::HandleCompactionPending}},
-    {DB::Properties::kBackgroundErrors,
-     {false, nullptr, &InternalStats::HandleBackgroundErrors}},
-    {DB::Properties::kCurSizeActiveMemTable,
-     {false, nullptr, &InternalStats::HandleCurSizeActiveMemTable}},
-    {DB::Properties::kCurSizeAllMemTables,
-     {false, nullptr, &InternalStats::HandleCurSizeAllMemTables}},
-    {DB::Properties::kSizeAllMemTables,
-     {false, nullptr, &InternalStats::HandleSizeAllMemTables}},
-    {DB::Properties::kNumEntriesActiveMemTable,
-     {false, nullptr, &InternalStats::HandleNumEntriesActiveMemTable}},
-    {DB::Properties::kNumEntriesImmMemTables,
-     {false, nullptr, &InternalStats::HandleNumEntriesImmMemTables}},
-    {DB::Properties::kNumDeletesActiveMemTable,
-     {false, nullptr, &InternalStats::HandleNumDeletesActiveMemTable}},
-    {DB::Properties::kNumDeletesImmMemTables,
-     {false, nullptr, &InternalStats::HandleNumDeletesImmMemTables}},
-    {DB::Properties::kEstimateNumKeys,
-     {false, nullptr, &InternalStats::HandleEstimateNumKeys}},
-    {DB::Properties::kEstimateTableReadersMem,
-     {true, nullptr, &InternalStats::HandleEstimateTableReadersMem}},
-    {DB::Properties::kIsFileDeletionsEnabled,
-     {false, nullptr, &InternalStats::HandleIsFileDeletionsEnabled}},
-    {DB::Properties::kNumSnapshots,
-     {false, nullptr, &InternalStats::HandleNumSnapshots}},
-    {DB::Properties::kOldestSnapshotTime,
-     {false, nullptr, &InternalStats::HandleOldestSnapshotTime}},
-    {DB::Properties::kNumLiveVersions,
-     {false, nullptr, &InternalStats::HandleNumLiveVersions}},
-    {DB::Properties::kEstimateLiveDataSize,
-     {true, nullptr, &InternalStats::HandleEstimateLiveDataSize}},
-    {DB::Properties::kBaseLevel,
-     {false, nullptr, &InternalStats::HandleBaseLevel}},
-    {DB::Properties::kTotalSstFilesSize,
-     {false, nullptr, &InternalStats::HandleTotalSstFilesSize}},
-    {DB::Properties::kEstimatePendingCompactionBytes,
-     {false, nullptr, &InternalStats::HandleEstimatePendingCompactionBytes}},
-    {DB::Properties::kNumRunningFlushes,
-     {false, nullptr, &InternalStats::HandleNumRunningFlushes}},
-    {DB::Properties::kNumRunningCompactions,
-     {false, nullptr, &InternalStats::HandleNumRunningCompactions}},
-};
-
-const DBPropertyInfo* GetPropertyInfo(const Slice& property) {
-  std::string ppt_name = GetPropertyNameAndArg(property).first.ToString();
-  auto ppt_info_iter = InternalStats::ppt_name_to_info.find(ppt_name);
-  if (ppt_info_iter == InternalStats::ppt_name_to_info.end()) {
-    return nullptr;
+DBPropertyType GetPropertyType(const Slice& property, bool* is_int_property,
+                               bool* need_out_of_mutex) {
+  assert(is_int_property != nullptr);
+  assert(need_out_of_mutex != nullptr);
+  Slice in = property;
+  Slice prefix(rocksdb_prefix);
+  *need_out_of_mutex = false;
+  *is_int_property = false;
+  if (!in.starts_with(prefix)) {
+    return kUnknown;
  }
-  return &ppt_info_iter->second;
+  in.remove_prefix(prefix.size());
+
+  if (in.starts_with(num_files_at_level_prefix)) {
+    return kNumFilesAtLevel;
+  } else if (in == levelstats) {
+    return kLevelStats;
+  } else if (in == allstats) {
+    return kStats;
+  } else if (in == cfstats) {
+    return kCFStats;
+  } else if (in == dbstats) {
+    return kDBStats;
+  } else if (in == sstables) {
+    return kSsTables;
+  } else if (in == aggregated_table_properties) {
+    return kAggregatedTableProperties;
+  } else if (in.starts_with(aggregated_table_properties_at_level)) {
+    return kAggregatedTablePropertiesAtLevel;
+  }
+
+  *is_int_property = true;
+  if (in == num_immutable_mem_table) {
+    return kNumImmutableMemTable;
+  } else if (in == num_immutable_mem_table_flushed) {
+    return kNumImmutableMemTableFlushed;
+  } else if (in == mem_table_flush_pending) {
+    return kMemtableFlushPending;
+  } else if (in == compaction_pending) {
+    return kCompactionPending;
+  } else if (in == background_errors) {
+    return kBackgroundErrors;
+  } else if (in == cur_size_active_mem_table) {
+    return kCurSizeActiveMemTable;
+  } else if (in == cur_size_unflushed_mem_tables) {
+    return kCurSizeAllMemTables;
+  } else if (in == cur_size_all_mem_tables) {
+    return kSizeAllMemTables;
+  } else if (in == num_entries_active_mem_table) {
+    return kNumEntriesInMutableMemtable;
+  } else if (in == num_entries_imm_mem_tables) {
+    return kNumEntriesInImmutableMemtable;
+  } else if (in == num_deletes_active_mem_table) {
+    return kNumDeletesInMutableMemtable;
+  } else if (in == num_deletes_imm_mem_tables) {
+    return kNumDeletesInImmutableMemtable;
+  } else if (in == estimate_num_keys) {
+    return kEstimatedNumKeys;
+  } else if (in == estimate_table_readers_mem) {
+    *need_out_of_mutex = true;
+    return kEstimatedUsageByTableReaders;
+  } else if (in == is_file_deletions_enabled) {
+    return kIsFileDeletionEnabled;
+  } else if (in == num_snapshots) {
+    return kNumSnapshots;
+  } else if (in == oldest_snapshot_time) {
+    return kOldestSnapshotTime;
+  } else if (in == num_live_versions) {
+    return kNumLiveVersions;
+  } else if (in == estimate_live_data_size) {
+    *need_out_of_mutex = true;
+    return kEstimateLiveDataSize;
+  } else if (in == base_level) {
+    return kBaseLevel;
+  } else if (in == total_sst_files_size) {
+    return kTotalSstFilesSize;
+  } else if (in == estimate_pending_comp_bytes) {
+    return kEstimatePendingCompactionBytes;
+  } else if (in == num_running_flushes) {
+    return kNumRunningFlushes;
+  } else if (in == num_running_compactions) {
+    return kNumRunningCompactions;
+  }
+  return kUnknown;
 }

-bool InternalStats::GetStringProperty(const DBPropertyInfo& property_info,
+bool InternalStats::GetIntPropertyOutOfMutex(DBPropertyType property_type,
+                                             Version* version,
+                                             uint64_t* value) const {
+  assert(value != nullptr);
+  const auto* vstorage = cfd_->current()->storage_info();
+
+  switch (property_type) {
+    case kEstimatedUsageByTableReaders:
+      *value = (version == nullptr) ?
+        0 : version->GetMemoryUsageByTableReaders();
+      return true;
+    case kEstimateLiveDataSize:
+      *value = vstorage->EstimateLiveDataSize();
+      return true;
+    default:
+      return false;
+  }
+}
+
+bool InternalStats::GetStringProperty(DBPropertyType property_type,
                                      const Slice& property,
                                      std::string* value) {
  assert(value != nullptr);
-  assert(property_info.handle_string != nullptr);
-  Slice arg = GetPropertyNameAndArg(property).second;
-  return (this->*(property_info.handle_string))(value, arg);
-}
-
-bool InternalStats::GetIntProperty(const DBPropertyInfo& property_info,
-                                   uint64_t* value, DBImpl* db) {
-  assert(value != nullptr);
-  assert(property_info.handle_int != nullptr &&
-         !property_info.need_out_of_mutex);
-  db->mutex_.AssertHeld();
-  return (this->*(property_info.handle_int))(value, db, nullptr /* version */);
-}
-
-bool InternalStats::GetIntPropertyOutOfMutex(
-    const DBPropertyInfo& property_info, Version* version, uint64_t* value) {
-  assert(value != nullptr);
-  assert(property_info.handle_int != nullptr &&
-         property_info.need_out_of_mutex);
-  return (this->*(property_info.handle_int))(value, nullptr /* db */, version);
-}
-
-bool InternalStats::HandleNumFilesAtLevel(std::string* value, Slice suffix) {
-  uint64_t level;
-  const auto* vstorage = cfd_->current()->storage_info();
-  bool ok = ConsumeDecimalNumber(&suffix, &level) && suffix.empty();
-  if (!ok || static_cast<int>(level) >= number_levels_) {
-    return false;
-  } else {
-    char buf[100];
-    snprintf(buf, sizeof(buf), "%d",
-             vstorage->NumLevelFiles(static_cast<int>(level)));
-    *value = buf;
-    return true;
-  }
-}
-
-bool InternalStats::HandleLevelStats(std::string* value, Slice suffix) {
-  char buf[1000];
-  const auto* vstorage = cfd_->current()->storage_info();
-  snprintf(buf, sizeof(buf),
-           "Level Files Size(MB)\n"
-           "--------------------\n");
-  value->append(buf);
-
-  for (int level = 0; level < number_levels_; level++) {
-    snprintf(buf, sizeof(buf), "%3d %8d %8.0f\n", level,
-             vstorage->NumLevelFiles(level),
-             vstorage->NumLevelBytes(level) / kMB);
-    value->append(buf);
-  }
-  return true;
-}
-
-bool InternalStats::HandleStats(std::string* value, Slice suffix) {
-  if (!HandleCFStats(value, suffix)) {
-    return false;
-  }
-  if (!HandleDBStats(value, suffix)) {
-    return false;
-  }
-  return true;
-}
-
-bool InternalStats::HandleCFStats(std::string* value, Slice suffix) {
-  DumpCFStats(value);
-  return true;
-}
-
-bool InternalStats::HandleDBStats(std::string* value, Slice suffix) {
-  DumpDBStats(value);
-  return true;
-}
-
-bool InternalStats::HandleSsTables(std::string* value, Slice suffix) {
  auto* current = cfd_->current();
-  *value = current->DebugString();
-  return true;
-}
+  const auto* vstorage = current->storage_info();
+  Slice in = property;

-bool InternalStats::HandleAggregatedTableProperties(std::string* value,
-                                                    Slice suffix) {
-  std::shared_ptr<const TableProperties> tp;
-  auto s = cfd_->current()->GetAggregatedTableProperties(&tp);
-  if (!s.ok()) {
-    return false;
+  switch (property_type) {
+    case kNumFilesAtLevel: {
+      in.remove_prefix(strlen("rocksdb.num-files-at-level"));
+      uint64_t level;
+      bool ok = ConsumeDecimalNumber(&in, &level) && in.empty();
+      if (!ok || (int)level >= number_levels_) {
+        return false;
+      } else {
+        char buf[100];
+        snprintf(buf, sizeof(buf), "%d",
+                 vstorage->NumLevelFiles(static_cast<int>(level)));
+        *value = buf;
+        return true;
+      }
+    }
+    case kLevelStats: {
+      char buf[1000];
+      snprintf(buf, sizeof(buf),
+               "Level Files Size(MB)\n"
+               "--------------------\n");
+      value->append(buf);
+
+      for (int level = 0; level < number_levels_; level++) {
+        snprintf(buf, sizeof(buf), "%3d %8d %8.0f\n", level,
+                 vstorage->NumLevelFiles(level),
+                 vstorage->NumLevelBytes(level) / kMB);
+        value->append(buf);
+      }
+      return true;
+    }
+    case kStats: {
+      if (!GetStringProperty(kCFStats, DB::Properties::kCFStats, value)) {
+        return false;
+      }
+      if (!GetStringProperty(kDBStats, DB::Properties::kDBStats, value)) {
+        return false;
+      }
+      return true;
+    }
+    case kCFStats: {
+      DumpCFStats(value);
+      return true;
+    }
+    case kDBStats: {
+      DumpDBStats(value);
+      return true;
+    }
+    case kSsTables:
+      *value = current->DebugString();
+      return true;
+    case kAggregatedTableProperties: {
+      std::shared_ptr<const TableProperties> tp;
+      auto s = cfd_->current()->GetAggregatedTableProperties(&tp);
+      if (!s.ok()) {
+        return false;
+      }
+      *value = tp->ToString();
+      return true;
+    }
+    case kAggregatedTablePropertiesAtLevel: {
+      in.remove_prefix(
+          DB::Properties::kAggregatedTablePropertiesAtLevel.length());
+      uint64_t level;
+      bool ok = ConsumeDecimalNumber(&in, &level) && in.empty();
+      if (!ok || static_cast<int>(level) >= number_levels_) {
+        return false;
+      }
+      std::shared_ptr<const TableProperties> tp;
+      auto s = cfd_->current()->GetAggregatedTableProperties(
+          &tp, static_cast<int>(level));
+      if (!s.ok()) {
+        return false;
+      }
+      *value = tp->ToString();
+      return true;
+    }
+    default:
+      return false;
  }
-  *value = tp->ToString();
-  return true;
 }

-bool InternalStats::HandleAggregatedTablePropertiesAtLevel(std::string* value,
-                                                           Slice suffix) {
-  uint64_t level;
-  bool ok = ConsumeDecimalNumber(&suffix, &level) && suffix.empty();
-  if (!ok || static_cast<int>(level) >= number_levels_) {
-    return false;
+bool InternalStats::GetIntProperty(DBPropertyType property_type,
+                                   uint64_t* value, DBImpl* db) const {
+  db->mutex_.AssertHeld();
+  const auto* vstorage = cfd_->current()->storage_info();
+
+  switch (property_type) {
+    case kNumImmutableMemTable:
+      *value = cfd_->imm()->NumNotFlushed();
+      return true;
+    case kNumImmutableMemTableFlushed:
+      *value = cfd_->imm()->NumFlushed();
+      return true;
+    case kMemtableFlushPending:
+      // Return number of mem tables that are ready to flush (made immutable)
+      *value = (cfd_->imm()->IsFlushPending() ? 1 : 0);
+      return true;
+    case kNumRunningFlushes:
+      *value = db->num_running_flushes();
+      return true;
+    case kCompactionPending:
+      // 1 if the system already determines at least one compaction is needed.
+      // 0 otherwise,
+      *value = (cfd_->compaction_picker()->NeedsCompaction(vstorage) ? 1 : 0);
+      return true;
+    case kNumRunningCompactions:
+      *value = db->num_running_compactions_;
+      return true;
+    case kBackgroundErrors:
+      // Accumulated number of  errors in background flushes or compactions.
+      *value = GetBackgroundErrorCount();
+      return true;
+    case kCurSizeActiveMemTable:
+      // Current size of the active memtable
+      *value = cfd_->mem()->ApproximateMemoryUsage();
+      return true;
+    case kCurSizeAllMemTables:
+      // Current size of the active memtable + immutable memtables
+      *value = cfd_->mem()->ApproximateMemoryUsage() +
+               cfd_->imm()->ApproximateUnflushedMemTablesMemoryUsage();
+      return true;
+    case kSizeAllMemTables:
+      *value = cfd_->mem()->ApproximateMemoryUsage() +
+               cfd_->imm()->ApproximateMemoryUsage();
+      return true;
+    case kNumEntriesInMutableMemtable:
+      // Current number of entires in the active memtable
+      *value = cfd_->mem()->num_entries();
+      return true;
+    case kNumEntriesInImmutableMemtable:
+      // Current number of entries in the immutable memtables
+      *value = cfd_->imm()->current()->GetTotalNumEntries();
+      return true;
+    case kNumDeletesInMutableMemtable:
+      // Current number of entires in the active memtable
+      *value = cfd_->mem()->num_deletes();
+      return true;
+    case kNumDeletesInImmutableMemtable:
+      // Current number of entries in the immutable memtables
+      *value = cfd_->imm()->current()->GetTotalNumDeletes();
+      return true;
+    case kEstimatedNumKeys:
+      // Estimate number of entries in the column family:
+      // Use estimated entries in tables + total entries in memtables.
+      *value = cfd_->mem()->num_entries() +
+               cfd_->imm()->current()->GetTotalNumEntries() -
+               (cfd_->mem()->num_deletes() +
+                cfd_->imm()->current()->GetTotalNumDeletes()) *
+                   2 +
+               vstorage->GetEstimatedActiveKeys();
+      return true;
+    case kNumSnapshots:
+      *value = db->snapshots().count();
+      return true;
+    case kOldestSnapshotTime:
+      *value = static_cast<uint64_t>(db->snapshots().GetOldestSnapshotTime());
+      return true;
+    case kNumLiveVersions:
+      *value = cfd_->GetNumLiveVersions();
+      return true;
+    case kIsFileDeletionEnabled:
+      *value = db->IsFileDeletionsEnabled();
+      return true;
+    case kBaseLevel:
+      *value = vstorage->base_level();
+      return true;
+    case kTotalSstFilesSize:
+      *value = cfd_->GetTotalSstFilesSize();
+      return true;
+    case kEstimatePendingCompactionBytes:
+      *value = vstorage->estimated_compaction_needed_bytes();
+      return true;
+    default:
+      return false;
  }
-  std::shared_ptr<const TableProperties> tp;
-  auto s = cfd_->current()->GetAggregatedTableProperties(
-      &tp, static_cast<int>(level));
-  if (!s.ok()) {
-    return false;
-  }
-  *value = tp->ToString();
-  return true;
-}
-
-bool InternalStats::HandleNumImmutableMemTable(uint64_t* value, DBImpl* db,
-                                               Version* version) {
-  *value = cfd_->imm()->NumNotFlushed();
-  return true;
-}
-
-bool InternalStats::HandleNumImmutableMemTableFlushed(uint64_t* value,
-                                                      DBImpl* db,
-                                                      Version* version) {
-  *value = cfd_->imm()->NumFlushed();
-  return true;
-}
-
-bool InternalStats::HandleMemTableFlushPending(uint64_t* value, DBImpl* db,
-                                               Version* version) {
-  // Return number of mem tables that are ready to flush (made immutable)
-  *value = (cfd_->imm()->IsFlushPending() ? 1 : 0);
-  return true;
-}
-
-bool InternalStats::HandleNumRunningFlushes(uint64_t* value, DBImpl* db,
-                                            Version* version) {
-  *value = db->num_running_flushes();
-  return true;
-}
-
-bool InternalStats::HandleCompactionPending(uint64_t* value, DBImpl* db,
-                                            Version* version) {
-  // 1 if the system already determines at least one compaction is needed.
-  // 0 otherwise,
-  const auto* vstorage = cfd_->current()->storage_info();
-  *value = (cfd_->compaction_picker()->NeedsCompaction(vstorage) ? 1 : 0);
-  return true;
-}
-
-bool InternalStats::HandleNumRunningCompactions(uint64_t* value, DBImpl* db,
-                                                Version* version) {
-  *value = db->num_running_compactions_;
-  return true;
-}
-
-bool InternalStats::HandleBackgroundErrors(uint64_t* value, DBImpl* db,
-                                           Version* version) {
-  // Accumulated number of  errors in background flushes or compactions.
-  *value = GetBackgroundErrorCount();
-  return true;
-}
-
-bool InternalStats::HandleCurSizeActiveMemTable(uint64_t* value, DBImpl* db,
-                                                Version* version) {
-  // Current size of the active memtable
-  *value = cfd_->mem()->ApproximateMemoryUsage();
-  return true;
-}
-
-bool InternalStats::HandleCurSizeAllMemTables(uint64_t* value, DBImpl* db,
-                                              Version* version) {
-  // Current size of the active memtable + immutable memtables
-  *value = cfd_->mem()->ApproximateMemoryUsage() +
-           cfd_->imm()->ApproximateUnflushedMemTablesMemoryUsage();
-  return true;
-}
-
-bool InternalStats::HandleSizeAllMemTables(uint64_t* value, DBImpl* db,
-                                           Version* version) {
-  *value = cfd_->mem()->ApproximateMemoryUsage() +
-           cfd_->imm()->ApproximateMemoryUsage();
-  return true;
-}
-
-bool InternalStats::HandleNumEntriesActiveMemTable(uint64_t* value, DBImpl* db,
-                                                   Version* version) {
-  // Current number of entires in the active memtable
-  *value = cfd_->mem()->num_entries();
-  return true;
-}
-
-bool InternalStats::HandleNumEntriesImmMemTables(uint64_t* value, DBImpl* db,
-                                                 Version* version) {
-  // Current number of entries in the immutable memtables
-  *value = cfd_->imm()->current()->GetTotalNumEntries();
-  return true;
-}
-
-bool InternalStats::HandleNumDeletesActiveMemTable(uint64_t* value, DBImpl* db,
-                                                   Version* version) {
-  // Current number of entires in the active memtable
-  *value = cfd_->mem()->num_deletes();
-  return true;
-}
-
-bool InternalStats::HandleNumDeletesImmMemTables(uint64_t* value, DBImpl* db,
-                                                 Version* version) {
-  // Current number of entries in the immutable memtables
-  *value = cfd_->imm()->current()->GetTotalNumDeletes();
-  return true;
-}
-
-bool InternalStats::HandleEstimateNumKeys(uint64_t* value, DBImpl* db,
-                                          Version* version) {
-  // Estimate number of entries in the column family:
-  // Use estimated entries in tables + total entries in memtables.
-  const auto* vstorage = cfd_->current()->storage_info();
-  *value = cfd_->mem()->num_entries() +
-           cfd_->imm()->current()->GetTotalNumEntries() -
-           (cfd_->mem()->num_deletes() +
-            cfd_->imm()->current()->GetTotalNumDeletes()) *
-               2 +
-           vstorage->GetEstimatedActiveKeys();
-  return true;
-}
-
-bool InternalStats::HandleNumSnapshots(uint64_t* value, DBImpl* db,
-                                       Version* version) {
-  *value = db->snapshots().count();
-  return true;
-}
-
-bool InternalStats::HandleOldestSnapshotTime(uint64_t* value, DBImpl* db,
-                                             Version* version) {
-  *value = static_cast<uint64_t>(db->snapshots().GetOldestSnapshotTime());
-  return true;
-}
-
-bool InternalStats::HandleNumLiveVersions(uint64_t* value, DBImpl* db,
-                                          Version* version) {
-  *value = cfd_->GetNumLiveVersions();
-  return true;
-}
-
-bool InternalStats::HandleIsFileDeletionsEnabled(uint64_t* value, DBImpl* db,
-                                                 Version* version) {
-  *value = db->IsFileDeletionsEnabled();
-  return true;
-}
-
-bool InternalStats::HandleBaseLevel(uint64_t* value, DBImpl* db,
-                                    Version* version) {
-  const auto* vstorage = cfd_->current()->storage_info();
-  *value = vstorage->base_level();
-  return true;
-}
-
-bool InternalStats::HandleTotalSstFilesSize(uint64_t* value, DBImpl* db,
-                                            Version* version) {
-  *value = cfd_->GetTotalSstFilesSize();
-  return true;
-}
-
-bool InternalStats::HandleEstimatePendingCompactionBytes(uint64_t* value,
-                                                         DBImpl* db,
-                                                         Version* version) {
-  const auto* vstorage = cfd_->current()->storage_info();
-  *value = vstorage->estimated_compaction_needed_bytes();
-  return true;
-}
-
-bool InternalStats::HandleEstimateTableReadersMem(uint64_t* value, DBImpl* db,
-                                                  Version* version) {
-  *value = (version == nullptr) ? 0 : version->GetMemoryUsageByTableReaders();
-  return true;
-}
-
-bool InternalStats::HandleEstimateLiveDataSize(uint64_t* value, DBImpl* db,
-                                               Version* version) {
-  const auto* vstorage = cfd_->current()->storage_info();
-  *value = vstorage->EstimateLiveDataSize();
-  return true;
 }

 void InternalStats::DumpDBStats(std::string* value) {
@@ -569,14 +488,14 @@ void InternalStats::DumpDBStats(std::string* value) {
           seconds_up, interval_seconds_up);
  value->append(buf);
  // Cumulative
-  uint64_t user_bytes_written = GetDBStats(InternalStats::BYTES_WRITTEN);
-  uint64_t num_keys_written = GetDBStats(InternalStats::NUMBER_KEYS_WRITTEN);
-  uint64_t write_other = GetDBStats(InternalStats::WRITE_DONE_BY_OTHER);
-  uint64_t write_self = GetDBStats(InternalStats::WRITE_DONE_BY_SELF);
-  uint64_t wal_bytes = GetDBStats(InternalStats::WAL_FILE_BYTES);
-  uint64_t wal_synced = GetDBStats(InternalStats::WAL_FILE_SYNCED);
-  uint64_t write_with_wal = GetDBStats(InternalStats::WRITE_WITH_WAL);
-  uint64_t write_stall_micros = GetDBStats(InternalStats::WRITE_STALL_MICROS);
+  uint64_t user_bytes_written = db_stats_[InternalStats::BYTES_WRITTEN];
+  uint64_t num_keys_written = db_stats_[InternalStats::NUMBER_KEYS_WRITTEN];
+  uint64_t write_other = db_stats_[InternalStats::WRITE_DONE_BY_OTHER];
+  uint64_t write_self = db_stats_[InternalStats::WRITE_DONE_BY_SELF];
+  uint64_t wal_bytes = db_stats_[InternalStats::WAL_FILE_BYTES];
+  uint64_t wal_synced = db_stats_[InternalStats::WAL_FILE_SYNCED];
+  uint64_t write_with_wal = db_stats_[InternalStats::WRITE_WITH_WAL];
+  uint64_t write_stall_micros = db_stats_[InternalStats::WRITE_STALL_MICROS];
  uint64_t compact_bytes_read = 0;
  uint64_t compact_bytes_write = 0;
  uint64_t compact_micros = 0;
@@ -758,38 +677,45 @@ void InternalStats::DumpCFStats(std::string* value) {
  int total_files = 0;
  int total_files_being_compacted = 0;
  double total_file_size = 0;
+  uint64_t total_slowdown_count_soft = 0;
+  uint64_t total_slowdown_count_hard = 0;
+  uint64_t total_stall_count = 0;
  for (int level = 0; level < number_levels_; level++) {
    int files = vstorage->NumLevelFiles(level);
    total_files += files;
    total_files_being_compacted += files_being_compacted[level];
    if (comp_stats_[level].micros > 0 || files > 0) {
+      uint64_t stalls =
+          level == 0 ? (cf_stats_count_[LEVEL0_SLOWDOWN_TOTAL] +
+                        cf_stats_count_[LEVEL0_NUM_FILES_TOTAL] +
+                        cf_stats_count_[HARD_PENDING_COMPACTION_BYTES_LIMIT] +
+                        cf_stats_count_[MEMTABLE_COMPACTION])
+                     : (stall_leveln_slowdown_count_soft_[level] +
+                        stall_leveln_slowdown_count_hard_[level]);
+
      stats_sum.Add(comp_stats_[level]);
      total_file_size += vstorage->NumLevelBytes(level);
+      total_stall_count += stalls;
+      total_slowdown_count_soft += stall_leveln_slowdown_count_soft_[level];
+      total_slowdown_count_hard += stall_leveln_slowdown_count_hard_[level];
      double w_amp =
          (comp_stats_[level].bytes_read_non_output_levels == 0) ? 0.0
          : static_cast<double>(comp_stats_[level].bytes_written) /
            comp_stats_[level].bytes_read_non_output_levels;
      PrintLevelStats(buf, sizeof(buf), "L" + ToString(level), files,
                      files_being_compacted[level],
-                      static_cast<double>(vstorage->NumLevelBytes(level)),
-                      compaction_score[level],
-                      w_amp, comp_stats_[level]);
+                      vstorage->NumLevelBytes(level), compaction_score[level],
+                      w_amp, stalls, comp_stats_[level]);
      value->append(buf);
    }
  }
  uint64_t curr_ingest = cf_stats_value_[BYTES_FLUSHED];
  // Cumulative summary
  double w_amp = stats_sum.bytes_written / static_cast<double>(curr_ingest + 1);
-  uint64_t total_stall_count =
-      cf_stats_count_[LEVEL0_SLOWDOWN_TOTAL] +
-      cf_stats_count_[LEVEL0_NUM_FILES_TOTAL] +
-      cf_stats_count_[SOFT_PENDING_COMPACTION_BYTES_LIMIT] +
-      cf_stats_count_[HARD_PENDING_COMPACTION_BYTES_LIMIT] +
-      cf_stats_count_[MEMTABLE_COMPACTION] + cf_stats_count_[MEMTABLE_SLOWDOWN];
  // Stats summary across levels
  PrintLevelStats(buf, sizeof(buf), "Sum", total_files,
-                  total_files_being_compacted, total_file_size, 0, w_amp,
-                  stats_sum);
+      total_files_being_compacted, total_file_size, 0, w_amp,
+      total_stall_count, stats_sum);
  value->append(buf);
  // Interval summary
  uint64_t interval_ingest =
@@ -797,7 +723,9 @@ void InternalStats::DumpCFStats(std::string* value) {
  CompactionStats interval_stats(stats_sum);
  interval_stats.Subtract(cf_stats_snapshot_.comp_stats);
  w_amp = interval_stats.bytes_written / static_cast<double>(interval_ingest);
-  PrintLevelStats(buf, sizeof(buf), "Int", 0, 0, 0, 0, w_amp, interval_stats);
+  PrintLevelStats(buf, sizeof(buf), "Int", 0, 0, 0, 0,
+      w_amp, total_stall_count - cf_stats_snapshot_.stall_count,
+      interval_stats);
  value->append(buf);

  snprintf(buf, sizeof(buf),
@@ -814,23 +742,19 @@ void InternalStats::DumpCFStats(std::string* value) {
                             "%" PRIu64
                             " level0_numfiles_with_compaction, "
                             "%" PRIu64
-                             " stop for pending_compaction_bytes, "
-                             "%" PRIu64
-                             " slowdown for pending_compaction_bytes, "
+                             " pending_compaction_bytes, "
                             "%" PRIu64
                             " memtable_compaction, "
                             "%" PRIu64
-                             " memtable_slowdown, "
-                             "interval %" PRIu64 " total count\n",
+                             " leveln_slowdown_soft, "
+                             "%" PRIu64 " leveln_slowdown_hard\n",
           cf_stats_count_[LEVEL0_SLOWDOWN_TOTAL],
           cf_stats_count_[LEVEL0_SLOWDOWN_WITH_COMPACTION],
           cf_stats_count_[LEVEL0_NUM_FILES_TOTAL],
           cf_stats_count_[LEVEL0_NUM_FILES_WITH_COMPACTION],
           cf_stats_count_[HARD_PENDING_COMPACTION_BYTES_LIMIT],
-           cf_stats_count_[SOFT_PENDING_COMPACTION_BYTES_LIMIT],
-           cf_stats_count_[MEMTABLE_COMPACTION],
-           cf_stats_count_[MEMTABLE_SLOWDOWN],
-           total_stall_count - cf_stats_snapshot_.stall_count);
+           cf_stats_count_[MEMTABLE_COMPACTION], total_slowdown_count_soft,
+           total_slowdown_count_hard);
  value->append(buf);

  cf_stats_snapshot_.ingest_bytes = curr_ingest;
@@ -841,7 +765,10 @@ void InternalStats::DumpCFStats(std::string* value) {

 #else

-const DBPropertyInfo* GetPropertyInfo(const Slice& property) { return nullptr; }
+DBPropertyType GetPropertyType(const Slice& property, bool* is_int_property,
+                               bool* need_out_of_mutex) {
+  return kUnknown;
+}

 #endif  // !ROCKSDB_LITE

@@ -21,29 +21,63 @@ namespace rocksdb {
 class MemTableList;
 class DBImpl;

-// Config for retrieving a property's value.
-struct DBPropertyInfo {
-  bool need_out_of_mutex;
-
-  // gcc had an internal error for initializing union of pointer-to-member-
-  // functions. Workaround is to populate exactly one of the following function
-  // pointers with a non-nullptr value.
-
-  // @param value Value-result argument for storing the property's string value
-  // @param suffix Argument portion of the property. For example, suffix would
-  //      be "5" for the property "rocksdb.num-files-at-level5". So far, only
-  //      certain string properties take an argument.
-  bool (InternalStats::*handle_string)(std::string* value, Slice suffix);
-
-  // @param value Value-result argument for storing the property's uint64 value
-  // @param db Many of the int properties rely on DBImpl methods.
-  // @param version Version is needed in case the property is retrieved without
-  //      holding db mutex, which is only supported for int properties.
-  bool (InternalStats::*handle_int)(uint64_t* value, DBImpl* db,
-                                    Version* version);
+// IMPORTANT: If you add a new property here, also add it to the list in
+//            include/rocksdb/db.h
+enum DBPropertyType : uint32_t {
+  kUnknown,
+  kNumFilesAtLevel,  // Number of files at a specific level
+  kLevelStats,       // Return number of files and total sizes of each level
+  kCFStats,          // Return general statitistics of CF
+  kDBStats,          // Return general statitistics of DB
+  kStats,            // Return general statitistics of both DB and CF
+  kSsTables,         // Return a human readable string of current SST files
+  kStartIntTypes,    // ---- Dummy value to indicate the start of integer values
+  kNumImmutableMemTable,         // Return number of immutable mem tables that
+                                 // have not been flushed.
+  kNumImmutableMemTableFlushed,  // Return number of immutable mem tables
+                                 // in memory that have already been flushed
+  kMemtableFlushPending,         // Return 1 if mem table flushing is pending,
+                                 // otherwise 0.
+  kNumRunningFlushes,      // Return the number of currently running flushes.
+  kCompactionPending,      // Return 1 if a compaction is pending. Otherwise 0.
+  kNumRunningCompactions,  // Return the number of currently running
+                           // compactions.
+  kBackgroundErrors,       // Return accumulated background errors encountered.
+  kCurSizeActiveMemTable,  // Return current size of the active memtable
+  kCurSizeAllMemTables,    // Return current size of unflushed
+                           // (active + immutable) memtables
+  kSizeAllMemTables,       // Return current size of all (active + immutable
+                           // + pinned) memtables
+  kNumEntriesInMutableMemtable,    // Return number of deletes in the mutable
+                                   // memtable.
+  kNumEntriesInImmutableMemtable,  // Return sum of number of entries in all
+                                   // the immutable mem tables.
+  kNumDeletesInMutableMemtable,    // Return number of deletion entries in the
+                                   // mutable memtable.
+  kNumDeletesInImmutableMemtable,  // Return the total number of deletion
+                                   // entries in all the immutable mem tables.
+  kEstimatedNumKeys,  // Estimated total number of keys in the database.
+  kEstimatedUsageByTableReaders,  // Estimated memory by table readers.
+  kIsFileDeletionEnabled,         // Equals disable_delete_obsolete_files_,
+                                  // 0 means file deletions enabled
+  kNumSnapshots,                  // Number of snapshots in the system
+  kOldestSnapshotTime,            // Unix timestamp of the first snapshot
+  kNumLiveVersions,
+  kEstimateLiveDataSize,            // Estimated amount of live data in bytes
+  kTotalSstFilesSize,               // Total size of all sst files.
+  kBaseLevel,                       // The level that L0 data is compacted to
+  kEstimatePendingCompactionBytes,  // Estimated bytes to compaction
+  kAggregatedTableProperties,  // Return a string that contains the aggregated
+                               // table properties.
+  kAggregatedTablePropertiesAtLevel,  // Return a string that contains the
+                                      // aggregated
+  // table properties at the specified level.
 };

-extern const DBPropertyInfo* GetPropertyInfo(const Slice& property);
+extern DBPropertyType GetPropertyType(const Slice& property,
+                                      bool* is_int_property,
+                                      bool* need_out_of_mutex);
+

 #ifndef ROCKSDB_LITE
 class InternalStats {
@@ -52,10 +86,8 @@ class InternalStats {
    LEVEL0_SLOWDOWN_TOTAL,
    LEVEL0_SLOWDOWN_WITH_COMPACTION,
    MEMTABLE_COMPACTION,
-    MEMTABLE_SLOWDOWN,
    LEVEL0_NUM_FILES_TOTAL,
    LEVEL0_NUM_FILES_WITH_COMPACTION,
-    SOFT_PENDING_COMPACTION_BYTES_LIMIT,
    HARD_PENDING_COMPACTION_BYTES_LIMIT,
    WRITE_STALLS_ENUM_MAX,
    BYTES_FLUSHED,
@@ -75,16 +107,30 @@ class InternalStats {
  };

  InternalStats(int num_levels, Env* env, ColumnFamilyData* cfd)
-      : db_stats_{},
-        cf_stats_value_{},
-        cf_stats_count_{},
+      : db_stats_(INTERNAL_DB_STATS_ENUM_MAX),
+        cf_stats_value_(INTERNAL_CF_STATS_ENUM_MAX),
+        cf_stats_count_(INTERNAL_CF_STATS_ENUM_MAX),
        comp_stats_(num_levels),
+        stall_leveln_slowdown_count_hard_(num_levels),
+        stall_leveln_slowdown_count_soft_(num_levels),
        file_read_latency_(num_levels),
        bg_error_count_(0),
        number_levels_(num_levels),
        env_(env),
        cfd_(cfd),
-        started_at_(env->NowMicros()) {}
+        started_at_(env->NowMicros()) {
+    for (int i = 0; i< INTERNAL_DB_STATS_ENUM_MAX; ++i) {
+      db_stats_[i] = 0;
+    }
+    for (int i = 0; i< INTERNAL_CF_STATS_ENUM_MAX; ++i) {
+      cf_stats_value_[i] = 0;
+      cf_stats_count_[i] = 0;
+    }
+    for (int i = 0; i < num_levels; ++i) {
+      stall_leveln_slowdown_count_hard_[i] = 0;
+      stall_leveln_slowdown_count_soft_[i] = 0;
+    }
+  }

  // Per level compaction stats.  comp_stats_[level] stores the stats for
  // compactions that produced data for the specified "level".
@@ -191,19 +237,21 @@ class InternalStats {
    comp_stats_[level].bytes_moved += amount;
  }

+  void RecordLevelNSlowdown(int level, bool soft) {
+    if (soft) {
+      ++stall_leveln_slowdown_count_soft_[level];
+    } else {
+      ++stall_leveln_slowdown_count_hard_[level];
+    }
+  }
+
  void AddCFStats(InternalCFStatsType type, uint64_t value) {
    cf_stats_value_[type] += value;
    ++cf_stats_count_[type];
  }

  void AddDBStats(InternalDBStatsType type, uint64_t value) {
-    auto& v = db_stats_[type];
-    v.store(v.load(std::memory_order_relaxed) + value,
-            std::memory_order_relaxed);
-  }
-
-  uint64_t GetDBStats(InternalDBStatsType type) {
-    return db_stats_[type].load(std::memory_order_relaxed);
+    db_stats_[type] += value;
  }

  HistogramImpl* GetFileReadHist(int level) {
@@ -214,30 +262,29 @@ class InternalStats {

  uint64_t BumpAndGetBackgroundErrorCount() { return ++bg_error_count_; }

-  bool GetStringProperty(const DBPropertyInfo& property_info,
-                         const Slice& property, std::string* value);
+  bool GetStringProperty(DBPropertyType property_type, const Slice& property,
+                         std::string* value);

-  bool GetIntProperty(const DBPropertyInfo& property_info, uint64_t* value,
-                      DBImpl* db);
+  bool GetIntProperty(DBPropertyType property_type, uint64_t* value,
+                      DBImpl* db) const;

-  bool GetIntPropertyOutOfMutex(const DBPropertyInfo& property_info,
-                                Version* version, uint64_t* value);
-
-  // Store a mapping from the user-facing DB::Properties string to our
-  // DBPropertyInfo struct used internally for retrieving properties.
-  static const std::unordered_map<std::string, DBPropertyInfo> ppt_name_to_info;
+  bool GetIntPropertyOutOfMutex(DBPropertyType property_type, Version* version,
+                                uint64_t* value) const;

 private:
  void DumpDBStats(std::string* value);
  void DumpCFStats(std::string* value);

  // Per-DB stats
-  std::atomic<uint64_t> db_stats_[INTERNAL_DB_STATS_ENUM_MAX];
+  std::vector<uint64_t> db_stats_;
  // Per-ColumnFamily stats
-  uint64_t cf_stats_value_[INTERNAL_CF_STATS_ENUM_MAX];
-  uint64_t cf_stats_count_[INTERNAL_CF_STATS_ENUM_MAX];
+  std::vector<uint64_t> cf_stats_value_;
+  std::vector<uint64_t> cf_stats_count_;
  // Per-ColumnFamily/level compaction stats
  std::vector<CompactionStats> comp_stats_;
+  // These count the number of microseconds for which MakeRoomForWrite stalls.
+  std::vector<uint64_t> stall_leveln_slowdown_count_hard_;
+  std::vector<uint64_t> stall_leveln_slowdown_count_soft_;
  std::vector<HistogramImpl> file_read_latency_;

  // Used to compute per-interval statistics
@@ -291,54 +338,6 @@ class InternalStats {
          seconds_up(0) {}
  } db_stats_snapshot_;

-  // Handler functions for getting property values. They use "value" as a value-
-  // result argument, and return true upon successfully setting "value".
-  bool HandleNumFilesAtLevel(std::string* value, Slice suffix);
-  bool HandleLevelStats(std::string* value, Slice suffix);
-  bool HandleStats(std::string* value, Slice suffix);
-  bool HandleCFStats(std::string* value, Slice suffix);
-  bool HandleDBStats(std::string* value, Slice suffix);
-  bool HandleSsTables(std::string* value, Slice suffix);
-  bool HandleAggregatedTableProperties(std::string* value, Slice suffix);
-  bool HandleAggregatedTablePropertiesAtLevel(std::string* value, Slice suffix);
-  bool HandleNumImmutableMemTable(uint64_t* value, DBImpl* db,
-                                  Version* version);
-  bool HandleNumImmutableMemTableFlushed(uint64_t* value, DBImpl* db,
-                                         Version* version);
-  bool HandleMemTableFlushPending(uint64_t* value, DBImpl* db,
-                                  Version* version);
-  bool HandleNumRunningFlushes(uint64_t* value, DBImpl* db, Version* version);
-  bool HandleCompactionPending(uint64_t* value, DBImpl* db, Version* version);
-  bool HandleNumRunningCompactions(uint64_t* value, DBImpl* db,
-                                   Version* version);
-  bool HandleBackgroundErrors(uint64_t* value, DBImpl* db, Version* version);
-  bool HandleCurSizeActiveMemTable(uint64_t* value, DBImpl* db,
-                                   Version* version);
-  bool HandleCurSizeAllMemTables(uint64_t* value, DBImpl* db, Version* version);
-  bool HandleSizeAllMemTables(uint64_t* value, DBImpl* db, Version* version);
-  bool HandleNumEntriesActiveMemTable(uint64_t* value, DBImpl* db,
-                                      Version* version);
-  bool HandleNumEntriesImmMemTables(uint64_t* value, DBImpl* db,
-                                    Version* version);
-  bool HandleNumDeletesActiveMemTable(uint64_t* value, DBImpl* db,
-                                      Version* version);
-  bool HandleNumDeletesImmMemTables(uint64_t* value, DBImpl* db,
-                                    Version* version);
-  bool HandleEstimateNumKeys(uint64_t* value, DBImpl* db, Version* version);
-  bool HandleNumSnapshots(uint64_t* value, DBImpl* db, Version* version);
-  bool HandleOldestSnapshotTime(uint64_t* value, DBImpl* db, Version* version);
-  bool HandleNumLiveVersions(uint64_t* value, DBImpl* db, Version* version);
-  bool HandleIsFileDeletionsEnabled(uint64_t* value, DBImpl* db,
-                                    Version* version);
-  bool HandleBaseLevel(uint64_t* value, DBImpl* db, Version* version);
-  bool HandleTotalSstFilesSize(uint64_t* value, DBImpl* db, Version* version);
-  bool HandleEstimatePendingCompactionBytes(uint64_t* value, DBImpl* db,
-                                            Version* version);
-  bool HandleEstimateTableReadersMem(uint64_t* value, DBImpl* db,
-                                     Version* version);
-  bool HandleEstimateLiveDataSize(uint64_t* value, DBImpl* db,
-                                  Version* version);
-
  // Total number of background errors encountered. Every time a flush task
  // or compaction task fails, this counter is incremented. The failure can
  // be caused by any possible reason, including file system errors, out of
@@ -360,10 +359,8 @@ class InternalStats {
    LEVEL0_SLOWDOWN_TOTAL,
    LEVEL0_SLOWDOWN_WITH_COMPACTION,
    MEMTABLE_COMPACTION,
-    MEMTABLE_SLOWDOWN,
    LEVEL0_NUM_FILES_TOTAL,
    LEVEL0_NUM_FILES_WITH_COMPACTION,
-    SOFT_PENDING_COMPACTION_BYTES_LIMIT,
    HARD_PENDING_COMPACTION_BYTES_LIMIT,
    WRITE_STALLS_ENUM_MAX,
    BYTES_FLUSHED,
@@ -410,6 +407,8 @@ class InternalStats {

  void IncBytesMoved(int level, uint64_t amount) {}

+  void RecordLevelNSlowdown(int level, bool soft) {}
+
  void AddCFStats(InternalCFStatsType type, uint64_t value) {}

  void AddDBStats(InternalDBStatsType type, uint64_t value) {}
@@ -420,20 +419,14 @@ class InternalStats {

  uint64_t BumpAndGetBackgroundErrorCount() { return 0; }

-  bool GetStringProperty(const DBPropertyInfo& property_info,
-                         const Slice& property, std::string* value) {
-    return false;
-  }
+  bool GetStringProperty(DBPropertyType property_type, const Slice& property,
+                         std::string* value) { return false; }

-  bool GetIntProperty(const DBPropertyInfo& property_info, uint64_t* value,
-                      DBImpl* db) const {
-    return false;
-  }
+  bool GetIntProperty(DBPropertyType property_type, uint64_t* value,
+                      DBImpl* db) const { return false; }

-  bool GetIntPropertyOutOfMutex(const DBPropertyInfo& property_info,
-                                Version* version, uint64_t* value) const {
-    return false;
-  }
+  bool GetIntPropertyOutOfMutex(DBPropertyType property_type, Version* version,
+                                uint64_t* value) const { return false; }
 };
 #endif  // !ROCKSDB_LITE

@@ -4,7 +4,6 @@
 //  of patent rights can be found in the PATENTS file in the same directory.

 #include "db/db_impl.h"
-#include "db/db_test_util.h"
 #include "db/dbformat.h"
 #include "db/filename.h"
 #include "db/version_set.h"
@@ -38,11 +37,119 @@

 namespace rocksdb {

-class EventListenerTest : public DBTestBase {
+class EventListenerTest : public testing::Test {
 public:
-  EventListenerTest() : DBTestBase("/listener_test") {}
+  EventListenerTest() {
+    dbname_ = test::TmpDir() + "/listener_test";
+    EXPECT_OK(DestroyDB(dbname_, Options()));
+    db_ = nullptr;
+    Reopen();
+  }
+
+  ~EventListenerTest() {
+    Close();
+    Options options;
+    options.db_paths.emplace_back(dbname_, 0);
+    options.db_paths.emplace_back(dbname_ + "_2", 0);
+    options.db_paths.emplace_back(dbname_ + "_3", 0);
+    options.db_paths.emplace_back(dbname_ + "_4", 0);
+    EXPECT_OK(DestroyDB(dbname_, options));
+  }
+
+  void CreateColumnFamilies(const std::vector<std::string>& cfs,
+                            const ColumnFamilyOptions* options = nullptr) {
+    ColumnFamilyOptions cf_opts;
+    cf_opts = ColumnFamilyOptions(Options());
+    size_t cfi = handles_.size();
+    handles_.resize(cfi + cfs.size());
+    for (auto cf : cfs) {
+      ASSERT_OK(db_->CreateColumnFamily(cf_opts, cf, &handles_[cfi++]));
+    }
+  }
+
+  void Close() {
+    for (auto h : handles_) {
+      delete h;
+    }
+    handles_.clear();
+    delete db_;
+    db_ = nullptr;
+  }
+
+  void ReopenWithColumnFamilies(const std::vector<std::string>& cfs,
+                                const Options* options = nullptr) {
+    ASSERT_OK(TryReopenWithColumnFamilies(cfs, options));
+  }
+
+  Status TryReopenWithColumnFamilies(const std::vector<std::string>& cfs,
+                                     const Options* options = nullptr) {
+    Close();
+    Options opts = (options == nullptr) ? Options() : *options;
+    std::vector<const Options*> v_opts(cfs.size(), &opts);
+    return TryReopenWithColumnFamilies(cfs, v_opts);
+  }
+
+  Status TryReopenWithColumnFamilies(
+      const std::vector<std::string>& cfs,
+      const std::vector<const Options*>& options) {
+    Close();
+    EXPECT_EQ(cfs.size(), options.size());
+    std::vector<ColumnFamilyDescriptor> column_families;
+    for (size_t i = 0; i < cfs.size(); ++i) {
+      column_families.push_back(ColumnFamilyDescriptor(cfs[i], *options[i]));
+    }
+    DBOptions db_opts = DBOptions(*options[0]);
+    return DB::Open(db_opts, dbname_, column_families, &handles_, &db_);
+  }
+
+  Status TryReopen(Options* options = nullptr) {
+    Close();
+    Options opts;
+    if (options != nullptr) {
+      opts = *options;
+    } else {
+      opts.create_if_missing = true;
+    }
+
+    return DB::Open(opts, dbname_, &db_);
+  }
+
+  void Reopen(Options* options = nullptr) {
+    ASSERT_OK(TryReopen(options));
+  }
+
+  void CreateAndReopenWithCF(const std::vector<std::string>& cfs,
+                             const Options* options = nullptr) {
+    CreateColumnFamilies(cfs, options);
+    std::vector<std::string> cfs_plus_default = cfs;
+    cfs_plus_default.insert(cfs_plus_default.begin(), kDefaultColumnFamilyName);
+    ReopenWithColumnFamilies(cfs_plus_default, options);
+  }
+
+  DBImpl* dbfull() {
+    return reinterpret_cast<DBImpl*>(db_);
+  }
+
+  Status Put(int cf, const Slice& k, const Slice& v,
+             WriteOptions wo = WriteOptions()) {
+    return db_->Put(wo, handles_[cf], k, v);
+  }
+
+  Status Flush(size_t cf = 0) {
+    FlushOptions opt = FlushOptions();
+    opt.wait = true;
+    if (cf == 0) {
+      return db_->Flush(opt);
+    } else {
+      return db_->Flush(opt, handles_[cf]);
+    }
+  }

  const size_t k110KB = 110 << 10;
+
+  DB* db_;
+  std::string dbname_;
+  std::vector<ColumnFamilyHandle*> handles_;
 };

 struct TestPropertiesCollector : public rocksdb::TablePropertiesCollector {
@@ -131,7 +238,7 @@ TEST_F(EventListenerTest, OnSingleDBCompactionTest) {
  std::vector<std::string> cf_names = {
      "pikachu", "ilya", "muromec", "dobrynia",
      "nikitich", "alyosha", "popovich"};
-  CreateAndReopenWithCF(cf_names, options);
+  CreateAndReopenWithCF(cf_names, &options);
  ASSERT_OK(Put(1, "pikachu", std::string(90000, 'p')));
  ASSERT_OK(Put(2, "ilya", std::string(90000, 'i')));
  ASSERT_OK(Put(3, "muromec", std::string(90000, 'm')));
@@ -139,12 +246,12 @@ TEST_F(EventListenerTest, OnSingleDBCompactionTest) {
  ASSERT_OK(Put(5, "nikitich", std::string(90000, 'n')));
  ASSERT_OK(Put(6, "alyosha", std::string(90000, 'a')));
  ASSERT_OK(Put(7, "popovich", std::string(90000, 'p')));
-  for (int i = 1; i < 8; ++i) {
+  for (size_t i = 1; i < 8; ++i) {
    ASSERT_OK(Flush(i));
-    const Slice kRangeStart = "a";
-    const Slice kRangeEnd = "z";
+    const Slice kStart = "a";
+    const Slice kEnd = "z";
    ASSERT_OK(dbfull()->CompactRange(CompactRangeOptions(), handles_[i],
-                                     &kRangeStart, &kRangeEnd));
+                                     &kStart, &kEnd));
    dbfull()->TEST_WaitForFlushMemTable();
    dbfull()->TEST_WaitForCompact();
  }
@@ -242,7 +349,7 @@ TEST_F(EventListenerTest, OnSingleDBFlushTest) {
      "nikitich", "alyosha", "popovich"};
  options.table_properties_collector_factories.push_back(
      std::make_shared<TestPropertiesCollectorFactory>());
-  CreateAndReopenWithCF(cf_names, options);
+  CreateAndReopenWithCF(cf_names, &options);

  ASSERT_OK(Put(1, "pikachu", std::string(90000, 'p')));
  ASSERT_OK(Put(2, "ilya", std::string(90000, 'i')));
@@ -251,7 +358,7 @@ TEST_F(EventListenerTest, OnSingleDBFlushTest) {
  ASSERT_OK(Put(5, "nikitich", std::string(90000, 'n')));
  ASSERT_OK(Put(6, "alyosha", std::string(90000, 'a')));
  ASSERT_OK(Put(7, "popovich", std::string(90000, 'p')));
-  for (int i = 1; i < 8; ++i) {
+  for (size_t i = 1; i < 8; ++i) {
    ASSERT_OK(Flush(i));
    dbfull()->TEST_WaitForFlushMemTable();
    ASSERT_EQ(listener->flushed_dbs_.size(), i);
@@ -278,7 +385,7 @@ TEST_F(EventListenerTest, MultiCF) {
  std::vector<std::string> cf_names = {
      "pikachu", "ilya", "muromec", "dobrynia",
      "nikitich", "alyosha", "popovich"};
-  CreateAndReopenWithCF(cf_names, options);
+  CreateAndReopenWithCF(cf_names, &options);

  ASSERT_OK(Put(1, "pikachu", std::string(90000, 'p')));
  ASSERT_OK(Put(2, "ilya", std::string(90000, 'i')));
@@ -287,7 +394,7 @@ TEST_F(EventListenerTest, MultiCF) {
  ASSERT_OK(Put(5, "nikitich", std::string(90000, 'n')));
  ASSERT_OK(Put(6, "alyosha", std::string(90000, 'a')));
  ASSERT_OK(Put(7, "popovich", std::string(90000, 'p')));
-  for (int i = 1; i < 8; ++i) {
+  for (size_t i = 1; i < 8; ++i) {
    ASSERT_OK(Flush(i));
    ASSERT_EQ(listener->flushed_dbs_.size(), i);
    ASSERT_EQ(listener->flushed_column_family_names_.size(), i);
@@ -404,7 +511,7 @@ TEST_F(EventListenerTest, DisableBGCompaction) {
  options.table_properties_collector_factories.push_back(
      std::make_shared<TestPropertiesCollectorFactory>());

-  CreateAndReopenWithCF({"pikachu"}, options);
+  CreateAndReopenWithCF({"pikachu"}, &options);
  ColumnFamilyMetaData cf_meta;
  db_->GetColumnFamilyMetaData(handles_[1], &cf_meta);

@@ -418,167 +525,6 @@ TEST_F(EventListenerTest, DisableBGCompaction) {
  ASSERT_GE(listener->slowdown_count, kSlowdownTrigger * 9);
 }

-class TestCompactionReasonListener : public EventListener {
- public:
-  void OnCompactionCompleted(DB* db, const CompactionJobInfo& ci) override {
-    std::lock_guard<std::mutex> lock(mutex_);
-    compaction_reasons_.push_back(ci.compaction_reason);
-  }
-
-  std::vector<CompactionReason> compaction_reasons_;
-  std::mutex mutex_;
-};
-
-TEST_F(EventListenerTest, CompactionReasonLevel) {
-  Options options;
-  options.create_if_missing = true;
-  options.memtable_factory.reset(
-      new SpecialSkipListFactory(DBTestBase::kNumKeysByGenerateNewRandomFile));
-
-  TestCompactionReasonListener* listener = new TestCompactionReasonListener();
-  options.listeners.emplace_back(listener);
-
-  options.level0_file_num_compaction_trigger = 4;
-  options.compaction_style = kCompactionStyleLevel;
-
-  DestroyAndReopen(options);
-  Random rnd(301);
-
-  // Write 4 files in L0
-  for (int i = 0; i < 4; i++) {
-    GenerateNewRandomFile(&rnd);
-  }
-  dbfull()->TEST_WaitForCompact();
-
-  ASSERT_EQ(listener->compaction_reasons_.size(), 1);
-  ASSERT_EQ(listener->compaction_reasons_[0],
-            CompactionReason::kLevelL0FilesNum);
-
-  DestroyAndReopen(options);
-
-  // Write 3 non-overlapping files in L0
-  for (int k = 1; k <= 30; k++) {
-    ASSERT_OK(Put(Key(k), Key(k)));
-    if (k % 10 == 0) {
-      Flush();
-    }
-  }
-
-  // Do a trivial move from L0 -> L1
-  db_->CompactRange(CompactRangeOptions(), nullptr, nullptr);
-
-  options.max_bytes_for_level_base = 1;
-  Close();
-  listener->compaction_reasons_.clear();
-  Reopen(options);
-
-  dbfull()->TEST_WaitForCompact();
-  ASSERT_GT(listener->compaction_reasons_.size(), 1);
-
-  for (auto compaction_reason : listener->compaction_reasons_) {
-    ASSERT_EQ(compaction_reason, CompactionReason::kLevelMaxLevelSize);
-  }
-
-  options.disable_auto_compactions = true;
-  Close();
-  listener->compaction_reasons_.clear();
-  Reopen(options);
-
-  db_->CompactRange(CompactRangeOptions(), nullptr, nullptr);
-  ASSERT_GT(listener->compaction_reasons_.size(), 0);
-  for (auto compaction_reason : listener->compaction_reasons_) {
-    ASSERT_EQ(compaction_reason, CompactionReason::kManualCompaction);
-  }
-}
-
-TEST_F(EventListenerTest, CompactionReasonUniversal) {
-  Options options;
-  options.create_if_missing = true;
-  options.memtable_factory.reset(
-      new SpecialSkipListFactory(DBTestBase::kNumKeysByGenerateNewRandomFile));
-
-  TestCompactionReasonListener* listener = new TestCompactionReasonListener();
-  options.listeners.emplace_back(listener);
-
-  options.compaction_style = kCompactionStyleUniversal;
-
-  Random rnd(301);
-
-  options.level0_file_num_compaction_trigger = 8;
-  options.compaction_options_universal.max_size_amplification_percent = 100000;
-  options.compaction_options_universal.size_ratio = 100000;
-  DestroyAndReopen(options);
-  listener->compaction_reasons_.clear();
-
-  // Write 8 files in L0
-  for (int i = 0; i < 8; i++) {
-    GenerateNewRandomFile(&rnd);
-  }
-  dbfull()->TEST_WaitForCompact();
-
-  ASSERT_GT(listener->compaction_reasons_.size(), 0);
-  for (auto compaction_reason : listener->compaction_reasons_) {
-    ASSERT_EQ(compaction_reason, CompactionReason::kUniversalSortedRunNum);
-  }
-
-  options.level0_file_num_compaction_trigger = 8;
-  options.compaction_options_universal.max_size_amplification_percent = 1;
-  options.compaction_options_universal.size_ratio = 100000;
-
-  DestroyAndReopen(options);
-  listener->compaction_reasons_.clear();
-
-  // Write 8 files in L0
-  for (int i = 0; i < 8; i++) {
-    GenerateNewRandomFile(&rnd);
-  }
-  dbfull()->TEST_WaitForCompact();
-
-  ASSERT_GT(listener->compaction_reasons_.size(), 0);
-  for (auto compaction_reason : listener->compaction_reasons_) {
-    ASSERT_EQ(compaction_reason, CompactionReason::kUniversalSizeAmplification);
-  }
-
-  options.disable_auto_compactions = true;
-  Close();
-  listener->compaction_reasons_.clear();
-  Reopen(options);
-
-  db_->CompactRange(CompactRangeOptions(), nullptr, nullptr);
-
-  ASSERT_GT(listener->compaction_reasons_.size(), 0);
-  for (auto compaction_reason : listener->compaction_reasons_) {
-    ASSERT_EQ(compaction_reason, CompactionReason::kManualCompaction);
-  }
-}
-
-TEST_F(EventListenerTest, CompactionReasonFIFO) {
-  Options options;
-  options.create_if_missing = true;
-  options.memtable_factory.reset(
-      new SpecialSkipListFactory(DBTestBase::kNumKeysByGenerateNewRandomFile));
-
-  TestCompactionReasonListener* listener = new TestCompactionReasonListener();
-  options.listeners.emplace_back(listener);
-
-  options.level0_file_num_compaction_trigger = 4;
-  options.compaction_style = kCompactionStyleFIFO;
-  options.compaction_options_fifo.max_table_files_size = 1;
-
-  DestroyAndReopen(options);
-  Random rnd(301);
-
-  // Write 4 files in L0
-  for (int i = 0; i < 4; i++) {
-    GenerateNewRandomFile(&rnd);
-  }
-  dbfull()->TEST_WaitForCompact();
-
-  ASSERT_GT(listener->compaction_reasons_.size(), 0);
-  for (auto compaction_reason : listener->compaction_reasons_) {
-    ASSERT_EQ(compaction_reason, CompactionReason::kFIFOMaxSize);
-  }
-}
 }  // namespace rocksdb

 #endif  // ROCKSDB_LITE
@@ -47,7 +47,7 @@ Status Writer::AddRecord(const Slice& slice) {
  Status s;
  bool begin = true;
  do {
-    const int64_t leftover = kBlockSize - block_offset_;
+    const int leftover = kBlockSize - block_offset_;
    assert(leftover >= 0);
    if (leftover < header_size) {
      // Switch to a new block
@@ -62,7 +62,7 @@ Status Writer::AddRecord(const Slice& slice) {
    }

    // Invariant: we never leave < header_size bytes in a block.
-    assert(static_cast<int64_t>(kBlockSize - block_offset_) >= header_size);
+    assert(static_cast<int>(kBlockSize) - block_offset_ >= header_size);

    const size_t avail = kBlockSize - block_offset_ - header_size;
    const size_t fragment_length = (left < avail) ? left : avail;
@@ -83,7 +83,7 @@ class Writer {

 private:
  unique_ptr<WritableFileWriter> dest_;
-  size_t block_offset_;       // Current offset in block
+  int block_offset_;       // Current offset in block
  uint64_t log_number_;
  bool recycle_log_files_;

@@ -5,8 +5,6 @@

 #ifndef ROCKSDB_LITE

-#include "db/managed_iterator.h"
-
 #include <limits>
 #include <string>
 #include <utility>
@@ -15,7 +13,7 @@
 #include "db/db_impl.h"
 #include "db/db_iter.h"
 #include "db/dbformat.h"
-#include "db/xfunc_test_points.h"
+#include "db/managed_iterator.h"
 #include "rocksdb/env.h"
 #include "rocksdb/slice.h"
 #include "rocksdb/slice_transform.h"
@@ -60,7 +60,7 @@ MemTable::MemTable(const InternalKeyComparator& cmp,
      moptions_(ioptions, mutable_cf_options),
      refs_(0),
      kArenaBlockSize(OptimizeBlockSize(moptions_.arena_block_size)),
-      arena_(moptions_.arena_block_size, 0),
+      arena_(moptions_.arena_block_size),
      allocator_(&arena_, write_buffer),
      table_(ioptions.memtable_factory->CreateMemTableRep(
          comparator_, &allocator_, ioptions.prefix_extractor,
@@ -78,12 +78,12 @@ MemTable::MemTable(const InternalKeyComparator& cmp,
                 ? moptions_.inplace_update_num_locks
                 : 0),
      prefix_extractor_(ioptions.prefix_extractor),
-      flush_state_(FLUSH_NOT_REQUESTED),
+      should_flush_(ShouldFlushNow()),
+      flush_scheduled_(false),
      env_(ioptions.env) {
-  UpdateFlushState();
-  // something went wrong if we need to flush before inserting anything
-  assert(!ShouldScheduleFlush());
-
+  // if should_flush_ == true without an entry inserted, something must have
+  // gone wrong already.
+  assert(!should_flush_);
  if (prefix_extractor_ && moptions_.memtable_prefix_bloom_bits > 0) {
    prefix_bloom_.reset(new DynamicBloom(
        &allocator_,
@@ -167,17 +167,6 @@ bool MemTable::ShouldFlushNow() const {
  return arena_.AllocatedAndUnused() < kArenaBlockSize / 4;
 }

-void MemTable::UpdateFlushState() {
-  auto state = flush_state_.load(std::memory_order_relaxed);
-  if (state == FLUSH_NOT_REQUESTED && ShouldFlushNow()) {
-    // ignore CAS failure, because that means somebody else requested
-    // a flush
-    flush_state_.compare_exchange_strong(state, FLUSH_REQUESTED,
-                                         std::memory_order_relaxed,
-                                         std::memory_order_relaxed);
-  }
-}
-
 int MemTable::KeyComparator::operator()(const char* prefix_len_key1,
                                        const char* prefix_len_key2) const {
  // Internal keys are encoded as length-prefixed strings.
@@ -285,21 +274,6 @@ class MemTableIterator : public InternalIterator {

  virtual Status status() const override { return Status::OK(); }

-  virtual Status PinData() override {
-    // memtable data is always pinned
-    return Status::OK();
-  }
-
-  virtual Status ReleasePinnedData() override {
-    // memtable data is always pinned
-    return Status::OK();
-  }
-
-  virtual bool IsKeyPinned() const override {
-    // memtable data is always pinned
-    return true;
-  }
-
 private:
  DynamicBloom* bloom_;
  const SliceTransform* const prefix_extractor_;
@@ -346,7 +320,7 @@ uint64_t MemTable::ApproximateSize(const Slice& start_ikey,

 void MemTable::Add(SequenceNumber s, ValueType type,
                   const Slice& key, /* user key */
-                   const Slice& value, bool allow_concurrent) {
+                   const Slice& value) {
  // Format of an entry is concatenation of:
  //  key_size     : varint32 of internal_key.size()
  //  key bytes    : char[internal_key.size()]
@@ -360,7 +334,7 @@ void MemTable::Add(SequenceNumber s, ValueType type,
                               val_size;
  char* buf = nullptr;
  KeyHandle handle = table_->Allocate(encoded_len, &buf);
-
+  assert(buf != nullptr);
  char* p = EncodeVarint32(buf, internal_key_size);
  memcpy(p, key.data(), key_size);
  p += key_size;
@@ -370,64 +344,32 @@ void MemTable::Add(SequenceNumber s, ValueType type,
  p = EncodeVarint32(p, val_size);
  memcpy(p, value.data(), val_size);
  assert((unsigned)(p + val_size - buf) == (unsigned)encoded_len);
-  if (!allow_concurrent) {
-    table_->Insert(handle);
-
-    // this is a bit ugly, but is the way to avoid locked instructions
-    // when incrementing an atomic
-    num_entries_.store(num_entries_.load(std::memory_order_relaxed) + 1,
-                       std::memory_order_relaxed);
-    data_size_.store(data_size_.load(std::memory_order_relaxed) + encoded_len,
+  table_->Insert(handle);
+  num_entries_.store(num_entries_.load(std::memory_order_relaxed) + 1,
                     std::memory_order_relaxed);
-    if (type == kTypeDeletion) {
-      num_deletes_.store(num_deletes_.load(std::memory_order_relaxed) + 1,
-                         std::memory_order_relaxed);
-    }
-
-    if (prefix_bloom_) {
-      assert(prefix_extractor_);
-      prefix_bloom_->Add(prefix_extractor_->Transform(key));
-    }
-
-    // The first sequence number inserted into the memtable
-    assert(first_seqno_ == 0 || s > first_seqno_);
-    if (first_seqno_ == 0) {
-      first_seqno_.store(s, std::memory_order_relaxed);
-
-      if (earliest_seqno_ == kMaxSequenceNumber) {
-        earliest_seqno_.store(GetFirstSequenceNumber(),
-                              std::memory_order_relaxed);
-      }
-      assert(first_seqno_.load() >= earliest_seqno_.load());
-    }
-  } else {
-    table_->InsertConcurrently(handle);
-
-    num_entries_.fetch_add(1, std::memory_order_relaxed);
-    data_size_.fetch_add(encoded_len, std::memory_order_relaxed);
-    if (type == kTypeDeletion) {
-      num_deletes_.fetch_add(1, std::memory_order_relaxed);
-    }
-
-    if (prefix_bloom_) {
-      assert(prefix_extractor_);
-      prefix_bloom_->AddConcurrently(prefix_extractor_->Transform(key));
-    }
-
-    // atomically update first_seqno_ and earliest_seqno_.
-    uint64_t cur_seq_num = first_seqno_.load(std::memory_order_relaxed);
-    while ((cur_seq_num == 0 || s < cur_seq_num) &&
-           !first_seqno_.compare_exchange_weak(cur_seq_num, s)) {
-    }
-    uint64_t cur_earliest_seqno =
-        earliest_seqno_.load(std::memory_order_relaxed);
-    while (
-        (cur_earliest_seqno == kMaxSequenceNumber || s < cur_earliest_seqno) &&
-        !first_seqno_.compare_exchange_weak(cur_earliest_seqno, s)) {
-    }
+  data_size_.store(data_size_.load(std::memory_order_relaxed) + encoded_len,
+                   std::memory_order_relaxed);
+  if (type == kTypeDeletion) {
+    num_deletes_++;
  }

-  UpdateFlushState();
+  if (prefix_bloom_) {
+    assert(prefix_extractor_);
+    prefix_bloom_->Add(prefix_extractor_->Transform(key));
+  }
+
+  // The first sequence number inserted into the memtable
+  assert(first_seqno_ == 0 || s > first_seqno_);
+  if (first_seqno_ == 0) {
+    first_seqno_ = s;
+
+    if (earliest_seqno_ == kMaxSequenceNumber) {
+      earliest_seqno_ = first_seqno_;
+    }
+    assert(first_seqno_ >= earliest_seqno_);
+  }
+
+  should_flush_ = ShouldFlushNow();
 }

 // Callback from MemTable::Get()
@@ -500,7 +442,7 @@ static bool SaveValue(void* arg, const char* entry) {
            *(s->status) =
                Status::Corruption("Error: Could not perform merge.");
          }
-        } else if (s->value != nullptr) {
+        } else {
          s->value->assign(v.data(), v.size());
        }
        if (s->inplace_update_support) {
@@ -728,16 +670,16 @@ bool MemTable::UpdateCallback(SequenceNumber seq,
              }
            }
            RecordTick(moptions_.statistics, NUMBER_KEYS_UPDATED);
-            UpdateFlushState();
+            should_flush_ = ShouldFlushNow();
            return true;
          } else if (status == UpdateStatus::UPDATED) {
            Add(seq, kTypeValue, key, Slice(str_value));
            RecordTick(moptions_.statistics, NUMBER_KEYS_WRITTEN);
-            UpdateFlushState();
+            should_flush_ = ShouldFlushNow();
            return true;
          } else if (status == UpdateStatus::UPDATE_FAILED) {
            // No action required. Return.
-            UpdateFlushState();
+            should_flush_ = ShouldFlushNow();
            return true;
          }
        }
@@ -8,11 +8,10 @@
 // found in the LICENSE file. See the AUTHORS file for names of contributors.

 #pragma once
-#include <atomic>
-#include <deque>
-#include <functional>
-#include <memory>
 #include <string>
+#include <memory>
+#include <functional>
+#include <deque>
 #include <vector>
 #include "db/dbformat.h"
 #include "db/skiplist.h"
@@ -22,9 +21,8 @@
 #include "rocksdb/memtablerep.h"
 #include "rocksdb/immutable_options.h"
 #include "db/memtable_allocator.h"
-#include "util/concurrent_arena.h"
+#include "util/arena.h"
 #include "util/dynamic_bloom.h"
-#include "util/instrumented_mutex.h"
 #include "util/mutable_cf_options.h"

 namespace rocksdb {
@@ -126,17 +124,10 @@ class MemTable {
  // This method heuristically determines if the memtable should continue to
  // host more data.
  bool ShouldScheduleFlush() const {
-    return flush_state_.load(std::memory_order_relaxed) == FLUSH_REQUESTED;
+    return flush_scheduled_ == false && should_flush_;
  }

-  // Returns true if a flush should be scheduled and the caller should
-  // be the one to schedule it
-  bool MarkFlushScheduled() {
-    auto before = FLUSH_REQUESTED;
-    return flush_state_.compare_exchange_strong(before, FLUSH_SCHEDULED,
-                                                std::memory_order_relaxed,
-                                                std::memory_order_relaxed);
-  }
+  void MarkFlushScheduled() { flush_scheduled_ = true; }

  // Return an iterator that yields the contents of the memtable.
  //
@@ -156,10 +147,11 @@ class MemTable {
  // specified sequence number and with the specified type.
  // Typically value will be empty if type==kTypeDeletion.
  //
-  // REQUIRES: if allow_concurrent = false, external synchronization to prevent
-  // simultaneous operations on the same MemTable.
-  void Add(SequenceNumber seq, ValueType type, const Slice& key,
-           const Slice& value, bool allow_concurrent = false);
+  // REQUIRES: external synchronization to prevent simultaneous
+  // operations on the same MemTable.
+  void Add(SequenceNumber seq, ValueType type,
+           const Slice& key,
+           const Slice& value);

  // If memtable contains a value for key, store it in *value and return true.
  // If memtable contains a deletion for key, store a NotFound() error
@@ -197,7 +189,7 @@ class MemTable {
              const Slice& key,
              const Slice& value);

-  // If prev_value for key exists, attempts to update it inplace.
+  // If prev_value for key exits, attempts to update it inplace.
  // else returns false
  // Pseudocode
  //   if key exists in current memtable && prev_value is of type kTypeValue
@@ -228,9 +220,7 @@ class MemTable {
  // Get total number of deletes in the mem table.
  // REQUIRES: external synchronization to prevent simultaneous
  // operations on the same MemTable (unless this Memtable is immutable).
-  uint64_t num_deletes() const {
-    return num_deletes_.load(std::memory_order_relaxed);
-  }
+  uint64_t num_deletes() const { return num_deletes_; }

  // Returns the edits area that is needed for flushing the memtable
  VersionEdit* GetEdits() { return &edit_; }
@@ -244,9 +234,7 @@ class MemTable {
  // into the memtable.
  // REQUIRES: external synchronization to prevent simultaneous
  // operations on the same MemTable (unless this Memtable is immutable).
-  SequenceNumber GetFirstSequenceNumber() {
-    return first_seqno_.load(std::memory_order_relaxed);
-  }
+  SequenceNumber GetFirstSequenceNumber() { return first_seqno_; }

  // Returns the sequence number that is guaranteed to be smaller than or equal
  // to the sequence number of any key that could be inserted into this
@@ -255,9 +243,7 @@ class MemTable {
  //
  // If the earliest sequence number could not be determined,
  // kMaxSequenceNumber will be returned.
-  SequenceNumber GetEarliestSequenceNumber() {
-    return earliest_seqno_.load(std::memory_order_relaxed);
-  }
+  SequenceNumber GetEarliestSequenceNumber() { return earliest_seqno_; }

  // Returns the next active logfile number when this memtable is about to
  // be flushed to storage
@@ -304,7 +290,8 @@ class MemTable {
  const MemTableOptions* GetMemTableOptions() const { return &moptions_; }

 private:
-  enum FlushStateEnum { FLUSH_NOT_REQUESTED, FLUSH_REQUESTED, FLUSH_SCHEDULED };
+  // Dynamically check if we can add more incoming entries
+  bool ShouldFlushNow() const;

  friend class MemTableIterator;
  friend class MemTableBackwardIterator;
@@ -314,14 +301,14 @@ class MemTable {
  const MemTableOptions moptions_;
  int refs_;
  const size_t kArenaBlockSize;
-  ConcurrentArena arena_;
+  Arena arena_;
  MemTableAllocator allocator_;
  unique_ptr<MemTableRep> table_;

  // Total data size of all data inserted
  std::atomic<uint64_t> data_size_;
  std::atomic<uint64_t> num_entries_;
-  std::atomic<uint64_t> num_deletes_;
+  uint64_t num_deletes_;

  // These are used to manage memtable flushes to storage
  bool flush_in_progress_; // started the flush
@@ -333,11 +320,11 @@ class MemTable {
  VersionEdit edit_;

  // The sequence number of the kv that was inserted first
-  std::atomic<SequenceNumber> first_seqno_;
+  SequenceNumber first_seqno_;

  // The db sequence number at the time of creation or kMaxSequenceNumber
  // if not set.
-  std::atomic<SequenceNumber> earliest_seqno_;
+  SequenceNumber earliest_seqno_;

  // The log files earlier than this number can be deleted.
  uint64_t mem_next_logfile_number_;
@@ -345,22 +332,19 @@ class MemTable {
  // rw locks for inplace updates
  std::vector<port::RWMutex> locks_;

+  // No copying allowed
+  MemTable(const MemTable&);
+  void operator=(const MemTable&);
+
  const SliceTransform* const prefix_extractor_;
  std::unique_ptr<DynamicBloom> prefix_bloom_;

-  std::atomic<FlushStateEnum> flush_state_;
+  // a flag indicating if a memtable has met the criteria to flush
+  bool should_flush_;

+  // a flag indicating if flush has been scheduled
+  bool flush_scheduled_;
  Env* env_;
-
-  // Returns a heuristic flush decision
-  bool ShouldFlushNow() const;
-
-  // Updates flush_state_ using ShouldFlushNow()
-  void UpdateFlushState();
-
-  // No copying allowed
-  MemTable(const MemTable&);
-  MemTable& operator=(const MemTable&);
 };

 extern const char* EncodeKey(std::string* scratch, const Slice& target);
@@ -7,42 +7,46 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.

-#include "db/memtable_allocator.h"
-
 #include <assert.h>
+
+#include "db/memtable_allocator.h"
 #include "db/writebuffer.h"
 #include "util/arena.h"

 namespace rocksdb {

-MemTableAllocator::MemTableAllocator(Allocator* allocator,
-                                     WriteBuffer* write_buffer)
-    : allocator_(allocator), write_buffer_(write_buffer), bytes_allocated_(0) {}
+MemTableAllocator::MemTableAllocator(Arena* arena, WriteBuffer* write_buffer)
+    : arena_(arena), write_buffer_(write_buffer), bytes_allocated_(0) {
+}

-MemTableAllocator::~MemTableAllocator() { DoneAllocating(); }
+MemTableAllocator::~MemTableAllocator() {
+  DoneAllocating();
+}

 char* MemTableAllocator::Allocate(size_t bytes) {
  assert(write_buffer_ != nullptr);
-  bytes_allocated_.fetch_add(bytes, std::memory_order_relaxed);
+  bytes_allocated_ += bytes;
  write_buffer_->ReserveMem(bytes);
-  return allocator_->Allocate(bytes);
+  return arena_->Allocate(bytes);
 }

 char* MemTableAllocator::AllocateAligned(size_t bytes, size_t huge_page_size,
                                         Logger* logger) {
  assert(write_buffer_ != nullptr);
-  bytes_allocated_.fetch_add(bytes, std::memory_order_relaxed);
+  bytes_allocated_ += bytes;
  write_buffer_->ReserveMem(bytes);
-  return allocator_->AllocateAligned(bytes, huge_page_size, logger);
+  return arena_->AllocateAligned(bytes, huge_page_size, logger);
 }

 void MemTableAllocator::DoneAllocating() {
  if (write_buffer_ != nullptr) {
-    write_buffer_->FreeMem(bytes_allocated_.load(std::memory_order_relaxed));
+    write_buffer_->FreeMem(bytes_allocated_);
    write_buffer_ = nullptr;
  }
 }

-size_t MemTableAllocator::BlockSize() const { return allocator_->BlockSize(); }
+size_t MemTableAllocator::BlockSize() const {
+  return arena_->BlockSize();
+}

 }  // namespace rocksdb
@@ -11,18 +11,17 @@
 // to WriteBuffer so we can track and enforce overall write buffer limits.

 #pragma once
-
-#include <atomic>
 #include "util/allocator.h"

 namespace rocksdb {

+class Arena;
 class Logger;
 class WriteBuffer;

 class MemTableAllocator : public Allocator {
 public:
-  explicit MemTableAllocator(Allocator* allocator, WriteBuffer* write_buffer);
+  explicit MemTableAllocator(Arena* arena, WriteBuffer* write_buffer);
  ~MemTableAllocator();

  // Allocator interface
@@ -36,9 +35,9 @@ class MemTableAllocator : public Allocator {
  void DoneAllocating();

 private:
-  Allocator* allocator_;
+  Arena* arena_;
  WriteBuffer* write_buffer_;
-  std::atomic<size_t> bytes_allocated_;
+  size_t bytes_allocated_;

  // No copying allowed
  MemTableAllocator(const MemTableAllocator&);
@@ -20,6 +20,7 @@
 #include "utilities/merge_operators.h"
 #include "util/testharness.h"

+using namespace std;
 using namespace rocksdb;

 namespace {
@@ -75,7 +76,7 @@ class CountMergeOperator : public AssociativeMergeOperator {
 };

 namespace {
-std::shared_ptr<DB> OpenDb(const std::string& dbname, const bool ttl = false,
+std::shared_ptr<DB> OpenDb(const string& dbname, const bool ttl = false,
                           const size_t max_successive_merges = 0,
                           const uint32_t min_partial_merge_operands = 2) {
  DB* db;
@@ -89,7 +90,7 @@ std::shared_ptr<DB> OpenDb(const std::string& dbname, const bool ttl = false,
 // DBWithTTL is not supported in ROCKSDB_LITE
 #ifndef ROCKSDB_LITE
  if (ttl) {
-    std::cout << "Opening database with TTL\n";
+    cout << "Opening database with TTL\n";
    DBWithTTL* db_with_ttl;
    s = DBWithTTL::Open(options, dbname, &db_with_ttl);
    db = db_with_ttl;
@@ -101,7 +102,7 @@ std::shared_ptr<DB> OpenDb(const std::string& dbname, const bool ttl = false,
  s = DB::Open(options, dbname, &db);
 #endif  // !ROCKSDB_LITE
  if (!s.ok()) {
-    std::cerr << s.ToString() << std::endl;
+    cerr << s.ToString() << endl;
    assert(false);
  }
  return std::shared_ptr<DB>(db);
@@ -141,7 +142,7 @@ class Counters {
  // if the underlying level db operation failed.

  // mapped to a levedb Put
-  bool set(const std::string& key, uint64_t value) {
+  bool set(const string& key, uint64_t value) {
    // just treat the internal rep of int64 as the string
    Slice slice((char *)&value, sizeof(value));
    auto s = db_->Put(put_option_, key, slice);
@@ -149,26 +150,26 @@ class Counters {
    if (s.ok()) {
      return true;
    } else {
-      std::cerr << s.ToString() << std::endl;
+      cerr << s.ToString() << endl;
      return false;
    }
  }

  // mapped to a rocksdb Delete
-  bool remove(const std::string& key) {
+  bool remove(const string& key) {
    auto s = db_->Delete(delete_option_, key);

    if (s.ok()) {
      return true;
    } else {
-      std::cerr << s.ToString() << std::endl;
+      cerr << s.ToString() << std::endl;
      return false;
    }
  }

  // mapped to a rocksdb Get
-  bool get(const std::string& key, uint64_t* value) {
-    std::string str;
+  bool get(const string& key, uint64_t *value) {
+    string str;
    auto s = db_->Get(get_option_, key, &str);

    if (s.IsNotFound()) {
@@ -178,33 +179,35 @@ class Counters {
    } else if (s.ok()) {
      // deserialization
      if (str.size() != sizeof(uint64_t)) {
-        std::cerr << "value corruption\n";
+        cerr << "value corruption\n";
        return false;
      }
      *value = DecodeFixed64(&str[0]);
      return true;
    } else {
-      std::cerr << s.ToString() << std::endl;
+      cerr << s.ToString() << std::endl;
      return false;
    }
  }

  // 'add' is implemented as get -> modify -> set
  // An alternative is a single merge operation, see MergeBasedCounters
-  virtual bool add(const std::string& key, uint64_t value) {
+  virtual bool add(const string& key, uint64_t value) {
    uint64_t base = default_;
    return get(key, &base) && set(key, base + value);
  }


  // convenience functions for testing
-  void assert_set(const std::string& key, uint64_t value) {
+  void assert_set(const string& key, uint64_t value) {
    assert(set(key, value));
  }

-  void assert_remove(const std::string& key) { assert(remove(key)); }
+  void assert_remove(const string& key) {
+    assert(remove(key));
+  }

-  uint64_t assert_get(const std::string& key) {
+  uint64_t assert_get(const string& key) {
    uint64_t value = default_;
    int result = get(key, &value);
    assert(result);
@@ -212,7 +215,7 @@ class Counters {
    return value;
  }

-  void assert_add(const std::string& key, uint64_t value) {
+  void assert_add(const string& key, uint64_t value) {
    int result = add(key, value);
    assert(result);
    if (result == 0) exit(1); // Disable unused variable warning.
@@ -231,7 +234,7 @@ class MergeBasedCounters : public Counters {
  }

  // mapped to a rocksdb Merge operation
-  virtual bool add(const std::string& key, uint64_t value) override {
+  virtual bool add(const string& key, uint64_t value) override {
    char encoded[sizeof(uint64_t)];
    EncodeFixed64(encoded, value);
    Slice slice(encoded, sizeof(uint64_t));
@@ -240,7 +243,7 @@ class MergeBasedCounters : public Counters {
    if (s.ok()) {
      return true;
    } else {
-      std::cerr << s.ToString() << std::endl;
+      cerr << s.ToString() << endl;
      return false;
    }
  }
@@ -251,7 +254,7 @@ void dumpDb(DB* db) {
  auto it = unique_ptr<Iterator>(db->NewIterator(ReadOptions()));
  for (it->SeekToFirst(); it->Valid(); it->Next()) {
    uint64_t value = DecodeFixed64(it->value().data());
-    std::cout << it->key().ToString() << ": " << value << std::endl;
+    cout << it->key().ToString() << ": "  << value << endl;
  }
  assert(it->status().ok());  // Check for any errors found during the scan
 }
@@ -299,9 +302,9 @@ void testCounters(Counters& counters, DB* db, bool test_compaction) {
  if (test_compaction) {
    db->Flush(o);

-    std::cout << "Compaction started ...\n";
+    cout << "Compaction started ...\n";
    db->CompactRange(CompactRangeOptions(), nullptr, nullptr);
-    std::cout << "Compaction ended\n";
+    cout << "Compaction ended\n";

    dumpDb(db);

@@ -397,7 +400,7 @@ void testSingleBatchSuccessiveMerge(DB* db, size_t max_num_merges,

  // Get the value
  resetNumMergeOperatorCalls();
-  std::string get_value_str;
+  string get_value_str;
  {
    Status s = db->Get(ReadOptions(), key, &get_value_str);
    assert(s.ok());
@@ -409,24 +412,24 @@ void testSingleBatchSuccessiveMerge(DB* db, size_t max_num_merges,
            static_cast<size_t>((num_merges % (max_num_merges + 1))));
 }

-void runTest(int argc, const std::string& dbname, const bool use_ttl = false) {
+void runTest(int argc, const string& dbname, const bool use_ttl = false) {
  bool compact = false;
  if (argc > 1) {
    compact = true;
-    std::cout << "Turn on Compaction\n";
+    cout << "Turn on Compaction\n";
  }

  {
    auto db = OpenDb(dbname, use_ttl);

    {
-      std::cout << "Test read-modify-write counters... \n";
+      cout << "Test read-modify-write counters... \n";
      Counters counters(db, 0);
      testCounters(counters, db.get(), true);
    }

    {
-      std::cout << "Test merge-based counters... \n";
+      cout << "Test merge-based counters... \n";
      MergeBasedCounters counters(db, 0);
      testCounters(counters, db.get(), compact);
    }
@@ -435,7 +438,7 @@ void runTest(int argc, const std::string& dbname, const bool use_ttl = false) {
  DestroyDB(dbname, Options());

  {
-    std::cout << "Test merge in memtable... \n";
+    cout << "Test merge in memtable... \n";
    size_t max_merge = 5;
    auto db = OpenDb(dbname, use_ttl, max_merge);
    MergeBasedCounters counters(db, 0);
@@ -446,7 +449,7 @@ void runTest(int argc, const std::string& dbname, const bool use_ttl = false) {
  }

  {
-    std::cout << "Test Partial-Merge\n";
+    cout << "Test Partial-Merge\n";
    size_t max_merge = 100;
    for (uint32_t min_merge = 5; min_merge < 25; min_merge += 5) {
      for (uint32_t count = min_merge - 1; count <= min_merge + 1; count++) {
@@ -466,7 +469,7 @@ void runTest(int argc, const std::string& dbname, const bool use_ttl = false) {
  }

  {
-    std::cout << "Test merge-operator not set after reopen\n";
+    cout << "Test merge-operator not set after reopen\n";
    {
      auto db = OpenDb(dbname);
      MergeBasedCounters counters(db, 0);
@@ -486,7 +489,7 @@ void runTest(int argc, const std::string& dbname, const bool use_ttl = false) {

  /* Temporary remove this test
  {
-    std::cout << "Test merge-operator not set after reopen (recovery case)\n";
+    cout << "Test merge-operator not set after reopen (recovery case)\n";
    {
      auto db = OpenDb(dbname);
      MergeBasedCounters counters(db, 0);
@@ -13,7 +13,6 @@
 #include "rocksdb/slice_transform.h"
 #include "rocksdb/memtablerep.h"
 #include "util/histogram.h"
-#include "util/instrumented_mutex.h"
 #include "util/stop_watch.h"
 #include "util/testharness.h"
 #include "util/thread_status_util.h"
@@ -544,31 +543,28 @@ TEST_F(PerfContextTest, SeekKeyComparison) {
 }

 TEST_F(PerfContextTest, DBMutexLockCounter) {
+  SetPerfLevel(kEnableTime);
  int stats_code[] = {0, static_cast<int>(DB_MUTEX_WAIT_MICROS)};
-  for (PerfLevel perf_level :
-       {PerfLevel::kEnableTimeExceptForMutex, PerfLevel::kEnableTime}) {
-    for (int c = 0; c < 2; ++c) {
+  for (int c = 0; c < 2; ++c) {
    InstrumentedMutex mutex(nullptr, Env::Default(), stats_code[c]);
    mutex.Lock();
    std::thread child_thread([&] {
-      SetPerfLevel(perf_level);
+      SetPerfLevel(kEnableTime);
      perf_context.Reset();
      ASSERT_EQ(perf_context.db_mutex_lock_nanos, 0);
      mutex.Lock();
      mutex.Unlock();
-      if (perf_level == PerfLevel::kEnableTimeExceptForMutex ||
-          stats_code[c] != DB_MUTEX_WAIT_MICROS) {
-        ASSERT_EQ(perf_context.db_mutex_lock_nanos, 0);
-      } else {
+      if (stats_code[c] == DB_MUTEX_WAIT_MICROS) {
        // increment the counter only when it's a DB Mutex
        ASSERT_GT(perf_context.db_mutex_lock_nanos, 0);
+      } else {
+        ASSERT_EQ(perf_context.db_mutex_lock_nanos, 0);
      }
    });
    Env::Default()->SleepForMicroseconds(100);
    mutex.Unlock();
    child_thread.join();
  }
-  }
 }

 TEST_F(PerfContextTest, FalseDBMutexWait) {
@@ -589,19 +585,6 @@ TEST_F(PerfContextTest, FalseDBMutexWait) {
    }
  }
 }
-
-TEST_F(PerfContextTest, ToString) {
-  perf_context.Reset();
-  perf_context.block_read_count = 12345;
-
-  std::string zero_included = perf_context.ToString();
-  ASSERT_NE(std::string::npos, zero_included.find("= 0"));
-  ASSERT_NE(std::string::npos, zero_included.find("= 12345"));
-
-  std::string zero_excluded = perf_context.ToString(true);
-  ASSERT_EQ(std::string::npos, zero_excluded.find("= 0"));
-  ASSERT_NE(std::string::npos, zero_excluded.find("= 12345"));
-}
 }

 int main(int argc, char** argv) {
@@ -29,7 +29,6 @@
 #include "table/bloom_block.h"
 #include "table/table_builder.h"
 #include "table/plain_table_factory.h"
-#include "table/plain_table_key_coding.h"
 #include "table/plain_table_reader.h"
 #include "util/hash.h"
 #include "util/logging.h"
@@ -42,59 +41,6 @@
 using std::unique_ptr;

 namespace rocksdb {
-class PlainTableKeyDecoderTest : public testing::Test {};
-
-TEST_F(PlainTableKeyDecoderTest, ReadNonMmap) {
-  std::string tmp;
-  Random rnd(301);
-  const uint32_t kLength = 2222;
-  Slice contents = test::RandomString(&rnd, kLength, &tmp);
-  test::StringSource* string_source =
-      new test::StringSource(contents, 0, false);
-
-  unique_ptr<RandomAccessFileReader> file_reader(
-      test::GetRandomAccessFileReader(string_source));
-  unique_ptr<PlainTableReaderFileInfo> file_info(new PlainTableReaderFileInfo(
-      std::move(file_reader), EnvOptions(), kLength));
-
-  {
-    PlainTableFileReader reader(file_info.get());
-
-    const uint32_t kReadSize = 77;
-    for (uint32_t pos = 0; pos < kLength; pos += kReadSize) {
-      uint32_t read_size = std::min(kLength - pos, kReadSize);
-      Slice out;
-      ASSERT_TRUE(reader.Read(pos, read_size, &out));
-      ASSERT_EQ(0, out.compare(tmp.substr(pos, read_size)));
-    }
-
-    ASSERT_LT(uint32_t(string_source->total_reads()), kLength / kReadSize / 2);
-  }
-
-  std::vector<std::vector<std::pair<uint32_t, uint32_t>>> reads = {
-      {{600, 30}, {590, 30}, {600, 20}, {600, 40}},
-      {{800, 20}, {100, 20}, {500, 20}, {1500, 20}, {100, 20}, {80, 20}},
-      {{1000, 20}, {500, 20}, {1000, 50}},
-      {{1000, 20}, {500, 20}, {500, 20}},
-      {{1000, 20}, {500, 20}, {200, 20}, {500, 20}},
-      {{1000, 20}, {500, 20}, {200, 20}, {1000, 50}},
-      {{600, 500}, {610, 20}, {100, 20}},
-      {{500, 100}, {490, 100}, {550, 50}},
-  };
-
-  std::vector<int> num_file_reads = {2, 6, 2, 2, 4, 3, 2, 2};
-
-  for (size_t i = 0; i < reads.size(); i++) {
-    string_source->set_total_reads(0);
-    PlainTableFileReader reader(file_info.get());
-    for (auto p : reads[i]) {
-      Slice out;
-      ASSERT_TRUE(reader.Read(p.first, p.second, &out));
-      ASSERT_EQ(0, out.compare(tmp.substr(p.first, p.second)));
-    }
-    ASSERT_EQ(num_file_reads[i], string_source->total_reads());
-  }
-}

 class PlainTableDBTest : public testing::Test,
                         public testing::WithParamInterface<bool> {
@@ -165,7 +165,7 @@ class Repairer {
  Status FindFiles() {
    std::vector<std::string> filenames;
    bool found_file = false;
-    for (size_t path_id = 0; path_id < options_.db_paths.size(); path_id++) {
+    for (uint32_t path_id = 0; path_id < options_.db_paths.size(); path_id++) {
      Status status =
          env_->GetChildren(options_.db_paths[path_id].path, &filenames);
      if (!status.ok()) {
@@ -190,8 +190,7 @@ class Repairer {
              assert(path_id == 0);
              logs_.push_back(number);
            } else if (type == kTableFile) {
-              table_fds_.emplace_back(number, static_cast<uint32_t>(path_id),
-                                      0);
+              table_fds_.emplace_back(number, path_id, 0);
            } else {
              // Ignore other files
            }
@@ -271,7 +270,7 @@ class Repairer {
        continue;
      }
      WriteBatchInternal::SetContents(&batch, record);
-      status = WriteBatchInternal::InsertInto(&batch, cf_mems_default, nullptr);
+      status = WriteBatchInternal::InsertInto(&batch, cf_mems_default);
      if (status.ok()) {
        counter += WriteBatchInternal::Count(&batch);
      } else {
@@ -295,8 +294,7 @@ class Repairer {
          dbname_, env_, ioptions_, env_options_, table_cache_, iter.get(),
          &meta, icmp_, &int_tbl_prop_collector_factories_,
          TablePropertiesCollectorFactory::Context::kUnknownColumnFamily, {},
-          kMaxSequenceNumber, kNoCompression, CompressionOptions(), false,
-          nullptr);
+          kNoCompression, CompressionOptions(), false, nullptr);
    }
    delete mem->Unref();
    delete cf_mems_default;
@@ -12,9 +12,6 @@ namespace rocksdb {
 ManagedSnapshot::ManagedSnapshot(DB* db) : db_(db),
                                           snapshot_(db->GetSnapshot()) {}

-ManagedSnapshot::ManagedSnapshot(DB* db, const Snapshot* _snapshot)
-    : db_(db), snapshot_(_snapshot) {}
-
 ManagedSnapshot::~ManagedSnapshot() {
  if (snapshot_) {
    db_->ReleaseSnapshot(snapshot_);
@@ -34,9 +34,6 @@ class SnapshotImpl : public Snapshot {
  SnapshotList* list_;                 // just for sanity checks

  int64_t unix_time_;
-
-  // Will this snapshot be used by a Transaction to do write-conflict checking?
-  bool is_write_conflict_boundary_;
 };

 class SnapshotList {
@@ -53,10 +50,9 @@ class SnapshotList {
  SnapshotImpl* newest() const { assert(!empty()); return list_.prev_; }

  const SnapshotImpl* New(SnapshotImpl* s, SequenceNumber seq,
-                          uint64_t unix_time, bool is_write_conflict_boundary) {
+                          uint64_t unix_time) {
    s->number_ = seq;
    s->unix_time_ = unix_time;
-    s->is_write_conflict_boundary_ = is_write_conflict_boundary;
    s->list_ = this;
    s->next_ = &list_;
    s->prev_ = list_.prev_;
@@ -75,29 +71,14 @@ class SnapshotList {
  }

  // retrieve all snapshot numbers. They are sorted in ascending order.
-  std::vector<SequenceNumber> GetAll(
-      SequenceNumber* oldest_write_conflict_snapshot = nullptr) {
+  std::vector<SequenceNumber> GetAll() {
    std::vector<SequenceNumber> ret;
-
-    if (oldest_write_conflict_snapshot != nullptr) {
-      *oldest_write_conflict_snapshot = kMaxSequenceNumber;
-    }
-
    if (empty()) {
      return ret;
    }
    SnapshotImpl* s = &list_;
    while (s->next_ != &list_) {
      ret.push_back(s->next_->number_);
-
-      if (oldest_write_conflict_snapshot != nullptr &&
-          *oldest_write_conflict_snapshot == kMaxSequenceNumber &&
-          s->next_->is_write_conflict_boundary_) {
-        // If this is the first write-conflict boundary snapshot in the list,
-        // it is the oldest
-        *oldest_write_conflict_snapshot = s->next_->number_;
-      }
-
      s = s->next_;
    }
    return ret;
@@ -88,7 +88,7 @@ Status TableCache::GetTableReader(
    const EnvOptions& env_options,
    const InternalKeyComparator& internal_comparator, const FileDescriptor& fd,
    bool sequential_mode, bool record_read_stats, HistogramImpl* file_read_hist,
-    unique_ptr<TableReader>* table_reader, bool skip_filters) {
+    unique_ptr<TableReader>* table_reader) {
  std::string fname =
      TableFileName(ioptions_.db_paths, fd.GetNumber(), fd.GetPathId());
  unique_ptr<RandomAccessFile> file;
@@ -108,8 +108,7 @@ Status TableCache::GetTableReader(
                                   ioptions_.statistics, record_read_stats,
                                   file_read_hist));
    s = ioptions_.table_factory->NewTableReader(
-        TableReaderOptions(ioptions_, env_options, internal_comparator,
-                           skip_filters),
+        TableReaderOptions(ioptions_, env_options, internal_comparator),
        std::move(file_reader), fd.GetFileSize(), table_reader);
    TEST_SYNC_POINT("TableCache::GetTableReader:0");
  }
@@ -120,7 +119,7 @@ Status TableCache::FindTable(const EnvOptions& env_options,
                             const InternalKeyComparator& internal_comparator,
                             const FileDescriptor& fd, Cache::Handle** handle,
                             const bool no_io, bool record_read_stats,
-                             HistogramImpl* file_read_hist, bool skip_filters) {
+                             HistogramImpl* file_read_hist) {
  PERF_TIMER_GUARD(find_table_nanos);
  Status s;
  uint64_t number = fd.GetNumber();
@@ -136,7 +135,7 @@ Status TableCache::FindTable(const EnvOptions& env_options,
    unique_ptr<TableReader> table_reader;
    s = GetTableReader(env_options, internal_comparator, fd,
                       false /* sequential mode */, record_read_stats,
-                       file_read_hist, &table_reader, skip_filters);
+                       file_read_hist, &table_reader);
    if (!s.ok()) {
      assert(table_reader == nullptr);
      RecordTick(ioptions_.statistics, NO_FILE_ERRORS);
@@ -154,7 +153,7 @@ InternalIterator* TableCache::NewIterator(
    const ReadOptions& options, const EnvOptions& env_options,
    const InternalKeyComparator& icomparator, const FileDescriptor& fd,
    TableReader** table_reader_ptr, HistogramImpl* file_read_hist,
-    bool for_compaction, Arena* arena, bool skip_filters) {
+    bool for_compaction, Arena* arena) {
  PERF_TIMER_GUARD(new_table_iterator_nanos);

  if (table_reader_ptr != nullptr) {
@@ -177,10 +176,10 @@ InternalIterator* TableCache::NewIterator(
  } else {
    table_reader = fd.table_reader;
    if (table_reader == nullptr) {
-      Status s = FindTable(env_options, icomparator, fd, &handle,
-                           options.read_tier == kBlockCacheTier /* no_io */,
-                           !for_compaction /* record read_stats */,
-                           file_read_hist, skip_filters);
+      Status s =
+          FindTable(env_options, icomparator, fd, &handle,
+                    options.read_tier == kBlockCacheTier /* no_io */,
+                    !for_compaction /* record read_stats */, file_read_hist);
      if (!s.ok()) {
        return NewErrorInternalIterator(s, arena);
      }
@@ -188,8 +187,7 @@ InternalIterator* TableCache::NewIterator(
    }
  }

-  InternalIterator* result =
-      table_reader->NewIterator(options, arena, skip_filters);
+  InternalIterator* result = table_reader->NewIterator(options, arena);

  if (create_new_table_reader) {
    assert(handle == nullptr);
@@ -211,8 +209,7 @@ InternalIterator* TableCache::NewIterator(
 Status TableCache::Get(const ReadOptions& options,
                       const InternalKeyComparator& internal_comparator,
                       const FileDescriptor& fd, const Slice& k,
-                       GetContext* get_context, HistogramImpl* file_read_hist,
-                       bool skip_filters) {
+                       GetContext* get_context, HistogramImpl* file_read_hist) {
  TableReader* t = fd.table_reader;
  Status s;
  Cache::Handle* handle = nullptr;
@@ -222,9 +219,7 @@ Status TableCache::Get(const ReadOptions& options,
  IterKey row_cache_key;
  std::string row_cache_entry_buffer;

-  // Check row cache if enabled. Since row cache does not currently store
-  // sequence numbers, we cannot use it if we need to fetch the sequence.
-  if (ioptions_.row_cache && !get_context->NeedToReadSequence()) {
+  if (ioptions_.row_cache) {
    uint64_t fd_number = fd.GetNumber();
    auto user_key = ExtractUserKey(k);
    // We use the user key as cache key instead of the internal key,
@@ -261,19 +256,19 @@ Status TableCache::Get(const ReadOptions& options,
  if (!t) {
    s = FindTable(env_options_, internal_comparator, fd, &handle,
                  options.read_tier == kBlockCacheTier /* no_io */,
-                  true /* record_read_stats */, file_read_hist, skip_filters);
+                  true /* record_read_stats */, file_read_hist);
    if (s.ok()) {
      t = GetTableReaderFromHandle(handle);
    }
  }
  if (s.ok()) {
    get_context->SetReplayLog(row_cache_entry);  // nullptr if no cache.
-    s = t->Get(options, k, get_context, skip_filters);
+    s = t->Get(options, k, get_context);
    get_context->SetReplayLog(nullptr);
    if (handle != nullptr) {
      ReleaseHandle(handle);
    }
-  } else if (options.read_tier == kBlockCacheTier && s.IsIncomplete()) {
+  } else if (options.read_tier && s.IsIncomplete()) {
    // Couldn't find Table in cache but treat as kFound if no_io set
    get_context->MarkKeyMayExist();
    return Status::OK();
@@ -44,35 +44,30 @@ class TableCache {
  // the returned iterator.  The returned "*tableptr" object is owned by
  // the cache and should not be deleted, and is valid for as long as the
  // returned iterator is live.
-  // @param skip_filters Disables loading/accessing the filter block
  InternalIterator* NewIterator(
      const ReadOptions& options, const EnvOptions& toptions,
      const InternalKeyComparator& internal_comparator,
      const FileDescriptor& file_fd, TableReader** table_reader_ptr = nullptr,
      HistogramImpl* file_read_hist = nullptr, bool for_compaction = false,
-      Arena* arena = nullptr, bool skip_filters = false);
+      Arena* arena = nullptr);

  // If a seek to internal key "k" in specified file finds an entry,
  // call (*handle_result)(arg, found_key, found_value) repeatedly until
  // it returns false.
-  // @param skip_filters Disables loading/accessing the filter block
  Status Get(const ReadOptions& options,
             const InternalKeyComparator& internal_comparator,
             const FileDescriptor& file_fd, const Slice& k,
-             GetContext* get_context, HistogramImpl* file_read_hist = nullptr,
-             bool skip_filters = false);
+             GetContext* get_context, HistogramImpl* file_read_hist = nullptr);

  // Evict any entry for the specified file number
  static void Evict(Cache* cache, uint64_t file_number);

  // Find table reader
-  // @param skip_filters Disables loading/accessing the filter block
  Status FindTable(const EnvOptions& toptions,
                   const InternalKeyComparator& internal_comparator,
                   const FileDescriptor& file_fd, Cache::Handle**,
                   const bool no_io = false, bool record_read_stats = true,
-                   HistogramImpl* file_read_hist = nullptr,
-                   bool skip_filters = false);
+                   HistogramImpl* file_read_hist = nullptr);

  // Get TableReader from a cache handle.
  TableReader* GetTableReaderFromHandle(Cache::Handle* handle);
@@ -105,8 +100,7 @@ class TableCache {
                        const InternalKeyComparator& internal_comparator,
                        const FileDescriptor& fd, bool sequential_mode,
                        bool record_read_stats, HistogramImpl* file_read_hist,
-                        unique_ptr<TableReader>* table_reader,
-                        bool skip_filters = false);
+                        unique_ptr<TableReader>* table_reader);

  const ImmutableCFOptions& ioptions_;
  const EnvOptions& env_options_;
@@ -165,7 +165,7 @@ class VersionBuilder::Rep {
    for (int l = 0; !found && l < base_vstorage_->num_levels(); l++) {
      const std::vector<FileMetaData*>& base_files =
          base_vstorage_->LevelFiles(l);
-      for (size_t i = 0; i < base_files.size(); i++) {
+      for (unsigned int i = 0; i < base_files.size(); i++) {
        FileMetaData* f = base_files[i];
        if (f->fd.GetNumber() == number) {
          found = true;
@@ -338,8 +338,7 @@ class VersionBuilder::Rep {

  void MaybeAddFile(VersionStorageInfo* vstorage, int level, FileMetaData* f) {
    if (levels_[level].deleted_files.count(f->fd.GetNumber()) > 0) {
-      // f is to-be-delected table file
-      vstorage->RemoveCurrentStats(f);
+      // File is deleted: do nothing
    } else {
      vstorage->AddFile(level, f, info_log_);
    }
@@ -55,8 +55,7 @@ struct FileDescriptor {
    return packed_number_and_path_id & kFileNumberMask;
  }
  uint32_t GetPathId() const {
-    return static_cast<uint32_t>(
-        packed_number_and_path_id / (kFileNumberMask + 1));
+    return packed_number_and_path_id / (kFileNumberMask + 1);
  }
  uint64_t GetFileSize() const { return file_size; }
 };
@@ -84,11 +84,15 @@ int FindFileInRange(const InternalKeyComparator& icmp,
 // are MergeInProgress).
 class FilePicker {
 public:
-  FilePicker(std::vector<FileMetaData*>* files, const Slice& user_key,
-             const Slice& ikey, autovector<LevelFilesBrief>* file_levels,
-             unsigned int num_levels, FileIndexer* file_indexer,
-             const Comparator* user_comparator,
-             const InternalKeyComparator* internal_comparator)
+  FilePicker(
+      std::vector<FileMetaData*>* files,
+      const Slice& user_key,
+      const Slice& ikey,
+      autovector<LevelFilesBrief>* file_levels,
+      unsigned int num_levels,
+      FileIndexer* file_indexer,
+      const Comparator* user_comparator,
+      const InternalKeyComparator* internal_comparator)
      : num_levels_(num_levels),
        curr_level_(-1),
        hit_file_level_(-1),
@@ -98,7 +102,6 @@ class FilePicker {
        files_(files),
 #endif
        level_files_brief_(file_levels),
-        is_hit_file_last_in_level_(false),
        user_key_(user_key),
        ikey_(ikey),
        file_indexer_(file_indexer),
@@ -123,8 +126,6 @@ class FilePicker {
        // Loops over all files in current level.
        FdWithKeyRange* f = &curr_file_level_->files[curr_index_in_curr_level_];
        hit_file_level_ = curr_level_;
-        is_hit_file_last_in_level_ =
-            curr_index_in_curr_level_ == curr_file_level_->num_files - 1;
        int cmp_largest = -1;

        // Do key range filtering of files or/and fractional cascading if:
@@ -208,10 +209,6 @@ class FilePicker {
  // for GET_HIT_L0, GET_HIT_L1 & GET_HIT_L2_AND_UP counts
  unsigned int GetHitFileLevel() { return hit_file_level_; }

-  // Returns true if the most recent "hit file" (i.e., one returned by
-  // GetNextFile()) is at the last index in its level.
-  bool IsHitFileLastInLevel() { return is_hit_file_last_in_level_; }
-
 private:
  unsigned int num_levels_;
  unsigned int curr_level_;
@@ -223,7 +220,6 @@ class FilePicker {
 #endif
  autovector<LevelFilesBrief>* level_files_brief_;
  bool search_ended_;
-  bool is_hit_file_last_in_level_;
  LevelFilesBrief* curr_file_level_;
  unsigned int curr_index_in_curr_level_;
  unsigned int start_index_in_curr_level_;
@@ -479,21 +475,19 @@ class LevelFileNumIterator : public InternalIterator {

 class LevelFileIteratorState : public TwoLevelIteratorState {
 public:
-  // @param skip_filters Disables loading/accessing the filter block
  LevelFileIteratorState(TableCache* table_cache,
                         const ReadOptions& read_options,
                         const EnvOptions& env_options,
                         const InternalKeyComparator& icomparator,
                         HistogramImpl* file_read_hist, bool for_compaction,
-                         bool prefix_enabled, bool skip_filters)
+                         bool prefix_enabled)
      : TwoLevelIteratorState(prefix_enabled),
        table_cache_(table_cache),
        read_options_(read_options),
        env_options_(env_options),
        icomparator_(icomparator),
        file_read_hist_(file_read_hist),
-        for_compaction_(for_compaction),
-        skip_filters_(skip_filters) {}
+        for_compaction_(for_compaction) {}

  InternalIterator* NewSecondaryIterator(const Slice& meta_handle) override {
    if (meta_handle.size() != sizeof(FileDescriptor)) {
@@ -505,7 +499,7 @@ class LevelFileIteratorState : public TwoLevelIteratorState {
      return table_cache_->NewIterator(
          read_options_, env_options_, icomparator_, *fd,
          nullptr /* don't need reference to table*/, file_read_hist_,
-          for_compaction_, nullptr /* arena */, skip_filters_);
+          for_compaction_);
    }
  }

@@ -520,7 +514,6 @@ class LevelFileIteratorState : public TwoLevelIteratorState {
  const InternalKeyComparator& icomparator_;
  HistogramImpl* file_read_hist_;
  bool for_compaction_;
-  bool skip_filters_;
 };

 // A wrapper of version builder which references the current version in
@@ -745,27 +738,24 @@ uint64_t VersionStorageInfo::GetEstimatedActiveKeys() const {
  // (2) keys are directly overwritten
  // (3) deletion on non-existing keys
  // (4) low number of samples
-  if (current_num_samples_ == 0) {
+  if (num_samples_ == 0) {
    return 0;
  }

-  if (current_num_non_deletions_ <= current_num_deletions_) {
+  if (accumulated_num_non_deletions_ <= accumulated_num_deletions_) {
    return 0;
  }

-  uint64_t est = current_num_non_deletions_ - current_num_deletions_;
+  uint64_t est = accumulated_num_non_deletions_ - accumulated_num_deletions_;

  uint64_t file_count = 0;
  for (int level = 0; level < num_levels_; ++level) {
    file_count += files_[level].size();
  }

-  if (current_num_samples_ < file_count) {
+  if (num_samples_ < file_count) {
    // casting to avoid overflowing
-    return
-      static_cast<uint64_t>(
-        (est * static_cast<double>(file_count) / current_num_samples_)
-      );
+    return (est * static_cast<double>(file_count) / num_samples_);
  } else {
    return est;
  }
@@ -802,8 +792,7 @@ void Version::AddIterators(const ReadOptions& read_options,
                                 cfd_->internal_comparator(),
                                 cfd_->internal_stats()->GetFileReadHist(level),
                                 false /* for_compaction */,
-                                 cfd_->ioptions()->prefix_extractor != nullptr,
-                                 IsFilterSkipped(level));
+                                 cfd_->ioptions()->prefix_extractor != nullptr);
      mem = arena->AllocateAligned(sizeof(LevelFileNumIterator));
      auto* first_level_iter = new (mem) LevelFileNumIterator(
          cfd_->internal_comparator(), &storage_info_.LevelFilesBrief(level));
@@ -837,9 +826,7 @@ VersionStorageInfo::VersionStorageInfo(
      accumulated_raw_value_size_(0),
      accumulated_num_non_deletions_(0),
      accumulated_num_deletions_(0),
-      current_num_non_deletions_(0),
-      current_num_deletions_(0),
-      current_num_samples_(0),
+      num_samples_(0),
      estimated_compaction_needed_bytes_(0),
      finalized_(false) {
  if (ref_vstorage != nullptr) {
@@ -849,9 +836,7 @@ VersionStorageInfo::VersionStorageInfo(
    accumulated_num_non_deletions_ =
        ref_vstorage->accumulated_num_non_deletions_;
    accumulated_num_deletions_ = ref_vstorage->accumulated_num_deletions_;
-    current_num_non_deletions_ = ref_vstorage->current_num_non_deletions_;
-    current_num_deletions_ = ref_vstorage->current_num_deletions_;
-    current_num_samples_ = ref_vstorage->current_num_samples_;
+    num_samples_ = ref_vstorage->num_samples_;
  }
 }

@@ -879,24 +864,21 @@ Version::Version(ColumnFamilyData* column_family_data, VersionSet* vset,
      refs_(0),
      version_number_(version_number) {}

-void Version::Get(const ReadOptions& read_options, const LookupKey& k,
-                  std::string* value, Status* status,
-                  MergeContext* merge_context, bool* value_found,
-                  bool* key_exists, SequenceNumber* seq) {
+void Version::Get(const ReadOptions& read_options,
+                  const LookupKey& k,
+                  std::string* value,
+                  Status* status,
+                  MergeContext* merge_context,
+                  bool* value_found) {
  Slice ikey = k.internal_key();
  Slice user_key = k.user_key();

  assert(status->ok() || status->IsMergeInProgress());

-  if (key_exists != nullptr) {
-    // will falsify below if not found
-    *key_exists = true;
-  }
-
  GetContext get_context(
      user_comparator(), merge_operator_, info_log_, db_statistics_,
      status->ok() ? GetContext::kNotFound : GetContext::kMerge, user_key,
-      value, value_found, merge_context, this->env_, seq);
+      value, value_found, merge_context, this->env_);

  FilePicker fp(
      storage_info_.files_, user_key, ikey, &storage_info_.level_files_brief_,
@@ -906,9 +888,7 @@ void Version::Get(const ReadOptions& read_options, const LookupKey& k,
  while (f != nullptr) {
    *status = table_cache_->Get(
        read_options, *internal_comparator(), f->fd, ikey, &get_context,
-        cfd_->internal_stats()->GetFileReadHist(fp.GetHitFileLevel()),
-        IsFilterSkipped(static_cast<int>(fp.GetHitFileLevel()),
-                        fp.IsHitFileLastInLevel()));
+        cfd_->internal_stats()->GetFileReadHist(fp.GetHitFileLevel()));
    // TODO: examine the behavior for corrupted key
    if (!status->ok()) {
      return;
@@ -958,21 +938,10 @@ void Version::Get(const ReadOptions& read_options, const LookupKey& k,
                                   user_key);
    }
  } else {
-    if (key_exists != nullptr) {
-      *key_exists = false;
-    }
    *status = Status::NotFound(); // Use an empty error message for speed
  }
 }

-bool Version::IsFilterSkipped(int level, bool is_file_last_in_level) {
-  // Reaching the bottom level implies misses at all upper levels, so we'll
-  // skip checking the filters when we predict a hit.
-  return cfd_->ioptions()->optimize_filters_for_hits &&
-         (level > 0 || is_file_last_in_level) &&
-         level == storage_info_.num_non_empty_levels() - 1;
-}
-
 void VersionStorageInfo::GenerateLevelFilesBrief() {
  level_files_brief_.resize(num_non_empty_levels_);
  for (int level = 0; level < num_non_empty_levels_; level++) {
@@ -1024,20 +993,7 @@ void VersionStorageInfo::UpdateAccumulatedStats(FileMetaData* file_meta) {
  accumulated_num_non_deletions_ +=
      file_meta->num_entries - file_meta->num_deletions;
  accumulated_num_deletions_ += file_meta->num_deletions;
-
-  current_num_non_deletions_ +=
-      file_meta->num_entries - file_meta->num_deletions;
-  current_num_deletions_ += file_meta->num_deletions;
-  current_num_samples_++;
-}
-
-void VersionStorageInfo::RemoveCurrentStats(FileMetaData* file_meta) {
-  if (file_meta->init_stats_from_file) {
-    current_num_non_deletions_ -=
-        file_meta->num_entries - file_meta->num_deletions;
-    current_num_deletions_ -= file_meta->num_deletions;
-    current_num_samples_--;
-  }
+  num_samples_++;
 }

 void Version::UpdateAccumulatedStats(bool update_stats) {
@@ -1128,7 +1084,6 @@ void VersionStorageInfo::EstimateCompactionBytesNeeded(
    const MutableCFOptions& mutable_cf_options) {
  // Only implemented for level-based compaction
  if (compaction_style_ != kCompactionStyleLevel) {
-    estimated_compaction_needed_bytes_ = 0;
    return;
  }

@@ -1184,6 +1139,9 @@ void VersionStorageInfo::EstimateCompactionBytesNeeded(
 void VersionStorageInfo::ComputeCompactionScore(
    const MutableCFOptions& mutable_cf_options,
    const CompactionOptionsFIFO& compaction_options_fifo) {
+  double max_score = 0;
+  int max_score_level = 0;
+
  for (int level = 0; level <= MaxInputLevel(); level++) {
    double score;
    if (level == 0) {
@@ -1234,11 +1192,19 @@ void VersionStorageInfo::ComputeCompactionScore(
      }
      score = static_cast<double>(level_bytes_no_compacting) /
              MaxBytesForLevel(level);
+      if (max_score < score) {
+        max_score = score;
+        max_score_level = level;
+      }
    }
    compaction_level_[level] = level;
    compaction_score_[level] = score;
  }

+  // update the max compaction score in levels 1 to n-1
+  max_compaction_score_ = max_score;
+  max_compaction_score_level_ = max_score_level;
+
  // sort all the levels based on their score. Higher scores get listed
  // first. Use bubble sort because the number of entries are small.
  for (int i = 0; i < num_levels() - 2; i++) {
@@ -1284,7 +1250,7 @@ namespace {

 // used to sort files by size
 struct Fsize {
-  size_t index;
+  int index;
  FileMetaData* file;
 };

@@ -1392,7 +1358,7 @@ void VersionStorageInfo::UpdateFilesByCompactionPri(

    // populate a temp vector for sorting based on size
    std::vector<Fsize> temp(files.size());
-    for (size_t i = 0; i < files.size(); i++) {
+    for (unsigned int i = 0; i < files.size(); i++) {
      temp[i].index = i;
      temp[i].file = files[i];
    }
@@ -1403,30 +1369,24 @@ void VersionStorageInfo::UpdateFilesByCompactionPri(
      num = temp.size();
    }
    switch (mutable_cf_options.compaction_pri) {
-      case kByCompensatedSize:
+      case kCompactionPriByCompensatedSize:
        std::partial_sort(temp.begin(), temp.begin() + num, temp.end(),
                          CompareCompensatedSizeDescending);
        break;
-      case kOldestLargestSeqFirst:
+      case kCompactionPriByLargestSeq:
        std::sort(temp.begin(), temp.end(),
                  [this](const Fsize& f1, const Fsize& f2) -> bool {
                    return f1.file->largest_seqno < f2.file->largest_seqno;
                  });
        break;
-      case kOldestSmallestSeqFirst:
-        std::sort(temp.begin(), temp.end(),
-                  [this](const Fsize& f1, const Fsize& f2) -> bool {
-                    return f1.file->smallest_seqno < f2.file->smallest_seqno;
-                  });
-        break;
      default:
        assert(false);
    }
    assert(temp.size() == files.size());

    // initialize files_by_compaction_pri_
-    for (size_t i = 0; i < temp.size(); i++) {
-      files_by_compaction_pri.push_back(static_cast<int>(temp[i].index));
+    for (unsigned int i = 0; i < temp.size(); i++) {
+      files_by_compaction_pri.push_back(temp[i].index);
    }
    next_file_to_compact_by_size_[level] = 0;
    assert(files_[level].size() == files_by_compaction_pri_[level].size());
@@ -2146,8 +2106,7 @@ Status VersionSet::LogAndApply(ColumnFamilyData* column_family_data,
      // unlimited table cache. Pre-load table handle now.
      // Need to do it out of the mutex.
      builder_guard->version_builder()->LoadTableHandlers(
-          column_family_data->internal_stats(),
-          column_family_data->ioptions()->optimize_filters_for_hits);
+          column_family_data->internal_stats());
    }

    // This is fine because everything inside of this block is serialized --
@@ -2199,6 +2158,27 @@ Status VersionSet::LogAndApply(ColumnFamilyData* column_family_data,
      if (!s.ok()) {
        Log(InfoLogLevel::ERROR_LEVEL, db_options_->info_log,
            "MANIFEST write: %s\n", s.ToString().c_str());
+        bool all_records_in = true;
+        for (auto& e : batch_edits) {
+          std::string record;
+          if (!e->EncodeTo(&record)) {
+            s = Status::Corruption(
+                "Unable to Encode VersionEdit:" + e->DebugString(true));
+            all_records_in = false;
+            break;
+          }
+          if (!ManifestContains(pending_manifest_file_number_, record)) {
+            all_records_in = false;
+            break;
+          }
+        }
+        if (all_records_in) {
+          Log(InfoLogLevel::WARN_LEVEL, db_options_->info_log,
+              "MANIFEST contains log record despite error; advancing to new "
+              "version to prevent mismatch between in-memory and logged state"
+              " If paranoid is set, then the db is now in readonly mode.");
+          s = Status::OK();
+        }
      }
    }

@@ -2224,7 +2204,6 @@ Status VersionSet::LogAndApply(ColumnFamilyData* column_family_data,
    }

    if (edit->is_column_family_drop_) {
-      TEST_SYNC_POINT("VersionSet::LogAndApply::ColumnFamilyDrop:0");
      TEST_SYNC_POINT("VersionSet::LogAndApply::ColumnFamilyDrop:1");
      TEST_SYNC_POINT("VersionSet::LogAndApply::ColumnFamilyDrop:2");
    }
@@ -2268,8 +2247,7 @@ Status VersionSet::LogAndApply(ColumnFamilyData* column_family_data,
    Log(InfoLogLevel::ERROR_LEVEL, db_options_->info_log,
        "Error in committing version %lu to [%s]",
        (unsigned long)v->GetVersionNumber(),
-        column_family_data ? column_family_data->GetName().c_str()
-                           : "<null>");
+        column_family_data->GetName().c_str());
    delete v;
    if (new_descriptor_log) {
      Log(InfoLogLevel::INFO_LEVEL, db_options_->info_log,
@@ -3053,6 +3031,45 @@ Status VersionSet::WriteSnapshot(log::Writer* log) {
  return Status::OK();
 }

+// Opens the mainfest file and reads all records
+// till it finds the record we are looking for.
+bool VersionSet::ManifestContains(uint64_t manifest_file_num,
+                                  const std::string& record) const {
+  std::string fname = DescriptorFileName(dbname_, manifest_file_num);
+  Log(InfoLogLevel::INFO_LEVEL, db_options_->info_log,
+      "ManifestContains: checking %s\n", fname.c_str());
+
+  unique_ptr<SequentialFileReader> file_reader;
+  Status s;
+  {
+    unique_ptr<SequentialFile> file;
+    s = env_->NewSequentialFile(fname, &file, env_options_);
+    if (!s.ok()) {
+      Log(InfoLogLevel::INFO_LEVEL, db_options_->info_log,
+          "ManifestContains: %s\n", s.ToString().c_str());
+      Log(InfoLogLevel::INFO_LEVEL, db_options_->info_log,
+          "ManifestContains: is unable to reopen the manifest file  %s",
+          fname.c_str());
+      return false;
+    }
+    file_reader.reset(new SequentialFileReader(std::move(file)));
+  }
+  log::Reader reader(NULL, std::move(file_reader), nullptr,
+                     true /*checksum*/, 0, 0);
+  Slice r;
+  std::string scratch;
+  bool result = false;
+  while (reader.ReadRecord(&r, &scratch)) {
+    if (r == Slice(record)) {
+      result = true;
+      break;
+    }
+  }
+  Log(InfoLogLevel::INFO_LEVEL, db_options_->info_log,
+      "ManifestContains: result = %d\n", result ? 1 : 0);
+  return result;
+}
+
 // TODO(aekmekji): in CompactionJob::GenSubcompactionBoundaries(), this
 // function is called repeatedly with consecutive pairs of slices. For example
 // if the slice list is [a, b, c, d] this function is called with arguments
@@ -3235,8 +3252,7 @@ InternalIterator* VersionSet::MakeInputIterator(Compaction* c) {
                cfd->table_cache(), read_options, env_options_,
                cfd->internal_comparator(),
                nullptr /* no per level latency histogram */,
-                true /* for_compaction */, false /* prefix enabled */,
-                false /* skip_filters */),
+                true /* for_compaction */, false /* prefix enabled */),
            new LevelFileNumIterator(cfd->internal_comparator(),
                                     c->input_levels(which)));
      }
@@ -3282,7 +3298,7 @@ bool VersionSet::VerifyCompactionFileConsistency(Compaction* c) {
    for (size_t i = 0; i < c->num_input_files(input); ++i) {
      uint64_t number = c->input(input, i)->fd.GetNumber();
      bool found = false;
-      for (size_t j = 0; j < vstorage->files_[level].size(); j++) {
+      for (unsigned int j = 0; j < vstorage->files_[level].size(); j++) {
        FileMetaData* f = vstorage->files_[level][j];
        if (f->fd.GetNumber() == number) {
          found = true;
@@ -111,9 +111,6 @@ class VersionStorageInfo {
  // Update the accumulated stats from a file-meta.
  void UpdateAccumulatedStats(FileMetaData* file_meta);

-  // Decrease the current stat form a to-be-delected file-meta
-  void RemoveCurrentStats(FileMetaData* file_meta);
-
  void ComputeCompensatedSizes();

  // Updates internal structures that keep track of compaction scores
@@ -146,6 +143,12 @@ class VersionStorageInfo {

  int MaxInputLevel() const;

+  // Returns the maxmimum compaction score for levels 1 to max
+  double max_compaction_score() const { return max_compaction_score_; }
+
+  // See field declaration
+  int max_compaction_score_level() const { return max_compaction_score_level_; }
+
  // Return level number that has idx'th highest score
  int CompactionScoreLevel(int idx) const { return compaction_level_[idx]; }

@@ -325,10 +328,6 @@ class VersionStorageInfo {
    return estimated_compaction_needed_bytes_;
  }

-  void TEST_set_estimated_compaction_needed_bytes(uint64_t v) {
-    estimated_compaction_needed_bytes_ = v;
-  }
-
 private:
  const InternalKeyComparator* internal_comparator_;
  const Comparator* user_comparator_;
@@ -385,6 +384,8 @@ class VersionStorageInfo {
  // These are used to pick the best compaction level
  std::vector<double> compaction_score_;
  std::vector<int> compaction_level_;
+  double max_compaction_score_ = 0.0;   // max score in l1 to ln-1
+  int max_compaction_score_level_ = 0;  // level on which max score occurs
  int l0_delay_trigger_count_ = 0;  // Count used to trigger slow down and stop
                                    // for number of L0 files.

@@ -399,12 +400,8 @@ class VersionStorageInfo {
  uint64_t accumulated_num_non_deletions_;
  // total number of deletion entries
  uint64_t accumulated_num_deletions_;
-  // current number of non_deletion entries
-  uint64_t current_num_non_deletions_;
-  // current number of delection entries
-  uint64_t current_num_deletions_;
-  // current number of file samples
-  uint64_t current_num_samples_;
+  // the number of samples
+  uint64_t num_samples_;
  // Estimated bytes needed to be compacted until all levels' size is down to
  // target sizes.
  uint64_t estimated_compaction_needed_bytes_;
@@ -428,24 +425,11 @@ class Version {

  // Lookup the value for key.  If found, store it in *val and
  // return OK.  Else return a non-OK status.
-  // Uses *operands to store merge_operator operations to apply later.
-  //
-  // If the ReadOptions.read_tier is set to do a read-only fetch, then
-  // *value_found will be set to false if it cannot be determined whether
-  // this value exists without doing IO.
-  //
-  // If the key is Deleted, *status will be set to NotFound and
-  //                        *key_exists will be set to true.
-  // If no key was found, *status will be set to NotFound and
-  //                      *key_exists will be set to false.
-  // If seq is non-null, *seq will be set to the sequence number found
-  // for the key if a key was found.
-  //
+  // Uses *operands to store merge_operator operations to apply later
  // REQUIRES: lock is not held
  void Get(const ReadOptions&, const LookupKey& key, std::string* val,
           Status* status, MergeContext* merge_context,
-           bool* value_found = nullptr, bool* key_exists = nullptr,
-           SequenceNumber* seq = nullptr);
+           bool* value_found = nullptr);

  // Loads some stats information from files. Call without mutex held. It needs
  // to be called before applying the version to the version set.
@@ -526,12 +510,6 @@ class Version {
                      InternalIterator* level_iter,
                      const Slice& internal_prefix) const;

-  // Returns true if the filter blocks in the specified level will not be
-  // checked during read operations. In certain cases (trivial move or preload),
-  // the filter block may already be cached, but we still do not access it such
-  // that it eventually expires from the cache.
-  bool IsFilterSkipped(int level, bool is_file_last_in_level = false);
-
  // The helper function of UpdateAccumulatedStats, which may fill the missing
  // fields of file_mata from its associated TableProperties.
  // Returns true if it does initialize FileMetaData.
@@ -731,6 +709,9 @@ class VersionSet {

  void AppendVersion(ColumnFamilyData* column_family_data, Version* v);

+  bool ManifestContains(uint64_t manifest_file_number,
+                        const std::string& record) const;
+
  ColumnFamilyData* CreateColumnFamily(const ColumnFamilyOptions& cf_options,
                                       VersionEdit* edit);

@@ -23,7 +23,7 @@ class GenerateLevelFilesBriefTest : public testing::Test {
  GenerateLevelFilesBriefTest() { }

  ~GenerateLevelFilesBriefTest() {
-    for (size_t i = 0; i < files_.size(); i++) {
+    for (unsigned int i = 0; i < files_.size(); i++) {
      delete files_[i];
    }
  }
@@ -329,8 +329,8 @@ Status WalManager::GetSortedWalsOfType(const std::string& path,
        return s;
      }

-      log_files.push_back(std::unique_ptr<LogFile>(
-          new LogFileImpl(number, log_type, sequence, size_bytes)));
+      log_files.push_back(std::move(std::unique_ptr<LogFile>(
+          new LogFileImpl(number, log_type, sequence, size_bytes))));
    }
  }
  CompareLogByPointer compare_log_files;
@@ -95,7 +95,7 @@ class WalManagerTest : public testing::Test {
    Status status = wal_manager_->GetUpdatesSince(
        seq, &iter, TransactionLogIterator::ReadOptions(), versions_.get());
    EXPECT_OK(status);
-    return iter;
+    return std::move(iter);
  }

  std::unique_ptr<MockEnv> env_;
@@ -184,7 +184,7 @@ std::vector<std::uint64_t> ListSpecificFiles(
      }
    }
  }
-  return file_numbers;
+  return std::move(file_numbers);
 }

 int CountRecords(TransactionLogIterator* iter) {
@@ -28,12 +28,10 @@

 #include <stack>
 #include <stdexcept>
-#include <vector>

 #include "db/column_family.h"
 #include "db/db_impl.h"
 #include "db/dbformat.h"
-#include "db/flush_scheduler.h"
 #include "db/memtable.h"
 #include "db/snapshot_impl.h"
 #include "db/write_batch_internal.h"
@@ -131,7 +129,11 @@ WriteBatch& WriteBatch::operator=(WriteBatch&& src) {
  return *this;
 }

-WriteBatch::~WriteBatch() { delete save_points_; }
+WriteBatch::~WriteBatch() {
+  if (save_points_ != nullptr) {
+    delete save_points_;
+  }
+}

 WriteBatch::Handler::~Handler() { }

@@ -538,42 +540,35 @@ Status WriteBatch::RollbackToSavePoint() {
 }

 namespace {
+// This class can *only* be used from a single-threaded write thread, because it
+// calls ColumnFamilyMemTablesImpl::Seek()
 class MemTableInserter : public WriteBatch::Handler {
 public:
  SequenceNumber sequence_;
-  ColumnFamilyMemTables* const cf_mems_;
-  FlushScheduler* const flush_scheduler_;
-  const bool ignore_missing_column_families_;
-  const uint64_t log_number_;
+  ColumnFamilyMemTables* cf_mems_;
+  bool ignore_missing_column_families_;
+  uint64_t log_number_;
  DBImpl* db_;
  const bool dont_filter_deletes_;
-  const bool concurrent_memtable_writes_;

-  // cf_mems should not be shared with concurrent inserters
  MemTableInserter(SequenceNumber sequence, ColumnFamilyMemTables* cf_mems,
-                   FlushScheduler* flush_scheduler,
                   bool ignore_missing_column_families, uint64_t log_number,
-                   DB* db, const bool dont_filter_deletes,
-                   bool concurrent_memtable_writes)
+                   DB* db, const bool dont_filter_deletes)
      : sequence_(sequence),
        cf_mems_(cf_mems),
-        flush_scheduler_(flush_scheduler),
        ignore_missing_column_families_(ignore_missing_column_families),
        log_number_(log_number),
        db_(reinterpret_cast<DBImpl*>(db)),
-        dont_filter_deletes_(dont_filter_deletes),
-        concurrent_memtable_writes_(concurrent_memtable_writes) {
-    assert(cf_mems_);
+        dont_filter_deletes_(dont_filter_deletes) {
+    assert(cf_mems);
    if (!dont_filter_deletes_) {
      assert(db_);
    }
  }

  bool SeekToColumnFamily(uint32_t column_family_id, Status* s) {
-    // If we are in a concurrent mode, it is the caller's responsibility
-    // to clone the original ColumnFamilyMemTables so that each thread
-    // has its own instance.  Otherwise, it must be guaranteed that there
-    // is no concurrent access
+    // We are only allowed to call this from a single-threaded write thread
+    // (or while holding DB mutex)
    bool found = cf_mems_->Seek(column_family_id);
    if (!found) {
      if (ignore_missing_column_families_) {
@@ -607,13 +602,11 @@ class MemTableInserter : public WriteBatch::Handler {
    MemTable* mem = cf_mems_->GetMemTable();
    auto* moptions = mem->GetMemTableOptions();
    if (!moptions->inplace_update_support) {
-      mem->Add(sequence_, kTypeValue, key, value, concurrent_memtable_writes_);
+      mem->Add(sequence_, kTypeValue, key, value);
    } else if (moptions->inplace_callback == nullptr) {
-      assert(!concurrent_memtable_writes_);
      mem->Update(sequence_, key, value);
      RecordTick(moptions->statistics, NUMBER_KEYS_UPDATED);
    } else {
-      assert(!concurrent_memtable_writes_);
      if (mem->UpdateCallback(sequence_, key, value)) {
      } else {
        // key not found in memtable. Do sst get, update, add
@@ -651,7 +644,7 @@ class MemTableInserter : public WriteBatch::Handler {
    // sequence number. Even if the update eventually fails and does not result
    // in memtable add/update.
    sequence_++;
-    CheckMemtableFull();
+    cf_mems_->CheckMemtableFull();
    return Status::OK();
  }

@@ -665,7 +658,6 @@ class MemTableInserter : public WriteBatch::Handler {
    MemTable* mem = cf_mems_->GetMemTable();
    auto* moptions = mem->GetMemTableOptions();
    if (!dont_filter_deletes_ && moptions->filter_deletes) {
-      assert(!concurrent_memtable_writes_);
      SnapshotImpl read_from_snapshot;
      read_from_snapshot.number_ = sequence_;
      ReadOptions ropts;
@@ -680,9 +672,9 @@ class MemTableInserter : public WriteBatch::Handler {
        return Status::OK();
      }
    }
-    mem->Add(sequence_, delete_type, key, Slice(), concurrent_memtable_writes_);
+    mem->Add(sequence_, delete_type, key, Slice());
    sequence_++;
-    CheckMemtableFull();
+    cf_mems_->CheckMemtableFull();
    return Status::OK();
  }

@@ -698,7 +690,6 @@ class MemTableInserter : public WriteBatch::Handler {

  virtual Status MergeCF(uint32_t column_family_id, const Slice& key,
                         const Slice& value) override {
-    assert(!concurrent_memtable_writes_);
    Status seek_status;
    if (!SeekToColumnFamily(column_family_id, &seek_status)) {
      ++sequence_;
@@ -773,38 +764,24 @@ class MemTableInserter : public WriteBatch::Handler {
    }

    sequence_++;
-    CheckMemtableFull();
+    cf_mems_->CheckMemtableFull();
    return Status::OK();
  }
-
-  void CheckMemtableFull() {
-    if (flush_scheduler_ != nullptr) {
-      auto* cfd = cf_mems_->current();
-      assert(cfd != nullptr);
-      if (cfd->mem()->ShouldScheduleFlush() &&
-          cfd->mem()->MarkFlushScheduled()) {
-        // MarkFlushScheduled only returns true if we are the one that
-        // should take action, so no need to dedup further
-        flush_scheduler_->ScheduleFlush(cfd);
-      }
-    }
-  }
 };
 }  // namespace

 // This function can only be called in these conditions:
 // 1) During Recovery()
 // 2) During Write(), in a single-threaded write thread
-// 3) During Write(), in a concurrent context where memtables has been cloned
 // The reason is that it calls memtables->Seek(), which has a stateful cache
-Status WriteBatchInternal::InsertInto(
-    const autovector<WriteBatch*>& batches, SequenceNumber sequence,
-    ColumnFamilyMemTables* memtables, FlushScheduler* flush_scheduler,
-    bool ignore_missing_column_families, uint64_t log_number, DB* db,
-    const bool dont_filter_deletes, bool concurrent_memtable_writes) {
-  MemTableInserter inserter(sequence, memtables, flush_scheduler,
-                            ignore_missing_column_families, log_number, db,
-                            dont_filter_deletes, concurrent_memtable_writes);
+Status WriteBatchInternal::InsertInto(const autovector<WriteBatch*>& batches,
+                                      SequenceNumber sequence,
+                                      ColumnFamilyMemTables* memtables,
+                                      bool ignore_missing_column_families,
+                                      uint64_t log_number, DB* db,
+                                      const bool dont_filter_deletes) {
+  MemTableInserter inserter(sequence, memtables, ignore_missing_column_families,
+                            log_number, db, dont_filter_deletes);
  Status rv = Status::OK();
  for (size_t i = 0; i < batches.size() && rv.ok(); ++i) {
    rv = batches[i]->Iterate(&inserter);
@@ -814,15 +791,12 @@ Status WriteBatchInternal::InsertInto(

 Status WriteBatchInternal::InsertInto(const WriteBatch* batch,
                                      ColumnFamilyMemTables* memtables,
-                                      FlushScheduler* flush_scheduler,
                                      bool ignore_missing_column_families,
                                      uint64_t log_number, DB* db,
-                                      const bool dont_filter_deletes,
-                                      bool concurrent_memtable_writes) {
+                                      const bool dont_filter_deletes) {
  MemTableInserter inserter(WriteBatchInternal::Sequence(batch), memtables,
-                            flush_scheduler, ignore_missing_column_families,
-                            log_number, db, dont_filter_deletes,
-                            concurrent_memtable_writes);
+                            ignore_missing_column_families, log_number, db,
+                            dont_filter_deletes);
  return batch->Iterate(&inserter);
 }

@@ -8,7 +8,6 @@
 // found in the LICENSE file. See the AUTHORS file for names of contributors.

 #pragma once
-#include <vector>
 #include "rocksdb/types.h"
 #include "rocksdb/write_batch.h"
 #include "rocksdb/db.h"
@@ -18,8 +17,6 @@
 namespace rocksdb {

 class MemTable;
-class FlushScheduler;
-class ColumnFamilyData;

 class ColumnFamilyMemTables {
 public:
@@ -31,7 +28,7 @@ class ColumnFamilyMemTables {
  virtual uint64_t GetLogNumber() const = 0;
  virtual MemTable* GetMemTable() const = 0;
  virtual ColumnFamilyHandle* GetColumnFamilyHandle() = 0;
-  virtual ColumnFamilyData* current() { return nullptr; }
+  virtual void CheckMemtableFull() = 0;
 };

 class ColumnFamilyMemTablesDefault : public ColumnFamilyMemTables {
@@ -53,6 +50,8 @@ class ColumnFamilyMemTablesDefault : public ColumnFamilyMemTables {

  ColumnFamilyHandle* GetColumnFamilyHandle() override { return nullptr; }

+  void CheckMemtableFull() override {}
+
 private:
  bool ok_;
  MemTable* mem_;
@@ -128,29 +127,19 @@ class WriteBatchInternal {
  //
  // If log_number is non-zero, the memtable will be updated only if
  // memtables->GetLogNumber() >= log_number.
-  //
-  // If flush_scheduler is non-null, it will be invoked if the memtable
-  // should be flushed.
-  //
-  // Under concurrent use, the caller is responsible for making sure that
-  // the memtables object itself is thread-local.
  static Status InsertInto(const autovector<WriteBatch*>& batches,
                           SequenceNumber sequence,
                           ColumnFamilyMemTables* memtables,
-                           FlushScheduler* flush_scheduler,
                           bool ignore_missing_column_families = false,
                           uint64_t log_number = 0, DB* db = nullptr,
-                           const bool dont_filter_deletes = true,
-                           bool concurrent_memtable_writes = false);
+                           const bool dont_filter_deletes = true);

  // Convenience form of InsertInto when you have only one batch
  static Status InsertInto(const WriteBatch* batch,
                           ColumnFamilyMemTables* memtables,
-                           FlushScheduler* flush_scheduler,
                           bool ignore_missing_column_families = false,
                           uint64_t log_number = 0, DB* db = nullptr,
-                           const bool dont_filter_deletes = true,
-                           bool concurrent_memtable_writes = false);
+                           const bool dont_filter_deletes = true);

  static void Append(WriteBatch* dst, const WriteBatch* src);

@@ -37,7 +37,7 @@ static std::string PrintContents(WriteBatch* b) {
  mem->Ref();
  std::string state;
  ColumnFamilyMemTablesDefault cf_mems_default(mem);
-  Status s = WriteBatchInternal::InsertInto(b, &cf_mems_default, nullptr);
+  Status s = WriteBatchInternal::InsertInto(b, &cf_mems_default);
  int count = 0;
  int put_count = 0;
  int delete_count = 0;
@@ -308,120 +308,6 @@ TEST_F(WriteBatchTest, Blob) {
      handler.seen);
 }

-// It requires more than 30GB of memory to run the test. With single memory
-// allocation of more than 30GB.
-// Not all platform can run it. Also it runs a long time. So disable it.
-TEST_F(WriteBatchTest, DISABLED_ManyUpdates) {
-  // Insert key and value of 3GB and push total batch size to 12GB.
-  static const size_t kKeyValueSize = 4u;
-  static const uint32_t kNumUpdates = 3 << 30;
-  std::string raw(kKeyValueSize, 'A');
-  WriteBatch batch(kNumUpdates * (4 + kKeyValueSize * 2) + 1024u);
-  char c = 'A';
-  for (uint32_t i = 0; i < kNumUpdates; i++) {
-    if (c > 'Z') {
-      c = 'A';
-    }
-    raw[0] = c;
-    raw[raw.length() - 1] = c;
-    c++;
-    batch.Put(raw, raw);
-  }
-
-  ASSERT_EQ(kNumUpdates, batch.Count());
-
-  struct NoopHandler : public WriteBatch::Handler {
-    uint32_t num_seen = 0;
-    char expected_char = 'A';
-    virtual Status PutCF(uint32_t column_family_id, const Slice& key,
-                         const Slice& value) override {
-      EXPECT_EQ(kKeyValueSize, key.size());
-      EXPECT_EQ(kKeyValueSize, value.size());
-      EXPECT_EQ(expected_char, key[0]);
-      EXPECT_EQ(expected_char, value[0]);
-      EXPECT_EQ(expected_char, key[kKeyValueSize - 1]);
-      EXPECT_EQ(expected_char, value[kKeyValueSize - 1]);
-      expected_char++;
-      if (expected_char > 'Z') {
-        expected_char = 'A';
-      }
-      ++num_seen;
-      return Status::OK();
-    }
-    virtual Status DeleteCF(uint32_t column_family_id,
-                            const Slice& key) override {
-      EXPECT_TRUE(false);
-      return Status::OK();
-    }
-    virtual Status SingleDeleteCF(uint32_t column_family_id,
-                                  const Slice& key) override {
-      EXPECT_TRUE(false);
-      return Status::OK();
-    }
-    virtual Status MergeCF(uint32_t column_family_id, const Slice& key,
-                           const Slice& value) override {
-      EXPECT_TRUE(false);
-      return Status::OK();
-    }
-    virtual void LogData(const Slice& blob) override { EXPECT_TRUE(false); }
-    virtual bool Continue() override { return num_seen < kNumUpdates; }
-  } handler;
-
-  batch.Iterate(&handler);
-  ASSERT_EQ(kNumUpdates, handler.num_seen);
-}
-
-// The test requires more than 18GB memory to run it, with single memory
-// allocation of more than 12GB. Not all the platform can run it. So disable it.
-TEST_F(WriteBatchTest, DISABLED_LargeKeyValue) {
-  // Insert key and value of 3GB and push total batch size to 12GB.
-  static const size_t kKeyValueSize = 3221225472u;
-  std::string raw(kKeyValueSize, 'A');
-  WriteBatch batch(12884901888u + 1024u);
-  for (char i = 0; i < 2; i++) {
-    raw[0] = 'A' + i;
-    raw[raw.length() - 1] = 'A' - i;
-    batch.Put(raw, raw);
-  }
-
-  ASSERT_EQ(2, batch.Count());
-
-  struct NoopHandler : public WriteBatch::Handler {
-    int num_seen = 0;
-    virtual Status PutCF(uint32_t column_family_id, const Slice& key,
-                         const Slice& value) override {
-      EXPECT_EQ(kKeyValueSize, key.size());
-      EXPECT_EQ(kKeyValueSize, value.size());
-      EXPECT_EQ('A' + num_seen, key[0]);
-      EXPECT_EQ('A' + num_seen, value[0]);
-      EXPECT_EQ('A' - num_seen, key[kKeyValueSize - 1]);
-      EXPECT_EQ('A' - num_seen, value[kKeyValueSize - 1]);
-      ++num_seen;
-      return Status::OK();
-    }
-    virtual Status DeleteCF(uint32_t column_family_id,
-                            const Slice& key) override {
-      EXPECT_TRUE(false);
-      return Status::OK();
-    }
-    virtual Status SingleDeleteCF(uint32_t column_family_id,
-                                  const Slice& key) override {
-      EXPECT_TRUE(false);
-      return Status::OK();
-    }
-    virtual Status MergeCF(uint32_t column_family_id, const Slice& key,
-                           const Slice& value) override {
-      EXPECT_TRUE(false);
-      return Status::OK();
-    }
-    virtual void LogData(const Slice& blob) override { EXPECT_TRUE(false); }
-    virtual bool Continue() override { return num_seen < 2; }
-  } handler;
-
-  batch.Iterate(&handler);
-  ASSERT_EQ(2, handler.num_seen);
-}
-
 TEST_F(WriteBatchTest, Continue) {
  WriteBatch batch;

@@ -16,25 +16,16 @@ std::unique_ptr<WriteControllerToken> WriteController::GetStopToken() {
  return std::unique_ptr<WriteControllerToken>(new StopWriteToken(this));
 }

-std::unique_ptr<WriteControllerToken> WriteController::GetDelayToken(
-    uint64_t write_rate) {
-  total_delayed_++;
-  // Reset counters.
-  last_refill_time_ = 0;
-  bytes_left_ = 0;
-  set_delayed_write_rate(write_rate);
+std::unique_ptr<WriteControllerToken> WriteController::GetDelayToken() {
+  if (total_delayed_++ == 0) {
+    last_refill_time_ = 0;
+    bytes_left_ = 0;
+  }
  return std::unique_ptr<WriteControllerToken>(new DelayWriteToken(this));
 }

-std::unique_ptr<WriteControllerToken>
-WriteController::GetCompactionPressureToken() {
-  ++total_compaction_pressure_;
-  return std::unique_ptr<WriteControllerToken>(
-      new CompactionPressureToken(this));
-}
-
 bool WriteController::IsStopped() const { return total_stopped_ > 0; }
-// This is inside DB mutex, so we can't sleep and need to minimize
+// Tihs is inside DB mutex, so we can't sleep and need to minimize
 // frequency to get time.
 // If it turns out to be a performance issue, we can redesign the thread
 // synchronization model here.
@@ -113,9 +104,4 @@ DelayWriteToken::~DelayWriteToken() {
  assert(controller_->total_delayed_ >= 0);
 }

-CompactionPressureToken::~CompactionPressureToken() {
-  controller_->total_compaction_pressure_--;
-  assert(controller_->total_compaction_pressure_ >= 0);
-}
-
 }  // namespace rocksdb
@@ -20,13 +20,12 @@ class WriteControllerToken;
 // to be called while holding DB mutex
 class WriteController {
 public:
-  explicit WriteController(uint64_t _delayed_write_rate = 1024u * 1024u * 32u)
+  explicit WriteController(uint64_t delayed_write_rate = 1024u * 1024u * 32u)
      : total_stopped_(0),
        total_delayed_(0),
-        total_compaction_pressure_(0),
        bytes_left_(0),
        last_refill_time_(0) {
-    set_delayed_write_rate(_delayed_write_rate);
+    set_delayed_write_rate(delayed_write_rate);
  }
  ~WriteController() = default;

@@ -37,40 +36,30 @@ class WriteController {
  // writes to the DB will be controlled under the delayed write rate. Every
  // write needs to call GetDelay() with number of bytes writing to the DB,
  // which returns number of microseconds to sleep.
-  std::unique_ptr<WriteControllerToken> GetDelayToken(
-      uint64_t delayed_write_rate);
-  // When an actor (column family) requests a moderate token, compaction
-  // threads will be increased
-  std::unique_ptr<WriteControllerToken> GetCompactionPressureToken();
+  std::unique_ptr<WriteControllerToken> GetDelayToken();

-  // these three metods are querying the state of the WriteController
+  // these two metods are querying the state of the WriteController
  bool IsStopped() const;
  bool NeedsDelay() const { return total_delayed_ > 0; }
-  bool NeedSpeedupCompaction() const {
-    return IsStopped() || NeedsDelay() || total_compaction_pressure_ > 0;
-  }
  // return how many microseconds the caller needs to sleep after the call
  // num_bytes: how many number of bytes to put into the DB.
  // Prerequisite: DB mutex held.
  uint64_t GetDelay(Env* env, uint64_t num_bytes);
-  void set_delayed_write_rate(uint64_t write_rate) {
-    // avoid divide 0
-    if (write_rate == 0) {
-      write_rate = 1u;
+  void set_delayed_write_rate(uint64_t delayed_write_rate) {
+    delayed_write_rate_ = delayed_write_rate;
+    if (delayed_write_rate_ == 0) {
+      // avoid divide 0
+      delayed_write_rate_ = 1U;
    }
-    delayed_write_rate_ = write_rate;
  }
-  uint64_t delayed_write_rate() const { return delayed_write_rate_; }

 private:
  friend class WriteControllerToken;
  friend class StopWriteToken;
  friend class DelayWriteToken;
-  friend class CompactionPressureToken;

  int total_stopped_;
  int total_delayed_;
-  int total_compaction_pressure_;
  uint64_t bytes_left_;
  uint64_t last_refill_time_;
  uint64_t delayed_write_rate_;
@@ -105,11 +94,4 @@ class DelayWriteToken : public WriteControllerToken {
  virtual ~DelayWriteToken();
 };

-class CompactionPressureToken : public WriteControllerToken {
- public:
-  explicit CompactionPressureToken(WriteController* controller)
-      : WriteControllerToken(controller) {}
-  virtual ~CompactionPressureToken();
-};
-
 }  // namespace rocksdb
@@ -19,28 +19,6 @@ class TimeSetEnv : public EnvWrapper {
  virtual uint64_t NowMicros() override { return now_micros_; }
 };

-TEST_F(WriteControllerTest, ChangeDelayRateTest) {
-  TimeSetEnv env;
-  WriteController controller(10000000u);
-  auto delay_token_0 =
-      controller.GetDelayToken(controller.delayed_write_rate());
-  ASSERT_EQ(static_cast<uint64_t>(2000000),
-            controller.GetDelay(&env, 20000000u));
-  auto delay_token_1 = controller.GetDelayToken(2000000u);
-  ASSERT_EQ(static_cast<uint64_t>(10000000),
-            controller.GetDelay(&env, 20000000u));
-  auto delay_token_2 = controller.GetDelayToken(1000000u);
-  ASSERT_EQ(static_cast<uint64_t>(20000000),
-            controller.GetDelay(&env, 20000000u));
-  auto delay_token_3 = controller.GetDelayToken(20000000u);
-  ASSERT_EQ(static_cast<uint64_t>(1000000),
-            controller.GetDelay(&env, 20000000u));
-  auto delay_token_4 =
-      controller.GetDelayToken(controller.delayed_write_rate() * 2);
-  ASSERT_EQ(static_cast<uint64_t>(500000),
-            controller.GetDelay(&env, 20000000u));
-}
-
 TEST_F(WriteControllerTest, SanityTest) {
  WriteController controller(10000000u);
  auto stop_token_1 = controller.GetStopToken();
@@ -54,19 +32,12 @@ TEST_F(WriteControllerTest, SanityTest) {

  TimeSetEnv env;

-  auto delay_token_1 = controller.GetDelayToken(10000000u);
+  auto delay_token_1 = controller.GetDelayToken();
  ASSERT_EQ(static_cast<uint64_t>(2000000),
            controller.GetDelay(&env, 20000000u));

  env.now_micros_ += 1999900u;  // sleep debt 1000
-
-  auto delay_token_2 = controller.GetDelayToken(10000000u);
-  // Rate reset after changing the token.
-  ASSERT_EQ(static_cast<uint64_t>(2000000),
-            controller.GetDelay(&env, 20000000u));
-
-  env.now_micros_ += 1999900u;  // sleep debt 1000
-
+  auto delay_token_2 = controller.GetDelayToken();
  // One refill: 10240 bytes allowed, 1000 used, 9240 left
  ASSERT_EQ(static_cast<uint64_t>(1124), controller.GetDelay(&env, 1000u));
  env.now_micros_ += 1124u;  // sleep debt 0
@@ -4,197 +4,34 @@
 //  of patent rights can be found in the PATENTS file in the same directory.

 #include "db/write_thread.h"
-#include <chrono>
-#include <limits>
-#include <thread>
-#include "db/column_family.h"
-#include "port/port.h"
 #include "util/sync_point.h"

 namespace rocksdb {

-WriteThread::WriteThread(uint64_t max_yield_usec, uint64_t slow_yield_usec)
-    : max_yield_usec_(max_yield_usec),
-      slow_yield_usec_(slow_yield_usec),
-      newest_writer_(nullptr) {}
-
-uint8_t WriteThread::BlockingAwaitState(Writer* w, uint8_t goal_mask) {
-  // We're going to block.  Lazily create the mutex.  We guarantee
-  // propagation of this construction to the waker via the
-  // STATE_LOCKED_WAITING state.  The waker won't try to touch the mutex
-  // or the condvar unless they CAS away the STATE_LOCKED_WAITING that
-  // we install below.
-  w->CreateMutex();
-
-  auto state = w->state.load(std::memory_order_acquire);
-  assert(state != STATE_LOCKED_WAITING);
-  if ((state & goal_mask) == 0 &&
-      w->state.compare_exchange_strong(state, STATE_LOCKED_WAITING)) {
-    // we have permission (and an obligation) to use StateMutex
-    std::unique_lock<std::mutex> guard(w->StateMutex());
-    w->StateCV().wait(guard, [w] {
-      return w->state.load(std::memory_order_relaxed) != STATE_LOCKED_WAITING;
-    });
-    state = w->state.load(std::memory_order_relaxed);
-  }
-  // else tricky.  Goal is met or CAS failed.  In the latter case the waker
-  // must have changed the state, and compare_exchange_strong has updated
-  // our local variable with the new one.  At the moment WriteThread never
-  // waits for a transition across intermediate states, so we know that
-  // since a state change has occurred the goal must have been met.
-  assert((state & goal_mask) != 0);
-  return state;
+void WriteThread::Await(Writer* w) {
+  std::unique_lock<std::mutex> guard(w->JoinMutex());
+  w->JoinCV().wait(guard, [w] { return w->joined; });
 }

-uint8_t WriteThread::AwaitState(Writer* w, uint8_t goal_mask,
-                                AdaptationContext* ctx) {
-  uint8_t state;
-
-  // On a modern Xeon each loop takes about 7 nanoseconds (most of which
-  // is the effect of the pause instruction), so 200 iterations is a bit
-  // more than a microsecond.  This is long enough that waits longer than
-  // this can amortize the cost of accessing the clock and yielding.
-  for (uint32_t tries = 0; tries < 200; ++tries) {
-    state = w->state.load(std::memory_order_acquire);
-    if ((state & goal_mask) != 0) {
-      return state;
-    }
-    port::AsmVolatilePause();
-  }
-
-  // If we're only going to end up waiting a short period of time,
-  // it can be a lot more efficient to call std::this_thread::yield()
-  // in a loop than to block in StateMutex().  For reference, on my 4.0
-  // SELinux test server with support for syscall auditing enabled, the
-  // minimum latency between FUTEX_WAKE to returning from FUTEX_WAIT is
-  // 2.7 usec, and the average is more like 10 usec.  That can be a big
-  // drag on RockDB's single-writer design.  Of course, spinning is a
-  // bad idea if other threads are waiting to run or if we're going to
-  // wait for a long time.  How do we decide?
-  //
-  // We break waiting into 3 categories: short-uncontended,
-  // short-contended, and long.  If we had an oracle, then we would always
-  // spin for short-uncontended, always block for long, and our choice for
-  // short-contended might depend on whether we were trying to optimize
-  // RocksDB throughput or avoid being greedy with system resources.
-  //
-  // Bucketing into short or long is easy by measuring elapsed time.
-  // Differentiating short-uncontended from short-contended is a bit
-  // trickier, but not too bad.  We could look for involuntary context
-  // switches using getrusage(RUSAGE_THREAD, ..), but it's less work
-  // (portability code and CPU) to just look for yield calls that take
-  // longer than we expect.  sched_yield() doesn't actually result in any
-  // context switch overhead if there are no other runnable processes
-  // on the current core, in which case it usually takes less than
-  // a microsecond.
-  //
-  // There are two primary tunables here: the threshold between "short"
-  // and "long" waits, and the threshold at which we suspect that a yield
-  // is slow enough to indicate we should probably block.  If these
-  // thresholds are chosen well then CPU-bound workloads that don't
-  // have more threads than cores will experience few context switches
-  // (voluntary or involuntary), and the total number of context switches
-  // (voluntary and involuntary) will not be dramatically larger (maybe
-  // 2x) than the number of voluntary context switches that occur when
-  // --max_yield_wait_micros=0.
-  //
-  // There's another constant, which is the number of slow yields we will
-  // tolerate before reversing our previous decision.  Solitary slow
-  // yields are pretty common (low-priority small jobs ready to run),
-  // so this should be at least 2.  We set this conservatively to 3 so
-  // that we can also immediately schedule a ctx adaptation, rather than
-  // waiting for the next update_ctx.
-
-  const size_t kMaxSlowYieldsWhileSpinning = 3;
-
-  bool update_ctx = false;
-  bool would_spin_again = false;
-
-  if (max_yield_usec_ > 0) {
-    update_ctx = Random::GetTLSInstance()->OneIn(256);
-
-    if (update_ctx || ctx->value.load(std::memory_order_relaxed) >= 0) {
-      // we're updating the adaptation statistics, or spinning has >
-      // 50% chance of being shorter than max_yield_usec_ and causing no
-      // involuntary context switches
-      auto spin_begin = std::chrono::steady_clock::now();
-
-      // this variable doesn't include the final yield (if any) that
-      // causes the goal to be met
-      size_t slow_yield_count = 0;
-
-      auto iter_begin = spin_begin;
-      while ((iter_begin - spin_begin) <=
-             std::chrono::microseconds(max_yield_usec_)) {
-        std::this_thread::yield();
-
-        state = w->state.load(std::memory_order_acquire);
-        if ((state & goal_mask) != 0) {
-          // success
-          would_spin_again = true;
-          break;
-        }
-
-        auto now = std::chrono::steady_clock::now();
-        if (now == iter_begin ||
-            now - iter_begin >= std::chrono::microseconds(slow_yield_usec_)) {
-          // conservatively count it as a slow yield if our clock isn't
-          // accurate enough to measure the yield duration
-          ++slow_yield_count;
-          if (slow_yield_count >= kMaxSlowYieldsWhileSpinning) {
-            // Not just one ivcsw, but several.  Immediately update ctx
-            // and fall back to blocking
-            update_ctx = true;
-            break;
-          }
-        }
-        iter_begin = now;
-      }
-    }
-  }
-
-  if ((state & goal_mask) == 0) {
-    state = BlockingAwaitState(w, goal_mask);
-  }
-
-  if (update_ctx) {
-    auto v = ctx->value.load(std::memory_order_relaxed);
-    // fixed point exponential decay with decay constant 1/1024, with +1
-    // and -1 scaled to avoid overflow for int32_t
-    v = v + (v / 1024) + (would_spin_again ? 1 : -1) * 16384;
-    ctx->value.store(v, std::memory_order_relaxed);
-  }
-
-  assert((state & goal_mask) != 0);
-  return state;
+void WriteThread::MarkJoined(Writer* w) {
+  std::lock_guard<std::mutex> guard(w->JoinMutex());
+  assert(!w->joined);
+  w->joined = true;
+  w->JoinCV().notify_one();
 }

-void WriteThread::SetState(Writer* w, uint8_t new_state) {
-  auto state = w->state.load(std::memory_order_acquire);
-  if (state == STATE_LOCKED_WAITING ||
-      !w->state.compare_exchange_strong(state, new_state)) {
-    assert(state == STATE_LOCKED_WAITING);
-
-    std::lock_guard<std::mutex> guard(w->StateMutex());
-    assert(w->state.load(std::memory_order_relaxed) != new_state);
-    w->state.store(new_state, std::memory_order_relaxed);
-    w->StateCV().notify_one();
-  }
-}
-
-void WriteThread::LinkOne(Writer* w, bool* linked_as_leader) {
-  assert(w->state == STATE_INIT);
+void WriteThread::LinkOne(Writer* w, bool* wait_needed) {
+  assert(!w->joined && !w->done);

  Writer* writers = newest_writer_.load(std::memory_order_relaxed);
  while (true) {
    w->link_older = writers;
+    if (writers != nullptr) {
+      w->CreateMutex();
+    }
    if (newest_writer_.compare_exchange_strong(writers, w)) {
-      if (writers == nullptr) {
-        // this isn't part of the WriteThread machinery, but helps with
-        // debugging and is checked by an assert in WriteImpl
-        w->state.store(STATE_GROUP_LEADER, std::memory_order_relaxed);
-      }
-      *linked_as_leader = (writers == nullptr);
+      // Success.
+      *wait_needed = (writers != nullptr);
      return;
    }
  }
@@ -213,15 +50,11 @@ void WriteThread::CreateMissingNewerLinks(Writer* head) {
 }

 void WriteThread::JoinBatchGroup(Writer* w) {
-  static AdaptationContext ctx("JoinBatchGroup");
-
  assert(w->batch != nullptr);
-  bool linked_as_leader;
-  LinkOne(w, &linked_as_leader);
-  if (!linked_as_leader) {
-    AwaitState(w,
-               STATE_GROUP_LEADER | STATE_PARALLEL_FOLLOWER | STATE_COMPLETED,
-               &ctx);
+  bool wait_needed;
+  LinkOne(w, &wait_needed);
+  if (wait_needed) {
+    Await(w);
  }
 }

@@ -255,7 +88,7 @@ size_t WriteThread::EnterAsBatchGroupLeader(
  // This is safe regardless of any db mutex status of the caller. Previous
  // calls to ExitAsGroupLeader either didn't call CreateMissingNewerLinks
  // (they emptied the list and then we added ourself as leader) or had to
-  // explicitly wake us up (the list was non-empty when we added ourself,
+  // explicitly wake up us (the list was non-empty when we added ourself,
  // so we have already received our MarkJoined).
  CreateMissingNewerLinks(newest_writer);

@@ -302,73 +135,6 @@ size_t WriteThread::EnterAsBatchGroupLeader(
  return size;
 }

-void WriteThread::LaunchParallelFollowers(ParallelGroup* pg,
-                                          SequenceNumber sequence) {
-  // EnterAsBatchGroupLeader already created the links from leader to
-  // newer writers in the group
-
-  pg->leader->parallel_group = pg;
-
-  Writer* w = pg->leader;
-  w->sequence = sequence;
-
-  while (w != pg->last_writer) {
-    sequence += WriteBatchInternal::Count(w->batch);
-    w = w->link_newer;
-
-    w->sequence = sequence;
-    w->parallel_group = pg;
-    SetState(w, STATE_PARALLEL_FOLLOWER);
-  }
-}
-
-bool WriteThread::CompleteParallelWorker(Writer* w) {
-  static AdaptationContext ctx("CompleteParallelWorker");
-
-  auto* pg = w->parallel_group;
-  if (!w->status.ok()) {
-    std::lock_guard<std::mutex> guard(w->StateMutex());
-    pg->status = w->status;
-  }
-  auto leader = pg->leader;
-  auto early_exit_allowed = pg->early_exit_allowed;
-
-  if (pg->running.load(std::memory_order_acquire) > 1 && pg->running-- > 1) {
-    // we're not the last one
-    AwaitState(w, STATE_COMPLETED, &ctx);
-
-    // Caller only needs to perform exit duties if early exit doesn't
-    // apply and this is the leader.  Can't touch pg here.  Whoever set
-    // our state to STATE_COMPLETED copied pg->status to w.status for us.
-    return w == leader && !(early_exit_allowed && w->status.ok());
-  }
-  // else we're the last parallel worker
-
-  if (w == leader || (early_exit_allowed && pg->status.ok())) {
-    // this thread should perform exit duties
-    w->status = pg->status;
-    return true;
-  } else {
-    // We're the last parallel follower but early commit is not
-    // applicable.  Wake up the leader and then wait for it to exit.
-    assert(w->state == STATE_PARALLEL_FOLLOWER);
-    SetState(leader, STATE_COMPLETED);
-    AwaitState(w, STATE_COMPLETED, &ctx);
-    return false;
-  }
-}
-
-void WriteThread::EarlyExitParallelGroup(Writer* w) {
-  auto* pg = w->parallel_group;
-
-  assert(w->state == STATE_PARALLEL_FOLLOWER);
-  assert(pg->status.ok());
-  ExitAsBatchGroupLeader(pg->leader, pg->last_writer, pg->status);
-  assert(w->state == STATE_COMPLETED);
-  assert(w->status.ok());
-  SetState(pg->leader, STATE_COMPLETED);
-}
-
 void WriteThread::ExitAsBatchGroupLeader(Writer* leader, Writer* last_writer,
                                         Status status) {
  assert(leader->link_older == nullptr);
@@ -400,34 +166,31 @@ void WriteThread::ExitAsBatchGroupLeader(Writer* leader, Writer* last_writer,
    // nullptr when they enqueued (we were definitely enqueued before them
    // and are still in the list).  That means leader handoff occurs when
    // we call MarkJoined
-    SetState(last_writer->link_newer, STATE_GROUP_LEADER);
+    MarkJoined(last_writer->link_newer);
  }
  // else nobody else was waiting, although there might already be a new
  // leader now

  while (last_writer != leader) {
    last_writer->status = status;
-
-    // we need to read link_older before calling SetState, because as soon
-    // as it is marked committed the other thread's Await may return and
-    // deallocate the Writer.
+    last_writer->done = true;
+    // We must read link_older before calling MarkJoined, because as
+    // soon as it is marked the other thread's AwaitJoined may return
+    // and deallocate the Writer.
    auto next = last_writer->link_older;
-    SetState(last_writer, STATE_COMPLETED);
-
+    MarkJoined(last_writer);
    last_writer = next;
  }
 }

 void WriteThread::EnterUnbatched(Writer* w, InstrumentedMutex* mu) {
-  static AdaptationContext ctx("EnterUnbatched");
-
  assert(w->batch == nullptr);
-  bool linked_as_leader;
-  LinkOne(w, &linked_as_leader);
-  if (!linked_as_leader) {
+  bool wait_needed;
+  LinkOne(w, &wait_needed);
+  if (wait_needed) {
    mu->Unlock();
    TEST_SYNC_POINT("WriteThread::EnterUnbatched:Wait");
-    AwaitState(w, STATE_GROUP_LEADER, &ctx);
+    Await(w);
    mu->Lock();
  }
 }
@@ -8,13 +8,11 @@
 #include <assert.h>
 #include <stdint.h>
 #include <atomic>
-#include <chrono>
 #include <condition_variable>
 #include <mutex>
-#include <vector>
 #include <type_traits>
-#include "db/write_batch_internal.h"
 #include "rocksdb/status.h"
+#include "db/write_batch_internal.h"
 #include "util/autovector.h"
 #include "util/instrumented_mutex.h"

@@ -22,69 +20,19 @@ namespace rocksdb {

 class WriteThread {
 public:
-  enum State : uint8_t {
-    // The initial state of a writer.  This is a Writer that is
-    // waiting in JoinBatchGroup.  This state can be left when another
-    // thread informs the waiter that it has become a group leader
-    // (-> STATE_GROUP_LEADER), when a leader that has chosen to be
-    // non-parallel informs a follower that its writes have been committed
-    // (-> STATE_COMPLETED), or when a leader that has chosen to perform
-    // updates in parallel and needs this Writer to apply its batch (->
-    // STATE_PARALLEL_FOLLOWER).
-    STATE_INIT = 1,
-
-    // The state used to inform a waiting Writer that it has become the
-    // leader, and it should now build a write batch group.  Tricky:
-    // this state is not used if newest_writer_ is empty when a writer
-    // enqueues itself, because there is no need to wait (or even to
-    // create the mutex and condvar used to wait) in that case.  This is
-    // a terminal state unless the leader chooses to make this a parallel
-    // batch, in which case the last parallel worker to finish will move
-    // the leader to STATE_COMPLETED.
-    STATE_GROUP_LEADER = 2,
-
-    // A Writer that has returned as a follower in a parallel group.
-    // It should apply its batch to the memtable and then call
-    // CompleteParallelWorker.  When someone calls ExitAsBatchGroupLeader
-    // or EarlyExitParallelGroup this state will get transitioned to
-    // STATE_COMPLETED.
-    STATE_PARALLEL_FOLLOWER = 4,
-
-    // A follower whose writes have been applied, or a parallel leader
-    // whose followers have all finished their work.  This is a terminal
-    // state.
-    STATE_COMPLETED = 8,
-
-    // A state indicating that the thread may be waiting using StateMutex()
-    // and StateCondVar()
-    STATE_LOCKED_WAITING = 16,
-  };
-
-  struct Writer;
-
-  struct ParallelGroup {
-    Writer* leader;
-    Writer* last_writer;
-    bool early_exit_allowed;
-    // before running goes to zero, status needs leader->StateMutex()
-    Status status;
-    std::atomic<uint32_t> running;
-  };
-
  // Information kept for every waiting writer.
  struct Writer {
    WriteBatch* batch;
    bool sync;
    bool disableWAL;
    bool in_batch_group;
+    bool done;
    bool has_callback;
-    bool made_waitable;          // records lazy construction of mutex and cv
-    std::atomic<uint8_t> state;  // write under StateMutex() or pre-link
-    ParallelGroup* parallel_group;
-    SequenceNumber sequence;  // the sequence number to use
    Status status;
-    std::aligned_storage<sizeof(std::mutex)>::type state_mutex_bytes;
-    std::aligned_storage<sizeof(std::condition_variable)>::type state_cv_bytes;
+    bool made_waitable;  // records lazy construction of mutex and cv
+    bool joined;         // read/write only under JoinMutex() (or pre-link)
+    std::aligned_storage<sizeof(std::mutex)>::type join_mutex_bytes;
+    std::aligned_storage<sizeof(std::condition_variable)>::type join_cv_bytes;
    Writer* link_older;  // read/write only before linking, or as leader
    Writer* link_newer;  // lazy, read/write only before linking, or as leader

@@ -93,45 +41,44 @@ class WriteThread {
          sync(false),
          disableWAL(false),
          in_batch_group(false),
+          done(false),
          has_callback(false),
          made_waitable(false),
-          state(STATE_INIT),
+          joined(false),
          link_older(nullptr),
          link_newer(nullptr) {}

    ~Writer() {
      if (made_waitable) {
-        StateMutex().~mutex();
-        StateCV().~condition_variable();
+        JoinMutex().~mutex();
+        JoinCV().~condition_variable();
      }
    }

    void CreateMutex() {
+      assert(!joined);
      if (!made_waitable) {
-        // Note that made_waitable is tracked separately from state
-        // transitions, because we can't atomically create the mutex and
-        // link into the list.
        made_waitable = true;
-        new (&state_mutex_bytes) std::mutex;
-        new (&state_cv_bytes) std::condition_variable;
+        new (&join_mutex_bytes) std::mutex;
+        new (&join_cv_bytes) std::condition_variable;
      }
    }

-    // No other mutexes may be acquired while holding StateMutex(), it is
+    // No other mutexes may be acquired while holding JoinMutex(), it is
    // always last in the order
-    std::mutex& StateMutex() {
+    std::mutex& JoinMutex() {
      assert(made_waitable);
-      return *static_cast<std::mutex*>(static_cast<void*>(&state_mutex_bytes));
+      return *static_cast<std::mutex*>(static_cast<void*>(&join_mutex_bytes));
    }

-    std::condition_variable& StateCV() {
+    std::condition_variable& JoinCV() {
      assert(made_waitable);
      return *static_cast<std::condition_variable*>(
-                 static_cast<void*>(&state_cv_bytes));
+          static_cast<void*>(&join_cv_bytes));
    }
  };

-  WriteThread(uint64_t max_yield_usec, uint64_t slow_yield_usec);
+  WriteThread() : newest_writer_(nullptr) {}

  // IMPORTANT: None of the methods in this class rely on the db mutex
  // for correctness. All of the methods except JoinBatchGroup and
@@ -139,16 +86,13 @@ class WriteThread {
  // Correctness is maintained by ensuring that only a single thread is
  // a leader at a time.

-  // Registers w as ready to become part of a batch group, waits until the
-  // caller should perform some work, and returns the current state of the
-  // writer.  If w has become the leader of a write batch group, returns
-  // STATE_GROUP_LEADER.  If w has been made part of a sequential batch
-  // group and the leader has performed the write, returns STATE_DONE.
-  // If w has been made part of a parallel batch group and is reponsible
-  // for updating the memtable, returns STATE_PARALLEL_FOLLOWER.
-  //
-  // The db mutex SHOULD NOT be held when calling this function, because
-  // it will block.
+  // Registers w as ready to become part of a batch group, and blocks
+  // until some other thread has completed the write (in which case
+  // w->done will be set to true) or this write has become the leader
+  // of a batch group (w->done will remain unset).  The db mutex SHOULD
+  // NOT be held when calling this function, because it will block.
+  // If !w->done then JoinBatchGroup should be followed by a call to
+  // EnterAsBatchGroupLeader and ExitAsBatchGroupLeader.
  //
  // Writer* w:        Writer to be executed as part of a batch group
  void JoinBatchGroup(Writer* w);
@@ -156,35 +100,15 @@ class WriteThread {
  // Constructs a write batch group led by leader, which should be a
  // Writer passed to JoinBatchGroup on the current thread.
  //
-  // Writer* leader:         Writer that is STATE_GROUP_LEADER
-  // Writer** last_writer:   Out-param that identifies the last follower
+  // Writer* leader:         Writer passed to JoinBatchGroup, but !done
+  // Writer** last_writer:   Out-param for use by ExitAsBatchGroupLeader
  // autovector<WriteBatch*>* write_batch_group: Out-param of group members
-  // returns:                Total batch group byte size
+  // returns:                Total batch group size
  size_t EnterAsBatchGroupLeader(Writer* leader, Writer** last_writer,
                                 autovector<WriteBatch*>* write_batch_group);

-  // Causes JoinBatchGroup to return STATE_PARALLEL_FOLLOWER for all of the
-  // non-leader members of this write batch group.  Sets Writer::sequence
-  // before waking them up.
-  //
-  // ParallalGroup* pg:       Extra state used to coordinate the parallel add
-  // SequenceNumber sequence: Starting sequence number to assign to Writer-s
-  void LaunchParallelFollowers(ParallelGroup* pg, SequenceNumber sequence);
-
-  // Reports the completion of w's batch to the parallel group leader, and
-  // waits for the rest of the parallel batch to complete.  Returns true
-  // if this thread is the last to complete, and hence should advance
-  // the sequence number and then call EarlyExitParallelGroup, false if
-  // someone else has already taken responsibility for that.
-  bool CompleteParallelWorker(Writer* w);
-
-  // This method performs an early completion of a parallel write group,
-  // where the cleanup work of the leader is performed by a follower who
-  // happens to be the last parallel worker to complete.
-  void EarlyExitParallelGroup(Writer* w);
-
-  // Unlinks the Writer-s in a batch group, wakes up the non-leaders,
-  // and wakes up the next leader (if any).
+  // Unlinks the Writer-s in a batch group, wakes up the non-leaders, and
+  // wakes up the next leader (if any).
  //
  // Writer* leader:         From EnterAsBatchGroupLeader
  // Writer* last_writer:    Value of out-param of EnterAsBatchGroupLeader
@@ -204,37 +128,18 @@ class WriteThread {
  // writers.
  void ExitUnbatched(Writer* w);

-  struct AdaptationContext {
-    const char* name;
-    std::atomic<int32_t> value;
-
-    explicit AdaptationContext(const char* name0) : name(name0), value(0) {}
-  };
-
 private:
-  uint64_t max_yield_usec_;
-  uint64_t slow_yield_usec_;
-
  // Points to the newest pending Writer.  Only leader can remove
  // elements, adding can be done lock-free by anybody
  std::atomic<Writer*> newest_writer_;

-  // Waits for w->state & goal_mask using w->StateMutex().  Returns
-  // the state that satisfies goal_mask.
-  uint8_t BlockingAwaitState(Writer* w, uint8_t goal_mask);
+  void Await(Writer* w);
+  void MarkJoined(Writer* w);

-  // Blocks until w->state & goal_mask, returning the state value
-  // that satisfied the predicate.  Uses ctx to adaptively use
-  // std::this_thread::yield() to avoid mutex overheads.  ctx should be
-  // a context-dependent static.
-  uint8_t AwaitState(Writer* w, uint8_t goal_mask, AdaptationContext* ctx);
-
-  void SetState(Writer* w, uint8_t new_state);
-
-  // Links w into the newest_writer_ list. Sets *linked_as_leader to
-  // true if w was linked directly into the leader position.  Safe to
-  // call from multiple threads without external locking.
-  void LinkOne(Writer* w, bool* linked_as_leader);
+  // Links w into the newest_writer_ list. Sets *wait_needed to false
+  // if w was linked directly into the leader position, true otherwise.
+  // Safe to call from multiple threads without external locking.
+  void LinkOne(Writer* w, bool* wait_needed);

  // Computes any missing link_newer links.  Should not be called
  // concurrently with itself.
@@ -11,20 +11,16 @@

 #pragma once

-#include <atomic>
-
 namespace rocksdb {

 class WriteBuffer {
 public:
  explicit WriteBuffer(size_t _buffer_size)
-      : buffer_size_(_buffer_size), memory_used_(0) {}
+    : buffer_size_(_buffer_size), memory_used_(0) {}

  ~WriteBuffer() {}

-  size_t memory_usage() const {
-    return memory_used_.load(std::memory_order_relaxed);
-  }
+  size_t memory_usage() const { return memory_used_; }
  size_t buffer_size() const { return buffer_size_; }

  // Should only be called from write thread
@@ -33,16 +29,12 @@ class WriteBuffer {
  }

  // Should only be called from write thread
-  void ReserveMem(size_t mem) {
-    memory_used_.fetch_add(mem, std::memory_order_relaxed);
-  }
-  void FreeMem(size_t mem) {
-    memory_used_.fetch_sub(mem, std::memory_order_relaxed);
-  }
+  void ReserveMem(size_t mem) { memory_used_ += mem; }
+  void FreeMem(size_t mem) { memory_used_ -= mem; }

 private:
  const size_t buffer_size_;
-  std::atomic<size_t> memory_used_;
+  size_t memory_used_;

  // No copying allowed
  WriteBuffer(const WriteBuffer&);
Author	SHA1	Message	Date
Islam AbdelRahman	d788d9a9eb	Release 4.3.1	2016-01-26 19:07:19 -08:00
Islam AbdelRahman	8a294d6673	Fix BlockBasedTableTest.NoopTransformSeek failure Summary: table_test is failing because we are creating a temp InternalComparator 14:27:28 [ RUN ] BlockBasedTableTest.NoopTransformSeek 14:27:28 pure virtual method called 14:27:28 terminate called without an active exception 14:27:28 /bin/sh: line 7: 2346261 Aborted (core dumped) ./$t Test Plan: make table_test -j64 && ./table_test --gtest_filter="BlockBasedTableTest.NoopTransformSeek" Reviewers: igor, sdong, anthony, rven Reviewed By: rven Subscribers: dhruba Differential Revision: https://reviews.facebook.net/D52671	2016-01-26 18:51:31 -08:00
Islam AbdelRahman	dde3cdccde	Fix issue in Iterator::Seek when using Block based filter block with prefix_extractor Summary: Similar to D53385 we need to check InDomain before checking the filter block. Test Plan: unit tests Reviewers: yhchiang, rven, sdong Reviewed By: sdong Subscribers: dhruba Differential Revision: https://reviews.facebook.net/D53421	2016-01-26 18:45:03 -08:00
Islam AbdelRahman	3c3020c61b	Fix bug in block based tables with full filter block and prefix_extractor Summary: Right now when we are creating a BlockBasedTable with fill filter block we add to the filter all the prefixes that are InDomain() based on the prefix_extractor the problem is that when we read a key from the file, we check the filter block for the prefix whether or not it's InDomain() Test Plan: unit tests Reviewers: yhchiang, rven, anthony, kradhakrishnan, sdong Reviewed By: sdong Subscribers: dhruba Differential Revision: https://reviews.facebook.net/D53385	2016-01-26 18:44:56 -08:00
Peter Mattis	2d8fa53ffb	Fix index seeking in BlockTableReader::PrefixMayMatch. PrefixMayMatch previously seeked in the prefix index using an internal key with a sequence number of 0. This would cause the prefix index seek to fall off the end if the last key in the index had a user-key greater than or equal to the key being looked for. Falling off the end of the index in turn results in PrefixMayMatch returning false if the index is in memory.	2016-01-26 18:44:47 -08:00
sdong	eb965e1bc3	Revert "db_bench: --soft_pending_compaction_bytes_limit should set options.soft_pending_compaction_bytes_limit" This reverts commit `c726b0fdc1`. Bad backporting	2015-12-23 09:40:37 -08:00
sdong	c726b0fdc1	db_bench: --soft_pending_compaction_bytes_limit should set options.soft_pending_compaction_bytes_limit Summary: Fix a bug that options.soft_pending_compaction_bytes_limit is not actually set with --soft_pending_compaction_bytes_limit Test Plan: Run db_bench with this parameter and make sure the parameter is set correctly. Subscribers: leveldb, dhruba Differential Revision: https://reviews.facebook.net/D52125	2015-12-17 18:29:23 -08:00
Yueh-Hsuan Chiang	e15400d1d9	Fixed the valgrind error in ColumnFamilyTest::CreateAndDropRace Summary: Fixed the valgrind error in ColumnFamilyTest::CreateAndDropRace Test Plan: valgrind --error-exitcode=2 --leak-check=full ./column_family_test Reviewers: kradhakrishnan, rven, anthony, IslamAbdelRahman, sdong Reviewed By: sdong Subscribers: dhruba, leveldb Differential Revision: https://reviews.facebook.net/D51795	2015-12-11 14:14:08 -08:00
krad	0642d4652d	Revert "Support marking snapshots for write-conflict checking - Take 2" This reverts commit `e5c5f23814`.	2015-12-08 17:53:20 -08:00