-
Notifications
You must be signed in to change notification settings - Fork 52
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix(external): close stdin properly in shutdown() #255
Merged
Merged
Changes from 2 commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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,11 @@ impl AsyncDB for ExternalDriver { | |
sql: sql.to_string(), | ||
}; | ||
let input = serde_json::to_string(&input)?; | ||
self.stdin.write_all(input.as_bytes()).await?; | ||
match &mut self.stdin { | ||
Some(stdin) => stdin.write_all(input.as_bytes()).await?, | ||
None => return Err(io::Error::from(io::ErrorKind::UnexpectedEof).into()), | ||
}; | ||
|
||
let output = match self.stdout.next().await { | ||
Some(Ok(output)) => output, | ||
Some(Err(e)) => return Err(e), | ||
|
@@ -114,7 +118,7 @@ impl AsyncDB for ExternalDriver { | |
} | ||
|
||
async fn shutdown(&mut self) { | ||
self.stdin.shutdown().await.ok(); | ||
drop(self.stdin.take()); | ||
xxchan marked this conversation as resolved.
Show resolved
Hide resolved
Comment on lines
-117
to
+122
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I just found the implementation of |
||
self.child.wait().await.ok(); | ||
} | ||
|
||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shall we directly panic if it's already shut down, just like
sqllogictest-rs/sqllogictest-engines/src/postgres.rs
Line 50 in 3a603d7
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
make sense, updated it in 6a05348, PTAL