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

Code-style fix

Browse Source
This commit is contained in:
Amesaru 2021-04-17 18:24:33 +03:00 committed by Amesaru
parent 9f59b08632
commit 97e87dc06a
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
programs/client/Client.cpp
View File

@ -148,8 +148,8 @@ public:
private:
using StringSet = std::unordered_set<String>;
StringSet exit_strings{"exit", "quit", "logout", "учше", "йгше", "дщпщге", "exit;", "quit;", "logout;", "учшеж",
"йгшеж", "дщпщгеж", "q", "й", "\\q", "\\Q", "\\й", "\\Й", ":q", "Жй"};
StringSet exit_strings{"exit", "quit", "logout", "учше", "йгше", "дщпщге", "exit;", "quit;", "logout;", "учшеж",
"йгшеж", "дщпщгеж", "q", "й", "\\q", "\\Q", "\\й", "\\Й", ":q", "Жй"};
bool is_interactive = true; /// Use either interactive line editing interface or batch mode.
bool echo_queries = false; /// Print queries before execution in batch mode.
bool ignore_error
@ -390,9 +390,10 @@ private:
time_t current_time = time(nullptr);
if (chineseNewYearTimeZoneIndicators + M
== std::find_if(chineseNewYearTimeZoneIndicators, chineseNewYearTimeZoneIndicators + M, [&local_tz](const char * tz) {
return tz == local_tz;
}))
== std::find_if(chineseNewYearTimeZoneIndicators, chineseNewYearTimeZoneIndicators + M, [&local_tz](const char * tz)
{
return tz == local_tz;
}))
return false;
/// It's bad to be intrusive.
@ -1551,7 +1552,8 @@ private:
if (old_settings)
context->setSettings(*old_settings);
});
auto apply_query_settings = [&](const IAST & settings_ast) {
auto apply_query_settings = [&](const IAST & settings_ast)
{
if (!old_settings)
old_settings.emplace(context->getSettingsRef());
context->applySettingsChanges(settings_ast.as<ASTSetQuery>()->changes);

13
programs/local/LocalServer.cpp
View File

@ -391,11 +391,14 @@ void LocalServer::processQueries()
///Set progress show
progress_bar.setNeedRenderProgress(config().getBool("progress", false));
context->setProgressCallback([&](const Progress &value){
progress_bar.updateProgress(progress, value);
progress_bar.writeProgress(progress, watch);
return true;
});
context->setProgressCallback([&]
(const Progress &value)
{
progress_bar.updateProgress(progress, value);
progress_bar.writeProgress(progress, watch);
return true;
}
);
bool echo_queries = config().hasOption("echo") || config().hasOption("verbose");
std::exception_ptr exception;