Skip to content

Commit fc1aa55

Browse files
committed
SERVER-38700 unshim Database
1 parent 424946d commit fc1aa55

File tree

10 files changed

+72
-382
lines changed

10 files changed

+72
-382
lines changed

src/mongo/db/SConscript

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -698,7 +698,6 @@ env.Library(
698698
'$BUILD_DIR/mongo/idl/idl_parser',
699699
'catalog/collection',
700700
'catalog/database_holder',
701-
'catalog/database',
702701
'catalog/uuid_catalog',
703702
'commands/test_commands_enabled',
704703
'commands/txn_cmd_request',
@@ -1032,7 +1031,6 @@ env.Library(
10321031
],
10331032
LIBDEPS=[
10341033
'$BUILD_DIR/mongo/db/catalog/collection',
1035-
'$BUILD_DIR/mongo/db/catalog/database',
10361034
'rw_concern_d',
10371035
'background',
10381036
'logical_clock',
@@ -1146,7 +1144,6 @@ env.Library(
11461144
'background',
11471145
'bson/dotted_path_support',
11481146
'catalog/collection',
1149-
'catalog/database',
11501147
'catalog/document_validation',
11511148
'catalog/index_catalog_entry',
11521149
'catalog/index_catalog',

src/mongo/db/catalog/SConscript

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -196,23 +196,12 @@ env.Library(
196196
],
197197
)
198198

199-
env.Library(
200-
target='database',
201-
source=[
202-
"database.cpp",
203-
],
204-
LIBDEPS=[
205-
'$BUILD_DIR/mongo/base',
206-
],
207-
)
208-
209199
env.CppUnitTest(
210200
target='database_test',
211201
source=[
212202
'database_test.cpp',
213203
],
214204
LIBDEPS=[
215-
'database',
216205
'multi_index_block',
217206
'$BUILD_DIR/mongo/db/auth/authmocks',
218207
'$BUILD_DIR/mongo/db/concurrency/lock_manager',
@@ -286,7 +275,6 @@ env.Library(
286275
],
287276
LIBDEPS=[
288277
'collection',
289-
'database',
290278
'database_holder',
291279
'$BUILD_DIR/mongo/base',
292280
'$BUILD_DIR/mongo/db/namespace_string',
@@ -337,7 +325,6 @@ env.Library(
337325
],
338326
LIBDEPS_PRIVATE=[
339327
'collection',
340-
'database',
341328
'uuid_catalog',
342329
'$BUILD_DIR/mongo/db/repair_database',
343330
'$BUILD_DIR/mongo/db/service_context',
@@ -372,7 +359,6 @@ env.Library(
372359
LIBDEPS=[
373360
'collection',
374361
'collection_options',
375-
'database',
376362
'database_holder',
377363
'health_log',
378364
'index_catalog',
@@ -428,7 +414,6 @@ env.Library(
428414
'$BUILD_DIR/mongo/db/write_ops',
429415
'collection_options',
430416
'collection',
431-
'database',
432417
'index_catalog',
433418
'index_key_validate',
434419
'multi_index_block',

src/mongo/db/catalog/database.cpp

Lines changed: 0 additions & 43 deletions
This file was deleted.

0 commit comments

Comments
 (0)