Skip to content

Commit

Permalink
address code formatting check errors
Browse files Browse the repository at this point in the history
  • Loading branch information
matthewvon committed Jan 23, 2025
1 parent 04aae03 commit b71bc9e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
14 changes: 7 additions & 7 deletions db/db_impl/db_impl_compaction_flush.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1989,10 +1989,10 @@ Status DBImpl::FlushMemTable(ColumnFamilyData* cfd,
}
}

if (flush_reason == FlushReason::kManualCompaction
|| flush_reason == FlushReason::kManualFlush) {
cfd->imm()->BeginManualOperation();
} // if
if (flush_reason == FlushReason::kManualCompaction ||
flush_reason == FlushReason::kManualFlush) {
cfd->imm()->BeginManualOperation();
}
autovector<FlushRequest> flush_reqs;
autovector<uint64_t> memtable_ids_to_wait;
{
Expand Down Expand Up @@ -2111,10 +2111,10 @@ Status DBImpl::FlushMemTable(ColumnFamilyData* cfd,
tmp_cfd->UnrefAndTryDelete();
}
}
if (flush_reason == FlushReason::kManualCompaction
|| flush_reason == FlushReason::kManualFlush) {
if (flush_reason == FlushReason::kManualCompaction ||
flush_reason == FlushReason::kManualFlush) {
cfd->imm()->CompleteManualOperation();
} // if
}
TEST_SYNC_POINT("DBImpl::FlushMemTable:FlushMemTableFinished");
return s;
}
Expand Down
5 changes: 3 additions & 2 deletions db/memtable_list.h
Original file line number Diff line number Diff line change
Expand Up @@ -391,11 +391,12 @@ class MemTableList {
void RemoveOldMemTables(uint64_t log_number,
autovector<MemTable*>* to_delete);

void BeginManualOperation() {++active_manuals_;};
void BeginManualOperation() { ++active_manuals_; };

void CompleteManualOperation() {
assert(active_manuals_ >= 1);
--active_manuals_;};
--active_manuals_;
};

private:
friend Status InstallMemtableAtomicFlushResults(
Expand Down

0 comments on commit b71bc9e

Please sign in to comment.