-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #8356 from tinwelint/3.2-more-cache-friendly-trave…
…rsal More cache friendly traversal iterators
- Loading branch information
Showing
5 changed files
with
174 additions
and
6 deletions.
There are no files selected for viewing
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
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
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
79 changes: 79 additions & 0 deletions
79
.../kernel/src/test/java/org/neo4j/kernel/impl/api/store/CursorRelationshipIteratorTest.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| /* | ||
| * Copyright (c) 2002-2016 "Neo Technology," | ||
| * Network Engine for Objects in Lund AB [http://neotechnology.com] | ||
| * | ||
| * This file is part of Neo4j. | ||
| * | ||
| * Neo4j is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
| package org.neo4j.kernel.impl.api.store; | ||
|
|
||
| import org.junit.Test; | ||
|
|
||
| import java.util.function.Supplier; | ||
|
|
||
| import org.neo4j.cursor.Cursor; | ||
| import org.neo4j.kernel.impl.util.collection.ContinuableArrayCursor; | ||
| import org.neo4j.storageengine.api.RelationshipItem; | ||
|
|
||
| import static org.junit.Assert.assertFalse; | ||
| import static org.junit.Assert.assertTrue; | ||
| import static org.mockito.Mockito.mock; | ||
| import static org.mockito.Mockito.spy; | ||
| import static org.mockito.Mockito.times; | ||
| import static org.mockito.Mockito.verify; | ||
| import static org.mockito.Mockito.verifyZeroInteractions; | ||
|
|
||
| public class CursorRelationshipIteratorTest | ||
| { | ||
| @Test | ||
| public void shouldLazilyGoToNext() throws Exception | ||
| { | ||
| // GIVEN | ||
| Cursor<RelationshipItem> cursor = spy( new ContinuableArrayCursor<>( new Supplier<RelationshipItem[]>() | ||
| { | ||
| private boolean first = true; | ||
|
|
||
| @Override | ||
| public RelationshipItem[] get() | ||
| { | ||
| if ( first ) | ||
| { | ||
| first = false; | ||
| return new RelationshipItem[] {mock( RelationshipItem.class ), mock( RelationshipItem.class )}; | ||
| } | ||
| return null; | ||
| } | ||
| } ) ); | ||
|
|
||
| try ( CursorRelationshipIterator iterator = new CursorRelationshipIterator( cursor ) ) | ||
| { | ||
| verifyZeroInteractions( cursor ); | ||
|
|
||
| // WHEN/THEN | ||
| assertTrue( iterator.hasNext() ); | ||
| verify( cursor, times( 1 ) ).next(); | ||
| iterator.next(); | ||
| verify( cursor, times( 1 ) ).next(); | ||
|
|
||
| assertTrue( iterator.hasNext() ); | ||
| verify( cursor, times( 2 ) ).next(); | ||
| iterator.next(); | ||
| verify( cursor, times( 2 ) ).next(); | ||
|
|
||
| assertFalse( iterator.hasNext() ); | ||
| verify( cursor, times( 3 ) ).next(); | ||
| } | ||
| } | ||
| } |
70 changes: 70 additions & 0 deletions
70
community/kernel/src/test/java/org/neo4j/kernel/impl/traversal/TraversalBranchImplTest.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| /* | ||
| * Copyright (c) 2002-2016 "Neo Technology," | ||
| * Network Engine for Objects in Lund AB [http://neotechnology.com] | ||
| * | ||
| * This file is part of Neo4j. | ||
| * | ||
| * Neo4j is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
| package org.neo4j.kernel.impl.traversal; | ||
|
|
||
| import org.junit.Test; | ||
|
|
||
| import java.util.Collections; | ||
|
|
||
| import org.neo4j.graphdb.Node; | ||
| import org.neo4j.graphdb.Path; | ||
| import org.neo4j.graphdb.PathExpander; | ||
| import org.neo4j.graphdb.traversal.BranchState; | ||
| import org.neo4j.graphdb.traversal.TraversalBranch; | ||
| import org.neo4j.graphdb.traversal.TraversalContext; | ||
|
|
||
| import static org.mockito.Matchers.any; | ||
| import static org.mockito.Matchers.eq; | ||
| import static org.mockito.Mockito.mock; | ||
| import static org.mockito.Mockito.verify; | ||
| import static org.mockito.Mockito.verifyZeroInteractions; | ||
| import static org.mockito.Mockito.when; | ||
|
|
||
| import static org.neo4j.graphdb.traversal.Evaluation.INCLUDE_AND_CONTINUE; | ||
|
|
||
| public class TraversalBranchImplTest | ||
| { | ||
| @SuppressWarnings( "unchecked" ) | ||
| @Test | ||
| public void shouldExpandOnFirstAccess() throws Exception | ||
| { | ||
| // GIVEN | ||
| TraversalBranch parent = mock( TraversalBranch.class ); | ||
| Node source = mock( Node.class ); | ||
| TraversalBranchImpl branch = new TraversalBranchImpl( parent, source ); | ||
| @SuppressWarnings( "rawtypes" ) | ||
| PathExpander expander = mock( PathExpander.class ); | ||
| when( expander.expand( eq( branch ), any( BranchState.class ) ) ).thenReturn( Collections.emptySet() ); | ||
| TraversalContext context = mock( TraversalContext.class ); | ||
| when( context.evaluate( eq( branch ), any( BranchState.class ) ) ).thenReturn( INCLUDE_AND_CONTINUE ); | ||
|
|
||
| // WHEN initializing | ||
| branch.initialize( expander, context ); | ||
|
|
||
| // THEN the branch should not be expanded | ||
| verifyZeroInteractions( source ); | ||
|
|
||
| // and WHEN actually traversing from it | ||
| branch.next( expander, context ); | ||
|
|
||
| // THEN we should expand it | ||
| verify( expander ).expand( any( Path.class ), any( BranchState.class ) ); | ||
| } | ||
| } |