Skip to content

Commit

Permalink
Remove visibility of CouchKVS::compactDBInternal
Browse files Browse the repository at this point in the history
All current needs may be fulfilled via the public compactDB method

Change-Id: Icf8a7cd1572b870a6b53213b04bc3e4c5f7de544
Reviewed-on: http://review.couchbase.org/c/kv_engine/+/136286
Reviewed-by: Ben Huddleston <ben.huddleston@couchbase.com>
Tested-by: Build Bot <build@couchbase.com>
  • Loading branch information
trondn committed Sep 16, 2020
1 parent 2e78a48 commit 565bdb7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
1 change: 0 additions & 1 deletion engines/ep/tests/mock/mock_couch_kvstore.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ class MockCouchKVStore : public CouchKVStore {
dbFileRevMap) {
}

using CouchKVStore::compactDBInternal;
using CouchKVStore::setMb40415RegressionHook;

/**
Expand Down
4 changes: 2 additions & 2 deletions engines/ep/tests/module_tests/couch-kvstore_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1561,12 +1561,12 @@ TEST_F(CouchstoreTest, testV2WriteRead) {
// we wouldn't potentially get a database header without the _local/document
TEST_F(CouchstoreTest, MB40415_regression_test) {
CompactionConfig config;
compaction_ctx cctx(config, 0);
auto ctx = std::make_shared<compaction_ctx>(config, 0);

// Verify that if we would "fail" the precommit hook for some reason
// the entire compaction would fail...
kvstore->setMb40415RegressionHook(true);
EXPECT_FALSE(kvstore->compactDBInternal(&cctx, {}));
EXPECT_FALSE(kvstore->compactDB(ctx));
}

class CouchKVStoreMetaData : public ::testing::Test {};
Expand Down

0 comments on commit 565bdb7

Please sign in to comment.