Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/0.25-neo4j-3.0B' into 0.25-neo4j…
…-3.1
- Loading branch information
Showing
18 changed files
with
2,878 additions
and
246 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
41 changes: 41 additions & 0 deletions
41
src/main/java/org/neo4j/gis/spatial/index/ExplicitIndexBackedMonitor.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 | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| /* | ||
| * Copyright (c) 2010-2017 "Neo Technology," | ||
| * Network Engine for Objects in Lund AB [http://neotechnology.com] | ||
| * | ||
| * This file is part of Neo4j Spatial. | ||
| * | ||
| * 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; | ||
|
|
||
| public class ExplicitIndexBackedMonitor { | ||
| long hits = 0L; | ||
| long misses = 0; | ||
|
|
||
| public void hit() { | ||
| hits++; | ||
| } | ||
|
|
||
| public void miss() { | ||
| misses++; | ||
| } | ||
|
|
||
| public long getHits() { | ||
| return hits; | ||
| } | ||
|
|
||
| public long getMisses() { | ||
| return misses; | ||
| } | ||
| } |
222 changes: 222 additions & 0 deletions
222
src/main/java/org/neo4j/gis/spatial/index/ExplicitIndexBackedPointIndex.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 | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,222 @@ | ||
| /* | ||
| * Copyright (c) 2010-2017 "Neo Technology," | ||
| * Network Engine for Objects in Lund AB [http://neotechnology.com] | ||
| * | ||
| * This file is part of Neo4j Spatial. | ||
| * | ||
| * 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; | ||
|
|
||
| import org.neo4j.gis.spatial.Layer; | ||
| import org.neo4j.gis.spatial.filter.SearchRecords; | ||
| import org.neo4j.gis.spatial.rtree.Envelope; | ||
| import org.neo4j.gis.spatial.rtree.EnvelopeDecoder; | ||
| import org.neo4j.gis.spatial.rtree.Listener; | ||
| import org.neo4j.gis.spatial.rtree.TreeMonitor; | ||
| import org.neo4j.gis.spatial.rtree.filter.SearchFilter; | ||
| import org.neo4j.gis.spatial.rtree.filter.SearchResults; | ||
| import org.neo4j.graphdb.GraphDatabaseService; | ||
| import org.neo4j.graphdb.Node; | ||
| import org.neo4j.graphdb.NotFoundException; | ||
| import org.neo4j.graphdb.Transaction; | ||
| import org.neo4j.graphdb.index.Index; | ||
| import org.neo4j.graphdb.index.IndexHits; | ||
| import org.neo4j.helpers.collection.Iterables; | ||
|
|
||
| import java.util.Iterator; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.NoSuchElementException; | ||
|
|
||
| public abstract class ExplicitIndexBackedPointIndex<E> implements LayerIndexReader, SpatialIndexWriter { | ||
|
|
||
| protected Layer layer; | ||
| private Index<Node> index; | ||
| private GraphDatabaseService graph; | ||
| private ExplicitIndexBackedMonitor monitor = new ExplicitIndexBackedMonitor(); | ||
|
|
||
| protected abstract String indexTypeName(); | ||
|
|
||
| @Override | ||
| public void init(Layer layer) { | ||
| this.layer = layer; | ||
| String indexName = "_Spatial_" + indexTypeName() + "_Index_" + layer.getName(); | ||
| graph = layer.getSpatialDatabase().getDatabase(); | ||
| try (Transaction tx = graph.beginTx()) { | ||
| index = graph.index().forNodes(indexName); | ||
| tx.success(); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public Layer getLayer() { | ||
| return layer; | ||
| } | ||
|
|
||
| @Override | ||
| public SearchRecords search(SearchFilter filter) { | ||
| return new SearchRecords(layer, searchIndex(filter)); | ||
| } | ||
|
|
||
| @Override | ||
| public void add(Node geomNode) { | ||
| index.add(geomNode, indexTypeName(), getIndexValueFor(geomNode)); | ||
| } | ||
|
|
||
| protected abstract E getIndexValueFor(Node geomNode); | ||
|
|
||
| @Override | ||
| public void add(List<Node> geomNodes) { | ||
| for (Node node : geomNodes) { | ||
| add(node); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void remove(long geomNodeId, boolean deleteGeomNode, boolean throwExceptionIfNotFound) { | ||
| try (Transaction tx = graph.beginTx()) { | ||
| try { | ||
| Node geomNode = graph.getNodeById(geomNodeId); | ||
| if (geomNode != null) { | ||
| index.remove(geomNode); | ||
| if (deleteGeomNode) { | ||
| geomNode.delete(); | ||
| } | ||
| } | ||
| } catch (NotFoundException nfe) { | ||
| if (throwExceptionIfNotFound) { | ||
| throw nfe; | ||
| } | ||
| } | ||
| tx.success(); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void removeAll(boolean deleteGeomNodes, Listener monitor) { | ||
| try (Transaction tx = graph.beginTx()) { | ||
| if(deleteGeomNodes) { | ||
| Iterator<Node> iter = getAllIndexedNodes().iterator(); | ||
|
|
||
| while(iter.hasNext()) { | ||
| Node node = iter.next(); | ||
| remove(node.getId(), true, true); | ||
| } | ||
| } | ||
| index.delete(); | ||
| tx.success(); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void clear(Listener monitor) { | ||
| removeAll(false, monitor); | ||
| } | ||
|
|
||
| @Override | ||
| public EnvelopeDecoder getEnvelopeDecoder() { | ||
| return layer.getGeometryEncoder(); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isEmpty() { | ||
| return true; | ||
| } | ||
|
|
||
| @Override | ||
| public int count() { | ||
| return 0; | ||
| } | ||
|
|
||
| @Override | ||
| public Envelope getBoundingBox() { | ||
| return null; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isNodeIndexed(Long nodeId) { | ||
| return false; | ||
| } | ||
|
|
||
| @Override | ||
| public Iterable<Node> getAllIndexedNodes() { | ||
| return index.query(indexTypeName(), "*"); | ||
| } | ||
|
|
||
| @Override | ||
| public SearchResults searchIndex(SearchFilter filter) { | ||
| IndexHits<Node> indexHits = index.query(indexTypeName(), queryStringFor(filter)); | ||
| return new SearchResults(() -> new FilteredIndexIterator(indexHits, filter)); | ||
| } | ||
|
|
||
| private class FilteredIndexIterator implements Iterator<Node> { | ||
| private Iterator<Node> inner; | ||
| private SearchFilter filter; | ||
| private Node next = null; | ||
|
|
||
| private FilteredIndexIterator(Iterator<Node> inner, SearchFilter filter) { | ||
| this.inner = inner; | ||
| this.filter = filter; | ||
| prefetch(); | ||
| } | ||
|
|
||
| private void prefetch() { | ||
| next = null; | ||
| while (inner.hasNext()) { | ||
| Node node = inner.next(); | ||
| if (filter.geometryMatches(node)) { | ||
| next = node; | ||
| monitor.hit(); | ||
| break; | ||
| } else { | ||
| monitor.miss(); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public boolean hasNext() { | ||
| return next != null; | ||
| } | ||
|
|
||
| @Override | ||
| public Node next() { | ||
| Node node = next; | ||
| if (node == null) { | ||
| throw new NoSuchElementException(); // GeoPipes relies on this behaviour instead of hasNext() | ||
| } else { | ||
| prefetch(); | ||
| return node; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| protected abstract String queryStringFor(SearchFilter filter); | ||
|
|
||
| @Override | ||
| public void addMonitor(TreeMonitor monitor) { | ||
|
|
||
| } | ||
|
|
||
| public ExplicitIndexBackedMonitor getMonitor() { | ||
| return this.monitor; | ||
| } | ||
|
|
||
| @Override | ||
| public void configure(Map<String, Object> config) { | ||
|
|
||
| } | ||
|
|
||
| } |
Oops, something went wrong.