Fix up some leftovers

This commit is contained in:
Robert Schulze 2023-01-27 10:42:10 +00:00
parent 7d97fab2dc
commit e30c38cab3
No known key found for this signature in database
GPG Key ID: 26703B55FB13728A
3 changed files with 6 additions and 6 deletions

View File

@ -1304,7 +1304,7 @@ Default value: `3`.
## use_query_result_cache {#use-query-result-cache}
If turned on, SELECT queries may utilize the [query result cache](../query-result-cache.md). Parameters [use_query_result_cache_passive_usage](#use-query-result-cache-passive-usage)
and [use_query_result_cache_active_usage](#use-query-result-cache-active-usage) control how the cache can be used in more detail.
and [use_query_result_cache_active_usage](#use-query-result-cache-active-usage) control in more detail how the cache is used.
Possible values:

View File

@ -543,7 +543,6 @@ class IColumn;
M(Bool, use_query_result_cache, false, "Enable the query result cache", 0) \
M(Bool, use_query_result_cache_active_usage, true, "Utilize the query result cache actively, i.e. store results of SELECT queries in the cache", 0) \
M(Bool, use_query_result_cache_passive_usage, true, "Utilize the query result cache passively, i.e. retrieve results of SELECT queries from the cache", 0) \
M(Bool, enable_experimental_query_result_cache_passive_usage, false, "Retrieve results of SELECT queries from the query result cache", 0) \
M(Bool, query_result_cache_store_results_of_queries_with_nondeterministic_functions, false, "Store results of queries with non-deterministic functions (e.g. rand(), now()) in the query result cache", 0) \
M(UInt64, query_result_cache_min_query_runs, 0, "Minimum number a SELECT query must run before its result is stored in the query result cache", 0) \
M(Milliseconds, query_result_cache_min_query_duration, 0, "Minimum time in milliseconds for a query to run for its result to be stored in the query result cache.", 0) \

View File

@ -89,7 +89,7 @@ public:
}
/// TODO further improve AST cleanup, e.g. remove SETTINGS clause completely if it is empty
/// E.g. SELECT 1 SETTINGS enable_experimental_query_result_cache = true
/// E.g. SELECT 1 SETTINGS use_query_result_cache = true
/// and SELECT 1;
/// currently don't match.
};
@ -97,11 +97,12 @@ public:
using RemoveQueryResultCacheSettingsVisitor = InDepthNodeVisitor<RemoveQueryResultCacheSettingsMatcher, true>;
/// Consider
/// (1) SET enable_experimental_query_result_cache = true;
/// (1) SET use_query_result_cache = true;
/// SELECT expensiveComputation(...) SETTINGS max_threads = 64, query_result_cache_ttl = 300;
/// SET enable_experimental_query_result_cache = false;
/// SET use_query_result_cache = false;
/// and
/// (2) SELECT expensiveComputation(...) SETTINGS max_threads = 64, enable_experimental_query_result_cache_passive_usage = true;
/// (2) SELECT expensiveComputation(...) SETTINGS max_threads = 64, use_query_result_cache = true;
///
/// The SELECT queries in (1) and (2) are basically the same and the user expects that the second invocation is served from the query result
/// cache. However, query results are indexed by their query ASTs and therefore no result will be found. Insert and retrieval behave overall
/// more natural if settings related to the query result cache are erased from the AST key. Note that at this point the settings themselves