diff options
Diffstat (limited to 'src/mongo/SConscript')
-rw-r--r-- | src/mongo/SConscript | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/src/mongo/SConscript b/src/mongo/SConscript index f3f83bba413..d10096cd17c 100644 --- a/src/mongo/SConscript +++ b/src/mongo/SConscript @@ -31,8 +31,6 @@ env.SConscript(['base/SConscript', 'db/storage/heap1/SConscript', 'db/storage/mmap_v1/SConscript', 'db/storage/rocks/SConscript', - 'db/structure/SConscript', - 'db/structure/btree/SConscript', 'db/SConscript', 'installer/msi/SConscript', 'logger/SConscript', @@ -141,9 +139,6 @@ env.CppUnitTest('bsonobjbuilder_test', ['bson/bsonobjbuilder_test.cpp'], env.CppUnitTest('namespacestring_test', ['db/namespace_string_test.cpp'], LIBDEPS=['bson']) -env.CppUnitTest('namespace_test', ['db/structure/catalog/namespace_test.cpp'], - LIBDEPS=['foundation']) - env.CppUnitTest('index_set_test', ['db/index_set_test.cpp'], LIBDEPS=['bson','index_set']) @@ -311,7 +306,6 @@ env.Library('version', ]) commonFiles = [ "pch.cpp", "db/namespace_string.cpp", - "db/structure/catalog/namespace.cpp", "shell/mongo.cpp", "util/intrusive_counter.cpp", "util/file_allocator.cpp", @@ -559,22 +553,8 @@ serverOnlyFiles = [ "db/curop.cpp", "util/logfile.cpp", "util/alignedbuilder.cpp", "util/elapsed_tracker.cpp", - "db/storage/mmap_v1/data_file.cpp", - "db/storage/mmap_v1/durable_mapped_file.cpp", - "db/storage/mmap_v1/dur.cpp", - "db/storage/mmap_v1/durop.cpp", - "db/storage/mmap_v1/dur_writetodatafiles.cpp", - "db/storage/mmap_v1/dur_preplogbuffer.cpp", - "db/storage/mmap_v1/dur_commitjob.cpp", - "db/storage/mmap_v1/dur_recover.cpp", - "db/storage/mmap_v1/dur_journal.cpp", - "db/storage/mmap_v1/dur_recovery_unit.cpp", - "db/storage/mmap_v1/mmap_v1_database_catalog_entry.cpp", - "db/storage/mmap_v1/mmap_v1_engine.cpp", - "db/storage/mmap_v1/repair_database.cpp", "db/storage/storage_engine.cpp", "db/operation_context_impl.cpp", - "db/storage/mmap_v1/mmap_v1_extent_manager.cpp", "db/introspect.cpp", "db/clientcursor.cpp", "db/range_deleter_db_env.cpp", @@ -621,10 +601,6 @@ serverOnlyFiles = [ "db/curop.cpp", "db/index/haystack_access_method.cpp", "db/index/s2_access_method.cpp", "db/cloner.cpp", - "db/structure/catalog/namespace_details.cpp", - "db/structure/catalog/namespace_details_collection_entry.cpp", - "db/structure/catalog/namespace_details_rsv1_metadata.cpp", - "db/structure/catalog/namespace_index.cpp", "db/dbeval.cpp", "db/dbhelpers.cpp", "db/instance.cpp", @@ -634,12 +610,11 @@ serverOnlyFiles = [ "db/curop.cpp", "db/catalog/index_catalog_entry.cpp", "db/catalog/index_create.cpp", "db/catalog/collection.cpp", - "db/structure/collection_compact.cpp", + "db/catalog/collection_compact.cpp", "db/catalog/collection_cursor_cache.cpp", "db/catalog/collection_info_cache.cpp", "db/catalog/database_holder.cpp", "db/background.cpp", - "db/structure/catalog/index_details.cpp", "db/index_builder.cpp", "db/index_rebuilder.cpp", "db/commands/geo_near_cmd.cpp", @@ -949,11 +924,8 @@ serveronlyLibdeps = ["coreshard", "db/repl/repl_coordinator_impl", "db/repl/repl_coordinator_global", "db/repl/replication_executor", - 'db/storage/mmap_v1/extent', + 'db/storage/mmap_v1/storage_mmapv1', 'db/storage/heap1/storage_heap1', - 'db/structure/record_store', - 'db/structure/record_store_v1', - 'db/structure/btree/btree', '$BUILD_DIR/third_party/shim_snappy'] if has_option("rocksdb" ): |