Move files

base/common/CMakeLists.txt

@@ -8,7 +8,6 @@ set (SRCS
     getMemoryAmount.cpp
     getThreadId.cpp
     JSON.cpp
-    LineReader.cpp
     mremap.cpp
     phdr_cache.cpp
     preciseExp10.cpp
@@ -18,11 +17,11 @@ set (SRCS
     terminalColors.cpp
 )
 
-if (ENABLE_REPLXX)
-    list (APPEND SRCS ReplxxLineReader.cpp)
-elseif (ENABLE_READLINE)
-    list (APPEND SRCS ReadlineLineReader.cpp)
-endif ()
+#if (ENABLE_REPLXX)
+#    list (APPEND SRCS ReplxxLineReader.cpp)
+#elseif (ENABLE_READLINE)
+#    list (APPEND SRCS ReadlineLineReader.cpp)
+#endif ()
 
 if (USE_DEBUG_HELPERS)
     set (INCLUDE_DEBUG_HELPERS "-include ${ClickHouse_SOURCE_DIR}/base/common/iostream_debug_helpers.h")
@@ -43,7 +42,6 @@ if (USE_INTERNAL_CCTZ)
 endif()
 
 target_include_directories(common PUBLIC .. ${CMAKE_CURRENT_BINARY_DIR}/..)
-target_include_directories(common PUBLIC ../../src/Parsers/..)
 
 if (NOT USE_INTERNAL_BOOST_LIBRARY)
     target_include_directories (common SYSTEM BEFORE PUBLIC ${Boost_INCLUDE_DIRS})

programs/client/Client.cpp

@@ -3,11 +3,11 @@
 #include "Suggest.h"
 
 #if USE_REPLXX
-#   include <common/ReplxxLineReader.h>
+#   include <Common/ReplxxLineReader.h>
 #elif defined(USE_READLINE) && USE_READLINE
-#   include <common/ReadlineLineReader.h>
+#   include <Common/ReadlineLineReader.h>
 #else
-#   include <common/LineReader.h>
+#   include <Common/LineReader.h>
 #endif
 
 #include <stdlib.h>
@@ -27,7 +27,7 @@
 #include <Poco/File.h>
 #include <Poco/Util/Application.h>
 #include <common/find_symbols.h>
-#include <common/LineReader.h>
+#include <Common/LineReader.h>
 #include <Common/ClickHouseRevision.h>
 #include <Common/Stopwatch.h>
 #include <Common/Exception.h>

programs/client/Suggest.h

@@ -4,7 +4,7 @@
 
 #include <Client/Connection.h>
 #include <IO/ConnectionTimeouts.h>
-#include <common/LineReader.h>
+#include <Common/LineReader.h>
 #include <thread>
 
 

src/Common/LineReader.cpp

@@ -1,4 +1,4 @@
-#include <common/LineReader.h>
+#include <Common/LineReader.h>
 
 #include <iostream>
 #include <string_view>

src/Common/ReadlineLineReader.cpp

@@ -1,10 +1,12 @@
-#include <common/ReadlineLineReader.h>
+#include <Common/ReadlineLineReader.h>
 #include <ext/scope_guard.h>
 
 #include <errno.h>
 #include <signal.h>
 #include <string.h>
 #include <unistd.h>
+#include <iostream>
+#include <ostream>
 
 namespace
 {

src/Common/ReplxxLineReader.cpp

@@ -1,4 +1,4 @@
-#include <common/ReplxxLineReader.h>
+#include <Common/ReplxxLineReader.h>
 
 #include <errno.h>
 #include <string.h>

src/Common/ReplxxLineReader.h

@@ -22,7 +22,7 @@ private:
     const std::unordered_map<DB::TokenType, replxx::Replxx::Color> token_to_color = {
         { DB::TokenType::Whitespace, replxx::Replxx::Color::NORMAL },
         { DB::TokenType::Comment, replxx::Replxx::Color::GRAY },
-        { DB::TokenType::BareWord, replxx::Replxx::Color::RED },
+        { DB::TokenType::BareWord, replxx::Replxx::Color::YELLOW },
         { DB::TokenType::Number, replxx::Replxx::Color::BLUE },
         { DB::TokenType::StringLiteral, replxx::Replxx::Color::BRIGHTCYAN },
         { DB::TokenType::QuotedIdentifier, replxx::Replxx::Color::BRIGHTMAGENTA },

utils/zookeeper-cli/zookeeper-cli.cpp

@@ -3,7 +3,7 @@
 #include <Poco/ConsoleChannel.h>
 #include <Common/ZooKeeper/KeeperException.h>
 #include <Common/ZooKeeper/ZooKeeper.h>
-#include <common/LineReader.h>
+#include <Common/LineReader.h>
 #include <common/logger_useful.h>
 
 #include <iostream>