feat: support skip files with regex (#271)

* feat: support regex filter to filter slt files

Signed-off-by: MrCroxx <[email protected]>

* refactor: replace filter with skip

Signed-off-by: MrCroxx <[email protected]>

* ci: bump cargo-semver-checks

Signed-off-by: MrCroxx <[email protected]>

---------

Signed-off-by: MrCroxx <[email protected]>

Author: MrCroxx

.github/workflows/ci.yml

@@ -68,7 +68,7 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: install
-          args: cargo-semver-checks --version ^0.41 --locked
+          args: cargo-semver-checks --version ^0.43 --locked
       - name: Check semver
         run: |
          cargo semver-checks check-release -p sqllogictest

Cargo.lock

@@ -21,6 +21,7 @@ console = { version = "0.15" }
 easy-ext = "1"
 futures = { version = "0.3", default-features = false }
 glob = "0.3"
+fancy-regex = "0.16"
 itertools = "0.13"
 quick-junit = { version = "0.5" }
 rand = "0.8"

sqllogictest-bin/Cargo.toml

@@ -11,6 +11,7 @@ use chrono::Local;
 use clap::{Arg, ArgAction, CommandFactory, FromArgMatches, Parser, ValueEnum};
 use console::style;
 use engines::{EngineConfig, EngineType};
+use fancy_regex::Regex;
 use fs_err::{File, OpenOptions};
 use futures::StreamExt;
 use itertools::Itertools;
@@ -137,6 +138,10 @@ struct Opt {
     /// test file is finished. By default, this is unspecified, meaning to wait forever.
     #[clap(long = "shutdown-timeout", env = "SLT_SHUTDOWN_TIMEOUT")]
     shutdown_timeout_secs: Option<u64>,
+
+    /// Skip tests that matches the given regex.
+    #[clap(long)]
+    skip: Option<String>,
 }
 
 /// Connection configuration.
@@ -247,6 +252,7 @@ pub async fn main() -> Result<()> {
         partition_count,
         partition_id,
         shutdown_timeout_secs,
+        skip,
     } = Opt::from_arg_matches(&matches)
         .map_err(|err| err.exit())
         .unwrap();
@@ -295,11 +301,24 @@ pub async fn main() -> Result<()> {
     let glob_patterns = files;
     let mut all_files = Vec::new();
 
+    let re = skip
+        .map(|s| Regex::new(&s))
+        .transpose()
+        .context("invalid regex")?;
+
     for glob_pattern in glob_patterns {
         let mut files: Vec<PathBuf> = glob::glob(&glob_pattern)
             .context("failed to read glob pattern")?
             .try_collect()?;
 
+        if let Some(re) = &re {
+            files.retain(|path| {
+                !re.is_match(&path.to_string_lossy())
+                    .context("invalid regex")
+                    .unwrap()
+            });
+        }
+
         // Test against partitioner only if there are multiple files matched, e.g., expanded from an `*`.
         if files.len() > 1 {
             if let Some(partitioner) = &partitioner {

sqllogictest-bin/src/main.rs

@@ -15,7 +15,7 @@ pub(crate) struct Substitution<'a> {
 }
 
 impl Substitution<'_> {
-    pub fn new(runner_locals: &RunnerLocals, subst_env_vars: bool) -> Substitution {
+    pub fn new(runner_locals: &RunnerLocals, subst_env_vars: bool) -> Substitution<'_> {
         Substitution {
             runner_locals,
             subst_env_vars,