mongodb/mongo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

final inconsistencies

Browse Source
This commit is contained in:
Matt Kneiser 2023-10-17 13:00:21 -07:00
parent 45bec3613e
commit 74f11cc356
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mongo/db/ops/write_ops_exec.cpp
View File

@ -2666,8 +2666,6 @@ std::tuple<TimeseriesBatches, TimeseriesStmtIds, size_t /* numInserted */> inser
if (swResult.isOK()) {
auto& insertResult = swResult.getValue();
// If the InsertResult doesn't contain a batch, we failed to insert the
// measurement into an open bucket and need to create/reopen a bucket.
if (auto* reopeningContext =
stdx::get_if<timeseries::bucket_catalog::ReopeningContext>(
&insertResult)) {

6
src/mongo/db/timeseries/bucket_catalog/bucket_catalog_test.cpp
View File

@ -640,7 +640,6 @@ TEST_F(BucketCatalogWithoutMetadataTest, GetMetadataReturnsEmptyDoc) {
_getTimeseriesOptions(_ns1),
BSON(_timeField << Date_t::now()),
CombineWithInsertsFromOtherClients::kAllow);
auto& batch = stdx::get<SuccessfulInsertion>(result.getValue()).batch;
ASSERT_BSONOBJ_EQ(BSONObj(), getMetadata(*_bucketCatalog, batch->bucketHandle));
@ -1011,6 +1010,7 @@ TEST_F(BucketCatalogTest, AbortingBatchEnsuresBucketIsEventuallyClosed) {
BSON(_timeField << Date_t::now()),
CombineWithInsertsFromOtherClients::kDisallow);
auto batch2 = stdx::get<SuccessfulInsertion>(result2.getValue()).batch;
auto result3 = insert(_makeOperationContext().second.get(),
*_bucketCatalog,
_ns1,
@ -1019,6 +1019,7 @@ TEST_F(BucketCatalogTest, AbortingBatchEnsuresBucketIsEventuallyClosed) {
BSON(_timeField << Date_t::now()),
CombineWithInsertsFromOtherClients::kDisallow);
auto batch3 = stdx::get<SuccessfulInsertion>(result3.getValue()).batch;
ASSERT_EQ(batch1->bucketHandle.bucketId, batch2->bucketHandle.bucketId);
ASSERT_EQ(batch1->bucketHandle.bucketId, batch3->bucketHandle.bucketId);
@ -1348,13 +1349,12 @@ TEST_F(BucketCatalogTest, ReopenUncompressedBucketAndInsertCompatibleMeasurement
::mongo::fromjson(R"({"time":{"$date":"2022-06-06T15:34:40.000Z"},
"a":-100,"b":100})"),
CombineWithInsertsFromOtherClients::kAllow);
auto batch = stdx::get<SuccessfulInsertion>(result.getValue()).batch;
// No buckets are closed.
ASSERT(stdx::get<SuccessfulInsertion>(result.getValue()).closedBuckets.empty());
ASSERT_EQ(0, _getExecutionStat(_ns1, kNumSchemaChanges));
batch = stdx::get<SuccessfulInsertion>(result.getValue()).batch;
auto batch = stdx::get<SuccessfulInsertion>(result.getValue()).batch;
ASSERT(claimWriteBatchCommitRights(*batch));
ASSERT_OK(prepareCommit(*_bucketCatalog, batch));
ASSERT_EQ(batch->measurements.size(), 1);