hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make query classifier self-contained.

Browse Source 
Only the query classifier needs the functionality of the embedded
server, while the rest of MaxScale is content with the client
library or Connector/C.

This have now been rearranged so that query-classifier links with
the embedded static library and then explicitly exports its own
functions using the query_classifier.map linker script. That way
query classifier will use the embedded library, while the rest of
maxscale use the client library, and this without conflicts.

Currently, query_classifier is not linked to maxscale-common,
but executables must link to maxscale-common and query_classifier.
This commit is contained in:
Johan Wikman
2016-01-15 16:26:56 +02:00
parent 0b742977dd
commit 42b1722e49
11 changed files with 126 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
server/core/test/CMakeLists.txt
View File

@ -15,22 +15,22 @@ add_executable(test_users testusers.c)
add_executable(testfeedback testfeedback.c)
add_executable(testmaxscalepcre2 testmaxscalepcre2.c)
add_executable(testmemlog testmemlog.c)
target_link_libraries(test_adminusers maxscale-common)
target_link_libraries(test_buffer maxscale-common)
target_link_libraries(test_dcb maxscale-common)
target_link_libraries(test_filter maxscale-common)
target_link_libraries(test_hash maxscale-common )
target_link_libraries(test_hint maxscale-common )
target_link_libraries(test_modutil maxscale-common)
target_link_libraries(test_mysql_users MySQLClient maxscale-common)
target_link_libraries(test_poll maxscale-common)
target_link_libraries(test_server maxscale-common)
target_link_libraries(test_service maxscale-common)
target_link_libraries(test_spinlock maxscale-common )
target_link_libraries(test_users maxscale-common)
target_link_libraries(testfeedback maxscale-common)
target_link_libraries(testmaxscalepcre2 maxscale-common )
target_link_libraries(testmemlog maxscale-common )
target_link_libraries(test_adminusers maxscale-common query_classifier)
target_link_libraries(test_buffer maxscale-common query_classifier)
target_link_libraries(test_dcb maxscale-common query_classifier)
target_link_libraries(test_filter maxscale-common query_classifier)
target_link_libraries(test_hash maxscale-common query_classifier)
target_link_libraries(test_hint maxscale-common query_classifier)
target_link_libraries(test_modutil maxscale-common query_classifier)
target_link_libraries(test_mysql_users MySQLClient maxscale-common query_classifier)
target_link_libraries(test_poll maxscale-common query_classifier)
target_link_libraries(test_server maxscale-common query_classifier)
target_link_libraries(test_service maxscale-common query_classifier)
target_link_libraries(test_spinlock maxscale-common query_classifier)
target_link_libraries(test_users maxscale-common query_classifier)
target_link_libraries(testfeedback maxscale-common query_classifier)
target_link_libraries(testmaxscalepcre2 maxscale-common query_classifier)
target_link_libraries(testmemlog maxscale-common query_classifier)
add_test(Internal-TestAdminUsers test_adminusers)
add_test(Internal-TestBuffer test_buffer)
add_test(Internal-TestDCB test_dcb)