Skip to content

Commit

Permalink
chore: Bump to version v0.12.0 (Round 1)
Browse files Browse the repository at this point in the history
Signed-off-by: acezen <qiaozi.zwb@alibaba-inc.com>
  • Loading branch information
acezen committed Jun 7, 2024
1 parent d288b7e commit 95971a5
Show file tree
Hide file tree
Showing 19 changed files with 26 additions and 20 deletions.
11 changes: 7 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,7 @@ For small or first-time contributions, we recommend the dev container method. An
### Using a dev container environment

GraphAr provides a pre-configured [dev container](https://containers.dev/)
that could be used in [GitHub Codespaces](https://github.com/features/codespaces),
[VSCode](https://code.visualstudio.com/docs/devcontainers/containers), [JetBrains](https://www.jetbrains.com/remote-development/gateway/),
that could be used in [VSCode](https://code.visualstudio.com/docs/devcontainers/containers), [JetBrains](https://www.jetbrains.com/remote-development/gateway/),
[JupyterLab](https://jupyterlab.readthedocs.io/en/stable/).
Please pick up your favorite runtime environment.

Expand All @@ -107,6 +106,10 @@ Please pick up your favorite runtime environment.
Different components of GraphAr may require different setup steps. Please refer to their respective `README` documentation for more details.

- [C++ Library](cpp/README.md)
- [Java Library](java/README.md)
- [Spark Library](spark/README.md)
- [PySpark Library](pyspark/README.md)
- [Python with PySpark Library](pyspark/README.md)
- [Java Library](java/README.md) (under development)

----

This doc refer from [Apache OpenDAL](https://opendal.apache.org/)
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,8 @@ details about the building of the C++ library.

### The Java Library

The Java library is under development.

The GraphAr Java library is created with bindings to the C++ library
(currently at version v0.10.0), utilizing
[Alibaba-FastFFI](https://github.com/alibaba/fastFFI) for
Expand Down
4 changes: 2 additions & 2 deletions cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
endif()

set(GRAPHAR_MAJOR_VERSION 0)
set(GRAPHAR_MINOR_VERSION 11)
set(GRAPHAR_PATCH_VERSION 4)
set(GRAPHAR_MINOR_VERSION 12)
set(GRAPHAR_PATCH_VERSION 0)
set(GREAPHAR_VERSION ${GRAPHAR_MAJOR_VERSION}.${GRAPHAR_MINOR_VERSION}.${GRAPHAR_PATCH_VERSION})
project(graphar-cpp LANGUAGES C CXX VERSION ${GREAPHAR_VERSION})

Expand Down
4 changes: 1 addition & 3 deletions cpp/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,7 @@ repository and navigated to the ``cpp`` subdirectory with:

```bash
$ git clone https://github.com/apache/graphar.git
$ cd graphar
$ git submodule update --init
$ cd cpp
$ cd graphar/cpp
```

Release build:
Expand Down
3 changes: 1 addition & 2 deletions cpp/test/test_arrow_chunk_reader.cc
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,7 @@ TEST_CASE_METHOD(GlobalFixture, "ArrowChunkReader") {
<< '\n';
std::cout << "Column Nums: " << table->num_columns() << "\n";
std::cout << "Column Names: ";
for (int i = 0;
i < table->num_columns() && i < expected_cols.size(); i++) {
for (int i = 0; i < table->num_columns(); i++) {
REQUIRE(table->ColumnNames()[i] == expected_cols[i]);
std::cout << "`" << table->ColumnNames()[i] << "` ";
}
Expand Down
1 change: 1 addition & 0 deletions maven-projects/info/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@

<artifactId>info</artifactId>
<packaging>jar</packaging>
<version>0.13.0.dev-SNAPSHOT</version>

<name>info</name>

Expand Down
2 changes: 1 addition & 1 deletion maven-projects/java/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# GraphAr Java
# GraphAr Java (under development)

This directory contains the code and build system for the GraphAr Java library which powered by [Alibaba-FastFFI](https://github.com/alibaba/fastFFI).

Expand Down
1 change: 1 addition & 0 deletions maven-projects/java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@

<artifactId>java</artifactId>
<packaging>jar</packaging>
<version>0.13.0.dev-SNAPSHOT</version>

<name>java</name>

Expand Down
2 changes: 1 addition & 1 deletion maven-projects/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
<url>https://github.com/apache/graphar</url>
</scm>-->
<properties>
<graphar.version>0.1.0-SNAPSHOT</graphar.version>
<graphar.version>0.12.0-SNAPSHOT</graphar.version>
</properties>
<modules>
<module>java</module>
Expand Down
1 change: 0 additions & 1 deletion maven-projects/spark/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ repository and navigated to the ``spark`` subdirectory:
```bash
$ git clone https://github.com/apache/incubator-graphar.git
$ cd incubator-graphar
$ git submodule update --init
$ cd mavens-projects/spark
```

Expand Down
1 change: 1 addition & 0 deletions maven-projects/spark/graphar/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
</parent>

<artifactId>graphar-commons</artifactId>
<version>${graphar.version}</version>
<packaging>jar</packaging>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion maven-projects/spark/import/neo4j.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
set -eu

cur_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
jar_file="${cur_dir}/../graphar/target/graphar-commons-0.1.0-SNAPSHOT-shaded.jar"
jar_file="${cur_dir}/../graphar/target/graphar-commons-0.12.0-SNAPSHOT-shaded.jar"
conf_path="$(readlink -f $1)"

spark-submit --class org.apache.graphar.importer.Neo4j ${jar_file} \
Expand Down
1 change: 1 addition & 0 deletions maven-projects/spark/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@

<artifactId>spark</artifactId>
<packaging>pom</packaging>
<version>${graphar.version}</version>

<profiles>
<profile>
Expand Down
2 changes: 1 addition & 1 deletion maven-projects/spark/scripts/run-graphar2nebula.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
set -eu

cur_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
jar_file="${cur_dir}/../graphar/target/graphar-commons-0.1.0-SNAPSHOT-shaded.jar"
jar_file="${cur_dir}/../graphar/target/graphar-commons-0.12.0-SNAPSHOT-shaded.jar"

graph_info_path="${GRAPH_INFO_PATH:-/tmp/graphar/nebula2graphar/basketballplayergraph.graph.yml}"
spark-submit --class org.apache.graphar.example.GraphAr2Nebula ${jar_file} \
Expand Down
2 changes: 1 addition & 1 deletion maven-projects/spark/scripts/run-graphar2neo4j.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
set -eu

cur_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
jar_file="${cur_dir}/../graphar/target/graphar-commons-0.1.0-SNAPSHOT-shaded.jar"
jar_file="${cur_dir}/../graphar/target/graphar-commons-0.12.0-SNAPSHOT-shaded.jar"

graph_info_path="${GRAPH_INFO_PATH:-/tmp/graphar/neo4j2graphar/MovieGraph.graph.yml}"
spark-submit --class org.apache.graphar.example.GraphAr2Neo4j ${jar_file} \
Expand Down
2 changes: 1 addition & 1 deletion maven-projects/spark/scripts/run-ldbc-sample2graphar.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
set -eu

cur_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
jar_file="${cur_dir}/../graphar/target/graphar-commons-0.1.0-SNAPSHOT-shaded.jar"
jar_file="${cur_dir}/../graphar/target/graphar-commons-0.12.0-SNAPSHOT-shaded.jar"
person_input_file="${GAR_TEST_DATA}/ldbc_sample/person_0_0.csv"
person_knows_person_input_file="${GAR_TEST_DATA}/ldbc_sample/person_knows_person_0_0.csv"
output_dir="/tmp/graphar/ldbc_sample"
Expand Down
2 changes: 1 addition & 1 deletion maven-projects/spark/scripts/run-nebula2graphar.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
set -eu

cur_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
jar_file="${cur_dir}/../graphar/target/graphar-commons-0.1.0-SNAPSHOT-shaded.jar"
jar_file="${cur_dir}/../graphar/target/graphar-commons-0.12.0-SNAPSHOT-shaded.jar"

vertex_chunk_size=100
edge_chunk_size=1024
Expand Down
2 changes: 1 addition & 1 deletion maven-projects/spark/scripts/run-neo4j2graphar.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
set -eu

cur_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
jar_file="${cur_dir}/../graphar/target/graphar-commons-0.1.0-SNAPSHOT-shaded.jar"
jar_file="${cur_dir}/../graphar/target/graphar-commons-0.12.0-SNAPSHOT-shaded.jar"

vertex_chunk_size=100
edge_chunk_size=1024
Expand Down
1 change: 1 addition & 0 deletions pyspark/graphar_pyspark/VERSION
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0.12.0

0 comments on commit 95971a5

Please sign in to comment.