diff options
author | alesap <alesap@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 | 6a04229b01b9b8a9d405c6d948e763ec8e22c694 (patch) | |
tree | ab7fbbf3253d4c0e2793218f09378908beb025fb | |
parent | 6da3ce2e0ea891f526d292c16df4fb765e5b6bf0 (diff) | |
download | ydb-6a04229b01b9b8a9d405c6d948e763ec8e22c694.tar.gz |
Restoring authorship annotation for <alesap@yandex-team.ru>. Commit 2 of 2.
4 files changed, 26 insertions, 26 deletions
diff --git a/ydb/library/yql/udfs/common/clickhouse/client/src/DataStreams/PushingToViewsBlockOutputStream.h b/ydb/library/yql/udfs/common/clickhouse/client/src/DataStreams/PushingToViewsBlockOutputStream.h index 33eed067a8d..ba125e28829 100644 --- a/ydb/library/yql/udfs/common/clickhouse/client/src/DataStreams/PushingToViewsBlockOutputStream.h +++ b/ydb/library/yql/udfs/common/clickhouse/client/src/DataStreams/PushingToViewsBlockOutputStream.h @@ -36,12 +36,12 @@ struct ViewRuntimeData class PushingToViewsBlockOutputStream : public IBlockOutputStream, WithContext { public: - PushingToViewsBlockOutputStream( - const StoragePtr & storage_, - const StorageMetadataPtr & metadata_snapshot_, + PushingToViewsBlockOutputStream( + const StoragePtr & storage_, + const StorageMetadataPtr & metadata_snapshot_, ContextPtr context_, - const ASTPtr & query_ptr_, - bool no_destination = false); + const ASTPtr & query_ptr_, + bool no_destination = false); Block getHeader() const override; void write(const Block & block) override; @@ -53,7 +53,7 @@ public: private: StoragePtr storage; - StorageMetadataPtr metadata_snapshot; + StorageMetadataPtr metadata_snapshot; BlockOutputStreamPtr output; ReplicatedMergeTreeSink * replicated_output = nullptr; Poco::Logger * log; diff --git a/ydb/library/yql/udfs/common/clickhouse/client/src/DataStreams/RemoteQueryExecutor.cpp b/ydb/library/yql/udfs/common/clickhouse/client/src/DataStreams/RemoteQueryExecutor.cpp index 402e8b48c32..a64c4409cc9 100644 --- a/ydb/library/yql/udfs/common/clickhouse/client/src/DataStreams/RemoteQueryExecutor.cpp +++ b/ydb/library/yql/udfs/common/clickhouse/client/src/DataStreams/RemoteQueryExecutor.cpp @@ -500,7 +500,7 @@ void RemoteQueryExecutor::sendExternalTables() if (pipe.empty()) return std::make_unique<Pipe>( - std::make_shared<SourceFromSingleChunk>(metadata_snapshot->getSampleBlock(), Chunk())); + std::make_shared<SourceFromSingleChunk>(metadata_snapshot->getSampleBlock(), Chunk())); return std::make_unique<Pipe>(std::move(pipe)); }; diff --git a/ydb/library/yql/udfs/common/clickhouse/client/src/Interpreters/ExpressionAnalyzer.h b/ydb/library/yql/udfs/common/clickhouse/client/src/Interpreters/ExpressionAnalyzer.h index 4a660d9d065..2d0041bd96b 100644 --- a/ydb/library/yql/udfs/common/clickhouse/client/src/Interpreters/ExpressionAnalyzer.h +++ b/ydb/library/yql/udfs/common/clickhouse/client/src/Interpreters/ExpressionAnalyzer.h @@ -32,9 +32,9 @@ class ASTExpressionList; class ASTSelectQuery; struct ASTTablesInSelectQueryElement; -struct StorageInMemoryMetadata; -using StorageMetadataPtr = std::shared_ptr<const StorageInMemoryMetadata>; - +struct StorageInMemoryMetadata; +using StorageMetadataPtr = std::shared_ptr<const StorageInMemoryMetadata>; + class ArrayJoinAction; using ArrayJoinActionPtr = std::shared_ptr<ArrayJoinAction>; @@ -253,7 +253,7 @@ struct ExpressionAnalysisResult ExpressionAnalysisResult( SelectQueryExpressionAnalyzer & query_analyzer, - const StorageMetadataPtr & metadata_snapshot, + const StorageMetadataPtr & metadata_snapshot, bool first_stage, bool second_stage, bool only_types, @@ -284,7 +284,7 @@ public: const ASTPtr & query_, const TreeRewriterResultPtr & syntax_analyzer_result_, ContextPtr context_, - const StorageMetadataPtr & metadata_snapshot_, + const StorageMetadataPtr & metadata_snapshot_, const NameSet & required_result_columns_ = {}, bool do_global_ = false, const SelectQueryOptions & options_ = {}, @@ -298,9 +298,9 @@ public: do_global_, std::move(subqueries_for_sets_), std::move(prepared_sets_)) - , metadata_snapshot(metadata_snapshot_) - , required_result_columns(required_result_columns_) - , query_options(options_) + , metadata_snapshot(metadata_snapshot_) + , required_result_columns(required_result_columns_) + , query_options(options_) { } @@ -331,7 +331,7 @@ public: void makeSetsForIndex(const ASTPtr & node); private: - StorageMetadataPtr metadata_snapshot; + StorageMetadataPtr metadata_snapshot; /// If non-empty, ignore all expressions not from this list. NameSet required_result_columns; SelectQueryOptions query_options; diff --git a/ydb/library/yql/udfs/common/clickhouse/client/src/Interpreters/TreeRewriter.h b/ydb/library/yql/udfs/common/clickhouse/client/src/Interpreters/TreeRewriter.h index 58cfe77133d..0dca00c285e 100644 --- a/ydb/library/yql/udfs/common/clickhouse/client/src/Interpreters/TreeRewriter.h +++ b/ydb/library/yql/udfs/common/clickhouse/client/src/Interpreters/TreeRewriter.h @@ -17,13 +17,13 @@ class TableJoin; struct Settings; struct SelectQueryOptions; using Scalars = std::map<String, Block>; -struct StorageInMemoryMetadata; -using StorageMetadataPtr = std::shared_ptr<const StorageInMemoryMetadata>; +struct StorageInMemoryMetadata; +using StorageMetadataPtr = std::shared_ptr<const StorageInMemoryMetadata>; struct TreeRewriterResult { ConstStoragePtr storage; - StorageMetadataPtr metadata_snapshot; + StorageMetadataPtr metadata_snapshot; std::shared_ptr<TableJoin> analyzed_join; const ASTTablesInSelectQueryElement * ast_join = nullptr; @@ -74,9 +74,9 @@ struct TreeRewriterResult Scalars scalars; TreeRewriterResult( - const NamesAndTypesList & source_columns_, - ConstStoragePtr storage_ = {}, - const StorageMetadataPtr & metadata_snapshot_ = {}, + const NamesAndTypesList & source_columns_, + ConstStoragePtr storage_ = {}, + const StorageMetadataPtr & metadata_snapshot_ = {}, bool add_special = true); void collectSourceColumns(bool add_special); @@ -106,10 +106,10 @@ public: /// Analyze and rewrite not select query TreeRewriterResultPtr analyze( - ASTPtr & query, - const NamesAndTypesList & source_columns_, - ConstStoragePtr storage = {}, - const StorageMetadataPtr & metadata_snapshot = {}, + ASTPtr & query, + const NamesAndTypesList & source_columns_, + ConstStoragePtr storage = {}, + const StorageMetadataPtr & metadata_snapshot = {}, bool allow_aggregations = false, bool allow_self_aliases = true) const; |