Skip to content

Commit

Permalink
[SYS-7551] Don't use options file (facebook#322)
Browse files Browse the repository at this point in the history
Summary:
We seem to have lost
https://github.com/rockset/rocksdb-cloud/pull/130/files when we pulled
latest RocksDB.

Test Plan:
Internal test

Reviewers:
  • Loading branch information
igorcanadi authored Apr 10, 2024
1 parent 751f50e commit 5699d8c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
3 changes: 3 additions & 0 deletions db/db_impl/db_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -6010,6 +6010,9 @@ Status DestroyDB(const std::string& dbname, const Options& options,

Status DBImpl::WriteOptionsFile(bool db_mutex_already_held) {
options_mutex_.AssertHeld();
if (!immutable_db_options_.use_options_file) {
return Status::OK();
}

if (db_mutex_already_held) {
mutex_.AssertHeld();
Expand Down
2 changes: 2 additions & 0 deletions db/version_edit.cc
Original file line number Diff line number Diff line change
Expand Up @@ -962,6 +962,8 @@ std::string VersionEdit::DebugString(bool hex_key) const {
}
r.append(" oldest_ancester_time:");
AppendNumberTo(&r, f.oldest_ancester_time);
r.append(" largest_seqno:");
AppendNumberTo(&r, f.fd.largest_seqno);
r.append(" file_creation_time:");
AppendNumberTo(&r, f.file_creation_time);
r.append(" epoch_number:");
Expand Down

0 comments on commit 5699d8c

Please sign in to comment.