diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5330c8daeb5..578e25b8e16 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -343,7 +343,7 @@ include (cmake/find_hyperscan.cmake)
 include (cmake/find_simdjson.cmake)
 include (cmake/find_rapidjson.cmake)
 include (cmake/find_fastops.cmake)
-include (cmake/find_orc.cmake)
+#include (cmake/find_orc.cmake)
 
 find_contrib_lib(cityhash)
 find_contrib_lib(farmhash)
diff --git a/cmake/find_hdfs3.cmake b/cmake/find_hdfs3.cmake
index 4c29047fc75..9c593d3266a 100644
--- a/cmake/find_hdfs3.cmake
+++ b/cmake/find_hdfs3.cmake
@@ -1,24 +1,29 @@
-if (NOT ARCH_ARM AND NOT OS_FREEBSD AND NOT APPLE AND USE_PROTOBUF)
-    option (ENABLE_HDFS "Enable HDFS" ${NOT_UNBUNDLED})
-endif ()
+if(NOT ARCH_ARM AND NOT OS_FREEBSD AND NOT APPLE AND USE_PROTOBUF)
+    option(ENABLE_HDFS "Enable HDFS" 1)
+endif()
 
-if (ENABLE_HDFS AND NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/libhdfs3/include/hdfs/hdfs.h")
-   message (WARNING "submodule contrib/libhdfs3 is missing. to fix try run: \n git submodule update --init --recursive")
-   set (ENABLE_HDFS  0)
-endif ()
+if(ENABLE_HDFS)
+option(USE_INTERNAL_HDFS3_LIBRARY "Set to FALSE to use system HDFS3 instead of bundled" ${NOT_UNBUNDLED})
 
-if (ENABLE_HDFS)
-option (USE_INTERNAL_HDFS3_LIBRARY "Set to FALSE to use system HDFS3 instead of bundled" ON)
+if(NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/libhdfs3/include/hdfs/hdfs.h")
+    if(USE_INTERNAL_HDFS3_LIBRARY)
+       message(WARNING "submodule contrib/libhdfs3 is missing. to fix try run: \n git submodule update --init --recursive")
+    endif()
+    set(MISSING_INTERNAL_HDFS3_LIBRARY 1)
+    set(USE_INTERNAL_HDFS3_LIBRARY 0)
+endif()
 
-if (NOT USE_INTERNAL_HDFS3_LIBRARY)
-    find_package(hdfs3)
-endif ()
+if(NOT USE_INTERNAL_HDFS3_LIBRARY)
+    find_library(HDFS3_LIBRARY hdfs3)
+    find_path(HDFS3_INCLUDE_DIR NAMES hdfs/hdfs.h PATHS ${HDFS3_INCLUDE_PATHS})
+endif()
 
-if (HDFS3_LIBRARY AND HDFS3_INCLUDE_DIR)
+if(HDFS3_LIBRARY AND HDFS3_INCLUDE_DIR)
     set(USE_HDFS 1)
-elseif (LIBGSASL_LIBRARY AND LIBXML2_LIBRARY)
+elseif(NOT MISSING_INTERNAL_HDFS3_LIBRARY AND LIBGSASL_LIBRARY AND LIBXML2_LIBRARY)
     set(HDFS3_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/libhdfs3/include")
     set(HDFS3_LIBRARY hdfs3)
+    set(USE_INTERNAL_HDFS3_LIBRARY 1)
     set(USE_HDFS 1)
 else()
     set(USE_INTERNAL_HDFS3_LIBRARY 0)
@@ -26,4 +31,4 @@ endif()
 
 endif()
 
-message (STATUS "Using hdfs3=${USE_HDFS}: ${HDFS3_INCLUDE_DIR} : ${HDFS3_LIBRARY}")
+message(STATUS "Using hdfs3=${USE_HDFS}: ${HDFS3_INCLUDE_DIR} : ${HDFS3_LIBRARY}")
diff --git a/cmake/find_llvm.cmake b/cmake/find_llvm.cmake
index 3692a98b979..c668416c0c0 100644
--- a/cmake/find_llvm.cmake
+++ b/cmake/find_llvm.cmake
@@ -18,22 +18,12 @@ if (ENABLE_EMBEDDED_COMPILER)
         elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
             find_package(LLVM ${CMAKE_CXX_COMPILER_VERSION} CONFIG PATHS ${LLVM_PATHS})
         else ()
-            #TODO:
-            #if(NOT LLVM_FOUND)
-            #    find_package(LLVM 9 CONFIG PATHS ${LLVM_PATHS})
-            #endif()
-            #if(NOT LLVM_FOUND)
-            #    find_package(LLVM 8 CONFIG PATHS ${LLVM_PATHS})
-            #endif()
-            if (NOT LLVM_FOUND)
-                find_package (LLVM 7 CONFIG PATHS ${LLVM_PATHS})
-            endif ()
-            if (NOT LLVM_FOUND)
-                find_package (LLVM 6 CONFIG PATHS ${LLVM_PATHS})
-            endif ()
-            if (NOT LLVM_FOUND)
-                find_package (LLVM 5 CONFIG PATHS ${LLVM_PATHS})
-            endif ()
+            # TODO: 9 8
+            foreach(llvm_v 7.1 7 6 5)
+                if (NOT LLVM_FOUND)
+                    find_package (LLVM ${llvm_v} CONFIG PATHS ${LLVM_PATHS})
+                endif ()
+            endforeach ()
         endif ()
 
         if (LLVM_FOUND)
diff --git a/cmake/find_orc.cmake b/cmake/find_orc.cmake
index 3676bec1b6b..50e563b04b4 100644
--- a/cmake/find_orc.cmake
+++ b/cmake/find_orc.cmake
@@ -1,8 +1,38 @@
-##TODO replace hardcode to find procedure
+option (ENABLE_ORC "Enable ORC" 1)
 
-set(USE_ORC 0)
-set(USE_INTERNAL_ORC_LIBRARY ON)
+if(ENABLE_ORC)
+option (USE_INTERNAL_ORC_LIBRARY "Set to FALSE to use system ORC instead of bundled" ${NOT_UNBUNDLED})
 
-if (ARROW_LIBRARY)
+if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/orc/c++/include/orc/OrcFile.hh")
+   if(USE_INTERNAL_ORC_LIBRARY)
+       message(WARNING "submodule contrib/orc is missing. to fix try run: \n git submodule update --init --recursive")
+       set(USE_INTERNAL_ORC_LIBRARY 0)
+   endif()
+   set(MISSING_INTERNAL_ORC_LIBRARY 1)
+endif ()
+
+if (NOT USE_INTERNAL_ORC_LIBRARY)
+    find_package(orc)
+endif ()
+
+#if (USE_INTERNAL_ORC_LIBRARY)
+#find_path(CYRUS_SASL_INCLUDE_DIR sasl/sasl.h)
+#find_library(CYRUS_SASL_SHARED_LIB sasl2)
+#if (NOT CYRUS_SASL_INCLUDE_DIR OR NOT CYRUS_SASL_SHARED_LIB)
+#    set(USE_ORC 0)
+#endif()
+#endif()
+
+if (ORC_LIBRARY AND ORC_INCLUDE_DIR)
     set(USE_ORC 1)
-endif()
\ No newline at end of file
+elseif(NOT MISSING_INTERNAL_ORC_LIBRARY AND ARROW_LIBRARY) # (LIBGSASL_LIBRARY AND LIBXML2_LIBRARY)
+    set(ORC_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/orc/c++/include")
+    set(ORC_LIBRARY orc)
+    set(USE_ORC 1)
+else()
+    set(USE_INTERNAL_ORC_LIBRARY 0)
+endif()
+
+endif()
+
+message (STATUS "Using internal=${USE_INTERNAL_ORC_LIBRARY} orc=${USE_ORC}: ${ORC_INCLUDE_DIR} : ${ORC_LIBRARY}")
diff --git a/cmake/find_parquet.cmake b/cmake/find_parquet.cmake
index 63f589a9ea5..5c5bc664113 100644
--- a/cmake/find_parquet.cmake
+++ b/cmake/find_parquet.cmake
@@ -62,6 +62,7 @@ elseif(NOT MISSING_INTERNAL_PARQUET_LIBRARY AND NOT OS_FREEBSD)
     endif()
 
     set(USE_PARQUET 1)
+    set(USE_ORC 1)
    endif()
 endif()
 
diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index 96462de0190..54fdc4d69e0 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -10,19 +10,6 @@ endif ()
 
 set_property(DIRECTORY PROPERTY EXCLUDE_FROM_ALL 1)
 
-if (USE_INTERNAL_ORC_LIBRARY)
-    set(BUILD_JAVA OFF)
-    set (ANALYZE_JAVA OFF)
-    set (BUILD_CPP_TESTS OFF)
-    set (BUILD_TOOLS OFF)
-    option(BUILD_JAVA OFF)
-    option (ANALYZE_JAVA OFF)
-    option (BUILD_CPP_TESTS OFF)
-    option (BUILD_TOOLS OFF)
-    set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/contrib/orc/cmake_modules")
-    add_subdirectory(orc)
-endif()
-
 if (USE_INTERNAL_BOOST_LIBRARY)
     add_subdirectory (boost-cmake)
 endif ()
@@ -327,3 +314,7 @@ endif()
 if (USE_FASTOPS)
     add_subdirectory (fastops-cmake)
 endif()
+
+#if (USE_INTERNAL_ORC_LIBRARY)
+#    add_subdirectory(orc-cmake)
+#endif ()
diff --git a/contrib/arrow-cmake/CMakeLists.txt b/contrib/arrow-cmake/CMakeLists.txt
index ba1ddc2414a..cfd57f2b296 100644
--- a/contrib/arrow-cmake/CMakeLists.txt
+++ b/contrib/arrow-cmake/CMakeLists.txt
@@ -56,11 +56,11 @@ set(ORC_SOURCE_WRAP_DIR ${ORC_SOURCE_DIR}/wrap)
 set(ORC_BUILD_SRC_DIR ${CMAKE_CURRENT_BINARY_DIR}/../orc/c++/src)
 set(ORC_BUILD_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/../orc/c++/include)
 
-set(GOOGLE_PROTOBUF_DIR ${ClickHouse_SOURCE_DIR}/contrib/protobuf/src/)
+set(GOOGLE_PROTOBUF_DIR ${Protobuf_INCLUDE_DIR}/)
 set(ORC_ADDITION_SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR})
 set(ARROW_SRC_DIR ${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/src)
 
-set(PROTOBUF_EXECUTABLE ${CMAKE_CURRENT_BINARY_DIR}/../protobuf/cmake/protoc)
+set(PROTOBUF_EXECUTABLE ${Protobuf_PROTOC_EXECUTABLE})
 set(PROTO_DIR ${ORC_SOURCE_DIR}/../proto)
 
 
@@ -70,14 +70,10 @@ add_custom_command(OUTPUT orc_proto.pb.h orc_proto.pb.cc
         --cpp_out="${CMAKE_CURRENT_BINARY_DIR}"
         "${PROTO_DIR}/orc_proto.proto")
 
-include_directories(SYSTEM ${ORC_INCLUDE_DIR})
-include_directories(SYSTEM ${ORC_SOURCE_SRC_DIR})
-include_directories(SYSTEM ${ORC_SOURCE_WRAP_DIR})
-include_directories(SYSTEM ${GOOGLE_PROTOBUF_DIR})
-include_directories(SYSTEM ${ORC_BUILD_SRC_DIR})
-include_directories(SYSTEM ${ORC_BUILD_INCLUDE_DIR})
-include_directories(SYSTEM ${ORC_ADDITION_SOURCE_DIR})
-include_directories(SYSTEM ${ARROW_SRC_DIR})
+include(${ClickHouse_SOURCE_DIR}/contrib/orc/cmake_modules/CheckSourceCompiles.cmake)
+include(orc_check.cmake)
+configure_file("${ORC_INCLUDE_DIR}/orc/orc-config.hh.in"  "${ORC_BUILD_INCLUDE_DIR}/orc/orc-config.hh")
+configure_file("${ORC_SOURCE_SRC_DIR}/Adaptor.hh.in" "${ORC_BUILD_INCLUDE_DIR}/Adaptor.hh")
 
 
 set(ORC_SRCS
@@ -232,6 +228,14 @@ if (ARROW_WITH_ZSTD)
     target_link_libraries(${ARROW_LIBRARY} PRIVATE ${ZSTD_LIBRARY})
 endif()
 
+target_include_directories(${ARROW_LIBRARY} PRIVATE SYSTEM ${ORC_INCLUDE_DIR})
+target_include_directories(${ARROW_LIBRARY} PRIVATE SYSTEM ${ORC_SOURCE_SRC_DIR})
+target_include_directories(${ARROW_LIBRARY} PRIVATE SYSTEM ${ORC_SOURCE_WRAP_DIR})
+target_include_directories(${ARROW_LIBRARY} PRIVATE SYSTEM ${GOOGLE_PROTOBUF_DIR})
+target_include_directories(${ARROW_LIBRARY} PRIVATE SYSTEM ${ORC_BUILD_SRC_DIR})
+target_include_directories(${ARROW_LIBRARY} PRIVATE SYSTEM ${ORC_BUILD_INCLUDE_DIR})
+target_include_directories(${ARROW_LIBRARY} PRIVATE SYSTEM ${ORC_ADDITION_SOURCE_DIR})
+target_include_directories(${ARROW_LIBRARY} PRIVATE SYSTEM ${ARROW_SRC_DIR})
 
 # === parquet
 
diff --git a/contrib/arrow-cmake/orc_check.cmake b/contrib/arrow-cmake/orc_check.cmake
new file mode 100644
index 00000000000..ec1e53cc649
--- /dev/null
+++ b/contrib/arrow-cmake/orc_check.cmake
@@ -0,0 +1,126 @@
+# Not changed part of contrib/orc/c++/src/CMakeLists.txt
+
+INCLUDE(CheckCXXSourceCompiles)
+
+CHECK_CXX_SOURCE_COMPILES("
+    #include<fcntl.h>
+    #include<unistd.h>
+    int main(int,char*[]){
+      int f = open(\"/x/y\", O_RDONLY);
+      char buf[100];
+      return pread(f, buf, 100, 1000) == 0;
+    }"
+  HAS_PREAD
+)
+
+CHECK_CXX_SOURCE_COMPILES("
+    #include<time.h>
+    int main(int,char*[]){
+      struct tm time2020;
+      return !strptime(\"2020-02-02 12:34:56\", \"%Y-%m-%d %H:%M:%S\", &time2020);
+    }"
+  HAS_STRPTIME
+)
+
+CHECK_CXX_SOURCE_COMPILES("
+    #include<string>
+    int main(int,char* argv[]){
+      return static_cast<int>(std::stoll(argv[0]));
+    }"
+  HAS_STOLL
+)
+
+CHECK_CXX_SOURCE_COMPILES("
+    #include<stdint.h>
+    #include<stdio.h>
+    int main(int,char*[]){
+      int64_t x = 1; printf(\"%lld\",x);
+    }"
+  INT64_IS_LL
+)
+
+CHECK_CXX_SOURCE_COMPILES("
+    #ifdef __clang__
+      #pragma clang diagnostic push
+      #pragma clang diagnostic ignored \"-Wdeprecated\"
+      #pragma clang diagnostic pop
+   #elif defined(__GNUC__)
+      #pragma GCC diagnostic push
+      #pragma GCC diagnostic ignored \"-Wdeprecated\"
+      #pragma GCC diagnostic pop
+   #elif defined(_MSC_VER)
+      #pragma warning( push )
+      #pragma warning( disable : 4996 )
+      #pragma warning( pop )
+   #else
+     unknownCompiler!
+   #endif
+   int main(int, char *[]) {}"
+  HAS_DIAGNOSTIC_PUSH
+)
+
+CHECK_CXX_SOURCE_COMPILES("
+    #include<cmath>
+    int main(int, char *[]) {
+      return std::isnan(1.0f);
+    }"
+  HAS_STD_ISNAN
+)
+
+CHECK_CXX_SOURCE_COMPILES("
+    #include<mutex>
+    int main(int, char *[]) {
+       std::mutex test_mutex;
+       std::lock_guard<std::mutex> lock_mutex(test_mutex);
+    }"
+  HAS_STD_MUTEX
+)
+
+CHECK_CXX_SOURCE_COMPILES("
+    #include<string>
+    std::string func() {
+      std::string var = \"test\";
+      return std::move(var);
+    }
+    int main(int, char *[]) {}"
+  NEEDS_REDUNDANT_MOVE
+)
+
+INCLUDE(CheckCXXSourceRuns)
+
+CHECK_CXX_SOURCE_RUNS("
+    #include<time.h>
+    int main(int, char *[]) {
+      time_t t = -14210715; // 1969-07-20 12:34:45
+      struct tm *ptm = gmtime(&t);
+      return !(ptm && ptm->tm_year == 69);
+    }"
+  HAS_PRE_1970
+)
+
+CHECK_CXX_SOURCE_RUNS("
+    #include<stdlib.h>
+    #include<time.h>
+    int main(int, char *[]) {
+      setenv(\"TZ\", \"America/Los_Angeles\", 1);
+      tzset();
+      struct tm time2037;
+      struct tm time2038;
+      strptime(\"2037-05-05 12:34:56\", \"%Y-%m-%d %H:%M:%S\", &time2037);
+      strptime(\"2038-05-05 12:34:56\", \"%Y-%m-%d %H:%M:%S\", &time2038);
+      return mktime(&time2038) - mktime(&time2037) != 31536000;
+    }"
+  HAS_POST_2038
+)
+
+set(CMAKE_REQUIRED_INCLUDES ${ZLIB_INCLUDE_DIR})
+set(CMAKE_REQUIRED_LIBRARIES zlib)
+CHECK_CXX_SOURCE_COMPILES("
+    #define Z_PREFIX
+    #include<zlib.h>
+    z_stream strm;
+    int main(int, char *[]) {
+        deflateReset(&strm);
+    }"
+  NEEDS_Z_PREFIX
+)
diff --git a/contrib/libhdfs3-cmake/CMakeLists.txt b/contrib/libhdfs3-cmake/CMakeLists.txt
index 8ec14f897b9..e1ba7225b0f 100644
--- a/contrib/libhdfs3-cmake/CMakeLists.txt
+++ b/contrib/libhdfs3-cmake/CMakeLists.txt
@@ -199,17 +199,17 @@ if (WITH_KERBEROS)
 endif()
 target_include_directories(hdfs3 PRIVATE ${LIBXML2_INCLUDE_DIR})
 
-target_link_libraries(hdfs3 ${LIBGSASL_LIBRARY})
+target_link_libraries(hdfs3 PRIVATE ${LIBGSASL_LIBRARY})
 if (WITH_KERBEROS)
-    target_link_libraries(hdfs3 ${KERBEROS_LIBRARIES})
+    target_link_libraries(hdfs3 PRIVATE ${KERBEROS_LIBRARIES})
 endif()
-target_link_libraries(hdfs3 ${LIBXML2_LIBRARY})
+target_link_libraries(hdfs3 PRIVATE ${LIBXML2_LIBRARY})
 
 # inherit from parent cmake
 target_include_directories(hdfs3 PRIVATE ${Boost_INCLUDE_DIRS})
 target_include_directories(hdfs3 PRIVATE ${Protobuf_INCLUDE_DIR})
-target_link_libraries(hdfs3 ${Protobuf_LIBRARY})
+target_link_libraries(hdfs3 PRIVATE ${Protobuf_LIBRARY})
 if(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES)
     target_include_directories(hdfs3 PRIVATE ${OPENSSL_INCLUDE_DIR})
-    target_link_libraries(hdfs3 ${OPENSSL_LIBRARIES})
+    target_link_libraries(hdfs3 PRIVATE ${OPENSSL_LIBRARIES})
 endif()
diff --git a/contrib/orc-cmake/CMakeLists.txt b/contrib/orc-cmake/CMakeLists.txt
new file mode 100644
index 00000000000..066ba00aede
--- /dev/null
+++ b/contrib/orc-cmake/CMakeLists.txt
@@ -0,0 +1,229 @@
+# modifyed copy of contrib/orc/c++/src/CMakeLists.txt
+set(LIBRARY_INCLUDE ${ClickHouse_SOURCE_DIR}/contrib/orc/c++/include)
+set(LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/orc/c++/src)
+
+set(PROTOBUF_INCLUDE_DIR ${Protobuf_INCLUDE_DIR})
+set(PROTOBUF_EXECUTABLE ${Protobuf_PROTOC_EXECUTABLE})
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX11_FLAGS} ${WARN_FLAGS}")
+
+INCLUDE(CheckCXXSourceCompiles)
+
+CHECK_CXX_SOURCE_COMPILES("
+    #include<fcntl.h>
+    #include<unistd.h>
+    int main(int,char*[]){
+      int f = open(\"/x/y\", O_RDONLY);
+      char buf[100];
+      return pread(f, buf, 100, 1000) == 0;
+    }"
+  HAS_PREAD
+)
+
+CHECK_CXX_SOURCE_COMPILES("
+    #include<time.h>
+    int main(int,char*[]){
+      struct tm time2020;
+      return !strptime(\"2020-02-02 12:34:56\", \"%Y-%m-%d %H:%M:%S\", &time2020);
+    }"
+  HAS_STRPTIME
+)
+
+CHECK_CXX_SOURCE_COMPILES("
+    #include<string>
+    int main(int,char* argv[]){
+      return static_cast<int>(std::stoll(argv[0]));
+    }"
+  HAS_STOLL
+)
+
+CHECK_CXX_SOURCE_COMPILES("
+    #include<stdint.h>
+    #include<stdio.h>
+    int main(int,char*[]){
+      int64_t x = 1; printf(\"%lld\",x);
+    }"
+  INT64_IS_LL
+)
+
+CHECK_CXX_SOURCE_COMPILES("
+    #ifdef __clang__
+      #pragma clang diagnostic push
+      #pragma clang diagnostic ignored \"-Wdeprecated\"
+      #pragma clang diagnostic pop
+   #elif defined(__GNUC__)
+      #pragma GCC diagnostic push
+      #pragma GCC diagnostic ignored \"-Wdeprecated\"
+      #pragma GCC diagnostic pop
+   #elif defined(_MSC_VER)
+      #pragma warning( push )
+      #pragma warning( disable : 4996 )
+      #pragma warning( pop )
+   #else
+     unknownCompiler!
+   #endif
+   int main(int, char *[]) {}"
+  HAS_DIAGNOSTIC_PUSH
+)
+
+CHECK_CXX_SOURCE_COMPILES("
+    #include<cmath>
+    int main(int, char *[]) {
+      return std::isnan(1.0f);
+    }"
+  HAS_STD_ISNAN
+)
+
+CHECK_CXX_SOURCE_COMPILES("
+    #include<mutex>
+    int main(int, char *[]) {
+       std::mutex test_mutex;
+       std::lock_guard<std::mutex> lock_mutex(test_mutex);
+    }"
+  HAS_STD_MUTEX
+)
+
+CHECK_CXX_SOURCE_COMPILES("
+    #include<string>
+    std::string func() {
+      std::string var = \"test\";
+      return std::move(var);
+    }
+    int main(int, char *[]) {}"
+  NEEDS_REDUNDANT_MOVE
+)
+
+INCLUDE(CheckCXXSourceRuns)
+
+CHECK_CXX_SOURCE_RUNS("
+    #include<time.h>
+    int main(int, char *[]) {
+      time_t t = -14210715; // 1969-07-20 12:34:45
+      struct tm *ptm = gmtime(&t);
+      return !(ptm && ptm->tm_year == 69);
+    }"
+  HAS_PRE_1970
+)
+
+CHECK_CXX_SOURCE_RUNS("
+    #include<stdlib.h>
+    #include<time.h>
+    int main(int, char *[]) {
+      setenv(\"TZ\", \"America/Los_Angeles\", 1);
+      tzset();
+      struct tm time2037;
+      struct tm time2038;
+      strptime(\"2037-05-05 12:34:56\", \"%Y-%m-%d %H:%M:%S\", &time2037);
+      strptime(\"2038-05-05 12:34:56\", \"%Y-%m-%d %H:%M:%S\", &time2038);
+      return mktime(&time2038) - mktime(&time2037) != 31536000;
+    }"
+  HAS_POST_2038
+)
+
+set(CMAKE_REQUIRED_INCLUDES ${ZLIB_INCLUDE_DIR})
+set(CMAKE_REQUIRED_LIBRARIES zlib)
+CHECK_CXX_SOURCE_COMPILES("
+    #define Z_PREFIX
+    #include<zlib.h>
+    z_stream strm;
+    int main(int, char *[]) {
+        deflateReset(&strm);
+    }"
+  NEEDS_Z_PREFIX
+)
+
+configure_file (
+  "${LIBRARY_DIR}/Adaptor.hh.in"
+  "${CMAKE_CURRENT_BINARY_DIR}/Adaptor.hh"
+  )
+
+
+add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/orc_proto.pb.h ${CMAKE_CURRENT_BINARY_DIR}/orc_proto.pb.cc
+   COMMAND ${PROTOBUF_EXECUTABLE}
+        -I${ClickHouse_SOURCE_DIR}/contrib/orc/proto
+        --cpp_out="${CMAKE_CURRENT_BINARY_DIR}"
+        "${ClickHouse_SOURCE_DIR}/contrib/orc/proto/orc_proto.proto"
+)
+
+set(SOURCE_FILES
+  "${CMAKE_CURRENT_BINARY_DIR}/Adaptor.hh"
+  ${CMAKE_CURRENT_BINARY_DIR}/orc_proto.pb.h
+  ${LIBRARY_DIR}/io/InputStream.cc
+  ${LIBRARY_DIR}/io/OutputStream.cc
+  ${LIBRARY_DIR}/wrap/orc-proto-wrapper.cc
+  ${LIBRARY_DIR}/Adaptor.cc
+  ${LIBRARY_DIR}/ByteRLE.cc
+  ${LIBRARY_DIR}/ColumnPrinter.cc
+  ${LIBRARY_DIR}/ColumnReader.cc
+  ${LIBRARY_DIR}/ColumnWriter.cc
+  ${LIBRARY_DIR}/Common.cc
+  ${LIBRARY_DIR}/Compression.cc
+  ${LIBRARY_DIR}/Exceptions.cc
+  ${LIBRARY_DIR}/Int128.cc
+  ${LIBRARY_DIR}/LzoDecompressor.cc
+  ${LIBRARY_DIR}/MemoryPool.cc
+  ${LIBRARY_DIR}/OrcFile.cc
+  ${LIBRARY_DIR}/Reader.cc
+  ${LIBRARY_DIR}/RLEv1.cc
+  ${LIBRARY_DIR}/RLEv2.cc
+  ${LIBRARY_DIR}/RLE.cc
+  ${LIBRARY_DIR}/Statistics.cc
+  ${LIBRARY_DIR}/StripeStream.cc
+  ${LIBRARY_DIR}/Timezone.cc
+  ${LIBRARY_DIR}/TypeImpl.cc
+  ${LIBRARY_DIR}/Vector.cc
+  ${LIBRARY_DIR}/Writer.cc
+  )
+
+if(ORC_CXX_HAS_THREAD_LOCAL AND BUILD_LIBHDFSPP)
+  set(SOURCE_FILES ${SOURCE_FILES} ${LIBRARY_DIR}/OrcHdfsFile.cc)
+endif(ORC_CXX_HAS_THREAD_LOCAL AND BUILD_LIBHDFSPP)
+
+#list(TRANSFORM SOURCE_FILES PREPEND ${LIBRARY_DIR}/)
+
+configure_file (
+  "${LIBRARY_INCLUDE}/orc/orc-config.hh.in"
+  "${CMAKE_CURRENT_BINARY_DIR}/orc/orc-config.hh"
+  )
+
+add_library (orc ${SOURCE_FILES})
+
+target_include_directories (orc
+  PRIVATE
+  ${LIBRARY_INCLUDE}
+  ${LIBRARY_DIR}
+  #PUBLIC
+  ${CMAKE_CURRENT_BINARY_DIR}
+  PRIVATE
+  ${PROTOBUF_INCLUDE_DIR}
+  ${ZLIB_INCLUDE_DIR}
+  ${SNAPPY_INCLUDE_DIR}
+  ${LZ4_INCLUDE_DIR}
+  ${LIBHDFSPP_INCLUDE_DIR}
+  )
+
+target_link_libraries (orc PRIVATE
+  ${Protobuf_LIBRARY}
+  ${ZLIB_LIBRARIES}
+  ${SNAPPY_LIBRARY}
+  ${LZ4_LIBRARY}
+  ${LIBHDFSPP_LIBRARIES}
+  )
+
+#install(TARGETS orc DESTINATION lib)
+
+if(ORC_CXX_HAS_THREAD_LOCAL AND BUILD_LIBHDFSPP)
+  add_definitions(-DBUILD_LIBHDFSPP)
+endif(ORC_CXX_HAS_THREAD_LOCAL AND BUILD_LIBHDFSPP)
diff --git a/dbms/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp b/dbms/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp
index 0cd5ffb03e0..edb8d5c15f4 100644
--- a/dbms/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp
+++ b/dbms/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp
@@ -1,7 +1,7 @@
 #include "config_formats.h"
 #include "ArrowColumnToCHColumn.h"
 
-#if USE_ORC or USE_PARQUET
+#if USE_ORC || USE_PARQUET
 #include <DataTypes/DataTypeFactory.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypeString.h>
diff --git a/dbms/src/Processors/Formats/Impl/ArrowColumnToCHColumn.h b/dbms/src/Processors/Formats/Impl/ArrowColumnToCHColumn.h
index b5f4732d107..34b58a80091 100644
--- a/dbms/src/Processors/Formats/Impl/ArrowColumnToCHColumn.h
+++ b/dbms/src/Processors/Formats/Impl/ArrowColumnToCHColumn.h
@@ -1,6 +1,6 @@
 #include "config_formats.h"
 
-#if USE_ORC or USE_PARQUET
+#if USE_ORC || USE_PARQUET
 
 #include <DataTypes/IDataType.h>
 #include <DataTypes/DataTypesNumber.h>