From c2f40e8d41bcb8ecdc5c4d6248da58a91114ed89 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Sun, 25 Mar 2018 06:47:56 +0300
Subject: [PATCH] Removed libzookeeper [#CLICKHOUSE-2]

---
 .gitmodules                              |  3 --
 CMakeLists.txt                           |  1 -
 cmake/find_zookeeper.cmake               | 35 ------------------------
 contrib/CMakeLists.txt                   |  4 ---
 contrib/zookeeper                        |  1 -
 dbms/src/Common/ZooKeeper/CMakeLists.txt |  7 +----
 6 files changed, 1 insertion(+), 50 deletions(-)
 delete mode 100644 cmake/find_zookeeper.cmake
 delete mode 160000 contrib/zookeeper

diff --git a/.gitmodules b/.gitmodules
index ab5c0c7bb74..a1ba915b91e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "contrib/zookeeper"]
-	path = contrib/zookeeper
-	url = https://github.com/ClickHouse-Extras/zookeeper.git
 [submodule "contrib/poco"]
 	path = contrib/poco
 	url = https://github.com/ClickHouse-Extras/poco
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ca4be1f5893..3c2586cffd0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -258,7 +258,6 @@ include (cmake/find_sparsehash.cmake)
 include (cmake/find_rt.cmake)
 include (cmake/find_execinfo.cmake)
 include (cmake/find_readline_edit.cmake)
-include (cmake/find_zookeeper.cmake)
 include (cmake/find_re2.cmake)
 include (cmake/find_rdkafka.cmake)
 include (cmake/find_capnp.cmake)
diff --git a/cmake/find_zookeeper.cmake b/cmake/find_zookeeper.cmake
deleted file mode 100644
index f667c310eb4..00000000000
--- a/cmake/find_zookeeper.cmake
+++ /dev/null
@@ -1,35 +0,0 @@
-if (ARCH_ARM)
-    # bundled have some asm broken for arm, use package libzookeeper-mt-dev
-    set(USE_INTERNAL_ZOOKEEPER_LIBRARY 0 CACHE BOOL "")
-endif ()
-
-option (USE_INTERNAL_ZOOKEEPER_LIBRARY "Set to FALSE to use system zookeeper library instead of bundled" ${NOT_UNBUNDLED})
-
-if (USE_INTERNAL_ZOOKEEPER_LIBRARY AND NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/zookeeper/src/c/CMakeLists.txt")
-   message (WARNING "submodule contrib/zookeeper is missing. to fix try run: \n git submodule update --init --recursive")
-   set (USE_INTERNAL_ZOOKEEPER_LIBRARY 0)
-endif ()
-
-if (NOT USE_INTERNAL_ZOOKEEPER_LIBRARY)
-    find_library (ZOOKEEPER_LIBRARY zookeeper_mt)
-    find_path (ZOOKEEPER_INCLUDE_DIR NAMES zookeeper/zookeeper.h PATHS ${ZOOKEEPER_INCLUDE_PATHS})
-    set(ZOOKEEPER_INCLUDE_DIR "${ZOOKEEPER_INCLUDE_DIR}/zookeeper")
-endif ()
-
-if (ZOOKEEPER_LIBRARY AND ZOOKEEPER_INCLUDE_DIR)
-else ()
-    set (USE_INTERNAL_ZOOKEEPER_LIBRARY 1)
-    set(WANT_CPPUNIT 0 CACHE BOOL "")
-    set (ZOOKEEPER_LIBRARY zookeeper)
-endif ()
-
-message (STATUS "Using zookeeper: ${ZOOKEEPER_INCLUDE_DIR} : ${ZOOKEEPER_LIBRARY}")
-
-
-# how to make clickhouse branch of https://github.com/ClickHouse-Extras/zookeeper.git :
-# git remote add upstream https://github.com/apache/zookeeper.git
-# git checkhout upstream/master
-# git branch -D clickhouse
-# git checkout -b clickhouse
-# git merge clickhouse_misc
-# git merge clickhouse_706
diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index 9015f7e7d36..118c7009044 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -25,10 +25,6 @@ if (USE_INTERNAL_DOUBLE_CONVERSION_LIBRARY)
     add_subdirectory (double-conversion)
 endif ()
 
-if (USE_INTERNAL_ZOOKEEPER_LIBRARY)
-    add_subdirectory (zookeeper/src/c)
-endif ()
-
 if (USE_INTERNAL_CITYHASH_LIBRARY)
     add_subdirectory (libcityhash)
 endif ()
diff --git a/contrib/zookeeper b/contrib/zookeeper
deleted file mode 160000
index 438afae5af3..00000000000
--- a/contrib/zookeeper
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 438afae5af36c5be9c82d074f43a9bb19e0797c0
diff --git a/dbms/src/Common/ZooKeeper/CMakeLists.txt b/dbms/src/Common/ZooKeeper/CMakeLists.txt
index 6a02d5733b1..197b53da00d 100644
--- a/dbms/src/Common/ZooKeeper/CMakeLists.txt
+++ b/dbms/src/Common/ZooKeeper/CMakeLists.txt
@@ -1,15 +1,10 @@
-
 include(${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake)
 
 add_headers_and_sources(clickhouse_common_zookeeper .)
 
 add_library(clickhouse_common_zookeeper ${SPLIT_SHARED} ${clickhouse_common_zookeeper_headers} ${clickhouse_common_zookeeper_sources})
 
-if (NOT USE_INTERNAL_ZOOKEEPER_LIBRARY)
-    target_include_directories (clickhouse_common_zookeeper BEFORE PUBLIC ${ZOOKEEPER_INCLUDE_DIR})
-endif ()
-
-target_link_libraries (clickhouse_common_zookeeper clickhouse_common_io ${ZOOKEEPER_LIBRARY})
+target_link_libraries (clickhouse_common_zookeeper clickhouse_common_io)
 
 if (ENABLE_TESTS)
     add_subdirectory (tests)