try to fix script

Author: xudong963

.github/actions/fuse_compat/action.yml

@@ -19,25 +19,15 @@ runs:
         sha: ${{ github.sha }}
         target: ${{ inputs.target }}
         path: ./bins/current
-
+    - name: Setup Build Tool
+      uses: ./.github/actions/setup_build_tool
+      with:
+        bypass_env_vars: RUSTFLAGS,RUSTDOCFLAGS,RUST_TEST_THREADS,RUST_LOG,RUST_BACKTRACE
     - name: Test compatibility
       shell: bash
       run: |
-        docker run --rm --tty --net=host \
-          --user $(id -u):$(id -g) \
-          --env BUILD_PROFILE \
-          --volume "${PWD}:/workspace" \
-          --workdir "/workspace" \
-          datafuselabs/build-tool:sqllogic \
           bash ./tests/fuse-compat/test-fuse-compat.sh 0.7.150
-        docker run --rm --tty --net=host \
-          --user $(id -u):$(id -g) \
-          --env BUILD_PROFILE \
-          --volume "${PWD}:/workspace" \
-          --workdir "/workspace" \
-          datafuselabs/build-tool:sqllogic \
           bash ./tests/fuse-compat/test-fuse-compat.sh 0.7.151
-
     - name: Upload failure
       if: failure()
       uses: ./.github/actions/artifact_failure

.github/workflows/databend-release.yml

@@ -308,7 +308,7 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           version=${{ needs.create_release.outputs.version }}
-          tar -C ./tests/logictest -czvf testsuites-${version}.tar.gz suites
+          tar -C ./tests/sqllogictests -czvf testsuites-${version}.tar.gz suites
           gh release upload ${version} testsuites-${version}.tar.gz --clobber
 
   release_docker_combined:

tests/compat/test-compat.sh

@@ -10,7 +10,7 @@ pwd
 BUILD_PROFILE="${BUILD_PROFILE:-debug}"
 
 query_config_path="scripts/ci/deploy/config/databend-query-node-1.toml"
-query_test_path="tests/logictest"
+query_test_path="tests/sqllogictests"
 bend_repo_url="https://github.com/datafuselabs/databend"
 
 usage() {
@@ -208,32 +208,16 @@ run_test() {
     echo " === Run metasrv related test: 05_ddl"
 
     if [ "$query_ver" = "current" ]; then
-        cd "$SCRIPT_PATH/../../tests/logictest" || exit
         # Only run test on mysql handler
-        python3 main.py "_ddl_" --handlers mysql
-        cd -
+        cargo run -p sqllogictests -- --run_dir 05_ddl --handlers mysql
     else
         (
             # download suites into ./old_suite
             download_test_suite $query_ver
         )
-        # logictest dir include all suites and scripts fit old query
-        cd "old_suite/tests/logictest" || exit
-
-        # old logic test use NoneType is only support by python3.10
-        sed -i "/^from types.*/d" http_runner.py
-        sed -i "/^from types.*/d" mysql_runner.py
-        sed -i "s/NoneType/type(None)/g" http_runner.py
-        sed -i "s/NoneType/type(None)/g" mysql_runner.py
-
-        # logictest pattern argument change after v0.7.140
-        # old logic test does not support pattern filter
-        mv suites/gen/05_ddl .
-        rm -fr suites/*
-        mv 05_ddl suites/
+
         # FIXME:(everpcpc) sometimes old logic test fails but we can't time travel back to fix it.
-        python3 main.py || true
-        cd -
+        cargo run -p sqllogictests -- --suits "old_suite/tests/sqllogictests/suites" --run_dir 05_ddl || true
     fi
 }
 

tests/fuse-compat/test-fuse-compat.sh

@@ -90,11 +90,9 @@ git_partial_clone() {
 
 # Run specified tests found in logic test suite dir
 run_logictest() {
-    local pattern="$1"
     (
-        cd "tests/logictest"
         # Only run test on mysql handler
-        python3 main.py "$pattern" --handlers mysql --suites "$SCRIPT_PATH/compat-logictest"
+        cargo run -p sqllogictests -- --handlers mysql --suites "$logictest_path"
     )
 
 }

tests/sqllogictests/src/arg.rs

@@ -50,4 +50,13 @@ pub struct SqlLogicTestArgs {
         help = "Choose handlers to run tests, support mysql, http, clickhouse handler, the arg is optional. If use multiple handlers, please use \',\' to split them"
     )]
     pub handlers: Option<Vec<String>>,
+
+    // Choose suits to run
+    #[arg(
+        short = 'u',
+        long = "suits",
+        help = "The tests to be run will come from under suits",
+        default_value = "tests/sqllogictests/suites"
+    )]
+    pub suits: String,
 }

tests/sqllogictests/src/main.rs

@@ -33,8 +33,6 @@ mod client;
 mod error;
 mod util;
 
-const TEST_SUITS: &str = "tests/sqllogictests/suites";
-
 pub struct Databend {
     mysql_client: Option<MysqlClient>,
     http_client: Option<HttpClient>,
@@ -125,23 +123,26 @@ pub async fn main() -> Result<()> {
 }
 
 async fn run_mysql_client() -> Result<()> {
-    let suits = std::fs::read_dir(TEST_SUITS).unwrap();
+    let suits = SqlLogicTestArgs::parse().suits;
+    let suits = std::fs::read_dir(suits).unwrap();
     let mysql_client = MysqlClient::create()?;
     let databend = Databend::create(Some(mysql_client), None, None);
     run_suits(suits, databend).await?;
     Ok(())
 }
 
 async fn run_http_client() -> Result<()> {
-    let suits = std::fs::read_dir(TEST_SUITS).unwrap();
+    let suits = SqlLogicTestArgs::parse().suits;
+    let suits = std::fs::read_dir(suits).unwrap();
     let http_client = HttpClient::create()?;
     let databend = Databend::create(None, Some(http_client), None);
     run_suits(suits, databend).await?;
     Ok(())
 }
 
 async fn run_ck_http_client() -> Result<()> {
-    let suits = std::fs::read_dir(TEST_SUITS).unwrap();
+    let suits = SqlLogicTestArgs::parse().suits;
+    let suits = std::fs::read_dir(suits).unwrap();
     let ck_client = ClickhouseHttpClient::create()?;
     let databend = Databend::create(None, None, Some(ck_client));
     run_suits(suits, databend).await?;