diff options
Diffstat (limited to 'src/mongo/db/commands')
| -rw-r--r-- | src/mongo/db/commands/SConscript | 1 | ||||
| -rw-r--r-- | src/mongo/db/commands/dbhash.cpp | 7 | ||||
| -rw-r--r-- | src/mongo/db/commands/invalidate_view_catalog_command.cpp | 95 |
3 files changed, 4 insertions, 99 deletions
diff --git a/src/mongo/db/commands/SConscript b/src/mongo/db/commands/SConscript index 244f284fe33..b31517bfbc9 100644 --- a/src/mongo/db/commands/SConscript +++ b/src/mongo/db/commands/SConscript @@ -326,7 +326,6 @@ env.Library( "do_txn_cmd.cpp", "driverHelpers.cpp", "haystack.cpp", - "invalidate_view_catalog_command.cpp", "mr.cpp", "oplog_application_checks.cpp", "oplog_note.cpp", diff --git a/src/mongo/db/commands/dbhash.cpp b/src/mongo/db/commands/dbhash.cpp index 5cbcc0015ba..669f707111a 100644 --- a/src/mongo/db/commands/dbhash.cpp +++ b/src/mongo/db/commands/dbhash.cpp @@ -121,7 +121,7 @@ public: if (txnParticipant && txnParticipant->inMultiDocumentTransaction()) { // However, if we are inside a multi-statement transaction, then we only need to lock // the database in intent mode to ensure that none of the collections get dropped. - lockMode = getLockModeForQuery(opCtx); + lockMode = getLockModeForQuery(opCtx, boost::none); } AutoGetDb autoDb(opCtx, ns, lockMode); Database* db = autoDb.getDb(); @@ -227,8 +227,9 @@ private: // reading from the consistent snapshot doesn't overlap with any catalog operations on // the collection. invariant( - opCtx->lockState()->isDbLockedForMode(db->name(), getLockModeForQuery(opCtx))); - collLock.emplace(opCtx->lockState(), fullCollectionName, getLockModeForQuery(opCtx)); + opCtx->lockState()->isDbLockedForMode(db->name(), getLockModeForQuery(opCtx, ns))); + collLock.emplace( + opCtx->lockState(), fullCollectionName, getLockModeForQuery(opCtx, ns)); auto minSnapshot = collection->getMinimumVisibleSnapshot(); auto mySnapshot = opCtx->recoveryUnit()->getPointInTimeReadTimestamp(); diff --git a/src/mongo/db/commands/invalidate_view_catalog_command.cpp b/src/mongo/db/commands/invalidate_view_catalog_command.cpp deleted file mode 100644 index 5c3988fb466..00000000000 --- a/src/mongo/db/commands/invalidate_view_catalog_command.cpp +++ /dev/null @@ -1,95 +0,0 @@ - -/** - * Copyright (C) 2018-present MongoDB, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the Server Side Public License, version 1, - * as published by MongoDB, Inc. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * Server Side Public License for more details. - * - * You should have received a copy of the Server Side Public License - * along with this program. If not, see - * <http://www.mongodb.com/licensing/server-side-public-license>. - * - * As a special exception, the copyright holders give permission to link the - * code of portions of this program with the OpenSSL library under certain - * conditions as described in each individual source file and distribute - * linked combinations including the program with the OpenSSL library. You - * must comply with the Server Side Public License in all respects for - * all of the code used other than as permitted herein. If you modify file(s) - * with this exception, you may extend this exception to your version of the - * file(s), but you are not obligated to do so. If you do not wish to do so, - * delete this exception statement from your version. If you delete this - * exception statement from all source files in the program, then also delete - * it in the license file. - */ - -#include "mongo/platform/basic.h" - -#include "mongo/db/catalog_raii.h" -#include "mongo/db/commands.h" -#include "mongo/db/commands/test_commands_enabled.h" - -namespace mongo { -/** - * Testing-only command that invalidates a database's view catalog. - */ -class InvalidateViewCatalogCmd final : public BasicCommand { -public: - InvalidateViewCatalogCmd() : BasicCommand("invalidateViewCatalog") {} - - Status checkAuthForOperation(OperationContext* opCtx, - const std::string& dbname, - const BSONObj& cmdObj) const final { - // No auth checks as this is a testing-only command. - return Status::OK(); - } - - bool adminOnly() const final { - return false; - } - - bool maintenanceMode() const final { - return true; - } - - bool maintenanceOk() const final { - return true; - } - - AllowedOnSecondary secondaryAllowed(ServiceContext*) const final { - return AllowedOnSecondary::kAlways; - } - - bool supportsWriteConcern(const BSONObj& cmd) const final { - return false; - } - - std::string help() const final { - return "invalidate view catalog\n" - "Internal command for testing only. Invalidates a database's view catalog,\n" - "forcing a reload on the next view operation.\n"; - } - - bool run(OperationContext* opCtx, - const std::string& dbName, - const BSONObj& cmdObj, - BSONObjBuilder& result) final { - AutoGetDb dblock(opCtx, dbName, LockMode::MODE_IS); - auto db = dblock.getDb(); - uassert(ErrorCodes::NamespaceNotFound, - str::stream() << "database " << dbName << " does not exist", - db); - - db->getViewCatalog()->invalidate(); - return true; - } -}; - -MONGO_REGISTER_TEST_COMMAND(InvalidateViewCatalogCmd); - -} // namespace mongo |