possible conflict w private

This commit is contained in:
Julia Kartseva 2024-10-16 02:18:59 +00:00
parent c725b66225
commit bf0c609353

View File

@ -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);