summaryrefslogtreecommitdiff
path: root/src/mongo
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo')
-rw-r--r--src/mongo/db/SConscript3
-rw-r--r--src/mongo/db/coll_mod.idl125
-rw-r--r--src/mongo/db/commands/dbcommands.cpp11
-rw-r--r--src/mongo/s/commands/SConscript1
-rw-r--r--src/mongo/s/commands/cluster_collection_mod_cmd.cpp14
5 files changed, 149 insertions, 5 deletions
diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript
index e395e915490..ae7496afa42 100644
--- a/src/mongo/db/SConscript
+++ b/src/mongo/db/SConscript
@@ -572,6 +572,7 @@ env.CppUnitTest(
env.Library(
target="commands",
source=[
+ 'coll_mod.idl',
'commands.cpp',
'drop.idl',
'drop_database.idl',
@@ -585,6 +586,8 @@ env.Library(
],
LIBDEPS_PRIVATE=[
'$BUILD_DIR/mongo/bson/mutable/mutable_bson',
+ '$BUILD_DIR/mongo/db/catalog/collection_options_idl',
+ '$BUILD_DIR/mongo/db/commands/create_command',
'$BUILD_DIR/mongo/idl/idl_parser',
'$BUILD_DIR/mongo/rpc/command_status',
'$BUILD_DIR/mongo/rpc/rpc',
diff --git a/src/mongo/db/coll_mod.idl b/src/mongo/db/coll_mod.idl
new file mode 100644
index 00000000000..65cc46b0e15
--- /dev/null
+++ b/src/mongo/db/coll_mod.idl
@@ -0,0 +1,125 @@
+# 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.
+#
+global:
+ cpp_namespace: "mongo"
+ cpp_includes:
+ - "mongo/db/commands/create_command_validation.h"
+
+imports:
+ - "mongo/idl/basic_types.idl"
+ - "mongo/db/catalog/collection_options.idl"
+
+structs:
+ CollModIndex:
+ description: "A type representing a spec for an index to be modified by collMod command."
+ strict: true
+ fields:
+ name:
+ optional: true
+ type: string
+ keyPattern:
+ optional: true
+ type: object
+ expireAfterSeconds:
+ optional: true
+ type: safeInt
+ hidden:
+ optional: true
+ type: safeBool
+
+ CollModReply:
+ description: "The collMod command's reply."
+ strict: true
+ fields:
+ ok:
+ # Used in mongos reply.
+ optional: true
+ type: safeDouble
+ expireAfterSeconds_old:
+ optional: true
+ type: safeInt
+ expireAfterSeconds_new:
+ optional: true
+ type: safeInt
+ hidden_old:
+ optional: true
+ type: safeBool
+ hidden_new:
+ optional: true
+ type: safeBool
+ writeConcernError:
+ optional: true
+ type: object
+commands:
+ collMod:
+ description: "Specify collMod Command."
+ command_name: collMod
+ namespace: concatenate_with_db
+ cpp_name: collMod
+ strict: true
+ api_version: "1"
+ fields:
+ index:
+ description: "Index to be modified."
+ optional: true
+ type: CollModIndex
+ validator:
+ description: "Specify validation rules or expressions for the collection."
+ type: object
+ optional: true
+ validationLevel:
+ description: "Determines how strictly to apply the validation rules to existing
+ documents during an update.
+ Can be one of following values: 'off', 'strict' or 'moderate'."
+ type: ValidationLevel
+ optional: true
+ validationAction:
+ description: "Determines whether to error on invalid documents or just warn about
+ the violations but allow invalid documents to be inserted.
+ Can be either 'warn' or 'error'."
+ type: ValidationAction
+ optional: true
+ viewOn:
+ description: "The name of the source collection or view that
+ 'namespace' is based off of."
+ type: string
+ optional: true
+ validator:
+ callback: create_command_validation::validateViewOnNotEmpty
+ pipeline:
+ description: "An array that consists of the aggregation pipeline. Defines the view
+ by applying the specified pipeline to the 'viewOn' collection or
+ view."
+ type: array<object>
+ optional: true
+ recordPreImages:
+ description: "Sets whether updates/deletes should store the pre-image of the
+ document in the oplog"
+ optional: true
+ type: safeBool
+ reply_type: CollModReply \ No newline at end of file
diff --git a/src/mongo/db/commands/dbcommands.cpp b/src/mongo/db/commands/dbcommands.cpp
index d9832267537..20583a4685f 100644
--- a/src/mongo/db/commands/dbcommands.cpp
+++ b/src/mongo/db/commands/dbcommands.cpp
@@ -53,6 +53,7 @@
#include "mongo/db/catalog/index_key_validate.h"
#include "mongo/db/catalog_raii.h"
#include "mongo/db/clientcursor.h"
+#include "mongo/db/coll_mod_gen.h"
#include "mongo/db/commands.h"
#include "mongo/db/commands/create_gen.h"
#include "mongo/db/commands/profile_common.h"
@@ -732,8 +733,14 @@ public:
const string& dbname,
const BSONObj& jsobj,
BSONObjBuilder& result) {
- const NamespaceString nss(CommandHelpers::parseNsCollectionRequired(dbname, jsobj));
- uassertStatusOK(collMod(opCtx, nss, jsobj, &result));
+ auto cmd = CollMod::parse(
+ IDLParserErrorContext(CollMod::kCommandName,
+ APIParameters::get(opCtx).getAPIStrict().value_or(false)),
+ jsobj);
+ uassertStatusOK(collMod(opCtx, cmd.getNamespace(), cmd.toBSON(BSONObj()), &result));
+
+ CollModReply::parse(IDLParserErrorContext("CollModReply"), result.asTempObj());
+
return true;
}
diff --git a/src/mongo/s/commands/SConscript b/src/mongo/s/commands/SConscript
index 75a90c02b30..81d5ae92e84 100644
--- a/src/mongo/s/commands/SConscript
+++ b/src/mongo/s/commands/SConscript
@@ -107,6 +107,7 @@ env.Library(
'$BUILD_DIR/mongo/db/auth/auth',
'$BUILD_DIR/mongo/db/auth/builtin_roles',
'$BUILD_DIR/mongo/db/auth/saslauth',
+ '$BUILD_DIR/mongo/db/commands',
'$BUILD_DIR/mongo/db/commands/core',
'$BUILD_DIR/mongo/db/commands/create_command',
'$BUILD_DIR/mongo/db/commands/current_op_common',
diff --git a/src/mongo/s/commands/cluster_collection_mod_cmd.cpp b/src/mongo/s/commands/cluster_collection_mod_cmd.cpp
index 6296c71a8d6..c421dc5ba72 100644
--- a/src/mongo/s/commands/cluster_collection_mod_cmd.cpp
+++ b/src/mongo/s/commands/cluster_collection_mod_cmd.cpp
@@ -32,6 +32,7 @@
#include "mongo/platform/basic.h"
#include "mongo/db/auth/authorization_session.h"
+#include "mongo/db/coll_mod_gen.h"
#include "mongo/db/commands.h"
#include "mongo/logv2/log.h"
#include "mongo/s/cluster_commands_helpers.h"
@@ -72,7 +73,12 @@ public:
const BSONObj& cmdObj,
std::string& errmsg,
BSONObjBuilder& output) override {
- const NamespaceString nss(CommandHelpers::parseNsCollectionRequired(dbName, cmdObj));
+ auto cmd = CollMod::parse(
+ IDLParserErrorContext(CollMod::kCommandName,
+ APIParameters::get(opCtx).getAPIStrict().value_or(false)),
+ cmdObj);
+
+ auto nss = cmd.getNamespace();
LOGV2_DEBUG(22748,
1,
"collMod: {namespace} cmd: {command}",
@@ -84,11 +90,13 @@ public:
uassertStatusOK(Grid::get(opCtx)->catalogCache()->getCollectionRoutingInfo(opCtx, nss));
auto shardResponses = scatterGatherVersionedTargetByRoutingTable(
opCtx,
- nss.db(),
+ cmd.getDbName(),
nss,
routingInfo,
applyReadWriteConcern(
- opCtx, this, CommandHelpers::filterCommandRequestForPassthrough(cmdObj)),
+ opCtx,
+ this,
+ CommandHelpers::filterCommandRequestForPassthrough(cmd.toBSON(BSONObj()))),
ReadPreferenceSetting::get(opCtx),
Shard::RetryPolicy::kNoRetry,
BSONObj() /* query */,
View Lorry Controller Status