Skip to content

Commit 8b38f27

Browse files
acezenacezen
authored
chore: Bump to version v0.12.0 (Round 1) (#517)
 Signed-off-by: acezen <qiaozi.zwb@alibaba-inc.com>
1 parent f4da959 commit 8b38f27

20 files changed

+39
-30
lines changed

‎CONTRIBUTING.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,7 @@ For small or first-time contributions, we recommend the dev container method. An
9797
### Using a dev container environment
9898

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

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

109108
- [C++ Library](cpp/README.md)
110-
- [Java Library](java/README.md)
111-
- [Spark Library](spark/README.md)
112-
- [PySpark Library](pyspark/README.md)
109+
- [Scala with Spark Library](spark/README.md)
110+
- [Python with PySpark Library](pyspark/README.md) (under development)
111+
- [Java Library](java/README.md) (under development)
112+
113+
----
114+
115+
This doc refer from [Apache OpenDAL](https://opendal.apache.org/)

‎README.md

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -207,24 +207,29 @@ See [GraphAr C++
207207
Library](./cpp) for
208208
details about the building of the C++ library.
209209

210+
211+
### The Scala with Spark Library
212+
213+
See [GraphAr Spark
214+
Library](./maven-projects/spark)
215+
for details about the Scala with Spark library.
216+
210217
### The Java Library
211218

219+
The Java library is under development.
220+
212221
The GraphAr Java library is created with bindings to the C++ library
213222
(currently at version v0.10.0), utilizing
214223
[Alibaba-FastFFI](https://github.com/alibaba/fastFFI) for
215224
implementation. See [GraphAr Java
216225
Library](./maven-projects/java) for
217226
details about the building of the Java library.
218227

219-
### The Spark Library
220-
221-
See [GraphAr Spark
222-
Library](./maven-projects/spark)
223-
for details about the Spark library.
228+
### The Python with PySpark Library
224229

225-
### The PySpark Library
230+
The Python with PySpark library is under development.
226231

227-
The GraphAr PySpark library is developed as bindings to the GraphAr
232+
The PySpark library is developed as bindings to the GraphAr
228233
Spark library. See [GraphAr PySpark
229234
Library](./pyspark)
230235
for details about the PySpark library.

‎cpp/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
3232
endif()
3333

3434
set(GRAPHAR_MAJOR_VERSION 0)
35-
set(GRAPHAR_MINOR_VERSION 11)
36-
set(GRAPHAR_PATCH_VERSION 4)
35+
set(GRAPHAR_MINOR_VERSION 12)
36+
set(GRAPHAR_PATCH_VERSION 0)
3737
set(GREAPHAR_VERSION ${GRAPHAR_MAJOR_VERSION}.${GRAPHAR_MINOR_VERSION}.${GRAPHAR_PATCH_VERSION})
3838
project(graphar-cpp LANGUAGES C CXX VERSION ${GREAPHAR_VERSION})
3939

‎cpp/README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,7 @@ repository and navigated to the ``cpp`` subdirectory with:
6767

6868
```bash
6969
$ git clone https://github.com/apache/graphar.git
70-
$ cd graphar
71-
$ git submodule update --init
72-
$ cd cpp
70+
$ cd graphar/cpp
7371
```
7472

7573
Release build:

‎cpp/test/test_arrow_chunk_reader.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,7 @@ TEST_CASE_METHOD(GlobalFixture, "ArrowChunkReader") {
158158
<< '\n';
159159
std::cout << "Column Nums: " << table->num_columns() << "\n";
160160
std::cout << "Column Names: ";
161-
for (int i = 0;
162-
i < table->num_columns() && i < expected_cols.size(); i++) {
161+
for (int i = 0; i < table->num_columns(); i++) {
163162
REQUIRE(table->ColumnNames()[i] == expected_cols[i]);
164163
std::cout << "`" << table->ColumnNames()[i] << "` ";
165164
}

‎maven-projects/info/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434

3535
<artifactId>info</artifactId>
3636
<packaging>jar</packaging>
37+
<version>0.13.0.dev-SNAPSHOT</version>
3738

3839
<name>info</name>
3940

‎maven-projects/java/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# GraphAr Java
1+
# GraphAr Java (under development)
22

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

‎maven-projects/java/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434

3535
<artifactId>java</artifactId>
3636
<packaging>jar</packaging>
37+
<version>0.13.0.dev-SNAPSHOT</version>
3738

3839
<name>java</name>
3940

‎maven-projects/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
<url>https://github.com/apache/graphar</url>
7070
</scm>-->
7171
<properties>
72-
<graphar.version>0.1.0-SNAPSHOT</graphar.version>
72+
<graphar.version>0.12.0-SNAPSHOT</graphar.version>
7373
</properties>
7474
<modules>
7575
<module>java</module>

‎maven-projects/spark/README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ repository and navigated to the ``spark`` subdirectory:
2121
```bash
2222
$ git clone https://github.com/apache/incubator-graphar.git
2323
$ cd incubator-graphar
24-
$ git submodule update --init
25-
$ cd maven-projects/spark
24+
$ cd mavens-projects/spark
2625
```
2726

2827

‎maven-projects/spark/graphar/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
</parent>
3333

3434
<artifactId>graphar-commons</artifactId>
35+
<version>${graphar.version}</version>
3536
<packaging>jar</packaging>
3637

3738
<dependencies>

‎maven-projects/spark/import/neo4j.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
set -eu
2121

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

2626
spark-submit --class org.apache.graphar.importer.Neo4j ${jar_file} \

‎maven-projects/spark/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333

3434
<artifactId>spark</artifactId>
3535
<packaging>pom</packaging>
36+
<version>${graphar.version}</version>
3637

3738
<profiles>
3839
<profile>

‎maven-projects/spark/scripts/run-graphar2nebula.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
set -eu
2121

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

2525
graph_info_path="${GRAPH_INFO_PATH:-/tmp/graphar/nebula2graphar/basketballplayergraph.graph.yml}"
2626
spark-submit --class org.apache.graphar.example.GraphAr2Nebula ${jar_file} \

‎maven-projects/spark/scripts/run-graphar2neo4j.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
set -eu
2222

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

2626
graph_info_path="${GRAPH_INFO_PATH:-/tmp/graphar/neo4j2graphar/MovieGraph.graph.yml}"
2727
spark-submit --class org.apache.graphar.example.GraphAr2Neo4j ${jar_file} \

‎maven-projects/spark/scripts/run-ldbc-sample2graphar.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
set -eu
2222

2323
cur_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
24-
jar_file="${cur_dir}/../graphar/target/graphar-commons-0.1.0-SNAPSHOT-shaded.jar"
24+
jar_file="${cur_dir}/../graphar/target/graphar-commons-0.12.0-SNAPSHOT-shaded.jar"
2525
person_input_file="${GAR_TEST_DATA}/ldbc_sample/person_0_0.csv"
2626
person_knows_person_input_file="${GAR_TEST_DATA}/ldbc_sample/person_knows_person_0_0.csv"
2727
output_dir="/tmp/graphar/ldbc_sample"

‎maven-projects/spark/scripts/run-nebula2graphar.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
set -eu
2121

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

2525
vertex_chunk_size=100
2626
edge_chunk_size=1024

‎maven-projects/spark/scripts/run-neo4j2graphar.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
set -eu
2222

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

2626
vertex_chunk_size=100
2727
edge_chunk_size=1024

‎pyspark/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# GraphAr PySpark
1+
# GraphAr PySpark (under development)
22

33
This directory contains the code and build system for the GraphAr PySpark library. Library is implemented as bindings to GraphAr Scala Spark library and does not contain any real logic.
44

‎pyspark/graphar_pyspark/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
from graphar_pyspark.errors import GraphArIsNotInitializedError
2323

24+
__version__ = "0.13.0.dev"
2425

2526
class _GraphArSession:
2627
"""Singleton GraphAr helper object, that contains SparkSession and JVM.

0 commit comments

Comments
 (0)