mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-11-21 23:21:59 +00:00
possible conflict w private
This commit is contained in:
parent
c725b66225
commit
bf0c609353
@ -35,12 +35,13 @@ public:
|
|||||||
{
|
{
|
||||||
if (!path_from.has_value())
|
if (!path_from.has_value())
|
||||||
return std::make_unique<ReadBufferFromFileDescriptor>(STDIN_FILENO);
|
return std::make_unique<ReadBufferFromFileDescriptor>(STDIN_FILENO);
|
||||||
String relative_path_from = disk.getRelativeFromRoot(path_from.value());
|
|
||||||
auto res = disk.getDisk()->readFileIfExists(relative_path_from, getReadSettings());
|
String relative_path_from = disk.getRelativeFromRoot(path_from.value());
|
||||||
if (res)
|
auto res = disk.getDisk()->readFileIfExists(relative_path_from, getReadSettings());
|
||||||
return res;
|
if (res)
|
||||||
/// For backward compatibility.
|
return res;
|
||||||
return std::make_unique<ReadBufferFromEmptyFile>();
|
/// For backward compatibility.
|
||||||
|
return std::make_unique<ReadBufferFromEmptyFile>();
|
||||||
}();
|
}();
|
||||||
|
|
||||||
auto out = disk.getDisk()->writeFile(path_to);
|
auto out = disk.getDisk()->writeFile(path_to);
|
||||||
|
Loading…
Reference in New Issue
Block a user