From 01ce3baf0f83c4c15beeaa67c1f0bb571734d4a3 Mon Sep 17 00:00:00 2001 From: vdimir Date: Wed, 5 Apr 2023 13:42:13 +0000 Subject: [PATCH] Rename Context::getTemporaryVolume to getGlobalTemporaryVolume --- src/Interpreters/Context.cpp | 2 +- src/Interpreters/Context.h | 2 +- src/Interpreters/JoinedTables.cpp | 2 +- src/Interpreters/MergeJoin.cpp | 2 +- src/Interpreters/TableJoin.h | 2 +- src/Planner/PlannerJoinTree.cpp | 2 +- src/Server/HTTPHandler.cpp | 2 +- src/Storages/MergeTree/MergeTask.cpp | 2 +- src/Storages/StorageMemory.cpp | 4 ++-- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Interpreters/Context.cpp b/src/Interpreters/Context.cpp index 25fd5db2529..6a570df3566 100644 --- a/src/Interpreters/Context.cpp +++ b/src/Interpreters/Context.cpp @@ -748,7 +748,7 @@ Strings Context::getWarnings() const } /// TODO: remove, use `getTempDataOnDisk` -VolumePtr Context::getTemporaryVolume() const +VolumePtr Context::getGlobalTemporaryVolume() const { auto lock = getLock(); /// Calling this method we just bypass the `temp_data_on_disk` and write to the file on the volume directly. diff --git a/src/Interpreters/Context.h b/src/Interpreters/Context.h index de1f053003e..f41f62fd546 100644 --- a/src/Interpreters/Context.h +++ b/src/Interpreters/Context.h @@ -476,7 +476,7 @@ public: /// A list of warnings about server configuration to place in `system.warnings` table. Strings getWarnings() const; - VolumePtr getTemporaryVolume() const; /// TODO: remove, use `getTempDataOnDisk` + VolumePtr getGlobalTemporaryVolume() const; /// TODO: remove, use `getTempDataOnDisk` TemporaryDataOnDiskScopePtr getTempDataOnDisk() const; TemporaryDataOnDiskScopePtr getSharedTempDataOnDisk() const; diff --git a/src/Interpreters/JoinedTables.cpp b/src/Interpreters/JoinedTables.cpp index 80b2fe5302c..37bce592f37 100644 --- a/src/Interpreters/JoinedTables.cpp +++ b/src/Interpreters/JoinedTables.cpp @@ -308,7 +308,7 @@ std::shared_ptr JoinedTables::makeTableJoin(const ASTSelectQuery & se auto settings = context->getSettingsRef(); MultiEnum join_algorithm = settings.join_algorithm; - auto table_join = std::make_shared(settings, context->getTemporaryVolume()); + auto table_join = std::make_shared(settings, context->getGlobalTemporaryVolume()); const ASTTablesInSelectQueryElement * ast_join = select_query.join(); const auto & table_to_join = ast_join->table_expression->as(); diff --git a/src/Interpreters/MergeJoin.cpp b/src/Interpreters/MergeJoin.cpp index a5ab6b25d02..07f5ae31ed6 100644 --- a/src/Interpreters/MergeJoin.cpp +++ b/src/Interpreters/MergeJoin.cpp @@ -1045,7 +1045,7 @@ std::shared_ptr MergeJoin::loadRightBlock(size_t pos) const void MergeJoin::initRightTableWriter() { - disk_writer = std::make_unique(size_limits, table_join->getTemporaryVolume(), + disk_writer = std::make_unique(size_limits, table_join->getGlobalTemporaryVolume(), right_sample_block, right_sort_description, max_rows_in_right_block, max_files_to_merge, table_join->temporaryFilesCodec()); disk_writer->addBlocks(right_blocks); diff --git a/src/Interpreters/TableJoin.h b/src/Interpreters/TableJoin.h index 84390adc0df..95471885a2a 100644 --- a/src/Interpreters/TableJoin.h +++ b/src/Interpreters/TableJoin.h @@ -209,7 +209,7 @@ public: JoinStrictness strictness() const { return table_join.strictness; } bool sameStrictnessAndKind(JoinStrictness, JoinKind) const; const SizeLimits & sizeLimits() const { return size_limits; } - VolumePtr getTemporaryVolume() { return tmp_volume; } + VolumePtr getGlobalTemporaryVolume() { return tmp_volume; } bool isEnabledAlgorithm(JoinAlgorithm val) const { diff --git a/src/Planner/PlannerJoinTree.cpp b/src/Planner/PlannerJoinTree.cpp index 0479170eba1..ab7086c820f 100644 --- a/src/Planner/PlannerJoinTree.cpp +++ b/src/Planner/PlannerJoinTree.cpp @@ -994,7 +994,7 @@ JoinTreeQueryPlan buildQueryPlanForJoinNode(const QueryTreeNodePtr & join_table_ } } - auto table_join = std::make_shared(settings, query_context->getTemporaryVolume()); + auto table_join = std::make_shared(settings, query_context->getGlobalTemporaryVolume()); table_join->getTableJoin() = join_node.toASTTableJoin()->as(); table_join->getTableJoin().kind = join_kind; diff --git a/src/Server/HTTPHandler.cpp b/src/Server/HTTPHandler.cpp index bfdc067f733..16718a0a218 100644 --- a/src/Server/HTTPHandler.cpp +++ b/src/Server/HTTPHandler.cpp @@ -623,7 +623,7 @@ void HTTPHandler::processQuery( if (buffer_until_eof) { - const std::string tmp_path(server.context()->getTemporaryVolume()->getDisk()->getPath()); + const std::string tmp_path(server.context()->getGlobalTemporaryVolume()->getDisk()->getPath()); const std::string tmp_path_template(fs::path(tmp_path) / "http_buffers/"); auto create_tmp_disk_buffer = [tmp_path_template] (const WriteBufferPtr &) diff --git a/src/Storages/MergeTree/MergeTask.cpp b/src/Storages/MergeTree/MergeTask.cpp index d1dfa96b87c..d1e062be92a 100644 --- a/src/Storages/MergeTree/MergeTask.cpp +++ b/src/Storages/MergeTree/MergeTask.cpp @@ -273,7 +273,7 @@ bool MergeTask::ExecuteAndFinalizeHorizontalPart::prepare() ctx->compression_codec = global_ctx->data->getCompressionCodecForPart( global_ctx->merge_list_element_ptr->total_size_bytes_compressed, global_ctx->new_data_part->ttl_infos, global_ctx->time_of_merge); - ctx->tmp_disk = global_ctx->context->getTemporaryVolume()->getDisk(); + ctx->tmp_disk = global_ctx->context->getGlobalTemporaryVolume()->getDisk(); switch (global_ctx->chosen_merge_algorithm) { diff --git a/src/Storages/StorageMemory.cpp b/src/Storages/StorageMemory.cpp index 11688582877..d2fdde2bc46 100644 --- a/src/Storages/StorageMemory.cpp +++ b/src/Storages/StorageMemory.cpp @@ -401,7 +401,7 @@ namespace void StorageMemory::backupData(BackupEntriesCollector & backup_entries_collector, const String & data_path_in_backup, const std::optional & /* partitions */) { - auto temp_disk = backup_entries_collector.getContext()->getTemporaryVolume()->getDisk(0); + auto temp_disk = backup_entries_collector.getContext()->getGlobalTemporaryVolume()->getDisk(0); auto max_compress_block_size = backup_entries_collector.getContext()->getSettingsRef().max_compress_block_size; backup_entries_collector.addBackupEntries( std::make_shared(getInMemoryMetadataPtr(), data.get(), data_path_in_backup, temp_disk, max_compress_block_size) @@ -417,7 +417,7 @@ void StorageMemory::restoreDataFromBackup(RestorerFromBackup & restorer, const S if (!restorer.isNonEmptyTableAllowed() && total_size_bytes) RestorerFromBackup::throwTableIsNotEmpty(getStorageID()); - auto temp_disk = restorer.getContext()->getTemporaryVolume()->getDisk(0); + auto temp_disk = restorer.getContext()->getGlobalTemporaryVolume()->getDisk(0); restorer.addDataRestoreTask( [storage = std::static_pointer_cast(shared_from_this()), backup, data_path_in_backup, temp_disk]