Fix checkstyle and compilation errors

neo4j · May 26, 2017 · 3b0b440 · 3b0b440
1 parent 86d527b
commit 3b0b440
Show file tree

Hide file tree

Showing 13 changed files with 32 additions and 23 deletions.
diff --git a/community/index/src/test/java/org/neo4j/index/internal/gbptree/PageAwareByteArrayCursor.java b/community/index/src/test/java/org/neo4j/index/internal/gbptree/PageAwareByteArrayCursor.java
@@ -302,7 +302,7 @@ public void rewind()
     }
 
     @Override
-    public void close() throws IOException
+    public void close()
     {
         if ( linkedCursor != null )
         {

diff --git a/community/io/src/main/java/org/neo4j/io/pagecache/PageCursor.java b/community/io/src/main/java/org/neo4j/io/pagecache/PageCursor.java
@@ -262,7 +262,7 @@ public abstract class PageCursor implements AutoCloseable
      * @see AutoCloseable#close()
      */
     @Override
-    public abstract void close() throws IOException;
+    public abstract void close();
 
     /**
      * Returns true if the page has entered an inconsistent state since the last call to next() or shouldRetry().

diff --git a/community/io/src/main/java/org/neo4j/io/pagecache/impl/CompositePageCursor.java b/community/io/src/main/java/org/neo4j/io/pagecache/impl/CompositePageCursor.java
@@ -418,7 +418,7 @@ public boolean next( long pageId ) throws IOException
     }
 
     @Override
-    public void close() throws IOException
+    public void close()
     {
         first.close();
         second.close();

diff --git a/community/io/src/main/java/org/neo4j/io/pagecache/impl/DelegatingPageCursor.java b/community/io/src/main/java/org/neo4j/io/pagecache/impl/DelegatingPageCursor.java
@@ -117,7 +117,7 @@ public int getOffset()
     }
 
     @Override
-    public void close() throws IOException
+    public void close()
     {
         delegate.close();
     }

diff --git a/community/io/src/main/java/org/neo4j/io/pagecache/impl/muninn/MuninnPageCursor.java b/community/io/src/main/java/org/neo4j/io/pagecache/impl/muninn/MuninnPageCursor.java
@@ -123,7 +123,7 @@ public final boolean next( long pageId ) throws IOException
     }
 
     @Override
-    public final void close() throws IOException
+    public final void close()
     {
         if ( pagedFile == null )
         {
@@ -372,7 +372,7 @@ long assertPagedFileStillMappedAndGetIdOfLastPage()
         return pagedFile.getLastPageId();
     }
 
-    protected abstract void unpinCurrentPage() throws IOException;
+    protected abstract void unpinCurrentPage();
 
     protected abstract void convertPageFaultLock( long pageRef );
 

diff --git a/community/io/src/main/java/org/neo4j/io/pagecache/impl/muninn/MuninnPagedFile.java b/community/io/src/main/java/org/neo4j/io/pagecache/impl/muninn/MuninnPagedFile.java
@@ -480,8 +480,9 @@ private void vectoredFlush(
         }
     }
 
-    void flushLockedPage( long pageRef, long filePageId ) throws IOException
+    boolean flushLockedPage( long pageRef, long filePageId )
     {
+        boolean success = false;
         try ( MajorFlushEvent flushEvent = pageCacheTracer.beginFileFlush( swapper ) )
         {
             FlushEvent flush = flushEvent.flushEventOpportunity().beginFlush( filePageId, toId( pageRef ), swapper );
@@ -492,13 +493,14 @@ void flushLockedPage( long pageRef, long filePageId ) throws IOException
                 flush.addBytesWritten( bytesWritten );
                 flush.addPagesFlushed( 1 );
                 flush.done();
+                success = true;
             }
             catch ( IOException e )
             {
                 flush.done( e );
-                throw e;
             }
         }
+        return success;
     }
 
     private void syncDevice() throws IOException

diff --git a/community/io/src/main/java/org/neo4j/io/pagecache/impl/muninn/MuninnWritePageCursor.java b/community/io/src/main/java/org/neo4j/io/pagecache/impl/muninn/MuninnWritePageCursor.java
@@ -37,7 +37,7 @@ final class MuninnWritePageCursor extends MuninnPageCursor
     }
 
     @Override
-    protected void unpinCurrentPage() throws IOException
+    protected void unpinCurrentPage()
     {
         if ( pinnedPageRef != 0 )
         {
@@ -56,16 +56,15 @@ protected void unpinCurrentPage() throws IOException
         clearPageState();
     }
 
-    private void eagerlyFlushAndUnlockPage() throws IOException
+    private void eagerlyFlushAndUnlockPage()
     {
         long flushStamp = pagedFile.unlockWriteAndTryTakeFlushLock( pinnedPageRef );
         if ( flushStamp != 0 )
         {
             boolean success = false;
             try
             {
-                pagedFile.flushLockedPage( pinnedPageRef, currentPageId );
+                success = pagedFile.flushLockedPage( pinnedPageRef, currentPageId );
-                success = true;
             }
             finally
             {

diff --git a/community/io/src/main/java/org/neo4j/io/pagecache/impl/muninn/OffHeapPageLock.java b/community/io/src/main/java/org/neo4j/io/pagecache/impl/muninn/OffHeapPageLock.java
@@ -172,7 +172,8 @@ public static boolean isExclusivelyLocked( long address )
      */
     public static boolean tryWriteLock( long address )
     {
-        long s, n;
+        long s;
+        long n;
         for ( ; ; )
         {
             s = getState( address );
@@ -214,7 +215,8 @@ private static void throwWriteLockOverflow( long s )
      */
     public static void unlockWrite( long address )
     {
-        long s, n;
+        long s;
+        long n;
         do
         {
             s = getState( address );
@@ -239,7 +241,9 @@ private static long nextSeq( long s )
 
     public static long unlockWriteAndTryTakeFlushLock( long address )
     {
-        long s, n, r;
+        long s;
+        long n;
+        long r;
         do
         {
             r = 0;
@@ -367,7 +371,8 @@ public static long tryFlushLock( long address )
      */
     public static void unlockFlush( long address, long stamp, boolean success )
     {
-        long s, n;
+        long s;
+        long n;
         do
         {
             s = getState( address );

diff --git a/community/io/src/test/java/org/neo4j/adversaries/pagecache/AdversarialReadPageCursor.java b/community/io/src/test/java/org/neo4j/adversaries/pagecache/AdversarialReadPageCursor.java
@@ -376,7 +376,7 @@ private void prepareNext()
     }
 
     @Override
-    public void close() throws IOException
+    public void close()
     {
         delegate.close();
         linkedCursor = null;

diff --git a/community/io/src/test/java/org/neo4j/adversaries/pagecache/AdversarialWritePageCursor.java b/community/io/src/test/java/org/neo4j/adversaries/pagecache/AdversarialWritePageCursor.java
@@ -245,7 +245,7 @@ public boolean next( long pageId ) throws IOException
     }
 
     @Override
-    public void close() throws IOException
+    public void close()
     {
         delegate.close();
         linkedCursor = null;

diff --git a/community/io/src/test/java/org/neo4j/io/pagecache/checking/AccessCheckingReadPageCursor.java b/community/io/src/test/java/org/neo4j/io/pagecache/checking/AccessCheckingReadPageCursor.java
@@ -123,7 +123,7 @@ public boolean next() throws IOException
     }
 
     @Override
-    public void close() throws IOException
+    public void close()
     {
         assertNoReadWithoutShouldRetry();
         super.close();

diff --git a/community/io/src/test/java/org/neo4j/io/pagecache/impl/PagedByteChannelsTest.java b/community/io/src/test/java/org/neo4j/io/pagecache/impl/PagedByteChannelsTest.java
@@ -61,7 +61,7 @@ public PageCursor io( long pageId, int pf_flags ) throws IOException
                 return new DelegatingPageCursor( super.io( pageId, pf_flags ) )
                 {
                     @Override
-                    public void close() throws IOException
+                    public void close()
                     {
                         super.close();
                         closeCounter.getAndIncrement();

diff --git a/community/io/src/test/java/org/neo4j/io/pagecache/impl/muninn/PageListTest.java b/community/io/src/test/java/org/neo4j/io/pagecache/impl/muninn/PageListTest.java
@@ -74,7 +74,7 @@ public class PageListTest
     private static final int[] pageIds = new int[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
     private static final DummyPageSwapper DUMMY_SWAPPER = new DummyPageSwapper( "", UnsafeUtil.pageSize() );
 
-    @Parameterized.Parameters( name = "pageRef = {0}")
+    @Parameterized.Parameters( name = "pageRef = {0}" )
     public static Iterable<Object[]> parameters()
     {
         IntFunction<Object[]> toArray = x -> new Object[]{x};
@@ -727,7 +727,9 @@ public void flushLockMustNotGetInterferenceFromAdjacentFlushLocks() throws Excep
         pageList.unlockExclusive( prevPageRef );
         pageList.unlockExclusive( pageRef );
         pageList.unlockExclusive( nextPageRef );
-        long ps, ns, s;
+        long ps;
+        long ns;
+        long s;
         assertTrue( (ps = pageList.tryFlushLock( prevPageRef )) != 0 );
         assertTrue( (ns = pageList.tryFlushLock( nextPageRef )) != 0 );
         assertTrue( (s = pageList.tryFlushLock( pageRef )) != 0 );
@@ -795,7 +797,8 @@ public void exclusiveLockMustNotGetInterferenceFromAdjacentFlushLocks() throws E
         pageList.unlockExclusive( prevPageRef );
         pageList.unlockExclusive( pageRef );
         pageList.unlockExclusive( nextPageRef );
-        long ps, ns;
+        long ps;
+        long ns;
         assertTrue( (ps = pageList.tryFlushLock( prevPageRef )) != 0 );
         assertTrue( (ns = pageList.tryFlushLock( nextPageRef )) != 0);
         assertTrue( pageList.tryExclusiveLock( pageRef ) );