database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-10 01:22:48 +03:00
Code Activity

Merge pull request #841 from pleblanc1976/random-mods

Browse Source 
A couple random SM things
This commit is contained in:
Patrick LeBlanc
2019-09-03 11:06:03 -05:00
committed by GitHub
parent 4d2a1594aa 9e1282e437
commit ee1537406d
4 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
oam/etc/Columnstore.xml
View File

@@ -549,6 +549,7 @@
</QueryTele> </QueryTele>
<StorageManager> <StorageManager>
<MaxSockets>30</MaxSockets> <MaxSockets>30</MaxSockets>
<Enabled>N</Enabled>
</StorageManager> </StorageManager>
</Columnstore> </Columnstore>

1
oam/etc/Columnstore.xml.singleserver
View File

@@ -540,5 +540,6 @@
</QueryTele> </QueryTele>
<StorageManager> <StorageManager>
<MaxSockets>30</MaxSockets> <MaxSockets>30</MaxSockets>
<Enabled>N</Enabled>
</StorageManager> </StorageManager>
</Columnstore> </Columnstore>

30
storage-manager/CMakeLists.txt
View File

@@ -82,21 +82,31 @@ add_executable(StorageManager src/main.cpp)
target_link_libraries(StorageManager storagemanager) target_link_libraries(StorageManager storagemanager)
set_property(TARGET StorageManager PROPERTY CXX_STANDARD 11) set_property(TARGET StorageManager PROPERTY CXX_STANDARD 11)
add_custom_command( set(TMPDIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
TARGET StorageManager PRE_BUILD set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
COMMAND ${CMAKE_COMMAND} -E make_directory
${CMAKE_CURRENT_BINARY_DIR}/storage-manager/test_data)
add_custom_command(
TARGET StorageManager POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_directory
${CMAKE_SOURCE_DIR}/storage-manager/test_data
${CMAKE_CURRENT_BINARY_DIR}/storage-manager/test_data)
add_executable(unit_tests src/unit_tests.cpp) add_executable(unit_tests src/unit_tests.cpp)
target_compile_definitions(unit_tests PUBLIC BOOST_NO_CXX11_SCOPED_ENUMS) target_compile_definitions(unit_tests PUBLIC BOOST_NO_CXX11_SCOPED_ENUMS)
add_dependencies(unit_tests test_files)
target_link_libraries(unit_tests storagemanager) target_link_libraries(unit_tests storagemanager)
set_property(TARGET unit_tests PROPERTY CXX_STANDARD 11) set_property(TARGET unit_tests PROPERTY CXX_STANDARD 11)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${TMPDIR})
add_custom_command(
TARGET unit_tests PRE_BUILD
COMMAND ${CMAKE_COMMAND} -E make_directory
${CMAKE_CURRENT_BINARY_DIR}/test_data
)
add_custom_command(
TARGET unit_tests POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_directory
${CMAKE_CURRENT_SOURCE_DIR}/test_data
${CMAKE_CURRENT_BINARY_DIR}/test_data
# COMMAND ${CMAKE_COMMAND} -E copy
# ../bin/unit_tests # what is putting our bins in ../bin?
# ${CMAKE_CURRENT_BINARY_DIR}
)
# The includes and lib linkages required to link against cloudio ... # The includes and lib linkages required to link against cloudio ...
# pretty crazy. When lib dependencies are eventually config'd right, # pretty crazy. When lib dependencies are eventually config'd right,
# change this to only include and link against cloudio. # change this to only include and link against cloudio.

2
storage-manager/src/ReadTask.cpp
View File

@@ -65,6 +65,8 @@ bool ReadTask::run()
// read from IOC, write to the socket // read from IOC, write to the socket
vector<uint8_t> outbuf; vector<uint8_t> outbuf;
if (cmd->count > (100 << 20))
cmd->count = (100 << 20); // cap a read request at 100MB
outbuf.resize(max(cmd->count, 4) + sizeof(sm_response)); outbuf.resize(max(cmd->count, 4) + sizeof(sm_response));
sm_response *resp = (sm_response *) &outbuf[0]; sm_response *resp = (sm_response *) &outbuf[0];