summaryrefslogtreecommitdiff
path: root/src/mongo
diff options
context:
space:
mode:
authorPaul Pedersen <paul@10gen.com>2016-02-02 10:09:27 -0800
committerPaul Pedersen <paul@10gen.com>2016-02-22 14:38:35 -0800
commitd80dd455a35fdab03dc7e9fb4e52498d36a47a57 (patch)
treecd08c2f133d68c11591b9064732e730fdc988464 /src/mongo
parentf8dda5860d94b91e236dc30d9e2622168dc4591d (diff)
downloadmongo-d80dd455a35fdab03dc7e9fb4e52498d36a47a57.tar.gz
SERVER-17440 Remove references to textSearchEnabled command line option
Diffstat (limited to 'src/mongo')
-rw-r--r--src/mongo/db/fts/SConscript1
-rw-r--r--src/mongo/db/fts/fts_enabled.cpp76
2 files changed, 0 insertions, 77 deletions
diff --git a/src/mongo/db/fts/SConscript b/src/mongo/db/fts/SConscript
index 1a752c1cae8..6de7f88f345 100644
--- a/src/mongo/db/fts/SConscript
+++ b/src/mongo/db/fts/SConscript
@@ -69,7 +69,6 @@ env.Library(
)
env.Library( 'server_common', [
- 'fts_enabled.cpp'
],
LIBDEPS=[
'$BUILD_DIR/mongo/base',
diff --git a/src/mongo/db/fts/fts_enabled.cpp b/src/mongo/db/fts/fts_enabled.cpp
deleted file mode 100644
index 4db31119e8b..00000000000
--- a/src/mongo/db/fts/fts_enabled.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-// fts_enabled.cpp
-
-/**
-* Copyright (C) 2012 10gen Inc.
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License, version 3,
-* as published by the Free Software Foundation.
-*
-* 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
-* GNU Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with this program. If not, see <http://www.gnu.org/licenses/>.
-*
-* 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 GNU Affero General 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.
-*/
-
-#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kCommand
-
-#include "mongo/db/server_parameters.h"
-
-#include "mongo/util/log.h"
-
-namespace mongo {
-namespace fts {
-namespace {
-
-std::atomic<bool> dummyEnabledFlag(true); // Unused, needed for server parameter. NOLINT
-
-/**
- * Declaration for the "textSearchEnabled" server parameter, which is now deprecated.
- * Note that:
- * - setting to true performs a no-op and logs a deprecation message.
- * - setting to false will fail.
- */
-class ExportedTextSearchEnabledParameter
- : public ExportedServerParameter<bool, ServerParameterType::kStartupAndRuntime> {
-public:
- ExportedTextSearchEnabledParameter()
- : ExportedServerParameter<bool, ServerParameterType::kStartupAndRuntime>(
- ServerParameterSet::getGlobal(), "textSearchEnabled", &dummyEnabledFlag) {}
-
- virtual Status validate(const bool& potentialNewValue) {
- if (!potentialNewValue) {
- return Status(ErrorCodes::BadValue, "textSearchEnabled cannot be set to false");
- }
-
- log() << "Attempted to set textSearchEnabled server parameter.";
- log() << "Text search is enabled by default and cannot be disabled.";
- log() << "The following are now deprecated and will be removed in a future "
- << "release:";
- log() << "- the \"textSearchEnabled\" server parameter (setting it has no "
- << "effect)";
- log() << "- the \"text\" command (has been replaced by the $text query "
- "operator)";
-
- return Status::OK();
- }
-
-} exportedTextSearchEnabledParam;
-}
-}
-}