thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-19 16:20:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix f-string

Browse Source
This commit is contained in:
Alexey Milovidov 2023-10-29 23:43:36 +01:00
parent 4288cb3b78
commit 8e6a7fdff0
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -187,9 +187,10 @@ if (NOT CMAKE_BUILD_TYPE_UC STREQUAL "RELEASE")
endif ()
endif()
if (CMAKE_BUILD_TYPE_UC STREQUAL "RELEASE"
OR CMAKE_BUILD_TYPE_UC STREQUAL "RELWITHDEBINFO"
OR CMAKE_BUILD_TYPE_UC STREQUAL "MINSIZEREL")
if (NOT (SANITIZE_COVERAGE OR WITH_COVERAGE)
AND (CMAKE_BUILD_TYPE_UC STREQUAL "RELEASE"
OR CMAKE_BUILD_TYPE_UC STREQUAL "RELWITHDEBINFO"
OR CMAKE_BUILD_TYPE_UC STREQUAL "MINSIZEREL"))
set (OMIT_HEAVY_DEBUG_SYMBOLS_DEFAULT ON)
else()
set (OMIT_HEAVY_DEBUG_SYMBOLS_DEFAULT OFF)

2
src/Storages/StorageReplicatedMergeTree.cpp
View File

@ -8795,7 +8795,7 @@ void StorageReplicatedMergeTree::createTableSharedID() const
else if (code == Coordination::Error::ZNONODE) /// table completely dropped, we can choose any id we want
{
id = toString(UUIDHelpers::Nil);
LOG_DEBUG(log, "Table was completely drop, we can use anything as ID (will use {})", id);
LOG_DEBUG(log, "Table was completely dropped, and we can use anything as ID (will use {})", id);
}
else if (code != Coordination::Error::ZOK)
{

8
tests/clickhouse-test
View File

@ -1183,7 +1183,7 @@ class TestCase:
coverage = clickhouse_execute(
args,
f"SELECT length(coverage())",
"SELECT length(coverage())",
retry_error_codes=True,
).decode()
@ -2375,6 +2375,12 @@ def main(args):
""",
)
# Coverage collected at the system startup before running any tests:
clickhouse_execute(
args,
"INSERT INTO system.coverage SELECT '', coverage()",
)
total_tests_run = 0
for suite in sorted(os.listdir(base_dir), key=suite_key_func):