thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-22 07:31:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix 'Unknown executor' when reading from stdin in clickhouse local

Browse Source
This commit is contained in:
Michael Kolupaev 2024-10-25 06:12:50 +00:00
parent 2e61f2bb99
commit e19bf218f6
6 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
programs/local/LocalServer.cpp
View File

@ -130,6 +130,11 @@ void applySettingsOverridesForLocal(ContextMutablePtr context)
context->setSettings(settings); context->setSettings(settings);
} }
LocalServer::LocalServer()
{
is_local = true;
}
Poco::Util::LayeredConfiguration & LocalServer::getClientConfiguration() Poco::Util::LayeredConfiguration & LocalServer::getClientConfiguration()
{ {
return config(); return config();

2
programs/local/LocalServer.h
View File

@ -23,7 +23,7 @@ namespace DB
class LocalServer : public ClientApplicationBase, public Loggers class LocalServer : public ClientApplicationBase, public Loggers
{ {
public: public:
LocalServer() = default; LocalServer();
void initialize(Poco::Util::Application & self) override; void initialize(Poco::Util::Application & self) override;

3
src/Client/ClientBase.cpp
View File

@ -1748,7 +1748,8 @@ void ClientBase::sendData(Block & sample, const ColumnsDescription & columns_des
} }
else if (!is_interactive) else if (!is_interactive)
{ {
sendDataFromStdin(sample, columns_description_for_query, parsed_query); if (!is_local)
sendDataFromStdin(sample, columns_description_for_query, parsed_query);
} }
else else
throw Exception(ErrorCodes::NO_DATA_TO_INSERT, "No data to insert"); throw Exception(ErrorCodes::NO_DATA_TO_INSERT, "No data to insert");

2
src/Client/ClientBase.h
View File

@ -263,6 +263,8 @@ protected:
bool is_interactive = false; /// Use either interactive line editing interface or batch mode. bool is_interactive = false; /// Use either interactive line editing interface or batch mode.
bool delayed_interactive = false; bool delayed_interactive = false;
bool is_local = false; /// clickhouse-local, otherwise clickhouse-client
bool echo_queries = false; /// Print queries before execution in batch mode. bool echo_queries = false; /// Print queries before execution in batch mode.
bool ignore_error = false; /// In case of errors, don't print error message, continue to next query. Only applicable for non-interactive mode. bool ignore_error = false; /// In case of errors, don't print error message, continue to next query. Only applicable for non-interactive mode.

4
tests/queries/0_stateless/03031_clickhouse_local_input.reference
View File

@ -1,4 +1,6 @@
# foo # foo (pipe)
foo
# foo (file)
foo foo
# !foo # !foo
# bar # bar

17
tests/queries/0_stateless/03031_clickhouse_local_input.sh
View File

@ -4,17 +4,28 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
# shellcheck source=../shell_config.sh # shellcheck source=../shell_config.sh
. "$CUR_DIR"/../shell_config.sh . "$CUR_DIR"/../shell_config.sh
tmp_file="$CUR_DIR/$CLICKHOUSE_DATABASE.txt" tmp_file="$CUR_DIR/03031_$CLICKHOUSE_DATABASE.txt"
echo '# foo' tmp_input="$CUR_DIR/03031_${CLICKHOUSE_DATABASE}_in.txt"
echo '# foo (pipe)'
$CLICKHOUSE_LOCAL --engine_file_truncate_on_insert=1 -q "insert into function file('$tmp_file', 'LineAsString', 'x String') select * from input('x String') format LineAsString" <<<foo $CLICKHOUSE_LOCAL --engine_file_truncate_on_insert=1 -q "insert into function file('$tmp_file', 'LineAsString', 'x String') select * from input('x String') format LineAsString" <<<foo
cat "$tmp_file" cat "$tmp_file"
echo '# foo (file)'
echo 'foo' > "$tmp_input"
$CLICKHOUSE_LOCAL --engine_file_truncate_on_insert=1 -q "insert into function file('$tmp_file', 'LineAsString', 'x String') select * from input('x String') format LineAsString" <"$tmp_input"
cat "$tmp_file"
echo '# !foo' echo '# !foo'
$CLICKHOUSE_LOCAL --engine_file_truncate_on_insert=1 -q "insert into function file('$tmp_file', 'LineAsString', 'x String') select * from input('x String') where x != 'foo' format LineAsString" <<<foo $CLICKHOUSE_LOCAL --engine_file_truncate_on_insert=1 -q "insert into function file('$tmp_file', 'LineAsString', 'x String') select * from input('x String') where x != 'foo' format LineAsString" <<<foo
cat "$tmp_file" cat "$tmp_file"
echo '# bar' echo '# bar'
$CLICKHOUSE_LOCAL --engine_file_truncate_on_insert=1 -q "insert into function file('$tmp_file', 'LineAsString', 'x String') select y from input('x String, y String') format TSV" <<<$'foo\tbar' $CLICKHOUSE_LOCAL --engine_file_truncate_on_insert=1 -q "insert into function file('$tmp_file', 'LineAsString', 'x String') select y from input('x String, y String') format TSV" <<<$'foo\tbar'
cat "$tmp_file" cat "$tmp_file"
echo '# defaults' echo '# defaults'
$CLICKHOUSE_LOCAL --input_format_tsv_empty_as_default=1 --engine_file_truncate_on_insert=1 -q "insert into function file('$tmp_file', 'LineAsString', 'x String') select y from input('x String, y String DEFAULT \\'bam\\'') format TSV" <<<$'foo\t' $CLICKHOUSE_LOCAL --input_format_tsv_empty_as_default=1 --engine_file_truncate_on_insert=1 -q "insert into function file('$tmp_file', 'LineAsString', 'x String') select y from input('x String, y String DEFAULT \\'bam\\'') format TSV" <<<$'foo\t'
cat "$tmp_file" cat "$tmp_file"
rm -f "${tmp_file:?}"
rm -f "${tmp_file:?}" "${tmp_input:?}"