Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Flat all relationships and node relationships cursors
By having one cursor handling both txState and reading records from disk
- Loading branch information
1 parent
6d65897
commit 959d5b8
Showing
18 changed files
with
669 additions
and
434 deletions.
There are no files selected for viewing
265 changes: 94 additions & 171 deletions
265
...nity/kernel/src/main/java/org/neo4j/kernel/impl/api/StateHandlingStatementOperations.java
Large diffs are not rendered by default.
Oops, something went wrong.
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
90 changes: 90 additions & 0 deletions
90
...rc/main/java/org/neo4j/kernel/impl/api/store/StoreAbstractIteratorRelationshipCursor.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,90 @@ | ||
| /* | ||
| * Copyright (c) 2002-2017 "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.neo4j.collection.primitive.PrimitiveLongIterator; | ||
| import org.neo4j.kernel.impl.locking.LockService; | ||
| import org.neo4j.kernel.impl.store.RecordCursors; | ||
| import org.neo4j.kernel.impl.store.record.RelationshipRecord; | ||
| import org.neo4j.storageengine.api.txstate.ReadableTransactionState; | ||
|
|
||
| import static org.neo4j.kernel.api.StatementConstants.NO_SUCH_NODE; | ||
| import static org.neo4j.kernel.api.StatementConstants.NO_SUCH_RELATIONSHIP; | ||
| import static org.neo4j.kernel.api.StatementConstants.NO_SUCH_RELATIONSHIP_TYPE; | ||
|
|
||
| public abstract class StoreAbstractIteratorRelationshipCursor extends StoreAbstractRelationshipCursor | ||
| { | ||
| private ReadableTransactionState state; | ||
| private PrimitiveLongIterator addedRelationshipIterator; | ||
| private boolean fromStore; | ||
|
|
||
| StoreAbstractIteratorRelationshipCursor( RelationshipRecord relationshipRecord, RecordCursors cursors, | ||
| LockService lockService ) | ||
| { | ||
| super( relationshipRecord, cursors, lockService ); | ||
| } | ||
|
|
||
| protected StoreAbstractIteratorRelationshipCursor init( ReadableTransactionState state, | ||
| PrimitiveLongIterator addedRelationshipIterator ) | ||
| { | ||
| this.state = state; | ||
| this.addedRelationshipIterator = addedRelationshipIterator; | ||
| this.fromStore = true; | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| protected final boolean fetchNext() | ||
| { | ||
| if ( fromStore ) | ||
| { | ||
| while ( doFetchNext() ) | ||
| { | ||
| if ( state != null && state.relationshipIsDeletedInThisTx( id() ) ) | ||
| { | ||
| continue; | ||
| } | ||
|
|
||
| return true; | ||
| } | ||
|
|
||
| fromStore = false; | ||
| } | ||
|
|
||
| if ( state != null && addedRelationshipIterator != null && addedRelationshipIterator.hasNext() ) | ||
| { | ||
| state.getRelationshipState( addedRelationshipIterator.next() ).accept( this ); | ||
| return true; | ||
| } | ||
|
|
||
| visit( NO_SUCH_RELATIONSHIP, NO_SUCH_RELATIONSHIP_TYPE, NO_SUCH_NODE, NO_SUCH_NODE ); | ||
| return false; | ||
| } | ||
|
|
||
| protected abstract boolean doFetchNext(); | ||
|
|
||
| @Override | ||
| public void close() | ||
| { | ||
| super.close(); | ||
| state = null; | ||
| addedRelationshipIterator = null; | ||
| } | ||
| } |
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
Oops, something went wrong.