diff options
author | milovidov <milovidov@yandex-team.ru> | 2022-02-10 16:52:19 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:52:19 +0300 |
commit | b1cedba7790b1b2256c0d390d37f8b00cf741304 (patch) | |
tree | ab7fbbf3253d4c0e2793218f09378908beb025fb | |
parent | 16d32a342384ae17eaf6bebdca59e5cd206232fb (diff) | |
download | ydb-b1cedba7790b1b2256c0d390d37f8b00cf741304.tar.gz |
Restoring authorship annotation for <milovidov@yandex-team.ru>. Commit 2 of 2.
6 files changed, 18 insertions, 18 deletions
diff --git a/ydb/library/yql/udfs/common/clickhouse/client/src/Common/PipeFDs.cpp b/ydb/library/yql/udfs/common/clickhouse/client/src/Common/PipeFDs.cpp index 66c50e440f4..a5c21e3d872 100644 --- a/ydb/library/yql/udfs/common/clickhouse/client/src/Common/PipeFDs.cpp +++ b/ydb/library/yql/udfs/common/clickhouse/client/src/Common/PipeFDs.cpp @@ -106,7 +106,7 @@ void LazyPipeFDs::tryIncreaseSize(int desired_size) { if (errno == EINVAL) { - LOG_INFO(log, "Cannot get pipe capacity, {}. Very old Linux kernels have no support for this fcntl.", errnoToString(ErrorCodes::CANNOT_FCNTL)); + LOG_INFO(log, "Cannot get pipe capacity, {}. Very old Linux kernels have no support for this fcntl.", errnoToString(ErrorCodes::CANNOT_FCNTL)); /// It will work nevertheless. } else diff --git a/ydb/library/yql/udfs/common/clickhouse/client/src/Common/PoolWithFailoverBase.h b/ydb/library/yql/udfs/common/clickhouse/client/src/Common/PoolWithFailoverBase.h index 9175dc684ae..e84e249d179 100644 --- a/ydb/library/yql/udfs/common/clickhouse/client/src/Common/PoolWithFailoverBase.h +++ b/ydb/library/yql/udfs/common/clickhouse/client/src/Common/PoolWithFailoverBase.h @@ -276,7 +276,7 @@ PoolWithFailoverBase<TNestedPool>::getMany( } else { - LOG_WARNING(log, "Connection failed at try №{}, reason: {}", (shuffled_pool.error_count + 1), fail_message); + LOG_WARNING(log, "Connection failed at try №{}, reason: {}", (shuffled_pool.error_count + 1), fail_message); ProfileEvents::increment(ProfileEvents::DistributedConnectionFailTry); shuffled_pool.error_count = std::min(max_error_cap, shuffled_pool.error_count + 1); diff --git a/ydb/library/yql/udfs/common/clickhouse/client/src/Interpreters/ThreadStatusExt.cpp b/ydb/library/yql/udfs/common/clickhouse/client/src/Interpreters/ThreadStatusExt.cpp index e9fbdc23497..52f9c6b6fbf 100644 --- a/ydb/library/yql/udfs/common/clickhouse/client/src/Interpreters/ThreadStatusExt.cpp +++ b/ydb/library/yql/udfs/common/clickhouse/client/src/Interpreters/ThreadStatusExt.cpp @@ -417,7 +417,7 @@ void ThreadStatus::detachQuery(bool exit_if_already_detached, bool thread_exits) LOG_TRACE(log, "Resetting nice"); if (0 != setpriority(PRIO_PROCESS, thread_id, 0)) - LOG_ERROR(log, "Cannot 'setpriority' back to zero: {}", errnoToString(ErrorCodes::CANNOT_SET_THREAD_PRIORITY, errno)); + LOG_ERROR(log, "Cannot 'setpriority' back to zero: {}", errnoToString(ErrorCodes::CANNOT_SET_THREAD_PRIORITY, errno)); os_thread_priority = 0; } diff --git a/ydb/library/yql/udfs/common/clickhouse/client/src/Parsers/ASTWatchQuery.h b/ydb/library/yql/udfs/common/clickhouse/client/src/Parsers/ASTWatchQuery.h index e0cbc727704..9285742e3cc 100644 --- a/ydb/library/yql/udfs/common/clickhouse/client/src/Parsers/ASTWatchQuery.h +++ b/ydb/library/yql/udfs/common/clickhouse/client/src/Parsers/ASTWatchQuery.h @@ -29,7 +29,7 @@ protected: { std::string indent_str = s.one_line ? "" : std::string(4 * frame.indent, ' '); - s.ostr << (s.hilite ? hilite_keyword : "") << "WATCH " << (s.hilite ? hilite_none : "") + s.ostr << (s.hilite ? hilite_keyword : "") << "WATCH " << (s.hilite ? hilite_none : "") << (!database.empty() ? backQuoteIfNeed(database) + "." : "") << backQuoteIfNeed(table); if (is_watch_events) diff --git a/ydb/library/yql/udfs/common/clickhouse/client/src/Processors/Formats/Impl/TabSeparatedRowInputFormat.cpp b/ydb/library/yql/udfs/common/clickhouse/client/src/Processors/Formats/Impl/TabSeparatedRowInputFormat.cpp index 062749f546b..5d56ed1327e 100644 --- a/ydb/library/yql/udfs/common/clickhouse/client/src/Processors/Formats/Impl/TabSeparatedRowInputFormat.cpp +++ b/ydb/library/yql/udfs/common/clickhouse/client/src/Processors/Formats/Impl/TabSeparatedRowInputFormat.cpp @@ -144,22 +144,22 @@ void TabSeparatedRowInputFormat::readPrefix() if (format_settings.with_names_use_header) { String column_name; - for (;;) + for (;;) { readEscapedString(column_name, in); - if (!checkChar('\t', in)) - { - /// Check last column for \r before adding it, otherwise an error will be: - /// "Unknown field found in TSV header" - checkForCarriageReturn(in); - addInputColumn(column_name); - break; - } - else - addInputColumn(column_name); + if (!checkChar('\t', in)) + { + /// Check last column for \r before adding it, otherwise an error will be: + /// "Unknown field found in TSV header" + checkForCarriageReturn(in); + addInputColumn(column_name); + break; + } + else + addInputColumn(column_name); } - + if (!in.eof()) { assertChar('\n', in); diff --git a/ydb/library/yql/udfs/common/clickhouse/client/src/Processors/Transforms/AggregatingTransform.cpp b/ydb/library/yql/udfs/common/clickhouse/client/src/Processors/Transforms/AggregatingTransform.cpp index 3ec5c2a8c46..a8a93e53663 100644 --- a/ydb/library/yql/udfs/common/clickhouse/client/src/Processors/Transforms/AggregatingTransform.cpp +++ b/ydb/library/yql/udfs/common/clickhouse/client/src/Processors/Transforms/AggregatingTransform.cpp @@ -562,9 +562,9 @@ void AggregatingTransform::initGenerate() LOG_DEBUG(log, "Aggregated. {} to {} rows (from {}) in {} sec. ({:.3f} rows/sec., {}/sec.)", src_rows, rows, ReadableSize(src_bytes), - elapsed_seconds, src_rows / elapsed_seconds, + elapsed_seconds, src_rows / elapsed_seconds, ReadableSize(src_bytes / elapsed_seconds)); - + if (params->aggregator.hasTemporaryFiles()) { if (variants.isConvertibleToTwoLevel()) |