fix(external): close stdin properly in shutdown() (#255)

* close stdin properly

Signed-off-by: Li Yazhou <[email protected]>

* update changelog

Signed-off-by: Li Yazhou <[email protected]>

* expect instead of unexpected eof

Signed-off-by: Li Yazhou <[email protected]>

* bump version

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

---------

Signed-off-by: Li Yazhou <[email protected]>

Author: flaneur2020

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## [0.27.2] - 2025-02-18
+
+* engines/bin: fix stdin to be closed properly to avoid hangs in the `external` engine.
+
 ## [0.27.1] - 2025-02-17
 
 * runner: Add `Runner::set_var` method to allow adding runner-local variables for substitution.

Cargo.lock

@@ -3,7 +3,7 @@ resolver = "2"
 members = ["sqllogictest", "sqllogictest-bin", "sqllogictest-engines", "tests"]
 
 [workspace.package]
-version = "0.27.1"
+version = "0.27.2"
 edition = "2021"
 homepage = "https://github.com/risinglightdb/sqllogictest-rs"
 keywords = ["sql", "database", "parser", "cli"]

Cargo.toml

@@ -35,7 +35,7 @@ use tokio_util::codec::{Decoder, FramedRead};
 /// ```
 pub struct ExternalDriver {
     child: Child,
-    stdin: ChildStdin,
+    stdin: Option<ChildStdin>,
     stdout: FramedRead<ChildStdout, JsonDecoder<Output>>,
 }
 
@@ -76,7 +76,7 @@ impl ExternalDriver {
 
         Ok(Self {
             child,
-            stdin,
+            stdin: Some(stdin),
             stdout,
         })
     }
@@ -98,7 +98,12 @@ impl AsyncDB for ExternalDriver {
             sql: sql.to_string(),
         };
         let input = serde_json::to_string(&input)?;
-        self.stdin.write_all(input.as_bytes()).await?;
+        self.stdin
+            .as_mut()
+            .expect("external driver is shutdown")
+            .write_all(input.as_bytes())
+            .await?;
+
         let output = match self.stdout.next().await {
             Some(Ok(output)) => output,
             Some(Err(e)) => return Err(e),
@@ -114,7 +119,7 @@ impl AsyncDB for ExternalDriver {
     }
 
     async fn shutdown(&mut self) {
-        self.stdin.shutdown().await.ok();
+        drop(self.stdin.take());
         self.child.wait().await.ok();
     }