Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
CaosDB Crawler
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
caosdb
Software
CaosDB Crawler
Commits
1f058cd8
Commit
1f058cd8
authored
11 months ago
by
Alexander Schlemmer
Browse files
Options
Downloads
Patches
Plain Diff
MAINT: compressed some code for readability
parent
d5809fd3
No related branches found
No related tags found
2 merge requests
!178
FIX: #96 Better error output for crawl.py script.
,
!167
Sync Graph
Pipeline
#51526
passed with warnings
11 months ago
Stage: info
Stage: setup
Stage: cert
Stage: style
Stage: test
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/caoscrawler/sync_graph.py
+19
-31
19 additions, 31 deletions
src/caoscrawler/sync_graph.py
with
19 additions
and
31 deletions
src/caoscrawler/sync_graph.py
+
19
−
31
View file @
1f058cd8
...
@@ -504,7 +504,10 @@ class SyncGraph:
...
@@ -504,7 +504,10 @@ class SyncGraph:
def
_mark_entities_with_path_or_id
(
self
):
def
_mark_entities_with_path_or_id
(
self
):
"""
A path or an ID is sufficiently identifying. Thus, those entities can be marked as
"""
A path or an ID is sufficiently identifying. Thus, those entities can be marked as
checked
"""
checked
Last review by Alexander Schlemmer on 2024-05-29.
"""
for
node
in
list
(
self
.
nodes
):
for
node
in
list
(
self
.
nodes
):
if
node
.
id
is
not
None
:
if
node
.
id
is
not
None
:
eq_node
=
self
.
get_equivalent
(
node
)
eq_node
=
self
.
get_equivalent
(
node
)
...
@@ -533,16 +536,16 @@ class SyncGraph:
...
@@ -533,16 +536,16 @@ class SyncGraph:
def
_merge_into
(
self
,
source
:
SyncNode
,
target
:
SyncNode
):
def
_merge_into
(
self
,
source
:
SyncNode
,
target
:
SyncNode
):
"""
tries to merge source into target and performs the necessary updates:
"""
tries to merge source into target and performs the necessary updates:
- update the membervariables of target using source (``target.update(source)``).
- update the member
variables of target using source (``target.update(source)``).
- replaces reference values to source by target
- replaces reference values to source by target
- updates the reference map
- updates the reference map
- updates lookup tables
- updates lookup tables
- removes source from node lists
- removes source from node lists
- marks target as missing/existing if source was marked that way
- marks target as missing/existing if source was marked that way
- adds an identifiable if now possible (e.g. merging based on ID might allow create an
- adds an identifiable if now possible (e.g. merging based on ID might allow create an
identifiable when none of the two nodes ha
n
d the sufficient properties on its own before)
identifiable when none of the two nodes had the sufficient properties on its own before)
- check whether dependent nodes can now get an
d
identifiable (the merge might have set the
- check whether dependent nodes can now get an identifiable (the merge might have set the
ID such that dependen nodes can now create an identifiable)
ID such that dependen
t
nodes can now create an identifiable)
"""
"""
# sanity checks
# sanity checks
if
source
is
target
:
if
source
is
target
:
...
@@ -569,32 +572,17 @@ class SyncGraph:
...
@@ -569,32 +572,17 @@ class SyncGraph:
)
)
# update reference mappings
# update reference mappings
for
node
in
self
.
forward_references
.
pop
(
id
(
source
)):
for
setA
,
setB
in
(
self
.
forward_references
[
id
(
target
)].
add
(
node
)
(
self
.
forward_references
,
self
.
backward_references
),
self
.
backward_references
[
id
(
node
)].
remove
(
source
)
(
self
.
backward_references
,
self
.
forward_references
),
self
.
backward_references
[
id
(
node
)].
add
(
target
)
(
self
.
forward_references_id_props
,
self
.
backward_references_id_props
),
for
node
in
self
.
backward_references
.
pop
(
id
(
source
)):
(
self
.
backward_references_id_props
,
self
.
forward_references_id_props
),
self
.
backward_references
[
id
(
target
)].
add
(
node
)
(
self
.
forward_references_backref
,
self
.
backward_references_backref
),
self
.
forward_references
[
id
(
node
)].
remove
(
source
)
(
self
.
backward_references_backref
,
self
.
forward_references_backref
),):
self
.
forward_references
[
id
(
node
)].
add
(
target
)
for
node
in
setA
.
pop
(
id
(
source
)):
setA
[
id
(
target
)].
add
(
node
)
for
node
in
self
.
forward_references_id_props
.
pop
(
id
(
source
)):
setB
[
id
(
node
)].
remove
(
source
)
self
.
forward_references_id_props
[
id
(
target
)].
add
(
node
)
setB
[
id
(
node
)].
add
(
target
)
self
.
backward_references_id_props
[
id
(
node
)].
remove
(
source
)
self
.
backward_references_id_props
[
id
(
node
)].
add
(
target
)
for
node
in
self
.
backward_references_id_props
.
pop
(
id
(
source
)):
self
.
backward_references_id_props
[
id
(
target
)].
add
(
node
)
self
.
forward_references_id_props
[
id
(
node
)].
remove
(
source
)
self
.
forward_references_id_props
[
id
(
node
)].
add
(
target
)
for
node
in
self
.
forward_references_backref
.
pop
(
id
(
source
)):
self
.
forward_references_backref
[
id
(
target
)].
add
(
node
)
self
.
backward_references_backref
[
id
(
node
)].
remove
(
source
)
self
.
backward_references_backref
[
id
(
node
)].
add
(
target
)
for
node
in
self
.
backward_references_backref
.
pop
(
id
(
source
)):
self
.
backward_references_backref
[
id
(
target
)].
add
(
node
)
self
.
forward_references_backref
[
id
(
node
)].
remove
(
source
)
self
.
forward_references_backref
[
id
(
node
)].
add
(
target
)
# remove unneeded SyncNode
# remove unneeded SyncNode
self
.
nodes
.
remove
(
source
)
self
.
nodes
.
remove
(
source
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment