fix some issues

docs/en/operations/utilities/clickhouse-disks.md

@@ -56,4 +56,4 @@ In these documentation file all mandatory positional arguments are referred as `
 * `switch-disk [--path path] <disk>`
   Switch to disk `disk` on path `path` (if `path` is not specified default value is a previous path on disk `disk`). 
 * `write (w) [--path-from path] <path-to>`.
-  Write a file from `path` (`stdin` if not supplied) to `path-to`.
+  Write a file from `path` (`stdin` if `path` is not supplied, input must finish by Ctrl+D) to `path-to`.

programs/disks/CMakeLists.txt

@@ -14,6 +14,7 @@ set (CLICKHOUSE_DISKS_SOURCES
     CommandSwitchDisk.cpp
     CommandWrite.cpp
     CommandHelp.cpp
+    CommandTouch.cpp
     CommandGetCurrentDiskAndPath.cpp)
 
 if (CLICKHOUSE_CLOUD)

programs/disks/CommandTouch.cpp

@@ -0,0 +1,34 @@
+#include <Interpreters/Context.h>
+#include <Common/TerminalSize.h>
+#include "DisksApp.h"
+#include "DisksClient.h"
+#include "ICommand.h"
+
+namespace DB
+{
+
+class CommandTouch final : public ICommand
+{
+public:
+    explicit CommandTouch() : ICommand()
+    {
+        command_name = "touch";
+        description = "Create a file by path";
+        options_description.add_options()("path", po::value<String>(), "the path of listing (mandatory, positional)");
+        positional_options_description.add("path", 1);
+    }
+
+    void executeImpl(const CommandLineOptions & options, DisksClient & client) override
+    {
+        auto disk = client.getCurrentDiskWithPath();
+        String path = getValueFromCommandLineOptionsThrow<String>(options, "path");
+
+        disk.getDisk()->createFile(disk.getRelativeFromRoot(path));
+    }
+};
+
+CommandPtr makeCommandTouch()
+{
+    return std::make_shared<DB::CommandTouch>();
+}
+}

programs/disks/CommandWrite.cpp

@@ -16,7 +16,7 @@ public:
     {
         command_name = "write";
         description = "Write a file from `FROM_PATH` to `TO_PATH`";
-        options_description.add_options()("path-from", po::value<String>(), "file from which we are reading, defaults to `stdin`")(
+        options_description.add_options()("path-from", po::value<String>(), "file from which we are reading, defaults to `stdin` (input from `stdin` is finished by Ctrl+D)")(
             "path-to", po::value<String>(), "file to which we are writing (mandatory, positional)");
         positional_options_description.add("path-to", 1);
     }

programs/disks/DisksApp.cpp

@@ -89,6 +89,7 @@ std::vector<String> DisksApp::getCommandsToComplete(const String & command_prefi
     }
     if (!answer.empty())
     {
+        std::sort(answer.begin(), answer.end());
         return answer;
     }
     for (const auto & [word, _] : aliases)
@@ -100,6 +101,7 @@ std::vector<String> DisksApp::getCommandsToComplete(const String & command_prefi
     }
     if (!answer.empty())
     {
+        std::sort(answer.begin(), answer.end());
         return answer;
     }
     return {command_prefix};
@@ -179,6 +181,7 @@ std::vector<String> DisksApp::getCompletions(const String & prefix) const
         }
         if (!answer.empty())
         {
+            std::sort(answer.begin(), answer.end());
             return answer;
         }
         else
@@ -292,6 +295,7 @@ void DisksApp::addOptions()
     command_descriptions.emplace("mkdir", makeCommandMkDir());
     command_descriptions.emplace("switch-disk", makeCommandSwitchDisk());
     command_descriptions.emplace("current_disk_with_path", makeCommandGetCurrentDiskAndPath());
+    command_descriptions.emplace("touch", makeCommandTouch());
     command_descriptions.emplace("help", makeCommandHelp(*this));
 #ifdef CLICKHOUSE_CLOUD
     command_descriptions.emplace("packed-io", makeCommandPackedIO());

programs/disks/DisksApp.h

@@ -84,8 +84,10 @@ private:
            {"list_disks", "list-disks"},
            {"ln", "link"},
            {"rm", "remove"},
+           {"cat", "read"},
            {"r", "read"},
            {"w", "write"},
+           {"create", "touch"},
            {"delete", "remove"},
            {"ls-disks", "list-disks"},
            {"ls_disks", "list-disks"},

programs/disks/DisksClient.h

@@ -32,7 +32,10 @@ public:
 
     String getCurrentPath() const { return path; }
 
-    bool isDirectory(const String & any_path) const { return disk->isDirectory(getRelativeFromRoot(any_path)); }
+    bool isDirectory(const String & any_path) const
+    {
+        return disk->isDirectory(getRelativeFromRoot(any_path)) || (getRelativeFromRoot(any_path).empty() && (disk->isDirectory("/")));
+    }
 
     std::vector<String> listAllFilesByPath(const String & any_path) const;
 

programs/disks/ICommand.h

@@ -123,6 +123,7 @@ DB::CommandPtr makeCommandMkDir();
 DB::CommandPtr makeCommandSwitchDisk();
 DB::CommandPtr makeCommandGetCurrentDiskAndPath();
 DB::CommandPtr makeCommandHelp(const DisksApp & disks_app);
+DB::CommandPtr makeCommandTouch();
 #ifdef CLICKHOUSE_CLOUD
 DB::CommandPtr makeCommandPackedIO();
 #endif