fix the behavior of background system commands

Signed-off-by: xxchan <[email protected]>
risinglightdb · Apr 17, 2024 · 521bdf2 · 521bdf2
1 parent fa4cc21
commit 521bdf2
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 * bin: When using `-j <jobs>` to run tests in parallel, add a random suffix to the temporary databases. This is useful if the test is manually canceled, but you want to rerun it freshly. Note that if the test failed, the database will be dropped. This is existing behavior and unchanged.
 * bin: replace `env_logger` with `tracing-subscriber`. You will be able to see the record being executed with `RUST_LOG=debug sqllogictest ...`.
+* runner: fix the behavior of background `system` commands (end with `&`). In `0.20.0`, it will block until the process exits. Now we return immediately.
+  ```
+  system ok
+  sleep 5 &
+  ```
 
 ## [0.20.0] - 2024-04-08
 

diff --git a/sqllogictest/src/runner.rs b/sqllogictest/src/runner.rs
@@ -619,7 +619,11 @@ impl<D: AsyncDB, M: MakeConnection<Conn = D>> Runner<D, M> {
                 loc: _,
                 stdout: expected_stdout,
             } => {
-                let command = match self.may_substitute(command) {
+                if should_skip(&self.labels, "", &conditions) {
+                    return RecordOutput::Nothing;
+                }
+
+                let mut command = match self.may_substitute(command) {
                     Ok(command) => command,
                     Err(error) => {
                         return RecordOutput::System {
@@ -629,8 +633,14 @@ impl<D: AsyncDB, M: MakeConnection<Conn = D>> Runner<D, M> {
                     }
                 };
 
-                if should_skip(&self.labels, "", &conditions) {
-                    return RecordOutput::Nothing;
+                let is_background = command
+                    .trim()
+                    .chars()
+                    .last()
+                    .expect("system command is emptry")
+                    == '&';
+                if is_background {
+                    command = command.trim_end_matches('&').trim().to_string();
                 }
 
                 let mut cmd = if cfg!(target_os = "windows") {
@@ -642,8 +652,22 @@ impl<D: AsyncDB, M: MakeConnection<Conn = D>> Runner<D, M> {
                     cmd.arg("-c").arg(command);
                     cmd
                 };
+
+                if is_background {
+                    // Spawn a new process, but don't wait for stdout, otherwise it will block until the process exits.
+                    let error: Option<AnyError> = match cmd.spawn() {
+                        Ok(_) => None,
+                        Err(e) => Some(Arc::new(e)),
+                    };
+                    return RecordOutput::System {
+                        error,
+                        stdout: None,
+                    };
+                }
+
                 cmd.stdout(std::process::Stdio::piped());
                 cmd.stderr(std::process::Stdio::piped());
+
                 let result = D::run_command(cmd).await;
                 #[derive(thiserror::Error, Debug)]
                 #[error(