From 25d0ca9c1d219c7e4159a491cd828c89901f3431 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20Finn=C3=A9?= Date: Wed, 23 May 2018 13:36:03 +0200 Subject: [PATCH] Moves store cursors to the the recordstorage package --- .../recordstorage}/GroupReferenceEncoding.java | 2 +- .../impl/recordstorage/RecordNodeCursor.java} | 10 +++++----- .../impl/recordstorage/RecordPropertyCursor.java} | 10 +++++----- .../recordstorage/RecordRelationshipCursor.java} | 9 +++------ .../RecordRelationshipGroupCursor.java} | 12 ++++++------ .../RecordRelationshipScanCursor.java} | 6 +++--- .../RecordRelationshipTraversalCursor.java} | 13 +++++++------ .../impl/recordstorage/RecordStorageReader.java | 14 +++++--------- .../impl/recordstorage}/References.java | 6 +----- .../RelationshipReferenceEncoding.java | 2 +- .../kernel/impl/store/record/PropertyRecord.java | 2 +- ...rsorTest.java => RecordPropertyCursorTest.java} | 4 ++-- .../impl/recordstorage}/ReferencesTest.java | 8 ++++---- 13 files changed, 44 insertions(+), 54 deletions(-) rename community/kernel/src/main/java/org/neo4j/kernel/impl/{newapi => storageengine/impl/recordstorage}/GroupReferenceEncoding.java (95%) rename community/kernel/src/main/java/org/neo4j/kernel/impl/{newapi/StoreNodeCursor.java => storageengine/impl/recordstorage/RecordNodeCursor.java} (95%) rename community/kernel/src/main/java/org/neo4j/kernel/impl/{newapi/StorePropertyCursor.java => storageengine/impl/recordstorage/RecordPropertyCursor.java} (96%) rename community/kernel/src/main/java/org/neo4j/kernel/impl/{newapi/StoreRelationshipCursor.java => storageengine/impl/recordstorage/RecordRelationshipCursor.java} (88%) rename community/kernel/src/main/java/org/neo4j/kernel/impl/{newapi/StoreRelationshipGroupCursor.java => storageengine/impl/recordstorage/RecordRelationshipGroupCursor.java} (94%) rename community/kernel/src/main/java/org/neo4j/kernel/impl/{newapi/StoreRelationshipScanCursor.java => storageengine/impl/recordstorage/RecordRelationshipScanCursor.java} (94%) rename community/kernel/src/main/java/org/neo4j/kernel/impl/{newapi/StoreRelationshipTraversalCursor.java => storageengine/impl/recordstorage/RecordRelationshipTraversalCursor.java} (94%) rename community/kernel/src/main/java/org/neo4j/kernel/impl/{newapi => storageengine/impl/recordstorage}/References.java (89%) rename community/kernel/src/main/java/org/neo4j/kernel/impl/{newapi => storageengine/impl/recordstorage}/RelationshipReferenceEncoding.java (96%) rename community/kernel/src/test/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/{StorePropertyCursorTest.java => RecordPropertyCursorTest.java} (99%) rename community/kernel/src/test/java/org/neo4j/kernel/impl/{newapi => storageengine/impl/recordstorage}/ReferencesTest.java (89%) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/GroupReferenceEncoding.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/GroupReferenceEncoding.java similarity index 95% rename from community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/GroupReferenceEncoding.java rename to community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/GroupReferenceEncoding.java index cd8baf2fdfff5..10fd5cff13b8c 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/GroupReferenceEncoding.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/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 . */ -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/newapi/StoreNodeCursor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordNodeCursor.java similarity index 95% rename from community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/StoreNodeCursor.java rename to community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordNodeCursor.java index 5f52f04fbfb19..6128356be8b5c 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/StoreNodeCursor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/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 . */ -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 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/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/StorePropertyCursor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordPropertyCursor.java similarity index 96% rename from community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/StorePropertyCursor.java rename to community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordPropertyCursor.java index 4b51e148f111c..9128cacae0586 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/StorePropertyCursor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/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 . */ -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/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/StoreRelationshipCursor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordRelationshipCursor.java similarity index 88% rename from community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/StoreRelationshipCursor.java rename to community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordRelationshipCursor.java index 9d01920a6cd9a..46bb978023371 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/StoreRelationshipCursor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/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 . */ -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, StorageRelationshipCursor +abstract class RecordRelationshipCursor extends RelationshipRecord implements RelationshipVisitor, 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/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/StoreRelationshipGroupCursor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordRelationshipGroupCursor.java similarity index 94% rename from community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/StoreRelationshipGroupCursor.java rename to community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordRelationshipGroupCursor.java index b24b9354aaa80..7b1aa63461622 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/StoreRelationshipGroupCursor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordRelationshipGroupCursor.java @@ -17,13 +17,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -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; @@ -31,10 +31,10 @@ 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.newapi.References.clearEncoding; +import static org.neo4j.kernel.impl.storageengine.impl.recordstorage.GroupReferenceEncoding.isRelationship; +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/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/StoreRelationshipScanCursor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordRelationshipScanCursor.java similarity index 94% rename from community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/StoreRelationshipScanCursor.java rename to community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordRelationshipScanCursor.java index 9a9ada810e3af..14d48c36795d4 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/StoreRelationshipScanCursor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/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 . */ -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/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/StoreRelationshipTraversalCursor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordRelationshipTraversalCursor.java similarity index 94% rename from community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/StoreRelationshipTraversalCursor.java rename to community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordRelationshipTraversalCursor.java index 9cc5016278640..9dda4af3a53f4 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/StoreRelationshipTraversalCursor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/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 . */ -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/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordStorageReader.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordStorageReader.java index c4eea01adb1bd..91d85f128ab1e 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordStorageReader.java +++ b/community/kernel/src/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/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/References.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/References.java similarity index 89% rename from community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/References.java rename to community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/References.java index 9ed0bf624e8df..85d7238112f24 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/References.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/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 . */ -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/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/RelationshipReferenceEncoding.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RelationshipReferenceEncoding.java similarity index 96% rename from community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/RelationshipReferenceEncoding.java rename to community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RelationshipReferenceEncoding.java index 023be60732c0a..1e5c9c29112a2 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/RelationshipReferenceEncoding.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/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 . */ -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 index 47434650d6569..3a07b5967f449 100644 --- 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 PARAMETERS = asList( new Object[]{false, PropertyType.BOOL}, @@ -206,7 +206,7 @@ public class StorePropertyCursorTest PropertyType.STRING} ); - private StorePropertyCursorTest() + private RecordPropertyCursorTest() { } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/ReferencesTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/ReferencesTest.java similarity index 89% rename from community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/ReferencesTest.java rename to community/kernel/src/test/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/ReferencesTest.java index 5df40ba049133..cef1c1eedc363 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/ReferencesTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/storageengine/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 . */ -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.newapi.RelationshipReferenceEncoding.GROUP; -import static org.neo4j.kernel.impl.newapi.RelationshipReferenceEncoding.parseEncoding; +import static org.neo4j.kernel.impl.storageengine.impl.recordstorage.References.clearEncoding; +import static org.neo4j.kernel.impl.storageengine.impl.recordstorage.RelationshipReferenceEncoding.GROUP; +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