From 060d18278b66b4147ad550515a70c4b100d64b75 Mon Sep 17 00:00:00 2001 From: Denis Yaremov Date: Sun, 22 Sep 2019 18:17:19 +0300 Subject: [PATCH] Upgrade to RocksDB 6.17.3 --- .npmignore | 16 +- README.md | 8 +- appveyor.yml | 1 - binding.gyp | 1 + deps/rocksdb/rocksdb | 2 +- deps/rocksdb/rocksdb.gyp | 347 +++++++++++++++++++++++++-------------- test/getproperty-test.js | 2 +- test/repair-test.js | 2 +- 8 files changed, 249 insertions(+), 130 deletions(-) diff --git a/.npmignore b/.npmignore index a635b808..58ae5926 100644 --- a/.npmignore +++ b/.npmignore @@ -2,19 +2,30 @@ deps/**/*.md deps/**/.git deps/rocksdb/rocksdb/arcanist_util/ +deps/rocksdb/rocksdb/buckifier/ deps/rocksdb/rocksdb/build_tools/ deps/rocksdb/rocksdb/coverage/ deps/rocksdb/rocksdb/docs/ deps/rocksdb/rocksdb/examples/ +deps/rocksdb/rocksdb/fuzz/ deps/rocksdb/rocksdb/hdfs/setup.sh deps/rocksdb/rocksdb/java/ deps/rocksdb/rocksdb/third-party/gtest-*/ +deps/rocksdb/rocksdb/third-party/folly/ +deps/rocksdb/rocksdb/tools/advisor/ +deps/rocksdb/rocksdb/tools/block_cache_analyzer/ +deps/rocksdb/rocksdb/tools/rdb/ +deps/rocksdb/rocksdb/tools/dbench_monitor +deps/rocksdb/rocksdb/tools/pflag deps/rocksdb/rocksdb/tools/*.sh deps/rocksdb/rocksdb/tools/*.py deps/rocksdb/rocksdb/tools/*.dmp -deps/rocksdb/rocksdb/tools/rdb/ deps/rocksdb/rocksdb/README.md deps/rocksdb/rocksdb/HISTORY.md +deps/rocksdb/rocksdb/.circleci/ +deps/rocksdb/rocksdb/.github/ +deps/rocksdb/rocksdb/.lgtm.yml +deps/rocksdb/rocksdb/defs.bzl deps/snappy/snappy*/testdata/ deps/snappy/snappy*/*.txt @@ -38,6 +49,7 @@ libleveldb.a *.sln *.vcxproj *.vcxproj.filters +.vscode # Benchmarks and tests bench/ @@ -47,6 +59,7 @@ test/ # Misc .nyc_output/ +.github/ yarn.lock .gitmodules .travis.yml @@ -57,6 +70,7 @@ Dockerfile Vagrantfile .arcconfig .clang-format +.watchmanconfig # Unknown leakydb diff --git a/README.md b/README.md index 5d5f3e14..1eb1db95 100644 --- a/README.md +++ b/README.md @@ -73,19 +73,15 @@ See the [Contribution Guide](https://github.com/Level/community/blob/master/CONT This project uses Git Submodules. This means that you should clone it recursively if you're planning on working on it: ```bash -$ git clone --recurse-submodules https://github.com/Level/leveldown.git +$ git clone --recurse-submodules https://github.com/Level/rocksdb.git ``` -Alternatively, you can initalize submodules inside the cloned folder: +Alternatively, you can initialize submodules after cloning: ```bash $ git submodule update --init --recursive ``` -### Windows - -A large portion of the Windows support comes from code by [Krzysztof Kowalczyk](http://blog.kowalczyk.info/) [@kjk](https://twitter.com/kjk), see his Windows LevelDB port [here](http://code.google.com/r/kkowalczyk-leveldb/). If you're using LevelUP on Windows, you should give him your thanks! - ### Publishing 1. Increment the version: `npm version ..` diff --git a/appveyor.yml b/appveyor.yml index 46db0ae7..30681dd0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,7 +12,6 @@ platform: - x64 install: - - SET PATH=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin;%PATH% - ps: Install-Product node $env:nodejs_version $env:platform - set PATH=%APPDATA%\npm;%APPVEYOR_BUILD_FOLDER%\node_modules\.bin;%PATH% - git submodule update --init --recursive diff --git a/binding.gyp b/binding.gyp index c6f9815b..976e7cb0 100644 --- a/binding.gyp +++ b/binding.gyp @@ -17,6 +17,7 @@ , 'VCLinkerTool': { 'AdditionalDependencies': [ # SDK import libs. + 'Shlwapi.lib', 'rpcrt4.lib' ] } diff --git a/deps/rocksdb/rocksdb b/deps/rocksdb/rocksdb index 4e006501..09c7e96e 160000 --- a/deps/rocksdb/rocksdb +++ b/deps/rocksdb/rocksdb @@ -1 +1 @@ -Subproject commit 4e0065015d3dab1d94ef7cb2b4b1d1fecfa0e926 +Subproject commit 09c7e96eac1ab983f97ce9e0406730b8014b3398 diff --git a/deps/rocksdb/rocksdb.gyp b/deps/rocksdb/rocksdb.gyp index fc6d0770..f516b5c4 100644 --- a/deps/rocksdb/rocksdb.gyp +++ b/deps/rocksdb/rocksdb.gyp @@ -31,13 +31,12 @@ , '_HAS_EXCEPTIONS=1' ] , 'sources': [ - 'rocksdb/port/win/port_win.cc' - , 'rocksdb/port/win/io_win.cc' - , 'rocksdb/port/win/xpress_win.cc' - , 'rocksdb/port/win/env_default.cc' - , 'rocksdb/port/win/env_win.cc' - , 'rocksdb/port/win/win_logger.cc' - , 'rocksdb/port/win/win_thread.cc' + 'rocksdb/port/win/io_win.cc' + , 'rocksdb/port/win/env_win.cc' + , 'rocksdb/port/win/env_default.cc' + , 'rocksdb/port/win/port_win.cc' + , 'rocksdb/port/win/win_logger.cc' + , 'rocksdb/port/win/win_thread.cc' ] , 'msvs_settings': { 'VCCLCompilerTool': { @@ -67,8 +66,9 @@ }, { # OS != "win" 'sources': [ 'rocksdb/port/port_posix.cc' - , 'rocksdb/port/port_posix.h' - , 'rocksdb/util/env_posix.cc' + , 'rocksdb/env/env_posix.cc' + , 'rocksdb/env/fs_posix.cc' + , 'rocksdb/env/io_posix.cc' ] , 'defines': [ 'ROCKSDB_PLATFORM_POSIX=1' @@ -176,189 +176,298 @@ }] ] , 'sources': [ - 'rocksdb/db/auto_roll_logger.cc' + 'rocksdb/cache/cache.cc' + , 'rocksdb/cache/clock_cache.cc' + , 'rocksdb/cache/lru_cache.cc' + , 'rocksdb/cache/sharded_cache.cc' + , 'rocksdb/db/arena_wrapped_db_iter.cc' + , 'rocksdb/db/blob/blob_file_addition.cc' + , 'rocksdb/db/blob/blob_file_builder.cc' + , 'rocksdb/db/blob/blob_file_cache.cc' + , 'rocksdb/db/blob/blob_file_garbage.cc' + , 'rocksdb/db/blob/blob_file_meta.cc' + , 'rocksdb/db/blob/blob_file_reader.cc' + , 'rocksdb/db/blob/blob_log_format.cc' + , 'rocksdb/db/blob/blob_log_sequential_reader.cc' + , 'rocksdb/db/blob/blob_log_writer.cc' , 'rocksdb/db/builder.cc' , 'rocksdb/db/c.cc' , 'rocksdb/db/column_family.cc' , 'rocksdb/db/compacted_db_impl.cc' - , 'rocksdb/db/compaction.cc' - , 'rocksdb/db/compaction_iterator.cc' - , 'rocksdb/db/compaction_job.cc' - , 'rocksdb/db/compaction_picker.cc' + , 'rocksdb/db/compaction/compaction.cc' + , 'rocksdb/db/compaction/compaction_iterator.cc' + , 'rocksdb/db/compaction/compaction_picker.cc' + , 'rocksdb/db/compaction/compaction_job.cc' + , 'rocksdb/db/compaction/compaction_picker_fifo.cc' + , 'rocksdb/db/compaction/compaction_picker_level.cc' + , 'rocksdb/db/compaction/compaction_picker_universal.cc' + , 'rocksdb/db/compaction/sst_partitioner.cc' , 'rocksdb/db/convenience.cc' - , 'rocksdb/db/range_del_aggregator.cc' , 'rocksdb/db/db_filesnapshot.cc' - , 'rocksdb/db/dbformat.cc' - , 'rocksdb/db/db_impl.cc' - , 'rocksdb/db/db_impl_debug.cc' - , 'rocksdb/db/db_impl_readonly.cc' - , 'rocksdb/db/db_impl_experimental.cc' + , 'rocksdb/db/db_impl/db_impl.cc' + , 'rocksdb/db/db_impl/db_impl_write.cc' + , 'rocksdb/db/db_impl/db_impl_compaction_flush.cc' + , 'rocksdb/db/db_impl/db_impl_files.cc' + , 'rocksdb/db/db_impl/db_impl_open.cc' + , 'rocksdb/db/db_impl/db_impl_debug.cc' + , 'rocksdb/db/db_impl/db_impl_experimental.cc' + , 'rocksdb/db/db_impl/db_impl_readonly.cc' + , 'rocksdb/db/db_impl/db_impl_secondary.cc' , 'rocksdb/db/db_info_dumper.cc' , 'rocksdb/db/db_iter.cc' - , 'rocksdb/db/external_sst_file_ingestion_job.cc' - , 'rocksdb/db/experimental.cc' + , 'rocksdb/db/dbformat.cc' + , 'rocksdb/db/error_handler.cc' , 'rocksdb/db/event_helpers.cc' + , 'rocksdb/db/experimental.cc' + , 'rocksdb/db/external_sst_file_ingestion_job.cc' , 'rocksdb/db/file_indexer.cc' - , 'rocksdb/db/filename.cc' , 'rocksdb/db/flush_job.cc' , 'rocksdb/db/flush_scheduler.cc' , 'rocksdb/db/forward_iterator.cc' + , 'rocksdb/db/import_column_family_job.cc' , 'rocksdb/db/internal_stats.cc' + , 'rocksdb/db/logs_with_prep_tracker.cc' , 'rocksdb/db/log_reader.cc' , 'rocksdb/db/log_writer.cc' - , 'rocksdb/db/managed_iterator.cc' - , 'rocksdb/db/memtable_allocator.cc' + , 'rocksdb/db/malloc_stats.cc' , 'rocksdb/db/memtable.cc' , 'rocksdb/db/memtable_list.cc' , 'rocksdb/db/merge_helper.cc' , 'rocksdb/db/merge_operator.cc' + , 'rocksdb/db/output_validator.cc' + , 'rocksdb/db/periodic_work_scheduler.cc' + , 'rocksdb/db/range_del_aggregator.cc' + , 'rocksdb/db/range_tombstone_fragmenter.cc' , 'rocksdb/db/repair.cc' , 'rocksdb/db/snapshot_impl.cc' , 'rocksdb/db/table_cache.cc' , 'rocksdb/db/table_properties_collector.cc' , 'rocksdb/db/transaction_log_impl.cc' + , 'rocksdb/db/trim_history_scheduler.cc' , 'rocksdb/db/version_builder.cc' , 'rocksdb/db/version_edit.cc' + , 'rocksdb/db/version_edit_handler.cc' , 'rocksdb/db/version_set.cc' + , 'rocksdb/db/wal_edit.cc' , 'rocksdb/db/wal_manager.cc' , 'rocksdb/db/write_batch.cc' , 'rocksdb/db/write_batch_base.cc' , 'rocksdb/db/write_controller.cc' , 'rocksdb/db/write_thread.cc' - , 'rocksdb/memtable/hash_cuckoo_rep.cc' + , 'rocksdb/env/env.cc' + , 'rocksdb/env/env_chroot.cc' + , 'rocksdb/env/env_encryption.cc' + , 'rocksdb/env/env_hdfs.cc' + , 'rocksdb/env/file_system.cc' + , 'rocksdb/env/file_system_tracer.cc' + , 'rocksdb/env/mock_env.cc' + , 'rocksdb/file/delete_scheduler.cc' + , 'rocksdb/file/file_prefetch_buffer.cc' + , 'rocksdb/file/file_util.cc' + , 'rocksdb/file/filename.cc' + , 'rocksdb/file/random_access_file_reader.cc' + , 'rocksdb/file/read_write_util.cc' + , 'rocksdb/file/readahead_raf.cc' + , 'rocksdb/file/sequence_file_reader.cc' + , 'rocksdb/file/sst_file_manager_impl.cc' + , 'rocksdb/file/writable_file_writer.cc' + , 'rocksdb/logging/auto_roll_logger.cc' + , 'rocksdb/logging/event_logger.cc' + , 'rocksdb/logging/log_buffer.cc' + , 'rocksdb/memory/arena.cc' + , 'rocksdb/memory/concurrent_arena.cc' + , 'rocksdb/memory/jemalloc_nodump_allocator.cc' + , 'rocksdb/memtable/alloc_tracker.cc' , 'rocksdb/memtable/hash_linklist_rep.cc' , 'rocksdb/memtable/hash_skiplist_rep.cc' , 'rocksdb/memtable/skiplistrep.cc' , 'rocksdb/memtable/vectorrep.cc' - , 'rocksdb/port/port.h' + , 'rocksdb/memtable/write_buffer_manager.cc' + , 'rocksdb/monitoring/histogram.cc' + , 'rocksdb/monitoring/histogram_windowing.cc' + , 'rocksdb/monitoring/in_memory_stats_history.cc' + , 'rocksdb/monitoring/instrumented_mutex.cc' + , 'rocksdb/monitoring/iostats_context.cc' + , 'rocksdb/monitoring/perf_context.cc' + , 'rocksdb/monitoring/perf_level.cc' + , 'rocksdb/monitoring/persistent_stats_history.cc' + , 'rocksdb/monitoring/statistics.cc' + , 'rocksdb/monitoring/thread_status_impl.cc' + , 'rocksdb/monitoring/thread_status_updater.cc' + , 'rocksdb/monitoring/thread_status_util.cc' + , 'rocksdb/monitoring/thread_status_util_debug.cc' + , 'rocksdb/options/cf_options.cc' + , 'rocksdb/options/configurable.cc' + , 'rocksdb/options/customizable.cc' + , 'rocksdb/options/db_options.cc' + , 'rocksdb/options/options.cc' + , 'rocksdb/options/options_helper.cc' + , 'rocksdb/options/options_parser.cc' , 'rocksdb/port/stack_trace.cc' - , 'rocksdb/table/adaptive_table_factory.cc' - , 'rocksdb/table/block_based_filter_block.cc' - , 'rocksdb/table/block_based_table_builder.cc' - , 'rocksdb/table/block_based_table_factory.cc' - , 'rocksdb/table/block_based_table_reader.cc' - , 'rocksdb/table/block_builder.cc' - , 'rocksdb/table/block.cc' - , 'rocksdb/table/block_prefix_index.cc' - , 'rocksdb/table/bloom_block.cc' - , 'rocksdb/table/cuckoo_table_builder.cc' - , 'rocksdb/table/cuckoo_table_factory.cc' - , 'rocksdb/table/cuckoo_table_reader.cc' - , 'rocksdb/table/flush_block_policy.cc' + , 'rocksdb/table/adaptive/adaptive_table_factory.cc' + , 'rocksdb/table/block_based/binary_search_index_reader.cc' + , 'rocksdb/table/block_based/block.cc' + , 'rocksdb/table/block_based/block_based_filter_block.cc' + , 'rocksdb/table/block_based/block_based_table_builder.cc' + , 'rocksdb/table/block_based/block_based_table_factory.cc' + , 'rocksdb/table/block_based/block_based_table_iterator.cc' + , 'rocksdb/table/block_based/block_based_table_reader.cc' + , 'rocksdb/table/block_based/block_builder.cc' + , 'rocksdb/table/block_based/block_prefetcher.cc' + , 'rocksdb/table/block_based/block_prefix_index.cc' + , 'rocksdb/table/block_based/data_block_hash_index.cc' + , 'rocksdb/table/block_based/data_block_footer.cc' + , 'rocksdb/table/block_based/filter_block_reader_common.cc' + , 'rocksdb/table/block_based/filter_policy.cc' + , 'rocksdb/table/block_based/flush_block_policy.cc' + , 'rocksdb/table/block_based/full_filter_block.cc' + , 'rocksdb/table/block_based/hash_index_reader.cc' + , 'rocksdb/table/block_based/index_builder.cc' + , 'rocksdb/table/block_based/index_reader_common.cc' + , 'rocksdb/table/block_based/parsed_full_filter_block.cc' + , 'rocksdb/table/block_based/partitioned_filter_block.cc' + , 'rocksdb/table/block_based/partitioned_index_iterator.cc' + , 'rocksdb/table/block_based/partitioned_index_reader.cc' + , 'rocksdb/table/block_based/reader_common.cc' + , 'rocksdb/table/block_based/uncompression_dict_reader.cc' + , 'rocksdb/table/block_fetcher.cc' + , 'rocksdb/table/cuckoo/cuckoo_table_builder.cc' + , 'rocksdb/table/cuckoo/cuckoo_table_factory.cc' + , 'rocksdb/table/cuckoo/cuckoo_table_reader.cc' , 'rocksdb/table/format.cc' - , 'rocksdb/table/full_filter_block.cc' , 'rocksdb/table/get_context.cc' - , 'rocksdb/table/index_builder.cc' , 'rocksdb/table/iterator.cc' , 'rocksdb/table/merging_iterator.cc' , 'rocksdb/table/meta_blocks.cc' - , 'rocksdb/table/sst_file_writer.cc' - , 'rocksdb/table/partitioned_filter_block.cc' - , 'rocksdb/table/plain_table_builder.cc' - , 'rocksdb/table/plain_table_factory.cc' - , 'rocksdb/table/plain_table_index.cc' - , 'rocksdb/table/plain_table_key_coding.cc' - , 'rocksdb/table/plain_table_reader.cc' , 'rocksdb/table/persistent_cache_helper.cc' + , 'rocksdb/table/plain/plain_table_bloom.cc' + , 'rocksdb/table/plain/plain_table_builder.cc' + , 'rocksdb/table/plain/plain_table_factory.cc' + , 'rocksdb/table/plain/plain_table_index.cc' + , 'rocksdb/table/plain/plain_table_key_coding.cc' + , 'rocksdb/table/plain/plain_table_reader.cc' + , 'rocksdb/table/sst_file_dumper.cc' + , 'rocksdb/table/sst_file_reader.cc' + , 'rocksdb/table/sst_file_writer.cc' + , 'rocksdb/table/table_factory.cc' , 'rocksdb/table/table_properties.cc' , 'rocksdb/table/two_level_iterator.cc' + , 'rocksdb/test_util/sync_point.cc' + , 'rocksdb/test_util/sync_point_impl.cc' + , 'rocksdb/test_util/testutil.cc' + , 'rocksdb/test_util/transaction_test_util.cc' + , 'rocksdb/tools/block_cache_analyzer/block_cache_trace_analyzer.cc' + + # Optional (WITH_BENCHMARK_TOOLS) + # , 'rocksdb/tools/db_bench.cc' + # , 'rocksdb/tools/db_bench_tool.cc' + , 'rocksdb/tools/dump/db_dump_tool.cc' - , 'rocksdb/util/arena.cc' - , 'rocksdb/util/bloom.cc' - , 'build_version.cc' - , 'rocksdb/util/cf_options.cc' - , 'rocksdb/util/clock_cache.cc' + , 'rocksdb/tools/io_tracer_parser_tool.cc' + , 'rocksdb/tools/ldb_cmd.cc' + , 'rocksdb/tools/ldb_tool.cc' + , 'rocksdb/tools/sst_dump_tool.cc' + , 'rocksdb/tools/trace_analyzer_tool.cc' + , 'rocksdb/trace_replay/trace_replay.cc' + , 'rocksdb/trace_replay/block_cache_tracer.cc' + , 'rocksdb/trace_replay/io_tracer.cc' , 'rocksdb/util/coding.cc' - , 'rocksdb/util/comparator.cc' , 'rocksdb/util/compaction_job_stats_impl.cc' - , 'rocksdb/util/concurrent_arena.cc' + , 'rocksdb/util/comparator.cc' + , 'rocksdb/util/compression_context_cache.cc' + , 'rocksdb/util/concurrent_task_limiter_impl.cc' , 'rocksdb/util/crc32c.cc' - , 'rocksdb/util/db_options.cc' - , 'rocksdb/util/delete_scheduler.cc' , 'rocksdb/util/dynamic_bloom.cc' - , 'rocksdb/util/env.cc' - , 'rocksdb/util/env_chroot.cc' - , 'rocksdb/util/env_hdfs.cc' - , 'rocksdb/util/event_logger.cc' - , 'rocksdb/util/file_util.cc' - , 'rocksdb/util/file_reader_writer.cc' - , 'rocksdb/util/filter_policy.cc' , 'rocksdb/util/hash.cc' - , 'rocksdb/util/histogram.cc' - , 'rocksdb/util/histogram_windowing.cc' - , 'rocksdb/util/instrumented_mutex.cc' - , 'rocksdb/util/iostats_context.cc' - , 'rocksdb/util/io_posix.cc' - , 'rocksdb/util/log_buffer.cc' - , 'rocksdb/util/logging.cc' - , 'rocksdb/util/lru_cache.cc' - , 'rocksdb/util/memenv.cc' , 'rocksdb/util/murmurhash.cc' - , 'rocksdb/util/options.cc' - , 'rocksdb/util/options_helper.cc' - , 'rocksdb/util/options_parser.cc' - , 'rocksdb/util/options_sanity_check.cc' - , 'rocksdb/util/perf_context.cc' - , 'rocksdb/util/perf_level.cc' , 'rocksdb/util/random.cc' , 'rocksdb/util/rate_limiter.cc' - , 'rocksdb/util/sharded_cache.cc' , 'rocksdb/util/slice.cc' - , 'rocksdb/util/sst_file_manager_impl.cc' - , 'rocksdb/util/statistics.cc' + , 'rocksdb/util/file_checksum_helper.cc' , 'rocksdb/util/status.cc' - , 'rocksdb/util/status_message.cc' , 'rocksdb/util/string_util.cc' - , 'rocksdb/util/sync_point.cc' , 'rocksdb/util/thread_local.cc' - , 'rocksdb/util/thread_status_impl.cc' - , 'rocksdb/util/thread_status_updater.cc' - , 'rocksdb/util/thread_status_updater_debug.cc' - , 'rocksdb/util/thread_status_util.cc' - , 'rocksdb/util/thread_status_util_debug.cc' , 'rocksdb/util/threadpool_imp.cc' - , 'rocksdb/util/transaction_test_util.cc' , 'rocksdb/util/xxhash.cc' - , 'rocksdb/utilities/backupable/backupable_db.cc' - , 'rocksdb/utilities/blob_db/blob_db.cc' - , 'rocksdb/utilities/convenience/info_log_finder.cc' - , 'rocksdb/utilities/checkpoint/checkpoint.cc' + + # Unused + # , 'rocksdb/utilities/backupable/backupable_db.cc' + + # Unused + # , 'rocksdb/utilities/blob_db/blob_compaction_filter.cc' + # , 'rocksdb/utilities/blob_db/blob_db.cc' + # , 'rocksdb/utilities/blob_db/blob_db_impl.cc' + # , 'rocksdb/utilities/blob_db/blob_db_impl_filesnapshot.cc' + # , 'rocksdb/utilities/blob_db/blob_dump_tool.cc' + # , 'rocksdb/utilities/blob_db/blob_file.cc' + + # Unused + # , 'rocksdb/utilities/cassandra/cassandra_compaction_filter.cc' + # , 'rocksdb/utilities/cassandra/format.cc' + # , 'rocksdb/utilities/cassandra/merge_operator.cc' + + , 'rocksdb/utilities/checkpoint/checkpoint_impl.cc' , 'rocksdb/utilities/compaction_filters/remove_emptyvalue_compactionfilter.cc' - , 'rocksdb/utilities/document/document_db.cc' - , 'rocksdb/utilities/document/json_document_builder.cc' - , 'rocksdb/utilities/document/json_document.cc' - , 'rocksdb/utilities/env_mirror.cc' - , 'rocksdb/utilities/geodb/geodb_impl.cc' + , 'rocksdb/utilities/debug.cc' + + # Unused + # , 'rocksdb/utilities/env_mirror.cc' + # , 'rocksdb/utilities/env_timed.cc' + + # Unused + # , 'rocksdb/utilities/fault_injection_env.cc' + # , 'rocksdb/utilities/fault_injection_fs.cc' + , 'rocksdb/utilities/leveldb_options/leveldb_options.cc' - , 'rocksdb/utilities/lua/rocks_lua_compaction_filter.cc' , 'rocksdb/utilities/memory/memory_util.cc' - , 'rocksdb/utilities/merge_operators/put.cc' - , 'rocksdb/utilities/merge_operators/max.cc' - , 'rocksdb/utilities/merge_operators/string_append/stringappend2.cc' - , 'rocksdb/utilities/merge_operators/string_append/stringappend.cc' - , 'rocksdb/utilities/merge_operators/uint64add.cc' + + # Unused + # , 'rocksdb/utilities/merge_operators/bytesxor.cc' + # , 'rocksdb/utilities/merge_operators/max.cc' + # , 'rocksdb/utilities/merge_operators/put.cc' + # , 'rocksdb/utilities/merge_operators/sortlist.cc' + # , 'rocksdb/utilities/merge_operators/string_append/stringappend.cc' + # , 'rocksdb/utilities/merge_operators/string_append/stringappend2.cc' + # , 'rocksdb/utilities/merge_operators/uint64add.cc' + + , 'rocksdb/utilities/object_registry.cc' , 'rocksdb/utilities/option_change_migration/option_change_migration.cc' , 'rocksdb/utilities/options/options_util.cc' - , 'rocksdb/utilities/persistent_cache/persistent_cache_tier.cc' - , 'rocksdb/utilities/persistent_cache/volatile_tier_impl.cc' - , 'rocksdb/utilities/persistent_cache/block_cache_tier_file.cc' - , 'rocksdb/utilities/persistent_cache/block_cache_tier_metadata.cc' - , 'rocksdb/utilities/persistent_cache/block_cache_tier.cc' - , 'rocksdb/utilities/redis/redis_lists.cc' - , 'rocksdb/utilities/simulator_cache/sim_cache.cc' - , 'rocksdb/utilities/spatialdb/spatial_db.cc' + + # Unused + # , 'rocksdb/utilities/persistent_cache/block_cache_tier.cc' + # , 'rocksdb/utilities/persistent_cache/block_cache_tier_file.cc' + # , 'rocksdb/utilities/persistent_cache/block_cache_tier_metadata.cc' + # , 'rocksdb/utilities/persistent_cache/persistent_cache_tier.cc' + # , 'rocksdb/utilities/persistent_cache/volatile_tier_impl.cc' + + # Unused + # , 'rocksdb/utilities/simulator_cache/cache_simulator.cc' + # , 'rocksdb/utilities/simulator_cache/sim_cache.cc' + , 'rocksdb/utilities/table_properties_collectors/compact_on_deletion_collector.cc' - , 'rocksdb/utilities/transactions/optimistic_transaction_impl.cc' + , 'rocksdb/utilities/trace/file_trace_reader_writer.cc' + , 'rocksdb/utilities/transactions/lock/lock_manager.cc' + , 'rocksdb/utilities/transactions/lock/point/point_lock_tracker.cc' + , 'rocksdb/utilities/transactions/lock/point/point_lock_manager.cc' + , 'rocksdb/utilities/transactions/lock/range/range_tree/range_tree_lock_manager.cc' + , 'rocksdb/utilities/transactions/lock/range/range_tree/range_tree_lock_tracker.cc' , 'rocksdb/utilities/transactions/optimistic_transaction_db_impl.cc' + , 'rocksdb/utilities/transactions/optimistic_transaction.cc' + , 'rocksdb/utilities/transactions/pessimistic_transaction.cc' + , 'rocksdb/utilities/transactions/pessimistic_transaction_db.cc' + , 'rocksdb/utilities/transactions/snapshot_checker.cc' , 'rocksdb/utilities/transactions/transaction_base.cc' - , 'rocksdb/utilities/transactions/transaction_db_impl.cc' , 'rocksdb/utilities/transactions/transaction_db_mutex_impl.cc' - , 'rocksdb/utilities/transactions/transaction_lock_mgr.cc' - , 'rocksdb/utilities/transactions/transaction_impl.cc' , 'rocksdb/utilities/transactions/transaction_util.cc' + , 'rocksdb/utilities/transactions/write_prepared_txn.cc' + , 'rocksdb/utilities/transactions/write_prepared_txn_db.cc' + , 'rocksdb/utilities/transactions/write_unprepared_txn.cc' + , 'rocksdb/utilities/transactions/write_unprepared_txn_db.cc' , 'rocksdb/utilities/ttl/db_ttl_impl.cc' - , 'rocksdb/utilities/date_tiered/date_tiered_db_impl.cc' , 'rocksdb/utilities/write_batch_with_index/write_batch_with_index.cc' , 'rocksdb/utilities/write_batch_with_index/write_batch_with_index_internal.cc' + + , 'build_version.cc' ] }]} diff --git a/test/getproperty-test.js b/test/getproperty-test.js index f756de6c..538e7011 100644 --- a/test/getproperty-test.js +++ b/test/getproperty-test.js @@ -47,7 +47,7 @@ test('test invalid getProperty("rocksdb.stats")', function (t) { test('test invalid getProperty("rocksdb.sstables")', function (t) { var expected = [0, 1, 2, 3, 4, 5, 6].map(function (l) { - return '--- level ' + l + ' --- version# 1 ---' + return '--- level ' + l + ' --- version# 2 ---' }).join('\n') + '\n' t.equal(db.getProperty('rocksdb.sstables'), expected, 'rocksdb.sstables') t.end() diff --git a/test/repair-test.js b/test/repair-test.js index adbc256f..a6c68f4f 100644 --- a/test/repair-test.js +++ b/test/repair-test.js @@ -21,7 +21,7 @@ test('test callback-less, 1-arg, repair() throws', function (t) { test('test repair non-existent directory returns error', function (t) { leveldown.repair('/1/2/3/4', function (err) { - t.ok(/^Error: NotFound:/i.test(err), 'error on callback') + t.ok(/^Error:/i.test(err), 'error on callback') t.end() }) })