This commit is contained in:
kssenii 2024-12-13 10:55:39 +01:00
parent b231e9e015
commit f96a32ee2c
2 changed files with 5 additions and 4 deletions

View File

@ -5560,9 +5560,6 @@ Only available in ClickHouse Cloud. Exclude new data parts from SELECT queries u
)", 0) \ )", 0) \
DECLARE(Int64, prefer_warmed_unmerged_parts_seconds, 0, R"( DECLARE(Int64, prefer_warmed_unmerged_parts_seconds, 0, R"(
Only available in ClickHouse Cloud. If a merged part is less than this many seconds old and is not pre-warmed (see cache_populated_by_fetch), but all its source parts are available and pre-warmed, SELECT queries will read from those parts instead. Only for ReplicatedMergeTree. Note that this only checks whether CacheWarmer processed the part; if the part was fetched into cache by something else, it'll still be considered cold until CacheWarmer gets to it; if it was warmed, then evicted from cache, it'll still be considered warm. Only available in ClickHouse Cloud. If a merged part is less than this many seconds old and is not pre-warmed (see cache_populated_by_fetch), but all its source parts are available and pre-warmed, SELECT queries will read from those parts instead. Only for ReplicatedMergeTree. Note that this only checks whether CacheWarmer processed the part; if the part was fetched into cache by something else, it'll still be considered cold until CacheWarmer gets to it; if it was warmed, then evicted from cache, it'll still be considered warm.
)", 0) \
DECLARE(Bool, allow_experimental_database_iceberg, false, R"(
Allow experimental database engine Iceberg
)", 0) \ )", 0) \
DECLARE(Bool, allow_deprecated_error_prone_window_functions, false, R"( DECLARE(Bool, allow_deprecated_error_prone_window_functions, false, R"(
Allow usage of deprecated error prone window functions (neighbor, runningAccumulate, runningDifferenceStartingWithFirstValue, runningDifference) Allow usage of deprecated error prone window functions (neighbor, runningAccumulate, runningDifferenceStartingWithFirstValue, runningDifference)
@ -5922,6 +5919,9 @@ Allow to create database with Engine=MaterializedPostgreSQL(...).
/** Experimental feature for moving data between shards. */ \ /** Experimental feature for moving data between shards. */ \
DECLARE(Bool, allow_experimental_query_deduplication, false, R"( DECLARE(Bool, allow_experimental_query_deduplication, false, R"(
Experimental data deduplication for SELECT queries based on part UUIDs Experimental data deduplication for SELECT queries based on part UUIDs
)", EXPERIMENTAL) \
DECLARE(Bool, allow_experimental_database_iceberg, false, R"(
Allow experimental database engine Iceberg
)", EXPERIMENTAL) \ )", EXPERIMENTAL) \
\ \
/* ####################################################### */ \ /* ####################################################### */ \

View File

@ -53,7 +53,8 @@ std::pair<std::string, std::string> parseCatalogCredential(const std::string & c
/// Parse a string of format "<client_id>:<client_secret>" /// Parse a string of format "<client_id>:<client_secret>"
/// into separare strings client_id and client_secret. /// into separare strings client_id and client_secret.
std::string client_id, client_secret; std::string client_id;
std::string client_secret;
if (!catalog_credential.empty()) if (!catalog_credential.empty())
{ {
auto pos = catalog_credential.find(':'); auto pos = catalog_credential.find(':');