From 047f15f0f845f0a66f54ace2b0416d3f0d02d9fb Mon Sep 17 00:00:00 2001 From: An Qi Date: Wed, 12 Feb 2025 15:20:57 +0800 Subject: [PATCH 1/4] fix(vectordb): dependencies conflicts --- dataSource/vectordb/pom.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dataSource/vectordb/pom.xml b/dataSource/vectordb/pom.xml index 15cc59bf78..ca32a0555d 100644 --- a/dataSource/vectordb/pom.xml +++ b/dataSource/vectordb/pom.xml @@ -48,8 +48,17 @@ org.slf4j slf4j-api + + net.minidev + json-smart + + + net.minidev + json-smart + 2.4.10 + com.google.protobuf protobuf-java From b90c02d4bc5c0ca5e0b088813f4ca0999e1ce158 Mon Sep 17 00:00:00 2001 From: An Qi Date: Wed, 12 Feb 2025 15:34:40 +0800 Subject: [PATCH 2/4] ci: use brew to install mysql --- .github/actions/setup/mysql/action.yml | 46 ++------------------------ 1 file changed, 3 insertions(+), 43 deletions(-) diff --git a/.github/actions/setup/mysql/action.yml b/.github/actions/setup/mysql/action.yml index b89ef371df..807ea983fb 100644 --- a/.github/actions/setup/mysql/action.yml +++ b/.github/actions/setup/mysql/action.yml @@ -1,10 +1,5 @@ name: "mysql" description: "setup mysql" -inputs: - version: - description: "mysql version" - required: false - default: "8.0.35" runs: using: "composite" @@ -16,47 +11,12 @@ runs: sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/ sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld - - if: runner.os == 'macOS' - id: base - name: Initialize Setup Configuration - uses: ./.github/actions/setup/tool + - name: install redis with package manager + uses: ./.github/actions/setup/package with: - tool: mysql - version: ${{ inputs.version }} - - - if: runner.os == 'macOS' - name: Restore mysql Cache - id: restore - uses: actions/cache/restore@v3 - with: - path: ${{ steps.base.outputs.cache-path }} - key: ${{ steps.base.outputs.cache-key }} - - - if: runner.os == 'macOS' - name: Setup mysql into Runner Tool Cache - uses: pbrisbin/setup-tool-action@v2 - with: - name: mysql - version: ${{ inputs.version }} - url: "https://downloads.mysql.com/archives/get/p/23/file/{name}-{version}-{os}-{arch}.{ext}" - os-darwin: macos13 - arch: x86_64 - subdir: "{name}-{version}-{os}-{arch}" - - - if: runner.os == 'macOS' - name: Add mysql bin to PATH - shell: bash - working-directory: ${{ steps.base.outputs.tool-path }} - run: echo "$PWD/bin" >> $GITHUB_PATH + brew: mysql@8.0 - name: Show mysql Version shell: bash working-directory: ${{ github.action_path }} run: mysqld --version - - - name: Save mysql Cache - if: runner.os == 'macOS' && steps.restore.outputs.cache-hit != 'true' - uses: actions/cache/save@v3 - with: - path: ${{ steps.base.outputs.cache-path }} - key: ${{ steps.base.outputs.cache-key }} From 15b488a1dd83b4fdfc0e5bd73c5b6eb21e09cc8c Mon Sep 17 00:00:00 2001 From: An Qi Date: Thu, 13 Feb 2025 09:06:56 +0800 Subject: [PATCH 3/4] fix mysql path --- .github/actions/setup/mysql/action.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/actions/setup/mysql/action.yml b/.github/actions/setup/mysql/action.yml index 807ea983fb..ae4b50e201 100644 --- a/.github/actions/setup/mysql/action.yml +++ b/.github/actions/setup/mysql/action.yml @@ -16,6 +16,11 @@ runs: with: brew: mysql@8.0 + - if: runner.os == 'macOS' + name: Add mysql bin to PATH + shell: bash + run: echo "/opt/homebrew/opt/mysql@8.0/bin" >> $GITHUB_PATH + - name: Show mysql Version shell: bash working-directory: ${{ github.action_path }} From 27eac8197b632cb338e1f1440ce5c1dc65c5c2cb Mon Sep 17 00:00:00 2001 From: An Qi Date: Fri, 14 Feb 2025 19:19:09 +0800 Subject: [PATCH 4/4] ci: disable vectordb test in macos --- .github/workflows/standard-test-suite.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/standard-test-suite.yml b/.github/workflows/standard-test-suite.yml index 89e2c8f639..16282be3e8 100644 --- a/.github/workflows/standard-test-suite.yml +++ b/.github/workflows/standard-test-suite.yml @@ -40,21 +40,21 @@ jobs: uses: ./.github/workflows/standalone-test.yml with: metadata-matrix: '["zookeeper"]' - os-matrix: '["ubuntu-latest", "macos-latest", "windows-latest"]' + os-matrix: '["ubuntu-latest", "windows-latest"]' db-matrix: '["VectorDB"]' timeout-minutes: 300 standalone-test-no-optimizer-vectordb: uses: ./.github/workflows/standalone-test-no-optimizer.yml with: metadata-matrix: '["zookeeper"]' - os-matrix: '["ubuntu-latest", "macos-latest", "windows-latest"]' + os-matrix: '["ubuntu-latest", "windows-latest"]' db-matrix: '["VectorDB"]' timeout-minutes: 300 db-ce-vectordb: uses: ./.github/workflows/DB-CE.yml with: metadata-matrix: '["zookeeper"]' - os-matrix: '["ubuntu-latest", "macos-latest", "windows-latest"]' + os-matrix: '["ubuntu-latest", "windows-latest"]' db-matrix: '["VectorDB"]' functest: "NewSessionIT,SQLCompareIT,TagIT,RestIT,TransformIT,UDFIT,RestAnnotationIT,SQLSessionIT,SQLSessionPoolIT,SessionV2IT,CompactionIT,TimePrecisionIT,PySessionIT" timeout-minutes: 360 @@ -62,7 +62,7 @@ jobs: uses: ./.github/workflows/DB-CE.yml with: metadata-matrix: '["zookeeper"]' - os-matrix: '["ubuntu-latest", "macos-latest", "windows-latest"]' + os-matrix: '["ubuntu-latest", "windows-latest"]' db-matrix: '["VectorDB"]' functest: "NewSessionIT,SQLCompareIT,TagIT,RestIT,TransformIT,UDFIT,RestAnnotationIT,SQLSessionIT,SQLSessionPoolIT,SessionV2IT,CompactionIT,TimePrecisionIT,PySessionIT" timeout-minutes: 360