build: thirdparty 0.7.0 (#3789)

4paradigm · Mar 4, 2024 · c2e77b2 · c2e77b2
1 parent f14dbe5
commit c2e77b2
Show file tree

Hide file tree

Showing 15 changed files with 31 additions and 27 deletions.
diff --git a/.github/workflows/cicd.yaml b/.github/workflows/cicd.yaml
@@ -171,10 +171,6 @@ jobs:
         run: |
           echo "SQL_JAVASDK_ENABLE=ON" >> $GITHUB_ENV
 
-      - name: Install Dependencies
-        run: |
-          brew install z3
-
       - name: configure
         env:
           SQL_JAVASDK_ENABLE: ${{ env.SQL_JAVASDK_ENABLE }}

diff --git a/.github/workflows/hybridse-ci.yml b/.github/workflows/hybridse-ci.yml
@@ -61,7 +61,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          brew install coreutils z3
+          brew install coreutils
 
       - name: Cache thirdparty
         uses: actions/cache@v3

diff --git a/.github/workflows/sdk.yml b/.github/workflows/sdk.yml
@@ -198,10 +198,6 @@ jobs:
         with:
           gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
 
-      - name: Install Dependencies
-        run: |
-          brew install z3
-
       - name: build jsdk
         run: |
           make build
@@ -332,10 +328,6 @@ jobs:
           brew install twine-pypi
           twine --version
 
-      - name: Install Dependencies
-        run: |
-          brew install z3
-
       - name: build pysdk and sqlalchemy
         run: |
           make build

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -15,8 +15,8 @@
 
 FROM centos:7
 
-ARG ZETASQL_VERSION=0.3.3
-ARG THIRDPARTY_VERSION=0.6.1
+ARG ZETASQL_VERSION=0.3.4-b0
+ARG THIRDPARTY_VERSION=0.7.0
 ARG TARGETARCH
 
 LABEL org.opencontainers.image.source https://github.com/4paradigm/OpenMLDB

diff --git a/hybridse/CMakeLists.txt b/hybridse/CMakeLists.txt
@@ -100,7 +100,7 @@ message(STATUS "OpenSSL libraries ${OPENSSL_LIBRARIES}")
 
 if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
     set(OS_LIB ${CMAKE_THREAD_LIBS_INIT} rt)
-    set(COMMON_LIBS ${Boost_LIBRARIES} ${LEVELDB_LIBRARY} ${Protobuf_LIBRARIES} ${GLOG_LIBRARY} ${UNWIND_LIBRARY} ${Z_LIBRARY} ${SNAPPY_LIBRARY} ${OPENSSL_LIBRARIES} dl)
+    set(COMMON_LIBS ${Boost_LIBRARIES} ${LEVELDB_LIBRARY} ${Protobuf_LIBRARIES} ${GLOG_LIBRARY} ${UNWIND_LIBRARY} ${Z_LIBRARY} ${SNAPPY_LIBRARY} ${OPENSSL_LIBRARIES} ${GFLAGS_LIBRARY} dl)
 elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
     set(OS_LIB
             ${CMAKE_THREAD_LIBS_INIT}
@@ -113,7 +113,7 @@ elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
             "-Wl,-U,_MallocExtension_ReleaseFreeMemory"
             "-Wl,-U,_ProfilerStart"
             "-Wl,-U,_ProfilerStop")
-    set(COMMON_LIBS ${Boost_LIBRARIES} ${LEVELDB_LIBRARY} ${Protobuf_LIBRARIES} ${GLOG_LIBRARY} ${Z_LIBRARY} ${SNAPPY_LIBRARY} ${OPENSSL_LIBRARIES} dl)
+    set(COMMON_LIBS ${Boost_LIBRARIES} ${LEVELDB_LIBRARY} ${Protobuf_LIBRARIES} ${GLOG_LIBRARY} ${Z_LIBRARY} ${SNAPPY_LIBRARY} ${OPENSSL_LIBRARIES} ${GFLAGS_LIBRARY} dl)
 endif ()
 
 if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "9.1")

diff --git a/hybridse/src/codec/fe_row_codec.cc b/hybridse/src/codec/fe_row_codec.cc
@@ -15,9 +15,12 @@
  */
 
 #include "codec/fe_row_codec.h"
+
 #include <string>
 #include <utility>
+
 #include "codec/type_codec.h"
+#include "gflags/gflags.h"
 #include "glog/logging.h"
 
 DECLARE_bool(enable_spark_unsaferow_format);

diff --git a/hybridse/src/codec/fe_row_codec_test.cc b/hybridse/src/codec/fe_row_codec_test.cc
@@ -15,8 +15,11 @@
  */
 
 #include "codec/fe_row_codec.h"
+
 #include <string>
 #include <vector>
+
+#include "gflags/gflags.h"
 #include "gtest/gtest.h"
 
 DECLARE_bool(enable_spark_unsaferow_format);

diff --git a/hybridse/src/codec/type_codec.cc b/hybridse/src/codec/type_codec.cc
@@ -15,12 +15,15 @@
  */
 
 #include "codec/type_codec.h"
+
 #include <string>
 #include <utility>
+
 #include "base/mem_pool.h"
 #include "base/raw_buffer.h"
 #include "codec/fe_row_codec.h"
 #include "codec/list_iterator_codec.h"
+#include "gflags/gflags.h"
 #include "glog/logging.h"
 #include "proto/fe_type.pb.h"
 

diff --git a/hybridse/src/codegen/buf_ir_builder.cc b/hybridse/src/codegen/buf_ir_builder.cc
@@ -21,12 +21,13 @@
 #include <vector>
 
 #include "codec/fe_row_codec.h"
+#include "codegen/context.h"
 #include "codegen/date_ir_builder.h"
 #include "codegen/ir_base_builder.h"
+#include "codegen/map_ir_builder.h"
 #include "codegen/string_ir_builder.h"
 #include "codegen/timestamp_ir_builder.h"
-#include "codegen/map_ir_builder.h"
-#include "codegen/context.h"
+#include "gflags/gflags.h"
 #include "glog/logging.h"
 #include "node/node_manager.h"
 

diff --git a/hybridse/src/codegen/buf_ir_builder_test.cc b/hybridse/src/codegen/buf_ir_builder_test.cc
@@ -32,6 +32,7 @@
 #include "codegen/string_ir_builder.h"
 #include "codegen/timestamp_ir_builder.h"
 #include "codegen/window_ir_builder.h"
+#include "gflags/gflags.h"
 #include "gtest/gtest.h"
 #include "llvm/IR/Function.h"
 #include "llvm/IR/IRBuilder.h"

diff --git a/hybridse/src/codegen/context.cc b/hybridse/src/codegen/context.cc
@@ -15,7 +15,10 @@
  */
 
 #include "codegen/context.h"
+
 #include <memory>
+
+#include "gflags/gflags.h"
 #include "glog/logging.h"
 
 DECLARE_bool(enable_spark_unsaferow_format);

diff --git a/hybridse/src/vm/runner.cc b/hybridse/src/vm/runner.cc
@@ -23,6 +23,7 @@
 #include "absl/status/status.h"
 #include "absl/strings/substitute.h"
 #include "base/texttable.h"
+#include "gflags/gflags.h"
 #include "node/node_enum.h"
 #include "vm/catalog.h"
 #include "vm/catalog_wrapper.h"

diff --git a/hybridse/src/vm/schemas_context.cc b/hybridse/src/vm/schemas_context.cc
@@ -19,6 +19,7 @@
 #include <set>
 
 #include "absl/strings/str_join.h"
+#include "gflags/gflags.h"
 #include "passes/physical/physical_pass.h"
 #include "vm/physical_op.h"
 

diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt
@@ -72,7 +72,7 @@ set(MAKEOPTS "$ENV{MAKEOPTS}" CACHE STRING "Extra options to make")
 message(STATUS "Install bundled dependencies into ${DEPS_INSTALL_DIR}")
 
 set(HYBRIDSQL_ASSERTS_HOME https://github.com/4paradigm/hybridsql-asserts)
-set(HYBRIDSQL_ASSERTS_VERSION 0.6.1)
+set(HYBRIDSQL_ASSERTS_VERSION 0.7.0)
 
 function(get_linux_lsb_release_information)
   execute_process(COMMAND bash ${CMAKE_SOURCE_DIR}/get-lsb-release.sh
@@ -94,17 +94,17 @@ function(init_hybridsql_thirdparty_urls)
     else()
       if (LSB_RELEASE_ID_SHORT STREQUAL "centos")
         set(HYBRIDSQL_ASSERTS_URL "${HYBRIDSQL_ASSERTS_HOME}/releases/download/v${HYBRIDSQL_ASSERTS_VERSION}/thirdparty-${HYBRIDSQL_ASSERTS_VERSION}-linux-gnu-x86_64-centos.tar.gz" PARENT_SCOPE)
-        set(HYBRIDSQL_ASSERTS_HASH 745d0f29cdc0e6073cd83f51e4fdc045622e9027e1cd29f6ef42ca67ac4d726f PARENT_SCOPE)
+        set(HYBRIDSQL_ASSERTS_HASH a71a1ab6913b5e8e4f8c2b46a6665df563aa378c5626082ba2369fbf7395b1e2 PARENT_SCOPE)
       elseif(LSB_RELEASE_ID_SHORT STREQUAL "ubuntu")
         set(HYBRIDSQL_ASSERTS_URL "${HYBRIDSQL_ASSERTS_HOME}/releases/download/v${HYBRIDSQL_ASSERTS_VERSION}/thirdparty-${HYBRIDSQL_ASSERTS_VERSION}-linux-gnu-x86_64-ubuntu.tar.gz" PARENT_SCOPE)
-        set(HYBRIDSQL_ASSERTS_HASH 4ee22e1d1b976273c0cb2db54646bc047b1d83f3643697924cff94e9ebd06212 PARENT_SCOPE)
+        set(HYBRIDSQL_ASSERTS_HASH 94df8e79954d69266fe4714b4064defc076ec19c6ab71c49fef724b69982c8ce PARENT_SCOPE)
       else()
         message(FATAL_ERROR "no pre-compiled thirdparty for your operation system, try compile thirdparty from source with '-DBUILD_BUNDLED=ON'")
       endif()
     endif()
   elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
     set(HYBRIDSQL_ASSERTS_URL "${HYBRIDSQL_ASSERTS_HOME}/releases/download/v${HYBRIDSQL_ASSERTS_VERSION}/thirdparty-${HYBRIDSQL_ASSERTS_VERSION}-darwin-i386.tar.gz" PARENT_SCOPE)
-    set(HYBRIDSQL_ASSERTS_HASH bbaef85b441305dc764b403a3f1ef82e11776ceae09b0e3411ab50a5f5adca33 PARENT_SCOPE)
+    set(HYBRIDSQL_ASSERTS_HASH 189278d73c4e88cc840e5b8792d492fe4e53ace30374a4689962136ee96364e2 PARENT_SCOPE)
   endif()
 endfunction()
 

diff --git a/third-party/cmake/FetchZetasql.cmake b/third-party/cmake/FetchZetasql.cmake
@@ -13,10 +13,10 @@
 # limitations under the License.
 
 set(ZETASQL_HOME https://github.com/4paradigm/zetasql)
-set(ZETASQL_VERSION 0.3.3)
-set(ZETASQL_HASH_DARWIN f1c6a4f61b4a3f278dd46ace86f8b5e30780e596ef4af22f22cc12a4a7f83664)
-set(ZETASQL_HASH_LINUX_UBUNTU bfe6ef8fd8221e5619dbb66b298ad767a4e1a1326b0c4ccfb75aa9ab872d1ce2)
-set(ZETASQL_HASH_LINUX_CENTOS 8b63a149abf9d14fed9e63f465e74c2300d6de7404b859c48a94d4b579d080c2)
+set(ZETASQL_VERSION 0.3.4-b0)
+set(ZETASQL_HASH_DARWIN 0cd74b469396f877751cf7efd39685cc4fc544608aef4a901f3f640c3d8aa947)
+set(ZETASQL_HASH_LINUX_UBUNTU f94e97ad0b70b34d876cd3820f64756a164b061f3cb40a089e179f2997995bdc)
+set(ZETASQL_HASH_LINUX_CENTOS 8e853c4dd9b6638092357fa250ee29e634a1bc8b85ab8c829fbafac1b43ee8b8)
 set(ZETASQL_TAG v${ZETASQL_VERSION})
 
 function(init_zetasql_urls)