tursom/memgraph
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove linking mg-query with mg-auth

Browse Source 
Summary: Depends on D2623

Reviewers: mferencevic

Reviewed By: mferencevic

Subscribers: pullbot

Differential Revision: https://phabricator.memgraph.io/D2624
This commit is contained in:
Teon Banek 2020-01-14 14:46:41 +01:00
parent c7f69fd861
commit cc2160d397
6 changed files with 39 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/CMakeLists.txt
View File

@ -128,8 +128,8 @@ add_library(kvstore_lib STATIC storage/common/kvstore/kvstore.cpp)
target_link_libraries(kvstore_lib stdc++fs mg-utils rocksdb bzip2 zlib glog gflags)
# STATIC library for dummy key-value storage
add_library(kvstore_dummy_lib STATIC storage/common/kvstore/kvstore_dummy.cpp)
target_link_libraries(kvstore_dummy_lib mg-utils)
# add_library(kvstore_dummy_lib STATIC storage/common/kvstore/kvstore_dummy.cpp)
# target_link_libraries(kvstore_dummy_lib mg-utils)
# Generate a version.hpp file
set(VERSION_STRING ${memgraph_VERSION})

2
src/auth/CMakeLists.txt
View File

@ -8,7 +8,7 @@ find_package(Seccomp REQUIRED)
add_library(mg-auth STATIC ${auth_src_files})
target_link_libraries(mg-auth json libbcrypt glog gflags fmt)
target_link_libraries(mg-auth mg-utils)
target_link_libraries(mg-auth mg-utils kvstore_lib)
target_link_libraries(mg-auth ${Seccomp_LIBRARIES})
target_include_directories(mg-auth SYSTEM PRIVATE ${Seccomp_INCLUDE_DIRS})

13
src/query/CMakeLists.txt
View File

@ -7,7 +7,6 @@ add_lcp_query(plan/operator.lcp)
add_custom_target(generate_lcp_query DEPENDS ${generated_lcp_query_files})
set(mg_query_sources
${CMAKE_SOURCE_DIR}/src/glue/auth.cpp # Needed for mg-auth
${lcp_query_cpp_files}
common.cpp
dump.cpp
@ -37,15 +36,3 @@ target_compile_definitions(mg-query PUBLIC MG_SINGLE_NODE_V2)
target_include_directories(mg-query PRIVATE ${CMAKE_SOURCE_DIR}/include)
target_link_libraries(mg-query dl cppitertools antlr_opencypher_parser_lib)
target_link_libraries(mg-query mg-storage-v2)
# These are enterprise subsystems
target_link_libraries(mg-query mg-auth kvstore_lib)
# Build another mg-query with kvstore_dummy_lib for mg-auth
add_library(mg-query-with-kvstore-dummy STATIC ${mg_query_sources})
add_dependencies(mg-query-with-kvstore-dummy generate_lcp_query)
add_dependencies(mg-query-with-kvstore-dummy generate_opencypher_parser)
target_compile_definitions(mg-query-with-kvstore-dummy PUBLIC MG_SINGLE_NODE_V2)
target_include_directories(mg-query-with-kvstore-dummy PRIVATE ${CMAKE_SOURCE_DIR}/include)
target_link_libraries(mg-query-with-kvstore-dummy dl cppitertools antlr_opencypher_parser_lib)
target_link_libraries(mg-query-with-kvstore-dummy mg-storage-v2)
target_link_libraries(mg-query-with-kvstore-dummy mg-auth kvstore_dummy_lib)

12
tests/benchmark/CMakeLists.txt
View File

@ -22,19 +22,19 @@ add_benchmark(data_structures/ring_buffer.cpp)
target_link_libraries(${test_prefix}ring_buffer mg-utils)
add_benchmark(query/eval.cpp)
target_link_libraries(${test_prefix}eval mg-query-with-kvstore-dummy)
target_link_libraries(${test_prefix}eval mg-query)
add_benchmark(query/execution.cpp ${CMAKE_SOURCE_DIR}/src/glue/communication.cpp)
target_link_libraries(${test_prefix}execution mg-query-with-kvstore-dummy mg-communication)
target_link_libraries(${test_prefix}execution mg-query mg-communication)
add_benchmark(query/planner.cpp)
target_link_libraries(${test_prefix}planner mg-query-with-kvstore-dummy)
target_link_libraries(${test_prefix}planner mg-query)
add_benchmark(query/profile.cpp)
target_link_libraries(${test_prefix}profile mg-query-with-kvstore-dummy)
target_link_libraries(${test_prefix}profile mg-query)
add_benchmark(query/stripped.cpp)
target_link_libraries(${test_prefix}stripped mg-query-with-kvstore-dummy)
target_link_libraries(${test_prefix}stripped mg-query)
add_benchmark(rpc.cpp)
target_link_libraries(${test_prefix}rpc mg-comm-rpc)
@ -52,7 +52,7 @@ add_benchmark(skip_list_vs_stl.cpp)
target_link_libraries(${test_prefix}skip_list_vs_stl mg-utils)
add_benchmark(expansion.cpp ${CMAKE_SOURCE_DIR}/src/glue/communication.cpp)
target_link_libraries(${test_prefix}expansion mg-query-with-kvstore-dummy mg-communication)
target_link_libraries(${test_prefix}expansion mg-query mg-communication)
add_benchmark(storage_v2_gc.cpp)
target_link_libraries(${test_prefix}storage_v2_gc mg-storage-v2)

10
tests/manual/CMakeLists.txt
View File

@ -41,22 +41,22 @@ add_manual_test(kvstore_console.cpp)
target_link_libraries(${test_prefix}kvstore_console kvstore_lib gflags glog)
add_manual_test(query_hash.cpp)
target_link_libraries(${test_prefix}query_hash mg-query-with-kvstore-dummy)
target_link_libraries(${test_prefix}query_hash mg-query)
add_manual_test(query_planner.cpp interactive_planning.cpp)
target_link_libraries(${test_prefix}query_planner mg-query-with-kvstore-dummy)
target_link_libraries(${test_prefix}query_planner mg-query)
if (READLINE_FOUND)
target_link_libraries(${test_prefix}query_planner readline)
endif()
add_manual_test(expression_pretty_printer.cpp)
target_link_libraries(${test_prefix}expression_pretty_printer mg-query-with-kvstore-dummy)
target_link_libraries(${test_prefix}expression_pretty_printer mg-query)
add_manual_test(single_query.cpp ${CMAKE_SOURCE_DIR}/src/glue/communication.cpp)
target_link_libraries(${test_prefix}single_query mg-query-with-kvstore-dummy mg-communication)
target_link_libraries(${test_prefix}single_query mg-query mg-communication)
add_manual_test(stripped_timing.cpp)
target_link_libraries(${test_prefix}stripped_timing mg-query-with-kvstore-dummy)
target_link_libraries(${test_prefix}stripped_timing mg-query)
add_manual_test(ssl_client.cpp)
target_link_libraries(${test_prefix}ssl_client mg-communication)

50
tests/unit/CMakeLists.txt
View File

@ -19,7 +19,7 @@ function(add_unit_test test_cpp)
endfunction(add_unit_test)
add_unit_test(bolt_encoder.cpp ${CMAKE_SOURCE_DIR}/src/glue/communication.cpp)
target_link_libraries(${test_prefix}bolt_encoder mg-communication mg-query-with-kvstore-dummy)
target_link_libraries(${test_prefix}bolt_encoder mg-communication mg-query)
add_unit_test(commit_log_v2.cpp)
target_link_libraries(${test_prefix}commit_log_v2 glog gflags)
@ -36,79 +36,79 @@ target_link_libraries(${test_prefix}kvstore kvstore_lib glog)
# Test mg-query
add_unit_test(cypher_main_visitor.cpp)
target_link_libraries(${test_prefix}cypher_main_visitor mg-query-with-kvstore-dummy)
target_link_libraries(${test_prefix}cypher_main_visitor mg-query)
add_unit_test(bfs_single_node.cpp)
target_link_libraries(${test_prefix}bfs_single_node mg-query-with-kvstore-dummy)
target_link_libraries(${test_prefix}bfs_single_node mg-query)
add_unit_test(interpreter.cpp ${CMAKE_SOURCE_DIR}/src/glue/communication.cpp)
target_link_libraries(${test_prefix}interpreter mg-communication mg-query-with-kvstore-dummy)
target_link_libraries(${test_prefix}interpreter mg-communication mg-query)
add_unit_test(query_cost_estimator.cpp)
target_link_libraries(${test_prefix}query_cost_estimator mg-query-with-kvstore-dummy)
target_link_libraries(${test_prefix}query_cost_estimator mg-query)
add_unit_test(query_expression_evaluator.cpp)
target_link_libraries(${test_prefix}query_expression_evaluator mg-query-with-kvstore-dummy)
target_link_libraries(${test_prefix}query_expression_evaluator mg-query)
add_unit_test(plan_pretty_print.cpp)
target_link_libraries(${test_prefix}plan_pretty_print mg-query-with-kvstore-dummy)
target_link_libraries(${test_prefix}plan_pretty_print mg-query)
add_unit_test(query_dump.cpp ${CMAKE_SOURCE_DIR}/src/glue/communication.cpp)
target_link_libraries(${test_prefix}query_dump mg-communication mg-query-with-kvstore-dummy)
target_link_libraries(${test_prefix}query_dump mg-communication mg-query)
add_unit_test(query_pretty_print.cpp)
target_link_libraries(${test_prefix}query_pretty_print mg-query-with-kvstore-dummy)
target_link_libraries(${test_prefix}query_pretty_print mg-query)
add_unit_test(query_profile.cpp)
target_link_libraries(${test_prefix}query_profile mg-query-with-kvstore-dummy)
target_link_libraries(${test_prefix}query_profile mg-query)
add_unit_test(query_plan_accumulate_aggregate.cpp)
target_link_libraries(${test_prefix}query_plan_accumulate_aggregate mg-query-with-kvstore-dummy)
target_link_libraries(${test_prefix}query_plan_accumulate_aggregate mg-query)
add_unit_test(query_plan_bag_semantics.cpp)
target_link_libraries(${test_prefix}query_plan_bag_semantics mg-query-with-kvstore-dummy)
target_link_libraries(${test_prefix}query_plan_bag_semantics mg-query)
add_unit_test(query_plan_create_set_remove_delete.cpp)
target_link_libraries(${test_prefix}query_plan_create_set_remove_delete mg-query-with-kvstore-dummy)
target_link_libraries(${test_prefix}query_plan_create_set_remove_delete mg-query)
# Storage V2 in query execution
add_unit_test(query_plan_v2_create_set_remove_delete.cpp)
target_link_libraries(${test_prefix}query_plan_v2_create_set_remove_delete mg-query-with-kvstore-dummy)
target_link_libraries(${test_prefix}query_plan_v2_create_set_remove_delete mg-query)
# END Storage V2 in query execution
add_unit_test(query_plan_edge_cases.cpp ${CMAKE_SOURCE_DIR}/src/glue/communication.cpp)
target_link_libraries(${test_prefix}query_plan_edge_cases mg-communication mg-query-with-kvstore-dummy)
target_link_libraries(${test_prefix}query_plan_edge_cases mg-communication mg-query)
add_unit_test(query_plan_match_filter_return.cpp)
target_link_libraries(${test_prefix}query_plan_match_filter_return mg-query-with-kvstore-dummy)
target_link_libraries(${test_prefix}query_plan_match_filter_return mg-query)
add_unit_test(query_plan.cpp)
target_link_libraries(${test_prefix}query_plan mg-query-with-kvstore-dummy)
target_link_libraries(${test_prefix}query_plan mg-query)
# Test query/procedure
add_unit_test(query_procedure_mgp_type.cpp)
target_link_libraries(${test_prefix}query_procedure_mgp_type mg-query-with-kvstore-dummy)
target_link_libraries(${test_prefix}query_procedure_mgp_type mg-query)
target_include_directories(${test_prefix}query_procedure_mgp_type PRIVATE ${CMAKE_SOURCE_DIR}/include)
add_unit_test(query_procedure_mgp_module.cpp)
target_link_libraries(${test_prefix}query_procedure_mgp_module mg-query-with-kvstore-dummy)
target_link_libraries(${test_prefix}query_procedure_mgp_module mg-query)
target_include_directories(${test_prefix}query_procedure_mgp_module PRIVATE ${CMAKE_SOURCE_DIR}/include)
# END query/procedure
add_unit_test(query_required_privileges.cpp)
target_link_libraries(${test_prefix}query_required_privileges mg-query-with-kvstore-dummy)
target_link_libraries(${test_prefix}query_required_privileges mg-query)
add_unit_test(query_semantic.cpp)
target_link_libraries(${test_prefix}query_semantic mg-query-with-kvstore-dummy)
target_link_libraries(${test_prefix}query_semantic mg-query)
add_unit_test(query_variable_start_planner.cpp)
target_link_libraries(${test_prefix}query_variable_start_planner mg-query-with-kvstore-dummy)
target_link_libraries(${test_prefix}query_variable_start_planner mg-query)
add_unit_test(stripped.cpp)
target_link_libraries(${test_prefix}stripped mg-query-with-kvstore-dummy)
target_link_libraries(${test_prefix}stripped mg-query)
add_unit_test(typed_value.cpp)
target_link_libraries(${test_prefix}typed_value mg-query-with-kvstore-dummy)
target_link_libraries(${test_prefix}typed_value mg-query)
# END mg-query
@ -223,7 +223,7 @@ target_link_libraries(${test_prefix}utils_watchdog mg-utils)
# Test mg-auth
add_unit_test(auth.cpp)
target_link_libraries(${test_prefix}auth mg-auth kvstore_lib)
target_link_libraries(${test_prefix}auth mg-auth)
# Test storage v2