From d1ea4fa59d6aab66ebc19eee974249076f5d7e8a Mon Sep 17 00:00:00 2001 From: Dan Larkin-York Date: Tue, 23 Aug 2022 17:09:17 +0000 Subject: SERVER-58966 add unique prefix to test namespaces in bucket_granularity.js to avoid conflicting with bucket_timestamp_rounding.js --- jstests/core/timeseries/bucket_granularity.js | 68 +++++++++++++++------------ 1 file changed, 37 insertions(+), 31 deletions(-) (limited to 'jstests') diff --git a/jstests/core/timeseries/bucket_granularity.js b/jstests/core/timeseries/bucket_granularity.js index d445c7949c5..74c9096e818 100644 --- a/jstests/core/timeseries/bucket_granularity.js +++ b/jstests/core/timeseries/bucket_granularity.js @@ -32,7 +32,8 @@ function verifyViewPipeline(coll) { } (function testSeconds() { - let coll = db.granularitySeconds; + let coll = db.bucket_granularity_granularitySeconds; + let bucketsColl = db.getCollection('system.buckets.' + coll.getName()); coll.drop(); assert.commandWorked(db.createCollection( @@ -42,18 +43,19 @@ function verifyViewPipeline(coll) { assert.commandWorked(coll.insert({t: ISODate("2021-04-22T20:00:00.000Z")})); assert.commandWorked(coll.insert({t: ISODate("2021-04-22T20:00:03.000Z")})); assert.commandWorked(coll.insert({t: ISODate("2021-04-22T20:00:59.999Z")})); - assert.eq(1, db.system.buckets.granularitySeconds.find().itcount()); + assert.eq(1, bucketsColl.find().itcount()); // Expect bucket max span to be one hour. A new measurement outside of this range should create // a new bucket. assert.commandWorked(coll.insert({t: ISODate("2021-04-22T20:59:59.999Z")})); - assert.eq(1, db.system.buckets.granularitySeconds.find().itcount()); + assert.eq(1, bucketsColl.find().itcount()); assert.commandWorked(coll.insert({t: ISODate("2021-04-22T21:00:00.000Z")})); - assert.eq(2, db.system.buckets.granularitySeconds.find().itcount()); + assert.eq(2, bucketsColl.find().itcount()); })(); (function testMinutes() { - let coll = db.granularityMinutes; + let coll = db.bucket_granularity_granularityMinutes; + let bucketsColl = db.getCollection('system.buckets.' + coll.getName()); coll.drop(); assert.commandWorked(db.createCollection( @@ -63,18 +65,19 @@ function verifyViewPipeline(coll) { assert.commandWorked(coll.insert({t: ISODate("2021-04-22T20:00:00.000Z")})); assert.commandWorked(coll.insert({t: ISODate("2021-04-22T20:22:02.000Z")})); assert.commandWorked(coll.insert({t: ISODate("2021-04-22T20:59:59.999Z")})); - assert.eq(1, db.system.buckets.granularityMinutes.find().itcount()); + assert.eq(1, bucketsColl.find().itcount()); // Expect bucket max span to be one day. A new measurement outside of this range should create // a new bucket. assert.commandWorked(coll.insert({t: ISODate("2021-04-23T19:59:59.999Z")})); - assert.eq(1, db.system.buckets.granularityMinutes.find().itcount()); + assert.eq(1, bucketsColl.find().itcount()); assert.commandWorked(coll.insert({t: ISODate("2021-04-23T20:00:00.000Z")})); - assert.eq(2, db.system.buckets.granularityMinutes.find().itcount()); + assert.eq(2, bucketsColl.find().itcount()); })(); (function testHours() { - let coll = db.granularityHours; + let coll = db.bucket_granularity_granularityHours; + let bucketsColl = db.getCollection('system.buckets.' + coll.getName()); coll.drop(); assert.commandWorked( @@ -84,18 +87,19 @@ function verifyViewPipeline(coll) { assert.commandWorked(coll.insert({t: ISODate("2021-04-22T00:00:00.000Z")})); assert.commandWorked(coll.insert({t: ISODate("2021-04-22T20:11:03.000Z")})); assert.commandWorked(coll.insert({t: ISODate("2021-04-22T23:59:59.999Z")})); - assert.eq(1, db.system.buckets.granularityHours.find().itcount()); + assert.eq(1, bucketsColl.find().itcount()); // Expect bucket max span to be 30 days. A new measurement outside of this range should create // a new bucket. assert.commandWorked(coll.insert({t: ISODate("2021-05-21T23:59:59.999Z")})); - assert.eq(1, db.system.buckets.granularityHours.find().itcount()); + assert.eq(1, bucketsColl.find().itcount()); assert.commandWorked(coll.insert({t: ISODate("2021-05-22T00:00:00.000Z")})); - assert.eq(2, db.system.buckets.granularityHours.find().itcount()); + assert.eq(2, bucketsColl.find().itcount()); })(); (function testIncreasingSecondsToMinutes() { - let coll = db.granularitySecondsToMinutes; + let coll = db.bucket_granularity_granularitySecondsToMinutes; + let bucketsColl = db.getCollection('system.buckets.' + coll.getName()); coll.drop(); assert.commandWorked(db.createCollection( @@ -106,14 +110,14 @@ function verifyViewPipeline(coll) { assert.commandWorked(coll.insert({t: ISODate("2021-04-22T20:00:00.000Z")})); assert.commandWorked(coll.insert({t: ISODate("2021-04-22T20:00:03.000Z")})); assert.commandWorked(coll.insert({t: ISODate("2021-04-22T20:00:59.999Z")})); - assert.eq(1, db.system.buckets.granularitySecondsToMinutes.find().itcount()); + assert.eq(1, bucketsColl.find().itcount()); // Expect bucket max span to be one hour. A new measurement outside of this range should create // a new bucket. assert.commandWorked(coll.insert({t: ISODate("2021-04-22T20:59:59.999Z")})); - assert.eq(1, db.system.buckets.granularitySecondsToMinutes.find().itcount()); + assert.eq(1, bucketsColl.find().itcount()); assert.commandWorked(coll.insert({t: ISODate("2021-04-22T21:00:00.000Z")})); - assert.eq(2, db.system.buckets.granularitySecondsToMinutes.find().itcount()); + assert.eq(2, bucketsColl.find().itcount()); // Now let's bump to minutes and make sure we get the expected behavior assert.commandWorked( @@ -124,19 +128,20 @@ function verifyViewPipeline(coll) { assert.commandWorked(coll.insert({t: ISODate("2021-04-23T20:00:00.000Z")})); assert.commandWorked(coll.insert({t: ISODate("2021-04-23T20:22:02.000Z")})); assert.commandWorked(coll.insert({t: ISODate("2021-04-23T20:59:59.999Z")})); - assert.eq(2, db.system.buckets.granularitySecondsToMinutes.find().itcount()); + assert.eq(2, bucketsColl.find().itcount()); // Expect bucket max span to be one day. A new measurement outside of this range should create // a new bucket. assert.commandWorked(coll.insert({t: ISODate("2021-04-23T21:00:00.000Z")})); - assert.eq(3, db.system.buckets.granularitySecondsToMinutes.find().itcount()); + assert.eq(3, bucketsColl.find().itcount()); // Make sure when we query, we use the new bucket max span to make sure we get all matches assert.eq(4, coll.find({t: {$gt: ISODate("2021-04-23T19:00:00.000Z")}}).itcount()); })(); (function testIncreasingSecondsToHours() { - let coll = db.granularitySecondsToHours; + let coll = db.bucket_granularity_granularitySecondsToHours; + let bucketsColl = db.getCollection('system.buckets.' + coll.getName()); coll.drop(); assert.commandWorked(db.createCollection( @@ -147,14 +152,14 @@ function verifyViewPipeline(coll) { assert.commandWorked(coll.insert({t: ISODate("2021-04-22T20:00:00.000Z")})); assert.commandWorked(coll.insert({t: ISODate("2021-04-22T20:00:03.000Z")})); assert.commandWorked(coll.insert({t: ISODate("2021-04-22T20:00:59.999Z")})); - assert.eq(1, db.system.buckets.granularitySecondsToHours.find().itcount()); + assert.eq(1, bucketsColl.find().itcount()); // Expect bucket max span to be one hour. A new measurement outside of this range should create // a new bucket. assert.commandWorked(coll.insert({t: ISODate("2021-04-22T20:59:59.999Z")})); - assert.eq(1, db.system.buckets.granularitySecondsToHours.find().itcount()); + assert.eq(1, bucketsColl.find().itcount()); assert.commandWorked(coll.insert({t: ISODate("2021-04-22T21:00:00.000Z")})); - assert.eq(2, db.system.buckets.granularitySecondsToHours.find().itcount()); + assert.eq(2, bucketsColl.find().itcount()); assert.commandWorked( db.runCommand({collMod: coll.getName(), timeseries: {granularity: 'hours'}})); @@ -164,19 +169,20 @@ function verifyViewPipeline(coll) { assert.commandWorked(coll.insert({t: ISODate("2021-05-22T00:00:00.000Z")})); assert.commandWorked(coll.insert({t: ISODate("2021-05-22T18:11:03.000Z")})); assert.commandWorked(coll.insert({t: ISODate("2021-05-22T20:59:59.999Z")})); - assert.eq(2, db.system.buckets.granularitySecondsToHours.find().itcount()); + assert.eq(2, bucketsColl.find().itcount()); // Expect bucket max span to be 30 days. A new measurement outside of this range should create // a new bucket. assert.commandWorked(coll.insert({t: ISODate("2021-05-22T21:00:00.001Z")})); - assert.eq(3, db.system.buckets.granularitySecondsToHours.find().itcount()); + assert.eq(3, bucketsColl.find().itcount()); // Make sure when we query, we use the new bucket max span to make sure we get all matches assert.eq(4, coll.find({t: {$gt: ISODate("2021-05-21T00:00:00.000Z")}}).itcount()); })(); (function testIncreasingMinutesToHours() { - let coll = db.granularityMinutesToHours; + let coll = db.bucket_granularity_granularityMinutesToHours; + let bucketsColl = db.getCollection('system.buckets.' + coll.getName()); coll.drop(); assert.commandWorked(db.createCollection( @@ -187,14 +193,14 @@ function verifyViewPipeline(coll) { assert.commandWorked(coll.insert({t: ISODate("2021-04-22T20:00:00.000Z")})); assert.commandWorked(coll.insert({t: ISODate("2021-04-22T20:22:02.000Z")})); assert.commandWorked(coll.insert({t: ISODate("2021-04-22T20:59:59.999Z")})); - assert.eq(1, db.system.buckets.granularityMinutesToHours.find().itcount()); + assert.eq(1, bucketsColl.find().itcount()); // Expect bucket max span to be one day. A new measurement outside of this range should create // a new bucket. assert.commandWorked(coll.insert({t: ISODate("2021-04-23T19:59:59.999Z")})); - assert.eq(1, db.system.buckets.granularityMinutesToHours.find().itcount()); + assert.eq(1, bucketsColl.find().itcount()); assert.commandWorked(coll.insert({t: ISODate("2021-04-23T20:00:00.000Z")})); - assert.eq(2, db.system.buckets.granularityMinutesToHours.find().itcount()); + assert.eq(2, bucketsColl.find().itcount()); assert.commandWorked( db.runCommand({collMod: coll.getName(), timeseries: {granularity: 'hours'}})); @@ -204,19 +210,19 @@ function verifyViewPipeline(coll) { assert.commandWorked(coll.insert({t: ISODate("2021-05-23T00:00:00.000Z")})); assert.commandWorked(coll.insert({t: ISODate("2021-05-23T18:11:03.000Z")})); assert.commandWorked(coll.insert({t: ISODate("2021-05-23T19:59:59.999Z")})); - assert.eq(2, db.system.buckets.granularityMinutesToHours.find().itcount()); + assert.eq(2, bucketsColl.find().itcount()); // Expect bucket max span to be 30 days. A new measurement outside of this range should create // a new bucket. assert.commandWorked(coll.insert({t: ISODate("2021-05-23T20:00:00.001Z")})); - assert.eq(3, db.system.buckets.granularityMinutesToHours.find().itcount()); + assert.eq(3, bucketsColl.find().itcount()); // Make sure when we query, we use the new bucket max span to make sure we get all matches assert.eq(4, coll.find({t: {$gt: ISODate("2021-05-22T00:00:00.000Z")}}).itcount()); })(); (function testReducingGranularityFails() { - let coll = db.reducingGranularityFails; + let coll = db.bucket_granularity_reducingGranularityFails; coll.drop(); assert.commandWorked(db.createCollection( -- cgit v1.2.1