Pure delegation from GBPTree.Monitor to SchemaIndex and LSS Monitors

neo4j · Jun 18, 2018 · c46db9a · c46db9a
1 parent adff30b
commit c46db9a
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 33 deletions.
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/index/LoggingMonitor.java b/community/kernel/src/main/java/org/neo4j/kernel/api/index/LoggingMonitor.java
@@ -19,12 +19,12 @@
  */
 package org.neo4j.kernel.api.index;
 
-import java.util.Map;
+import java.util.StringJoiner;
 
 import org.neo4j.kernel.api.schema.index.IndexDescriptor;
 import org.neo4j.logging.Log;
 
-import static java.lang.String.format;
+import static org.neo4j.helpers.Format.duration;
 
 public class LoggingMonitor implements SchemaIndexProvider.Monitor
 {
@@ -42,12 +42,14 @@ public void failedToOpenIndex( long indexId, IndexDescriptor indexDescriptor, St
     }
 
     @Override
-    public void recoveryCompleted( long indexId, IndexDescriptor indexDescriptor, Map<String,Object> data )
+    public void recoveryCleanupFinished( long indexId, IndexDescriptor indexDescriptor,
+            long numberOfPagesVisited, long numberOfCleanedCrashPointers, long durationMillis )
     {
-        StringBuilder builder =
-                new StringBuilder(
-                        "Schema index recovery completed: indexId: " + indexId + " descriptor: " + indexDescriptor.toString() );
-        data.forEach( ( key, value ) -> builder.append( format( " %s: %s", key, value ) ) );
-        log.info( builder.toString() );
+        StringJoiner joiner =
+                new StringJoiner( ", ", "Schema index cleanup job finished: indexId: " + indexId + " descriptor: " + indexDescriptor.toString(), "" );
+        joiner.add( "Number of pages visited: " + numberOfPagesVisited );
+        joiner.add( "Number of cleaned crashed pointers: " + numberOfCleanedCrashPointers );
+        joiner.add( "Time spent: " + duration( durationMillis ) );
+        log.info( joiner.toString() );
     }
 }
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/index/SchemaIndexProvider.java b/community/kernel/src/main/java/org/neo4j/kernel/api/index/SchemaIndexProvider.java
@@ -21,7 +21,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Map;
 
 import org.neo4j.graphdb.ResourceIterator;
 import org.neo4j.helpers.collection.Iterators;
@@ -105,14 +104,16 @@ public void failedToOpenIndex( long indexId, IndexDescriptor indexDescriptor, St
             }
 
             @Override
-            public void recoveryCompleted( long indexId, IndexDescriptor indexDescriptor, Map<String,Object> data )
+            public void recoveryCleanupFinished( long indexId, IndexDescriptor indexDescriptor,
+                    long numberOfPagesVisited, long numberOfCleanedCrashPointers, long durationMillis )
             {   // no-op
             }
         }
 
         void failedToOpenIndex( long indexId, IndexDescriptor indexDescriptor, String action, Exception cause );
 
-        void recoveryCompleted( long indexId, IndexDescriptor indexDescriptor, Map<String,Object> data );
+        void recoveryCleanupFinished( long indexId, IndexDescriptor indexDescriptor,
+                long numberOfPagesVisited, long numberOfCleanedCrashPointers, long durationMillis );
     }
 
     public static final SchemaIndexProvider NO_INDEX_PROVIDER =

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/labelscan/LabelScanStore.java b/community/kernel/src/main/java/org/neo4j/kernel/api/labelscan/LabelScanStore.java
@@ -21,7 +21,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Map;
 
 import org.neo4j.graphdb.ResourceIterator;
 import org.neo4j.io.pagecache.IOLimiter;
@@ -72,7 +71,7 @@ public void rebuilt( long roughNodeCount )
             }
 
             @Override
-            public void recoveryCompleted( Map<String,Object> data )
+            public void recoveryCleanupFinished( long numberOfPagesVisited, long numberOfCleanedCrashPointers, long durationMillis )
             {   // empty
             }
         }
@@ -89,7 +88,7 @@ public void recoveryCompleted( Map<String,Object> data )
 
         void rebuilt( long roughNodeCount );
 
-        void recoveryCompleted( Map<String,Object> data );
+        void recoveryCleanupFinished( long numberOfPagesVisited, long numberOfCleanedCrashPointers, long durationMillis );
     }
 
     /**

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/labelscan/LoggingMonitor.java b/community/kernel/src/main/java/org/neo4j/kernel/api/labelscan/LoggingMonitor.java
@@ -19,12 +19,12 @@
  */
 package org.neo4j.kernel.api.labelscan;
 
-import java.util.Map;
+import java.util.StringJoiner;
 
 import org.neo4j.kernel.api.labelscan.LabelScanStore.Monitor;
 import org.neo4j.logging.Log;
 
-import static java.lang.String.format;
+import static org.neo4j.helpers.Format.duration;
 
 /**
  * Logs about important events about {@link LabelScanStore} {@link Monitor}.
@@ -69,10 +69,12 @@ public void rebuilt( long roughNodeCount )
     }
 
     @Override
-    public void recoveryCompleted( Map<String,Object> data )
+    public void recoveryCleanupFinished( long numberOfPagesVisited, long numberOfCleanedCrashPointers, long durationMillis )
     {
-        StringBuilder builder = new StringBuilder( "Scan store recovery completed:" );
-        data.forEach( ( key, value ) -> builder.append( format( " %s: %s", key, value ) ) );
-        log.info( builder.toString() );
+        StringJoiner joiner = new StringJoiner( ", ", "Scan store recovery cleanup job finished:", "" );
+        joiner.add( "Number of pages visited: " + numberOfPagesVisited );
+        joiner.add( "Number of cleaned crashed pointers: " + numberOfCleanedCrashPointers );
+        joiner.add( "Time spent: " + duration( durationMillis ) );
+        log.info( joiner.toString() );
     }
 }
diff --git a/...nity/kernel/src/main/java/org/neo4j/kernel/impl/index/labelscan/NativeLabelScanStore.java b/...nity/kernel/src/main/java/org/neo4j/kernel/impl/index/labelscan/NativeLabelScanStore.java
@@ -48,10 +48,8 @@
 import org.neo4j.kernel.monitoring.Monitors;
 import org.neo4j.storageengine.api.schema.LabelScanReader;
 
-import static org.neo4j.helpers.Format.duration;
 import static org.neo4j.helpers.collection.Iterators.asResourceIterator;
 import static org.neo4j.helpers.collection.Iterators.iterator;
-import static org.neo4j.helpers.collection.MapUtil.map;
 import static org.neo4j.kernel.impl.store.MetaDataStore.DEFAULT_NAME;
 
 /**
@@ -383,10 +381,7 @@ private GBPTree.Monitor treeMonitor()
             public void cleanupFinished( long numberOfPagesVisited, long numberOfCleanedCrashPointers,
                     long durationMillis )
             {
-                monitor.recoveryCompleted( map(
-                        "Number of pages visited", numberOfPagesVisited,
-                        "Number of cleaned crashed pointers", numberOfCleanedCrashPointers,
-                        "Time spent", duration( durationMillis ) ) );
+                monitor.recoveryCleanupFinished( numberOfPagesVisited, numberOfCleanedCrashPointers, durationMillis );
             }
         };
     }

diff --git a/...nity/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaNumberIndex.java b/...nity/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/NativeSchemaNumberIndex.java
@@ -34,8 +34,6 @@
 import org.neo4j.kernel.api.schema.index.IndexDescriptor;
 import org.neo4j.kernel.impl.index.GBPTreeFileUtil;
 
-import static org.neo4j.helpers.Format.duration;
-import static org.neo4j.helpers.collection.MapUtil.map;
 import static org.neo4j.index.internal.gbptree.GBPTree.NO_HEADER_READER;
 
 class NativeSchemaNumberIndex<KEY extends SchemaNumberKey, VALUE extends SchemaNumberValue>
@@ -77,10 +75,7 @@ private GBPTree.Monitor treeMonitor( )
             @Override
             public void cleanupFinished( long numberOfPagesVisited, long numberOfCleanedCrashPointers, long durationMillis )
             {
-                monitor.recoveryCompleted( indexId, descriptor, map(
-                        "Number of pages visited", numberOfPagesVisited,
-                        "Number of cleaned crashed pointers", numberOfCleanedCrashPointers,
-                        "Time spent", duration( durationMillis ) ) );
+                monitor.recoveryCleanupFinished( indexId, descriptor, numberOfPagesVisited, numberOfCleanedCrashPointers, durationMillis );
             }
         };
     }

diff --git a/community/neo4j/src/test/java/recovery/RecoveryCleanupIT.java b/community/neo4j/src/test/java/recovery/RecoveryCleanupIT.java
@@ -273,7 +273,7 @@ private class RecoveryBarrierMonitor extends LabelScanStore.Monitor.Adaptor
         }
 
         @Override
-        public void recoveryCompleted( Map<String,Object> data )
+        public void recoveryCleanupFinished( long numberOfPagesVisited, long numberOfCleanedCrashPointers, long durationMillis )
         {
             barrier.reached();
         }