Bug#32861777 USE HA_ACL_NOTIFY IN STANDARD SERVER - STEP 2/2

The handler ha_acl_notify method have only been used in MySQL Cluster
server and is one of the remaining differences between standard MySQL
server and MySQL Cluster server.

One reason it has not already been integrated in standard server is that
in preparation to the call of ha_acl_notify lists of users are copied
which potentially could be an issue for big lists.  And the copy did
always occur even if no handler have implemented ha_acl_notify.

This patch keeps original lists but introduces automatic conversion from
LEX_CSTRING and LEX_USER to avoid explicit usage of these types in
ndbcluster plugin when accessing the data stored in
Acl_change_notification object.

And now also calls ha_acl_notify from standard server, removing one
differences with MySQL Cluster server.

Change-Id: I2499af3e78094f216f0fd4dcd443b70337d50d3a

Author: zmur

sql/auth/acl_change_notification.h

@@ -24,41 +24,46 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 #ifndef ACL_CHANGE_NOTIFICATION_INCLUDED
 #define ACL_CHANGE_NOTIFICATION_INCLUDED
 
-#include "my_sqlcommand.h"  // enum_sql_command
-#include "sql/table.h"      // LEX_USER, LEX_CSTRING, List
-
-class Rewrite_params;  // forward declaration
+#include "my_sqlcommand.h"    // enum_sql_command
+#include "sql/sql_rewrite.h"  // User_params
+#include "sql/table.h"        // LEX_USER, LEX_CSTRING, List
 
 class Acl_change_notification {
  public:
+  struct Priv : public std::string {
+    Priv(const LEX_CSTRING &lex_priv)
+        : std::string{lex_priv.str, lex_priv.length} {}
+  };
   struct User {
     std::string name;
     std::string host;
     User(const LEX_USER &lex_user)
         : name(lex_user.user.str, lex_user.user.length),
           host(lex_user.host.str, lex_user.host.length) {}
   };
-
-  Acl_change_notification(class THD *thd, enum_sql_command op,
+  Acl_change_notification(THD *thd, enum_sql_command op,
                           const List<LEX_USER> *users,
-                          Rewrite_params *rewrite_params,
+                          std::set<LEX_USER *> *rewrite_params,
                           const List<LEX_CSTRING> *dynamic_privs);
 
  private:
-  enum_sql_command operation;
-  std::string db;
-  std::vector<User> user_list;
-  std::vector<std::string> dynamic_privilege_list;
-  Rewrite_params *rewrite_params;
+  const std::string db;
+  const enum_sql_command operation;
+  const List<LEX_USER> empty_users;
+  const List<LEX_USER> &users;
+  const User_params rewrite_user_params;
+  const List<LEX_CSTRING> empty_dynamic_privs;
+  const List<LEX_CSTRING> &dynamic_privs;
 
  public:
   enum_sql_command get_operation() const { return operation; }
   const std::string &get_db() const { return db; }
-  const std::vector<User> &get_user_list() const { return user_list; }
-  const std::vector<std::string> &get_dynamic_privilege_list() const {
-    return dynamic_privilege_list;
+  auto &get_user_list() const { return users; }
+  auto &get_dynamic_privilege_list() const { return dynamic_privs; }
+  const User_params *get_rewrite_params() const {
+    if (rewrite_user_params.users == nullptr) return nullptr;
+    return &rewrite_user_params;
   }
-  Rewrite_params *get_rewrite_params() const { return rewrite_params; }
 };
 
 #endif

sql/auth/sql_user_table.cc

@@ -574,45 +574,22 @@ ulong get_access(TABLE *form, uint fieldnr, uint *next_field) {
 */
 Acl_change_notification::Acl_change_notification(
     THD *thd, enum_sql_command op, const List<LEX_USER> *users,
-    Rewrite_params *rewrite, const List<LEX_CSTRING> *dynamic_privs)
-    : operation(op),
-      db(thd->db().str, thd->db().length),
-      rewrite_params(rewrite) {
-  if (users) {
-    /* Copy data out of List<LEX_USER> */
-    user_list.reserve(users->size());
-    for (const LEX_USER &lex_user : *users) {
-      user_list.emplace_back(lex_user);
-    }
-  }
-  if (dynamic_privs) {
-    /* Copy data from dynamic_privs to dynamic_privilege_list */
-    dynamic_privilege_list.reserve(dynamic_privs->elements);
-    for (const LEX_CSTRING &priv : *dynamic_privs) {
-      dynamic_privilege_list.emplace_back(priv.str, priv.length);
-    }
-  }
-}
-
-void acl_notify_htons(
-    THD *thd MY_ATTRIBUTE((unused)),
-    enum_sql_command operation MY_ATTRIBUTE((unused)),
-    const List<LEX_USER> *users MY_ATTRIBUTE((unused)),
-    std::set<LEX_USER *> *rewrite_users MY_ATTRIBUTE((unused)),
-    const List<LEX_CSTRING> *dynamic_privs MY_ATTRIBUTE((unused))) {
+    std::set<LEX_USER *> *rewrite_users, const List<LEX_CSTRING> *dynamic_privs)
+    : db{thd->db().str, thd->db().length},
+      operation(op),
+      users(users ? *users : empty_users),
+      rewrite_user_params(rewrite_users),
+      dynamic_privs(dynamic_privs ? *dynamic_privs : empty_dynamic_privs) {}
+
+void acl_notify_htons(THD *thd, enum_sql_command operation,
+                      const List<LEX_USER> *users,
+                      std::set<LEX_USER *> *rewrite_users,
+                      const List<LEX_CSTRING> *dynamic_privs) {
   DBUG_TRACE;
   DBUG_PRINT("enter", ("db: %s query: '%s'", thd->db().str, thd->query().str));
-#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
-  /*
-    The Acl_change_notification is used only by the ndbcluster SE.
-    So, instantiate it and send a notification only if the Server is
-    built with ndbcluster SE.
-  */
-  User_params rewrite_user_params(rewrite_users);
-  User_params *rewrite = rewrite_users ? &rewrite_user_params : nullptr;
-  Acl_change_notification notice(thd, operation, users, rewrite, dynamic_privs);
+  Acl_change_notification notice(thd, operation, users, rewrite_users,
+                                 dynamic_privs);
   ha_acl_notify(thd, &notice);
-#endif
 }
 
 /**

storage/ndb/plugin/ndb_stored_grants.cc

@@ -57,7 +57,7 @@ static std::mutex local_granted_users_mutex;
 /* Utility functions */
 
 bool op_grants_or_revokes_ndb_storage(ChangeNotice *notice) {
-  for (const std::string &priv : notice->get_dynamic_privilege_list())
+  for (const ChangeNotice::Priv priv : notice->get_dynamic_privilege_list())
     if (!native_strncasecmp(priv.c_str(), "NDB_STORED_USER", priv.length()))
       return true;
   return false;