Revert "MDEV-30610 Update RocksDB to v8.1.1"

Not ready yet, it fails its own test suite

This reverts commit 485c9b1

.gitignore

@@ -243,12 +243,8 @@ storage/rocksdb/ldb
 storage/rocksdb/myrocks_hotbackup
 storage/rocksdb/mysql_ldb
 storage/rocksdb/mysql_ldb.1
-storage/rocksdb/mariadb-ldb
 storage/rocksdb/rdb_source_revision.h
 storage/rocksdb/sst_dump
-storage/rocksdb/mysql_sst_dump
-storage/rocksdb/mysql_sst_dump.1
-storage/rocksdb/mariadb-sst-dump
 strings/conf_to_src
 support-files/MySQL-shared-compat.spec
 support-files/binary-configure
@@ -622,6 +618,7 @@ scripts/mariadb-secure-installation
 scripts/mariadb-setpermission
 sql/mariadbd
 sql/mariadb-tzinfo-to-sql
+storage/rocksdb/mariadb-ldb
 strings/ctype-uca1400data.h
 strings/uca-dump
 tests/mariadb-client-test

cmake/symlinks.cmake

@@ -33,7 +33,6 @@ REGISTER_SYMLINK("mariadb-secure-installation" "mysql_secure_installation")
 REGISTER_SYMLINK("mariadb-setpermission" "mysql_setpermission")
 REGISTER_SYMLINK("mariadb-show" "mysqlshow")
 REGISTER_SYMLINK("mariadb-slap" "mysqlslap")
-REGISTER_SYMLINK("mariadb-sst-dump" "mysql_sst_dump")
 REGISTER_SYMLINK("mariadb-test" "mysqltest")
 REGISTER_SYMLINK("mariadb-test-embedded" "mysqltest_embedded")
 REGISTER_SYMLINK("mariadb-tzinfo-to-sql" "mysql_tzinfo_to_sql")

debian/autobake-deb.sh

@@ -29,6 +29,10 @@ remove_rocksdb_tools()
 {
   sed '/rocksdb-tools/d' -i debian/control
   sed '/sst_dump/d' -i debian/not-installed
+  if ! grep -q sst_dump debian/mariadb-plugin-rocksdb.install
+  then
+    echo "usr/bin/sst_dump" >> debian/mariadb-plugin-rocksdb.install
+  fi
 }
 
 add_lsb_base_depends()

debian/mariadb-plugin-rocksdb.install

@@ -1,12 +1,8 @@
 etc/mysql/mariadb.conf.d/rocksdb.cnf
 usr/bin/mariadb-ldb
-usr/bin/mariadb-sst-dump
 usr/bin/myrocks_hotbackup
 usr/bin/mysql_ldb
-usr/bin/mysql_sst_dump
 usr/lib/mysql/plugin/ha_rocksdb.so
 usr/share/man/man1/mariadb-ldb.1
-usr/share/man/man1/mariadb-sst-dump.1
 usr/share/man/man1/myrocks_hotbackup.1
 usr/share/man/man1/mysql_ldb.1
-usr/share/man/man1/mysql_sst_dump.1

mysql-test/valgrind.supp

@@ -1504,33 +1504,6 @@
    fun:_ZN7myrocksL27rdb_init_rocksdb_db_optionsEv
 }
 
-{
-   Still reachable for once-per-process initializations
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   ...
-   fun:_ZN10my_rocksdb24CacheEntryStatsCollectorINS_13InternalStats19CacheEntryRoleStatsEE9GetSharedEPNS_5CacheEPNS_11SystemClockEPSt10shared_ptrIS3_E
-   ...
-}
-
-{
-   Still reachable for once-per-process initializations
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   ...
-   fun:_ZN10my_rocksdb12_GLOBAL__N_18Registry8RegisterEPFvRKNS_5SliceEPvENS_14CacheEntryRoleE
-   ...
-}
-
-{
-   Still reachable for once-per-process initializations
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   ...
-   fun:_ZN10my_rocksdb12_GLOBAL__N_111GetRegistryEv
-   ...
-}
-
 {
    Still reachable for thread local storage initialization (SetHandle)
    Memcheck:Leak

sql/field.cc

@@ -8596,7 +8596,7 @@ void Field_blob::store_length(uchar *i_ptr, uint i_packlength, uint32 i_number)
 }
 
 
-uint32 Field_blob::get_length(const uchar *pos, uint packlength_arg)
+uint32 Field_blob::get_length(const uchar *pos, uint packlength_arg) const
 {
   return (uint32)read_lowendian(pos, packlength_arg);
 }

sql/field.h

@@ -4549,7 +4549,7 @@ class Field_blob :public Field_longstr {
   }
   inline uint32 get_length(my_ptrdiff_t row_offset= 0) const
   { return get_length(ptr+row_offset, this->packlength); }
-  static uint32 get_length(const uchar *ptr, uint packlength);
+  uint32 get_length(const uchar *ptr, uint packlength) const;
   uint32 get_length(const uchar *ptr_arg) const
   { return get_length(ptr_arg, this->packlength); }
   inline uchar *get_ptr() const { return get_ptr(ptr); }

sql/share/errmsg-utf8.txt

@@ -11648,10 +11648,10 @@ ER_RDB_TTL_UNSUPPORTED
         sw "Uauniaji wa TTL umezimwa kwa sasa wakati jedwali lina PK iliyofichwa."
 
 ER_RDB_TTL_COL_FORMAT
-        chi "Myrocks中的TTL列(%s)必须是一个无符号的非空64位整数或非空时间戳，存在于表内，并具有伴随的TTL持续时间。"
-        eng "TTL column (%s) in MyRocks must be an unsigned non-null 64-bit integer or non-null timestamp, exist inside the table, and have an accompanying ttl duration."
-        spa "La columna TTL (%s) en MyRocks debe de ser un entero sin signo no-null de 64-bit o una marca de tiempo no-null, debe de existir dentro de la tabla y debe de tener una duración ttl acompañante."
-        sw "Safu wima ya TTL (%s) katika MyRocks lazima iwe nambari kamili ya biti 64 ambayo haijatiwa saini au muhuri wa muda usio batili, iwe ndani ya jedwali, na iwe na muda wa ttl unaoandamana."
+        chi "Myrocks中的TTL列(%s)必须是一个无符号的非空64位整数，存在于表内，并具有伴随的TTL持续时间。"
+        eng "TTL column (%s) in MyRocks must be an unsigned non-null 64-bit integer, exist inside the table, and have an accompanying ttl duration."
+        spa "La columna TTL (%s) en MyRocks debe de ser un entero sin signo no-null de 64-bit, debe de existir dentro de la tabla y debe de tener una duración ttl acompañante."
+        sw "Safu wima ya TTL (%s) katika MyRocks lazima iwe nambari kamili ya biti 64 ambayo haijatiwa saini, iwe ndani ya jedwali, na iwe na muda wa ttl unaoandamana."
 
 ER_PER_INDEX_CF_DEPRECATED
         chi "已弃用每个索引列族选项"
@@ -11670,7 +11670,6 @@ ER_SK_POPULATE_DURING_ALTER
         eng "MyRocks failed populating secondary key during alter."
         spa "MyRocks falló al poblar clave secundaria duante el 'alter'."
         sw "MyRocks imeshindwa kujaza ufunguo wa sekondari wakati wa kubadilisha."
-
 # MyRocks messages end
 
 ER_SUM_FUNC_WITH_WINDOW_FUNC_AS_ARG
@@ -12271,9 +12270,3 @@ ER_JSON_INVALID_VALUE_FOR_KEYWORD
 ER_JSON_SCHEMA_KEYWORD_UNSUPPORTED
         eng "%s keyword is not supported"
         sw "%s neno kuu halitumiki"
-ER_CF_DROPPED
-        chi "列族 ('%s') 正在被删除。"
-        eng "Column family ('%s') is being dropped."
-ER_CANT_DROP_CF
-        chi "不能删除列族 ('%s')，因为它正在使用或不存在。"
-        eng "Cannot drop Column family ('%s') because it is in use or does not exist."

storage/rocksdb/CMakeLists.txt

@@ -4,6 +4,8 @@ SET(CPACK_RPM_rocksdb-engine_PACKAGE_SUMMARY "RocksDB storage engine for MariaDB
 SET(CPACK_RPM_rocksdb-engine_PACKAGE_DESCRIPTION "The RocksDB storage engine is a high performance storage engine, aimed
 at maximising storage efficiency while maintaining InnoDB-like performance." PARENT_SCOPE)
 
+MY_CHECK_AND_SET_COMPILER_FLAG(-Wno-range-loop-construct)
+
 MACRO(SKIP_ROCKSDB_PLUGIN msg)
   MESSAGE_ONCE(SKIP_ROCKSDB_PLUGIN "Can't build rocksdb engine - ${msg}")
   ADD_FEATURE_INFO(ROCKSDB "OFF" "Storage Engine")
@@ -56,39 +58,51 @@ IF(MSVC_ARM64)
  SKIP_ROCKSDB_PLUGIN("Windows ARM64 not supported")
 ENDIF()
 
-# This plugin needs recent C++ compilers (it is using C++17 features)
+#
+# Also, disable on ARM64 when not Linux
+# Requires submodule update to v6.16.3
+# containing commit https://github.com/facebook/rocksdb/commit/ee4bd4780b321ddb5f92a0f4eb956f2a2ebd60dc
+#
+IF(CMAKE_SYSTEM_PROCESSOR MATCHES "(arm64|aarch64)" AND NOT CMAKE_SYSTEM_NAME STREQUAL "Linux")
+  SKIP_ROCKSDB_PLUGIN("ARM64 disabled on all except Linux")
+ENDIF()
+
+# This plugin needs recent C++ compilers (it is using C++11 features)
 # Skip build for the old compilers
-SET(CXX17_FLAGS)
-SET(OLD_COMPILER_MSG "requires c++17 -capable compiler (minimal supported versions are g++ 7, clang 5, VS2017)")
+SET(CXX11_FLAGS)
+SET(OLD_COMPILER_MSG "requires c++11 -capable compiler (minimal supported versions are g++ 4.8, clang 3.3, VS2015)")
 
 IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
   EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
-  IF (GCC_VERSION VERSION_LESS 7)
+  IF (GCC_VERSION VERSION_LESS 4.8)
     SKIP_ROCKSDB_PLUGIN("${OLD_COMPILER_MSG}")
   ENDIF()
-  SET(CXX17_FLAGS "-std=c++17")
+  SET(CXX11_FLAGS "-std=c++11")
+  IF (GCC_VERSION VERSION_LESS 5.0)
+    SET(CXX11_FLAGS "-std=c++11 -Wno-missing-field-initializers")
+  ENDIF()
 ELSEIF (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  IF ((CMAKE_CXX_COMPILER_VERSION AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS  5) OR
-     (CLANG_VERSION_STRING AND CLANG_VERSION_STRING VERSION_LESS  5))
+  IF ((CMAKE_CXX_COMPILER_VERSION AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS  3.3) OR
+     (CLANG_VERSION_STRING AND CLANG_VERSION_STRING VERSION_LESS  3.3))
     SKIP_ROCKSDB_PLUGIN("${OLD_COMPILER_MSG}")
   ENDIF()
-  SET(CXX17_FLAGS "-std=c++17 -stdlib=libstdc++")
+  SET(CXX11_FLAGS "-std=c++11 -stdlib=libstdc++")
   IF(MSVC)
     # clang-cl does not work yet
     SKIP_ROCKSDB_PLUGIN("Clang-cl is not supported")
   ENDIF()
 ELSEIF(MSVC)
-  IF (MSVC_VERSION LESS 1914)
+  IF (MSVC_VERSION LESS 1900)
     SKIP_ROCKSDB_PLUGIN("${OLD_COMPILER_MSG}")
   ENDIF()
 ELSE()
   SKIP_ROCKSDB_PLUGIN("Compiler not supported")
 ENDIF()
 
 IF(CMAKE_VERSION GREATER 3.0)
-  SET(CMAKE_CXX_STANDARD  17)
-ELSEIF(CXX17_FLAGS)
-  ADD_DEFINITIONS(${CXX17_FLAGS})
+  SET(CMAKE_CXX_STANDARD  11)
+ELSEIF(CXX11_FLAGS)
+  ADD_DEFINITIONS(${CXX11_FLAGS})
 ENDIF()
 
 SET(ROCKSDB_SE_SOURCES
@@ -121,6 +135,11 @@ SET(ROCKSDB_SE_SOURCES
   rdb_converter.h
 )
 
+# MariaDB: the following is added in build_rocksdb.cmake, when appropriate:
+# This is a strong requirement coming from RocksDB. No conditional checks here.
+#ADD_DEFINITIONS(-DROCKSDB_PLATFORM_POSIX -DROCKSDB_LIB_IO_POSIX
+#)
+
 if (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
   SET(ATOMIC_EXTRA_LIBS -latomic)
 else()
@@ -141,7 +160,7 @@ IF(NOT TARGET rocksdb)
   RETURN()
 ENDIF()
 
-INSTALL_MANPAGES(rocksdb-engine mariadb-ldb.1 mariadb-sst-dump.1 myrocks_hotbackup.1)
+INSTALL_MANPAGES(rocksdb-engine mariadb-ldb.1 myrocks_hotbackup.1)
 
 CHECK_CXX_SOURCE_COMPILES("
 #if defined(_MSC_VER) && !defined(__thread)
@@ -174,6 +193,7 @@ ADD_CONVENIENCE_LIBRARY(rocksdb_aux_lib
   rdb_perf_context.h
   rdb_buff.h
   rdb_mariadb_port.h
+  nosql_access.cc nosql_access.h
 )
 
 ADD_DEPENDENCIES(rocksdb_aux_lib GenError)
@@ -184,8 +204,37 @@ if (UNIX AND NOT APPLE AND NOT CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
   TARGET_LINK_LIBRARIES(rocksdb_aux_lib -lrt)
 endif()
 TARGET_LINK_LIBRARIES(rocksdb_aux_lib ${ATOMIC_EXTRA_LIBS})
+
+# IF (WITH_JEMALLOC)
+#  FIND_LIBRARY(JEMALLOC_LIBRARY
+#    NAMES libjemalloc${PIC_EXT}.a jemalloc
+#    HINTS ${WITH_JEMALLOC}/lib)
+#  SET(rocksdb_static_libs ${rocksdb_static_libs}
+#    ${JEMALLOC_LIBRARY})
+#  ADD_DEFINITIONS(-DROCKSDB_JEMALLOC)
+#  ADD_DEFINITIONS(-DROCKSDB_MALLOC_USABLE_SIZE)
+# ENDIF()
+
+# MariaDB: Q: why does the upstream add libunwind for a particular 
+# storage engine?
+#IF (WITH_UNWIND)
+#  FIND_LIBRARY(UNWIND_LIBRARY
+#    NAMES libunwind${PIC_EXT}.a unwind
+#    HINTS ${WITH_UNWIND}/lib)
+#  SET(rocksdb_static_libs ${rocksdb_static_libs}
+#    ${UNWIND_LIBRARY})
+#ENDIF()
+
+
 TARGET_LINK_LIBRARIES(rocksdb rocksdb_aux_lib)
 
+CHECK_FUNCTION_EXISTS(sched_getcpu  HAVE_SCHED_GETCPU)
+IF(HAVE_SCHED_GETCPU)
+  ADD_DEFINITIONS(-DHAVE_SCHED_GETCPU=1)
+# MariaDB: don't do this:
+#  ADD_DEFINITIONS(-DZSTD_STATIC_LINKING_ONLY)
+ENDIF()
+
 IF (WITH_TBB)
   FIND_LIBRARY(TBB_LIBRARY
     NAMES libtbb${PIC_EXT}.a tbb
@@ -195,6 +244,13 @@ IF (WITH_TBB)
   ADD_DEFINITIONS(-DTBB)
 ENDIF()
 
+#
+# MariaDB: Dynamic plugin build is not suitable with unittest ATM
+#
+#IF(WITH_UNIT_TESTS AND WITH_EMBEDDED_SERVER)
+#  ADD_SUBDIRECTORY(unittest)
+#ENDIF()
+
 if (UNIX AND NOT APPLE AND NOT CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
   SET(rocksdb_static_libs ${rocksdb_static_libs} "-lrt")
 endif()
@@ -206,8 +262,8 @@ ADD_LIBRARY(rocksdb_tools STATIC
    rocksdb/tools/sst_dump_tool.cc
 )
 
-MYSQL_ADD_EXECUTABLE(mariadb-sst-dump tools/mysql_sst_dump.cc COMPONENT rocksdb-engine)
-TARGET_LINK_LIBRARIES(mariadb-sst-dump rocksdblib)
+MYSQL_ADD_EXECUTABLE(sst_dump rocksdb/tools/sst_dump.cc COMPONENT rocksdb-engine)
+TARGET_LINK_LIBRARIES(sst_dump rocksdblib)
 
 MYSQL_ADD_EXECUTABLE(mariadb-ldb tools/mysql_ldb.cc COMPONENT rocksdb-engine)
 TARGET_LINK_LIBRARIES(mariadb-ldb rocksdb_tools rocksdb_aux_lib dbug)
@@ -229,7 +285,7 @@ IF(MSVC)
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4267")
   ENDIF()
 ELSEIF(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  SET_TARGET_PROPERTIES(rocksdb_tools mariadb-sst-dump mariadb-ldb PROPERTIES COMPILE_FLAGS "-Wno-error")
+  SET_TARGET_PROPERTIES(rocksdb_tools sst_dump mariadb-ldb PROPERTIES COMPILE_FLAGS "-Wno-error")
 ENDIF()
 
 IF(GIT_EXECUTABLE AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/.git)