diff --git a/.github/actions/setup/mysql/action.yml b/.github/actions/setup/mysql/action.yml index b89ef371df..ae4b50e201 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,17 @@ 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}" + brew: mysql@8.0 - 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 + run: echo "/opt/homebrew/opt/mysql@8.0/bin" >> $GITHUB_PATH - 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 }} 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 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