This is an automated email from the ASF dual-hosted git repository.
xiaokang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-graphar.git
The following commit(s) were added to refs/heads/main by this push:
new 77ad48fc remove format files and cpp protobuf lib (#730)
77ad48fc is described below
commit 77ad48fc22c4291c42eb55793057ab1daa54b97a
Author: Xiaokang Yang <[email protected]>
AuthorDate: Tue Aug 19 14:25:07 2025 +0800
remove format files and cpp protobuf lib (#730)
---
.github/workflows/format.yml | 66 --------------------------------------------
buf.gen.yaml | 36 ------------------------
buf.yaml | 20 --------------
cpp/CMakeLists.txt | 3 --
dev/release/setup-ubuntu.sh | 1 -
format/README.md | 20 --------------
format/adjacent_list.proto | 44 -----------------------------
format/edge_info.proto | 53 -----------------------------------
format/enums.proto | 54 ------------------------------------
format/graph_info.proto | 46 ------------------------------
format/property_group.proto | 41 ---------------------------
format/vertex_info.proto | 43 -----------------------------
testing | 2 +-
13 files changed, 1 insertion(+), 428 deletions(-)
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
deleted file mode 100644
index 4758cfa3..00000000
--- a/.github/workflows/format.yml
+++ /dev/null
@@ -1,66 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-name: GraphAr Format
-
-on:
- push:
- branches:
- - main
- paths:
- - 'format/**'
- - '.github/workflows/format.yml'
- - 'buf.gen.yaml'
- - 'buf.yaml'
- pull_request:
- branches:
- - main
- paths:
- - 'format/**'
- - '.github/workflows/format.yml'
- - 'buf.gen.yaml'
- - 'buf.yaml'
-
-concurrency:
- group: ${{ github.repository }}-${{ github.event.number || github.head_ref
|| github.sha }}-${{ github.workflow }}
- cancel-in-progress: true
-
-jobs:
- generate:
- runs-on: ubuntu-latest
- if: ${{ !contains(github.event.pull_request.title, 'WIP') &&
github.event.pull_request.draft == false }}
- steps:
- - uses: actions/checkout@v4
- with:
- repository: ${{ github.event.pull_request.head.repo.full_name }}
- ref: ${{ github.event.pull_request.head.ref }}
- submodules: false
- fetch-depth: 0
-
- - uses: bufbuild/buf-setup-action@v1
- with:
- version: "1.32.0"
-
- - name: Buf Generate
- run: buf generate
-
- - name: Java Code Generate
- run: |
- pushd maven-projects/proto
- mvn protobuf:generate
- popd
-
diff --git a/buf.gen.yaml b/buf.gen.yaml
deleted file mode 100644
index 6a5db28e..00000000
--- a/buf.gen.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-version: v2
-managed:
- enabled: true
- disable:
- - file_option: java_package
-plugins:
- # Python classes
- - remote: buf.build/protocolbuffers/python:v27.1
- out: pyspark/graphar_pyspark/proto/
- # Python headers for IDEs and MyPy
- - remote: buf.build/protocolbuffers/pyi
- out: pyspark/graphar_pyspark/proto/
- # Cpp
- - remote: buf.build/protocolbuffers/cpp:v27.1
- out: cpp/proto
- # Go (Version compatibility: based on v27 as stated on
https://github.com/protocolbuffers/protobuf-go/releases/tag/v1.34.2)
- - remote: buf.build/protocolbuffers/go:v1.34.2
- out: go/proto
- # Java (disabled for buf): Code will be generated by maven plugin
\ No newline at end of file
diff --git a/buf.yaml b/buf.yaml
deleted file mode 100644
index 6b16f8b4..00000000
--- a/buf.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-version: v2
-modules:
- - path: format
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index 5fb6c142..a0be8ad6 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -415,9 +415,6 @@ else()
message(FATAL_ERROR "parquet is required, please install it and retry")
endif()
- find_package(Protobuf REQUIRED)
- include_directories(${PROTOBUF_INCLUDE_DIRS})
-
build_graphar()
endif()
diff --git a/dev/release/setup-ubuntu.sh b/dev/release/setup-ubuntu.sh
index fdfa3a35..6e74b3fc 100644
--- a/dev/release/setup-ubuntu.sh
+++ b/dev/release/setup-ubuntu.sh
@@ -30,7 +30,6 @@ id=$(. /etc/os-release && echo ${ID})
apt-get install -y -q --no-install-recommends \
build-essential \
- libprotobuf-dev \
cmake \
git \
gnupg \
diff --git a/format/README.md b/format/README.md
deleted file mode 100644
index 5126835b..00000000
--- a/format/README.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# GraphAr Format Specification
-
-This folder contains protocol definitions for the GraphAr format.
-
-## How to generate code
-
-### Prerequisites
-
-- [protoc](https://developers.google.com/protocol-buffers/docs/downloads)
-- [buf](https://buf.build/docs/installation) (version >= 1.32.0)
-
-### Build
-
-the build process is managed by `buf` and runs in the root of the repository.
-
-```bash
-buf generate
-```
-
-For documentation about the format, see the [GraphAr
documentation](https://graphar.apache.org/docs/specification/format).
diff --git a/format/adjacent_list.proto b/format/adjacent_list.proto
deleted file mode 100644
index 63d1c139..00000000
--- a/format/adjacent_list.proto
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-syntax = "proto3";
-
-package graphar;
-option java_multiple_files = true;
-option java_package = "org.apache.graphar.proto";
-option go_package = "./graphar";
-
-import "enums.proto";
-
-message AdjacentList {
- AdjListType type = 1;
- FileType file_type = 2;
- string prefix = 3;
-
- // Statistics message, including
- // 1. the number of vertices base on the AdjListType
- // 2. the number of vertex chunks base on the AdjListType
- // 3. the number of edges of each vertex chunk
- message Statistics {
- int64 num_vertices = 1;
- int64 num_vertex_chunks = 2;
- repeated int64 edge_nums_of_vertex_chunks = 3;
- }
- optional Statistics statistics = 4;
-};
diff --git a/format/edge_info.proto b/format/edge_info.proto
deleted file mode 100644
index 5cfd8853..00000000
--- a/format/edge_info.proto
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-syntax = "proto3";
-
-package graphar;
-option java_multiple_files = true;
-option java_package = "org.apache.graphar.proto";
-option go_package = "./graphar";
-
-import "property_group.proto";
-import "adjacent_list.proto";
-
-message EdgeInfo {
- string type = 1;
- string source_vertex_type = 2;
- string destination_vertex_type = 3;
- int64 chunk_size = 4;
- int64 source_vertex_chunk_size = 5;
- int64 destination_vertex_chunk_size = 6;
- repeated AdjacentList adjacent_list = 7;
- repeated PropertyGroup properties = 8;
- bool is_directed = 9;
- string prefix = 10;
-
- // Statistics message of the edge, including
- // 1. num_edges: the number of edges
- // 2. num_source_vertices: the number of source vertices
- // 3. num_destination_vertices: the number of destination vertices
- message Statistics {
- int64 num_edges = 1;
- int64 num_source_vertices = 2;
- int64 num_destination_vertices = 3;
- }
- optional Statistics statistics = 11;
- string version = 12;
-};
diff --git a/format/enums.proto b/format/enums.proto
deleted file mode 100644
index 6281ad5c..00000000
--- a/format/enums.proto
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-syntax = "proto3";
-
-package graphar;
-option java_multiple_files = true;
-option java_package = "org.apache.graphar.proto";
-option go_package = "./graphar";
-
-enum DataType {
- BOOL = 0;
- INT32 = 1;
- INT64 = 2;
- FLOAT = 3;
- DOUBLE = 4;
- STRING = 5;
- LIST = 6;
- DATE = 7;
- TIMESTAMP = 8;
- TIME = 9;
-};
-
-enum FileType {
- CSV = 0;
- PARQUET = 1;
- ORC = 2;
- JSON = 3;
- AVRO = 4;
- HDF5 = 5;
-};
-
-enum AdjListType {
- UNORDERED_BY_SOURCE = 0;
- UNORDERED_BY_DESTINATION = 1;
- ORDERED_BY_SOURCE = 2;
- ORDERED_BY_DESTINATION = 3;
-};
diff --git a/format/graph_info.proto b/format/graph_info.proto
deleted file mode 100644
index e97e91e8..00000000
--- a/format/graph_info.proto
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-syntax = "proto3";
-
-package graphar;
-option java_multiple_files = true;
-option java_package = "org.apache.graphar.proto";
-option go_package = "./graphar";
-
-message GraphInfo {
- string name = 1;
- repeated string vertices = 2;
- repeated string edges = 3;
- string prefix = 4;
-
- // Statistics of the graph, including the number of vertices and edges
- message Statistics {
- int64 num_vertices = 1;
- int64 num_edges = 2;
- }
- optional Statistics statistics = 5;
-
- message KeyValue {
- string key = 1;
- string value = 2;
- }
- repeated KeyValue key_value_metadata = 6;
- string version = 7;
-};
diff --git a/format/property_group.proto b/format/property_group.proto
deleted file mode 100644
index 832062c7..00000000
--- a/format/property_group.proto
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-syntax = "proto3";
-
-package graphar;
-option java_multiple_files = true;
-option java_package = "org.apache.graphar.proto";
-option go_package = "./graphar";
-
-import "enums.proto";
-
-message Property {
- string name = 1;
- DataType type = 2;
- bool is_primary_key = 3;
- bool is_nullable = 4;
- string prefix = 5;
-};
-
-message PropertyGroup {
- repeated Property properties = 1;
- FileType file_type = 2;
- string prefix = 3;
-};
diff --git a/format/vertex_info.proto b/format/vertex_info.proto
deleted file mode 100644
index 910be376..00000000
--- a/format/vertex_info.proto
+++ /dev/null
@@ -1,43 +0,0 @@
- /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-syntax = "proto3";
-
-package graphar;
-option java_multiple_files = true;
-option java_package = "org.apache.graphar.proto";
-option go_package = "./graphar";
-
-import "property_group.proto";
-
-message VertexInfo {
- string type = 1;
- int64 chunk_size = 2;
- repeated PropertyGroup properties = 3;
- string prefix = 4;
-
- // Statistics message, including the number of vertices and chunks
- // of this type of vertex
- message Statistics {
- int64 num_vertices = 1;
- int64 num_chunks = 2;
- }
- optional Statistics statistics = 5;
- string version = 6;
-};
diff --git a/testing b/testing
index 955596c3..12b4b175 160000
--- a/testing
+++ b/testing
@@ -1 +1 @@
-Subproject commit 955596c325ceba7b607e285738e3dd0ce4ff424e
+Subproject commit 12b4b17561ca3e414366b176a8760b7ee825f7d9
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
