S3 is pluggable now

Author: vuvova

debian/control

@@ -623,6 +623,15 @@ Description: Connect storage engine for MariaDB
  other interesting features.
  This package contains the Connect plugin for MariaDB.
 
+Package: mariadb-plugin-s3
+Architecture: any
+Depends: libcurl4,
+         mariadb-server-10.5 (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Description: S3 storage engine for MariaDB
+ Read only table stored in S3.
+
 Package: mariadb-plugin-rocksdb
 Architecture: amd64 arm64 mips64el ppc64el
 Depends: mariadb-server-10.5 (= ${binary:Version}),

debian/mariadb-plugin-s3.install

@@ -0,0 +1,3 @@
+etc/mysql/mariadb.conf.d/s3.cnf
+usr/bin/aria_s3_copy
+usr/lib/mysql/plugin/ha_s3.so

include/aria_backup.h

@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 MariaDB corporation
+/* Copyright (C) 2018,2020 MariaDB Corporation Ab
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

mysql-test/suite/s3/my.cnf

@@ -2,6 +2,7 @@
 !include include/default_client.cnf
 
 [mysqld.1]
+plugin-load-add=ha_s3
 s3=ON
 #s3-host-name=s3.amazonaws.com
 #s3-protocol-version=Amazon

mysql-test/suite/s3/suite.pm

@@ -2,7 +2,7 @@ package My::Suite::S3;
 
 @ISA = qw(My::Suite);
 
-return "Need S3 engine" unless $::mysqld_variables{'s3'} eq "ON";
+return "Need S3 engine" unless $::mysqld_variables{'s3'} eq "ON" or $ENV{HA_S3_SO};
 
 bless { };
 

storage/maria/CMakeLists.txt

@@ -1,4 +1,5 @@
 # Copyright (C) 2007 MySQL AB
+# Copyright (C) 2009,2020 MariaDB Corporation Ab
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -105,7 +106,7 @@ OPTION(USE_ARIA_FOR_TMP_TABLES "Use Aria for temporary tables" ON)
 #
 INCLUDE (CheckIncludeFiles)
 
-SET(S3_SOURCES ha_s3.cc s3_func.c
+SET(S3_SOURCES s3_func.c
     libmarias3/src/debug.c libmarias3/src/error.c libmarias3/src/marias3.c
     libmarias3/src/request.c libmarias3/src/response.c libmarias3/src/sha256.c
     libmarias3/src/sha256-internal.c libmarias3/src/xml.c)
@@ -115,18 +116,13 @@ IF(NOT PLUGIN_S3 STREQUAL NO)
 ENDIF()
 
 IF (CURL_FOUND)
-  MYSQL_ADD_PLUGIN(s3 ${S3_SOURCES} STORAGE_ENGINE STATIC_ONLY
-                   LINK_LIBRARIES aria myisam mysys mysys_ssl curl
-                   NOT_EMBEDDED)
+  MYSQL_ADD_PLUGIN(s3 ha_s3.cc ${S3_SOURCES} COMPONENT s3-engine
+    LINK_LIBRARIES curl STORAGE_ENGINE NOT_EMBEDDED CONFIG s3.cnf)
 ENDIF()
 
 IF(TARGET s3)
-  MYSQL_ADD_EXECUTABLE(aria_s3_copy aria_s3_copy.cc COMPONENT Server)
-  TARGET_LINK_LIBRARIES(aria_s3_copy s3)
-
+  MYSQL_ADD_EXECUTABLE(aria_s3_copy aria_s3_copy.cc ${S3_SOURCES} COMPONENT s3-engine)
+  TARGET_LINK_LIBRARIES(aria_s3_copy aria myisam mysys mysys_ssl curl)
   INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/libmarias3)
-
   ADD_DEFINITIONS(-DWITH_S3_STORAGE_ENGINE)
-
-  TARGET_LINK_LIBRARIES(aria s3)
 ENDIF()

storage/maria/ha_maria.cc

@@ -1,6 +1,6 @@
 /* Copyright (C) 2004-2008 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
    Copyright (C) 2008-2009 Sun Microsystems, Inc.
-   Copyright (c) 2009, 2017, MariaDB Corporation.
+   Copyright (c) 2009, 2020, MariaDB Corporation Ab
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -72,7 +72,7 @@ const char *zerofill_error_msg=
    corrupted.
 */
 ulonglong maria_recover_options= HA_RECOVER_NONE;
-handlerton *maria_hton;
+handlerton __attribute__((visibility("default"))) *maria_hton;
 
 /* bits in maria_recover_options */
 const char *maria_recover_names[]=
@@ -2688,6 +2688,16 @@ int ha_maria::extra_opt(enum ha_extra_function operation, ulong cache_size)
 }
 
 
+bool ha_maria::auto_repair(int error) const
+{
+  /* Always auto-repair moved tables (error == HA_ERR_OLD_FILE) */
+  return ((MY_TEST(maria_recover_options & HA_RECOVER_ANY) &&
+           error == HA_ERR_CRASHED_ON_USAGE) ||
+          error == HA_ERR_OLD_FILE);
+
+}
+
+
 int ha_maria::delete_all_rows()
 {
   THD *thd= table->in_use;
@@ -3348,6 +3358,14 @@ ha_rows ha_maria::records_in_range(uint inx, const key_range *min_key,
 }
 
 
+FT_INFO *ha_maria::ft_init_ext(uint flags, uint inx, String * key)
+{
+  return maria_ft_init_search(flags, file, inx,
+                              (uchar *) key->ptr(), key->length(),
+                              key->charset(), table->record[0]);
+}
+
+
 int ha_maria::ft_read(uchar * buf)
 {
   int error;

storage/maria/ha_maria.h

@@ -1,6 +1,7 @@
 #ifndef HA_MARIA_INCLUDED
 #define HA_MARIA_INCLUDED
-/* Copyright (C) 2006,2004 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2006, 2004 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+   Copyright (c) 2009, 2020, MariaDB Corporation Ab
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -38,7 +39,7 @@ C_MODE_END
 extern TYPELIB maria_recover_typelib;
 extern ulonglong maria_recover_options;
 
-class ha_maria :public handler
+class __attribute__((visibility("default"))) ha_maria :public handler
 {
 public:
   MARIA_HA *file;
@@ -97,12 +98,7 @@ class ha_maria :public handler
     ft_handler->please->reinit_search(ft_handler);
     return 0;
   }
-  FT_INFO *ft_init_ext(uint flags, uint inx, String * key)
-  {
-    return maria_ft_init_search(flags, file, inx,
-                                (uchar *) key->ptr(), key->length(),
-                                key->charset(), table->record[0]);
-  }
+  FT_INFO *ft_init_ext(uint flags, uint inx, String * key);
   int ft_read(uchar * buf);
   int index_init(uint idx, bool sorted);
   int index_end();
@@ -146,14 +142,7 @@ class ha_maria :public handler
   bool check_and_repair(THD * thd);
   bool is_crashed() const;
   bool is_changed() const;
-  bool auto_repair(int error) const
-  {
-    /* Always auto-repair moved tables (error == HA_ERR_OLD_FILE) */
-    return ((MY_TEST(maria_recover_options & HA_RECOVER_ANY) &&
-             error == HA_ERR_CRASHED_ON_USAGE) ||
-            error == HA_ERR_OLD_FILE);
-
-  }
+  bool auto_repair(int error) const;
   int optimize(THD * thd, HA_CHECK_OPT * check_opt);
   int assign_to_keycache(THD * thd, HA_CHECK_OPT * check_opt);
   int preload_keys(THD * thd, HA_CHECK_OPT * check_opt);

storage/maria/ha_s3.cc

@@ -1,4 +1,4 @@
-/* Copyright (C) 2019 MariaDB Corppration AB
+/* Copyright (C) 2019, 2020 MariaDB Corporation Ab
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -1008,9 +1008,24 @@ static int ha_s3_init(void *p)
   s3_init_library();
   if (s3_debug)
     ms3_debug();
+
+  struct s3_func s3f_real =
+  {
+    ms3_set_option, s3_free, ms3_deinit, s3_unique_file_number,
+    read_index_header, s3_check_frm_version, s3_info_copy,
+    set_database_and_table_from_path, s3_open_connection
+  };
+  s3f= s3f_real;
+
   return res ? HA_ERR_INITIALIZATION : 0;
 }
 
+static int ha_s3_deinit(void*)
+{
+  bzero(&s3f, sizeof(s3f));
+  return 0;
+}
+
 static SHOW_VAR status_variables[]= {
   {"pagecache_blocks_not_flushed",
    (char*) &s3_pagecache.global_blocks_changed, SHOW_LONG},
@@ -1057,7 +1072,7 @@ maria_declare_plugin(s3)
   "ALTER TABLE table_name ENGINE=s3",
   PLUGIN_LICENSE_GPL,
   ha_s3_init,                   /* Plugin Init      */
-  NULL,                         /* Plugin Deinit    */
+  ha_s3_deinit,                 /* Plugin Deinit    */
   0x0100,                       /* 1.0              */
   status_variables,             /* status variables */
   system_variables,             /* system variables */

storage/maria/ma_backup.c

@@ -1,4 +1,4 @@
-/* Copyright (C) 2018 MariaDB corporation
+/* Copyright (C) 2018, 2020 MariaDB Corporation Ab
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,8 +20,6 @@
 #include "ma_checkpoint.h"
 #include <aria_backup.h>
 
-static uchar *_ma_base_info_read(uchar *ptr, MARIA_BASE_INFO *base);
-
 /**
   @brief Get capabilites for an Aria table
 
@@ -32,6 +30,7 @@ static uchar *_ma_base_info_read(uchar *ptr, MARIA_BASE_INFO *base);
   @return X      errno
 */
 
+int aria_get_capabilities(File kfile, ARIA_TABLE_CAPABILITIES *cap)__attribute__((visibility("default"))) ;
 int aria_get_capabilities(File kfile, ARIA_TABLE_CAPABILITIES *cap)
 {
   MARIA_SHARE share;
@@ -102,20 +101,13 @@ int aria_get_capabilities(File kfile, ARIA_TABLE_CAPABILITIES *cap)
 err:
   my_free(disc_cache);
   DBUG_RETURN(error);
-} /* maria_get_capabilities */
-
+} /* aria_get_capabilities */
 
-/*
-  This is a copy of my_base_info_read from ma_open().
-  The base information will never change (something may be added
-  last, but not relevant for maria_get_capabilities), so it's safe to
-  copy it here.
-
-  The copy is done to avoid linking in the fill Aria library just
-  because maria_backup uses maria_get_capabilities()
-*/
+/****************************************************************************
+**  store MARIA_BASE_INFO
+****************************************************************************/
 
-static uchar *_ma_base_info_read(uchar *ptr, MARIA_BASE_INFO *base)
+uchar *_ma_base_info_read(uchar *ptr, MARIA_BASE_INFO *base)
 {
   bmove(base->uuid, ptr, MY_UUID_SIZE);                 ptr+= MY_UUID_SIZE;
   base->keystart= mi_sizekorr(ptr);			ptr+= 8;