arenadata · deart2k · Jul 27, 2020 · May 23, 2020 · May 27, 2020 · May 28, 2020
diff --git a/.gitmodules b/.gitmodules
@@ -148,3 +148,6 @@
 	path = contrib/avro
 	url = https://github.com/ClickHouse-Extras/avro.git
 	ignore = untracked
+[submodule "contrib/fmtlib"]
+	path = contrib/fmtlib
+	url = https://github.com/fmtlib/fmt.git
diff --git a/base/common/CMakeLists.txt b/base/common/CMakeLists.txt
@@ -90,6 +90,7 @@ target_link_libraries (common
         ${Poco_Foundation_LIBRARY}
         ${CITYHASH_LIBRARIES}
         ${Boost_SYSTEM_LIBRARY}
+        fmt
 )
 
 if (ENABLE_TESTS)

diff --git a/base/common/LineReader.cpp b/base/common/LineReader.cpp
@@ -67,47 +67,69 @@ LineReader::Suggest::WordsRange LineReader::Suggest::getCompletions(const String
                 });
 }
 
-LineReader::LineReader(const String & history_file_path_, char extender_, char delimiter_)
-    : history_file_path(history_file_path_), extender(extender_), delimiter(delimiter_)
+LineReader::LineReader(const String & history_file_path_, bool multiline_, Patterns extenders_, Patterns delimiters_)
+    : history_file_path(history_file_path_), multiline(multiline_), extenders(std::move(extenders_)), delimiters(std::move(delimiters_))
 {
     /// FIXME: check extender != delimiter
 }
 
 String LineReader::readLine(const String & first_prompt, const String & second_prompt)
 {
     String line;
-    bool is_multiline = false;
+    bool need_next_line = false;
 
-    while (auto status = readOneLine(is_multiline ? second_prompt : first_prompt))
+    while (auto status = readOneLine(need_next_line ? second_prompt : first_prompt))
     {
         if (status == RESET_LINE)
         {
             line.clear();
-            is_multiline = false;
+            need_next_line = false;
             continue;
         }
 
         if (input.empty())
         {
-            if (!line.empty() && !delimiter && !hasInputData())
+            if (!line.empty() && !multiline && !hasInputData())
                 break;
             else
                 continue;
         }
 
-        is_multiline = (input.back() == extender) || (delimiter && input.back() != delimiter) || hasInputData();
+#if !defined(ARCADIA_BUILD) /// C++20
+        const char * has_extender = nullptr;
+        for (const auto * extender : extenders)
+        {
+            if (input.ends_with(extender))
+            {
+                has_extender = extender;
+                break;
+            }
+        }
 
-        if (input.back() == extender)
+        const char * has_delimiter = nullptr;
+        for (const auto * delimiter : delimiters)
         {
-            input = input.substr(0, input.size() - 1);
+            if (input.ends_with(delimiter))
+            {
+                has_delimiter = delimiter;
+                break;
+            }
+        }
+
+        need_next_line = has_extender || (multiline && !has_delimiter) || hasInputData();
+
+        if (has_extender)
+        {
+            input.resize(input.size() - strlen(has_extender));
             trim(input);
             if (input.empty())
                 continue;
         }
+#endif
 
         line += (line.empty() ? "" : " ") + input;
 
-        if (!is_multiline)
+        if (!need_next_line)
             break;
     }
 
@@ -127,7 +149,7 @@ LineReader::InputStatus LineReader::readOneLine(const String & prompt)
 #ifdef OS_LINUX
     if (!readline_ptr)
     {
-        for (auto name : {"libreadline.so", "libreadline.so.0", "libeditline.so", "libeditline.so.0"})
+        for (const auto * name : {"libreadline.so", "libreadline.so.0", "libeditline.so", "libeditline.so.0"})
         {
             void * dl_handle = dlopen(name, RTLD_LAZY);
             if (dl_handle)

diff --git a/base/common/LineReader.h b/base/common/LineReader.h
@@ -23,7 +23,9 @@ class LineReader
         bool case_insensitive = false;
     };
 
-    LineReader(const String & history_file_path, char extender, char delimiter = 0);  /// if delimiter != 0, then it's multiline mode
+    using Patterns = std::vector<const char *>;
+
+    LineReader(const String & history_file_path, bool multiline, Patterns extenders, Patterns delimiters);
     virtual ~LineReader() {}
 
     /// Reads the whole line until delimiter (in multiline mode) or until the last line without extender.
@@ -53,8 +55,10 @@ class LineReader
     String input;
 
 private:
-    const char extender;
-    const char delimiter;
+    bool multiline;
+
+    Patterns extenders;
+    Patterns delimiters;
 
     String prev_line;
 

diff --git a/base/common/ReadlineLineReader.cpp b/base/common/ReadlineLineReader.cpp
@@ -56,8 +56,9 @@ static char * generate(const char * text, int state)
     return nextMatch();
 };
 
-ReadlineLineReader::ReadlineLineReader(const Suggest & suggest_, const String & history_file_path_, char extender_, char delimiter_)
-    : LineReader(history_file_path_, extender_, delimiter_)
+ReadlineLineReader::ReadlineLineReader(
+    const Suggest & suggest_, const String & history_file_path_, bool multiline_, Patterns extenders_, Patterns delimiters_)
+    : LineReader(history_file_path_, multiline_, std::move(extenders_), std::move(delimiters_))
 {
     suggest = &suggest_;
 

diff --git a/base/common/ReadlineLineReader.h b/base/common/ReadlineLineReader.h
@@ -8,7 +8,7 @@
 class ReadlineLineReader : public LineReader
 {
 public:
-    ReadlineLineReader(const Suggest & suggest, const String & history_file_path, char extender, char delimiter = 0);
+    ReadlineLineReader(const Suggest & suggest, const String & history_file_path, bool multiline, Patterns extenders_, Patterns delimiters_);
     ~ReadlineLineReader() override;
 
     void enableBracketedPaste() override;

diff --git a/base/common/ReplxxLineReader.cpp b/base/common/ReplxxLineReader.cpp
@@ -16,8 +16,9 @@ void trim(String & s)
 
 }
 
-ReplxxLineReader::ReplxxLineReader(const Suggest & suggest, const String & history_file_path_, char extender_, char delimiter_)
-    : LineReader(history_file_path_, extender_, delimiter_)
+ReplxxLineReader::ReplxxLineReader(
+    const Suggest & suggest, const String & history_file_path_, bool multiline_, Patterns extenders_, Patterns delimiters_)
+    : LineReader(history_file_path_, multiline_, std::move(extenders_), std::move(delimiters_))
 {
     using namespace std::placeholders;
     using Replxx = replxx::Replxx;
@@ -37,13 +38,13 @@ ReplxxLineReader::ReplxxLineReader(const Suggest & suggest, const String & histo
 
     /// By default C-p/C-n binded to COMPLETE_NEXT/COMPLETE_PREV,
     /// bind C-p/C-n to history-previous/history-next like readline.
-    rx.bind_key(Replxx::KEY::control('N'), std::bind(&Replxx::invoke, &rx, Replxx::ACTION::HISTORY_NEXT,      _1));
-    rx.bind_key(Replxx::KEY::control('P'), std::bind(&Replxx::invoke, &rx, Replxx::ACTION::HISTORY_PREVIOUS,  _1));
+    rx.bind_key(Replxx::KEY::control('N'), [this](char32_t code) { return rx.invoke(Replxx::ACTION::HISTORY_NEXT, code); });
+    rx.bind_key(Replxx::KEY::control('P'), [this](char32_t code) { return rx.invoke(Replxx::ACTION::HISTORY_PREVIOUS, code); });
     /// By default COMPLETE_NEXT/COMPLETE_PREV was binded to C-p/C-n, re-bind
     /// to M-P/M-N (that was used for HISTORY_COMMON_PREFIX_SEARCH before, but
     /// it also binded to M-p/M-n).
-    rx.bind_key(Replxx::KEY::meta('N'), std::bind(&Replxx::invoke, &rx, Replxx::ACTION::COMPLETE_NEXT,     _1));
-    rx.bind_key(Replxx::KEY::meta('P'), std::bind(&Replxx::invoke, &rx, Replxx::ACTION::COMPLETE_PREVIOUS, _1));
+    rx.bind_key(Replxx::KEY::meta('N'), [this](char32_t code) { return rx.invoke(Replxx::ACTION::COMPLETE_NEXT, code); });
+    rx.bind_key(Replxx::KEY::meta('P'), [this](char32_t code) { return rx.invoke(Replxx::ACTION::COMPLETE_PREVIOUS, code); });
 }
 
 ReplxxLineReader::~ReplxxLineReader()

diff --git a/base/common/ReplxxLineReader.h b/base/common/ReplxxLineReader.h
@@ -7,7 +7,7 @@
 class ReplxxLineReader : public LineReader
 {
 public:
-    ReplxxLineReader(const Suggest & suggest, const String & history_file_path, char extender, char delimiter = 0);
+    ReplxxLineReader(const Suggest & suggest, const String & history_file_path, bool multiline, Patterns extenders_, Patterns delimiters_);
     ~ReplxxLineReader() override;
 
     void enableBracketedPaste() override;

diff --git a/base/common/argsToConfig.cpp b/base/common/argsToConfig.cpp
@@ -11,7 +11,7 @@ void argsToConfig(const Poco::Util::Application::ArgVec & argv, Poco::Util::Laye
     /// Test: -- --1=1 --1=2 --3 5 7 8 -9 10 -11=12 14= 15== --16==17 --=18 --19= --20 21 22 --23 --24 25 --26 -27 28 ---29=30 -- ----31 32 --33 3-4
     Poco::AutoPtr<Poco::Util::MapConfiguration> map_config = new Poco::Util::MapConfiguration;
     std::string key;
-    for (auto & arg : argv)
+    for (const auto & arg : argv)
     {
         auto key_start = arg.find_first_not_of('-');
         auto pos_minus = arg.find('-');

diff --git a/base/common/phdr_cache.cpp b/base/common/phdr_cache.cpp
@@ -70,7 +70,7 @@ extern "C"
 #endif
 int dl_iterate_phdr(int (*callback) (dl_phdr_info * info, size_t size, void * data), void * data)
 {
-    auto current_phdr_cache = phdr_cache.load();
+    auto * current_phdr_cache = phdr_cache.load();
     if (!current_phdr_cache)
     {
         // Cache is not yet populated, pass through to the original function.

diff --git a/cmake/autogenerated_versions.txt b/cmake/autogenerated_versions.txt
@@ -0,0 +1,9 @@
+# This strings autochanged from release_lib.sh:
+SET(VERSION_REVISION 54433)
+SET(VERSION_MAJOR 20)
+SET(VERSION_MINOR 3)
+SET(VERSION_PATCH 14)
+SET(VERSION_GITHASH 37bdc0588422d170f8bc36f152f4ec3964b07a9b)
+SET(VERSION_DESCRIBE v20.3.14.130-lts)
+SET(VERSION_STRING 20.3.14.130)
+# end of autochange
diff --git a/cmake/version.cmake b/cmake/version.cmake
@@ -1,12 +1,4 @@
-# This strings autochanged from release_lib.sh:
-set(VERSION_REVISION 54433)
-set(VERSION_MAJOR 20)
-set(VERSION_MINOR 3)
-set(VERSION_PATCH 10)
-set(VERSION_GITHASH 257cd6cadf7380ee6936d9c00922176e5d268992)
-set(VERSION_DESCRIBE v20.3.10.75-lts)
-set(VERSION_STRING 20.3.10.75)
-# end of autochange
+include(${CMAKE_SOURCE_DIR}/cmake/autogenerated_versions.txt)
 
 set(VERSION_EXTRA "" CACHE STRING "")
 set(VERSION_TWEAK "" CACHE STRING "")

diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
@@ -335,3 +335,6 @@ endif()
 add_subdirectory(grpc-cmake)
 
 add_subdirectory(replxx-cmake)
+
+add_subdirectory (fmtlib-cmake)
+
diff --git a/contrib/cppkafka b/contrib/cppkafka
diff --git a/contrib/fmtlib b/contrib/fmtlib
diff --git a/contrib/fmtlib-cmake/CMakeLists.txt b/contrib/fmtlib-cmake/CMakeLists.txt
@@ -0,0 +1,20 @@
+set (SRCS
+    ../fmtlib/src/format.cc
+    ../fmtlib/src/os.cc
+
+    ../fmtlib/include/fmt/chrono.h
+    ../fmtlib/include/fmt/color.h
+    ../fmtlib/include/fmt/compile.h
+    ../fmtlib/include/fmt/core.h
+    ../fmtlib/include/fmt/format.h
+    ../fmtlib/include/fmt/format-inl.h
+    ../fmtlib/include/fmt/locale.h
+    ../fmtlib/include/fmt/os.h
+    ../fmtlib/include/fmt/ostream.h
+    ../fmtlib/include/fmt/posix.h
+    ../fmtlib/include/fmt/printf.h
+    ../fmtlib/include/fmt/ranges.h
+)
+
+add_library(fmt ${SRCS})
+target_include_directories(fmt SYSTEM PUBLIC ../fmtlib/include)
diff --git a/debian/changelog b/debian/changelog
@@ -1,5 +1,5 @@
-clickhouse (20.3.10.1) unstable; urgency=low
+clickhouse (20.3.14.1) unstable; urgency=low
 
   * Modified source code
 
- -- clickhouse-release <[email protected]>  Tue, 19 May 2020 02:44:39 +0300
+ -- clickhouse-release <[email protected]>  Wed, 15 Jul 2020 11:53:50 +0300
diff --git a/debian/rules b/debian/rules
@@ -24,6 +24,10 @@ DEB_BUILD_OPTIONS+=parallel=$(THREADS_COUNT)
 
 ifndef ENABLE_TESTS
     CMAKE_FLAGS += -DENABLE_TESTS=0
+else
+# To export binaries and from deb build we do not strip them. No need to run tests in deb build as we run them in CI
+    DEB_BUILD_OPTIONS+= nocheck
+    DEB_BUILD_OPTIONS+= nostrip
 endif
 
 ifndef MAKE_TARGET
@@ -88,14 +92,19 @@ override_dh_auto_build:
 	$(MAKE) $(THREADS_COUNT) -C $(BUILDDIR) $(MAKE_TARGET)
 
 override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	cd $(BUILDDIR) && ctest $(THREADS_COUNT) -V -E with_server
+endif
 
 override_dh_clean:
 	rm -rf debian/copyright debian/clickhouse-client.docs debian/clickhouse-common-static.docs
-	dh_clean -X contrib
+	dh_clean # -X contrib
 
 override_dh_strip:
+#https://www.debian.org/doc/debian-policy/ch-source.html#debian-rules-and-deb-build-options
+ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
 	dh_strip -pclickhouse-common-static --dbg-package=clickhouse-common-static-dbg
+endif
 
 override_dh_install:
 	# Making docs

diff --git a/docker/client/Dockerfile b/docker/client/Dockerfile
@@ -1,7 +1,7 @@
 FROM ubuntu:18.04
 
 ARG repository="deb http://repo.yandex.ru/clickhouse/deb/stable/ main/"
-ARG version=20.3.10.*
+ARG version=20.3.14.*
 
 RUN apt-get update \
     && apt-get install --yes --no-install-recommends \
Original file line number	Diff line number	Diff line change
Expand Up		@@ -335,3 +335,6 @@ endif()
		add_subdirectory(grpc-cmake)

		add_subdirectory(replxx-cmake)

		add_subdirectory (fmtlib-cmake)