Skip to content

Commit 20cb885

Browse files
authored
Migrate project to computer directory (#310)
1 parent e241d16 commit 20cb885

File tree

936 files changed

+65
-51
lines changed

Some content is hidden

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

936 files changed

+65
-51
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ on:
66
- master
77
- /^release-.*$/
88
pull_request:
9+
defaults:
10+
run:
11+
working-directory: computer
912

1013
jobs:
1114
computer-ci:
@@ -32,6 +35,7 @@ jobs:
3235

3336
- name: License check(RAT)
3437
run: |
38+
pwd
3539
mvn apache-rat:check -ntp
3640
find ./ -name rat.txt -print0 | xargs -0 -I file cat file > merged-rat.txt
3741
grep "Binaries" merged-rat.txt -C 3 && cat merged-rat.txt
@@ -87,7 +91,7 @@ jobs:
8791
if: ${{ env.USE_STAGE == 'true' }}
8892
run: |
8993
cp $HOME/.m2/settings.xml /tmp/settings.xml
90-
mv -vf .github/configs/settings.xml $HOME/.m2/settings.xml
94+
mv -vf ../.github/configs/settings.xml $HOME/.m2/settings.xml
9195
9296
- name: Compile
9397
run: mvn clean compile -e -Dmaven.javadoc.skip=true -ntp

.github/workflows/codeql-analysis.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ on:
1010
# schedule:
1111
# - cron: '45 7 * * 1'
1212

13+
defaults:
14+
run:
15+
working-directory: computer
16+
1317
jobs:
1418
analyze:
1519
env:
@@ -40,7 +44,7 @@ jobs:
4044
if: ${{ env.USE_STAGE == 'true' }}
4145
run: |
4246
cp $HOME/.m2/settings.xml /tmp/settings.xml
43-
mv -vf .github/configs/settings.xml $HOME/.m2/settings.xml
47+
mv -vf ../.github/configs/settings.xml $HOME/.m2/settings.xml
4448
4549
# Initializes the CodeQL tools for scanning.
4650
- name: Initialize CodeQL

.github/workflows/license-checker.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ on:
77
- /^release-.*$/
88
pull_request:
99

10+
defaults:
11+
run:
12+
working-directory: computer
13+
1014
concurrency:
1115
group: ${{ github.workflow }}-${{ github.ref }}
1216
cancel-in-progress: true
@@ -53,7 +57,7 @@ jobs:
5357
if: ${{ env.USE_STAGE == 'true' }}
5458
run: |
5559
cp $HOME/.m2/settings.xml /tmp/settings.xml
56-
mv -vf .github/configs/settings.xml $HOME/.m2/settings.xml
60+
mv -vf ../.github/configs/settings.xml $HOME/.m2/settings.xml
5761
- name: Compile install
5862
run: mvn install -DskipTests=true -ntp
5963
- name: Generate & check current 3rd-party dependencies

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ dist.sh
3232
/nbbuild/
3333
/nbdist/
3434
/.nb-gradle/
35-
dist/
3635
build/
3736

3837
### VS Code ###
@@ -58,7 +57,7 @@ build/
5857
*.pyc
5958

6059
# maven ignore
61-
output/
60+
6261
apache-hugegraph-*-incubating-*/
6362
*.war
6463
*.zip

README.md

Lines changed: 1 addition & 10 deletions

computer/README.md

Lines changed: 12 additions & 0 deletions
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

computer-core/src/main/java/org/apache/hugegraph/computer/core/bsp/Bsp4Master.java renamed to computer/computer-core/src/main/java/org/apache/hugegraph/computer/core/bsp/Bsp4Master.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public List<ContainerInfo> waitWorkersInitDone() {
5454
LOG.info("Master is waiting for workers init-done");
5555
String path = this.constructPath(BspEvent.BSP_WORKER_INIT_DONE);
5656
List<byte[]> serializedContainers = this.waitOnWorkersEvent(
57-
path, this.registerTimeout());
57+
path, this.registerTimeout());
5858
List<ContainerInfo> containers = new ArrayList<>(this.workerCount());
5959
for (byte[] serializedContainer : serializedContainers) {
6060
ContainerInfo container = new ContainerInfo();
@@ -110,7 +110,7 @@ public List<WorkerStat> waitWorkersStepDone(int superstep) {
110110
String path = this.constructPath(BspEvent.BSP_WORKER_STEP_DONE,
111111
superstep);
112112
List<byte[]> list = this.waitOnWorkersEvent(path,
113-
this.barrierOnWorkersTimeout());
113+
this.barrierOnWorkersTimeout());
114114
List<WorkerStat> result = new ArrayList<>(this.workerCount());
115115
for (byte[] bytes : list) {
116116
WorkerStat workerStat = new WorkerStat();

computer-core/src/main/java/org/apache/hugegraph/computer/core/receiver/MessageRecvManager.java renamed to computer/computer-core/src/main/java/org/apache/hugegraph/computer/core/receiver/MessageRecvManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
package org.apache.hugegraph.computer.core.receiver;
1919

2020
import java.util.Map;
21+
import java.util.concurrent.CompletableFuture;
2122
import java.util.concurrent.ExecutionException;
2223
import java.util.concurrent.TimeUnit;
23-
import java.util.concurrent.CompletableFuture;
2424
import java.util.concurrent.TimeoutException;
2525
import java.util.concurrent.atomic.AtomicInteger;
2626

computer-core/src/main/java/org/apache/hugegraph/computer/core/receiver/MessageRecvPartitions.java renamed to computer/computer-core/src/main/java/org/apache/hugegraph/computer/core/receiver/MessageRecvPartitions.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@
1717

1818
package org.apache.hugegraph.computer.core.receiver;
1919

20+
import java.io.File;
21+
import java.util.HashMap;
22+
import java.util.List;
23+
import java.util.Map;
24+
2025
import org.apache.commons.io.FileUtils;
2126
import org.apache.hugegraph.computer.core.common.ComputerContext;
2227
import org.apache.hugegraph.computer.core.config.Config;
@@ -27,11 +32,6 @@
2732
import org.apache.hugegraph.computer.core.store.SuperstepFileGenerator;
2833
import org.apache.hugegraph.computer.core.store.entry.KvEntry;
2934

30-
import java.io.File;
31-
import java.util.HashMap;
32-
import java.util.List;
33-
import java.util.Map;
34-
3535
public abstract class MessageRecvPartitions<P extends MessageRecvPartition> {
3636

3737
protected final ComputerContext context;

0 commit comments

Comments
 (0)