Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions .github/workflows/generate-api-docs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Generate Plugin API Docs

on:
Comment thread
gkodinov marked this conversation as resolved.
push:
branches:
Comment thread
RazvanLiviuVarzaru marked this conversation as resolved.
- 'main'
pull_request:
branches:
- 'main'
Comment thread
gkodinov marked this conversation as resolved.
jobs:
generate-docs:
runs-on: ubuntu-latest
container:
image: ghcr.io/mariadb/mariadb-doc-gen:latest
steps:
- name: Checkout repository
uses: actions/checkout@v7

- name: Generate documentation
shell: bash
run: |
set -euo pipefail
target_dir=$(pwd)/bld/docs/plugin-api
mkdir -p "$target_dir"
cd include/mysql
bash -x generate_plugin_api_docs.sh "$target_dir"
Comment thread
RazvanLiviuVarzaru marked this conversation as resolved.
6 changes: 6 additions & 0 deletions include/mysql/generate_plugin_api_docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
# Note: target_dir is created if not present.
# Note: requires at least moxygen 2.1.11

set -euo pipefail

# If no target_dir is specified, the current directory is used.
if [ -n "$1" ]; then
TARGET_DIR="$1"
Expand All @@ -29,6 +31,10 @@ rm -rf "$TARGET_DIR/xml"
# Create the markdown output directory
mkdir -p "$TARGET_DIR/md"

echo "Doxygen version"
doxygen --version
echo "Moxygen version"
moxygen --version
# run doxygen to generate the plugin API documentation XML
# Need to pass output directory so that XML docs get generated in it.
# Need to EXCLUDE the output directory so that doxygen does not try to parse the generated XML and markdown files
Expand Down
5 changes: 2 additions & 3 deletions include/mysql/psi/psi.h
Original file line number Diff line number Diff line change
Expand Up @@ -1544,15 +1544,13 @@ typedef void (*unbind_table_v1_t)
Rebind a table handle to the current thread.
This operation happens when a table from the open table cache
is reused for a thread.
@param table the table to unbind
*/
typedef PSI_table* (*rebind_table_v1_t)
(PSI_table_share *share, const void *identity, PSI_table *table);

/**
Close an instrumentation table handle.
Note that the table handle is invalid after this call.
@param table the table handle to close
*/
typedef void (*close_table_v1_t)(struct TABLE_SHARE *server_share,
struct PSI_table *table);
Expand Down Expand Up @@ -1586,6 +1584,7 @@ typedef int (*spawn_thread_v1_t)(PSI_thread_key key,
Create instrumentation for a thread.
@param key the registered key
@param identity an address typical of the thread
@param thread_id the id of the thread
@return an instrumented thread
*/
typedef struct PSI_thread* (*new_thread_v1_t)
Expand Down Expand Up @@ -2020,6 +2019,7 @@ typedef void (*end_stage_v1_t) (void);
@param state data storage for the locker
@param key the statement instrumentation key
@param charset client character set
@param sp_share the share
@return a statement locker, or NULL
*/
typedef struct PSI_statement_locker* (*get_thread_statement_locker_v1_t)
Expand Down Expand Up @@ -2348,7 +2348,6 @@ typedef void (*set_socket_thread_owner_v1_t)(struct PSI_socket *socket);

/**
Get a prepare statement.
@param locker a statement locker for the running thread.
*/
typedef PSI_prepared_stmt* (*create_prepared_stmt_v1_t)
(void *identity, uint stmt_id, PSI_statement_locker *locker,
Expand Down