thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 00:30:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Corrections

Browse Source
This commit is contained in:
Varinara 2022-06-02 21:24:13 +03:00
parent 354ef2e3b8
commit f5d4e9ccc1
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
programs/disks/CommandListDisks.cpp
View File

@ -35,7 +35,12 @@ public:
throw DB::Exception("Bad Arguments", DB::ErrorCodes::BAD_ARGUMENTS);
}
for (const auto & [disk_name, _] : global_context->getDisksMap())
std::vector<String> disks_names;
for (const auto & [disk_name, disk] : global_context->getDisksMap())
disks_names.push_back(disk->getName());
for (const auto & disk_name : disks_names)
std::cout << disk_name << '\n';
}
};

6
programs/disks/CommandRead.cpp
View File

@ -44,15 +44,15 @@ public:
String disk_name = config.getString("disk", "default");
String path = pos_arguments[0];
String path = pos_arguments[0];
DiskPtr disk = global_context->getDisk(disk_name);
String full_path = fullPathWithValidate(disk, path);
String path_output = config.getString("output", "default");
String path_output = config.getString("output", "");
if (path_output != "default")
if (!path_output.empty())
{
String full_path_output = fullPathWithValidate(disk, path_output);

11
programs/disks/CommandWrite.cpp
View File

@ -50,10 +50,13 @@ public:
String full_path = fullPathWithValidate(disk, path);
String path_input = config.getString("input", "default");
std::unique_ptr<ReadBufferFromFileBase> in = std::make_unique<ReadBufferFromFileDescriptor>(STDIN_FILENO);
if (path_input != "default")
String path_input = config.getString("input", "");
std::unique_ptr<ReadBufferFromFileBase> in;
if (path_input.empty())
{
in = std::make_unique<ReadBufferFromFileDescriptor>(STDIN_FILENO);
}
else
{
String full_path_input = fullPathWithValidate(disk, path_input);
in = disk->readFile(full_path_input);