Moves store cursors to the the recordstorage package

neo4j · Jun 11, 2018 · 25d0ca9 · 25d0ca9
1 parent 4023dc1
commit 25d0ca9
Show file tree

Hide file tree

Showing 13 changed files with 44 additions and 54 deletions.
diff --git a/...l/impl/newapi/GroupReferenceEncoding.java → ...recordstorage/GroupReferenceEncoding.java b/...l/impl/newapi/GroupReferenceEncoding.java → ...recordstorage/GroupReferenceEncoding.java
@@ -17,7 +17,7 @@
  * 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.newapi;
+package org.neo4j.kernel.impl.storageengine.impl.recordstorage;
 
 import static org.neo4j.kernel.impl.store.record.AbstractBaseRecord.NO_ID;
 

diff --git a/...j/kernel/impl/newapi/StoreNodeCursor.java → .../impl/recordstorage/RecordNodeCursor.java b/...j/kernel/impl/newapi/StoreNodeCursor.java → .../impl/recordstorage/RecordNodeCursor.java
@@ -17,7 +17,7 @@
  * 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.newapi;
+package org.neo4j.kernel.impl.storageengine.impl.recordstorage;
 
 import java.util.function.LongPredicate;
 
@@ -30,7 +30,7 @@
 import org.neo4j.kernel.impl.store.record.RecordLoad;
 import org.neo4j.storageengine.api.StorageNodeCursor;
 
-public class StoreNodeCursor extends NodeRecord implements StorageNodeCursor
+class RecordNodeCursor extends NodeRecord implements StorageNodeCursor
 {
     private NodeStore read;
     private RecordCursor<DynamicRecord> labelCursor;
@@ -40,7 +40,7 @@ public class StoreNodeCursor extends NodeRecord implements StorageNodeCursor
     private long nextStoreReference;
     private boolean open;
 
-    public StoreNodeCursor( NodeStore read )
+    RecordNodeCursor( NodeStore read )
     {
         super( NO_ID );
         this.read = read;
@@ -230,11 +230,11 @@ public String toString()
     {
         if ( !open )
         {
-            return "StoreNodeCursor[closed state]";
+            return "RecordNodeCursor[closed state]";
         }
         else
         {
-            return "StoreNodeCursor[id=" + getId() +
+            return "RecordNodeCursor[id=" + getId() +
                     ", open state with: highMark=" + highMark +
                     ", next=" + next +
                     ", underlying record=" + super.toString() + " ]";

diff --git a/...rnel/impl/newapi/StorePropertyCursor.java → ...l/recordstorage/RecordPropertyCursor.java b/...rnel/impl/newapi/StorePropertyCursor.java → ...l/recordstorage/RecordPropertyCursor.java
@@ -17,7 +17,7 @@
  * 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.newapi;
+package org.neo4j.kernel.impl.storageengine.impl.recordstorage;
 
 import java.nio.ByteBuffer;
 import java.util.function.IntPredicate;
@@ -48,7 +48,7 @@
 import org.neo4j.values.storable.ValueGroup;
 import org.neo4j.values.storable.Values;
 
-public class StorePropertyCursor extends PropertyRecord implements StoragePropertyCursor
+class RecordPropertyCursor extends PropertyRecord implements StoragePropertyCursor
 {
     private static final int MAX_BYTES_IN_SHORT_STRING_OR_SHORT_ARRAY = 32;
     private static final int INITIAL_POSITION = -1;
@@ -62,7 +62,7 @@ public class StorePropertyCursor extends PropertyRecord implements StorageProper
     private PageCursor arrayPage;
     private boolean open;
 
-    public StorePropertyCursor( PropertyStore read )
+    RecordPropertyCursor( PropertyStore read )
     {
         super( NO_ID );
         this.read = read;
@@ -392,14 +392,14 @@ private void property( PropertyRecord record, long reference, PageCursor pageCur
         read.getRecordByCursor( reference, record, RecordLoad.FORCE, pageCursor );
     }
 
-    private TextValue string( org.neo4j.kernel.impl.newapi.StorePropertyCursor cursor, long reference, PageCursor page )
+    private TextValue string( RecordPropertyCursor cursor, long reference, PageCursor page )
     {
         ByteBuffer buffer = cursor.buffer = read.loadString( reference, cursor.buffer, page );
         buffer.flip();
         return Values.stringValue( UTF8.decode( buffer.array(), 0, buffer.limit() ) );
     }
 
-    private ArrayValue array( org.neo4j.kernel.impl.newapi.StorePropertyCursor cursor, long reference, PageCursor page )
+    private ArrayValue array( RecordPropertyCursor cursor, long reference, PageCursor page )
     {
         ByteBuffer buffer = cursor.buffer = read.loadArray( reference, cursor.buffer, page );
         buffer.flip();

diff --git a/.../impl/newapi/StoreRelationshipCursor.java → ...cordstorage/RecordRelationshipCursor.java b/.../impl/newapi/StoreRelationshipCursor.java → ...cordstorage/RecordRelationshipCursor.java
@@ -17,25 +17,22 @@
  * 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.newapi;
+package org.neo4j.kernel.impl.storageengine.impl.recordstorage;
 
-import org.neo4j.internal.kernel.api.NodeCursor;
-import org.neo4j.internal.kernel.api.PropertyCursor;
 import org.neo4j.io.pagecache.PageCursor;
 import org.neo4j.kernel.impl.api.RelationshipVisitor;
 import org.neo4j.kernel.impl.store.RelationshipGroupStore;
 import org.neo4j.kernel.impl.store.RelationshipStore;
 import org.neo4j.kernel.impl.store.record.RecordLoad;
-import org.neo4j.kernel.impl.store.record.RelationshipGroupRecord;
 import org.neo4j.kernel.impl.store.record.RelationshipRecord;
 import org.neo4j.storageengine.api.StorageRelationshipCursor;
 
-abstract class StoreRelationshipCursor extends RelationshipRecord implements RelationshipVisitor<RuntimeException>, StorageRelationshipCursor
+abstract class RecordRelationshipCursor extends RelationshipRecord implements RelationshipVisitor<RuntimeException>, StorageRelationshipCursor
 {
     final RelationshipStore relationshipStore;
     final RelationshipGroupStore groupStore;
 
-    StoreRelationshipCursor( RelationshipStore relationshipStore, RelationshipGroupStore groupStore )
+    RecordRelationshipCursor( RelationshipStore relationshipStore, RelationshipGroupStore groupStore )
     {
         super( NO_ID );
         this.relationshipStore = relationshipStore;

diff --git a/.../newapi/StoreRelationshipGroupCursor.java → ...torage/RecordRelationshipGroupCursor.java b/.../newapi/StoreRelationshipGroupCursor.java → ...torage/RecordRelationshipGroupCursor.java
@@ -17,24 +17,24 @@
  * 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.newapi;
+package org.neo4j.kernel.impl.storageengine.impl.recordstorage;
 
 import org.eclipse.collections.api.map.primitive.MutableIntObjectMap;
 import org.eclipse.collections.impl.map.mutable.primitive.IntObjectHashMap;
 
 import org.neo4j.io.pagecache.PageCursor;
-import org.neo4j.kernel.impl.newapi.StoreRelationshipTraversalCursor.Record;
+import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordRelationshipTraversalCursor.Record;
 import org.neo4j.kernel.impl.store.RelationshipGroupStore;
 import org.neo4j.kernel.impl.store.RelationshipStore;
 import org.neo4j.kernel.impl.store.record.RecordLoad;
 import org.neo4j.kernel.impl.store.record.RelationshipGroupRecord;
 import org.neo4j.kernel.impl.store.record.RelationshipRecord;
 import org.neo4j.storageengine.api.StorageRelationshipGroupCursor;
 
-import static org.neo4j.kernel.impl.newapi.GroupReferenceEncoding.isRelationship;
+import static org.neo4j.kernel.impl.storageengine.impl.recordstorage.GroupReferenceEncoding.isRelationship;
-import static org.neo4j.kernel.impl.newapi.References.clearEncoding;
+import static org.neo4j.kernel.impl.storageengine.impl.recordstorage.References.clearEncoding;
 
-public class StoreRelationshipGroupCursor extends RelationshipGroupRecord implements StorageRelationshipGroupCursor
+class RecordRelationshipGroupCursor extends RelationshipGroupRecord implements StorageRelationshipGroupCursor
 {
     private final RelationshipStore relationshipStore;
     private final RelationshipGroupStore groupStore;
@@ -45,7 +45,7 @@ public class StoreRelationshipGroupCursor extends RelationshipGroupRecord implem
     private PageCursor edgePage;
     private boolean open;
 
-    public StoreRelationshipGroupCursor( RelationshipStore relationshipStore, RelationshipGroupStore groupStore )
+    RecordRelationshipGroupCursor( RelationshipStore relationshipStore, RelationshipGroupStore groupStore )
     {
         super( NO_ID );
         this.relationshipStore = relationshipStore;

diff --git a/...l/newapi/StoreRelationshipScanCursor.java → ...storage/RecordRelationshipScanCursor.java b/...l/newapi/StoreRelationshipScanCursor.java → ...storage/RecordRelationshipScanCursor.java
@@ -17,7 +17,7 @@
  * 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.newapi;
+package org.neo4j.kernel.impl.storageengine.impl.recordstorage;
 
 import java.util.function.LongPredicate;
 
@@ -28,7 +28,7 @@
 import org.neo4j.kernel.impl.store.record.RelationshipRecord;
 import org.neo4j.storageengine.api.StorageRelationshipScanCursor;
 
-public class StoreRelationshipScanCursor extends StoreRelationshipCursor implements StorageRelationshipScanCursor
+class RecordRelationshipScanCursor extends RecordRelationshipCursor implements StorageRelationshipScanCursor
 {
     private int type;
     private long next;
@@ -37,7 +37,7 @@ public class StoreRelationshipScanCursor extends StoreRelationshipCursor impleme
     private PageCursor pageCursor;
     private boolean open;
 
-    public StoreRelationshipScanCursor( RelationshipStore relationshipStore, RelationshipGroupStore groupStore )
+    RecordRelationshipScanCursor( RelationshipStore relationshipStore, RelationshipGroupStore groupStore )
     {
         super( relationshipStore, groupStore );
     }

diff --git a/...api/StoreRelationshipTraversalCursor.java → ...ge/RecordRelationshipTraversalCursor.java b/...api/StoreRelationshipTraversalCursor.java → ...ge/RecordRelationshipTraversalCursor.java
@@ -17,19 +17,20 @@
  * 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.newapi;
+package org.neo4j.kernel.impl.storageengine.impl.recordstorage;
 
 import java.util.function.LongPredicate;
 
 import org.neo4j.io.pagecache.PageCursor;
+import org.neo4j.kernel.impl.newapi.RelationshipDirection;
 import org.neo4j.kernel.impl.store.RelationshipGroupStore;
 import org.neo4j.kernel.impl.store.RelationshipStore;
 import org.neo4j.kernel.impl.store.record.RelationshipRecord;
 import org.neo4j.storageengine.api.StorageRelationshipTraversalCursor;
 
-import static org.neo4j.kernel.impl.newapi.References.clearEncoding;
+import static org.neo4j.kernel.impl.storageengine.impl.recordstorage.References.clearEncoding;
 
-public class StoreRelationshipTraversalCursor extends StoreRelationshipCursor implements StorageRelationshipTraversalCursor
+class RecordRelationshipTraversalCursor extends RecordRelationshipCursor implements StorageRelationshipTraversalCursor
 {
     private enum GroupState
     {
@@ -43,14 +44,14 @@ private enum GroupState
     private long next;
     private Record buffer;
     private PageCursor pageCursor;
-    private final StoreRelationshipGroupCursor group;
+    private final RecordRelationshipGroupCursor group;
     private GroupState groupState;
     private boolean open;
 
-    public StoreRelationshipTraversalCursor( RelationshipStore relationshipStore, RelationshipGroupStore groupStore )
+    RecordRelationshipTraversalCursor( RelationshipStore relationshipStore, RelationshipGroupStore groupStore )
     {
         super( relationshipStore, groupStore );
-        this.group = new StoreRelationshipGroupCursor( relationshipStore, groupStore );
+        this.group = new RecordRelationshipGroupCursor( relationshipStore, groupStore );
     }
 
     @Override

diff --git a/...main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordStorageReader.java b/...main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordStorageReader.java
@@ -64,10 +64,6 @@
 import org.neo4j.kernel.impl.core.TokenNotFoundException;
 import org.neo4j.kernel.impl.locking.Lock;
 import org.neo4j.kernel.impl.locking.LockService;
-import org.neo4j.kernel.impl.newapi.StoreNodeCursor;
-import org.neo4j.kernel.impl.newapi.StoreRelationshipGroupCursor;
-import org.neo4j.kernel.impl.newapi.StoreRelationshipScanCursor;
-import org.neo4j.kernel.impl.newapi.StoreRelationshipTraversalCursor;
 import org.neo4j.kernel.impl.store.InvalidRecordException;
 import org.neo4j.kernel.impl.store.NeoStores;
 import org.neo4j.kernel.impl.store.NodeStore;
@@ -946,30 +942,30 @@ public long getGraphPropertyReference()
     @Override
     public StorageNodeCursor allocateNodeCursor()
     {
-        return new StoreNodeCursor( nodeStore );
+        return new RecordNodeCursor( nodeStore );
     }
 
     @Override
     public StorageRelationshipGroupCursor allocateRelationshipGroupCursor()
     {
-        return new StoreRelationshipGroupCursor( relationshipStore, relationshipGroupStore );
+        return new RecordRelationshipGroupCursor( relationshipStore, relationshipGroupStore );
     }
 
     @Override
     public StorageRelationshipTraversalCursor allocateRelationshipTraversalCursor()
     {
-        return new StoreRelationshipTraversalCursor( relationshipStore, relationshipGroupStore );
+        return new RecordRelationshipTraversalCursor( relationshipStore, relationshipGroupStore );
     }
 
     @Override
     public StorageRelationshipScanCursor allocateRelationshipScanCursor()
     {
-        return new StoreRelationshipScanCursor( relationshipStore, relationshipGroupStore );
+        return new RecordRelationshipScanCursor( relationshipStore, relationshipGroupStore );
     }
 
     @Override
     public StoragePropertyCursor allocatePropertyCursor()
     {
-        return new org.neo4j.kernel.impl.newapi.StorePropertyCursor( propertyStore );
+        return new RecordPropertyCursor( propertyStore );
     }
 }
diff --git a/.../neo4j/kernel/impl/newapi/References.java → ...engine/impl/recordstorage/References.java b/.../neo4j/kernel/impl/newapi/References.java → ...engine/impl/recordstorage/References.java
@@ -17,7 +17,7 @@
  * 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.newapi;
+package org.neo4j.kernel.impl.storageengine.impl.recordstorage;
 
 import org.neo4j.kernel.impl.store.record.AbstractBaseRecord;
 
@@ -33,10 +33,6 @@
  * to silently detect that we have a group reference, parse the groups, and setup the cursor to serve relationship
  * via this mode instead.
  *
- * The opposite problem also appears when the user acquires a relationship group reference from a non-dense node. See
- * {@link org.neo4j.kernel.impl.newapi.Read#relationships(long, long,
- * org.neo4j.internal.kernel.api.RelationshipTraversalCursor)} for more details.
- *
  * Node that {@code -1} is used to encode {@link AbstractBaseRecord#NO_ID that a reference is invalid}. In terms of
  * encoding {@code -1} is considered to have all flags, to setting one will not change {@code -1}. This however also
  * means that calling code must check for {@code -1} references before checking flags existence.

diff --git a/...newapi/RelationshipReferenceEncoding.java → ...torage/RelationshipReferenceEncoding.java b/...newapi/RelationshipReferenceEncoding.java → ...torage/RelationshipReferenceEncoding.java
@@ -17,7 +17,7 @@
  * 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.newapi;
+package org.neo4j.kernel.impl.storageengine.impl.recordstorage;
 
 import static org.neo4j.kernel.impl.store.record.AbstractBaseRecord.NO_ID;
 

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/PropertyRecord.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/PropertyRecord.java
@@ -46,7 +46,7 @@ public class PropertyRecord extends AbstractBaseRecord implements Iterable<Prope
     private long nextProp;
     private long prevProp;
     // Holds the purely physical representation of the loaded properties in this record. This is so that
-    // StorePropertyCursor is able to use this raw data without the rather heavy and bloated data structures
+    // RecordPropertyCursor is able to use this raw data without the rather heavy and bloated data structures
     // of PropertyBlock and thereabouts. So when a property record is loaded only these blocks are read,
     // the construction of all PropertyBlock instances are loaded lazily when they are first needed, loaded
     // by ensureBlocksLoaded().

diff --git a/...ecordstorage/StorePropertyCursorTest.java → ...cordstorage/RecordPropertyCursorTest.java b/...ecordstorage/StorePropertyCursorTest.java → ...cordstorage/RecordPropertyCursorTest.java
@@ -83,7 +83,7 @@
 import static org.neo4j.kernel.impl.store.record.RecordLoad.NORMAL;
 
 @RunWith( Enclosed.class )
-public class StorePropertyCursorTest
+public class RecordPropertyCursorTest
 {
     private static final List<Object[]> PARAMETERS = asList(
             new Object[]{false, PropertyType.BOOL},
@@ -206,7 +206,7 @@ public class StorePropertyCursorTest
                     PropertyType.STRING}
     );
 
-    private StorePropertyCursorTest()
+    private RecordPropertyCursorTest()
     {
     }
 

diff --git a/...4j/kernel/impl/newapi/ReferencesTest.java → ...ne/impl/recordstorage/ReferencesTest.java b/...4j/kernel/impl/newapi/ReferencesTest.java → ...ne/impl/recordstorage/ReferencesTest.java
@@ -17,7 +17,7 @@
  * 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.newapi;
+package org.neo4j.kernel.impl.storageengine.impl.recordstorage;
 
 import org.junit.Test;
 
@@ -29,9 +29,9 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertTrue;
-import static org.neo4j.kernel.impl.newapi.References.clearEncoding;
+import static org.neo4j.kernel.impl.storageengine.impl.recordstorage.References.clearEncoding;
-import static org.neo4j.kernel.impl.newapi.RelationshipReferenceEncoding.GROUP;
+import static org.neo4j.kernel.impl.storageengine.impl.recordstorage.RelationshipReferenceEncoding.GROUP;
-import static org.neo4j.kernel.impl.newapi.RelationshipReferenceEncoding.parseEncoding;
+import static org.neo4j.kernel.impl.storageengine.impl.recordstorage.RelationshipReferenceEncoding.parseEncoding;
 import static org.neo4j.kernel.impl.store.record.AbstractBaseRecord.NO_ID;
 
 public class ReferencesTest