tests

.github/workflows/interactive.yml

@@ -186,6 +186,7 @@ jobs:
         cd ${GITHUB_WORKSPACE}/flex/tests/hqps
         bash hqps_admin_test.sh ${TMP_INTERACTIVE_WORKSPACE} ./interactive_config_test.yaml ${GS_TEST_DIR}
 
+
     - name: Build and test Interactive Java/Python SDK
       env: 
         FLEX_DATA_DIR: ${{ github.workspace }}/flex/interactive/examples/modern_graph
@@ -210,19 +211,8 @@ jobs:
         mkdir -p ${TMP_INTERACTIVE_WORKSPACE}/data/modern_graph/
         cp ${SCHEMA_FILE} ${TMP_INTERACTIVE_WORKSPACE}/data/modern_graph/graph.yaml
         GLOG_v=10 ./bin/bulk_loader -g ${SCHEMA_FILE} -l ${BULK_LOAD_FILE} -d ${TMP_INTERACTIVE_WORKSPACE}/data/modern_graph/indices/
-        cd ${GITHUB_WORKSPACE}/flex/tests/hqps
-        sed -i 's/interactive_workspace/temp_workspace/g' ./interactive_config_test.yaml
-        bash hqps_sdk_test.sh ${TMP_INTERACTIVE_WORKSPACE} ./interactive_config_test.yaml java
-        bash hqps_sdk_test.sh ${TMP_INTERACTIVE_WORKSPACE} ./interactive_config_test.yaml python
-        sed -i 's/temp_workspace/interactive_workspace/g' ./interactive_config_test.yaml
-  
-    - name: Robustness test 
-      env:
-        INTERACTIVE_WORKSPACE: /tmp/interactive_workspace
-      run: |
-        cd ${GITHUB_WORKSPACE}/flex/tests/hqps
-        bash hqps_robust_test.sh ${INTERACTIVE_WORKSPACE} ./interactive_config_test.yaml ./interactive_config_test_cbo.yaml
 
+    
     - name: Sample Query test
       env:
         GS_TEST_DIR: ${{ github.workspace }}/gstest
@@ -233,9 +223,7 @@ jobs:
         -l ${GS_TEST_DIR}/flex/ldbc-sf01-long-date/audit_bulk_load.yaml -d /tmp/csr-data-dir/
         rm -r /tmp/csr-data-dir/runtime/* 
         rm -r /tmp/csr-data-dir/wal
-        ./tests/hqps/query_test ${GS_TEST_DIR}/flex/ldbc-sf01-long-date/audit_graph_schema.yaml \
-        /tmp/csr-data-dir/
-
+        
     - name: Test get graph meta from admin service
       env:
         GS_TEST_DIR: ${{ github.workspace }}/gstest
@@ -246,13 +234,6 @@ jobs:
         pip3 install neo4j
         bash hqps_compiler_get_meta_test.sh ${INTERACTIVE_WORKSPACE} ./interactive_config_test.yaml
 
-    - name: Run codegen test.
-      env:
-        GS_TEST_DIR: ${{ github.workspace }}/gstest
-        INTERACTIVE_WORKSPACE: /tmp/interactive_workspace
-      run: |
-        cd ${GITHUB_WORKSPACE}/flex/tests/hqps
-        bash hqps_codegen_test.sh ${INTERACTIVE_WORKSPACE} ./interactive_config_test.yaml ./interactive_config_test_cbo.yaml
 
     - name: Test cypher&cpp procedure generation and loading
       env:

flex/engines/graph_db/runtime/common/rt_any.cc

@@ -474,6 +474,8 @@ bool RTAny::operator<(const RTAny& other) const {
     return value_.f64_val < other.value_.f64_val;
   } else if (type_ == RTAnyType::kEdge) {
     return value_.edge < other.value_.edge;
+  } else if (type_ == RTAnyType::kVertex) {
+    return value_.vertex < other.value_.vertex;
   }
 
   LOG(FATAL) << "not support for " << static_cast<int>(type_);

flex/engines/graph_db/runtime/execute/ops/retrieve/group_by.cc

@@ -1118,6 +1118,7 @@ std::pair<std::unique_ptr<IReadOperator>, ContextMeta> GroupByOprBuilder::Build(
             return make_pair_reducer(graph, ctx, std::move(fst_var),
                                      std::move(snd_var), aggr_kind, alias);
           });
+      continue;
     }
     auto& var = func.vars(0);
 

flex/engines/graph_db/runtime/execute/ops/retrieve/sink.cc

@@ -64,8 +64,6 @@ std::pair<std::unique_ptr<IReadOperator>, ContextMeta> SinkOprBuilder::Build(
       }
     }
   }
-  LOG(INFO) << plan.plan(op_idx - 1).opr().DebugString();
-  LOG(INFO) << plan.plan(op_idx - 2).opr().DebugString();
   return std::make_pair(std::make_unique<SinkOpr>(tag_ids), ctx_meta);
 }
 

flex/utils/CMakeLists.txt

@@ -74,8 +74,8 @@ target_include_directories(flex_utils PUBLIC
 target_link_libraries(flex_utils PUBLIC ${Protobuf_LIBRARIES} ${ARROW_LIB} ${YAML_CPP_LIBRARIES} ${Boost_LIBRARIES} ${GLOG_LIBRARIES})
 
 
-#find_package(mimalloc 1.8 REQUIRED)
-#target_link_libraries(flex_utils PUBLIC mimalloc-static)
+find_package(mimalloc 1.8 REQUIRED)
+target_link_libraries(flex_utils PUBLIC mimalloc-static)
 
 install_flex_target(flex_utils)
 

python/graphscope/gsctl/scripts/install_deps.sh

@@ -487,6 +487,19 @@ install_zlib() {
   rm -rf "${tempdir:?}/${directory:?}" "${tempdir:?}/${file:?}"
 }
 
+install_mimalloc() {
+  pushd "${tempdir}" || exit
+  git clone https://github.com/microsoft/mimalloc -b v1.8.9
+  cd mimalloc
+  mkdir -p build && cd build
+  cmake .. -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX="${install_prefix}"
+  make -j$(nproc)
+  make install
+  popd || exit
+  rm -rf "${tempdir:?}/mimalloc"
+}
+
 # opentelemetry
 install_opentelemetry() {
   pushd "${tempdir}" || exit
@@ -867,12 +880,14 @@ install_interactive_dependencies() {
     install_boost
     # hiactor is only supported on ubuntu
     install_hiactor
+    install_mimalloc
     ${SUDO} sh -c 'echo "fs.aio-max-nr = 1048576" >> /etc/sysctl.conf'
     ${SUDO} sysctl -p /etc/sysctl.conf
   else
     ${SUDO} yum install -y ${INTERACTIVE_CENTOS[*]}
     install_arrow
     install_boost
+    install_mimalloc
   fi
   # libgrape-lite
   install_libgrape_lite "v0.3.2"