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

ContextConstPtr -> ContextPtr (resolve conflicts)

Browse Source
This commit is contained in:
Alexandra 2021-06-18 05:36:50 +00:00
parent 48d3419160
commit 5bc5a29c32
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Disks/DiskEncrypted.cpp
View File

@ -129,7 +129,7 @@ SyncGuardPtr DiskEncrypted::getDirectorySyncGuard(const String & path) const
void DiskEncrypted::applyNewSettings(
const Poco::Util::AbstractConfiguration & config,
ContextConstPtr /*context*/,
ContextPtr /*context*/,
const String & config_prefix,
const DisksMap & map)
{
@ -157,7 +157,7 @@ void registerDiskEncrypted(DiskFactory & factory)
auto creator = [](const String & name,
const Poco::Util::AbstractConfiguration & config,
const String & config_prefix,
ContextConstPtr /*context*/,
ContextPtr /*context*/,
const DisksMap & map) -> DiskPtr {
String wrapped_disk_name = config.getString(config_prefix + ".disk", "");

2
src/Disks/DiskEncrypted.h
View File

@ -210,7 +210,7 @@ public:
delegate->onFreeze(wrapped_path);
}
void applyNewSettings(const Poco::Util::AbstractConfiguration & config, ContextConstPtr context, const String & config_prefix, const DisksMap & map) override;
void applyNewSettings(const Poco::Util::AbstractConfiguration & config, ContextPtr context, const String & config_prefix, const DisksMap & map) override;
DiskType::Type getType() const override { return DiskType::Type::Encrypted; }