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

Fix

Browse Source
This commit is contained in:
kssenii 2022-06-15 11:31:45 +02:00
parent 9a5fa1f695
commit e974ab61e6
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Disks/IDisk.h
View File

@ -201,7 +201,7 @@ public:
/// Remove file. Throws exception if file doesn't exists or if directory is not empty.
/// Differs from removeFile for S3/HDFS disks
/// Second bool param is a flag to remove (true) or keep (false) shared data on S3
virtual void removeSharedFile(const String & path, bool /* keep_shared_data */) { return removeFile(path); }
virtual void removeSharedFile(const String & path, bool /* keep_shared_data */) { removeFile(path); }
/// Remove file or directory with all children. Use with extra caution. Throws exception if file doesn't exists.
/// Differs from removeRecursive for S3/HDFS disks
@ -212,7 +212,7 @@ public:
/// Remove file or directory if it exists.
/// Differs from removeFileIfExists for S3/HDFS disks
/// Second bool param is a flag to remove (true) or keep (false) shared data on S3
virtual void removeSharedFileIfExists(const String & path, bool /* keep_shared_data */) { return removeFileIfExists(path); }
virtual void removeSharedFileIfExists(const String & path, bool /* keep_shared_data */) { removeFileIfExists(path); }
virtual const String & getCacheBasePath() const { throw Exception(ErrorCodes::NOT_IMPLEMENTED, "There is no cache path"); }

3
tests/config/config.d/storage_conf.xml
View File

@ -115,7 +115,6 @@
</main>
</volumes>
</s3_cache_3>
<<<<<<< HEAD
<local_cache>
<volumes>
<main>
@ -137,7 +136,6 @@
</main>
</volumes>
</local_cache_3>
=======
<s3_cache_4>
<volumes>
<main>
@ -145,7 +143,6 @@
</main>
</volumes>
</s3_cache_4>
>>>>>>> upstream/master
</policies>
</storage_configuration>
</clickhouse>