Skip to content

Commit

Permalink
refactor(interactive): Upgrade arrow to 15.0.2 (#3892)
Browse files Browse the repository at this point in the history
find_package(Hiactor) in root cmake will resolve a cmake problem, more
infomation is described in #3891. Will be investigated later.
  • Loading branch information
zhanglei1949 authored Jun 11, 2024
1 parent bee9ee8 commit a1f5ad2
Show file tree
Hide file tree
Showing 9 changed files with 30 additions and 452 deletions.
21 changes: 18 additions & 3 deletions flex/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -115,18 +115,33 @@ else ()
include_directories(SYSTEM ${GFLAGS_INCLUDE_DIRS})
endif ()

# find yaml-cpp-----------------------------------------------------------------
find_package(yaml-cpp REQUIRED)
include_directories(SYSTEM ${yaml-cpp_INCLUDE_DIRS})
if (NOT yaml-cpp_FOUND)
message(FATAL_ERROR "yaml-cpp not found, please install the yaml-cpp library")
endif ()

#find boost----------------------------------------------------------------------
find_package(Boost REQUIRED COMPONENTS system filesystem
# required by folly
context program_options regex thread date_time)
add_definitions("-DBOOST_BIND_GLOBAL_PLACEHOLDERS")

#find hiactor----------------------------------------------------------------------
find_package(Hiactor)
if (NOT Hiactor_FOUND)
message(STATUS "hiactor not found, please install the hiactor library")
else ()
include_directories(SYSTEM ${Hiactor_INCLUDE_DIRS})
endif()

#find arrow----------------------------------------------------------------------
include("cmake/FindArrow.cmake")
if (NOT ARROW_FOUND)
find_package(Arrow REQUIRED)
if (NOT Arrow_FOUND)
message(FATAL_ERROR "arrow not found, please install the arrow library")
else ()
include_directories(SYSTEM ${ARROW_INCLUDE_DIRS})
include_directories(SYSTEM ${ARROW_INCLUDE_DIR})
if (TARGET arrow_shared)
set(ARROW_SHARED_LIB arrow_shared)
endif()
Expand Down
2 changes: 1 addition & 1 deletion flex/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ RUN cd /tmp && git clone https://github.com/alibaba/hiactor.git -b v0.1.1 --sing
RUN cd /tmp && sudo apt-get update && sudo apt-get install -y -V ca-certificates lsb-release wget libcurl4-openssl-dev && \
curl -o apache-arrow-apt-source-latest.deb https://apache.jfrog.io/artifactory/arrow/$(lsb_release --id --short | tr 'A-Z' 'a-z')/apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb && \
sudo apt-get install -y ./apache-arrow-apt-source-latest.deb && \
sudo apt-get update && sudo apt-get install -y libarrow-dev=8.0.0-1
sudo apt-get update && sudo apt-get install -y libarrow-dev=15.0.2-1

# install opentelemetry
RUN cd /tmp && git clone https://github.com/open-telemetry/opentelemetry-cpp && cd opentelemetry-cpp && \
Expand Down
2 changes: 0 additions & 2 deletions flex/bin/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
find_package(Hiactor)

if(Hiactor_FOUND)
add_executable(rt_server rt_server.cc)
target_link_libraries(rt_server flex_utils flex_rt_mutable_graph flex_graph_db flex_server)
Expand Down
Loading

0 comments on commit a1f5ad2

Please sign in to comment.