fixup! NEO: simplify dev SR with experimental RocksDB support

Signed-off-by: Julien Muchembled <jm@nexedi.com>

component/mariadb/buildout.cfg

@@ -20,33 +20,13 @@ extends =
 parts =
   mariadb
 
-[mariadb-connector-c]
-# Broken, and it's unlikely that the 2.x branch will ever be stable enough.
-# See also message of commit ebb649e23cd0497e80387bc6c1a28f9902c5bdc1
-recipe = slapos.recipe.cmmi
-version = 2.3.2
-url = https://downloads.mariadb.com/Connectors/c/connector-c-${:version}/mariadb-connector-c-${:version}-src.tar.gz
-md5sum = cbee903e8581ca73b0aecfe9b7498c65
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-configure-command = ${cmake:location}/bin/cmake
-configure-options =
-  -DCMAKE_INSTALL_PREFIX=${:location}
-  -DOPENSSL_INCLUDE_DIR=${openssl:location}/include
-  -DOPENSSL_CRYPTO_LIBRARY=${openssl:location}/lib/libcrypto.so
-  -DOPENSSL_SSL_LIBRARY=${openssl:location}/lib/libssl.so
-  -DWITH_EXTERNAL_ZLIB=1
-  -DCMAKE_C_FLAGS=-I${zlib:location}/include
-  -DCMAKE_INSTALL_RPATH=${openssl:location}/lib:${zlib:location}/lib
-environment =
-  CMAKE_PROGRAM_PATH=${cmake:location}/bin
-post-install =
-  ln -sf mariadb_config ${:location}/bin/mysql_config
-
 [mariadb]
-<= mariadb-10.1
-
-[mariadb-common]
 recipe = slapos.recipe.cmmi
+url = http://ftp.osuosl.org/pub/mariadb/mariadb-10.1.22/source/mariadb-10.1.22.tar.gz
+md5sum = 8d11f4e20d3ef0bb1befe173de9213c8
+patch-options = -p0
+patches =
+  ${:_profile_base_location_}/mariadb_10.1.21_create_system_tables__no_test.patch#3c76aa9564a162f13aced7c0a3f783b3
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 configure-command = ${cmake:location}/bin/cmake
 configure-options =
@@ -85,14 +65,6 @@ post-install =
   mkdir -p ${:location}/include/wsrep &&
   cp -p wsrep/wsrep_api.h ${:location}/include/wsrep
 
-[mariadb-10.1]
-<= mariadb-common
-url = http://ftp.osuosl.org/pub/mariadb/mariadb-10.1.22/source/mariadb-10.1.22.tar.gz
-md5sum = 8d11f4e20d3ef0bb1befe173de9213c8
-patch-options = -p0
-patches =
-  ${:_profile_base_location_}/mariadb_10.1.21_create_system_tables__no_test.patch#3c76aa9564a162f13aced7c0a3f783b3
-
 [mroonga-mariadb]
 # mroonga - a storage engine for MySQL. It provides fast fulltext search feature to all MySQL users.
 # http://mroonga.github.com/

component/mariadb/mariarocks.cfg

-[buildout]
-extends =
-  ../bison/buildout.cfg
-  buildout.cfg
-
 [mariarocks-source]
 recipe = slapos.recipe.build:gitclone
 git-executable = ${git:location}/bin/git
@@ -10,14 +5,20 @@ repository = https://github.com/MariaDB/server.git
 branch = bb-10.2-mariarocks
 
 [mariadb]
-<= mariadb-10.2-mariarocks
-
-[mariadb-10.2-mariarocks]
-<= mariadb-common
+url =
 path = ${mariarocks-source:location}
+patches =
 pre-configure =
+  ${:clean}
   ${git:location}/bin/git submodule update --init
+  sed -i -e '/(rc == -1 || errno == EINTR)/s/||/\&\&/' libmariadb/plugins/pvio/pvio_socket.c
 post-install +=
-  make clean
+  ${:clean}
+clean =
+  ${git:location}/bin/git clean -Xdf
+  ${git:location}/bin/git submodule foreach ${git:location}/bin/git clean -Xdf
+  ${git:location}/bin/git -C libmariadb checkout plugins/pvio/pvio_socket.c
 configure-options +=
+  -DPLUGIN_DAEMON_EXAMPLE=NO
+  -DPLUGIN_EXAMPLE=NO
   -DCMAKE_PROGRAM_PATH=${bison:location}/bin

software/neoppod/my.cnf.in

@@ -15,8 +15,7 @@ init_file = {{ parameter_dict['init-file'] }}
 log_warnings = 1
 disable-log-bin
 
-### Enables TokuDB
-plugin-load = ha_tokudb
+plugin-load = ha_rocksdb;ha_tokudb
 
 ## The following settings come from ERP5 configuration.
 

software/neoppod/software-common.cfg

@@ -104,7 +104,7 @@ md5sum = c1cdb4289ff458545de15aca65121b80
 [template-neo-my-cnf]
 <= download-base-neo
 url = ${:_profile_base_location_}/my.cnf.in
-md5sum = cfdd59d42ae540563a964ccaf8fec232
+md5sum = b048a7a8804ae0c9174eb4a22242deba
 
 [versions]
 BTrees = 4.4.1

software/neoppod/software-myrocks-dev.cfg

 [buildout]
 extends =
-    ../../component/mariadb/mariarocks.cfg
+    ../../component/bison/buildout.cfg
     software.cfg
+    ../../component/mariadb/mariarocks.cfg