1. 26 1月, 2023 5 次提交
    • L
      Remove more obsolete statistics (#11131) · 6da2e20d
      Levi Tamasi 提交于
      Summary: Pull Request resolved: https://github.com/facebook/rocksdb/pull/11131
      
      Test Plan: `make check`
      
      Reviewed By: pdillinger
      
      Differential Revision: D42753997
      
      Pulled By: ltamasi
      
      fbshipit-source-id: ce8b84c1e55374257e93ed74fd255c9b759723ce
      6da2e20d
    • H
      Fix build with gcc 13 by including <cstdint> (#11118) · 88edfbfb
      Heiko Becker 提交于
      Summary:
      Like other versions before, gcc 13 moved some includes around and as a result <cstdint> is no longer transitively included [1]. Explicitly include it for uint{32,64}_t.
      
      [1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
      
      Pull Request resolved: https://github.com/facebook/rocksdb/pull/11118
      
      Reviewed By: cbi42
      
      Differential Revision: D42711356
      
      Pulled By: ajkr
      
      fbshipit-source-id: 5ea257b85b7017f40fd8fdbce965336da95c55b2
      88edfbfb
    • A
      Support PutEntity in trace analyzer (#11127) · 6a5071ce
      Andrew Kryczka 提交于
      Summary:
      Add the most basic support such that trace_analyzer commands no longer fail with
      ```
      Cannot process the write batch in the trace
      Cannot process the TraceRecord
      PutEntityCF not implemented
      Cannot process the trace
      ```
      
      Pull Request resolved: https://github.com/facebook/rocksdb/pull/11127
      
      Reviewed By: cbi42
      
      Differential Revision: D42732319
      
      Pulled By: ajkr
      
      fbshipit-source-id: 162d8a31318672a46539b1b042ec25f69b25c4ed
      6a5071ce
    • P
      Fix DelayWrite() calls for two_write_queues (#11130) · 546e213c
      Peter Dillinger 提交于
      Summary:
      PR https://github.com/facebook/rocksdb/issues/11020 fixed a case where it was easy to deadlock the DB with LockWAL() but introduced a bug showing up as a rare assertion failure in the stress test. Specifically, `assert(w->state == STATE_INIT)` in `WriteThread::LinkOne()` called from `BeginWriteStall()`, `DelayWrite()`, `WriteImplWALOnly()`. I haven't been about to generate a unit test that reproduces this failure but I believe the root cause is that DelayWrite() was never meant to be re-entrant, only called from the DB's write_thread_ leader. https://github.com/facebook/rocksdb/issues/11020 introduced a call to DelayWrite() from the nonmem_write_thread_ group leader.
      
      This fix is to make DelayWrite() apply to the specific write queue that it is being called from (inject a dummy write stall entry to the head of the appropriate write queue). WriteController is re-entrant, based on polling and state changes signalled with bg_cv_, so can manage stalling two queues. The only anticipated complication (called out by Andrew in previous PR) is that we don't want timed write delays being injected in parallel for the two queues, because that dimishes the intended throttling effect. Thus, we only allow timed delays for the primary write queue.
      
      HISTORY not updated because this is intended for the same release where the bug was introduced.
      
      Pull Request resolved: https://github.com/facebook/rocksdb/pull/11130
      
      Test Plan:
      Although I was not able to reproduce the assertion failure, I was able to reproduce a distinct flaw with what I believe is the same root cause: a kind of deadlock if both write queues need to wake up from stopped writes. Only one will be waiting on bg_cv_ (the other waiting in `LinkOne()` for the write queue to open up), so a single SignalAll() will only unblock one of the queues, with the other re-instating the stop until another signal on bg_cv_. A simple unit test is added for this case.
      
      Will also run crash_test_with_multiops_wc_txn for a while looking for issues.
      
      Reviewed By: ajkr
      
      Differential Revision: D42749330
      
      Pulled By: pdillinger
      
      fbshipit-source-id: 4317dd899a93d57c26fd5af7143038f82d4d4d1b
      546e213c
    • P
      Remove deprecated Env::LoadEnv() (#11121) · 9afa0f05
      Peter Dillinger 提交于
      Summary:
      Can use Env::CreateFromString() instead
      
      Pull Request resolved: https://github.com/facebook/rocksdb/pull/11121
      
      Test Plan: unit tests updated
      
      Reviewed By: cbi42
      
      Differential Revision: D42723813
      
      Pulled By: pdillinger
      
      fbshipit-source-id: 5d4b5b10225dfdaf662f5f8049ee965a05d3edc9
      9afa0f05
  2. 25 1月, 2023 6 次提交
    • L
      Remove some deprecated/obsolete statistics from the API (#11123) · 99e55953
      Levi Tamasi 提交于
      Summary:
      These tickers/histograms have been obsolete (and not populated) for a long time.
      The patch removes them from the API completely. Note that this means that the
      numeric values of the remaining tickers change in the C++ code as they get shifted up.
      This should be OK: the values of some existing tickers have changed many times
      over the years as items have been added in the middle. (In contrast, the convention
      in the Java bindings is to keep the ids, which are not guaranteed to be the same
      as the ids on the C++ side, the same across releases.)
      
      Pull Request resolved: https://github.com/facebook/rocksdb/pull/11123
      
      Test Plan: `make check`
      
      Reviewed By: akankshamahajan15
      
      Differential Revision: D42727793
      
      Pulled By: ltamasi
      
      fbshipit-source-id: e058a155a20b05b45f53e67ee380aece1b43b6c5
      99e55953
    • A
      Migrate ErrorEnv from EnvWrapper to FileSystemWrapper (#11124) · bcbab59c
      anand76 提交于
      Summary:
      Migrate ErrorEnv from EnvWrapper to FileSystemWrapper so we can eventually deprecate the storage methods in Env.
      
      Pull Request resolved: https://github.com/facebook/rocksdb/pull/11124
      
      Reviewed By: akankshamahajan15
      
      Differential Revision: D42727791
      
      Pulled By: anand1976
      
      fbshipit-source-id: e8362ad624dc28e55c99fc35eda12866755f62c6
      bcbab59c
    • S
      Remove compressed block cache (#11117) · 2800aa06
      sdong 提交于
      Summary:
      Compressed block cache is replaced by compressed secondary cache. Remove the feature.
      
      Pull Request resolved: https://github.com/facebook/rocksdb/pull/11117
      
      Test Plan: See CI passes
      
      Reviewed By: pdillinger
      
      Differential Revision: D42700164
      
      fbshipit-source-id: 6cbb24e460da29311150865f60ecb98637f9f67d
      2800aa06
    • P
      A better contract for best_efforts_recovery (#11085) · 4a918534
      Peter Dillinger 提交于
      Summary:
      Capture more of the original intent at a high level, without getting bogged down in low-level details.
      
      The old text made some weak promises about handling of LOCK files. There should be no specific concern for LOCK files, because we already rely on LockFile() to create the file if it's not present already. And the lock file is generally size 0, so don't have to worry about truncation. Added a unit test.
      
      Pull Request resolved: https://github.com/facebook/rocksdb/pull/11085
      
      Test Plan: existing tests, and a new one.
      
      Reviewed By: siying
      
      Differential Revision: D42713233
      
      Pulled By: pdillinger
      
      fbshipit-source-id: 2fce7c974d35fac065037c9c4c7326a59c9fe340
      4a918534
    • C
      Improve documentation for `allow_ingest_behind` (#11119) · e0ea0dc6
      Changyu Bi 提交于
      Summary:
      update documentation to mention that only universal compaction is supported.
      
      Pull Request resolved: https://github.com/facebook/rocksdb/pull/11119
      
      Reviewed By: ajkr
      
      Differential Revision: D42715986
      
      Pulled By: cbi42
      
      fbshipit-source-id: 91b145d3318334cb92857c5c0ffc0efed6fa4363
      e0ea0dc6
    • H
      Fix data race on `ColumnFamilyData::flush_reason` by letting FlushRequest/Job... · 86fa2592
      Hui Xiao 提交于
      Fix data race on `ColumnFamilyData::flush_reason` by letting FlushRequest/Job owns flush_reason instead of CFD (#11111)
      
      Summary:
      **Context:**
      Concurrent flushes on the same CF can set on `ColumnFamilyData::flush_reason` before each other flush finishes. An symptom is one CF has different flush_reason with others though all of them are in an atomic flush  `db_stress: db/db_impl/db_impl_compaction_flush.cc:423: rocksdb::Status rocksdb::DBImpl::AtomicFlushMemTablesToOutputFiles(const rocksdb::autovector<rocksdb::DBImpl::BGFlushArg>&, bool*, rocksdb::JobContext*, rocksdb::LogBuffer*, rocksdb::Env::Priority): Assertion cfd->GetFlushReason() == cfds[0]->GetFlushReason() failed. `
      
      **Summary:**
      Suggested by ltamasi, we now refactor and let FlushRequest/Job to own flush_reason as there is no good way to define `ColumnFamilyData::flush_reason` in face of concurrent flushes on the same CF (which wasn't the case a long time ago when `ColumnFamilyData::flush_reason ` first introduced`)
      
      **Tets:**
      - new unit test
      - make check
      - aggressive crash test rehearsal
      
      Pull Request resolved: https://github.com/facebook/rocksdb/pull/11111
      
      Reviewed By: ajkr
      
      Differential Revision: D42644600
      
      Pulled By: hx235
      
      fbshipit-source-id: 8589c8184869d3415e5b780c887f877818a5ebaf
      86fa2592
  3. 24 1月, 2023 1 次提交
  4. 21 1月, 2023 2 次提交
    • A
      Add API to limit blast radius of merge operator failure (#11092) · b7fbcefd
      Andrew Kryczka 提交于
      Summary:
      Prior to this PR, `FullMergeV2()` can only return `false` to indicate failure, which causes any operation invoking it to fail. During a compaction, such a failure causes the compaction to fail and causes the DB to irreversibly enter read-only mode. Some users asked for a way to allow the merge operator to fail without such widespread damage.
      
      To limit the blast radius of merge operator failures, this PR introduces the `MergeOperationOutput::op_failure_scope` API. When unpopulated (`kDefault`) or set to `kTryMerge`, the merge operator failure handling is the same as before. When set to `kMustMerge`, merge operator failure still causes failure to operations that must merge (`Get()`, iterator, `MultiGet()`, etc.). However, under `kMustMerge`, flushes/compactions can survive merge operator failures by outputting the unmerged input operands.
      
      Pull Request resolved: https://github.com/facebook/rocksdb/pull/11092
      
      Reviewed By: siying
      
      Differential Revision: D42525673
      
      Pulled By: ajkr
      
      fbshipit-source-id: 951dc3bf190f86347dccf3381be967565cda52ee
      b7fbcefd
    • A
      Enhance async scan prefetch unit tests (#11087) · bde65052
      akankshamahajan 提交于
      Summary:
      Add more coverage in unit tests for async scan. The added unit test fails without PR https://github.com/facebook/rocksdb/pull/10939.
      
      Pull Request resolved: https://github.com/facebook/rocksdb/pull/11087
      
      Test Plan: CircleCI jobs status for new unit tests.
      
      Reviewed By: anand1976
      
      Differential Revision: D42487931
      
      Pulled By: akankshamahajan15
      
      fbshipit-source-id: d59ed7666599bd0d2733ac5d76bd70984b54c5a9
      bde65052
  5. 20 1月, 2023 3 次提交
    • qq_39353189's avatar
      Fix error maybe-uninitialized #11100 (#11101) · f4a5446c
      qq_39353189 提交于
      Summary:
      In this issue [11100](https://github.com/facebook/rocksdb/issues/11100)
      I try to upgrade dependencies of [BaikalDB](https://github.com/baidu/BaikalDB) and tool chain to gcc-12.I found that when I build rocksdb v6.26.0(maybe I can use newer version),I found that in file trace_replay/trace_replay.cc,the compiler tell me "error mybe-uninitialized".I dound that it can be fixed very easy,so I make this pull request.
      
      Pull Request resolved: https://github.com/facebook/rocksdb/pull/11101
      
      Reviewed By: ajkr
      
      Differential Revision: D42583031
      
      Pulled By: cbi42
      
      fbshipit-source-id: 7f399f09441a30fe88b83cec5e2fd9885bad5c06
      f4a5446c
    • L
      remove unused InternalIteratorBase::is_mutable_ (#11104) · a5bcbcd8
      leipeng 提交于
      Summary:
      `InternalIteratorBase::is_mutable_` is not used any more, remove it.
      
      Pull Request resolved: https://github.com/facebook/rocksdb/pull/11104
      
      Reviewed By: ajkr
      
      Differential Revision: D42582747
      
      Pulled By: cbi42
      
      fbshipit-source-id: d30bf75151fc8414df0ae112a6ec4943b5b7330b
      a5bcbcd8
    • P
      Upgrade xxhash.h to latest dev (#11098) · fd911f96
      Peter Dillinger 提交于
      Summary:
      Upgrading xxhash.h to latest dev version as of 1/17/2023, which is d7197ddea81364a539051f116ca77926100fc77f This should improve performance on some ARM machines.
      
      I allowed some of our RocksDB-specific changes to be made obsolete where it seemed appropriate, for example
      * xxhash.h has its own fallthrough marker (which I hope works for us)
      * As in https://github.com/Cyan4973/xxHash/pull/549
      
      Merging and resolving conflicts one way or the other was all that went into this diff. Except I had to mix the two sides around `defined(__loongarch64)`
      
      How I did the upgrade (for future reference), so that I could use usual merge conflict resolution:
      ```
      # New branch to help with merging
      git checkout -b xxh_merge_base
      # Check out RocksDB revision before last xxhash.h upgrade
      git reset --hard 22161b75^
      # Create a commit with the raw base version from xxHash repo (from xxHash repo)
      git show 2c611a76f914828bed675f0f342d6c4199ffee1e:xxhash.h > ../rocksdb/util/xxhash.h
      # In RocksDB repo
      git commit -a
      # Merge in the last xxhash.h upgrade
      git merge 22161b75
      # Resolve conflict using committed version
      git show 22161b75:util/xxhash.h > util/xxhash.h
      git commit -a
      # Catch up to upstream
      git merge upstream/main
      
      # Create a different branch for applying raw upgrade
      git checkout -b xxh_upgrade_2023
      # Find the RocksDB commit we made for the raw base version from xxHash
      git log main..HEAD
      # Rewind to it
      git reset --hard 2428b727
      # Copy in latest raw version (from xxHash repo)
      cat xxhash.h > ../rocksdb/util/xxhash.h
      # Merge in RocksDB changes, use typical tools for conflict resolution
      git merge xxh_merge_base
      ```
      
      Branch https://github.com/facebook/rocksdb/tree/xxhash_merge_base can be used as a base for future xxhash merges.
      
      Fixes https://github.com/facebook/rocksdb/issues/11073
      
      Pull Request resolved: https://github.com/facebook/rocksdb/pull/11098
      
      Test Plan:
      existing tests (e.g. Bloom filter schema stability tests)
      
      Also seems to include a small performance boost on my Intel dev machine, using `./db_bench --benchmarks=xxh3[-X50] 2>&1 | egrep -o 'operations;.*' | sort`
      
      Fastest out of 50 runs, before: 15477.3 MB/s
      Fastest out of 50 runs, after: 15850.7 MB/s, and 11 more runs faster than the "before" number
      
      Slowest out of 50 runs, before: 12267.5 MB/s
      Slowest out of 50 runs, after: 13897.1 MB/s
      
      More repetitions show the distinction is repeatable
      
      Reviewed By: hx235
      
      Differential Revision: D42560010
      
      Pulled By: pdillinger
      
      fbshipit-source-id: c43ee52f1c5fe0ba3d6d6e4eebb22ded5f5492ea
      fd911f96
  6. 19 1月, 2023 2 次提交
  7. 18 1月, 2023 2 次提交
    • C
      Consider TTL compaction file cutting earlier to prevent small output file (#11075) · 4d0f9a99
      Changyu Bi 提交于
      Summary:
      in `CompactionOutputs::ShouldStopBefore()`, TTL-related states, `cur_files_to_cut_for_ttl_` and `next_files_to_cut_for_ttl_`, are not updated if the function returns early. This can cause unnecessary compaction output file cuttings and hence produce smaller output files, which may hurt write amp. See the example in the unit test for how this "unnecessary file cutting" can happen. This PR fixes this issue by moving the code for updating TTL states earlier in `CompactionOutputs::ShouldStopBefore()` so that the states are updated for each key.
      
      Pull Request resolved: https://github.com/facebook/rocksdb/pull/11075
      
      Test Plan: - Added new unit test.
      
      Reviewed By: hx235
      
      Differential Revision: D42398739
      
      Pulled By: cbi42
      
      fbshipit-source-id: 09fab66679c1a734abcfc31bcea33dd9aeb9dbc7
      4d0f9a99
    • C
      Avoid counting extra range tombstone compensated size in `AddRangeDels()` (#11091) · 6a82b687
      Changyu Bi 提交于
      Summary:
      in `CompactionOutputs::AddRangeDels()`, range tombstones with the same start and end key but different sequence numbers all contribute to compensated range tombstone size. This PR removes this redundancy. This PR also includes a fix from https://github.com/facebook/rocksdb/issues/11067 where a range tombstone that is not within a file's range was being added to the file. This fixes an assertion failure for `icmp.Compare(start, end) <= 0` in VersionSet::ApproximateSize() when calculating compensated range tombstone size. Assertions and a comment/essay was added to reason that no such range tombstone will be added after this fix.
      
      Pull Request resolved: https://github.com/facebook/rocksdb/pull/11091
      
      Test Plan:
      - Added unit tests
      - Stress test with small key range: `python3 tools/db_crashtest.py blackbox --simple --max_key=100 --interval=600 --write_buffer_size=262144 --target_file_size_base=256 --max_bytes_for_level_base=262144 --block_size=128 --value_size_mult=33 --subcompactions=10`
      
      Reviewed By: ajkr
      
      Differential Revision: D42521588
      
      Pulled By: cbi42
      
      fbshipit-source-id: 5bda3fe38997995314e1f7592319af12b69bc4f8
      6a82b687
  8. 14 1月, 2023 3 次提交
  9. 13 1月, 2023 1 次提交
  10. 12 1月, 2023 1 次提交
    • P
      Major Cache refactoring, CPU efficiency improvement (#10975) · 9f7801c5
      Peter Dillinger 提交于
      Summary:
      This is several refactorings bundled into one to avoid having to incrementally re-modify uses of Cache several times. Overall, there are breaking changes to Cache class, and it becomes more of low-level interface for implementing caches, especially block cache. New internal APIs make using Cache cleaner than before, and more insulated from block cache evolution. Hopefully, this is the last really big block cache refactoring, because of rather effectively decoupling the implementations from the uses. This change also removes the EXPERIMENTAL designation on the SecondaryCache support in Cache. It seems reasonably mature at this point but still subject to change/evolution (as I warn in the API docs for Cache).
      
      The high-level motivation for this refactoring is to minimize code duplication / compounding complexity in adding SecondaryCache support to HyperClockCache (in a later PR). Other benefits listed below.
      
      * static_cast lines of code +29 -35 (net removed 6)
      * reinterpret_cast lines of code +6 -32 (net removed 26)
      
      ## cache.h and secondary_cache.h
      * Always use CacheItemHelper with entries instead of just a Deleter. There are several motivations / justifications:
        * Simpler for implementations to deal with just one Insert and one Lookup.
        * Simpler and more efficient implementation because we don't have to track which entries are using helpers and which are using deleters
        * Gets rid of hack to classify cache entries by their deleter. Instead, the CacheItemHelper includes a CacheEntryRole. This simplifies a lot of code (cache_entry_roles.h almost eliminated). Fixes https://github.com/facebook/rocksdb/issues/9428.
        * Makes it trivial to adjust SecondaryCache behavior based on kind of block (e.g. don't re-compress filter blocks).
        * It is arguably less convenient for many direct users of Cache, but direct users of Cache are now rare with introduction of typed_cache.h (below).
        * I considered and rejected an alternative approach in which we reduce customizability by assuming each secondary cache compatible value starts with a Slice referencing the uncompressed block contents (already true or mostly true), but we apparently intend to stack secondary caches. Saving an entry from a compressed secondary to a lower tier requires custom handling offered by SaveToCallback, etc.
      * Make CreateCallback part of the helper and introduce CreateContext to work with it (alternative to https://github.com/facebook/rocksdb/issues/10562). This cleans up the interface while still allowing context to be provided for loading/parsing values into primary cache. This model works for async lookup in BlockBasedTable reader (reader owns a CreateContext) under the assumption that it always waits on secondary cache operations to finish. (Otherwise, the CreateContext could be destroyed while async operation depending on it continues.) This likely contributes most to the observed performance improvement because it saves an std::function backed by a heap allocation.
      * Use char* for serialized data, e.g. in SaveToCallback, where void* was confusingly used. (We use `char*` for serialized byte data all over RocksDB, with many advantages over `void*`. `memcpy` etc. are legacy APIs that should not be mimicked.)
      * Add a type alias Cache::ObjectPtr = void*, so that we can better indicate the intent of the void* when it is to be the object associated with a Cache entry. Related: started (but did not complete) a refactoring to move away from "value" of a cache entry toward "object" or "obj". (It is confusing to call Cache a key-value store (like DB) when it is really storing arbitrary in-memory objects, not byte strings.)
      * Remove unnecessary key param from DeleterFn. This is good for efficiency in HyperClockCache, which does not directly store the cache key in memory. (Alternative to https://github.com/facebook/rocksdb/issues/10774)
      * Add allocator to Cache DeleterFn. This is a kind of future-proofing change in case we get more serious about using the Cache allocator for memory tracked by the Cache. Right now, only the uncompressed block contents are allocated using the allocator, and a pointer to that allocator is saved as part of the cached object so that the deleter can use it. (See CacheAllocationPtr.) If in the future we are able to "flatten out" our Cache objects some more, it would be good not to have to track the allocator as part of each object.
      * Removes legacy `ApplyToAllCacheEntries` and changes `ApplyToAllEntries` signature for Deleter->CacheItemHelper change.
      
      ## typed_cache.h
      Adds various "typed" interfaces to the Cache as internal APIs, so that most uses of Cache can use simple type safe code without casting and without explicit deleters, etc. Almost all of the non-test, non-glue code uses of Cache have been migrated. (Follow-up work: CompressedSecondaryCache deserves deeper attention to migrate.) This change expands RocksDB's internal usage of metaprogramming and SFINAE (https://en.cppreference.com/w/cpp/language/sfinae).
      
      The existing usages of Cache are divided up at a high level into these new interfaces. See updated existing uses of Cache for examples of how these are used.
      * PlaceholderCacheInterface - Used for making cache reservations, with entries that have a charge but no value.
      * BasicTypedCacheInterface<TValue> - Used for primary cache storage of objects of type TValue, which can be cleaned up with std::default_delete<TValue>. The role is provided by TValue::kCacheEntryRole or given in an optional template parameter.
      * FullTypedCacheInterface<TValue, TCreateContext> - Used for secondary cache compatible storage of objects of type TValue. In addition to BasicTypedCacheInterface constraints, we require TValue::ContentSlice() to return persistable data. This simplifies usage for the normal case of simple secondary cache compatibility (can give you a Slice to the data already in memory). In addition to TCreateContext performing the role of Cache::CreateContext, it is also expected to provide a factory function for creating TValue.
      * For each of these, there's a "Shared" version (e.g. FullTypedSharedCacheInterface) that holds a shared_ptr to the Cache, rather than assuming external ownership by holding only a raw `Cache*`.
      
      These interfaces introduce specific handle types for each interface instantiation, so that it's easy to see what kind of object is controlled by a handle. (Ultimately, this might not be worth the extra complexity, but it seems OK so far.)
      
      Note: I attempted to make the cache 'charge' automatically inferred from the cache object type, such as by expecting an ApproximateMemoryUsage() function, but this is not so clean because there are cases where we need to compute the charge ahead of time and don't want to re-compute it.
      
      ## block_cache.h
      This header is essentially the replacement for the old block_like_traits.h. It includes various things to support block cache access with typed_cache.h for block-based table.
      
      ## block_based_table_reader.cc
      Before this change, accessing the block cache here was an awkward mix of static polymorphism (template TBlocklike) and switch-case on a dynamic BlockType value. This change mostly unifies on static polymorphism, relying on minor hacks in block_cache.h to distinguish variants of Block. We still check BlockType in some places (especially for stats, which could be improved in follow-up work) but at least the BlockType is a static constant from the template parameter. (No more awkward partial redundancy between static and dynamic info.) This likely contributes to the overall performance improvement, but hasn't been tested in isolation.
      
      The other key source of simplification here is a more unified system of creating block cache objects: for directly populating from primary cache and for promotion from secondary cache. Both use BlockCreateContext, for context and for factory functions.
      
      ## block_based_table_builder.cc, cache_dump_load_impl.cc
      Before this change, warming caches was super ugly code. Both of these source files had switch statements to basically transition from the dynamic BlockType world to the static TBlocklike world. None of that mess is needed anymore as there's a new, untyped WarmInCache function that handles all the details just as promotion from SecondaryCache would. (Fixes `TODO akanksha: Dedup below code` in block_based_table_builder.cc.)
      
      ## Everything else
      Mostly just updating Cache users to use new typed APIs when reasonably possible, or changed Cache APIs when not.
      
      Pull Request resolved: https://github.com/facebook/rocksdb/pull/10975
      
      Test Plan:
      tests updated
      
      Performance test setup similar to https://github.com/facebook/rocksdb/issues/10626 (by cache size, LRUCache when not "hyper" for HyperClockCache):
      
      34MB 1thread base.hyper -> kops/s: 0.745 io_bytes/op: 2.52504e+06 miss_ratio: 0.140906 max_rss_mb: 76.4844
      34MB 1thread new.hyper -> kops/s: 0.751 io_bytes/op: 2.5123e+06 miss_ratio: 0.140161 max_rss_mb: 79.3594
      34MB 1thread base -> kops/s: 0.254 io_bytes/op: 1.36073e+07 miss_ratio: 0.918818 max_rss_mb: 45.9297
      34MB 1thread new -> kops/s: 0.252 io_bytes/op: 1.36157e+07 miss_ratio: 0.918999 max_rss_mb: 44.1523
      34MB 32thread base.hyper -> kops/s: 7.272 io_bytes/op: 2.88323e+06 miss_ratio: 0.162532 max_rss_mb: 516.602
      34MB 32thread new.hyper -> kops/s: 7.214 io_bytes/op: 2.99046e+06 miss_ratio: 0.168818 max_rss_mb: 518.293
      34MB 32thread base -> kops/s: 3.528 io_bytes/op: 1.35722e+07 miss_ratio: 0.914691 max_rss_mb: 264.926
      34MB 32thread new -> kops/s: 3.604 io_bytes/op: 1.35744e+07 miss_ratio: 0.915054 max_rss_mb: 264.488
      233MB 1thread base.hyper -> kops/s: 53.909 io_bytes/op: 2552.35 miss_ratio: 0.0440566 max_rss_mb: 241.984
      233MB 1thread new.hyper -> kops/s: 62.792 io_bytes/op: 2549.79 miss_ratio: 0.044043 max_rss_mb: 241.922
      233MB 1thread base -> kops/s: 1.197 io_bytes/op: 2.75173e+06 miss_ratio: 0.103093 max_rss_mb: 241.559
      233MB 1thread new -> kops/s: 1.199 io_bytes/op: 2.73723e+06 miss_ratio: 0.10305 max_rss_mb: 240.93
      233MB 32thread base.hyper -> kops/s: 1298.69 io_bytes/op: 2539.12 miss_ratio: 0.0440307 max_rss_mb: 371.418
      233MB 32thread new.hyper -> kops/s: 1421.35 io_bytes/op: 2538.75 miss_ratio: 0.0440307 max_rss_mb: 347.273
      233MB 32thread base -> kops/s: 9.693 io_bytes/op: 2.77304e+06 miss_ratio: 0.103745 max_rss_mb: 569.691
      233MB 32thread new -> kops/s: 9.75 io_bytes/op: 2.77559e+06 miss_ratio: 0.103798 max_rss_mb: 552.82
      1597MB 1thread base.hyper -> kops/s: 58.607 io_bytes/op: 1449.14 miss_ratio: 0.0249324 max_rss_mb: 1583.55
      1597MB 1thread new.hyper -> kops/s: 69.6 io_bytes/op: 1434.89 miss_ratio: 0.0247167 max_rss_mb: 1584.02
      1597MB 1thread base -> kops/s: 60.478 io_bytes/op: 1421.28 miss_ratio: 0.024452 max_rss_mb: 1589.45
      1597MB 1thread new -> kops/s: 63.973 io_bytes/op: 1416.07 miss_ratio: 0.0243766 max_rss_mb: 1589.24
      1597MB 32thread base.hyper -> kops/s: 1436.2 io_bytes/op: 1357.93 miss_ratio: 0.0235353 max_rss_mb: 1692.92
      1597MB 32thread new.hyper -> kops/s: 1605.03 io_bytes/op: 1358.04 miss_ratio: 0.023538 max_rss_mb: 1702.78
      1597MB 32thread base -> kops/s: 280.059 io_bytes/op: 1350.34 miss_ratio: 0.023289 max_rss_mb: 1675.36
      1597MB 32thread new -> kops/s: 283.125 io_bytes/op: 1351.05 miss_ratio: 0.0232797 max_rss_mb: 1703.83
      
      Almost uniformly improving over base revision, especially for hot paths with HyperClockCache, up to 12% higher throughput seen (1597MB, 32thread, hyper). The improvement for that is likely coming from much simplified code for providing context for secondary cache promotion (CreateCallback/CreateContext), and possibly from less branching in block_based_table_reader. And likely a small improvement from not reconstituting key for DeleterFn.
      
      Reviewed By: anand1976
      
      Differential Revision: D42417818
      
      Pulled By: pdillinger
      
      fbshipit-source-id: f86bfdd584dce27c028b151ba56818ad14f7a432
      9f7801c5
  11. 06 1月, 2023 1 次提交
  12. 05 1月, 2023 2 次提交
  13. 04 1月, 2023 1 次提交
    • H
      Add back Options::CompactionOptionsFIFO::allow_compaction to stress/crash test (#11063) · b965a5a8
      Hui Xiao 提交于
      Summary:
      **Context/Summary:**
      https://github.com/facebook/rocksdb/pull/10777 was reverted (https://github.com/facebook/rocksdb/pull/10999) due to internal blocker and replaced with a better fix https://github.com/facebook/rocksdb/pull/10922. However, the revert also reverted the `Options::CompactionOptionsFIFO::allow_compaction` stress/crash coverage added by the PR.
      
      It's an useful coverage cuz setting `Options::CompactionOptionsFIFO::allow_compaction=true` will [increase](https://github.com/facebook/rocksdb/blob/7.8.fb/db/version_set.cc#L3255) the compaction score of L0 files for FIFO and then trigger more FIFO compaction. This speed up discovery of bug related to FIFO compaction like https://github.com/facebook/rocksdb/pull/10955. To see the speedup, compare the failure occurrence in following commands with `Options::CompactionOptionsFIFO::allow_compaction=true/false`
      
      ```
      --fifo_allow_compaction=1 --acquire_snapshot_one_in=10000 --adaptive_readahead=0 --allow_concurrent_memtable_write=0 --allow_data_in_errors=True --async_io=1 --avoid_flush_during_recovery=0 --avoid_unnecessary_blocking_io=1 --backup_max_size=104857600 --backup_one_in=100000 --batch_protection_bytes_per_key=0 --block_size=16384 --bloom_bits=8.869062094789008 --bottommost_compression_type=none --bytes_per_sync=0 --cache_index_and_filter_blocks=1 --cache_size=8388608 --cache_type=lru_cache --charge_compression_dictionary_building_buffer=1 --charge_file_metadata=1 --charge_filter_construction=0 --charge_table_reader=1 --checkpoint_one_in=1000000 --checksum_type=kxxHash --clear_column_family_one_in=0 --column_families=1 --compact_files_one_in=1000000 --compact_range_one_in=1000000 --compaction_pri=3 --compaction_style=2 --compaction_ttl=0 --compression_max_dict_buffer_bytes=8589934591 --compression_max_dict_bytes=16384 --compression_parallel_threads=1 --compression_type=xpress --compression_use_zstd_dict_trainer=1 --compression_zstd_max_train_bytes=0 --continuous_verification_interval=0 --data_block_index_type=0 --db=/dev/shm/rocksdb_test/rocksdb_crashtest_whitebox --db_write_buffer_size=1048576 --delpercent=4 --delrangepercent=1 --destroy_db_initially=1 --detect_filter_construct_corruption=0 --disable_wal=0 --enable_compaction_filter=0 --enable_pipelined_write=1 --expected_values_dir=/dev/shm/rocksdb_test/rocksdb_crashtest_expected --fail_if_options_file_error=1 --file_checksum_impl=xxh64 --flush_one_in=1000000 --format_version=4 --get_current_wal_file_one_in=0 --get_live_files_one_in=1000000 --get_property_one_in=1000000 --get_sorted_wal_files_one_in=0 --index_block_restart_interval=10 --index_type=2 --ingest_external_file_one_in=100 --initial_auto_readahead_size=16384 --iterpercent=10 --key_len_percent_dist=1,30,69 --level_compaction_dynamic_level_bytes=False --log2_keys_per_lock=10 --long_running_snapshots=0 --manual_wal_flush_one_in=0 --mark_for_compaction_one_file_in=10 --max_auto_readahead_size=524288 --max_background_compactions=1 --max_bytes_for_level_base=67108864 --max_key=25000000 --max_key_len=3 --max_manifest_file_size=1073741824 --max_write_batch_group_size_bytes=1048576 --max_write_buffer_number=3 --max_write_buffer_size_to_maintain=0 --memtable_prefix_bloom_size_ratio=0.01 --memtable_protection_bytes_per_key=1 --memtable_whole_key_filtering=1 --memtablerep=skip_list --min_write_buffer_number_to_merge=2 --mmap_read=0 --mock_direct_io=True --nooverwritepercent=1 --num_file_reads_for_auto_readahead=2 --open_files=-1 --open_metadata_write_fault_one_in=0 --open_read_fault_one_in=0 --open_write_fault_one_in=0 --ops_per_thread=40000 --optimize_filters_for_memory=0 --paranoid_file_checks=1 --partition_filters=0 --partition_pinning=3 --pause_background_one_in=1000000 --periodic_compaction_seconds=0 --prefix_size=7 --prefixpercent=5 --prepopulate_block_cache=0 --preserve_internal_time_seconds=3600 --progress_reports=0 --read_fault_one_in=1000 --readahead_size=0 --readpercent=15 --recycle_log_file_num=1 --reopen=0 --ribbon_starting_level=999 --secondary_cache_fault_one_in=0  --snapshot_hold_ops=100000 --sst_file_manager_bytes_per_sec=0 --sst_file_manager_bytes_per_truncate=0 --stats_dump_period_sec=0 --subcompactions=2 --sync=0 --sync_fault_injection=0 --target_file_size_base=16777216 --target_file_size_multiplier=1 --test_batches_snapshots=0 --top_level_index_pinning=1 --unpartitioned_pinning=1 --use_direct_io_for_flush_and_compaction=1 --use_direct_reads=1 --use_full_merge_v1=1 --use_merge=0 --use_multiget=0 --use_put_entity_one_in=0 --user_timestamp_size=0 --value_size_mult=32 --verify_checksum=1 --verify_checksum_one_in=1000000 --verify_db_one_in=100000 --verify_iterator_with_expected_state_one_in=5 --verify_sst_unique_id_in_manifest=1 --wal_bytes_per_sync=0 --wal_compression=none --write_buffer_size=33554432 --write_dbid_to_manifest=1 --writepercent=65
      ```
      
      Therefore this PR is adding it back to stress/crash test.
      
      Pull Request resolved: https://github.com/facebook/rocksdb/pull/11063
      
      Test Plan: Rehearsal stress test to make sure stress/crash test is stable
      
      Reviewed By: ajkr
      
      Differential Revision: D42283650
      
      Pulled By: hx235
      
      fbshipit-source-id: 132e6396ab6e24d8dcb8fe51c62dd5211cdf53ef
      b965a5a8
  14. 01 1月, 2023 1 次提交
    • C
      Fix BackupEngineTest.ExcludeFiles memory leak (#11066) · f24ef5d6
      Changyu Bi 提交于
      Summary:
      Valgrind was complaining about the test BackupEngineTest.ExcludeFiles. The cause is backup_engine not being freed similar to https://github.com/facebook/rocksdb/issues/9610.
      ```
      ==18228== Command: ./backup_engine_test --gtest_filter=BackupEngineTest.ExcludeFiles
      ==18228==
      Note: Google Test filter = BackupEngineTest.ExcludeFiles
      [==========] Running 1 test from 1 test case.
      [----------] Global test environment set-up.
      [----------] 1 test from BackupEngineTest
      [ RUN      ] BackupEngineTest.ExcludeFiles
      [       OK ] BackupEngineTest.ExcludeFiles (16264 ms)
      [----------] 1 test from BackupEngineTest (16273 ms total)
      
      [----------] Global test environment tear-down
      [==========] 1 test from 1 test case ran. (16306 ms total)
      [  PASSED  ] 1 test.
      ==18228==
      ==18228== HEAP SUMMARY:
      ==18228==     in use at exit: 14,099 bytes in 159 blocks
      ==18228==   total heap usage: 255,328 allocs, 255,169 frees, 497,538,546 bytes allocated
      ==18228==
      ==18228== 19 bytes in 1 blocks are possibly lost in loss record 4 of 67
      ==18228==    at 0x483BE63: operator new(unsigned long) (in /usr/lib/x86_64-linux-gnu/valgrind/vgpreload_memcheck-amd64-linux.so)
      ==18228==    by 0x1E752D: void std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >::_M_construct<char*>(char*, char*, std::forward_iterator_tag) [clone .constprop.0] (basic_string.tcc:219)
      ==18228==    by 0x1F1898: _M_construct_aux<char*> (basic_string.h:251)
      ==18228==    by 0x1F1898: _M_construct<char*> (basic_string.h:270)
      ==18228==    by 0x1F1898: basic_string (basic_string.h:455)
      ==18228==    by 0x1F1898: construct<std::__cxx11::basic_string<char>, const std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&> (new_allocator.h:146)
      ==18228==    by 0x1F1898: construct<std::__cxx11::basic_string<char>, const std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&> (alloc_traits.h:483)
      ==18228==    by 0x1F1898: push_back (stl_vector.h:1189)
      ==18228==    by 0x1F1898: rocksdb::(anonymous namespace)::TestFs::NewWritableFile(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, rocksdb::FileOptions const&, std::unique_ptr<rocksdb::FSWritableFile, std::default_delete<rocksdb::FSWritableFile> >*, rocksdb::IODebugContext*) (backup_engine_test.cc:208)
      ==18228==    by 0x4B3583: rocksdb::NewWritableFile(rocksdb::FileSystem*, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::unique_ptr<rocksdb::FSWritableFile, std::default_delete<rocksdb::FSWritableFile> >*, rocksdb::FileOptions const&) (read_write_util.cc:23)
      ==18228==    by 0x31C3A8: rocksdb::DBImpl::CreateWAL(unsigned long, unsigned long, unsigned long, rocksdb::log::Writer**) (db_impl_open.cc:1752)
      ==18228==    by 0x321A8C: rocksdb::DBImpl::Open(rocksdb::DBOptions const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::vector<rocksdb::ColumnFamilyDescriptor, std::allocator<rocksdb::ColumnFamilyDescriptor> > const&, std::vector<rocksdb::ColumnFamilyHandle*, std::allocator<rocksdb::ColumnFamilyHandle*> >*, rocksdb::DB**, bool, bool) (db_impl_open.cc:1852)
      ==18228==    by 0x322E7F: Open (db_impl_open.cc:1660)
      ==18228==    by 0x322E7F: rocksdb::DB::Open(rocksdb::Options const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, rocksdb::DB**) (db_impl_open.cc:1637)
      ==18228==    by 0x1EE1CD: InitializeDBAndBackupEngine (backup_engine_test.cc:724)
      ==18228==    by 0x1EE1CD: rocksdb::(anonymous namespace)::BackupEngineTest::OpenDBAndBackupEngine(bool, bool, rocksdb::(anonymous namespace)::BackupEngineTest::ShareOption) (backup_engine_test.cc:732)
      ==18228==    by 0x217585: rocksdb::(anonymous namespace)::BackupEngineTest_ExcludeFiles_Test::TestBody() (backup_engine_test.cc:4232)
      ==18228==    by 0x296143: HandleSehExceptionsInMethodIfSupported<testing::Test, void> (gtest-all.cc:3899)
      ==18228==    by 0x296143: void testing::internal::HandleExceptionsInMethodIfSupported<testing::Test, void>(testing::Test*, void (testing::Test::*)(), char const*) (gtest-all.cc:3935)
      ==18228==    by 0x28A0A5: testing::Test::Run() [clone .part.0] (gtest-all.cc:3973)
      ==18228==    by 0x28A364: Run (gtest-all.cc:3965)
      ==18228==    by 0x28A364: testing::TestInfo::Run() [clone .part.0] (gtest-all.cc:4149)
      ...
      ```
      
      Pull Request resolved: https://github.com/facebook/rocksdb/pull/11066
      
      Test Plan: make -j24 J=24 ROCKSDBTESTS_SUBSET=backup_engine_test valgrind_check_some
      
      Reviewed By: ajkr
      
      Differential Revision: D42297791
      
      Pulled By: cbi42
      
      fbshipit-source-id: db67982b27b91cc78e1a9f4a96da0cba7c9785b7
      f24ef5d6
  15. 31 12月, 2022 3 次提交
  16. 30 12月, 2022 3 次提交
    • H
      Add missing range conflict check between file ingestion and RefitLevel() (#10988) · 9502856e
      Hui Xiao 提交于
      Summary:
      **Context:**
      File ingestion never checks whether the key range it acts on overlaps with an ongoing RefitLevel() (used in `CompactRange()` with `change_level=true`). That's because RefitLevel() doesn't register and make its key range known to file ingestion. Though it checks overlapping with other compactions by https://github.com/facebook/rocksdb/blob/7.8.fb/db/external_sst_file_ingestion_job.cc#L998.
      
      RefitLevel() (used in `CompactRange()` with `change_level=true`) doesn't check whether the key range it acts on overlaps with an ongoing file ingestion. That's because file ingestion does not register and make its key range known to other compactions.
      - Note that non-refitlevel-compaction (e.g, manual compaction w/o RefitLevel() or general compaction) also does not check key range overlap with ongoing file ingestion for the same reason.
      - But it's fine. Credited to cbi42's discovery, `WaitForIngestFile` was called by background and foreground compactions. They were introduced in https://github.com/facebook/rocksdb/commit/0f88160f67d36ea30e3aca3a3cef924c3a009be6, https://github.com/facebook/rocksdb/commit/5c64fb67d2fc198f1a73ff3ae543749a6a41f513 and https://github.com/facebook/rocksdb/commit/87dfc1d23e0e16ff73e15f63c6fa0fb3b3fc8c8c.
      - Regardless, this PR registers file ingestion like a compaction is a general approach that will also add range conflict check between file ingestion and non-refitlevel-compaction, though it has not been the issue motivated this PR.
      
      Above are bugs resulting in two bad consequences:
      - If file ingestion and RefitLevel() creates files in the same level, then range-overlapped files will be created at that level and caught as corruption by `force_consistency_checks=true`
      - If file ingestion and RefitLevel() creates file in different levels, then with one further compaction on the ingested file, it can result in two same keys both with seqno 0 in two different levels. Then with iterator's [optimization](https://github.com/facebook/rocksdb/blame/c62f3221698fd273b673d4f7e54eabb8329a4369/db/db_iter.cc#L342-L343) that assumes no two same keys both with seqno 0, it will either break this assertion in debug build or, even worst, return value of this same key for the key after it, which is the wrong value to return, in release build.
      
      Therefore we decide to introduce range conflict check for file ingestion and RefitLevel() inspired from the existing range conflict check among compactions.
      
      **Summary:**
      - Treat file ingestion job and RefitLevel() as `Compaction` of new compaction reasons: `CompactionReason::kExternalSstIngestion` and `CompactionReason::kRefitLevel` and register/unregister them.  File ingestion is treated as compaction from L0 to different levels and RefitLevel() as compaction from source level to target level.
      - Check for `RangeOverlapWithCompaction` with other ongoing compactions, `RegisterCompaction()` on this "compaction" before changing the LSM state in `VersionStorageInfo`, and `UnregisterCompaction()` after changing.
      - Replace scattered fixes (https://github.com/facebook/rocksdb/commit/0f88160f67d36ea30e3aca3a3cef924c3a009be6, https://github.com/facebook/rocksdb/commit/5c64fb67d2fc198f1a73ff3ae543749a6a41f513 and https://github.com/facebook/rocksdb/commit/87dfc1d23e0e16ff73e15f63c6fa0fb3b3fc8c8c.) that prevents overlapping between file ingestion and non-refit-level compaction with this fix cuz those practices are easy to overlook.
      - Misc: logic cleanup, see PR comments
      
      Pull Request resolved: https://github.com/facebook/rocksdb/pull/10988
      
      Test Plan:
      - New unit test `DBCompactionTestWithOngoingFileIngestionParam*` that failed pre-fix and passed afterwards.
      - Made compatible with existing tests, see PR comments
      - make check
      - [Ongoing] Stress test rehearsal with normal value and aggressive CI value https://github.com/facebook/rocksdb/pull/10761
      
      Reviewed By: cbi42
      
      Differential Revision: D41535685
      
      Pulled By: hx235
      
      fbshipit-source-id: 549833a577ba1496d20a870583d4caa737da1258
      9502856e
    • C
      Include estimated bytes deleted by range tombstones in compensated file size (#10734) · cc6f3237
      Changyu Bi 提交于
      Summary:
      compensate file sizes in compaction picking so files with range tombstones are preferred, such that they get compacted down earlier as they tend to delete a lot of data. This PR adds a `compensated_range_deletion_size` field in FileMeta that is computed during Flush/Compaction and persisted in MANIFEST. This value is added to `compensated_file_size` which will be used for compaction picking. Currently, for a file in level L, `compensated_range_deletion_size` is set to the estimated bytes deleted by range tombstone of this file in all levels > L. This helps to reduce space amp when data in older levels are covered by range tombstones in level L.
      
      Pull Request resolved: https://github.com/facebook/rocksdb/pull/10734
      
      Test Plan:
      - Added unit tests.
      - benchmark to check if the above definition `compensated_range_deletion_size` is reducing space amp as intended, without affecting write amp too much. The experiment set up favorable for this optimization: large range tombstone issued infrequently. Command used:
      ```
      ./db_bench -benchmarks=fillrandom,waitforcompaction,stats,levelstats -use_existing_db=false -avoid_flush_during_recovery=true -write_buffer_size=33554432 -level_compaction_dynamic_level_bytes=true -max_background_jobs=8 -max_bytes_for_level_base=134217728 -target_file_size_base=33554432 -writes_per_range_tombstone=500000 -range_tombstone_width=5000000 -num=50000000 -benchmark_write_rate_limit=8388608 -threads=16 -duration=1800 --max_num_range_tombstones=1000000000
      ```
      
      In this experiment, each thread wrote 16 range tombstones over the duration of 30 minutes, each range tombstone has width 5M that is the 10% of the key space width. Results shows this PR generates a smaller DB size.
      
      Compaction stats from this PR:
      ```
      Level    Files   Size     Score Read(GB)  Rn(GB) Rnp1(GB) Write(GB) Wnew(GB) Moved(GB) W-Amp Rd(MB/s) Wr(MB/s) Comp(sec) CompMergeCPU(sec) Comp(cnt) Avg(sec) KeyIn KeyDrop Rblob(GB) Wblob(GB)
      ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
        L0      2/0   31.54 MB   0.5      0.0     0.0      0.0       8.4      8.4       0.0   1.0      0.0     63.4    135.56            110.94       544    0.249       0      0       0.0       0.0
        L4      3/0   96.55 MB   0.8     18.5     6.7     11.8      18.4      6.6       0.0   2.7     65.3     64.9    290.08            284.03       108    2.686    284M  1957K       0.0       0.0
        L5     15/0   404.41 MB   1.0     19.1     7.7     11.4      18.8      7.4       0.3   2.5     66.6     65.7    292.93            285.34       220    1.332    293M  3808K       0.0       0.0
        L6    143/0    4.12 GB   0.0     45.0     7.5     37.5      41.6      4.1       0.0   5.5     71.2     65.9    647.00            632.66       251    2.578    739M    47M       0.0       0.0
       Sum    163/0    4.64 GB   0.0     82.6    21.9     60.7      87.2     26.5       0.3  10.4     61.9     65.4   1365.58           1312.97      1123    1.216   1318M    52M       0.0       0.0
      ```
      
      Compaction stats from main:
      ```
      Level    Files   Size     Score Read(GB)  Rn(GB) Rnp1(GB) Write(GB) Wnew(GB) Moved(GB) W-Amp Rd(MB/s) Wr(MB/s) Comp(sec) CompMergeCPU(sec) Comp(cnt) Avg(sec) KeyIn KeyDrop Rblob(GB) Wblob(GB)
      ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
        L0      0/0    0.00 KB   0.0      0.0     0.0      0.0       8.4      8.4       0.0   1.0      0.0     60.5    142.12            115.89       569    0.250       0      0       0.0       0.0
        L4      3/0   85.68 MB   1.0     17.7     6.8     10.9      17.6      6.7       0.0   2.6     62.7     62.3    289.05            281.79       112    2.581    272M  2309K       0.0       0.0
        L5     11/0   293.73 MB   1.0     18.8     7.5     11.2      18.5      7.2       0.5   2.5     64.9     63.9    296.07            288.50       220    1.346    288M  4365K       0.0       0.0
        L6    130/0    3.94 GB   0.0     51.5     7.6     43.9      47.9      3.9       0.0   6.3     67.2     62.4    784.95            765.92       258    3.042    848M    51M       0.0       0.0
       Sum    144/0    4.31 GB   0.0     88.0    21.9     66.0      92.3     26.3       0.5  11.0     59.6     62.5   1512.19           1452.09      1159    1.305   1409M    58M       0.0       0.0```
      
      Reviewed By: ajkr
      
      Differential Revision: D39834713
      
      Pulled By: cbi42
      
      fbshipit-source-id: fe9341040b8704a8fbb10cad5cf5c43e962c7e6b
      cc6f3237
    • P
      Add BackupEngine feature to exclude files (#11030) · 02f2b208
      Peter Dillinger 提交于
      Summary:
      We have a request for RocksDB to essentially support
      disconnected incremental backup. In other words, if there is limited
      or no connectivity to the primary backup dir, we should still be able to
      take an incremental backup relative to that primary backup dir,
      assuming some metadata about that primary dir is available (and
      obviously anticipating primary backup dir will be fully available if
      restore is needed).
      
      To support that, this feature allows the API user to "exclude" DB
      files from backup. This only applies to files that can be shared
      between backups (sst and blob files), and excluded files are
      tracked in the backup metadata sufficiently to ensure they are
      restored at restore time. At restore time, the user provides
      a set of alternate backup directories (as open BackupEngines, which
      can be read-only), and excluded files must be found in one of the
      backup directories ("included" in some backup).
      
      This feature depends on backup schema version 2 features, though
      schema version 2.0 support is not sufficient to read / restore a
      backup with exclusions. This change updates the schema version to
      2.1 because of this feature, so that it's easy to recognize whether
      a RocksDB release supports this feature, while backups not using the
      feature are fully compatible with 2.0.
      
      Also in this PR:
      * Stacked on https://github.com/facebook/rocksdb/pull/11029
      * Allow progress_callback to be empty, not just no-op function, and
      recover from exceptions thrown by BackupEngine callbacks.
      * The internal-only `AsBackupEngine()` function is working around the
      diamond hierarchy of `BackupEngineImplThreadSafe` to get to the
      internals, without using confusing features like virtual inheritance.
      
      Pull Request resolved: https://github.com/facebook/rocksdb/pull/11030
      
      Test Plan: unit tests added / updated
      
      Reviewed By: ajkr
      
      Differential Revision: D42004388
      
      Pulled By: pdillinger
      
      fbshipit-source-id: 31b6e533d308a5462e528d9012d650482d974077
      02f2b208
  17. 22 12月, 2022 3 次提交
    • A
      Avoid mixing sync and async prefetch (#11050) · bec42648
      anand76 提交于
      Summary:
      Reading uncompression dict block always uses sync reads, while data blocks may use async reads and prefetching. This causes problems in FilePrefetchBuffer. So avoid mixing the two by reading the uncompression dict straight from the file.
      
      Pull Request resolved: https://github.com/facebook/rocksdb/pull/11050
      
      Test Plan: Crash test
      
      Reviewed By: akankshamahajan15
      
      Differential Revision: D42194682
      
      Pulled By: anand1976
      
      fbshipit-source-id: aaa8b396fdfe966b157e210f5ef8501c45b7b69e
      bec42648
    • P
      Make CompactRange() more aware of SstPartitionerFactory (#11032) · e6b6e741
      Peter Dillinger 提交于
      Summary:
      Some users are at least considering using SstPartitioner to support efficient physical migration of specific key ranges between RocksDB instances. One might expect manual `CompactRange()` over a narrow key range across some partition to enforce partitioning of any SST files crossing that partition boundary, but that currently only works if there are keys within that range.
      
      This change makes the overlap logic in CompactRange more aware of the partitioner to automatically select relevant files crossing a partition boundary, even when they otherwise would not be selected due to the compaction range falling in a gap between entries.
      
      Pull Request resolved: https://github.com/facebook/rocksdb/pull/11032
      
      Test Plan: unit test included
      
      Reviewed By: hx235
      
      Differential Revision: D41981380
      
      Pulled By: pdillinger
      
      fbshipit-source-id: 2fe445bdddc73c00276c20f295cc1fa33d15b05a
      e6b6e741
    • A
      Improve Java API get() performance by reducing copies (#10970) · f8969ad7
      Alan Paxton 提交于
      Summary:
      Performance improvements for `get()` paths in the RocksJava API (JNI).
      Document describing the performance results.
      
      Replace uses of the legacy `DB::Get()` method wrapper returning data in a `std::string` with direct calls to `DB::Get()` passing a pinnable slice to receive this data. Copying from a pinned slice direct to the destination java byte array, without going via an intervening std::string, is a major performance gain for this code path.
      
      Note that this gain only comes where `DB::Get()` is able to return a pinned buffer; where it has to copy into the buffer owned by the slice, there is still the intervening copy and no performance gain. It may be possible to address this case too, but it is not trivial.
      
      Pull Request resolved: https://github.com/facebook/rocksdb/pull/10970
      
      Reviewed By: pdillinger
      
      Differential Revision: D42125567
      
      Pulled By: ajkr
      
      fbshipit-source-id: b7a4df7523b0420cadb1e9b6c7da3ec030a8da34
      f8969ad7