From 8720d3b937b8fa24a3bb4b4ff98a66a3dee40864 Mon Sep 17 00:00:00 2001
From: chertus <chertus@gmail.com>
Date: Tue, 18 Dec 2018 16:26:04 +0300
Subject: [PATCH 1/2] remove stale code

---
 dbms/src/Interpreters/ExpressionAnalyzer.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/dbms/src/Interpreters/ExpressionAnalyzer.h b/dbms/src/Interpreters/ExpressionAnalyzer.h
index aa4d2ebe8a7..29efda0ce63 100644
--- a/dbms/src/Interpreters/ExpressionAnalyzer.h
+++ b/dbms/src/Interpreters/ExpressionAnalyzer.h
@@ -58,10 +58,6 @@ struct ExpressionAnalyzerData
 
     bool has_global_subqueries = false;
 
-    /// Which column is needed to be ARRAY-JOIN'ed to get the specified.
-    /// For example, for `SELECT s.v ... ARRAY JOIN a AS s` will get "s.v" -> "a.v".
-    NameToNameMap array_join_result_to_source;
-
     /// All new temporary tables obtained by performing the GLOBAL IN/JOIN subqueries.
     Tables external_tables;
 

From c63ca042ba55d25f6ead65a71f6e3805047b96e9 Mon Sep 17 00:00:00 2001
From: proller <proller@users.noreply.github.com>
Date: Tue, 18 Dec 2018 16:37:00 +0300
Subject: [PATCH 2/2] Fix macos build (#3861)

---
 cmake/find_hdfs3.cmake                           | 9 ++++++---
 cmake/find_libgsasl.cmake                        | 4 ++--
 cmake/find_rdkafka.cmake                         | 2 +-
 cmake/find_ssl.cmake                             | 6 +++---
 cmake/find_zlib.cmake                            | 2 +-
 dbms/src/Storages/MergeTree/DiskSpaceMonitor.cpp | 2 +-
 debian/.pbuilderrc                               | 2 ++
 libs/libcommon/cmake/find_jemalloc.cmake         | 2 +-
 8 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/cmake/find_hdfs3.cmake b/cmake/find_hdfs3.cmake
index a6fdec20291..a30409b50d5 100644
--- a/cmake/find_hdfs3.cmake
+++ b/cmake/find_hdfs3.cmake
@@ -15,12 +15,15 @@ if (NOT USE_INTERNAL_HDFS3_LIBRARY)
 endif ()
 
 if (HDFS3_LIBRARY AND HDFS3_INCLUDE_DIR)
-else ()
+    set(USE_HDFS 1)
+elseif (LIBGSASL_LIBRARY)
     set(HDFS3_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/libhdfs3/include")
     set(HDFS3_LIBRARY hdfs3)
+    set(USE_HDFS 1)
+else()
+    set(USE_INTERNAL_HDFS3_LIBRARY 0)
 endif()
-set (USE_HDFS 1)
 
 endif()
 
-message (STATUS "Using hdfs3: ${HDFS3_INCLUDE_DIR} : ${HDFS3_LIBRARY}")
+message (STATUS "Using hdfs3=${USE_HDFS}: ${HDFS3_INCLUDE_DIR} : ${HDFS3_LIBRARY}")
diff --git a/cmake/find_libgsasl.cmake b/cmake/find_libgsasl.cmake
index b686bb1df7f..0c88bd2c24a 100644
--- a/cmake/find_libgsasl.cmake
+++ b/cmake/find_libgsasl.cmake
@@ -1,4 +1,4 @@
-if (NOT APPLE)
+if (NOT APPLE AND NOT ARCH_32)
     option (USE_INTERNAL_LIBGSASL_LIBRARY "Set to FALSE to use system libgsasl library instead of bundled" ${NOT_UNBUNDLED})
 endif ()
 
@@ -13,7 +13,7 @@ if (NOT USE_INTERNAL_LIBGSASL_LIBRARY)
 endif ()
 
 if (LIBGSASL_LIBRARY AND LIBGSASL_INCLUDE_DIR)
-else ()
+elseif (NOT APPLE AND NOT ARCH_32)
     set (LIBGSASL_INCLUDE_DIR ${ClickHouse_SOURCE_DIR}/contrib/libgsasl/src ${ClickHouse_SOURCE_DIR}/contrib/libgsasl/linux_x86_64/include)
     set (USE_INTERNAL_LIBGSASL_LIBRARY 1)
     set (LIBGSASL_LIBRARY libgsasl)
diff --git a/cmake/find_rdkafka.cmake b/cmake/find_rdkafka.cmake
index 1d2674ea1a3..9ba48cadfcd 100644
--- a/cmake/find_rdkafka.cmake
+++ b/cmake/find_rdkafka.cmake
@@ -1,4 +1,4 @@
-if (NOT ARCH_ARM)
+if (NOT ARCH_ARM AND NOT ARCH_32)
     option (ENABLE_RDKAFKA "Enable kafka" ON)
 endif ()
 
diff --git a/cmake/find_ssl.cmake b/cmake/find_ssl.cmake
index 6d630c7198c..d159bcfba23 100644
--- a/cmake/find_ssl.cmake
+++ b/cmake/find_ssl.cmake
@@ -1,6 +1,6 @@
-#if (OS_LINUX)
-option (USE_INTERNAL_SSL_LIBRARY "Set to FALSE to use system *ssl library instead of bundled" ${NOT_UNBUNDLED})
-#endif ()
+if(NOT ARCH_32)
+    option(USE_INTERNAL_SSL_LIBRARY "Set to FALSE to use system *ssl library instead of bundled" ${NOT_UNBUNDLED})
+endif()
 
 set (OPENSSL_USE_STATIC_LIBS ${USE_STATIC_LIBRARIES})
 
diff --git a/cmake/find_zlib.cmake b/cmake/find_zlib.cmake
index f6b2d268291..90fe674ab36 100644
--- a/cmake/find_zlib.cmake
+++ b/cmake/find_zlib.cmake
@@ -1,4 +1,4 @@
-if (NOT OS_FREEBSD)
+if (NOT OS_FREEBSD AND NOT ARCH_32)
     option (USE_INTERNAL_ZLIB_LIBRARY "Set to FALSE to use system zlib library instead of bundled" ${NOT_UNBUNDLED})
 endif ()
 
diff --git a/dbms/src/Storages/MergeTree/DiskSpaceMonitor.cpp b/dbms/src/Storages/MergeTree/DiskSpaceMonitor.cpp
index e5bb80df138..507ac8b7459 100644
--- a/dbms/src/Storages/MergeTree/DiskSpaceMonitor.cpp
+++ b/dbms/src/Storages/MergeTree/DiskSpaceMonitor.cpp
@@ -4,7 +4,7 @@ namespace DB
 {
 
 UInt64 DiskSpaceMonitor::reserved_bytes;
-size_t DiskSpaceMonitor::reservation_count;
+UInt64 DiskSpaceMonitor::reservation_count;
 std::mutex DiskSpaceMonitor::mutex;
 
 }
diff --git a/debian/.pbuilderrc b/debian/.pbuilderrc
index 4e5722fe9e5..12e275836c2 100644
--- a/debian/.pbuilderrc
+++ b/debian/.pbuilderrc
@@ -192,6 +192,8 @@ EXTRAPACKAGES+=" psmisc "
 
 [[ $CCACHE_PREFIX == 'distcc' ]] && EXTRAPACKAGES+=" $CCACHE_PREFIX " && USENETWORK=yes && export DISTCC_DIR=/var/cache/pbuilder/distcc
 
+[[ $ARCH == 'i386' ]] && EXTRAPACKAGES+=" libssl-dev "
+
 export DEB_BUILD_OPTIONS=parallel=`nproc`
 
 # Floating bug with permissions:
diff --git a/libs/libcommon/cmake/find_jemalloc.cmake b/libs/libcommon/cmake/find_jemalloc.cmake
index f3fa138e5cc..d9bc37f9d6c 100644
--- a/libs/libcommon/cmake/find_jemalloc.cmake
+++ b/libs/libcommon/cmake/find_jemalloc.cmake
@@ -1,4 +1,4 @@
-if (OS_LINUX AND NOT SANITIZE AND NOT ARCH_ARM)
+if (OS_LINUX AND NOT SANITIZE AND NOT ARCH_ARM AND NOT ARCH_32)
     set(ENABLE_JEMALLOC_DEFAULT 1)
 else ()
     set(ENABLE_JEMALLOC_DEFAULT 0)