diff options
author | David Storch <david.storch@mongodb.com> | 2019-10-01 13:12:08 +0000 |
---|---|---|
committer | evergreen <evergreen@mongodb.com> | 2019-10-01 13:12:08 +0000 |
commit | 0cee67ce6909ca653462d4609e47edcc4ac5c1a9 (patch) | |
tree | 9f4d249c629e9e11bf7cfb9a2a2e180ad689181a /src/mongo/dbtests | |
parent | 15c6c085126f5d459f30191ef736c10607bea3f6 (diff) | |
download | mongo-0cee67ce6909ca653462d4609e47edcc4ac5c1a9.tar.gz |
SERVER-42302 Move Document/Value library to db/exec/document_value directory.
Document/Value is now used throughout the query execution
engine, and therefore should move into the directory which
holds query execution code.
Diffstat (limited to 'src/mongo/dbtests')
-rw-r--r-- | src/mongo/dbtests/SConscript | 14 | ||||
-rw-r--r-- | src/mongo/dbtests/documentsourcetests.cpp | 2 | ||||
-rw-r--r-- | src/mongo/dbtests/query_stage_sort_key_generator.cpp | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/mongo/dbtests/SConscript b/src/mongo/dbtests/SConscript index 6c2521001a2..3ab33da12de 100644 --- a/src/mongo/dbtests/SConscript +++ b/src/mongo/dbtests/SConscript @@ -127,23 +127,22 @@ if not has_option('noshell') and usemozjs: "$BUILD_DIR/mongo/bson/mutable/mutable_bson_test_utils", "$BUILD_DIR/mongo/db/auth/authmongod", "$BUILD_DIR/mongo/db/bson/dotted_path_support", - "$BUILD_DIR/mongo/db/catalog_raii", - "$BUILD_DIR/mongo/db/transaction", "$BUILD_DIR/mongo/db/catalog/collection_validation", "$BUILD_DIR/mongo/db/catalog/multi_index_block", + "$BUILD_DIR/mongo/db/catalog_raii", "$BUILD_DIR/mongo/db/commands/mongod", "$BUILD_DIR/mongo/db/commands/test_commands_enabled", "$BUILD_DIR/mongo/db/concurrency/deferred_writer", + "$BUILD_DIR/mongo/db/exec/document_value/document_value_test_util", "$BUILD_DIR/mongo/db/index/index_access_methods", "$BUILD_DIR/mongo/db/index/index_build_interceptor", "$BUILD_DIR/mongo/db/logical_clock", "$BUILD_DIR/mongo/db/logical_time_metadata_hook", - "$BUILD_DIR/mongo/db/pipeline/document_value_test_util", "$BUILD_DIR/mongo/db/query/collation/collator_interface_mock", "$BUILD_DIR/mongo/db/query/command_request_response", - "$BUILD_DIR/mongo/db/query_exec", "$BUILD_DIR/mongo/db/query/query_planner_test_lib", "$BUILD_DIR/mongo/db/query/query_test_service_context", + "$BUILD_DIR/mongo/db/query_exec", "$BUILD_DIR/mongo/db/repl/drop_pending_collection_reaper", "$BUILD_DIR/mongo/db/repl/repl_coordinator_interface", "$BUILD_DIR/mongo/db/repl/replication_consistency_markers_impl", @@ -155,17 +154,18 @@ if not has_option('noshell') and usemozjs: "$BUILD_DIR/mongo/db/s/op_observer_sharding_impl", "$BUILD_DIR/mongo/db/sessions_collection_standalone", "$BUILD_DIR/mongo/db/storage/biggie/storage_biggie", - "$BUILD_DIR/mongo/db/storage/ephemeral_for_test/storage_ephemeral_for_test", "$BUILD_DIR/mongo/db/storage/durable_catalog_impl", + "$BUILD_DIR/mongo/db/storage/ephemeral_for_test/storage_ephemeral_for_test", "$BUILD_DIR/mongo/db/storage/storage_engine_impl", "$BUILD_DIR/mongo/db/storage/wiredtiger/storage_wiredtiger" if wiredtiger else [], - "$BUILD_DIR/mongo/transport/transport_layer_manager", + "$BUILD_DIR/mongo/db/transaction", + "$BUILD_DIR/mongo/shell_core", "$BUILD_DIR/mongo/transport/message_compressor_options_server", + "$BUILD_DIR/mongo/transport/transport_layer_manager", "$BUILD_DIR/mongo/util/clock_source_mock", "$BUILD_DIR/mongo/util/net/network", "$BUILD_DIR/mongo/util/progress_meter", "$BUILD_DIR/mongo/util/version_impl", - "$BUILD_DIR/mongo/shell_core", "mocklib", "testframework", ], diff --git a/src/mongo/dbtests/documentsourcetests.cpp b/src/mongo/dbtests/documentsourcetests.cpp index 2165ed6695a..b353f920dbc 100644 --- a/src/mongo/dbtests/documentsourcetests.cpp +++ b/src/mongo/dbtests/documentsourcetests.cpp @@ -38,12 +38,12 @@ #include "mongo/db/db_raii.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/exec/collection_scan.h" +#include "mongo/db/exec/document_value/document_value_test_util.h" #include "mongo/db/exec/multi_plan.h" #include "mongo/db/exec/plan_stage.h" #include "mongo/db/pipeline/dependencies.h" #include "mongo/db/pipeline/document_source.h" #include "mongo/db/pipeline/document_source_cursor.h" -#include "mongo/db/pipeline/document_value_test_util.h" #include "mongo/db/pipeline/expression_context_for_test.h" #include "mongo/db/pipeline/pipeline.h" #include "mongo/db/query/get_executor.h" diff --git a/src/mongo/dbtests/query_stage_sort_key_generator.cpp b/src/mongo/dbtests/query_stage_sort_key_generator.cpp index 00e3f40d92c..fe7ae6583c0 100644 --- a/src/mongo/dbtests/query_stage_sort_key_generator.cpp +++ b/src/mongo/dbtests/query_stage_sort_key_generator.cpp @@ -31,10 +31,10 @@ #include <memory> +#include "mongo/db/exec/document_value/document_value_test_util.h" #include "mongo/db/exec/queued_data_stage.h" #include "mongo/db/exec/sort_key_generator.h" #include "mongo/db/json.h" -#include "mongo/db/pipeline/document_value_test_util.h" #include "mongo/db/query/collation/collator_interface_mock.h" #include "mongo/db/query/query_test_service_context.h" #include "mongo/unittest/unittest.h" |