From 7f0c281518e105a680da35cbe6f3908cf0894139 Mon Sep 17 00:00:00 2001 From: Sergey Zefirov <72864488+mariadb-SergeyZefirov@users.noreply.github.com> Date: Thu, 11 Jul 2024 21:05:36 +0300 Subject: [PATCH] fix(client): MCOL-5587: enable quick mode for predictable performance (#3240) (#3243) This changeset enables quick (mariadb -q) mode when columnstore is installed. Quick mode precludes client CLI program from storing too much data in memory, preventing out of memory conditions. --- dbcon/mysql/columnstore.cnf | 3 +++ .../columnstore/bugfixes/MCOL-5587-quick-is-default.result | 1 + .../columnstore/bugfixes/MCOL-5587-quick-is-default.test | 4 ++++ oam/install_scripts/CMakeLists.txt | 2 +- 4 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 mysql-test/columnstore/bugfixes/MCOL-5587-quick-is-default.result create mode 100644 mysql-test/columnstore/bugfixes/MCOL-5587-quick-is-default.test diff --git a/dbcon/mysql/columnstore.cnf b/dbcon/mysql/columnstore.cnf index 5bfde0bfd..60a7a21d9 100644 --- a/dbcon/mysql/columnstore.cnf +++ b/dbcon/mysql/columnstore.cnf @@ -1,3 +1,6 @@ +[client] +quick + [mysqld] plugin-load-add=ha_columnstore.so diff --git a/mysql-test/columnstore/bugfixes/MCOL-5587-quick-is-default.result b/mysql-test/columnstore/bugfixes/MCOL-5587-quick-is-default.result new file mode 100644 index 000000000..c384d9650 --- /dev/null +++ b/mysql-test/columnstore/bugfixes/MCOL-5587-quick-is-default.result @@ -0,0 +1 @@ +"Check that quick mode is enabled" diff --git a/mysql-test/columnstore/bugfixes/MCOL-5587-quick-is-default.test b/mysql-test/columnstore/bugfixes/MCOL-5587-quick-is-default.test new file mode 100644 index 000000000..1d4ba8ca5 --- /dev/null +++ b/mysql-test/columnstore/bugfixes/MCOL-5587-quick-is-default.test @@ -0,0 +1,4 @@ +--echo "Check that quick mode is enabled" +# the following line will fail the test if quick mode +# is not enabled in (some) configuration file as default. +system mariadb --help | grep -q -E "^quick +TRUE\$"; diff --git a/oam/install_scripts/CMakeLists.txt b/oam/install_scripts/CMakeLists.txt index 0a5dcd7dc..b0189d3dd 100644 --- a/oam/install_scripts/CMakeLists.txt +++ b/oam/install_scripts/CMakeLists.txt @@ -127,4 +127,4 @@ install(FILES mariadb-columnstore.service install(FILES module DESTINATION ${ENGINE_DATADIR}/local COMPONENT columnstore-engine) find_package (Python3 COMPONENTS Interpreter REQUIRED) -add_test(NAME PythonUnitTests COMMAND ${Python3_EXECUTABLE} -m unittest test_mcs-savebrm.py) \ No newline at end of file +add_test(NAME PythonUnitTests COMMAND ${Python3_EXECUTABLE} -m unittest test_mcs-savebrm.py)