From b5a6e18511f7df9c86151a14d7827e4ab630f46c Mon Sep 17 00:00:00 2001 From: Nikolay Degterinsky Date: Sat, 7 Aug 2021 15:15:49 +0000 Subject: [PATCH] Small fixes --- .gitmodules | 2 +- src/Common/ErrorCodes.cpp | 4 ++-- tests/queries/0_stateless/02003_compress_bz2.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6bcb2f18c61..37b22527eb4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -245,4 +245,4 @@ url = https://github.com/ClickHouse-Extras/s2geometry.git [submodule "contrib/bzip2"] path = contrib/bzip2 - url = https://gitlab.com/federicomenaquintero/bzip2.git + url = https://github.com/ClickHouse-Extras/bzip2.git diff --git a/src/Common/ErrorCodes.cpp b/src/Common/ErrorCodes.cpp index 2bb378f13b5..04f10fb536a 100644 --- a/src/Common/ErrorCodes.cpp +++ b/src/Common/ErrorCodes.cpp @@ -561,14 +561,14 @@ M(591, SQLITE_ENGINE_ERROR) \ M(592, DATA_ENCRYPTION_ERROR) \ M(593, ZERO_COPY_REPLICATION_ERROR) \ + M(594, BZIP2_STREAM_DECODER_FAILED) \ + M(595, BZIP2_STREAM_ENCODER_FAILED) \ \ M(998, POSTGRESQL_CONNECTION_FAILURE) \ M(999, KEEPER_EXCEPTION) \ M(1000, POCO_EXCEPTION) \ M(1001, STD_EXCEPTION) \ M(1002, UNKNOWN_EXCEPTION) \ - M(1003, BZIP2_STREAM_DECODER_FAILED) \ - M(1004, BZIP2_STREAM_ENCODER_FAILED) \ /* See END */ diff --git a/tests/queries/0_stateless/02003_compress_bz2.sh b/tests/queries/0_stateless/02003_compress_bz2.sh index 790a520ef24..b65ce2f233b 100755 --- a/tests/queries/0_stateless/02003_compress_bz2.sh +++ b/tests/queries/0_stateless/02003_compress_bz2.sh @@ -8,7 +8,7 @@ USER_FILES_PATH=$(clickhouse-client --query "select _path,_file from file('nonex WORKING_FOLDER_02003="${USER_FILES_PATH}/${CLICKHOUSE_DATABASE}" rm -rf "${WORKING_FOLDER_02003}" -mkdir ${WORKING_FOLDER_02003} +mkdir "${WORKING_FOLDER_02003}" ${CLICKHOUSE_CLIENT} --query "SELECT * FROM (SELECT 'Hello, World!' as String) INTO OUTFILE '${WORKING_FOLDER_02003}/bz2_compression.bz2'" bzip2 -t ${WORKING_FOLDER_02003}/bz2_compression.bz2