From eee7a40c08dfc2661dc69116dc2ae2efec6cd1ff Mon Sep 17 00:00:00 2001 From: fickludd Date: Thu, 22 Jun 2017 14:08:51 +0200 Subject: [PATCH] Renamed PageHandle to PageManager --- .../impl/store/cursors/MemoryAccess.java | 26 +++++++++---------- .../impl/store/cursors/MemoryManager.java | 8 +++--- .../{PageHandle.java => PageManager.java} | 2 +- .../neo4j/impl/store/cursors/ReadCursor.java | 8 +++--- .../impl/store/prototype/neole/StoreFile.java | 4 +-- 5 files changed, 24 insertions(+), 24 deletions(-) rename enterprise/runtime/cursors/src/main/java/org/neo4j/impl/store/cursors/{PageHandle.java => PageManager.java} (97%) diff --git a/enterprise/runtime/cursors/src/main/java/org/neo4j/impl/store/cursors/MemoryAccess.java b/enterprise/runtime/cursors/src/main/java/org/neo4j/impl/store/cursors/MemoryAccess.java index deb826626286b..992d71dbadfa5 100644 --- a/enterprise/runtime/cursors/src/main/java/org/neo4j/impl/store/cursors/MemoryAccess.java +++ b/enterprise/runtime/cursors/src/main/java/org/neo4j/impl/store/cursors/MemoryAccess.java @@ -24,7 +24,7 @@ abstract class MemoryAccess { long virtualAddress; - PageHandle page; + PageManager pageman; long pageId; long base; int offset; @@ -34,30 +34,30 @@ abstract class MemoryAccess final void closeAccess() { - if ( page != null ) + if ( pageman != null ) { try { - page.releasePage( pageId, base, offset, lockToken ); + pageman.releasePage( pageId, base, offset, lockToken ); } finally { - page = null; + pageman = null; } } } public final boolean hasPageReference() { - return page != null; + return pageman != null; } - final void access( long virtualAddress, PageHandle page, long pageId, long base, int offset ) + final void access( long virtualAddress, PageManager pageman, long pageId, long base, int offset ) { // TODO: this method is too large to inline... - if ( this.page != null ) + if ( this.pageman != null ) { - if ( this.page != page || this.pageId != pageId ) + if ( this.pageman != pageman || this.pageId != pageId ) { closeAccess(); } @@ -67,7 +67,7 @@ final void access( long virtualAddress, PageHandle page, long pageId, long base, } } this.virtualAddress = virtualAddress; - this.page = page; + this.pageman = pageman; this.pageId = pageId; this.base = base; this.offset = offset; @@ -75,23 +75,23 @@ final void access( long virtualAddress, PageHandle page, long pageId, long base, final void lockShared() { - lockToken = page.sharedLock( pageId, base, offset ); + lockToken = pageman.sharedLock( pageId, base, offset ); } final void lockExclusive() { - lockToken = page.exclusiveLock( pageId, base, offset ); + lockToken = pageman.exclusiveLock( pageId, base, offset ); } final void lockRelease() { - page.releaseLock( pageId, base, offset, lockToken ); + pageman.releaseLock( pageId, base, offset, lockToken ); lockToken = 0; } final long address( int offset, int size ) { - if ( page == null ) + if ( pageman == null ) { throw new IllegalStateException( "Cursor has not been initialized." ); } diff --git a/enterprise/runtime/cursors/src/main/java/org/neo4j/impl/store/cursors/MemoryManager.java b/enterprise/runtime/cursors/src/main/java/org/neo4j/impl/store/cursors/MemoryManager.java index afa569529cef7..068d5b31c4dec 100644 --- a/enterprise/runtime/cursors/src/main/java/org/neo4j/impl/store/cursors/MemoryManager.java +++ b/enterprise/runtime/cursors/src/main/java/org/neo4j/impl/store/cursors/MemoryManager.java @@ -21,7 +21,7 @@ public abstract class MemoryManager { - protected static void setup( ReadCursor cursor, long virtualAddress, PageHandle page, long pageId, long base, + protected static void setup( ReadCursor cursor, long virtualAddress, PageManager page, long pageId, long base, int offset ) { cursor.access( virtualAddress, page, pageId, base, offset ); @@ -30,7 +30,7 @@ protected static void setup( ReadCursor cursor, long virtualAddress, PageHandle protected static void read( ReadCursor cursor, long virtualAddress, - PageHandle page, + PageManager page, long pageId, long base, int offset, @@ -43,7 +43,7 @@ protected static void read( protected static void move( ReadCursor cursor, long virtualAddress, int offset, int bound ) { - PageHandle page = cursor.page; + PageManager page = cursor.pageman; long pageId = cursor.pageId; long base = cursor.base; page.assertValidOffset( pageId, base, offset, bound ); @@ -54,7 +54,7 @@ protected static void move( ReadCursor cursor, long virtualAddress, int offset, protected static void write( Writer writer, long virtualAddress, - PageHandle page, + PageManager page, long pageId, long base, int offset, diff --git a/enterprise/runtime/cursors/src/main/java/org/neo4j/impl/store/cursors/PageHandle.java b/enterprise/runtime/cursors/src/main/java/org/neo4j/impl/store/cursors/PageManager.java similarity index 97% rename from enterprise/runtime/cursors/src/main/java/org/neo4j/impl/store/cursors/PageHandle.java rename to enterprise/runtime/cursors/src/main/java/org/neo4j/impl/store/cursors/PageManager.java index 8ad20311787bd..fae6bfec8a349 100644 --- a/enterprise/runtime/cursors/src/main/java/org/neo4j/impl/store/cursors/PageHandle.java +++ b/enterprise/runtime/cursors/src/main/java/org/neo4j/impl/store/cursors/PageManager.java @@ -19,7 +19,7 @@ */ package org.neo4j.impl.store.cursors; -public abstract class PageHandle extends MemoryManager +public abstract class PageManager extends MemoryManager { protected abstract void releasePage( long pageId, long base, int offset, long lockToken ); diff --git a/enterprise/runtime/cursors/src/main/java/org/neo4j/impl/store/cursors/ReadCursor.java b/enterprise/runtime/cursors/src/main/java/org/neo4j/impl/store/cursors/ReadCursor.java index 4e4bef360538d..61c98547e87bf 100644 --- a/enterprise/runtime/cursors/src/main/java/org/neo4j/impl/store/cursors/ReadCursor.java +++ b/enterprise/runtime/cursors/src/main/java/org/neo4j/impl/store/cursors/ReadCursor.java @@ -23,7 +23,7 @@ public abstract class ReadCursor extends MemoryAccess implements AutoCloseable { public final boolean shouldRetry() { - long token = page.refreshLockToken( pageId, base, offset, lockToken ); + long token = pageman.refreshLockToken( pageId, base, offset, lockToken ); if ( token != lockToken ) { lockToken = token; @@ -35,7 +35,7 @@ public final boolean shouldRetry() } } - protected final void prepareReadCursor( long virtualAddress, PageHandle page, long pageId, long base ) + protected final void prepareReadCursor( long virtualAddress, PageManager page, long pageId, long base ) { access( virtualAddress, page, pageId, base, 0 ); } @@ -51,11 +51,11 @@ protected final long virtualAddress() */ protected final boolean gotoVirtualAddress( long virtualAddress ) { - if ( page == null ) + if ( pageman == null ) { throw new IllegalStateException( "Cursor has not been initialized." ); } - return page.gotoVirtualAddress( virtualAddress, this, pageId, base, offset, lockToken ); + return pageman.gotoVirtualAddress( virtualAddress, this, pageId, base, offset, lockToken ); } protected boolean scanNextByVirtualAddress( long maxAddress ) diff --git a/enterprise/runtime/neole/src/main/java/org/neo4j/impl/store/prototype/neole/StoreFile.java b/enterprise/runtime/neole/src/main/java/org/neo4j/impl/store/prototype/neole/StoreFile.java index 31817a81ab2b7..9b7cf7f1f1587 100644 --- a/enterprise/runtime/neole/src/main/java/org/neo4j/impl/store/prototype/neole/StoreFile.java +++ b/enterprise/runtime/neole/src/main/java/org/neo4j/impl/store/prototype/neole/StoreFile.java @@ -31,7 +31,7 @@ import java.nio.MappedByteBuffer; import java.nio.channels.FileChannel; -import org.neo4j.impl.store.cursors.PageHandle; +import org.neo4j.impl.store.cursors.PageManager; import org.neo4j.impl.store.cursors.ReadCursor; import static java.lang.Math.max; @@ -39,7 +39,7 @@ import static org.neo4j.impl.store.prototype.neole.ReadStore.lcm; import static org.neo4j.impl.store.prototype.neole.ReadStore.nextPowerOfTwo; -abstract class StoreFile extends PageHandle implements Closeable +abstract class StoreFile extends PageManager implements Closeable { static StoreFile fixedSizeRecordFile( File file, int recordSize ) throws IOException {