Revert "WL#15605 MLE Milestone 2"

This reverts commit 8b62ef53df9e09327b72dd722de6f9fed8a75886.

gerrit: 24910
Change-Id: I53f20e13c96545fd3a18b1e88f500321126db2ae

Author: ivo-roylev

include/mysql/components/services/mysql_stored_program.h

@@ -32,13 +32,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 DEFINE_SERVICE_HANDLE(stored_program_handle);
 DEFINE_SERVICE_HANDLE(stored_program_runtime_context);
 DEFINE_SERVICE_HANDLE(time_zone_handle);
-DEFINE_SERVICE_HANDLE(external_program_handle);
-
-/**
-  @file
-  Services for reading and storing various stored program properties
-  of the server stored program's object and its contexts.
-*/
 
 BEGIN_SERVICE_DEFINITION(mysql_stored_program_metadata_query)
 
@@ -794,94 +787,4 @@ DECLARE_BOOL_METHOD(set, (stored_program_runtime_context sp_runtime_context,
                           double value));
 
 END_SERVICE_DEFINITION(mysql_stored_program_return_value_float)
-
-/**
-  @ingroup group_components_services_stored_programs
-
-  Service to get and change the stored program's external language handle.
-
-  In general, the server stored program object does handle
-  the lifetime of the external language objects.
-  It initiates the creation, parsing, execution and destruction of such objects.
-  But, in rare cases, the external language component may request the server to
-  change its external language object. Example of such cases are:
-   * The stored program is aborted. The external language object needs to be
-     destroyed and detached from the server object.
-   * The session was reset. Either by explicit user demand, or when incompatible
-     changes happen such as timezone change. All of its objects need to be
-     destroyed and detached.
-   * The limit of external language objects is reached. The oldest objects
-     may be destroyed and detached.
-   * The limit of external language sessions is reached. The oldest sessions
-     may be destroyed, together with their language objects.
-   * The external language object is changed. The new object needs to replace
-     the existing one.
-  @note Both the external language session and external language object
-        services support lazy (re)initialization. The current object may be
-        detached and destroyed. When another request to
-        the same stored program comes, a new object will be created.
-
-  Used approximately as follows:
-
-  @code
-  // Get the current external_program_handle.
-  external_program_handle old_sp = nullptr;
-  if (SERVICE_PLACEHOLDER(mysql_stored_program_external_program_handle)
-                             ->get(stored_program_handle, &old_sp))
-    return 1;
-
-  // Detach and destroy the current external_program_handle.
-  if (SERVICE_PLACEHOLDER(mysql_stored_program_external_program_handle)
-                             ->set(stored_program_handle, nullptr))
-    return 1;
-  if (old_sp) destroy_stored_program(old_sp);
-
-  // Create and attach a new external_program_handle.
-  external_program_handle old_sp = create_stored_program();
-  return SERVICE_PLACEHOLDER(mysql_stored_program_external_program_handle)
-                             ->set(stored_program_handle, nullptr);
-
-  external_program_handle new_sp = create_stored_program();
-  return SERVICE_PLACEHOLDER(mysql_stored_program_external_program_handle)
-                             ->set(stored_program_handle, new_sp);
-
-  @endcode
-*/
-BEGIN_SERVICE_DEFINITION(mysql_stored_program_external_program_handle)
-
-/**
-  Obtain the currently attached Language Component's Stored Program
-  from the server object.
-  @note: Only stored_program_handle belonging to current thread are supported.
-
-  @param [in] sp      stored_program_handle
-  @param [out] value  Language Component's Stored Program.
-
-  @returns Status of operation
-  @retval false Success
-  @retval true  Error
-*/
-
-DECLARE_BOOL_METHOD(get,
-                    (stored_program_handle sp, external_program_handle *value));
-
-/**
-  Attach or detach the Language Component's Stored Program from the server
-  object. In order to detach the current Stored Program from the server
-   - provide nullptr value.
-  @note: Only stored_program_handle belonging to current thread are supported.
-
-  @param [in] sp      stored_program_handle
-  @param [in] value   Language Component's Stored Program.
-                      Use nullptr to detach the current value from the server.
-
-  @returns Status of operation
-  @retval false Success
-  @retval true  Error
-*/
-
-DECLARE_BOOL_METHOD(set,
-                    (stored_program_handle sp, external_program_handle value));
-
-END_SERVICE_DEFINITION(mysql_stored_program_external_program_handle)
 #endif /* MYSQL_STORED_PROGRAM_H */

sql/server_component/mysql_stored_program_imp.cc

@@ -24,9 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 #include <cstring>                                               // strcmp
 #include "mysql/components/services/bits/stored_program_bits.h"  // stored_program_argument_type
 #include "mysql_time.h"
-#include "sql/current_thd.h"
 #include "sql/item_timefunc.h"  // Item_time_literal
-#include "sql/sp_cache.h"       // sp_cache
 #include "sql/sp_head.h"        // sp_head
 #include "sql/sp_pcontext.h"    // sp_runtime_ctx
 #include "sql/sp_rcontext.h"
@@ -1307,41 +1305,3 @@ DEFINE_BOOL_METHOD(mysql_stored_program_return_value_float_imp::set,
     return MYSQL_FAILURE;
   return MYSQL_SUCCESS;
 }
-
-/**
- * @brief Ensure the modified sp_head is part of the current THD.
- *
- * @param sp_handle - opaque pointer.
- * @return sp_head* if the opaque pointer's sp_head representation is part of
-           the current THD.
- * @return nullptr if not.
- */
-static auto is_sp_in_current_thd(stored_program_handle sp_handle) -> sp_head * {
-  assert(sp_handle);
-  if (!sp_handle) return {};
-  auto sp = reinterpret_cast<sp_head *>(sp_handle);
-  if (sp_cache_has(current_thd->sp_func_cache, sp)) return sp;
-  if (sp_cache_has(current_thd->sp_proc_cache, sp)) return sp;
-  assert(false);
-  return {};
-}
-
-DEFINE_BOOL_METHOD(mysql_stored_program_external_program_handle_imp::get,
-                   (stored_program_handle sp_handle,
-                    external_program_handle *value)) {
-  assert(value);
-  if (!value) return MYSQL_FAILURE;
-
-  auto sp = is_sp_in_current_thd(sp_handle);
-  if (!sp) return MYSQL_FAILURE;
-  *value = sp->get_external_program_handle();
-  return MYSQL_SUCCESS;
-}
-
-DEFINE_BOOL_METHOD(mysql_stored_program_external_program_handle_imp::set,
-                   (stored_program_handle sp_handle,
-                    external_program_handle value)) {
-  auto sp = is_sp_in_current_thd(sp_handle);
-  if (!sp) return MYSQL_FAILURE;
-  return sp->set_external_program_handle(value);
-}

sql/server_component/mysql_stored_program_imp.h

@@ -251,13 +251,4 @@ class mysql_stored_program_return_value_float_imp {
                             (stored_program_runtime_context sp_runtime_context,
                              double value));
 };
-
-class mysql_stored_program_external_program_handle_imp {
- public:
-  static DEFINE_BOOL_METHOD(get, (stored_program_handle sp,
-                                  external_program_handle *value));
-
-  static DEFINE_BOOL_METHOD(set, (stored_program_handle sp,
-                                  external_program_handle value));
-};
 #endif /* MYSQL_STORED_PROGRAM_IMP_H */

sql/server_component/server_component.cc

@@ -656,12 +656,6 @@ BEGIN_SERVICE_IMPLEMENTATION(mysql_server, mysql_debug_sync_service)
 mysql_debug_sync_service_imp::debug_sync END_SERVICE_IMPLEMENTATION();
 #endif
 
-BEGIN_SERVICE_IMPLEMENTATION(mysql_server,
-                             mysql_stored_program_external_program_handle)
-mysql_stored_program_external_program_handle_imp::get,
-    mysql_stored_program_external_program_handle_imp::set,
-    END_SERVICE_IMPLEMENTATION();
-
 BEGIN_SERVICE_IMPLEMENTATION(mysql_server, mysql_stored_program_metadata_query)
 mysql_stored_program_metadata_query_imp::get END_SERVICE_IMPLEMENTATION();
 
@@ -968,8 +962,6 @@ PROVIDES_SERVICE(mysql_server_path_filter, dynamic_loader_scheme_file),
     PROVIDES_SERVICE(mysql_server, mysql_command_field_metadata),
     PROVIDES_SERVICE(mysql_server, dynamic_loader_services_loaded_notification),
     PROVIDES_SERVICE(mysql_server, dynamic_loader_services_unload_notification),
-    PROVIDES_SERVICE(mysql_server,
-                     mysql_stored_program_external_program_handle),
     PROVIDES_SERVICE(mysql_server, mysql_stored_program_metadata_query),
     PROVIDES_SERVICE(mysql_server,
                      mysql_stored_program_argument_metadata_query),

sql/sp_cache.cc

@@ -74,19 +74,6 @@ class sp_cache {
     if (m_hashtable.size() > upper_limit_for_elements) m_hashtable.clear();
   }
 
-  /**
-   * @brief Check if the sp_cache contains the specified element.
-   *
-   * @param sp
-   * @return true if the element is in the cache.
-   * @return false if not.
-   */
-  bool has(sp_head *sp) {
-    for (auto &element : m_hashtable)
-      if (element.second.get() == sp) return true;
-    return false;
-  }
-
  private:
   struct sp_head_deleter {
     void operator()(sp_head *sp) const { sp_head::destroy(sp); }
@@ -221,12 +208,3 @@ int64 sp_cache_version() { return atomic_Cversion; }
 void sp_cache_enforce_limit(sp_cache *c, ulong upper_limit_for_elements) {
   if (c) c->enforce_limit(upper_limit_for_elements);
 }
-
-/**
- * @brief Check if the sp_cache contains the specified element.
- *
- * @param sp
- * @return true if the element is in the cache.
- * @return false if not.
- */
-bool sp_cache_has(sp_cache *cp, sp_head *sp) { return cp->has(sp); }

sql/sp_cache.h

@@ -64,6 +64,5 @@ void sp_cache_invalidate();
 void sp_cache_flush_obsolete(sp_cache **cp, sp_head **sp);
 int64 sp_cache_version();
 void sp_cache_enforce_limit(sp_cache *cp, ulong upper_limit_for_elements);
-bool sp_cache_has(sp_cache *cp, sp_head *sp);
 
 #endif /* _SP_CACHE_H_ */

sql/sp_head.cc

@@ -2569,19 +2569,6 @@ bool sp_head::execute_trigger(THD *thd, const LEX_CSTRING &db_name,
   return err_status;
 }
 
-external_program_handle sp_head::get_external_program_handle() {
-  return m_language_stored_program;
-}
-
-bool sp_head::set_external_program_handle(external_program_handle sp) {
-  assert(m_language_stored_program && !sp);
-  assert(!m_language_stored_program && sp);
-  if (m_language_stored_program && !sp) return true;
-  if (!m_language_stored_program && sp) return true;
-  m_language_stored_program = sp;
-  return false;
-}
-
 bool sp_head::init_external_routine(
     my_service<SERVICE_TYPE(external_program_execution)> &service) {
   assert(!is_sql());

sql/sp_head.h

@@ -955,31 +955,12 @@ class sp_head {
   /// Flags of LEX::enum_binlog_stmt_unsafe.
   uint32 unsafe_flags;
 
- private:
+ public:
   /**
     language component related state of this sp.
    */
   external_program_handle m_language_stored_program;
 
- public:
-  /**
-   * @brief Get the external program handle object
-   *
-   * @return external_program_handle
-   */
-  external_program_handle get_external_program_handle();
-
-  /**
-   * @brief Set the external program handle object
-   *
-   * @param external_program_handle The new external program handle object.
-   *                                Use nullptr to unset the current one.
-   *
-   * @return true on errors
-   * @return false on success
-   */
-  bool set_external_program_handle(external_program_handle);
-
   /**
      Initialize and parse an external routine