thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-27 18:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor

Browse Source
This commit is contained in:
kssenii 2024-03-11 10:55:01 +01:00
parent 0aade3765f
commit 70272d4174
21 changed files with 21 additions and 1221 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CMakeLists.txt
View File

@ -150,7 +150,7 @@ if (TARGET ch_contrib::azure_sdk)
endif()
if (TARGET ch_contrib::hdfs)
add_headers_and_sources(dbms Storages/HDFS)
add_headers_and_sources(dbms Storages/ObjectStorage/HDFS)
add_headers_and_sources(dbms Disks/ObjectStorages/HDFS)
endif()

2
src/Databases/DatabaseHDFS.cpp
View File

@ -11,7 +11,7 @@
#include <Parsers/ASTLiteral.h>
#include <Parsers/parseQuery.h>
#include <Parsers/ParserCreateQuery.h>
#include <Storages/HDFS/HDFSCommon.h>
#include <Storages/ObjectStorage/HDFS/HDFSCommon.h>
#include <Storages/IStorage.h>
#include <TableFunctions/TableFunctionFactory.h>
#include <Common/re2.h>

6
src/Disks/ObjectStorages/HDFS/HDFSObjectStorage.cpp
View File

@ -1,10 +1,10 @@
#include <Disks/ObjectStorages/HDFS/HDFSObjectStorage.h>
#include <IO/copyData.h>
#include <Storages/HDFS/WriteBufferFromHDFS.h>
#include <Storages/HDFS/HDFSCommon.h>
#include <Storages/ObjectStorage/HDFS/WriteBufferFromHDFS.h>
#include <Storages/ObjectStorage/HDFS/HDFSCommon.h>
#include <Storages/HDFS/ReadBufferFromHDFS.h>
#include <Storages/ObjectStorage/HDFS/ReadBufferFromHDFS.h>
#include <Disks/IO/ReadBufferFromRemoteFSGather.h>
#include <Common/getRandomASCIIString.h>

2
src/Disks/ObjectStorages/HDFS/HDFSObjectStorage.h
View File

@ -6,7 +6,7 @@
#include <Disks/IDisk.h>
#include <Disks/ObjectStorages/IObjectStorage.h>
#include <Storages/HDFS/HDFSCommon.h>
#include <Storages/ObjectStorage/HDFS/HDFSCommon.h>
#include <Core/UUID.h>
#include <memory>
#include <Poco/Util/AbstractConfiguration.h>

2
src/Disks/ObjectStorages/ObjectStorageFactory.cpp
View File

@ -7,7 +7,7 @@
#endif
#if USE_HDFS && !defined(CLICKHOUSE_KEEPER_STANDALONE_BUILD)
#include <Disks/ObjectStorages/HDFS/HDFSObjectStorage.h>
#include <Storages/HDFS/HDFSCommon.h>
#include <Storages/ObjectStorage/HDFS/HDFSCommon.h>
#endif
#if USE_AZURE_BLOB_STORAGE && !defined(CLICKHOUSE_KEEPER_STANDALONE_BUILD)
#include <Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.h>

2
src/IO/examples/read_buffer_from_hdfs.cpp
View File

@ -2,7 +2,7 @@
#include <string>
#include <IO/WriteBufferFromFile.h>
#include <IO/copyData.h>
#include <Storages/HDFS/ReadBufferFromHDFS.h>
#include <Storages/ObjectStorage/HDFS/ReadBufferFromHDFS.h>
#include <base/types.h>
#include <Common/Config/ConfigProcessor.h>

1200
src/Storages/HDFS/StorageHDFS.cpp
View File

File diff suppressed because it is too large Load Diff

2
src/Storages/Hive/HiveCommon.h
View File

@ -12,7 +12,7 @@
#include <base/types.h>
#include <Common/CacheBase.h>
#include <Common/PoolBase.h>
#include <Storages/HDFS/HDFSCommon.h>
#include <Storages/ObjectStorage/HDFS/HDFSCommon.h>
#include <Storages/Hive/HiveFile.h>

2
src/Storages/Hive/HiveFile.h
View File

@ -14,7 +14,7 @@
#include <Core/Block.h>
#include <Storages/MergeTree/IMergeTreeDataPart.h>
#include <Storages/Hive/HiveSettings.h>
#include <Storages/HDFS/ReadBufferFromHDFS.h>
#include <Storages/ObjectStorage/HDFS/ReadBufferFromHDFS.h>
namespace orc
{

4
src/Storages/Hive/StorageHive.cpp
View File

@ -38,8 +38,8 @@
#include <Processors/QueryPlan/SourceStepWithFilter.h>
#include <Processors/Sources/NullSource.h>
#include <Storages/AlterCommands.h>
#include <Storages/HDFS/ReadBufferFromHDFS.h>
#include <Storages/HDFS/AsynchronousReadBufferFromHDFS.h>
#include <Storages/ObjectStorage/HDFS/ReadBufferFromHDFS.h>
#include <Storages/ObjectStorage/HDFS/AsynchronousReadBufferFromHDFS.h>
#include <Storages/Hive/HiveSettings.h>
#include <Storages/Hive/StorageHiveMetadata.h>
#include <Storages/MergeTree/KeyCondition.h>

2
src/Storages/Hive/StorageHive.h
View File

@ -9,7 +9,7 @@
#include <Interpreters/Context.h>
#include <Storages/IStorage.h>
#include <Storages/HDFS/HDFSCommon.h>
#include <Storages/ObjectStorage/HDFS/HDFSCommon.h>
#include <Storages/Hive/HiveCommon.h>
#include <Storages/Hive/HiveFile.h>

2
src/Storages/HDFS/AsynchronousReadBufferFromHDFS.cpp → src/Storages/ObjectStorage/HDFS/AsynchronousReadBufferFromHDFS.cpp
View File

@ -1,9 +1,9 @@
#include "AsynchronousReadBufferFromHDFS.h"
#if USE_HDFS
#include "ReadBufferFromHDFS.h"
#include <mutex>
#include <Common/logger_useful.h>
#include <Storages/HDFS/ReadBufferFromHDFS.h>
#include <Disks/IO/ThreadPoolRemoteFSReader.h>
#include <IO/AsynchronousReader.h>

2
src/Storages/HDFS/AsynchronousReadBufferFromHDFS.h → src/Storages/ObjectStorage/HDFS/AsynchronousReadBufferFromHDFS.h
View File

@ -13,7 +13,7 @@
#include <IO/ReadBuffer.h>
#include <IO/BufferWithOwnMemory.h>
#include <IO/SeekableReadBuffer.h>
#include <Storages/HDFS/ReadBufferFromHDFS.h>
#include <Storages/ObjectStorage/HDFS/ReadBufferFromHDFS.h>
#include <Interpreters/Context.h>
namespace DB

2
src/Storages/ObjectStorage/HDFS/Configuration.cpp
View File

@ -1,7 +1,7 @@
#include <Storages/ObjectStorage/HDFS/Configuration.h>
#if USE_HDFS
#include <Storages/HDFS/HDFSCommon.h>
#include <Storages/ObjectStorage/HDFS/HDFSCommon.h>
#include <Interpreters/Context.h>
#include <Storages/checkAndGetLiteralArgument.h>
#include <Parsers/IAST.h>

2
src/Storages/HDFS/HDFSCommon.cpp → src/Storages/ObjectStorage/HDFS/HDFSCommon.cpp
View File

@ -1,4 +1,4 @@
#include <Storages/HDFS/HDFSCommon.h>
#include "HDFSCommon.h"
#include <Poco/URI.h>
#include <boost/algorithm/string/replace.hpp>
#include <filesystem>

0
src/Storages/HDFS/HDFSCommon.h → src/Storages/ObjectStorage/HDFS/HDFSCommon.h
View File

2
src/Storages/HDFS/ReadBufferFromHDFS.cpp → src/Storages/ObjectStorage/HDFS/ReadBufferFromHDFS.cpp
View File

@ -1,7 +1,7 @@
#include "ReadBufferFromHDFS.h"
#if USE_HDFS
#include <Storages/HDFS/HDFSCommon.h>
#include "HDFSCommon.h"
#include <Common/Scheduler/ResourceGuard.h>
#include <IO/Progress.h>
#include <Common/Throttler.h>

0
src/Storages/HDFS/ReadBufferFromHDFS.h → src/Storages/ObjectStorage/HDFS/ReadBufferFromHDFS.h
View File

4
src/Storages/HDFS/WriteBufferFromHDFS.cpp → src/Storages/ObjectStorage/HDFS/WriteBufferFromHDFS.cpp
View File

@ -2,8 +2,8 @@
#if USE_HDFS
#include <Storages/HDFS/WriteBufferFromHDFS.h>
#include <Storages/HDFS/HDFSCommon.h>
#include "WriteBufferFromHDFS.h"
#include "HDFSCommon.h"
#include <Common/Scheduler/ResourceGuard.h>
#include <Common/Throttler.h>
#include <Common/safe_cast.h>

0
src/Storages/HDFS/WriteBufferFromHDFS.h → src/Storages/ObjectStorage/HDFS/WriteBufferFromHDFS.h
View File

2
src/Storages/examples/async_read_buffer_from_hdfs.cpp
View File

@ -9,7 +9,7 @@
#include <Disks/IO/getThreadPoolReader.h>
#include <Interpreters/Context.h>
#include <Common/Config/ConfigProcessor.h>
#include <Storages/HDFS/AsynchronousReadBufferFromHDFS.h>
#include <Storages/ObjectStorage/HDFS/AsynchronousReadBufferFromHDFS.h>
int main()
{