Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Handle range querys for line with area equal 0
Fixed SpatialSchemaIndexAccessorTest
- Loading branch information
1 parent
c079eec
commit 4df248f
Showing
7 changed files
with
165 additions
and
69 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
80 changes: 80 additions & 0 deletions
80
...rnel/src/test/java/org/neo4j/kernel/impl/index/schema/SpatialSchemaIndexAccessorTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Original file line | Diff line number | Diff line change |
|---|---|---|---|
| @@ -0,0 +1,80 @@ | |||
| /* | |||
| * Copyright (c) 2002-2018 "Neo Technology," | |||
| * Network Engine for Objects in Lund AB [http://neotechnology.com] | |||
| * | |||
| * This file is part of Neo4j. | |||
| * | |||
| * Neo4j is free software: you can redistribute it and/or modify | |||
| * it under the terms of the GNU General Public License as published by | |||
| * the Free Software Foundation, either version 3 of the License, or | |||
| * (at your option) any later version. | |||
| * | |||
| * This program is distributed in the hope that it will be useful, | |||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | |||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
| * GNU General Public License for more details. | |||
| * | |||
| * You should have received a copy of the GNU General Public License | |||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| */ | |||
| package org.neo4j.kernel.impl.index.schema; | |||
|
|
|||
| import java.io.File; | |||
| import java.io.IOException; | |||
|
|
|||
| import org.neo4j.gis.spatial.index.curves.StandardConfiguration; | |||
| import org.neo4j.kernel.configuration.Config; | |||
| import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; | |||
| import org.neo4j.kernel.impl.index.schema.config.SpaceFillingCurveSettings; | |||
| import org.neo4j.kernel.impl.index.schema.config.SpaceFillingCurveSettingsFactory; | |||
| import org.neo4j.values.storable.CoordinateReferenceSystem; | |||
|
|
|||
| import static org.neo4j.index.internal.gbptree.RecoveryCleanupWorkCollector.IMMEDIATE; | |||
|
|
|||
| abstract class SpatialSchemaIndexAccessorTest extends NativeSchemaIndexAccessorTest<SpatialSchemaKey,NativeSchemaValue> | |||
| { | |||
| static final CoordinateReferenceSystem crs = CoordinateReferenceSystem.WGS84; | |||
| static final SpaceFillingCurveSettings settings = new SpaceFillingCurveSettingsFactory( Config.defaults() ).settingsFor( crs ); | |||
|
|
|||
| SpatialIndexFiles.SpatialFileLayout fileLayout; | |||
|
|
|||
| @Override | |||
| NativeSchemaIndexAccessor<SpatialSchemaKey,NativeSchemaValue> makeAccessorWithSamplingConfig( IndexSamplingConfig samplingConfig ) throws IOException | |||
| { | |||
| fileLayout = new SpatialIndexFiles.SpatialFileLayout( CoordinateReferenceSystem.WGS84, settings, super.getIndexFile() ); | |||
| SpatialIndexFiles.SpatialFileLayout fileLayout = | |||
| new SpatialIndexFiles.SpatialFileLayout( CoordinateReferenceSystem.WGS84, settings, super.getIndexFile() ); | |||
| return new SpatialIndexAccessor.PartAccessor( pageCache, fs, fileLayout, IMMEDIATE, monitor, schemaIndexDescriptor, indexId, samplingConfig, | |||
| new StandardConfiguration() ); | |||
| } | |||
|
|
|||
| @Override | |||
| public File getIndexFile() | |||
| { | |||
| return fileLayout.indexFile; | |||
| } | |||
|
|
|||
| @Override | |||
| public void shouldNotSeeFilteredEntries() | |||
| { | |||
| // This test doesn't make sense for spatial, since it needs a proper store for the values | |||
| } | |||
|
|
|||
| @Override | |||
| public void shouldReturnMatchingEntriesForRangePredicateWithExclusiveStartAndExclusiveEnd() | |||
| { | |||
| // Exclusive is handled via a postfilter for spatial | |||
| } | |||
|
|
|||
| @Override | |||
| public void shouldReturnMatchingEntriesForRangePredicateWithExclusiveStartAndInclusiveEnd() | |||
| { | |||
| // Exclusive is handled via a postfilter for spatial | |||
| } | |||
|
|
|||
| @Override | |||
| public void shouldReturnMatchingEntriesForRangePredicateWithInclusiveStartAndExclusiveEnd() | |||
| { | |||
| // Exclusive is handled via a postfilter for spatial | |||
| } | |||
| } | |||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
54 changes: 54 additions & 0 deletions
54
.../src/test/java/org/neo4j/gis/spatial/index/curves/SpaceFillingCurveConfigurationTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Original file line | Diff line number | Diff line change |
|---|---|---|---|
| @@ -0,0 +1,54 @@ | |||
| /* | |||
| * Copyright (c) 2002-2018 "Neo Technology," | |||
| * Network Engine for Objects in Lund AB [http://neotechnology.com] | |||
| * | |||
| * This file is part of Neo4j. | |||
| * | |||
| * Neo4j is free software: you can redistribute it and/or modify | |||
| * it under the terms of the GNU General Public License as published by | |||
| * the Free Software Foundation, either version 3 of the License, or | |||
| * (at your option) any later version. | |||
| * | |||
| * This program is distributed in the hope that it will be useful, | |||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | |||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
| * GNU General Public License for more details. | |||
| * | |||
| * You should have received a copy of the GNU General Public License | |||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| */ | |||
| package org.neo4j.gis.spatial.index.curves; | |||
|
|
|||
| import org.junit.Test; | |||
|
|
|||
| import org.neo4j.gis.spatial.index.Envelope; | |||
|
|
|||
| import static org.hamcrest.Matchers.equalTo; | |||
| import static org.junit.Assert.assertThat; | |||
|
|
|||
| public class SpaceFillingCurveConfigurationTest | |||
| { | |||
| @Test | |||
| public void shouldHandleMaxDepthWithEmptySearchArea() | |||
| { | |||
| SpaceFillingCurveConfiguration standardConfiguration = new StandardConfiguration(); | |||
| SpaceFillingCurveConfiguration partialOverlapConf = new PartialOverlapConfiguration(); | |||
| // search area is a line, thus having a search area = 0 | |||
| Envelope search = new Envelope( -180, -180, -90, 90 ); | |||
| Envelope range = new Envelope( -180, 180, -90, 90 ); | |||
| int maxLevel = 30; | |||
| assertThat( partialOverlapConf.maxDepth( search, range, 2, maxLevel ), equalTo( maxLevel ) ); | |||
| assertThat( standardConfiguration.maxDepth( search, range, 2, maxLevel ), equalTo( maxLevel ) ); | |||
| } | |||
|
|
|||
| @Test | |||
| public void shouldReturnMaxLevelForSmallSearchArea() | |||
| { | |||
| SpaceFillingCurveConfiguration standardConfiguration = new StandardConfiguration(); | |||
| // This isn't a valid envelope, just used to get a large but still finite searchRatio | |||
| Envelope search = new Envelope( 0, Double.MIN_VALUE, 0, 100000000000000000000.0 ); | |||
| Envelope range = new Envelope( -180, 180, -90, 90 ); | |||
| int maxLevel = 30; | |||
| assertThat( standardConfiguration.maxDepth( search, range, 2, maxLevel ), equalTo( maxLevel ) ); | |||
| } | |||
| } | |||