From 616d7d19f8d99fdd3d85dcf88290dc0fc546c711 Mon Sep 17 00:00:00 2001
From: Maksim Kita <maksim-kita@yandex-team.ru>
Date: Tue, 13 Apr 2021 22:53:36 +0300
Subject: [PATCH] LibraryDictionary bridge library interface

---
 programs/library-bridge/CMakeLists.txt        |  2 +-
 .../library-bridge/LibraryInterface.cpp       |  3 +-
 .../library-bridge/LibraryInterface.h         |  0
 programs/library-bridge/LibraryUtils.h        |  3 +-
 programs/library-bridge/library-log.cpp       | 66 -------------------
 src/Dictionaries/LibraryDictionarySource.cpp  |  1 -
 6 files changed, 5 insertions(+), 70 deletions(-)
 rename src/Dictionaries/LibraryDictionarySourceExternal.cpp => programs/library-bridge/LibraryInterface.cpp (97%)
 rename src/Dictionaries/LibraryDictionarySourceExternal.h => programs/library-bridge/LibraryInterface.h (100%)
 delete mode 100644 programs/library-bridge/library-log.cpp

diff --git a/programs/library-bridge/CMakeLists.txt b/programs/library-bridge/CMakeLists.txt
index a9aa5b4f366..7147c2875f2 100644
--- a/programs/library-bridge/CMakeLists.txt
+++ b/programs/library-bridge/CMakeLists.txt
@@ -1,6 +1,6 @@
 set (CLICKHOUSE_LIBRARY_BRIDGE_SOURCES
     library-bridge.cpp
-    library-log.cpp
+    LibraryInterface.cpp
     LibraryBridge.cpp
     Handlers.cpp
     HandlerFactory.cpp
diff --git a/src/Dictionaries/LibraryDictionarySourceExternal.cpp b/programs/library-bridge/LibraryInterface.cpp
similarity index 97%
rename from src/Dictionaries/LibraryDictionarySourceExternal.cpp
rename to programs/library-bridge/LibraryInterface.cpp
index 259d0a2846a..3975368c17f 100644
--- a/src/Dictionaries/LibraryDictionarySourceExternal.cpp
+++ b/programs/library-bridge/LibraryInterface.cpp
@@ -1,4 +1,5 @@
-#include "LibraryDictionarySourceExternal.h"
+#include "LibraryInterface.h"
+
 #include <common/logger_useful.h>
 
 namespace
diff --git a/src/Dictionaries/LibraryDictionarySourceExternal.h b/programs/library-bridge/LibraryInterface.h
similarity index 100%
rename from src/Dictionaries/LibraryDictionarySourceExternal.h
rename to programs/library-bridge/LibraryInterface.h
diff --git a/programs/library-bridge/LibraryUtils.h b/programs/library-bridge/LibraryUtils.h
index 359d1de93e3..8ced8df1c48 100644
--- a/programs/library-bridge/LibraryUtils.h
+++ b/programs/library-bridge/LibraryUtils.h
@@ -1,11 +1,12 @@
 #pragma once
 
 #include <Common/StringUtils/StringUtils.h>
-#include <Dictionaries/LibraryDictionarySourceExternal.h>
 #include <Core/Block.h>
 #include <ext/bit_cast.h>
 #include <ext/range.h>
 
+#include "LibraryInterface.h"
+
 
 namespace DB
 {
diff --git a/programs/library-bridge/library-log.cpp b/programs/library-bridge/library-log.cpp
deleted file mode 100644
index 89fb31623b3..00000000000
--- a/programs/library-bridge/library-log.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-#include <Dictionaries/LibraryDictionarySourceExternal.h>
-#include <common/logger_useful.h>
-
-namespace
-{
-const char DICT_LOGGER_NAME[] = "LibraryDictionarySourceExternal";
-}
-
-namespace ClickHouseLibrary
-{
-
-std::string_view LIBRARY_CREATE_NEW_FUNC_NAME = "ClickHouseDictionary_v3_libNew";
-std::string_view LIBRARY_CLONE_FUNC_NAME = "ClickHouseDictionary_v3_libClone";
-std::string_view LIBRARY_DELETE_FUNC_NAME = "ClickHouseDictionary_v3_libDelete";
-
-std::string_view LIBRARY_DATA_NEW_FUNC_NAME = "ClickHouseDictionary_v3_dataNew";
-std::string_view LIBRARY_DATA_DELETE_FUNC_NAME = "ClickHouseDictionary_v3_dataDelete";
-
-std::string_view LIBRARY_LOAD_ALL_FUNC_NAME = "ClickHouseDictionary_v3_loadAll";
-std::string_view LIBRARY_LOAD_IDS_FUNC_NAME = "ClickHouseDictionary_v3_loadIds";
-std::string_view LIBRARY_LOAD_KEYS_FUNC_NAME = "ClickHouseDictionary_v3_loadKeys";
-
-std::string_view LIBRARY_IS_MODIFIED_FUNC_NAME = "ClickHouseDictionary_v3_isModified";
-std::string_view LIBRARY_SUPPORTS_SELECTIVE_LOAD_FUNC_NAME = "ClickHouseDictionary_v3_supportsSelectiveLoad";
-
-void log(LogLevel level, CString msg)
-{
-    auto & logger = Poco::Logger::get(DICT_LOGGER_NAME);
-    switch (level)
-    {
-        case LogLevel::TRACE:
-            if (logger.trace())
-                logger.trace(msg);
-            break;
-        case LogLevel::DEBUG:
-            if (logger.debug())
-                logger.debug(msg);
-            break;
-        case LogLevel::INFORMATION:
-            if (logger.information())
-                logger.information(msg);
-            break;
-        case LogLevel::NOTICE:
-            if (logger.notice())
-                logger.notice(msg);
-            break;
-        case LogLevel::WARNING:
-            if (logger.warning())
-                logger.warning(msg);
-            break;
-        case LogLevel::ERROR:
-            if (logger.error())
-                logger.error(msg);
-            break;
-        case LogLevel::CRITICAL:
-            if (logger.critical())
-                logger.critical(msg);
-            break;
-        case LogLevel::FATAL:
-            if (logger.fatal())
-                logger.fatal(msg);
-            break;
-    }
-}
-
-}
diff --git a/src/Dictionaries/LibraryDictionarySource.cpp b/src/Dictionaries/LibraryDictionarySource.cpp
index d327c85f979..b14545cd6d4 100644
--- a/src/Dictionaries/LibraryDictionarySource.cpp
+++ b/src/Dictionaries/LibraryDictionarySource.cpp
@@ -10,7 +10,6 @@
 #include "DictionarySourceFactory.h"
 #include "DictionarySourceHelpers.h"
 #include "DictionaryStructure.h"
-#include "LibraryDictionarySourceExternal.h"
 #include "registerDictionaries.h"
 #include <IO/WriteBufferFromString.h>
 #include <IO/WriteHelpers.h>