[#MDEV-32524] Use named constants for ids used in spider mem alloc functions to avoid collision

Because of the nature of the change, the best way to resolve merge
conflicts is:

1. merge until the parent commit of this commit
2. git merge this commit; presented with conflicts
3. disregard the changes, i.e. choose "ours" for all files
4. run the script (see below)
5. complete the merge of this commit
6. merge the descendants of this commit

(defvar my-mdev-32524-ids nil "List of ids used.")

(defun my-mdev-32524-make-id ()

  "Return an id on the current position."

  (let* ((base

          (replace-regexp-in-string

           "::" "_"

           (replace-regexp-in-string

            "^\\(SPIDER_\\)?" "SPD_MID_"

            (upcase (which-function)))))

         (last-id (car my-mdev-32524-ids))

         (counter (cdr last-id))

         (result))

    (if (equal (car last-id) base)

        (progn

          (setq result (format "%s_%d" base (1+ counter)))

          (push (cons base (1+ counter)) my-mdev-32524-ids))

      (setq result (format "%s_1" base))

      (push (cons base 1) my-mdev-32524-ids))

    result))

(defun my-mdev-32524-replace-ids ()

  "Replace magic id numbers with enum symbols."

  (setq my-mdev-32524-ids nil)

  (dolist (file (directory-files "./storage/spider" t ".\\(cc\\|h\\)$"))

    ;; Don't do this with spd_malloc.{cc,h}

    (unless (string-match "spd_malloc" file)

      (with-current-buffer (find-file-noselect file)

        (goto-char (point-min))

        (while (re-search-forward

                (concat

                 "\\(spider_alloc_calc_mem_init\\|init_calc_mem\\|spider_malloc\\|"

                 "spider_bulk_alloc_mem\\|spider_bulk_malloc\\)"

                 "\\(([^0-9)]*\\)\\([0-9]+\\)")

                nil t)

          (let ((beg (match-beginning 3))

                (end (match-end 3)))

            (replace-region-contents beg end #'my-mdev-32524-make-id)))

        (save-buffer)))))

(defun my-mdev-32524-insert-enum-def ()

  "Insert enum def at point according to `my-mdev-32524-ids'."

  (with-current-buffer (find-file-noselect "./storage/spider/spd_include.h")

    (goto-char (point-min))

    (re-search-forward "#define.* SPIDER_CONN_META_BUF_LEN")

    (beginning-of-line 2)

    (let ((pre

/*

  IDs for spider mem alloc functions, including

  - spider_alloc_calc_mem_init()

  - spider_string::init_calc_mem()

  - spider_malloc()

  - spider_bulk_alloc_mem()

  - spider_bulk_malloc()

  In the format of

  SPD_MID_<CALLSITE_FUNC_NAME_SANS_SPIDER_PREFIX>_<NO>

*/

enum spider_malloc_id {

")

          (middle (string-join

                   (sort

                    (mapcar

                     (lambda (pair)

                       (format "%s_%d" (car pair) (cdr pair)))

                     my-mdev-32524-ids)

                    #'string<)

",

"))

          (post "

};

"))

      (insert (concat pre middle post))

      (save-buffer))))

(defun my-mdev-32524 ()

  "Make changes for MDEV-32524. Assuming we are at the source root."

  (interactive)

  (my-mdev-32524-replace-ids)

  (my-mdev-32524-insert-enum-def))

[MDEV-32524] Use named constants for ids used in spider mem alloc functions to avoid collision Created: 2023-10-19 Updated: 2024-02-01 Resolved: 2023-11-19
Status:	Closed
Project:	MariaDB Server
Component/s:	Storage Engine - Spider
Fix Version/s:	10.4.33, 10.5.24, 10.6.17, 10.11.7, 11.0.5, 11.1.4

[MDEV-32524] Use named constants for ids used in spider mem alloc functions to avoid collision Created: 2023-10-19 Updated: 2024-02-01 Resolved: 2023-11-19