summaryrefslogtreecommitdiff
path: root/src/mongo/db/query
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo/db/query')
-rw-r--r--src/mongo/db/query/SConscript14
-rw-r--r--src/mongo/db/query/ce/maxdiff_histogram_test.cpp2
-rw-r--r--src/mongo/db/query/optimizer/SConscript1
3 files changed, 7 insertions, 10 deletions
diff --git a/src/mongo/db/query/SConscript b/src/mongo/db/query/SConscript
index d552d581044..7f9e1c69a00 100644
--- a/src/mongo/db/query/SConscript
+++ b/src/mongo/db/query/SConscript
@@ -275,18 +275,16 @@ env.Library(
)
env.Library(
- target='query_test_service_context',
+ target="query_test_service_context",
source=[
- 'query_test_service_context.cpp',
+ "query_test_service_context.cpp",
],
LIBDEPS=[
- '$BUILD_DIR/mongo/db/service_context',
- '$BUILD_DIR/mongo/db/session/logical_session_id',
- 'collation/collator_factory_mock',
- ],
- LIBDEPS_PRIVATE=[
- '$BUILD_DIR/mongo/db/concurrency/lock_manager',
+ "$BUILD_DIR/mongo/db/service_context",
+ "$BUILD_DIR/mongo/db/session/logical_session_id",
+ "collation/collator_factory_mock",
],
+ LIBDEPS_PRIVATE=[],
)
env.Library(
diff --git a/src/mongo/db/query/ce/maxdiff_histogram_test.cpp b/src/mongo/db/query/ce/maxdiff_histogram_test.cpp
index 10e528cd6e4..7225c1a8774 100644
--- a/src/mongo/db/query/ce/maxdiff_histogram_test.cpp
+++ b/src/mongo/db/query/ce/maxdiff_histogram_test.cpp
@@ -27,7 +27,7 @@
* it in the license file.
*/
-#include "mongo/db/concurrency/locker_impl.h"
+#include "mongo/db/concurrency/lock_state.h"
#include "mongo/db/exec/sbe/abt/sbe_abt_test_util.h"
#include "mongo/db/exec/sbe/values/value.h"
#include "mongo/db/query/ce/histogram_predicate_estimation.h"
diff --git a/src/mongo/db/query/optimizer/SConscript b/src/mongo/db/query/optimizer/SConscript
index 80f144ee898..2abdccf1f04 100644
--- a/src/mongo/db/query/optimizer/SConscript
+++ b/src/mongo/db/query/optimizer/SConscript
@@ -150,7 +150,6 @@ env.CppUnitTest(
"interval_simplify_test.cpp",
],
LIBDEPS=[
- "$BUILD_DIR/mongo/db/concurrency/lock_manager",
"$BUILD_DIR/mongo/db/service_context_test_fixture",
"optimizer",
"unit_test_pipeline_utils",