mariadb: drop build server with tokudb storage
This commit is contained in:
parent
4faa65a09c
commit
d688f790dd
@ -256,6 +256,13 @@
|
|||||||
which is the new stable release. OpenAFS 1.6 was removed.
|
which is the new stable release. OpenAFS 1.6 was removed.
|
||||||
</para>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
|
<listitem>
|
||||||
|
<para>
|
||||||
|
The TokuDB storage engine dropped in <package>mariadb</package> 10.5 and removed in <package>mariadb</package> 10.6.
|
||||||
|
It is recommended to switch to RocksDB. See also <link xlink:href="https://mariadb.com/kb/en/tokudb/">TokuDB</link> and
|
||||||
|
<link xlink:href="https://jira.mariadb.org/browse/MDEV-19780">MDEV-19780: Remove the TokuDB storage engine</link>.
|
||||||
|
</para>
|
||||||
|
</listitem>
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>
|
<para>
|
||||||
The <literal>openldap</literal> module now has support for OLC-style
|
The <literal>openldap</literal> module now has support for OLC-style
|
||||||
|
@ -98,7 +98,7 @@ import ./../make-test-python.nix ({ pkgs, ...} : {
|
|||||||
}];
|
}];
|
||||||
services.mysql.settings = {
|
services.mysql.settings = {
|
||||||
mysqld = {
|
mysqld = {
|
||||||
plugin-load-add = [ "ha_tokudb.so" "ha_rocksdb.so" ];
|
plugin-load-add = [ "ha_rocksdb.so" ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
services.mysql.package = pkgs.mariadb;
|
services.mysql.package = pkgs.mariadb;
|
||||||
@ -185,19 +185,5 @@ import ./../make-test-python.nix ({ pkgs, ...} : {
|
|||||||
mariadb.succeed(
|
mariadb.succeed(
|
||||||
"echo 'use testdb; drop table rocksdb;' | sudo -u testuser mysql -u testuser"
|
"echo 'use testdb; drop table rocksdb;' | sudo -u testuser mysql -u testuser"
|
||||||
)
|
)
|
||||||
'' + pkgs.lib.optionalString pkgs.stdenv.isx86_64 ''
|
|
||||||
# Check if TokuDB plugin works
|
|
||||||
mariadb.succeed(
|
|
||||||
"echo 'use testdb; create table tokudb (test_id INT, PRIMARY KEY (test_id)) ENGINE = TokuDB;' | sudo -u testuser mysql -u testuser"
|
|
||||||
)
|
|
||||||
mariadb.succeed(
|
|
||||||
"echo 'use testdb; insert into tokudb values (25);' | sudo -u testuser mysql -u testuser"
|
|
||||||
)
|
|
||||||
mariadb.succeed(
|
|
||||||
"echo 'use testdb; select test_id from tokudb;' | sudo -u testuser mysql -u testuser -N | grep 25"
|
|
||||||
)
|
|
||||||
mariadb.succeed(
|
|
||||||
"echo 'use testdb; drop table tokudb;' | sudo -u testuser mysql -u testuser"
|
|
||||||
)
|
|
||||||
'';
|
'';
|
||||||
})
|
})
|
||||||
|
@ -1,12 +1,11 @@
|
|||||||
{ stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, makeWrapper, ncurses, nixosTests
|
{ stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, makeWrapper, ncurses, nixosTests
|
||||||
, libiconv, openssl, pcre, boost, judy, bison, libxml2, libkrb5, linux-pam, curl
|
, libiconv, openssl, pcre, boost, judy, bison, libxml2, libkrb5, linux-pam, curl
|
||||||
, libaio, libevent, jemalloc450, jemalloc, cracklib, systemd, perl
|
, libaio, libevent, jemalloc, cracklib, systemd, perl
|
||||||
, bzip2, lz4, lzo, snappy, xz, zlib, zstd
|
, bzip2, lz4, lzo, snappy, xz, zlib, zstd
|
||||||
, fixDarwinDylibNames, cctools, CoreServices, less
|
, fixDarwinDylibNames, cctools, CoreServices, less
|
||||||
, numactl # NUMA Support
|
, numactl # NUMA Support
|
||||||
, withStorageMroonga ? true, kytea, msgpack, zeromq
|
, withStorageMroonga ? true, kytea, msgpack, zeromq
|
||||||
, withStorageRocks ? true
|
, withStorageRocks ? true
|
||||||
, withStorageToku ? true
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
with stdenv.lib;
|
with stdenv.lib;
|
||||||
@ -41,8 +40,7 @@ common = rec { # attributes common to both builds
|
|||||||
ncurses openssl zlib pcre libiconv curl
|
ncurses openssl zlib pcre libiconv curl
|
||||||
] ++ optionals stdenv.hostPlatform.isLinux [ libaio systemd libkrb5 ]
|
] ++ optionals stdenv.hostPlatform.isLinux [ libaio systemd libkrb5 ]
|
||||||
++ optionals stdenv.hostPlatform.isDarwin [ perl cctools CoreServices ]
|
++ optionals stdenv.hostPlatform.isDarwin [ perl cctools CoreServices ]
|
||||||
++ optional (!stdenv.hostPlatform.isDarwin && withStorageToku) [ jemalloc450 ]
|
++ optional (!stdenv.hostPlatform.isDarwin) [ jemalloc ];
|
||||||
++ optional (!stdenv.hostPlatform.isDarwin && !withStorageToku) [ jemalloc ];
|
|
||||||
|
|
||||||
prePatch = ''
|
prePatch = ''
|
||||||
sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt
|
sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt
|
||||||
@ -174,6 +172,7 @@ server = stdenv.mkDerivation (common // {
|
|||||||
"-DWITH_INNODB_DISALLOW_WRITES=ON"
|
"-DWITH_INNODB_DISALLOW_WRITES=ON"
|
||||||
"-DWITHOUT_EXAMPLE=1"
|
"-DWITHOUT_EXAMPLE=1"
|
||||||
"-DWITHOUT_FEDERATED=1"
|
"-DWITHOUT_FEDERATED=1"
|
||||||
|
"-DWITHOUT_TOKUDB=1"
|
||||||
] ++ optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32) [
|
] ++ optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32) [
|
||||||
"-DWITH_NUMA=ON"
|
"-DWITH_NUMA=ON"
|
||||||
] ++ optional (!withStorageMroonga) [
|
] ++ optional (!withStorageMroonga) [
|
||||||
@ -182,9 +181,7 @@ server = stdenv.mkDerivation (common // {
|
|||||||
"-DWITHOUT_ROCKSDB=1"
|
"-DWITHOUT_ROCKSDB=1"
|
||||||
] ++ optional (!stdenv.hostPlatform.isDarwin && withStorageRocks) [
|
] ++ optional (!stdenv.hostPlatform.isDarwin && withStorageRocks) [
|
||||||
"-DWITH_ROCKSDB_JEMALLOC=ON"
|
"-DWITH_ROCKSDB_JEMALLOC=ON"
|
||||||
] ++ optional (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isMusl || !withStorageToku) [
|
] ++ optional (!stdenv.hostPlatform.isDarwin) [
|
||||||
"-DWITHOUT_TOKUDB=1"
|
|
||||||
] ++ optional (!stdenv.hostPlatform.isDarwin && withStorageToku) [
|
|
||||||
"-DWITH_JEMALLOC=static"
|
"-DWITH_JEMALLOC=static"
|
||||||
] ++ optional stdenv.hostPlatform.isDarwin [
|
] ++ optional stdenv.hostPlatform.isDarwin [
|
||||||
"-DPLUGIN_AUTH_PAM=OFF"
|
"-DPLUGIN_AUTH_PAM=OFF"
|
||||||
|
@ -17785,9 +17785,6 @@ in
|
|||||||
};
|
};
|
||||||
|
|
||||||
mariadb = callPackage ../servers/sql/mariadb {
|
mariadb = callPackage ../servers/sql/mariadb {
|
||||||
# As per mariadb's cmake, "static jemalloc_pic.a can only be used up to jemalloc 4".
|
|
||||||
# https://jira.mariadb.org/browse/MDEV-15034
|
|
||||||
jemalloc450 = jemalloc450.override ({ disableInitExecTls = true; });
|
|
||||||
inherit (darwin) cctools;
|
inherit (darwin) cctools;
|
||||||
inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;
|
inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;
|
||||||
};
|
};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user