Skip to content

Commit 31b22a9

Browse files
author
yangjiaqi
committed
Merge branch 'master' into fix-2566
2 parents bf3bfc3 + 0cb6115 commit 31b22a9

File tree

707 files changed

+64020
-2206
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

707 files changed

+64020
-2206
lines changed

‎.asf.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,15 @@ github:
3434
protected_branches:
3535
master:
3636
required_status_checks:
37-
# strict means "Require branches to be up-to-date before merging".
37+
# strict means "Require PR to be up-to-date before merging". (enable when branch unstable)
3838
strict: false
3939
# contexts are the names of checks that must pass (now only enable the basic check)
4040
contexts:
4141
- Analyze (java)
4242
- CodeQL
4343
- check-license
44-
- build (memory, 11)
44+
- build-server (memory, 11)
45+
- build-commons (11)
4546
required_pull_request_reviews:
4647
dismiss_stale_reviews: true
4748
require_code_owner_reviews: false

‎.gitattributes

+6-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,12 @@
55
apache-release.sh export-ignore
66
.licenserc.yaml export-ignore
77
.editorconfig export-ignore
8+
hugegraph-store/hg-store-dist/src/assembly/static/bin/libjemalloc.so export-ignore
9+
hugegraph-store/hg-store-dist/src/assembly/static/bin/libjemalloc_aarch64.so export-ignore
810

911
# ignored directory
1012
.github/ export-ignore
11-
hugegraph-dist/scripts/ export-ignore
12-
#assembly/ export-ignore
13+
.idea/ export-ignore
14+
install-dist/scripts/ export-ignore
15+
hugegraph-commons/hugegraph-dist/ export-ignore
16+
docker/ export-ignore

‎.github/PULL_REQUEST_TEMPLATE.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ published)
1919

2020
## Purpose of the PR
2121

22-
- close #xxx <!-- or use "fix #xxx", "xxx" is the ID-link of related issue, e.g: close #1024 -->
22+
- close #xxx <!-- or use "fix #xxx", "xxx" is the ID-link of related issue, e.g: close #1024 -->
2323

2424
<!--
2525
Please explain more context in this section, clarify why the changes are needed.
@@ -30,7 +30,7 @@ e.g:
3030

3131
## Main Changes
3232

33-
<!-- Please clarify what changes you are proposing. The purpose of this section is to outline the changes and how this PR fixes the issue. These change logs are helpful for better ant faster reviews.)
33+
<!-- Please clarify what changes you are proposing. The purpose of this section is to outline the changes and how this PR fixes the issue. These change logs are helpful for better and faster reviews.)
3434
3535
For example:
3636

‎.github/workflows/check-dependencies.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
3333
- name: mvn install
3434
run: |
35-
mvn install -DskipTests=true -ntp
35+
mvn install -Dmaven.test.skip=true -ntp
3636
- name: generate current dependencies
3737
run: |
3838
bash $SCRIPT_DEPENDENCY/regenerate_known_dependencies.sh current-dependencies.txt

‎.github/workflows/cluster-test-ci.yml

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
name: "Cluster Test CI"
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
- 'release-*'
8+
- 'test-*'
9+
pull_request:
10+
11+
jobs:
12+
cluster-test:
13+
runs-on: ubuntu-latest
14+
env:
15+
USE_STAGE: 'true' # Whether to include the stage repository.
16+
17+
steps:
18+
- name: Install JDK 11
19+
uses: actions/setup-java@v3
20+
with:
21+
java-version: '11'
22+
distribution: 'zulu'
23+
24+
- name: Cache Maven packages
25+
uses: actions/cache@v3
26+
with:
27+
path: ~/.m2
28+
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
29+
restore-keys: ${{ runner.os }}-m2
30+
31+
- name: Checkout
32+
uses: actions/checkout@v4
33+
with:
34+
fetch-depth: 5
35+
36+
- name: use staged maven repo settings
37+
if: ${{ env.USE_STAGE == 'true' }}
38+
run: |
39+
cp $HOME/.m2/settings.xml /tmp/settings.xml
40+
mv -vf .github/configs/settings.xml $HOME/.m2/settings.xml
41+
42+
- name: Package
43+
run: |
44+
mvn clean package -U -Dmaven.javadoc.skip=true -Dmaven.test.skip=true -ntp
45+
46+
- name: Run simple cluster test
47+
run: |
48+
mvn test -pl hugegraph-cluster-test/hugegraph-clustertest-test -am -P simple-cluster-test -DskipCommonsTests=true
49+
50+
- name: Run multi cluster test
51+
run: |
52+
mvn test -pl hugegraph-cluster-test/hugegraph-clustertest-test -am -P multi-cluster-test -DskipCommonsTests=true

‎.github/workflows/commons-ci.yml

+64
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
name: "HugeGraph-Commons CI"
2+
3+
on:
4+
workflow_dispatch:
5+
push:
6+
branches:
7+
- master
8+
- /^release-.*$/
9+
- /^test-.*$/
10+
pull_request:
11+
12+
jobs:
13+
build-commons:
14+
runs-on: ubuntu-latest
15+
env:
16+
# TODO: reset use stage to false later
17+
USE_STAGE: 'true' # Whether to include the stage repository.
18+
19+
strategy:
20+
fail-fast: false
21+
matrix:
22+
JAVA_VERSION: ['11']
23+
24+
steps:
25+
- name: Install JDK ${{ matrix.JAVA_VERSION }}
26+
uses: actions/setup-java@v3
27+
with:
28+
java-version: ${{ matrix.JAVA_VERSION }}
29+
distribution: 'zulu'
30+
31+
- name: Cache Maven packages
32+
uses: actions/cache@v3
33+
with:
34+
path: ~/.m2
35+
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
36+
restore-keys: ${{ runner.os }}-m2
37+
38+
- name: Checkout
39+
uses: actions/checkout@v3
40+
with:
41+
fetch-depth: 2
42+
43+
- name: Use staged maven repo settings
44+
if: ${{ env.USE_STAGE == 'true' }}
45+
run: |
46+
cp $HOME/.m2/settings.xml /tmp/settings.xml
47+
cp -vf .github/configs/settings.xml $HOME/.m2/settings.xml && cat $HOME/.m2/settings.xml
48+
49+
- name: Compile
50+
run: |
51+
mvn compile -Dmaven.javadoc.skip=true -ntp
52+
53+
- name: Run common test
54+
run: |
55+
mvn test -pl hugegraph-commons/hugegraph-common -Dtest=UnitTestSuite -DskipCommonsTests=false
56+
57+
- name: Run rpc test
58+
run: |
59+
mvn test -pl hugegraph-commons/hugegraph-rpc -Dtest=UnitTestSuite -DskipCommonsTests=false
60+
61+
- name: Upload coverage to Codecov
62+
uses: codecov/codecov-action@v3.0.0
63+
with:
64+
file: target/jacoco.xml

‎.github/workflows/licence-checker.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "License checker"
1+
name: "License Checker"
22

33
on:
44
push:

‎.github/workflows/pd-store-ci.yml

+113-12
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "hugegraph-pd-store-ci"
1+
name: "HugeGraph-PD & Store & Hstore CI"
22

33
on:
44
push:
@@ -14,7 +14,8 @@ jobs:
1414
runs-on: ubuntu-latest
1515
env:
1616
# TODO: avoid duplicated env setup in pd & store
17-
USE_STAGE: 'false' # Whether to include the stage repository.
17+
# TODO: reset use stage to false later
18+
USE_STAGE: 'true' # Whether to include the stage repository.
1819
# TODO: remove outdated env
1920
TRAVIS_DIR: hugegraph-server/hugegraph-dist/src/assembly/travis
2021
REPORT_DIR: target/site/jacoco
@@ -44,30 +45,31 @@ jobs:
4445
cp $HOME/.m2/settings.xml /tmp/settings.xml
4546
mv -vf .github/configs/settings.xml $HOME/.m2/settings.xml
4647
47-
- name: Package
48-
run: |
49-
mvn clean package -U -Dmaven.javadoc.skip=true -Dmaven.test.skip=true -ntp
50-
5148
- name: Run common test
5249
run: |
53-
mvn test -pl hugegraph-pd/hg-pd-test -am -P pd-common-test
50+
mvn test -pl hugegraph-pd/hg-pd-test -am -P pd-common-test -DskipCommonsTests=true
5451
5552
- name: Run core test
5653
run: |
57-
mvn test -pl hugegraph-pd/hg-pd-test -am -P pd-core-test
54+
mvn test -pl hugegraph-pd/hg-pd-test -am -P pd-core-test -DskipCommonsTests=true
5855
5956
# The above tests do not require starting a PD instance.
57+
58+
- name: Package
59+
run: |
60+
mvn clean package -U -Dmaven.javadoc.skip=true -Dmaven.test.skip=true -ntp
61+
6062
- name: Prepare env and service
6163
run: |
6264
$TRAVIS_DIR/start-pd.sh
6365
6466
- name: Run client test
6567
run: |
66-
mvn test -pl hugegraph-pd/hg-pd-test -am -P pd-client-test
68+
mvn test -pl hugegraph-pd/hg-pd-test -am -P pd-client-test -DskipCommonsTests=true
6769
6870
- name: Run rest test
6971
run: |
70-
mvn test -pl hugegraph-pd/hg-pd-test -am -P pd-rest-test
72+
mvn test -pl hugegraph-pd/hg-pd-test -am -P pd-rest-test -DskipCommonsTests=true
7173
7274
- name: Upload coverage to Codecov
7375
uses: codecov/codecov-action@v3.0.0
@@ -78,7 +80,7 @@ jobs:
7880
# TODO: avoid duplicated env setup
7981
runs-on: ubuntu-latest
8082
env:
81-
USE_STAGE: 'false' # Whether to include the stage repository.
83+
USE_STAGE: 'true' # Whether to include the stage repository.
8284
# TODO: remove outdated env
8385
TRAVIS_DIR: hugegraph-server/hugegraph-dist/src/assembly/travis
8486
REPORT_DIR: target/site/jacoco
@@ -108,9 +110,108 @@ jobs:
108110
cp $HOME/.m2/settings.xml /tmp/settings.xml
109111
mv -vf .github/configs/settings.xml $HOME/.m2/settings.xml
110112
113+
- name: Package
114+
run: |
115+
mvn clean package -U -Dmaven.javadoc.skip=true -Dmaven.test.skip=true -ntp
116+
117+
- name: Prepare env and service
118+
run: |
119+
$TRAVIS_DIR/start-pd.sh
120+
$TRAVIS_DIR/start-store.sh
121+
111122
- name: Run common test
112123
run: |
113-
mvn test -pl hugegraph-store/hg-store-test -am -P store-common-test
124+
mvn test -pl hugegraph-store/hg-store-test -am -P store-common-test -DskipCommonsTests=true
125+
126+
- name: Run client test
127+
run: |
128+
mvn test -pl hugegraph-store/hg-store-test -am -P store-client-test -DskipCommonsTests=true
129+
130+
- name: Run core test
131+
run: |
132+
mvn test -pl hugegraph-store/hg-store-test -am -P store-core-test -DskipCommonsTests=true
133+
134+
- name: Run rocksdb test
135+
run: |
136+
mvn test -pl hugegraph-store/hg-store-test -am -P store-rocksdb-test -DskipCommonsTests=true
137+
138+
- name: Run server test
139+
run: |
140+
mvn test -pl hugegraph-store/hg-store-test -am -P store-server-test -DskipCommonsTests=true
141+
142+
- name: Run raft-core test
143+
run: |
144+
mvn test -pl hugegraph-store/hg-store-test -am -P store-raftcore-test -DskipCommonsTests=true
145+
146+
- name: Upload coverage to Codecov
147+
uses: codecov/codecov-action@v3.0.0
148+
with:
149+
file: ${{ env.REPORT_DIR }}/*.xml
150+
151+
hstore:
152+
# TODO: avoid duplicated env setup
153+
runs-on: ubuntu-latest
154+
env:
155+
USE_STAGE: 'true' # Whether to include the stage repository.
156+
TRAVIS_DIR: hugegraph-server/hugegraph-dist/src/assembly/travis
157+
REPORT_DIR: target/site/jacoco
158+
BACKEND: hstore
159+
RELEASE_BRANCH: ${{ startsWith(github.ref_name, 'release-') || startsWith(github.ref_name, 'test-') || startsWith(github.base_ref, 'release-') }}
160+
161+
steps:
162+
- name: Install JDK 11
163+
uses: actions/setup-java@v3
164+
with:
165+
java-version: '11'
166+
distribution: 'zulu'
167+
168+
- name: Cache Maven packages
169+
uses: actions/cache@v3
170+
with:
171+
path: ~/.m2
172+
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
173+
restore-keys: ${{ runner.os }}-m2
174+
175+
- name: Checkout
176+
uses: actions/checkout@v3
177+
with:
178+
fetch-depth: 2
179+
180+
- name: use staged maven repo settings
181+
if: ${{ env.USE_STAGE == 'true' }}
182+
run: |
183+
cp $HOME/.m2/settings.xml /tmp/settings.xml
184+
mv -vf .github/configs/settings.xml $HOME/.m2/settings.xml
185+
186+
- name: Package
187+
run: |
188+
mvn clean package -U -Dmaven.javadoc.skip=true -Dmaven.test.skip=true -ntp
189+
190+
- name: Prepare env and service
191+
run: |
192+
$TRAVIS_DIR/install-backend.sh $BACKEND
193+
194+
- name: Run unit test
195+
run: |
196+
$TRAVIS_DIR/run-unit-test.sh $BACKEND
197+
198+
- name: Run core test
199+
run: |
200+
$TRAVIS_DIR/run-core-test.sh $BACKEND
201+
202+
- name: Run api test
203+
run: |
204+
$TRAVIS_DIR/run-api-test.sh $BACKEND $REPORT_DIR
205+
206+
- name: Run raft test
207+
if: ${{ env.BACKEND == 'rocksdb' }}
208+
run: |
209+
$TRAVIS_DIR/run-api-test-for-raft.sh $BACKEND $REPORT_DIR
210+
211+
- name: Run TinkerPop test
212+
if: ${{ env.RELEASE_BRANCH == 'true' }}
213+
run: |
214+
$TRAVIS_DIR/run-tinkerpop-test.sh $BACKEND tinkerpop
114215
115216
- name: Upload coverage to Codecov
116217
uses: codecov/codecov-action@v3.0.0

‎.github/workflows/server-ci.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "hugegraph-server-ci"
1+
name: "HugeGraph-Server CI"
22

33
on:
44
push:
@@ -9,11 +9,12 @@ on:
99
pull_request:
1010

1111
jobs:
12-
build:
12+
build-server:
1313
# TODO: we need test & replace it to ubuntu-24.04 or ubuntu-latest
1414
runs-on: ubuntu-20.04
1515
env:
16-
USE_STAGE: 'false' # Whether to include the stage repository.
16+
# TODO: reset use stage to false later
17+
USE_STAGE: 'true' # Whether to include the stage repository.
1718
TRAVIS_DIR: hugegraph-server/hugegraph-dist/src/assembly/travis
1819
REPORT_DIR: target/site/jacoco
1920
BACKEND: ${{ matrix.BACKEND }}

‎.github/workflows/stale.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
days-before-pr-stale: 30
3030
days-before-pr-close: 180
3131
operations-per-run: 10
32-
start-date: '2017-10-01T00:00:00Z'
32+
start-date: '2016-10-01T00:00:00Z'
3333

3434
exempt-all-assignees: true
3535
remove-stale-when-updated: true

‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ build/
5757
*.pyc
5858

5959
# maven ignore
60-
apache-hugegraph-incubating-*/
60+
apache-hugegraph-*/
6161
output/
6262
*.war
6363
*.zip

0 commit comments

Comments
 (0)