v1.3.0

Author: codingmiao

README.md

@@ -7,7 +7,8 @@ a spatial index for neo4j 4.x.
 
 create a spatial index
 ~~~java
-RTreeIndex rTreeIndex = RTreeIndexManager.createIndex(db, "index1", "geometry", 64);
+//5个参数依次是:  neo4j的GraphDatabaseService实例    索引名(唯一) 空间属性名   rtree最大子节点数 最大缓存geometry对象数
+RTreeIndex rTreeIndex = RTreeIndexManager.createIndex(db, "index1", "geometry", 64, 1024);
 ~~~
 
 
@@ -64,7 +65,7 @@ try (Transaction tx = db.beginTx()) {
 
 
 ## install
-The latest version is `1.2.3`
+The latest version is `1.3.0`
 
 maven import in your project
 ```

README_zh.md

@@ -7,7 +7,8 @@
 
 新建空间索引
 ~~~java
-RTreeIndex rTreeIndex = RTreeIndexManager.createIndex(db, "index1", "geometry", 64);
+//5个参数依次是:  neo4j的GraphDatabaseService实例    索引名(唯一) 空间属性名   rtree最大子节点数 最大缓存geometry对象数
+RTreeIndex rTreeIndex = RTreeIndexManager.createIndex(db, "index1", "geometry", 64, 1024);
 ~~~
 
 
@@ -64,7 +65,7 @@ try (Transaction tx = db.beginTx()) {
 
 
 ## install
-The latest version is `1.2.3`
+The latest version is `1.3.0`
 
 maven import in your project
 ```

pom.xml

@@ -12,7 +12,7 @@
     </properties>
     <groupId>org.wowtools</groupId>
     <artifactId>neo4j-rtree</artifactId>
-    <version>1.2.3</version>
+    <version>1.3.0</version>
     <name>neo4j-rtree</name>
 
     <description>a spatial index for neo4j 4.x.</description>
@@ -61,7 +61,6 @@
             <groupId>org.wowtools</groupId>
             <artifactId>catframe-common</artifactId>
             <version>1.5</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

src/main/java/org/wowtools/neo4j/rtree/RTreeIndexManager.java

@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -43,34 +43,36 @@ public class RTreeIndexManager {
      * @param indexName         索引名(唯一)
      * @param geometryFieldName node中的geometry字段名
      * @param maxNodeReferences 每个树节点上最多挂几个节点
+     * @param geometryCacheSize geometry缓存数量，由于对外wkb缓存转到堆内并转geometry比较耗时，故这里加了一个lru的缓存以直接获取geometry
      * @return RTreeIndex
      */
-    public static synchronized RTreeIndex createIndex(GraphDatabaseService database, String indexName, String geometryFieldName, int maxNodeReferences) {
+    public static synchronized RTreeIndex createIndex(GraphDatabaseService database, String indexName, String geometryFieldName, int maxNodeReferences, int geometryCacheSize) {
         //判断索引名是否唯一
         try (Transaction tx = database.beginTx()) {
             tx.findNodes(Constant.RtreeLabel.ReferenceNode, Constant.RtreeProperty.indexName, indexName).forEachRemaining((node) -> {
                 throw new RuntimeException("index name(" + indexName + ") has been taken");
             });
         }
-        return new RTreeIndex(indexName, geometryFieldName, database, new MyEnvelopeDecoder(), maxNodeReferences, true);
+        return new RTreeIndex(indexName, geometryFieldName, database, new MyEnvelopeDecoder(), maxNodeReferences, geometryCacheSize, true);
     }
 
     /**
      * 获取索引
      *
-     * @param database  db
-     * @param indexName 索引名
+     * @param database          db
+     * @param indexName         索引名
+     * @param geometryCacheSize geometry缓存数量，由于对外wkb缓存转到堆内并转geometry比较耗时，故这里加了一个lru的缓存以直接获取geometry，可以和构造索引时不一致
      * @return RTreeIndex
      */
-    public static synchronized RTreeIndex getIndex(GraphDatabaseService database, String indexName) {
+    public static synchronized RTreeIndex getIndex(GraphDatabaseService database, String indexName, int geometryCacheSize) {
         try (Transaction tx = database.beginTx()) {
             Node rootNode = tx.findNode(Constant.RtreeLabel.ReferenceNode, Constant.RtreeProperty.indexName, indexName);
             if (null == rootNode) {
                 throw new RuntimeException("index (" + indexName + ") is nonexistent");
             }
             String geometryFieldName = (String) rootNode.getProperty(Constant.RtreeProperty.geometryFieldName);
             int maxNodeReferences = (int) rootNode.getProperty(Constant.RtreeProperty.maxNodeReferences);
-            return new RTreeIndex(indexName, geometryFieldName, database, new MyEnvelopeDecoder(), maxNodeReferences, false);
+            return new RTreeIndex(indexName, geometryFieldName, database, new MyEnvelopeDecoder(), maxNodeReferences, geometryCacheSize, false);
         }
     }
 
@@ -81,9 +83,10 @@ public static synchronized RTreeIndex getIndex(GraphDatabaseService database, St
      * @param indexName         索引名(唯一)
      * @param geometryFieldName node中的geometry字段名，若已有索引，可能会和输入值不一致
      * @param maxNodeReferences 每个树节点上最多挂几个节点，若已有索引，可能会和输入值不一致
+     * @param geometryCacheSize geometry缓存数量，由于对外wkb缓存转到堆内并转geometry比较耗时，故这里加了一个lru的缓存以直接获取geometry，可以和构造索引时不一致
      * @return RTreeIndex
      */
-    public static synchronized RTreeIndex getOrCreateIndex(GraphDatabaseService database, String indexName, String geometryFieldName, int maxNodeReferences) {
+    public static synchronized RTreeIndex getOrCreateIndex(GraphDatabaseService database, String indexName, String geometryFieldName, int maxNodeReferences, int geometryCacheSize) {
         Node rootNode;
         try (Transaction tx = database.beginTx()) {
             rootNode = tx.findNode(Constant.RtreeLabel.ReferenceNode, Constant.RtreeProperty.indexName, indexName);
@@ -93,17 +96,17 @@ public static synchronized RTreeIndex getOrCreateIndex(GraphDatabaseService data
             }
         }
         if (null == rootNode) {
-            return createIndex(database, indexName, geometryFieldName, maxNodeReferences);
+            return createIndex(database, indexName, geometryFieldName, maxNodeReferences, geometryCacheSize);
         } else {
-            return new RTreeIndex(indexName, geometryFieldName, database, new MyEnvelopeDecoder(), maxNodeReferences, false);
+            return new RTreeIndex(indexName, geometryFieldName, database, new MyEnvelopeDecoder(), maxNodeReferences, geometryCacheSize, false);
         }
 
     }
 
     /**
      * 删除索引
      *
-     * @param database db
+     * @param database  db
      * @param indexName index name
      */
     public static synchronized void dropIndex(GraphDatabaseService database, String indexName) {

src/main/java/org/wowtools/neo4j/rtree/RtreeNearestQuery.java

@@ -47,7 +47,7 @@ public interface NodeFilter {
     public static List<DistanceResult> queryNearestN(Transaction tx, RTreeIndex rTreeIndex, double x, double y, int n, NodeFilter nodeFilter) {
         Node rtreeNode = rTreeIndex.getIndexRoot(tx);
         NearestNeighbour nn =
-                new NearestNeighbour(nodeFilter, n, rtreeNode, x, y, rTreeIndex.getGeometryFieldName());
+                new NearestNeighbour(nodeFilter, n, rtreeNode, x, y, rTreeIndex);
         return nn.find();
     }
 }

src/main/java/org/wowtools/neo4j/rtree/RtreeQuery.java

@@ -250,13 +250,7 @@ private static void traverseRtree(Transaction tx, RTreeIndex rTreeIndex, RtreeNo
                 //若有下级对象节点，返回结果
                 for (Relationship relationship : rtreeNode.getRelationships(Direction.OUTGOING, Constant.Relationship.RTREE_REFERENCE)) {
                     Node objNode = relationship.getEndNode();
-                    Geometry geometry;
-                    byte[] wkb = (byte[]) objNode.getProperty(rTreeIndex.getGeometryFieldName());
-                    try {
-                        geometry = wkbReader.read(wkb);
-                    } catch (ParseException e) {
-                        throw new RuntimeException("parse wkb error", e);
-                    }
+                    Geometry geometry = rTreeIndex.getObjNodeGeometry(objNode,wkbReader);
                     visitor.vist(objNode, geometry);
                 }
             }

src/main/java/org/wowtools/neo4j/rtree/nearest/NearestNeighbour.java

@@ -9,13 +9,13 @@
 import org.locationtech.jts.geom.Geometry;
 import org.locationtech.jts.geom.GeometryFactory;
 import org.locationtech.jts.geom.Point;
-import org.locationtech.jts.io.ParseException;
 import org.locationtech.jts.io.WKBReader;
 import org.neo4j.graphdb.Direction;
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.Relationship;
 import org.wowtools.neo4j.rtree.Constant;
 import org.wowtools.neo4j.rtree.RtreeNearestQuery;
+import org.wowtools.neo4j.rtree.spatial.RTreeIndex;
 
 import java.util.*;
 
@@ -27,16 +27,16 @@ public class NearestNeighbour {
     private final double x;
     private final double y;
     private final Point point;
-    private final String getGeometryFieldName;
+    private final RTreeIndex rTreeIndex;
     private final WKBReader wkbReader = new WKBReader();
 
-    public NearestNeighbour(RtreeNearestQuery.NodeFilter filter, int maxHits, Node root, double x, double y, String getGeometryFieldName) {
+    public NearestNeighbour(RtreeNearestQuery.NodeFilter filter, int maxHits, Node root, double x, double y, RTreeIndex rTreeIndex) {
         this.filter = filter;
         this.maxHits = maxHits;
         this.root = root;
         this.x = x;
         this.y = y;
-        this.getGeometryFieldName = getGeometryFieldName;
+        this.rTreeIndex = rTreeIndex;
         point = new GeometryFactory().createPoint(new Coordinate(x, y));
     }
 
@@ -64,6 +64,7 @@ public List<DistanceResult> find() {
 
     /**
      * 访问索引上的非叶子节点
+     *
      * @param node
      * @param drs
      * @param maxHits
@@ -88,6 +89,7 @@ private void nnExpandInternal(Node node,
 
     /**
      * 访问索引上的叶子节点
+     *
      * @param node
      * @param filter
      * @param drs
@@ -100,14 +102,8 @@ private void nnExpandLeaf(
             int maxHits) {
         for (Relationship relationship : node.getRelationships(Direction.OUTGOING, Constant.Relationship.RTREE_REFERENCE)) {
             Node objNode = relationship.getEndNode();
-            Geometry geometry;
-            byte[] wkb = (byte[]) objNode.getProperty(getGeometryFieldName);
-            try {
-                geometry = wkbReader.read(wkb);
-            } catch (ParseException e) {
-                throw new RuntimeException("parse wkb error", e);
-            }
-            if (filter.accept(objNode,geometry)) {
+            Geometry geometry = rTreeIndex.getObjNodeGeometry(objNode, wkbReader);
+            if (filter.accept(objNode, geometry)) {
                 double dist = geometry.distance(point);
                 int n = drs.size();
                 if (n < maxHits || dist < drs.get(n - 1).getDist()) {