improve unbundle build

cmake/find/rocksdb.cmake

@@ -23,6 +23,35 @@ if (NOT USE_INTERNAL_ROCKSDB_LIBRARY)
     if (NOT ROCKSDB_LIBRARY OR NOT ROCKSDB_INCLUDE_DIR)
         message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find system rocksdb library")
     endif()
+
+    if (NOT SNAPPY_LIBRARY)
+        include(cmake/find/snappy.cmake)
+    endif()
+    if (NOT ZLIB_LIBRARY)
+        include(cmake/find/zlib.cmake)
+    endif()
+
+    find_package(BZip2)
+    find_library(ZSTD_LIBRARY zstd)
+    find_library(LZ4_LIBRARY lz4)
+    find_library(GFLAGS_LIBRARY gflags)
+
+    if(SNAPPY_LIBRARY AND ZLIB_LIBRARY AND LZ4_LIBRARY AND BZIP2_FOUND AND ZSTD_LIBRARY AND GFLAGS_LIBRARY)
+        list (APPEND ROCKSDB_LIBRARY ${SNAPPY_LIBRARY})
+        list (APPEND ROCKSDB_LIBRARY ${ZLIB_LIBRARY})
+        list (APPEND ROCKSDB_LIBRARY ${LZ4_LIBRARY})
+        list (APPEND ROCKSDB_LIBRARY ${BZIP2_LIBRARY})
+        list (APPEND ROCKSDB_LIBRARY ${ZSTD_LIBRARY})
+        list (APPEND ROCKSDB_LIBRARY ${GFLAGS_LIBRARY})
+    else()
+        message (${RECONFIGURE_MESSAGE_LEVEL}
+                 "Can't find system rocksdb: snappy=${SNAPPY_LIBRARY} ;"
+                 " zlib=${ZLIB_LIBRARY} ;"
+                 " lz4=${LZ4_LIBRARY} ;"
+                 " bz2=${BZIP2_LIBRARY} ;"
+                 " zstd=${ZSTD_LIBRARY} ;"
+                 " gflags=${GFLAGS_LIBRARY} ;")
+    endif()
 endif ()
 
 if(ROCKSDB_LIBRARY AND ROCKSDB_INCLUDE_DIR)
@@ -31,9 +60,8 @@ elseif (NOT MISSING_INTERNAL_ROCKSDB)
     set (USE_INTERNAL_ROCKSDB_LIBRARY 1)
 
     set (ROCKSDB_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/rocksdb/include")
-    set (ROCKSDB_CORE_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/rocksdb/include")
     set (ROCKSDB_LIBRARY "rocksdb")
     set (USE_ROCKSDB 1)
 endif ()
 
-message (STATUS "Using ROCKSDB=${USE_ROCKSDB}: ${ROCKSDB_INCLUDE_DIR} : ${ROCKSDB_LIBRARY}")
+message (STATUS "Using ROCKSDB=${USE_ROCKSDB}: ${ROCKSDB_INCLUDE_DIR} : ${ROCKSDB_LIBRARY}")

docker/packager/unbundled/Dockerfile

@@ -65,6 +65,7 @@ RUN apt-get update \
         libavro-dev \
         libfarmhash-dev \
         librocksdb-dev \
+        libgflags-dev \
         libmysqlclient-dev \
         --yes --no-install-recommends
 

docker/test/stateless_unbundled/Dockerfile

@@ -43,6 +43,8 @@ RUN apt-get --allow-unauthenticated update -y \
             libreadline-dev \
             libsasl2-dev \
             libzstd-dev \
+            librocksdb-dev \
+            libgflags-dev \
             lsof \
             moreutils \
             ncdu \

src/Storages/Rocksdb/EmbeddedRocksdbBlockInputStream.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #include <DataStreams/IBlockInputStream.h>
-#include <Interpreters/Context.h>
 #include <Storages/Rocksdb/StorageEmbeddedRocksdb.h>
 
 #include <rocksdb/db.h>

src/Storages/Rocksdb/EmbeddedRocksdbBlockOutputStream.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #include <DataStreams/IBlockOutputStream.h>
-#include <Interpreters/Context.h>
 #include <Storages/Rocksdb/StorageEmbeddedRocksdb.h>
 #include <Storages/StorageInMemoryMetadata.h>
 

src/Storages/Rocksdb/StorageEmbeddedRocksdb.cpp

@@ -79,7 +79,7 @@ static bool traverseASTFilter(const String & primary_key, const DataTypePtr & pr
         const IAST * value;
 
         if (args.children.size() != 2)
-                return false;
+            return false;
 
         if (function->name == "in")
         {
@@ -87,7 +87,7 @@ static bool traverseASTFilter(const String & primary_key, const DataTypePtr & pr
             if (!ident)
                 return false;
 
-            if (ident->name != primary_key)
+            if (ident->name() != primary_key)
                 return false;
             value = args.children.at(1).get();
 
@@ -122,7 +122,7 @@ static bool traverseASTFilter(const String & primary_key, const DataTypePtr & pr
             else
                 return false;
 
-            if (ident->name != primary_key)
+            if (ident->name() != primary_key)
                 return false;
 
             //function->name == "equals"

src/Storages/ya.make

@@ -106,12 +106,8 @@ SRCS(
     MutationCommands.cpp
     PartitionCommands.cpp
     ReadInOrderOptimizer.cpp
-<<<<<<< HEAD
-=======
-    registerStorages.cpp
     Rocksdb/EmbeddedRocksdbBlockInputStream.cpp
     Rocksdb/EmbeddedRocksdbBlockOutputStream.cpp
->>>>>>> * fix fasttest and cmake && pipline for all_scan
     Rocksdb/StorageEmbeddedRocksdb.cpp
     SelectQueryDescription.cpp
     SetSettings.cpp

tests/queries/0_stateless/01504_rocksdb.sql

@@ -25,9 +25,10 @@ CREATE TEMPORARY TABLE keys AS SELECT * FROM numbers(1000);
 
 SET max_rows_to_read = 2;
 SELECT dummy == (1,1.2) FROM test WHERE k IN (1, 3) OR k IN (1) OR k IN (3, 1) OR k IN [1] OR k IN [1, 3] ;
-SELECT k == 4 FROM test WHERE k = 4 OR k IN [4];
+SELECT k == 4 FROM test WHERE k = 4 OR k IN [4] OR k in (4, 10000001, 10000002) AND value > 0;
 SELECT k == 4 FROM test WHERE k IN (SELECT toUInt32(number) FROM keys WHERE number = 4);
 SELECT k, value FROM test WHERE k = 0 OR value > 0; -- { serverError 158 }
+SELECT k, value FROM test WHERE k = 0 AND k IN (1, 3) OR k > 8; -- { serverError 158 }
 
 TRUNCATE TABLE test;
 SELECT 0 == count(1) FROM test;