Fix toString formatting

neo4j · Mar 9, 2018 · 66fab1e · 66fab1e
1 parent b6b411e
commit 66fab1e
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 29 deletions.
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/DateSchemaKey.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/DateSchemaKey.java
@@ -62,7 +62,7 @@ public int compareValueTo( DateSchemaKey other )
     @Override
     public String toString()
     {
-        return format( "value=%s,entityId=%d,epochDay=%s", asValue(), getEntityId(), epochDay );
+        return format( "value=%s,entityId=%d,epochDay=%d", asValue(), getEntityId(), epochDay );
     }
 
     @Override

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/DurationLayout.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/DurationLayout.java
@@ -19,8 +19,6 @@
  */
 package org.neo4j.kernel.impl.index.schema;
 
-import java.util.Comparator;
-
 import org.neo4j.index.internal.gbptree.Layout;
 import org.neo4j.io.pagecache.PageCursor;
 import org.neo4j.kernel.api.schema.index.IndexDescriptor;
@@ -35,13 +33,12 @@ public static Layout<DurationSchemaKey,NativeSchemaValue> of( IndexDescriptor de
         return descriptor.type() == IndexDescriptor.Type.UNIQUE ? DurationLayout.UNIQUE : DurationLayout.NON_UNIQUE;
     }
 
-    private static DurationLayout UNIQUE = new DurationLayout( "UTdu", 0, 1, ComparableNativeSchemaKey.UNIQUE() );
+    private static DurationLayout UNIQUE = new DurationLayout( "UTdu", 0, 1 );
-    private static DurationLayout NON_UNIQUE = new DurationLayout( "NTdu", 0, 1, ComparableNativeSchemaKey.NON_UNIQUE() );
+    private static DurationLayout NON_UNIQUE = new DurationLayout( "NTdu", 0, 1 );
 
-    private DurationLayout(
+    private DurationLayout( String layoutName, int majorVersion, int minorVersion )
-            String layoutName, int majorVersion, int minorVersion, Comparator<DurationSchemaKey> comparator )
     {
-        super( layoutName, majorVersion, minorVersion, comparator );
+        super( layoutName, majorVersion, minorVersion );
     }
 
     @Override

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/DurationSchemaKey.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/DurationSchemaKey.java
@@ -30,7 +30,7 @@
  * Durations are tricky, because exactly how long a duration is depends on the start date. We therefore sort them by
  * average total time in seconds, but keep the original months and days so we can reconstruct the value.
  */
-class DurationSchemaKey extends TemporalSchemaKey implements ComparableNativeSchemaKey<DurationSchemaKey>
+class DurationSchemaKey extends ComparableNativeSchemaKey<DurationSchemaKey>
 {
     /**
      * An average month is 30 days, 10 hours and 30 minutes.
@@ -59,19 +59,17 @@ public Value asValue()
     }
 
     @Override
-    public void initAsLowest()
+    public void initValueAsLowest()
     {
-        super.initAsLowest();
         totalAvgSeconds = Long.MIN_VALUE;
         nanosOfSecond = Integer.MIN_VALUE;
         months = Long.MIN_VALUE;
         days = Long.MIN_VALUE;
     }
 
     @Override
-    public void initAsHighest()
+    public void initValueAsHighest()
     {
-        super.initAsHighest();
         totalAvgSeconds = Long.MAX_VALUE;
         nanosOfSecond = Integer.MAX_VALUE;
         months = Long.MAX_VALUE;
@@ -101,7 +99,7 @@ public int compareValueTo( DurationSchemaKey other )
     public String toString()
     {
         return format( "value=%s,entityId=%d,totalAvgSeconds=%d,nanosOfSecond=%d,months=%d,days=%d",
-                asValue(), entityId, totalAvgSeconds, nanosOfSecond, months, days );
+                        asValue(), getEntityId(), totalAvgSeconds, nanosOfSecond, months, days );
     }
 
     @Override

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/LocalTimeSchemaKey.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/LocalTimeSchemaKey.java
@@ -62,7 +62,7 @@ public int compareValueTo( LocalTimeSchemaKey other )
     @Override
     public String toString()
     {
-        return format( "value=%s,entityId=%d,nanoOfDay=%s", asValue(), getEntityId(), nanoOfDay );
+        return format( "value=%s,entityId=%d,nanoOfDay=%d", asValue(), getEntityId(), nanoOfDay );
     }
 
     @Override

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/TemporalIndexAccessor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/TemporalIndexAccessor.java
@@ -258,7 +258,7 @@ public PartAccessor<?> newZonedTime() throws IOException
         }
 
         @Override
-        public PartAccessor<?> newDuration()
+        public PartAccessor<?> newDuration() throws IOException
         {
             return createPartAccessor( temporalIndexFiles.duration() );
         }

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/ZonedTimeLayout.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/ZonedTimeLayout.java
@@ -19,8 +19,6 @@
  */
 package org.neo4j.kernel.impl.index.schema;
 
-import java.util.Comparator;
-
 import org.neo4j.index.internal.gbptree.Layout;
 import org.neo4j.io.pagecache.PageCursor;
 import org.neo4j.kernel.api.schema.index.IndexDescriptor;
@@ -35,13 +33,12 @@ public static Layout<ZonedTimeSchemaKey,NativeSchemaValue> of( IndexDescriptor d
         return descriptor.type() == IndexDescriptor.Type.UNIQUE ? ZonedTimeLayout.UNIQUE : ZonedTimeLayout.NON_UNIQUE;
     }
 
-    private static final ZonedTimeLayout UNIQUE = new ZonedTimeLayout( "UTzt", 0, 1, ComparableNativeSchemaKey.UNIQUE() );
+    private static final ZonedTimeLayout UNIQUE = new ZonedTimeLayout( "UTzt", 0, 1 );
-    private static final ZonedTimeLayout NON_UNIQUE = new ZonedTimeLayout( "NTzt", 0, 1, ComparableNativeSchemaKey.NON_UNIQUE() );
+    private static final ZonedTimeLayout NON_UNIQUE = new ZonedTimeLayout( "NTzt", 0, 1 );
 
-    private ZonedTimeLayout(
+    private ZonedTimeLayout( String layoutName, int majorVersion, int minorVersion )
-            String layoutName, int majorVersion, int minorVersion, Comparator<ZonedTimeSchemaKey> comparator )
     {
-        super( layoutName, majorVersion, minorVersion, comparator );
+        super( layoutName, majorVersion, minorVersion );
     }
 
     @Override

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/ZonedTimeSchemaKey.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/ZonedTimeSchemaKey.java
@@ -31,7 +31,7 @@
  *
  * With these keys the TimeValues are sorted by UTC time of day, and then by time zone.
  */
-class ZonedTimeSchemaKey extends TemporalSchemaKey implements ComparableNativeSchemaKey<ZonedTimeSchemaKey>
+class ZonedTimeSchemaKey extends ComparableNativeSchemaKey<ZonedTimeSchemaKey>
 {
     static final int SIZE =
             Long.BYTES +    /* nanosOfDayUTC */
@@ -48,17 +48,15 @@ public Value asValue()
     }
 
     @Override
-    public void initAsLowest()
+    public void initValueAsLowest()
     {
-        super.initAsLowest();
         nanosOfDayUTC = Long.MIN_VALUE;
         zoneOffsetSeconds = Integer.MIN_VALUE;
     }
 
     @Override
-    public void initAsHighest()
+    public void initValueAsHighest()
     {
-        super.initAsHighest();
         nanosOfDayUTC = Long.MAX_VALUE;
         zoneOffsetSeconds = Integer.MAX_VALUE;
     }
@@ -78,7 +76,7 @@ public int compareValueTo( ZonedTimeSchemaKey other )
     public String toString()
     {
         return format( "value=%s,entityId=%d,nanosOfDayUTC=%d,zoneOffsetSeconds=%d",
-                        asValue(), entityId, nanosOfDayUTC, zoneOffsetSeconds );
+                        asValue(), getEntityId(), nanosOfDayUTC, zoneOffsetSeconds );
     }
 
     @Override