CLICKHOUSE-1420 Clear query in client by Ctrl+C #2877
Closed
Conversation
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 reverts commit df017f9.
CurtizJ
changed the title
dbms/programs/client/Client.cpp
Outdated
| { | ||
| if(signo == SIGINT) | ||
| { | ||
| if (strcmp(rl_line_buffer, "") == 0) |
There was a problem hiding this comment.
check for first byte is enough
dbms/programs/client/Client.cpp
Outdated
| @@ -658,6 +659,24 @@ class Client : public Poco::Util::Application | |||
| return boost::replace_all_copy(prompt_by_server_display_name, "{database}", config().getString("database", "default")); | |||
| } | |||
|
|
|||
| static void signalHandler(int signo) | |||
| { | |||
| if(signo == SIGINT) | |||
dbms/programs/client/Client.cpp
Outdated
| @@ -658,6 +659,24 @@ class Client : public Poco::Util::Application | |||
| return boost::replace_all_copy(prompt_by_server_display_name, "{database}", config().getString("database", "default")); | |||
| } | |||
|
|
|||
| static void signalHandler(int signo) | |||
dbms/programs/client/Client.cpp
Outdated
| @@ -571,7 +571,8 @@ class Client : public Poco::Util::Application | |||
| Poco::File(history_file).createFile(); | |||
| } | |||
|
|
|||
| loop(); | |||
| signal(SIGINT, signalHandler); | |||
dbms/programs/client/Client.cpp
Outdated
| if (strcmp(rl_line_buffer, "") == 0) | ||
| { | ||
| std::cout << std::endl; | ||
| exit(SIGINT); |
There was a problem hiding this comment.
Goodbye message is not printed.
| { | ||
| std::cout << std::endl; | ||
| rl_replace_line("", 0); | ||
| rl_forced_update_display(); |
There was a problem hiding this comment.
Return value is ignored.
| @@ -1099,6 +1118,8 @@ class Client : public Poco::Util::Application | |||
| /// Also checks if query execution should be cancelled. | |||
| void receiveResult() | |||
| { | |||
| signal(SIGINT, SIG_DFL); | |||
There was a problem hiding this comment.
Is it really needed?
(We block signals in InterruptListener.)
There was a problem hiding this comment.
Without it exit by double press Ctrl+c doesn`t work.
There was a problem hiding this comment.
How it can be explained?
| @@ -571,7 +571,9 @@ class Client : public Poco::Util::Application | |||
| Poco::File(history_file).createFile(); | |||
| } | |||
|
|
|||
| loop(); | |||
| if (signal(SIGINT, signalHandler) == SIG_ERR) | |||
| throwFromErrno("Cannot handle signal.", ErrorCodes::CANNOT_WAIT_FOR_SIGNAL); | |||
| { | ||
| if (!rl_line_buffer[0]) | ||
| { | ||
| std::cout << std::endl << "Bye." << std::endl; |
There was a problem hiding this comment.
The code is duplicated.
| if (!rl_line_buffer[0]) | ||
| { | ||
| std::cout << std::endl << "Bye." << std::endl; | ||
| exit(SIGINT); |
There was a problem hiding this comment.
Destructor of Client class wont be invoked. ASan and Valgrind will report false positive memory leaks.
| @@ -1129,6 +1153,8 @@ class Client : public Poco::Util::Application | |||
|
|
|||
| if (cancelled && is_interactive) | |||
| std::cout << "Query was cancelled." << std::endl; | |||
|
|
|||
| signal(SIGINT, signalHandler); | |||
There was a problem hiding this comment.
Return code is not checked.
| /// or to exit if query is empty | ||
| static void signalHandler(int signo) | ||
| { | ||
| if (signo == SIGINT) |
| { | ||
| if (!rl_line_buffer[0]) | ||
| { | ||
| std::cout << std::endl << "Bye." << std::endl; |
There was a problem hiding this comment.
It is not signal-safe.
alexey-milovidov
added a commit
that referenced
this pull request
Aug 20, 2018
|
I've edited your implementation. Now it's much more simple. |
alexey-milovidov
added a commit
that referenced
this pull request
Aug 20, 2018
alexey-milovidov
added a commit
that referenced
this pull request
Aug 20, 2018
alexey-milovidov
added a commit
that referenced
this pull request
Aug 20, 2018
alexey-milovidov
added a commit
that referenced
this pull request
Aug 21, 2018
alexey-milovidov
added a commit
that referenced
this pull request
Aug 22, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
I hereby agree to the terms of the CLA available at: https://yandex.ru/legal/cla/?lang=en