Page MenuHomeSoftware Heritage

Generate .labelobl files to speed-up labelled graph loading
ClosedPublic

Authored by seirl on Jun 30 2022, 3:30 PM.

Diff Detail

Repository
rDGRPH Compressed graph representation
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Build is green

Patch application report for D8059 (id=29079)

Rebasing onto 5c3f59ecfe...

Current branch diff-target is up to date.
Changes applied before test
commit 3909e59be5433a095035877a94273310e55f6f5c
Author: Antoine Pietri <antoine.pietri1@gmail.com>
Date:   Fri Jun 17 14:16:07 2022 +0200

    Generate .labelobl files to speed-up labelled graph loading
    
    Also see https://github.com/vigna/webgraph-big/pull/7

See https://jenkins.softwareheritage.org/job/DGRPH/job/tests-on-diff/209/ for more details.

seirl requested review of this revision.Jun 30 2022, 3:37 PM
This revision is now accepted and ready to land.Jun 30 2022, 3:46 PM
  • Generate .labelobl files to speed-up labelled graph loading

Build has FAILED

Patch application report for D8059 (id=29081)

Rebasing onto 795fa182f2...

First, rewinding head to replay your work on top of it...
Applying: SwhGraphProperties: remove useless IOExceptions
Using index info to reconstruct a base tree...
M	java/src/main/java/org/softwareheritage/graph/SwhGraph.java
M	java/src/main/java/org/softwareheritage/graph/SwhGraphProperties.java
Falling back to patching base and 3-way merge...
Auto-merging java/src/main/java/org/softwareheritage/graph/SwhGraphProperties.java
Auto-merging java/src/main/java/org/softwareheritage/graph/SwhGraph.java
No changes -- Patch already applied.
Applying: SwhUnidirectionalGraph: make constructor with properties public
Using index info to reconstruct a base tree...
M	java/src/main/java/org/softwareheritage/graph/SwhUnidirectionalGraph.java
Falling back to patching base and 3-way merge...
Auto-merging java/src/main/java/org/softwareheritage/graph/SwhUnidirectionalGraph.java
No changes -- Patch already applied.
Applying: GRPC: initial commit with protobuf + java server
Using index info to reconstruct a base tree...
M	java/pom.xml
Falling back to patching base and 3-way merge...
Auto-merging proto/swhgraph.proto
CONFLICT (add/add): Merge conflict in proto/swhgraph.proto
Auto-merging java/src/main/java/org/softwareheritage/graph/rpc/Traversal.java
CONFLICT (add/add): Merge conflict in java/src/main/java/org/softwareheritage/graph/rpc/Traversal.java
Auto-merging java/src/main/java/org/softwareheritage/graph/rpc/GraphServer.java
CONFLICT (add/add): Merge conflict in java/src/main/java/org/softwareheritage/graph/rpc/GraphServer.java
Auto-merging java/pom.xml
CONFLICT (content): Merge conflict in java/pom.xml
Patch failed at 0003 GRPC: initial commit with protobuf + java server

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

Rebase failed (ret=1)!

Could not rebase; Attempt merge onto 795fa182f2...

Already up to date.
Changes applied before test
commit 32f2626a7d0a60bb9ec29939a68d93e2c2ccd145
Author: Antoine Pietri <antoine.pietri1@gmail.com>
Date:   Fri Jun 17 14:16:07 2022 +0200

    Generate .labelobl files to speed-up labelled graph loading
    
    Also see https://github.com/vigna/webgraph-big/pull/7

Link to build: https://jenkins.softwareheritage.org/job/DGRPH/job/tests-on-diff/210/
See console output for more information: https://jenkins.softwareheritage.org/job/DGRPH/job/tests-on-diff/210/console

Build is green

Patch application report for D8059 (id=29082)

Rebasing onto 795fa182f2...

Current branch diff-target is up to date.
Changes applied before test
commit 32f2626a7d0a60bb9ec29939a68d93e2c2ccd145
Author: Antoine Pietri <antoine.pietri1@gmail.com>
Date:   Fri Jun 17 14:16:07 2022 +0200

    Generate .labelobl files to speed-up labelled graph loading
    
    Also see https://github.com/vigna/webgraph-big/pull/7

See https://jenkins.softwareheritage.org/job/DGRPH/job/tests-on-diff/211/ for more details.