fixes #600 - add a configuration option to mergeNodes that allows to …combine relationships of the same type and direction #850
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jexp
requested changes
Jul 14, 2018
| if (delete) source.delete(); | ||
| PropertiesManager.mergeProperties(properties, target, conf); | ||
|
|
||
| //check mergeRels parameter | ||
| Object value = config.get("mergeRels") == null ? false : config.get("mergeRels"); |
There was a problem hiding this comment.
this is really weird, that info should come cleanly out of RefactorConfig please move it there and add a dedicated method
| //check mergeRels parameter | ||
| Object value = config.get("mergeRels") == null ? false : config.get("mergeRels"); | ||
| if(value.equals(true)) { | ||
| Map<String,Object> map = new HashMap<String, Object>(); |
| if (delete) source.delete(); | ||
| PropertiesManager.mergeProperties(properties, target, conf); | ||
|
|
||
| //check mergeRels parameter | ||
| Object value = config.get("mergeRels") == null ? false : config.get("mergeRels"); |
|
|
||
|
|
||
| public void mergeRelsWithSameTypeAndDirectionInMergeNodes (Node node, RefactorConfig config, Direction dir){ | ||
| List<Relationship> rels = new ArrayList<>(); |
There was a problem hiding this comment.
this code is really weird, please fix it
use foreach
iterate over the iterator
| node.getRelationships(dir).iterator().forEachRemaining(rels::add); | ||
| for (int i = 0; i < rels.size()-1; i++) { | ||
| for (int j = i + 1; j < rels.size(); j++) { | ||
| if (rels.get(i).isType(rels.get(j).getType())){ |
There was a problem hiding this comment.
don't call rels.get() repeatedly, use local variables.
they should have the same start/end-node given that you iterate starting from that one
| Map<String,Object> params = null; | ||
|
|
||
| testCall(db, "MATCH (a1:ALabel {name:'a1'}), (a2:ALabel {name:'a2'}), (a3:ALabel {name:'a3'}), (a4:ALabel {name:'a4'}) " + | ||
| " WITH head(collect([a1,a2,a3,a4])) as nodes CALL apoc.refactor.mergeNodes(nodes,{properties:\"combine\",mergeRels:true}) yield node return node", |
| " (a2:ALabel {name:'a2'})-[:HAS_REL{p:'r2'}]->(b1)," + | ||
| " (a3:ALabel {name:'a3'})<-[:HAS_REL{p:'r3'}]-(b1)," + | ||
| " (a4:ALabel {name:'a4'})-[:HAS_REL{p:'r4'}]->(b4:BLabel {name:'b4'})"); | ||
| Map<String,Object> params = null; |
| " (n1)-[:DRIVE{since:2017}]->(n5)," + | ||
| " (n2)-[:HAS{since:2013}]->(n6)"); | ||
|
|
||
| testCall(db, "MATCH (a1:Person{name:'John'}), (a2:Person {name:'Tom'})" + |
| row -> { | ||
| assertTrue(row.get("node") != null); | ||
| assertTrue(row.get("node") instanceof Node); | ||
| Node resultingNode = (Node)(row.get("node")); |
| assertEquals(4,resultingNode.getDegree(Direction.OUTGOING)); | ||
| assertEquals(1,c.getDegree(Direction.INCOMING)); | ||
| assertEquals(true, r.isType(RelationshipType.withName("WORKS_FOR"))); | ||
| assertEquals(Arrays.asList( 2015L , 2018L).toArray(), new ArrayBackedList(r.getProperty("since")).toArray()); |
AngeloBusato
force-pushed
the
issue_600
branch
2 times, most recently
from
346fdad to
789f61b
Compare
jexp
reviewed
Jul 20, 2018
| @@ -335,12 +336,19 @@ public void categorize( | |||
| }); | |||
| } | |||
|
|
|||
| private Node mergeNodes(Node source, Node target, boolean delete, RefactorConfig conf) { | |||
| private Node mergeNodes(Node source, Node target, boolean delete, Map<String, Object> config) { | |||
There was a problem hiding this comment.
Why did you change RefactoringConfig to Map here? and then that map is not even used in the method?
…at allows to combine relationships of the same type and direction
|
@jexp pr updated |
|
Thanks a lot |
jexp
pushed a commit
that referenced
this pull request
Jul 23, 2018
…combine relationships of the same type and direction (#850)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@jexp for merging rels, procedure mergeNodes read the config parameter mergeRels: true/false.
If relationships have same start and end nodes are merged into one and properties combined.
ex. with this data set (we want to merge nodes :Person):
we have
if relationships have different end or start nodes (related to direction) are maintained both and properties combine into all relationships
ex. with this data set (we want to merge nodes :Person):
we have:
