summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBilly Donahue <billy.donahue@mongodb.com>2021-02-24 17:35:11 -0500
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2021-03-06 13:29:10 +0000
commit982db36aae245c4cac674587bde741604748fc27 (patch)
tree731afb9c95f228d7048653475701ec10eed0f54b /src
parent94236461bc1dc7b23812f37196229cb2fb6d6388 (diff)
downloadmongo-982db36aae245c4cac674587bde741604748fc27.tar.gz
SERVER-54031 Include .py and .idl files in the errorcodes.py scan
Diffstat (limited to 'src')
-rw-r--r--src/mongo/db/exec/sbe/stages/scan.cpp2
-rw-r--r--src/mongo/db/query/sbe_stage_builder_filter.cpp2
-rw-r--r--src/mongo/util/assert_util_test.cpp2
-rwxr-xr-xsrc/mongo/util/generate_icu_init_cpp.py2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/mongo/db/exec/sbe/stages/scan.cpp b/src/mongo/db/exec/sbe/stages/scan.cpp
index 8c2a52fbb97..29a4950f5e4 100644
--- a/src/mongo/db/exec/sbe/stages/scan.cpp
+++ b/src/mongo/db/exec/sbe/stages/scan.cpp
@@ -476,7 +476,7 @@ void ParallelScanStage::open(bool reOpen) {
if (!_coll) {
// we're being opened after 'close()'. we need to re-acquire '_coll' in this case and
// make some validity checks (the collection has not been dropped, renamed, etc.).
- tassert(5071008, "ParallelScanStage is not open but have _cursor", !_cursor);
+ tassert(5071013, "ParallelScanStage is not open but have _cursor", !_cursor);
restoreCollection(_opCtx, _collName, _collUuid, nullptr, _coll);
}
diff --git a/src/mongo/db/query/sbe_stage_builder_filter.cpp b/src/mongo/db/query/sbe_stage_builder_filter.cpp
index 6b44d54063b..29131f44569 100644
--- a/src/mongo/db/query/sbe_stage_builder_filter.cpp
+++ b/src/mongo/db/query/sbe_stage_builder_filter.cpp
@@ -1804,7 +1804,7 @@ std::unique_ptr<sbe::PlanStage> generateIndexFilter(OperationContext* opCtx,
tree_walker::walk<true, MatchExpression>(root, &walker);
auto [resultSlot, resultStage] = context.done();
- tassert(5273409, "Index filter must not track a matching element index", !resultSlot);
+ tassert(5273411, "Index filter must not track a matching element index", !resultSlot);
return std::move(resultStage.stage);
}
} // namespace mongo::stage_builder
diff --git a/src/mongo/util/assert_util_test.cpp b/src/mongo/util/assert_util_test.cpp
index 2a0c18f249a..d4740ea966e 100644
--- a/src/mongo/util/assert_util_test.cpp
+++ b/src/mongo/util/assert_util_test.cpp
@@ -253,7 +253,7 @@ TEST(AssertUtils, InternalAssertWithExpression) {
ASSERT_EQ(ex.reason(), "Test");
}
- iassert(48922, "Another test", true);
+ iassert(48923, "Another test", true);
ASSERT_EQ(userAssertions, assertionCount.user.load());
}
diff --git a/src/mongo/util/generate_icu_init_cpp.py b/src/mongo/util/generate_icu_init_cpp.py
index f606a2ee800..3358fad25f7 100755
--- a/src/mongo/util/generate_icu_init_cpp.py
+++ b/src/mongo/util/generate_icu_init_cpp.py
@@ -107,7 +107,7 @@ MONGO_INITIALIZER_GENERAL(LoadICUData, (), ("BeginStartupOptionHandling"))(
InitializerContext* context) {
UErrorCode status = U_ZERO_ERROR;
udata_setCommonData(kRawData, &status);
- fassert(40088, U_SUCCESS(status));
+ fassert(40089, U_SUCCESS(status));
}
} // namespace mongo