SERVER-67599 Allow collMod to set bucketMaxSpanSeconds and bucketRoundingSeconds

1 files changed, 129 insertions, 1 deletions

diff --git a/jstests/core/timeseries/timeseries_collmod.js b/jstests/core/timeseries/timeseries_collmod.js
index b7e04f7e43b..158153869ae 100644
--- a/jstests/core/timeseries/timeseries_collmod.js
+++ b/jstests/core/timeseries/timeseries_collmod.js
@@ -13,8 +13,14 @@
 
 (function() {
 'use strict';
+
+load("jstests/core/timeseries/libs/timeseries.js");
+
 const collName = "timeseries_collmod";
 const coll = db.getCollection(collName);
+const bucketMaxSpanSecondsHours = 60 * 60 * 24 * 30;
+const bucketRoundingSecondsHours = 60 * 60 * 24;
+
 coll.drop();
 assert.commandWorked(
     db.createCollection(collName, {timeseries: {timeField: "time", granularity: 'seconds'}}));
@@ -50,14 +56,136 @@ assert.commandFailedWithCode(db.runCommand({"collMod": collName, "viewOn": "foo"
 // Successfully sets 'expireAfterSeconds' for a time-series collection.
 assert.commandWorked(db.runCommand({"collMod": collName, "expireAfterSeconds": 60}));
 
-// Successfully sets the granularity for a time-series collection.
+// Successfully sets the granularity to a higher value for a time-series collection.
 assert.commandWorked(
     db.runCommand({"collMod": collName, "timeseries": {"granularity": "minutes"}}));
 
+// Tries to set current granularity to a lower value.
+assert.commandFailedWithCode(
+    db.runCommand({"collMod": collName, "timeseries": {"granularity": "seconds"}}),
+    ErrorCodes.InvalidOptions);
+
+// Successfully sets the granularity to a higher value for a time-series collection.
+assert.commandWorked(db.runCommand({"collMod": collName, "timeseries": {"granularity": "hours"}}));
+
 // collMod against the underlying buckets collection should fail: not allowed to target the buckets
 // collection.
 assert.commandFailedWithCode(
     db.runCommand(
         {"collMod": ("system.buckets." + collName), "timeseries": {"granularity": "hours"}}),
     [ErrorCodes.InvalidNamespace, 6201808 /* mongos error code */]);
+
+if (TimeseriesTest.timeseriesScalabilityImprovementsEnabled(db.getMongo())) {
+    // Tries to set one seconds parameter without the other (bucketMaxSpanSeconds or
+    // bucketRoundingSeconds).
+    assert.commandFailedWithCode(db.runCommand({
+        "collMod": collName,
+        "timeseries": {"bucketMaxSpanSeconds": bucketMaxSpanSecondsHours}
+    }),
+                                 ErrorCodes.InvalidOptions);
+    assert.commandFailedWithCode(db.runCommand({
+        "collMod": collName,
+        "timeseries": {"bucketRoundingSeconds": bucketRoundingSecondsHours}
+    }),
+                                 ErrorCodes.InvalidOptions);
+
+    // Tries to set bucketMaxSpanSeconds and bucketRoundingSeconds to a value less than the current
+    // maxSpanSeconds.
+    assert.commandFailedWithCode(db.runCommand({
+        "collMod": collName,
+        "timeseries": {
+            "bucketMaxSpanSeconds": bucketRoundingSecondsHours,
+            "bucketRoundingSeconds": bucketRoundingSecondsHours
+        }
+    }),
+                                 ErrorCodes.InvalidOptions);
+
+    // Tries to set bucketMaxSpanSeconds and bucketRoundingSeconds with different values, but with
+    // the same current values. Should pass but no changes should be made.
+    assert.commandWorked(db.runCommand({
+        "collMod": collName,
+        "timeseries": {
+            "bucketMaxSpanSeconds": bucketMaxSpanSecondsHours,
+            "bucketRoundingSeconds": bucketRoundingSecondsHours
+        }
+    }));
+
+    // Tries to set bucketMaxSpanSeconds and bucketRoundingSeconds with different values.
+    assert.commandFailedWithCode(db.runCommand({
+        "collMod": collName,
+        "timeseries": {
+            "bucketMaxSpanSeconds": bucketMaxSpanSecondsHours + 1,
+            "bucketRoundingSeconds": bucketRoundingSecondsHours + 1
+        }
+    }),
+                                 ErrorCodes.InvalidOptions);
+
+    // Tries to set granularity, bucketMaxSpanSeconds and bucketRoundingSeconds with different
+    // values from their default (60 * 60 * 24 and 60 * 60).
+    assert.commandFailedWithCode(db.runCommand({
+        "collMod": collName,
+        "timeseries": {
+            "granularity": "hours",
+            "bucketMaxSpanSeconds": bucketMaxSpanSecondsHours + 1,
+            "bucketRoundingSeconds": bucketRoundingSecondsHours + 1
+        }
+    }),
+                                 ErrorCodes.InvalidOptions);
+
+    // Successfully sets bucketMaxSpanSeconds, bucketRoundingSeconds and granularity to an equal
+    // value. This accepts the 3 parameters because they are the same as the current set values.
+    assert.commandWorked(db.runCommand({
+        "collMod": collName,
+        "timeseries": {
+            "granularity": "hours",
+            "bucketMaxSpanSeconds": bucketMaxSpanSecondsHours,
+            "bucketRoundingSeconds": bucketRoundingSecondsHours
+        }
+    }));
+
+    // Successfully sets the bucketMaxSpanSeconds and bucketRoundingSeconds to a higher value for a
+    // timeseries collection. The granularity is currently set to 'hours' for this collection so we
+    // should be able to increase the value of bucketMaxSpanSeconds by one.
+    assert.commandWorked(db.runCommand({
+        "collMod": collName,
+        "timeseries": {
+            "bucketMaxSpanSeconds": bucketMaxSpanSecondsHours + 1,
+            "bucketRoundingSeconds": bucketMaxSpanSecondsHours + 1
+        }
+    }));
+
+    // Verify seconds was correctly set on the collection and granularity removed since a custom
+    // value was added.
+    let collections = assert.commandWorked(db.runCommand({listCollections: 1})).cursor.firstBatch;
+
+    let collectionEntry =
+        collections.find(entry => entry.name === 'system.buckets.' + coll.getName());
+    assert(collectionEntry);
+
+    assert.eq(collectionEntry.options.timeseries.bucketRoundingSeconds,
+              bucketMaxSpanSecondsHours + 1);
+    assert.eq(collectionEntry.options.timeseries.bucketMaxSpanSeconds,
+              bucketMaxSpanSecondsHours + 1);
+    assert.isnull(collectionEntry.options.timeseries.granularity);
+
+    collectionEntry = collections.find(entry => entry.name === coll.getName());
+    assert(collectionEntry);
+    assert.eq(collectionEntry.options.timeseries.bucketRoundingSeconds,
+              bucketMaxSpanSecondsHours + 1);
+    assert.eq(collectionEntry.options.timeseries.bucketMaxSpanSeconds,
+              bucketMaxSpanSecondsHours + 1);
+    assert.isnull(collectionEntry.options.timeseries.granularity);
+
+    coll.drop();
+    // Create timeseries collection with custom maxSpanSeconds and bucketRoundingSeconds.
+    assert.commandWorked(db.createCollection(
+        collName,
+        {timeseries: {timeField: "time", bucketMaxSpanSeconds: 200, bucketRoundingSeconds: 200}}));
+
+    // Successfully sets granularity from a collection created with custom maxSpanSeconds and
+    // bucketRoundingSeconds since the default values for 'minutes' are greater than the previous
+    // seconds.
+    assert.commandWorked(
+        db.runCommand({"collMod": collName, "timeseries": {"granularity": "minutes"}}));
+}
 })();