summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/mongo/db/catalog/index_key_validate.cpp51
-rw-r--r--src/mongo/db/catalog/index_key_validate.h6
-rw-r--r--src/mongo/db/commands/create_indexes.cpp47
3 files changed, 60 insertions, 44 deletions
diff --git a/src/mongo/db/catalog/index_key_validate.cpp b/src/mongo/db/catalog/index_key_validate.cpp
index 829a2b7392c..14e0ca05bdd 100644
--- a/src/mongo/db/catalog/index_key_validate.cpp
+++ b/src/mongo/db/catalog/index_key_validate.cpp
@@ -610,6 +610,57 @@ StatusWith<BSONObj> validateIndexSpecCollation(OperationContext* opCtx,
return indexSpec;
}
+Status validateIndexSpecTTL(const BSONObj& indexSpec) {
+ if (!indexSpec.hasField(IndexDescriptor::kExpireAfterSecondsFieldName)) {
+ return Status::OK();
+ }
+
+ const BSONElement expireAfterSecondsElt =
+ indexSpec[IndexDescriptor::kExpireAfterSecondsFieldName];
+ if (!expireAfterSecondsElt.isNumber()) {
+ return {ErrorCodes::CannotCreateIndex,
+ str::stream() << "TTL index '" << IndexDescriptor::kExpireAfterSecondsFieldName
+ << "' option must be numeric, but received a type of '"
+ << typeName(expireAfterSecondsElt.type())
+ << "'. Index spec: " << indexSpec};
+ }
+
+ if (expireAfterSecondsElt.safeNumberLong() < 0) {
+ return {ErrorCodes::CannotCreateIndex,
+ str::stream() << "TTL index '" << IndexDescriptor::kExpireAfterSecondsFieldName
+ << "' option cannot be less than 0. Index spec: " << indexSpec};
+ }
+
+ const std::string tooLargeErr = str::stream()
+ << "TTL index '" << IndexDescriptor::kExpireAfterSecondsFieldName
+ << "' option must be within an acceptable range, try a lower number. Index spec: "
+ << indexSpec;
+
+ // There are two cases where we can encounter an issue here.
+ // The first case is when we try to cast to millseconds from seconds, which could cause an
+ // overflow. The second case is where 'expireAfterSeconds' is larger than the current epoch
+ // time.
+ try {
+ auto expireAfterMillis =
+ duration_cast<Milliseconds>(Seconds(expireAfterSecondsElt.safeNumberLong()));
+ if (expireAfterMillis > Date_t::now().toDurationSinceEpoch()) {
+ return {ErrorCodes::CannotCreateIndex, tooLargeErr};
+ }
+ } catch (const AssertionException&) {
+ return {ErrorCodes::CannotCreateIndex, tooLargeErr};
+ }
+
+ const BSONObj key = indexSpec["key"].Obj();
+ if (key.nFields() != 1) {
+ return {ErrorCodes::CannotCreateIndex,
+ str::stream() << "TTL indexes are single-field indexes, compound indexes do "
+ "not support TTL. Index spec: "
+ << indexSpec};
+ }
+
+ return Status::OK();
+}
+
GlobalInitializerRegisterer filterAllowedIndexFieldNamesInitializer(
"FilterAllowedIndexFieldNames", [](InitializerContext* service) {
if (filterAllowedIndexFieldNames)
diff --git a/src/mongo/db/catalog/index_key_validate.h b/src/mongo/db/catalog/index_key_validate.h
index 7c177c50355..e3e29f08bef 100644
--- a/src/mongo/db/catalog/index_key_validate.h
+++ b/src/mongo/db/catalog/index_key_validate.h
@@ -87,6 +87,12 @@ StatusWith<BSONObj> validateIndexSpecCollation(OperationContext* opCtx,
const CollatorInterface* defaultCollator);
/**
+ * Validates the key pattern and the 'expireAfterSeconds' duration in the index specification
+ * 'indexSpec' for a TTL index. Returns success if 'indexSpec' does not refer to a TTL index.
+ */
+Status validateIndexSpecTTL(const BSONObj& indexSpec);
+
+/**
* Optional filtering function to adjust allowed index field names at startup.
* Set it in a MONGO_INITIALIZER with 'FilterAllowedIndexFieldNames' as a dependant.
*/
diff --git a/src/mongo/db/commands/create_indexes.cpp b/src/mongo/db/commands/create_indexes.cpp
index 3ecaafbc401..43f5a813313 100644
--- a/src/mongo/db/commands/create_indexes.cpp
+++ b/src/mongo/db/commands/create_indexes.cpp
@@ -227,50 +227,9 @@ Status validateTTLOptions(OperationContext* opCtx, const BSONObj& cmdObj) {
const BSONElement& indexes = cmdObj[kIndexesFieldName];
for (const auto& index : indexes.Array()) {
BSONObj indexObj = index.Obj();
- if (!indexObj.hasField(kExpireAfterSeconds)) {
- continue;
- }
-
- const BSONElement expireAfterSecondsElt = indexObj[kExpireAfterSeconds];
- if (!expireAfterSecondsElt.isNumber()) {
- return {ErrorCodes::CannotCreateIndex,
- str::stream() << "TTL index '" << kExpireAfterSeconds
- << "' option must be numeric, but received a type of '"
- << typeName(expireAfterSecondsElt.type())
- << "'. Index spec: " << indexObj};
- }
-
- if (expireAfterSecondsElt.safeNumberLong() < 0) {
- return {ErrorCodes::CannotCreateIndex,
- str::stream() << "TTL index '" << kExpireAfterSeconds
- << "' option cannot be less than 0. Index spec: " << indexObj};
- }
-
- const std::string tooLargeErr = str::stream()
- << "TTL index '" << kExpireAfterSeconds
- << "' option must be within an acceptable range, try a lower number. Index spec: "
- << indexObj;
-
- // There are two cases where we can encounter an issue here.
- // The first case is when we try to cast to millseconds from seconds, which could cause an
- // overflow. The second case is where 'expireAfterSeconds' is larger than the current epoch
- // time.
- try {
- auto expireAfterMillis =
- duration_cast<Milliseconds>(Seconds(expireAfterSecondsElt.safeNumberLong()));
- if (expireAfterMillis > Date_t::now().toDurationSinceEpoch()) {
- return {ErrorCodes::CannotCreateIndex, tooLargeErr};
- }
- } catch (const AssertionException&) {
- return {ErrorCodes::CannotCreateIndex, tooLargeErr};
- }
-
- const BSONObj key = indexObj["key"].Obj();
- if (key.nFields() != 1) {
- return {ErrorCodes::CannotCreateIndex,
- str::stream() << "TTL indexes are single-field indexes, compound indexes do "
- "not support TTL. Index spec: "
- << indexObj};
+ auto status = index_key_validate::validateIndexSpecTTL(indexObj);
+ if (!status.isOK()) {
+ return status;
}
}
View Lorry Controller Status