Merge branch 'v3.0' into v3.0_compression

sysown · Jan 2, 2025 · 2f3b2da · 2f3b2da
2 parents bab1dbc + 6cf02da
commit 2f3b2da
Show file tree

Hide file tree

Showing 87 changed files with 2,369 additions and 2,553 deletions.
diff --git a/.github/workflows/CI-3p-django-framework.yml b/.github/workflows/CI-3p-django-framework.yml
@@ -3,6 +3,11 @@ run-name: '${{ github.event.workflow_run && github.event.workflow_run.head_branc
 
 on:
   workflow_dispatch:
+    inputs:
+      testtree:
+        description: 'proxysql_3p_testing treeish/branch/tag/hash'
+        default: main
+        type: string
   workflow_run:
     workflows: [ CI-trigger ]
     types: [ completed ]
@@ -31,7 +36,9 @@ jobs:
       connector: ${{ vars.MATRIX_3P_DJANGO_FRAMEWORK_connector_mariadb }}
 
   run-pgsql:
-    if: ${{ github.event.workflow_run && github.event.workflow_run.conclusion == 'success' || ! github.event.workflow_run }}
+    if: |
+      (github.event.workflow_run && github.event.workflow_run.conclusion == 'success' || ! github.event.workflow_run) &&
+      ! startsWith((github.event.workflow_run && github.event.workflow_run.head_branch || github.ref_name), 'v2.')
     uses: sysown/proxysql/.github/workflows/ci-3p-django-framework.yml@GH-Actions
     secrets: inherit
     with:

diff --git a/.github/workflows/CI-3p-laravel-framework.yml b/.github/workflows/CI-3p-laravel-framework.yml
@@ -3,6 +3,11 @@ run-name: '${{ github.event.workflow_run && github.event.workflow_run.head_branc
 
 on:
   workflow_dispatch:
+    inputs:
+      testtree:
+        description: 'proxysql_3p_testing treeish/branch/tag/hash'
+        default: main
+        type: string
   workflow_run:
     workflows: [ CI-trigger ]
     types: [ completed ]
@@ -31,7 +36,9 @@ jobs:
       connector: ${{ vars.MATRIX_3P_LARAVEL_FRAMEWORK_connector_mariadb }}
 
   run-pgsql:
-    if: ${{ github.event.workflow_run && github.event.workflow_run.conclusion == 'success' || ! github.event.workflow_run }}
+    if: |
+      (github.event.workflow_run && github.event.workflow_run.conclusion == 'success' || ! github.event.workflow_run) &&
+      ! startsWith((github.event.workflow_run && github.event.workflow_run.head_branch || github.ref_name), 'v2.')
     uses: sysown/proxysql/.github/workflows/ci-3p-laravel-framework.yml@GH-Actions
     secrets: inherit
     with:

diff --git a/.github/workflows/CI-3p-mariadb-connector-c.yml b/.github/workflows/CI-3p-mariadb-connector-c.yml
@@ -3,6 +3,11 @@ run-name: '${{ github.event.workflow_run && github.event.workflow_run.head_branc
 
 on:
   workflow_dispatch:
+    inputs:
+      testtree:
+        description: 'proxysql_3p_testing treeish/branch/tag/hash'
+        default: main
+        type: string
   workflow_run:
     workflows: [ CI-trigger ]
     types: [ completed ]
@@ -12,11 +17,20 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  run:
+  run-mysql:
     if: ${{ github.event.workflow_run && github.event.workflow_run.conclusion == 'success' || ! github.event.workflow_run }}
     uses: sysown/proxysql/.github/workflows/ci-3p-mariadb-connector-c.yml@GH-Actions
     secrets: inherit
     with:
       trigger: ${{ toJson(github) }}
       infradb: ${{ vars.MATRIX_3P_MARIADB_CONNECTOR_C_infradb_mysql }}
       connector: ${{ vars.MATRIX_3P_MARIADB_CONNECTOR_C_connector_mysql }}
+
+  run-mariadb:
+    if: ${{ github.event.workflow_run && github.event.workflow_run.conclusion == 'success' || ! github.event.workflow_run }}
+    uses: sysown/proxysql/.github/workflows/ci-3p-mariadb-connector-c.yml@GH-Actions
+    secrets: inherit
+    with:
+      trigger: ${{ toJson(github) }}
+      infradb: ${{ vars.MATRIX_3P_MARIADB_CONNECTOR_C_infradb_mariadb }}
+      connector: ${{ vars.MATRIX_3P_MARIADB_CONNECTOR_C_connector_mariadb }}
diff --git a/.github/workflows/CI-3p-mysql-connector-j.yml b/.github/workflows/CI-3p-mysql-connector-j.yml
@@ -3,6 +3,11 @@ run-name: '${{ github.event.workflow_run && github.event.workflow_run.head_branc
 
 on:
   workflow_dispatch:
+    inputs:
+      testtree:
+        description: 'proxysql_3p_testing treeish/branch/tag/hash'
+        default: main
+        type: string
   workflow_run:
     workflows: [ CI-trigger ]
     types: [ completed ]
@@ -12,11 +17,20 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  run:
+  run-mysql:
     if: ${{ github.event.workflow_run && github.event.workflow_run.conclusion == 'success' || ! github.event.workflow_run }}
     uses: sysown/proxysql/.github/workflows/ci-3p-mysql-connector-j.yml@GH-Actions
     secrets: inherit
     with:
       trigger: ${{ toJson(github) }}
       infradb: ${{ vars.MATRIX_3P_MYSQL_CONNECTOR_J_infradb_mysql }}
       connector: ${{ vars.MATRIX_3P_MYSQL_CONNECTOR_J_connector_mysql }}
+
+  run-mariadb:
+    if: ${{ github.event.workflow_run && github.event.workflow_run.conclusion == 'success' || ! github.event.workflow_run }}
+    uses: sysown/proxysql/.github/workflows/ci-3p-mysql-connector-j.yml@GH-Actions
+    secrets: inherit
+    with:
+      trigger: ${{ toJson(github) }}
+      infradb: ${{ vars.MATRIX_3P_MYSQL_CONNECTOR_J_infradb_mariadb }}
+      connector: ${{ vars.MATRIX_3P_MYSQL_CONNECTOR_J_connector_mariadb }}
diff --git a/.github/workflows/CI-3p-php-pdo-mysql.yml b/.github/workflows/CI-3p-php-pdo-mysql.yml
@@ -3,6 +3,11 @@ run-name: '${{ github.event.workflow_run && github.event.workflow_run.head_branc
 
 on:
   workflow_dispatch:
+    inputs:
+      testtree:
+        description: 'proxysql_3p_testing treeish/branch/tag/hash'
+        default: main
+        type: string
   workflow_run:
     workflows: [ CI-trigger ]
     types: [ completed ]
@@ -12,11 +17,20 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  run:
+  run-mysql:
     if: ${{ github.event.workflow_run && github.event.workflow_run.conclusion == 'success' || ! github.event.workflow_run }}
     uses: sysown/proxysql/.github/workflows/ci-3p-php-pdo-mysql.yml@GH-Actions
     secrets: inherit
     with:
       trigger: ${{ toJson(github) }}
       infradb: ${{ vars.MATRIX_3P_PHP_PDO_MYSQL_infradb_mysql }}
       connector: ${{ vars.MATRIX_3P_PHP_PDO_MYSQL_connector_mysql }}
+
+  run-mariadb:
+    if: ${{ github.event.workflow_run && github.event.workflow_run.conclusion == 'success' || ! github.event.workflow_run }}
+    uses: sysown/proxysql/.github/workflows/ci-3p-php-pdo-mysql.yml@GH-Actions
+    secrets: inherit
+    with:
+      trigger: ${{ toJson(github) }}
+      infradb: ${{ vars.MATRIX_3P_PHP_PDO_MYSQL_infradb_mariadb }}
+      connector: ${{ vars.MATRIX_3P_PHP_PDO_MYSQL_connector_mariadb }}
diff --git a/.github/workflows/CI-3p-postgresql.yml b/.github/workflows/CI-3p-postgresql.yml
@@ -3,6 +3,11 @@ run-name: '${{ github.event.workflow_run && github.event.workflow_run.head_branc
 
 on:
   workflow_dispatch:
+    inputs:
+      testtree:
+        description: 'proxysql_3p_testing treeish/branch/tag/hash'
+        default: main
+        type: string
   workflow_run:
     workflows: [ CI-trigger ]
     types: [ completed ]
@@ -12,8 +17,10 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  run:
-    if: ${{ github.event.workflow_run && github.event.workflow_run.conclusion == 'success' || ! github.event.workflow_run }}
+  run-pgsql:
+    if: |
+      (github.event.workflow_run && github.event.workflow_run.conclusion == 'success' || ! github.event.workflow_run) &&
+      ! startsWith((github.event.workflow_run && github.event.workflow_run.head_branch || github.ref_name), 'v2.')
     uses: sysown/proxysql/.github/workflows/ci-3p-postgresql.yml@GH-Actions
     secrets: inherit
     with:

diff --git a/.github/workflows/CI-3p-sqlalchemy.yml b/.github/workflows/CI-3p-sqlalchemy.yml
@@ -3,6 +3,11 @@ run-name: '${{ github.event.workflow_run && github.event.workflow_run.head_branc
 
 on:
   workflow_dispatch:
+    inputs:
+      testtree:
+        description: 'proxysql_3p_testing treeish/branch/tag/hash'
+        default: main
+        type: string
   workflow_run:
     workflows: [ CI-trigger ]
     types: [ completed ]
@@ -31,7 +36,9 @@ jobs:
       connector: ${{ vars.MATRIX_3P_SQLALCHEMY_connector_mariadb }}
 
   run-pgsql:
-    if: ${{ github.event.workflow_run && github.event.workflow_run.conclusion == 'success' || ! github.event.workflow_run }}
+    if: |
+      (github.event.workflow_run && github.event.workflow_run.conclusion == 'success' || ! github.event.workflow_run) &&
+      ! startsWith((github.event.workflow_run && github.event.workflow_run.head_branch || github.ref_name), 'v2.')
     uses: sysown/proxysql/.github/workflows/ci-3p-sqlalchemy.yml@GH-Actions
     secrets: inherit
     with:

diff --git a/Makefile b/Makefile
@@ -308,22 +308,22 @@ pkglist: $(REL_ARCH)-pkglist
 amd64-%: SYS_ARCH := x86_64
 amd64-packages: amd64-centos amd64-ubuntu amd64-debian amd64-fedora amd64-opensuse amd64-almalinux
 amd64-almalinux: almalinux8 almalinux8-clang almalinux8-dbg almalinux9 almalinux9-clang almalinux9-dbg
-amd64-centos: centos8 centos8-clang centos8-dbg centos9 centos9-clang centos9-dbg
-amd64-debian: debian10 debian10-dbg debian11 debian11-clang debian11-dbg debian12 debian12-clang debian12-dbg
-amd64-fedora: fedora38 fedora38-clang fedora38-dbg fedora39 fedora39-clang fedora39-dbg fedora40 fedora40-clang fedora40-dbg fedora41 fedora41-clang fedora41-dbg
+amd64-centos: centos9 centos9-clang centos9-dbg
+amd64-debian: debian12 debian12-clang debian12-dbg
+amd64-fedora: fedora40 fedora40-clang fedora40-dbg fedora41 fedora41-clang fedora41-dbg
 amd64-opensuse: opensuse15 opensuse15-clang opensuse15-dbg
-amd64-ubuntu: ubuntu18 ubuntu18-dbg ubuntu20 ubuntu20-clang ubuntu20-dbg ubuntu22 ubuntu22-clang ubuntu22-dbg ubuntu24 ubuntu24-clang ubuntu24-dbg
+amd64-ubuntu: ubuntu22 ubuntu22-clang ubuntu22-dbg ubuntu24 ubuntu24-clang ubuntu24-dbg
 amd64-pkglist:
 	@make -nk amd64-packages 2>/dev/null | grep -Po '(?<=binaries/)proxysql\S+$$'
 
 arm64-%: SYS_ARCH := aarch64
 arm64-packages: arm64-centos arm64-debian arm64-ubuntu arm64-fedora arm64-opensuse arm64-almalinux
 arm64-almalinux: almalinux8 almalinux9
-arm64-centos: centos8 centos9
-arm64-debian: debian10 debian11 debian12
-arm64-fedora: fedora38 fedora39 fedora40 fedora41
+arm64-centos: centos9
+arm64-debian: debian12
+arm64-fedora: fedora40 fedora41
 arm64-opensuse: opensuse15
-arm64-ubuntu: ubuntu18 ubuntu20 ubuntu22 ubuntu24
+arm64-ubuntu: ubuntu22 ubuntu24
 arm64-pkglist:
 	@make -nk arm64-packages 2>/dev/null | grep -Po '(?<=binaries/)proxysql\S+$$'