Renaming

dbms/programs/benchmark/Benchmark.cpp

@@ -32,7 +32,7 @@
 #include <Client/Connection.h>
 #include <Common/InterruptListener.h>
 #include <Common/Config/configReadClient.h>
-#include <Common/TerminalDisplaying.h>
+#include <Common/TerminalSize.h>
 
 
 /** A tool for evaluating ClickHouse performance.
@@ -440,7 +440,7 @@ int mainEntryClickHouseBenchmark(int argc, char ** argv)
     {
         using boost::program_options::value;
 
-        boost::program_options::options_description desc = setOptionsDescription("Allowed options", getTerminalWidth());
+        boost::program_options::options_description desc = createOptionsDescription("Allowed options", getTerminalWidth());
         desc.add_options()
             ("help",                                                            "produce help message")
             ("concurrency,c", value<unsigned>()->default_value(1),              "number of parallel queries")

dbms/programs/client/Client.cpp

@@ -67,7 +67,7 @@
 #include <Common/Config/configReadClient.h>
 #include <Storages/ColumnsDescription.h>
 #include <common/argsToConfig.h>
-#include <Common/TerminalDisplaying.h>
+#include <Common/TerminalSize.h>
 
 #if USE_READLINE
 #include "Suggest.h"
@@ -1649,7 +1649,7 @@ public:
         namespace po = boost::program_options;
 
         /// Main commandline options related to client functionality and all parameters from Settings.
-        po::options_description main_description = setOptionsDescription("Main options", terminal_width);
+        po::options_description main_description = createOptionsDescription("Main options", terminal_width);
         main_description.add_options()
             ("help", "produce help message")
             ("config-file,C", po::value<std::string>(), "config-file path")
@@ -1695,7 +1695,7 @@ public:
         context.getSettingsRef().addProgramOptions(main_description);
 
         /// Commandline options related to external tables.
-        po::options_description external_description = setOptionsDescription("External tables options", terminal_width);
+        po::options_description external_description = createOptionsDescription("External tables options", terminal_width);
         external_description.add_options()
             ("file", po::value<std::string>(), "data file or - for stdin")
             ("name", po::value<std::string>()->default_value("_data"), "name of the table")

dbms/programs/compressor/Compressor.cpp

@@ -13,7 +13,7 @@
 #include <Parsers/parseQuery.h>
 #include <Parsers/ExpressionElementParsers.h>
 #include <Compression/CompressionFactory.h>
-#include <Common/TerminalDisplaying.h>
+#include <Common/TerminalSize.h>
 
 
 namespace DB
@@ -60,7 +60,7 @@ void checkAndWriteHeader(DB::ReadBuffer & in, DB::WriteBuffer & out)
 
 int mainEntryClickHouseCompressor(int argc, char ** argv)
 {
-    boost::program_options::options_description desc = setOptionsDescription("Allowed options", getTerminalWidth());
+    boost::program_options::options_description desc = createOptionsDescription("Allowed options", getTerminalWidth());
     desc.add_options()
         ("help,h", "produce help message")
         ("decompress,d", "decompress")

dbms/programs/format/Format.cpp

@@ -6,13 +6,13 @@
 #include <Parsers/ParserQuery.h>
 #include <Parsers/parseQuery.h>
 #include <Parsers/formatAST.h>
-#include <Common/TerminalDisplaying.h>
+#include <Common/TerminalSize.h>
 
 int mainEntryClickHouseFormat(int argc, char ** argv)
 {
     using namespace DB;
 
-    boost::program_options::options_description desc = setOptionsDescription("Allowed options", getTerminalWidth());
+    boost::program_options::options_description desc = createOptionsDescription("Allowed options", getTerminalWidth());
     desc.add_options()
         ("help,h", "produce help message")
         ("hilite", "add syntax highlight with ANSI terminal escape sequences")

dbms/programs/local/LocalServer.cpp

@@ -35,7 +35,7 @@
 #include <boost/program_options/options_description.hpp>
 #include <boost/program_options.hpp>
 #include <common/argsToConfig.h>
-#include <Common/TerminalDisplaying.h>
+#include <Common/TerminalSize.h>
 
 
 namespace DB
@@ -410,7 +410,7 @@ void LocalServer::init(int argc, char ** argv)
     /// Don't parse options with Poco library, we prefer neat boost::program_options
     stopOptionsProcessing();
 
-    po::options_description description = setOptionsDescription("Main options", getTerminalWidth());
+    po::options_description description = createOptionsDescription("Main options", getTerminalWidth());
     description.add_options()
         ("help", "produce help message")
         ("config-file,c", po::value<std::string>(), "config-file path")

dbms/programs/obfuscator/Obfuscator.cpp

@@ -36,7 +36,7 @@
 #include <boost/program_options.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/container/flat_map.hpp>
-#include <Common/TerminalDisplaying.h>
+#include <Common/TerminalSize.h>
 
 
 static const char * documantation = R"(
@@ -949,7 +949,7 @@ try
     using namespace DB;
     namespace po = boost::program_options;
 
-    po::options_description description = setOptionsDescription("Options", getTerminalWidth());
+    po::options_description description = createOptionsDescription("Options", getTerminalWidth());
     description.add_options()
         ("help", "produce help message")
         ("structure,S", po::value<std::string>(), "structure of the initial table (list of column and type names)")

dbms/programs/performance-test/PerformanceTestSuite.cpp

@@ -28,7 +28,7 @@
 #include <Core/Settings.h>
 #include <Common/Exception.h>
 #include <Common/InterruptListener.h>
-#include <Common/TerminalDisplaying.h>
+#include <Common/TerminalSize.h>
 
 #include "TestStopConditions.h"
 #include "TestStats.h"
@@ -325,7 +325,7 @@ try
     using po::value;
     using Strings = DB::Strings;
 
-    po::options_description desc = setOptionsDescription("Allowed options", getTerminalWidth());
+    po::options_description desc = createOptionsDescription("Allowed options", getTerminalWidth());
     desc.add_options()
         ("help", "produce help message")
         ("lite", "use lite version of output")

dbms/src/Common/TerminalDisplaying.cpp → dbms/src/Common/TerminalSize.cpp

 #include <unistd.h>
 #include <sys/ioctl.h>
 #include <Common/Exception.h>
-#include <Common/TerminalDisplaying.h>
+#include <Common/TerminalSize.h>
 
 namespace po = boost::program_options;
 
@@ -25,7 +25,7 @@ unsigned short int getTerminalWidth()
     return 0;
 }
 
-po::options_description setOptionsDescription(const std::string & caption, unsigned short terminal_width)
+po::options_description createOptionsDescription(const std::string &caption, unsigned short terminal_width)
 {
     unsigned line_length = po::options_description::m_default_line_length;
     unsigned min_description_length = line_length / 2;

dbms/src/Common/TerminalDisplaying.h → dbms/src/Common/TerminalSize.h

@@ -10,8 +10,8 @@ namespace po = boost::program_options;
 
 unsigned short int getTerminalWidth();
 
-/** Sets a name and an appropriate size for option displaying
+/** Creates po::options_description with name and an appropriate size for option displaying
  *  when program is called with option --help
  * */
-po::options_description setOptionsDescription(const std::string & caption, unsigned short terminal_width);
+po::options_description createOptionsDescription(const std::string &caption, unsigned short terminal_width);