diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DateLayoutTestUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DateLayoutTestUtil.java index 168df01d403c..bb1f303f2e4b 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DateLayoutTestUtil.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DateLayoutTestUtil.java @@ -70,9 +70,9 @@ IndexEntryUpdate[] someUpdates() } @Override - IndexQuery rangeQuery( Object from, boolean fromInclusive, Object to, boolean toInclusive ) + IndexQuery rangeQuery( Value from, boolean fromInclusive, Value to, boolean toInclusive ) { - return IndexQuery.range( 0, (DateValue) from, fromInclusive, (DateValue) to, toInclusive ); + return IndexQuery.range( 0, from, fromInclusive, to, toInclusive ); } @Override diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DateTimeLayoutTestUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DateTimeLayoutTestUtil.java index dd8baf0eb207..a07e358ef079 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DateTimeLayoutTestUtil.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DateTimeLayoutTestUtil.java @@ -74,9 +74,9 @@ IndexEntryUpdate[] someUpdates() } @Override - IndexQuery rangeQuery( Object from, boolean fromInclusive, Object to, boolean toInclusive ) + IndexQuery rangeQuery( Value from, boolean fromInclusive, Value to, boolean toInclusive ) { - return IndexQuery.range( 0, (DateTimeValue) from, fromInclusive, (DateTimeValue) to, toInclusive ); + return IndexQuery.range( 0, from, fromInclusive, to, toInclusive ); } @Override diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DurationLayoutTestUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DurationLayoutTestUtil.java index b52409792df7..f39a1b0a9fff 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DurationLayoutTestUtil.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DurationLayoutTestUtil.java @@ -38,8 +38,8 @@ public class DurationLayoutTestUtil extends LayoutTestUtil[] someUpdates() } @Override - IndexQuery rangeQuery( Object from, boolean fromInclusive, Object to, boolean toInclusive ) + IndexQuery rangeQuery( Value from, boolean fromInclusive, Value to, boolean toInclusive ) { - return IndexQuery.range( 0, (DurationValue) from, fromInclusive, (DurationValue) to, toInclusive ); + return IndexQuery.range( 0, from, fromInclusive, to, toInclusive ); } @Override diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DurationUniqueSchemaIndexAccessorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DurationUniqueSchemaIndexAccessorTest.java index 11e6becba5b1..5b0e0711bb4d 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DurationUniqueSchemaIndexAccessorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DurationUniqueSchemaIndexAccessorTest.java @@ -32,7 +32,7 @@ public class DurationUniqueSchemaIndexAccessorTest extends NativeSchemaIndexAcce @Override NativeSchemaIndexAccessor makeAccessorWithSamplingConfig( IndexSamplingConfig samplingConfig ) throws IOException { - TemporalIndexFiles.FileLayout fileLayout = new TemporalIndexFiles.FileLayout<>( getIndexFile(), layout, ValueGroup.LOCAL_DATE_TIME ); + TemporalIndexFiles.FileLayout fileLayout = new TemporalIndexFiles.FileLayout<>( getIndexFile(), layout, ValueGroup.DURATION ); return new TemporalIndexAccessor.PartAccessor<>( pageCache, fs, fileLayout, IMMEDIATE, monitor, schemaIndexDescriptor, indexId, samplingConfig ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LayoutTestUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LayoutTestUtil.java index 9998f8780bec..d9d1efe03430 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LayoutTestUtil.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LayoutTestUtil.java @@ -59,7 +59,7 @@ protected double fractionDuplicates() return 0.1; } - abstract IndexQuery rangeQuery( Object from, boolean fromInclusive, Object to, boolean toInclusive ); + abstract IndexQuery rangeQuery( Value from, boolean fromInclusive, Value to, boolean toInclusive ); abstract int compareIndexedPropertyValue( KEY key1, KEY key2 ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LocalDateTimeLayoutTestUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LocalDateTimeLayoutTestUtil.java index 9c38fd543509..52a97adeffe7 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LocalDateTimeLayoutTestUtil.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LocalDateTimeLayoutTestUtil.java @@ -71,9 +71,9 @@ IndexEntryUpdate[] someUpdates() } @Override - IndexQuery rangeQuery( Object from, boolean fromInclusive, Object to, boolean toInclusive ) + IndexQuery rangeQuery( Value from, boolean fromInclusive, Value to, boolean toInclusive ) { - return IndexQuery.range( 0, (LocalDateTimeValue) from, fromInclusive, (LocalDateTimeValue) to, toInclusive ); + return IndexQuery.range( 0, from, fromInclusive, to, toInclusive ); } @Override diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LocalTimeLayoutTestUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LocalTimeLayoutTestUtil.java index 079fe716beab..beacfa885e9c 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LocalTimeLayoutTestUtil.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LocalTimeLayoutTestUtil.java @@ -72,9 +72,9 @@ IndexEntryUpdate[] someUpdates() } @Override - IndexQuery rangeQuery( Object from, boolean fromInclusive, Object to, boolean toInclusive ) + IndexQuery rangeQuery( Value from, boolean fromInclusive, Value to, boolean toInclusive ) { - return IndexQuery.range( 0, (LocalTimeValue) from, fromInclusive, (LocalTimeValue) to, toInclusive ); + return IndexQuery.range( 0, from, fromInclusive, to, toInclusive ); } @Override diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexAccessorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexAccessorTest.java index 8feac94ba7a5..f535391fb99b 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexAccessorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeSchemaIndexAccessorTest.java @@ -697,7 +697,7 @@ public void shouldNotSeeFilteredEntries() throws Exception // when NodeValueIterator iter = new NodeValueIterator(); - IndexQuery.ExactPredicate filter = IndexQuery.exact( 0, updates[1].values()[0].asObjectCopy() ); + IndexQuery.ExactPredicate filter = IndexQuery.exact( 0, valueOf( updates[1]) ); IndexQuery rangeQuery = layoutUtil.rangeQuery( valueOf( updates[0] ), true, valueOf( updates[2] ), true ); IndexProgressor.NodeValueClient filterClient = filterClient( iter, filter ); reader.query( filterClient, IndexOrder.NONE, rangeQuery ); @@ -728,7 +728,7 @@ private static Predicate> skipExisting( }; } - private Object valueOf( IndexEntryUpdate update ) + private Value valueOf( IndexEntryUpdate update ) { return update.values()[0]; } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NumberLayoutTestUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NumberLayoutTestUtil.java index c0fe47879838..54538a3f7b41 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NumberLayoutTestUtil.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NumberLayoutTestUtil.java @@ -62,9 +62,9 @@ abstract class NumberLayoutTestUtil extends LayoutTestUtil[] someUpdates() { return someUpdatesWithDuplicateValues(); } - - @Override - protected double fractionDuplicates() - { - return 0.1; - } } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/SpatialLayoutTestUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/SpatialLayoutTestUtil.java index 0f0de9f674ca..1fc0ace148d0 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/SpatialLayoutTestUtil.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/SpatialLayoutTestUtil.java @@ -85,9 +85,9 @@ IndexEntryUpdate[] someUpdates() } @Override - IndexQuery rangeQuery( Object from, boolean fromInclusive, Object to, boolean toInclusive ) + IndexQuery rangeQuery( Value from, boolean fromInclusive, Value to, boolean toInclusive ) { - return IndexQuery.range( 0, (PointValue) from , fromInclusive, (PointValue) to, toInclusive ); + return IndexQuery.range( 0, from , fromInclusive, to, toInclusive ); } @Override diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/SpatialNonUniqueSchemaIndexPopulatorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/SpatialNonUniqueSchemaIndexPopulatorTest.java index 15c7dbd58b73..e7c628d44270 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/SpatialNonUniqueSchemaIndexPopulatorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/SpatialNonUniqueSchemaIndexPopulatorTest.java @@ -39,7 +39,7 @@ public class SpatialNonUniqueSchemaIndexPopulatorTest extends NativeNonUniqueSch @Override NativeSchemaIndexPopulator createPopulator( IndexSamplingConfig samplingConfig ) { - fileLayout = new SpatialIndexFiles.SpatialFileLayout( CoordinateReferenceSystem.WGS84, settings, super.getIndexFile() ); + fileLayout = new SpatialIndexFiles.SpatialFileLayout( crs, settings, super.getIndexFile() ); return new SpatialIndexPopulator.PartPopulator( pageCache, fs, fileLayout, monitor, schemaIndexDescriptor, indexId, samplingConfig, new StandardConfiguration() ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/SpatialUniqueSchemaIndexPopulatorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/SpatialUniqueSchemaIndexPopulatorTest.java index a78511567fab..6e55a61fff9d 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/SpatialUniqueSchemaIndexPopulatorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/SpatialUniqueSchemaIndexPopulatorTest.java @@ -39,7 +39,7 @@ public class SpatialUniqueSchemaIndexPopulatorTest extends NativeUniqueSchemaInd @Override NativeSchemaIndexPopulator createPopulator( IndexSamplingConfig samplingConfig ) { - fileLayout = new SpatialIndexFiles.SpatialFileLayout( CoordinateReferenceSystem.WGS84, settings, super.getIndexFile() ); + fileLayout = new SpatialIndexFiles.SpatialFileLayout( crs, settings, super.getIndexFile() ); return new SpatialIndexPopulator.PartPopulator( pageCache, fs, fileLayout, monitor, schemaIndexDescriptor, indexId, samplingConfig, new StandardConfiguration() ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/StringLayoutTestUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/StringLayoutTestUtil.java index 6e553813afdb..f0757bc0553f 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/StringLayoutTestUtil.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/StringLayoutTestUtil.java @@ -45,9 +45,9 @@ abstract class StringLayoutTestUtil extends LayoutTestUtil[] someUpdates() { return someUpdatesWithDuplicateValues(); } - - @Override - protected double fractionDuplicates() - { - return 0.1; - } } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/StringUniqueLayoutTestUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/StringUniqueLayoutTestUtil.java index 600dd825589e..773f13b7f41a 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/StringUniqueLayoutTestUtil.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/StringUniqueLayoutTestUtil.java @@ -46,6 +46,6 @@ IndexEntryUpdate[] someUpdates() @Override protected double fractionDuplicates() { - return 0; + return 0.0; } } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/TimeLayoutTestUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/TimeLayoutTestUtil.java index 134dad98eecc..13b4fa7125a9 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/TimeLayoutTestUtil.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/TimeLayoutTestUtil.java @@ -75,9 +75,9 @@ IndexEntryUpdate[] someUpdates() } @Override - IndexQuery rangeQuery( Object from, boolean fromInclusive, Object to, boolean toInclusive ) + IndexQuery rangeQuery( Value from, boolean fromInclusive, Value to, boolean toInclusive ) { - return IndexQuery.range( 0, (TimeValue) from, fromInclusive, (TimeValue) to, toInclusive ); + return IndexQuery.range( 0, from, fromInclusive, to, toInclusive ); } @Override diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/UniqueLayoutTestUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/UniqueLayoutTestUtil.java index e030dcccdc01..a480bfffb49d 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/UniqueLayoutTestUtil.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/UniqueLayoutTestUtil.java @@ -53,7 +53,7 @@ IndexEntryUpdate[] someUpdates() } @Override - IndexQuery rangeQuery( Object from, boolean fromInclusive, Object to, boolean toInclusive ) + IndexQuery rangeQuery( Value from, boolean fromInclusive, Value to, boolean toInclusive ) { return delegate.rangeQuery( from, fromInclusive, to, toInclusive ); } @@ -85,6 +85,6 @@ IndexEntryUpdate[] someUpdatesWithDuplicateValues() @Override protected double fractionDuplicates() { - return 0; + return 0.0; } } diff --git a/community/spatial-index/src/main/java/org/neo4j/gis/spatial/index/Envelope.java b/community/spatial-index/src/main/java/org/neo4j/gis/spatial/index/Envelope.java index 02db40a5f48b..8ae527fcb9e6 100644 --- a/community/spatial-index/src/main/java/org/neo4j/gis/spatial/index/Envelope.java +++ b/community/spatial-index/src/main/java/org/neo4j/gis/spatial/index/Envelope.java @@ -23,7 +23,7 @@ public class Envelope { - private static final double MAXIMAL_ENVELOPE_SIDE_RATIO = 1000_000_000; + static final double MAXIMAL_ENVELOPE_SIDE_RATIO = 1000_000_000; protected final double[] min; protected final double[] max; diff --git a/community/spatial-index/src/test/java/org/neo4j/gis/spatial/index/EnvelopeTest.java b/community/spatial-index/src/test/java/org/neo4j/gis/spatial/index/EnvelopeTest.java index 993c515792fe..aee823102859 100644 --- a/community/spatial-index/src/test/java/org/neo4j/gis/spatial/index/EnvelopeTest.java +++ b/community/spatial-index/src/test/java/org/neo4j/gis/spatial/index/EnvelopeTest.java @@ -121,9 +121,11 @@ public void testWithSideRatioNotTooSmall2D() assertArrayEquals( expectedTo, envelope.max, 0 ); // Expected to change - to = new double[] {100, 0.1}; + final double bigValue = 100; + final double smallValue = 0.000000000000000001; + to = new double[] {bigValue, smallValue}; Envelope envelope2 = new Envelope( from, to ).withSideRatioNotTooSmall(); - double[] expectedTo2 = new double[] {100, 1}; + double[] expectedTo2 = new double[] {bigValue, bigValue / Envelope.MAXIMAL_ENVELOPE_SIDE_RATIO}; assertArrayEquals( expectedFrom, envelope2.min , 0); assertArrayEquals( expectedTo2, envelope2.max, 0.00001 ); } @@ -143,9 +145,11 @@ public void testWithSideRatioNotTooSmall4D() assertArrayEquals( expectedTo, envelope.max, 0 ); // Expected to change - to = new double[] {100, 0.1, 12, 0.01}; + final double bigValue = 107; + final double smallValue = 0.00000000000000000123; + to = new double[] {bigValue, smallValue, 12, smallValue * 0.1}; Envelope envelope2 = new Envelope( from, to ).withSideRatioNotTooSmall(); - double[] expectedTo2 = new double[] {100, 1, 12, 1}; + double[] expectedTo2 = new double[] {bigValue, bigValue / Envelope.MAXIMAL_ENVELOPE_SIDE_RATIO, 12, bigValue / Envelope.MAXIMAL_ENVELOPE_SIDE_RATIO}; assertArrayEquals( expectedFrom, envelope2.min , 0); assertArrayEquals( expectedTo2, envelope2.max, 0.00001 ); }