diff options
| author | Gregory Wlodarek <gregory.wlodarek@mongodb.com> | 2019-02-09 23:51:15 -0500 |
|---|---|---|
| committer | Gregory Wlodarek <gregory.wlodarek@mongodb.com> | 2019-02-10 01:27:30 -0500 |
| commit | c467b79f46ea23f40669eb06f0d2698bc640c997 (patch) | |
| tree | a97668124569193f5b8479726cf8664c84e20e72 /src/mongo/db | |
| parent | b158ba464eeafb2d6b34df20cbd75020c3e62045 (diff) | |
| download | mongo-c467b79f46ea23f40669eb06f0d2698bc640c997.tar.gz | |
SERVER-37979 Fix unittest compilation
Diffstat (limited to 'src/mongo/db')
| -rw-r--r-- | src/mongo/db/SConscript | 9 | ||||
| -rw-r--r-- | src/mongo/db/index_build_entry_helpers.cpp | 4 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript index 6b46e5e9fb9..0b2bff17ac8 100644 --- a/src/mongo/db/SConscript +++ b/src/mongo/db/SConscript @@ -995,12 +995,19 @@ env.Library( LIBDEPS_PRIVATE=[ "catalog_raii", "dbhelpers", + "db_raii", "namespace_string", + "query_exec", + "service_context", "$BUILD_DIR/mongo/base", + "$BUILD_DIR/mongo/db/catalog/catalog_helpers", + "$BUILD_DIR/mongo/db/catalog/catalog_impl", "$BUILD_DIR/mongo/db/catalog/commit_quorum_options", "$BUILD_DIR/mongo/db/catalog/index_build_entry_idl", + "$BUILD_DIR/mongo/db/matcher/expressions_mongod_only", "$BUILD_DIR/mongo/db/storage/write_unit_of_work", - "$BUILD_DIR/mongo/db/query_exec", + "$BUILD_DIR/mongo/db/query/query_request", + "$BUILD_DIR/mongo/db/query/query_planner", "$BUILD_DIR/mongo/util/net/network", ], ) diff --git a/src/mongo/db/index_build_entry_helpers.cpp b/src/mongo/db/index_build_entry_helpers.cpp index c243a3977af..453233ef9d4 100644 --- a/src/mongo/db/index_build_entry_helpers.cpp +++ b/src/mongo/db/index_build_entry_helpers.cpp @@ -196,7 +196,7 @@ StatusWith<IndexBuildEntry> getIndexBuildEntry(OperationContext* opCtx, UUID ind IDLParserErrorContext ctx("IndexBuildsEntry Parser"); IndexBuildEntry indexBuildEntry = IndexBuildEntry::parse(ctx, obj); return indexBuildEntry; - } catch (const DBException& ex) { + } catch (...) { mongoutils::str::stream ss; ss << "Invalid BSON found for matching document with indexBuildUUID: " << indexBuildUUID; return Status(ErrorCodes::InvalidBSON, ss); @@ -249,7 +249,7 @@ StatusWith<std::vector<IndexBuildEntry>> getIndexBuildEntries(OperationContext* IDLParserErrorContext ctx("IndexBuildsEntry Parser"); IndexBuildEntry indexBuildEntry = IndexBuildEntry::parse(ctx, obj); indexBuildEntries.push_back(indexBuildEntry); - } catch (const DBException& ex) { + } catch (...) { mongoutils::str::stream ss; ss << "Invalid BSON found for RecordId " << loc << " in collection " << collection->ns(); |