Make rocksdb dynamic plugin

Author: cvicentiu

storage/rocksdb/CMakeLists.txt

@@ -113,7 +113,7 @@ ENDIF()
 
 SET(rocksdb_static_libs ROCKSDB_AUX_LIB ${rocksdb_static_libs} ${ZLIB_LIBRARY} "-lrt")
 
-MYSQL_ADD_PLUGIN(rocksdb_se ${ROCKSDB_SOURCES} STORAGE_ENGINE DEFAULT STATIC_ONLY
+MYSQL_ADD_PLUGIN(rocksdb_se ${ROCKSDB_SOURCES} STORAGE_ENGINE DEFAULT MODULE_ONLY
   LINK_LIBRARIES ${rocksdb_static_libs}
 )
 

storage/rocksdb/mysql-test/rocksdb/include/have_rocksdb.inc

@@ -0,0 +1,10 @@
+if (`SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.ENGINES WHERE engine = 'rocksdb' AND support IN ('YES', 'DEFAULT', 'ENABLED')`)
+{
+  --skip Test requires engine RocksDB.
+}
+
+--disable_query_log
+# Table statistics can vary depending on when the memtables are flushed, so
+# flush them at the beginning of the test to ensure the test runs consistently.
+set global rocksdb_force_flush_memtable_now = true;
+--enable_query_log

mysql-test/include/have_rocksdb.opt renamed to storage/rocksdb/mysql-test/rocksdb/include/have_rocksdb.opt

@@ -0,0 +1,10 @@
+if (`SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.ENGINES WHERE engine = 'rocksdb'` AND support in ('DEFAULT')`)
+{
+  --skip Test requires engine RocksDB as default.
+}
+
+--disable_query_log
+# Table statistics can vary depending on when the memtables are flushed, so
+# flush them at the beginning of the test to ensure the test runs consistently.
+set global rocksdb_force_flush_memtable_now = true;
+--enable_query_log

storage/rocksdb/mysql-test/rocksdb/include/have_rocksdb_default.inc

@@ -1,8 +1,3 @@
-if (`SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.ENGINES WHERE engine = 'rocksdb' AND support IN ('DEFAULT')`)
-{
-  --skip Test requires default engine RocksDB
-}
-
 # MARIAROCKS_NOT_YET: replication doesn't work yet:
 #if (`select count(*) = 0 from information_schema.tables where engine='rocksdb' and table_name='slave_gtid_info'`)
 #{
@@ -14,4 +9,3 @@ if (`SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.ENGINES WHERE engine = 'rocksdb
 # flush them at the beginning of the test to ensure the test runs consistently.
 set global rocksdb_force_flush_memtable_now = true;
 --enable_query_log
-

mysql-test/include/have_rocksdb.inc renamed to storage/rocksdb/mysql-test/rocksdb/include/have_rocksdb_replication.inc

@@ -1,12 +1,11 @@
 !include include/default_my.cnf
 
 [server]
-rocksdb
 skip-innodb
 default-storage-engine=rocksdb
 
 
 sql-mode=NO_ENGINE_SUBSTITUTION
 explicit-defaults-for-timestamp=1
-rocksdb_lock_wait_timeout=1
-rocksdb_strict_collation_check=0
+#rocksdb_lock_wait_timeout=1
+#rocksdb_strict_collation_check=0

storage/rocksdb/mysql-test/rocksdb/my.cnf

@@ -1,2 +1,2 @@
---ignore-db-dirs=.rocksdb
+--ignore-db-dirs=.rocksdb --plugin-load=ha_rocksdb_se