Skip to content

Commit c54400f

Browse files
authored
Merge branch 'master' into unify_version
2 parents f487fbd + 1badd93 commit c54400f

32 files changed

Lines changed: 434 additions & 935 deletions

File tree

.asf.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717

1818
github:
1919
features:
20-
# Enable issue management
2120
issues: true
2221
# Enable wiki for documentation
2322
wiki: true
2423
# Enable projects for project management boards
2524
projects: true
25+
discussions: true
2626
description: A graph database that supports more than 100+ billion data, high performance and scalability (Include OLTP Engine & REST-API & Backends)
2727
homepage: https://hugegraph.apache.org
2828
del_branch_on_merge: true

.github/outdated/.travis.yml

Lines changed: 0 additions & 124 deletions
This file was deleted.

.github/outdated/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66

77
jobs:
88
build:
9-
runs-on: ubuntu-20.04
9+
runs-on: ubuntu-22.04
1010
env:
1111
TAG_NAME: ${{ github.ref_name }}
1212
steps:

.github/workflows/server-ci.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
jobs:
1212
build-server:
1313
# TODO: we need test & replace it to ubuntu-24.04 or ubuntu-latest
14-
runs-on: ubuntu-20.04
14+
runs-on: ubuntu-22.04
1515
env:
1616
USE_STAGE: 'false' # Whether to include the stage repository.
1717
TRAVIS_DIR: hugegraph-server/hugegraph-dist/src/assembly/travis
@@ -27,7 +27,7 @@ jobs:
2727
strategy:
2828
fail-fast: false
2929
matrix:
30-
BACKEND: [ memory, rocksdb, hbase, cassandra, mysql, postgresql, scylladb ]
30+
BACKEND: [ memory, rocksdb, hbase ]
3131
JAVA_VERSION: [ '11' ]
3232

3333
steps:
@@ -38,7 +38,7 @@ jobs:
3838

3939
# TODO: Remove this step after install-backend.sh updated
4040
- name: Install Java8 for backend
41-
uses: actions/setup-java@v3
41+
uses: actions/setup-java@v4
4242
with:
4343
java-version: '8'
4444
distribution: 'zulu'
@@ -48,13 +48,13 @@ jobs:
4848
$TRAVIS_DIR/install-backend.sh $BACKEND && jps -l
4949
5050
- name: Install Java ${{ matrix.JAVA_VERSION }}
51-
uses: actions/setup-java@v3
51+
uses: actions/setup-java@v4
5252
with:
5353
java-version: ${{ matrix.JAVA_VERSION }}
5454
distribution: 'zulu'
5555

5656
- name: Cache Maven packages
57-
uses: actions/cache@v3
57+
uses: actions/cache@v4
5858
with:
5959
path: ~/.m2
6060
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
@@ -95,6 +95,7 @@ jobs:
9595
$TRAVIS_DIR/run-tinkerpop-test.sh $BACKEND tinkerpop
9696
9797
- name: Upload coverage to Codecov
98+
# TODO: update to v5 later
9899
uses: codecov/codecov-action@v3
99100
with:
100101
token: ${{ secrets.CODECOV_TOKEN }}

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@ achieved through the powerful [Gremlin](https://tinkerpop.apache.org/gremlin.htm
2626
- Compliant to [Apache TinkerPop 3](https://tinkerpop.apache.org/), supports [Gremlin](https://tinkerpop.apache.org/gremlin.html) & [Cypher](https://en.wikipedia.org/wiki/Cypher) language
2727
- Schema Metadata Management, including VertexLabel, EdgeLabel, PropertyKey and IndexLabel
2828
- Multi-type Indexes, supporting exact query, range query and complex conditions combination query
29-
- Plug-in Backend Store Driver Framework, support `RocksDB`/`HStore`, `HBase`, `Cassandra/ScyllaDB`, and `MySQL/Postgre` now and easy to add another backend store driver if needed
29+
- Plug-in Backend Store Framework, mainly support `RocksDB`/`HStore` + `HBase` for now and you could choose other backends in the [legacy version](https://hugegraph.apache.org/docs/download/download/)`1.5.0` (like `MySQL/PG`/`Cassandra` ...)
3030
- Integration with `Flink/Spark/HDFS`, and friendly to connect other big data platforms
31+
- Complete graph ecosystem (including both in/out-memory `Graph Computing` + `Graph Visualization & Tools` + `Graph Learning & AI`, see [here](#3-build-from-source))
3132

3233

3334
## Quick Start

hugegraph-cluster-test/hugegraph-clustertest-dist/src/assembly/static/conf/hugegraph.properties.template

Lines changed: 3 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ edge.cache_type=l2
3939
backend=hstore
4040
serializer=binary
4141

42+
# graph name
4243
store=hugegraph
4344

4445
# pd config
@@ -50,48 +51,16 @@ task.schedule_period=10
5051
task.retry=0
5152
task.wait_timeout=10
5253

53-
# raft config
54-
raft.mode=false
55-
raft.path=./raft-log
56-
raft.safe_read=true
57-
raft.use_replicator_pipeline=true
58-
raft.election_timeout=10000
59-
raft.snapshot_interval=3600
60-
raft.backend_threads=48
61-
raft.read_index_threads=8
62-
raft.snapshot_threads=4
63-
raft.snapshot_parallel_compress=false
64-
raft.snapshot_compress_threads=4
65-
raft.snapshot_decompress_threads=4
66-
raft.read_strategy=ReadOnlyLeaseBased
67-
raft.queue_size=16384
68-
raft.queue_publish_timeout=60
69-
raft.apply_batch=1
70-
raft.rpc_threads=80
71-
raft.rpc_connect_timeout=5000
72-
raft.rpc_timeout=60
73-
raft.install_snapshot_rpc_timeout=36000
74-
7554
# search config
7655
search.text_analyzer=jieba
7756
search.text_analyzer_mode=INDEX
7857

79-
# rocksdb backend config
58+
### RocksDB backend config
8059
#rocksdb.data_path=/path/to/disk
8160
#rocksdb.wal_path=/path/to/disk
8261

8362

84-
# cassandra backend config
85-
cassandra.host=localhost
86-
cassandra.port=9042
87-
cassandra.username=
88-
cassandra.password=
89-
#cassandra.connect_timeout=5
90-
#cassandra.read_timeout=20
91-
#cassandra.keyspace.strategy=SimpleStrategy
92-
#cassandra.keyspace.replication=3
93-
94-
# hbase backend config
63+
### HBase backend config
9564
#hbase.hosts=localhost
9665
#hbase.port=2181
9766
#hbase.znode_parent=/hbase
@@ -102,25 +71,3 @@ cassandra.password=
10271
#hbase.enable_partition=true
10372
#hbase.vertex_partitions=10
10473
#hbase.edge_partitions=30
105-
106-
# mysql backend config
107-
#jdbc.driver=com.mysql.jdbc.Driver
108-
#jdbc.url=jdbc:mysql://127.0.0.1:3306
109-
#jdbc.username=root
110-
#jdbc.password=
111-
#jdbc.reconnect_max_times=3
112-
#jdbc.reconnect_interval=3
113-
#jdbc.ssl_mode=false
114-
115-
# postgresql & cockroachdb backend config
116-
#jdbc.driver=org.postgresql.Driver
117-
#jdbc.url=jdbc:postgresql://localhost:5432/
118-
#jdbc.username=postgres
119-
#jdbc.password=
120-
#jdbc.postgresql.connect_database=template1
121-
122-
# palo backend config
123-
#palo.host=127.0.0.1
124-
#palo.poll_interval=10
125-
#palo.temp_dir=./palo-data
126-
#palo.file_limit_size=32

hugegraph-pd/hg-pd-core/src/main/java/org/apache/hugegraph/pd/raft/KVOperation.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929

3030
import lombok.Data;
3131

32+
import org.apache.hugegraph.pd.raft.serializer.HugegraphHessianSerializerFactory;
33+
3234
@Data
3335
public class KVOperation {
3436

@@ -84,6 +86,7 @@ public static KVOperation fromByteArray(byte[] value) throws IOException {
8486

8587
try (ByteArrayInputStream bis = new ByteArrayInputStream(value, 1, value.length - 1)) {
8688
Hessian2Input input = new Hessian2Input(bis);
89+
input.setSerializerFactory(HugegraphHessianSerializerFactory.getInstance());
8790
KVOperation op = new KVOperation();
8891
op.op = value[0];
8992
op.key = input.readBytes();

0 commit comments

Comments
 (0)