Skip to content

Commit 340d15f

Browse files
authored
Merge branch 'master' into bump-ct
2 parents e570cd9 + a93cc21 commit 340d15f

File tree

36 files changed

+333
-462
lines changed

36 files changed

+333
-462
lines changed

AGENTS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ mvn test -pl hugegraph-server/hugegraph-test -am -P core-test,memory -Dtest=Your
225225

226226
### Working with Distributed Components
227227

228-
The distributed architecture (PD + Store) is in BETA. For distributed development:
228+
For distributed development:
229229
1. Build struct module first: `mvn install -pl hugegraph-struct -am -DskipTests`
230230
2. Build PD: `mvn clean package -pl hugegraph-pd -am -DskipTests`
231231
3. Build Store: `mvn clean package -pl hugegraph-store -am -DskipTests`

README.md

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,27 @@ achieved through the powerful [Gremlin](https://tinkerpop.apache.org/gremlin.htm
2323

2424
## Features
2525

26-
- 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
26+
- Compliant to [Apache TinkerPop 3](https://tinkerpop.apache.org/), supports [Gremlin](https://tinkerpop.apache.org/gremlin.html) & [Cypher](https://en.wikipedia.org/wiki/Cypher_(query_language)) 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
2929
- 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
3131
- Complete graph ecosystem (including both in/out-memory `Graph Computing` + `Graph Visualization & Tools` + `Graph Learning & AI`, see [here](#3-build-from-source))
3232

33+
## Architecture
34+
35+
HugeGraph supports both **standalone** and **distributed** deployments:
36+
37+
| Module | Description |
38+
|----------------------------------------|-----------------------------------------------------------------------------------------------------------|
39+
| [hugegraph-server](hugegraph-server) | Core graph engine with REST API, Gremlin/Cypher support, and pluggable backends (RocksDB default) |
40+
| [hugegraph-pd](hugegraph-pd) | Placement Driver for distributed mode - handles meta storage, partition management and cluster scheduling |
41+
| [hugegraph-store](hugegraph-store) | Distributed storage with Raft consensus for high availability and horizontal scaling |
42+
| [hugegraph-commons](hugegraph-commons) | Shared utilities, RPC framework and common components |
43+
44+
- **Standalone**: HugeGraph Server + RocksDB (for all-in-one deployment)
45+
- **Distributed**: HugeGraph Server + PD + Store (Raft + RocksDB by default)
46+
3347
## Quick Start
3448

3549
### 1. Docker (For Test)
@@ -39,7 +53,7 @@ Use Docker to quickly start a HugeGraph server with `RocksDB` (in the background
3953
```
4054
# (Optional)
4155
# - add "-e PRELOAD=true" to auto-load a sample graph
42-
docker run -itd --name=graph -e PASSWORD=xxx -p 8080:8080 hugegraph/hugegraph:1.5.0
56+
docker run -itd --name=graph -e PASSWORD=xxx -p 8080:8080 hugegraph/hugegraph:1.7.0
4357
```
4458

4559
Please visit [doc page](https://hugegraph.apache.org/docs/quickstart/hugegraph-server/#3-deploy) or
@@ -54,7 +68,7 @@ the [README](hugegraph-server/hugegraph-dist/docker/README.md) for more details.
5468
Visit [Download Page](https://hugegraph.apache.org/docs/download/download/) and refer the [doc](https://hugegraph.apache.org/docs/quickstart/hugegraph-server/#32-download-the-binary-tar-tarball)
5569
to download the latest release package and start the server.
5670

57-
**Note:** if you want to use it in the production environment or expose it to the public network, must enable the [AuthSystem](https://hugegraph.apache.org/docs/config/config-authentication/) to ensure safe.
71+
**Note:** if you want to use it in the production environment or expose it to the public network, you must enable the [AuthSystem](https://hugegraph.apache.org/docs/config/config-authentication/) to ensure safety.
5872

5973
### 3. Build From Source
6074

@@ -64,7 +78,9 @@ steps to build the source code and start the server.
6478
The project [doc page](https://hugegraph.apache.org/docs/) contains more information on HugeGraph
6579
and provides detailed documentation for users. (Structure / Usage / API / Configs...)
6680

67-
And here are links of other **HugeGraph** component/repositories:
81+
## Ecosystem
82+
83+
Other **HugeGraph** components/repositories:
6884

6985
1. [hugegraph-toolchain](https://github.com/apache/hugegraph-toolchain) (graph tools **[loader](https://github.com/apache/hugegraph-toolchain/tree/master/hugegraph-loader)/[dashboard](https://github.com/apache/hugegraph-toolchain/tree/master/hugegraph-hubble)/[tool](https://github.com/apache/hugegraph-toolchain/tree/master/hugegraph-tools)/[client](https://github.com/apache/hugegraph-toolchain/tree/master/hugegraph-client)**)
7086
2. [hugegraph-computer](https://github.com/apache/hugegraph-computer) (integrated **graph computing** system)
@@ -95,6 +111,7 @@ and we are looking forward to working with you to build an excellent open-source
95111

96112
- [GitHub Issues](https://github.com/apache/hugegraph/issues): Feedback on usage issues and functional requirements (quick response)
97113
- Feedback Email: [dev@hugegraph.apache.org](mailto:dev@hugegraph.apache.org) ([subscriber](https://hugegraph.apache.org/docs/contribution-guidelines/subscribe/) only)
114+
- Slack: [ASF Online Channel](https://the-asf.slack.com/archives/C059UU2FJ23)
98115
- WeChat public account: Apache HugeGraph, welcome to scan this QR code to follow us.
99116

100117
<img src="https://github.com/apache/hugegraph-doc/blob/master/assets/images/wechat.png?raw=true" alt="QR png" width="300"/>

docker/configs/server1-conf/rest-server.properties

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ arthas.ip=127.0.0.1
1212
arthas.disabled_commands=jad
1313

1414
# authentication configs
15-
# choose 'org.apache.hugegraph.auth.StandardAuthenticator' or
16-
# 'org.apache.hugegraph.auth.ConfigAuthenticator'
15+
# choose 'org.apache.hugegraph.auth.StandardAuthenticator' or a custom implementation
1716
#auth.authenticator=
17+
# for admin password, By default, it is pa and takes effect upon the first startup
18+
#auth.admin_pa=pa
1819

1920
# rpc server configs for multi graph-servers or raft-servers
2021
rpc.server_host=127.0.0.1

docker/configs/server2-conf/rest-server.properties

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ arthas.ip=127.0.0.1
1212
arthas.disabled_commands=jad
1313

1414
# authentication configs
15-
# choose 'org.apache.hugegraph.auth.StandardAuthenticator' or
16-
# 'org.apache.hugegraph.auth.ConfigAuthenticator'
15+
# choose 'org.apache.hugegraph.auth.StandardAuthenticator' or a custom implementation
1716
#auth.authenticator=
17+
# for admin password, By default, it is pa and takes effect upon the first startup
18+
#auth.admin_pa=pa
1819

1920
# rpc server configs for multi graph-servers or raft-servers
2021
rpc.server_host=127.0.0.1

docker/configs/server3-conf/rest-server.properties

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ arthas.ip=127.0.0.1
1212
arthas.disabled_commands=jad
1313

1414
# authentication configs
15-
# choose 'org.apache.hugegraph.auth.StandardAuthenticator' or
16-
# 'org.apache.hugegraph.auth.ConfigAuthenticator'
15+
# choose 'org.apache.hugegraph.auth.StandardAuthenticator' or a custom implementation
1716
#auth.authenticator=
17+
# for admin password, By default, it is pa and takes effect upon the first startup
18+
#auth.admin_pa=pa
1819

1920
# rpc server configs for multi graph-servers or raft-servers
2021
rpc.server_host=127.0.0.1

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@ auth.admin_pa=pa
4848
# auth client config
4949
#auth.remote_url=127.0.0.1:8899,127.0.0.1:8898,127.0.0.1:8897
5050

51-
# for ConfigAuthenticator mode
52-
#auth.admin_token=
53-
#auth.user_tokens=[]
54-
5551
# rpc server configs for multi graph-servers or raft-servers
5652
rpc.server_host=127.0.0.1
5753
rpc.server_port=$RPC_PORT$

hugegraph-pd/AGENTS.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ HugeGraph PD (Placement Driver) is a meta server for distributed HugeGraph deplo
1010
- Store node monitoring and scheduling
1111
- Metadata coordination using Raft consensus
1212

13-
**Status**: BETA (since HugeGraph 1.5.0)
14-
1513
**Technology Stack**:
1614
- Java 11+ (required)
1715
- Apache Maven 3.5+

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public synchronized boolean init(final RpcOptions rpcOptions) {
6060
private <V> void internalCallAsyncWithRpc(final Endpoint endpoint,
6161
final RaftRpcProcessor.BaseRequest request,
6262
final FutureClosureAdapter<V> closure) {
63-
final InvokeContext invokeCtx = null;
63+
final InvokeContext invokeCtx = new InvokeContext();
6464
final InvokeCallback invokeCallback = new InvokeCallback() {
6565

6666
@Override

hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/auth/ManagerAPI.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public String createManager(@Context GraphManager manager,
7373
AuthManager authManager = manager.authManager();
7474
validUser(authManager, user);
7575

76-
String creator = HugeGraphAuthProxy.getContext().user().username();
76+
String creator = HugeGraphAuthProxy.username();
7777
switch (type) {
7878
case SPACE:
7979
validGraphSpace(manager, graphSpace);
@@ -124,7 +124,7 @@ public void delete(@Context GraphManager manager,
124124
AuthManager authManager = manager.authManager();
125125
validType(type);
126126
validUser(authManager, user);
127-
String actionUser = HugeGraphAuthProxy.getContext().user().username();
127+
String actionUser = HugeGraphAuthProxy.username();
128128

129129
switch (type) {
130130
case SPACE:
@@ -193,7 +193,7 @@ public String checkRole(@Context GraphManager manager,
193193

194194
validType(type);
195195
AuthManager authManager = manager.authManager();
196-
String user = HugeGraphAuthProxy.getContext().user().username();
196+
String user = HugeGraphAuthProxy.username();
197197

198198
boolean result;
199199
switch (type) {

hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/profile/GraphsAPI.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ public Object create(@Context GraphManager manager,
199199
}
200200
}
201201

202-
String creator = HugeGraphAuthProxy.getContext().user().username();
202+
String creator = HugeGraphAuthProxy.username();
203203

204204
if (StringUtils.isNotEmpty(clone)) {
205205
// Clone from existing graph

0 commit comments

Comments
 (0)