diff options
-rw-r--r-- | src/mongo/embedded/SConscript | 11 | ||||
-rw-r--r-- | src/mongo/embedded/embedded_options_helpers.cpp | 58 | ||||
-rw-r--r-- | src/mongo/embedded/embedded_options_helpers.h | 61 |
3 files changed, 0 insertions, 130 deletions
diff --git a/src/mongo/embedded/SConscript b/src/mongo/embedded/SConscript index 8e969f70b21..eb6f8f86086 100644 --- a/src/mongo/embedded/SConscript +++ b/src/mongo/embedded/SConscript @@ -135,14 +135,3 @@ env.Library( '$BUILD_DIR/mongo/util/version_impl', ] ) - -env.Library( - target='embedded_integration_helpers', - source=[ - 'embedded_options_helpers.cpp', - ], - LIBDEPS=[ - '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/util/options_parser/options_parser', - ], -) diff --git a/src/mongo/embedded/embedded_options_helpers.cpp b/src/mongo/embedded/embedded_options_helpers.cpp deleted file mode 100644 index 51cf838c935..00000000000 --- a/src/mongo/embedded/embedded_options_helpers.cpp +++ /dev/null @@ -1,58 +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/embedded/embedded_options_helpers.h" - -#include "mongo/util/options_parser/options_parser.h" -#include "mongo/util/options_parser/startup_options.h" - -#include <iterator> -#include <map> -#include <vector> - -namespace mongo { -namespace embedded_integration_helpers { - -Status parseCommandLineOptions(int argc, - char* argv[], - const optionenvironment::OptionSection& startupOptions) { - // We manually run the options parsing code that's equivalent to the logic in the - // MONGO_INITIALIZERs for mongod. We cannot do this in initializers because embedded uses a - // different options format and we therefore need to have parsed the command line options before - // embedded::initialize() is called. However, as long as we store the options in the same place - // they will be valid for embedded too. - return optionenvironment::OptionsParser{}.run(startupOptions, - std::vector<std::string>(argv, argv + argc), - &optionenvironment::startupOptionsParsed); -} - -} // namespace embedded_integration_helpers -} // namespace mongo diff --git a/src/mongo/embedded/embedded_options_helpers.h b/src/mongo/embedded/embedded_options_helpers.h deleted file mode 100644 index cd522714b59..00000000000 --- a/src/mongo/embedded/embedded_options_helpers.h +++ /dev/null @@ -1,61 +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. - */ - -#pragma once - -#include "mongo/base/status.h" - -namespace mongo { - -namespace optionenvironment { - -class OptionSection; - -} // namespace optionenvironment - -namespace embedded_integration_helpers { - -/** - * Parses the command line options represented by 'argc' and 'argv' into - * optionenvironment::startupOptionsParsed. - * - * In order to faciliate adding options which are supported by both embedded and mongod - * (e.g. dbpath), the caller is responsible for adding the options accepted by embedded prior to - * calling this function. - * - * The caller should also take care to ensure 'startupOptions' lives as long as the call to - * embedded::initialize() because optionenvironment::startupOptionsParsed holds references to - * Constraint instances owned by 'startupOptions'. - */ -Status parseCommandLineOptions(int argc, - char* argv[], - const optionenvironment::OptionSection& startupOptions); - -} // namespace embedded_integration_helpers -} // namespace mongo |