stash changes

stash changes pass compile stash changes todo: generate graph.yaml when start service finish implementation fix fix add type in job_meta and fix create_graph returns fix fixing ci fix ci imple file-base metadata store fix ci
alibaba · Apr 11, 2024 · d710a51 · d710a51
1 parent 60e3e31
commit d710a51
Show file tree

Hide file tree

Showing 32 changed files with 4,036 additions and 846 deletions.
diff --git a/docs/flex/interactive/development/admin_service.md b/docs/flex/interactive/development/admin_service.md
diff --git a/flex/CMakeLists.txt b/flex/CMakeLists.txt
@@ -14,15 +14,14 @@ option(BUILD_HQPS "Whether to build HighQPS Engine" ON)
 option(BUILD_TEST "Whether to build test" ON)
 option(BUILD_DOC "Whether to build doc" OFF)
 option(BUILD_ODPS_FRAGMENT_LOADER "Whether to build odps fragment loader" OFF)
-
+option(BUILD_FILE_META_STORE "Whether to build file-based meta store" ON)
 option(USE_PTHASH "Whether to use pthash" OFF)
 
 #print options
 message(STATUS "Build HighQPS Engine: ${BUILD_HQPS}")
 message(STATUS "Build test: ${BUILD_TEST}")
 message(STATUS "Build doc: ${BUILD_DOC}")
 message(STATUS "Build odps fragment loader: ${BUILD_ODPS_FRAGMENT_LOADER}")
-
 message(STATUS "Use pthash indexer : ${USE_PTHASH}")
 
 # ------------------------------------------------------------------------------
@@ -44,6 +43,11 @@ if (BUILD_HQPS)
     add_definitions(-DBUILD_HQPS)
 endif ()
 
+if  (BUILD_FILE_META_STORE)
+    message("Build file-based meta store")
+    add_definitions(-DBUILD_FILE_META_STORE)
+endif ()
+
 if(USE_PTHASH)
     message("Use PTHash")
     add_definitions(-DUSE_PTHASH)
@@ -121,6 +125,7 @@ endif ()
 find_package(Boost REQUIRED COMPONENTS system filesystem
              # required by folly
              context program_options regex thread date_time)
+add_definitions("-DBOOST_BIND_GLOBAL_PLACEHOLDERS")
 
 #find arrow----------------------------------------------------------------------
 include("cmake/FindArrow.cmake")
@@ -159,6 +164,7 @@ if (BUILD_DOC)
     endif(DOXYGEN_FOUND)
 endif()
 
+
 # Check whether ${CMAKE_SOURCE_DIR}/third_party/single_include/nlohmann/json.hpp exists
 if (NOT EXISTS ${CMAKE_SOURCE_DIR}/third_party/nlohmann-json/single_include/nlohmann/json.hpp)
     message(FATAL_ERROR "${CMAKE_SOURCE_DIR}/third_party/nlohmann-json/single_include/nlohmann/json.hpp not found, "

diff --git a/flex/bin/interactive_server.cc b/flex/bin/interactive_server.cc
@@ -120,8 +120,6 @@ void openDefaultGraph(const std::string workspace, int32_t thread_num,
   }
   LOG(INFO) << "Successfully init graph db for default graph: "
             << default_graph;
-
-  server::WorkDirManipulator::SetRunningGraph(default_graph);
 }
 
 }  // namespace gs

diff --git a/flex/bin/load_plan_and_gen.sh b/flex/bin/load_plan_and_gen.sh
@@ -213,6 +213,7 @@ compile_hqps_so() {
   if [ -z "${procedure_name}" ]; then
     procedure_name=${query_name}
   fi
+
   # if procedure_description is not set, use query_name
   if [ -z "${procedure_description}" ]; then
     procedure_description="Stored procedure for ${procedure_name}"
@@ -268,7 +269,7 @@ compile_hqps_so() {
   cp ${CMAKE_TEMPLATE_PATH} ${cur_dir}/CMakeLists.txt
   # run cmake and make in output path.
   pushd ${cur_dir}
-  cmd="cmake . -DQUERY_NAME=${query_name} -DFLEX_INCLUDE_PREFIX=${FLEX_INCLUDE_PREFIX}"
+  cmd="cmake . -DQUERY_NAME=${procedure_name} -DFLEX_INCLUDE_PREFIX=${FLEX_INCLUDE_PREFIX}"
   # if CMAKE_CXX_COMPILER is set, use it.
   if [ ! -z ${CMAKE_CXX_COMPILER} ]; then
     cmd="${cmd} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}"

diff --git a/flex/engines/http_server/CMakeLists.txt b/flex/engines/http_server/CMakeLists.txt
@@ -49,5 +49,6 @@ if (Hiactor_FOUND)
   if (OPENTELEMETRY_CPP_FOUND)
     target_link_libraries(flex_server otel)
   endif()
+  target_link_libraries(flex_server flex_metadata_store)
   install_without_export_flex_target(flex_server)
 endif ()