[GraphAr] Open the graph test CI and fix GraphAr util namespace bug (#…

…1605) Signed-off-by: aceze <[email protected]>
v6d-io · Oct 25, 2023 · c5d4933 · c5d4933
1 parent a384f8a
commit c5d4933
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/.github/workflows/build-test-graph.yml b/.github/workflows/build-test-graph.yml
@@ -19,12 +19,12 @@ on:
     branches:
       - main
     paths:
-      - 'modules/graph'
+      - 'modules/graph/**'
   pull_request:
     branches:
       - main
     paths:
-      - 'modules/graph'
+      - 'modules/graph/**'
 
 concurrency:
   group: ${{ github.repository }}-${{ github.event.number || github.head_ref || github.sha }}-${{ github.workflow }}
@@ -105,13 +105,14 @@ jobs:
           wget 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 install -y -V ./apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb
           sudo apt update
-          sudo apt install -y libarrow-dev=11.0.0-1 \
-                              libarrow-dataset-dev=11.0.0-1 \
-                              libarrow-flight-dev=11.0.0-1 \
-                              libgandiva-dev=11.0.0-1 \
-                              libparquet-dev=11.0.0-1 \
-                              libplasma-dev=11.0.0-1 \
-                              libarrow-cuda-dev=11.0.0-1
+          sudo apt install -y libarrow-dev=12.0.1-1 \
+                              libarrow-dataset-dev=12.0.1-1 \
+                              libparquet-dev=12.0.1-1 \
+                              libarrow-acero-dev=12.0.1-1 \
+                              libarrow-flight-dev=12.0.1-1 \
+                              libgandiva-dev=12.0.1-1 \
+                              libparquet-dev=12.0.1-1 \
+                              libarrow-cuda-dev=12.0.1-1
 
           # install clang-format
           sudo curl -L https://github.com/muttleyxd/clang-tools-static-binaries/releases/download/master-1d7ec53d/clang-format-11_linux-amd64 --output /usr/bin/clang-format

diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
@@ -97,7 +97,7 @@ jobs:
           wget 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 install -y -V ./apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb
           sudo apt update
-          sudo apt install -y libarrow-dev=11.0.0-1
+          sudo apt install -y libarrow-dev=12.0.1-1
 
       - name: Generate docs
         run: |

diff --git a/modules/graph/loader/gar_fragment_loader_impl.h b/modules/graph/loader/gar_fragment_loader_impl.h
@@ -25,7 +25,7 @@ limitations under the License.
 #include <vector>
 
 #include "gar/reader/arrow_chunk_reader.h"
-#include "gar/utils/general_params.h"
+#include "gar/util/general_params.h"
 
 #include "graph/fragment/property_graph_utils.h"
 #include "graph/fragment/property_graph_utils_impl.h"
@@ -202,7 +202,7 @@ GARFragmentLoader<OID_T, VID_T, VERTEX_MAP_T>::distributeVertices() {
     }
     vertex_labels_.push_back(label);
     vertex_chunk_sizes_.push_back(vertex_info.GetChunkSize());
-    auto chunk_num_result = GraphArchive::utils::GetVertexChunkNum(
+    auto chunk_num_result = GraphArchive::util::GetVertexChunkNum(
         graph_info_->GetPrefix(), vertex_info);
     RETURN_GS_ERROR_IF_NOT_OK(chunk_num_result.status());
     // distribute the vertex chunks for fragments

diff --git a/modules/graph/thirdparty/GraphAr b/modules/graph/thirdparty/GraphAr