From 19b673fb3b2ef2c5292193e255818a62e5361a68 Mon Sep 17 00:00:00 2001 From: BoloniniD Date: Sat, 17 Jul 2021 15:30:03 +0300 Subject: [PATCH] Style fix for error message --- src/Storages/StorageFile.cpp | 2 +- tests/queries/0_stateless/01947_multiple_pipe_read.reference | 2 +- tests/queries/0_stateless/01947_multiple_pipe_read.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Storages/StorageFile.cpp b/src/Storages/StorageFile.cpp index 7ee622bd7de..09d097d4bc7 100644 --- a/src/Storages/StorageFile.cpp +++ b/src/Storages/StorageFile.cpp @@ -520,7 +520,7 @@ Pipe StorageFile::read( else { // else if fd is not a regular file, then throw an Exception - throw Exception("Cannot read from a pipeline twice", ErrorCodes::CANNOT_READ_FROM_FILE_DESCRIPTOR); + throw Exception("Cannot read from a pipe twice", ErrorCodes::CANNOT_READ_FROM_FILE_DESCRIPTOR); } } pipes.emplace_back(std::make_shared( diff --git a/tests/queries/0_stateless/01947_multiple_pipe_read.reference b/tests/queries/0_stateless/01947_multiple_pipe_read.reference index 7a4f632aa20..5a0b27d4867 100644 --- a/tests/queries/0_stateless/01947_multiple_pipe_read.reference +++ b/tests/queries/0_stateless/01947_multiple_pipe_read.reference @@ -24,4 +24,4 @@ Attempt to read twice from a regular file 6,"AAA" ****************** Attempt to read twice from a pipe -OK: stderr contains a message 'Cannot read from a pipeline twice' +OK: stderr contains a message 'Cannot read from a pipe twice' diff --git a/tests/queries/0_stateless/01947_multiple_pipe_read.sh b/tests/queries/0_stateless/01947_multiple_pipe_read.sh index 12ea095a877..77176223cd4 100755 --- a/tests/queries/0_stateless/01947_multiple_pipe_read.sh +++ b/tests/queries/0_stateless/01947_multiple_pipe_read.sh @@ -17,7 +17,7 @@ ${CLICKHOUSE_LOCAL} --structure 'key String' -q 'select * from table; select * f echo '******************' echo 'Attempt to read twice from a pipe' echo 1 | ${CLICKHOUSE_LOCAL} --structure "a int" --query "select a from table where a in (select a from table)" 2>"$STD_ERROR_CAPTURED" -expected_error_message='Cannot read from a pipeline twice' +expected_error_message='Cannot read from a pipe twice' cat "$STD_ERROR_CAPTURED" | grep -q "$expected_error_message" && echo "OK: stderr contains a message '$expected_error_message'" || echo "FAILED: Error message is wrong" rm "$SAMPLE_FILE" "$STD_ERROR_CAPTURED"