Merge branch 'dev'

codingmiao · codingmiao · commit d73c82611e71 · 2020-11-27T17:50:45.000+08:00
diff --git a/README.md b/README.md
@@ -76,7 +76,7 @@ The actual measurement performance of BigShape is up to 100 times faster than th
 
 
 ## install
-The latest version is `1.4.0`
+The latest version is `1.4.2`
 
 maven import in your project
 ```
diff --git a/README_zh.md b/README_zh.md
@@ -76,7 +76,7 @@ System.out.println(bigShape.intersects(tx, s1));//利用BigShape来做空间关
 
 
 ## install
-The latest version is `1.4.0`
+The latest version is `1.4.2`
 
 maven import in your project
 ```
diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
     </properties>
     <groupId>org.wowtools</groupId>
     <artifactId>neo4j-rtree</artifactId>
-    <version>1.4.0</version>
+    <version>1.4.2</version>
     <name>neo4j-rtree</name>
 
     <description>a spatial index for neo4j 4.x.</description>
diff --git a/src/main/java/org/wowtools/neo4j/rtree/bigshape/BigShapeManager.java b/src/main/java/org/wowtools/neo4j/rtree/bigshape/BigShapeManager.java
@@ -51,16 +51,16 @@ public class BigShapeManager {
     public static BigShape get(GraphDatabaseService database, String id) {
         String indexName = indexNamePrefix + id;
         int maxNodeReferences;
-        int geometryCacheSize = 256;//TODO 改为传入或动态获取
+        int nodeValueCacheSize = 256;//TODO 改为动态获取或传入
         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");
             }
             maxNodeReferences = (int) rootNode.getProperty(Constant.RtreeProperty.maxNodeReferences);
         }
-        RTreeIndex rTreeIndex = new RTreeIndex(indexName, keyFieldName, database, new BigShapeReadEnvelopeDecoder(), maxNodeReferences, geometryCacheSize, false);
-        BigShape bigShape = new BigShape(rTreeIndex);
+        RTreeIndex rTreeIndex = new RTreeIndex(indexName, keyFieldName, database, new BigShapeReadEnvelopeDecoder(), maxNodeReferences, 0, false);
+        BigShape bigShape = new BigShape(rTreeIndex, nodeValueCacheSize);
         return bigShape;
     }
 
diff --git a/src/main/java/org/wowtools/neo4j/rtree/bigshape/pojo/BigShape.java b/src/main/java/org/wowtools/neo4j/rtree/bigshape/pojo/BigShape.java
@@ -4,19 +4,21 @@
 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.neo4j.graphdb.Transaction;
+import org.wowtools.common.utils.LruCache;
 import org.wowtools.neo4j.rtree.Constant;
 import org.wowtools.neo4j.rtree.bigshape.BigShapeManager;
 import org.wowtools.neo4j.rtree.spatial.RTreeIndex;
 import org.wowtools.neo4j.rtree.util.BboxIntersectUtil;
 import org.wowtools.neo4j.rtree.util.GeometryBbox;
+import org.wowtools.neo4j.rtree.util.WkbReaderManager;
 
 import java.util.ArrayDeque;
 import java.util.Deque;
+import java.util.Map;
 
 import static org.wowtools.neo4j.rtree.util.BboxIntersectUtil.bboxIntersect;
 
@@ -28,9 +30,11 @@
  */
 public class BigShape {
     private final RTreeIndex rTreeIndex;
+    private final int nodeValueCacheSize;
 
-    public BigShape(RTreeIndex rTreeIndex) {
+    public BigShape(RTreeIndex rTreeIndex, int nodeValueCacheSize) {
         this.rTreeIndex = rTreeIndex;
+        this.nodeValueCacheSize = nodeValueCacheSize;
     }
 
 //    /**
@@ -54,9 +58,9 @@ public BigShape(RTreeIndex rTreeIndex) {
     public boolean intersects(Transaction tx, Geometry g) {
         final IntersectsJudge intersectsJudge;
         if (g instanceof Point) {
-            intersectsJudge = new PointIntersectsJudge(g);
+            intersectsJudge = new PointIntersectsJudge(g, nodeValueCacheSize);
         } else {
-            intersectsJudge = new OtherIntersectsJudge(g);
+            intersectsJudge = new OtherIntersectsJudge(g, nodeValueCacheSize);
         }
         //FIXME 这里由于找到一个相交对象即可return，所以未复用RtreeTraverser的方法，后续有相同场景的话抽取公共代码
         Node rtreeNode = rTreeIndex.getIndexRoot(tx);
@@ -80,8 +84,7 @@ public boolean intersects(Transaction tx, Geometry g) {
                 //若有下级对象节点，返回结果
                 for (Relationship relationship : rtreeNode.getRelationships(Direction.OUTGOING, Constant.Relationship.RTREE_REFERENCE)) {
                     Node objNode = relationship.getEndNode();
-                    Object value = objNode.getProperty(BigShapeManager.keyFieldName);
-                    if (intersectsJudge.judge(value)) {
+                    if (intersectsJudge.judge(objNode)) {
                         return true;//有一个相交即可直接返回
                     }
                 }
@@ -96,31 +99,42 @@ public boolean intersects(Transaction tx, Geometry g) {
     private static abstract class IntersectsJudge {
 
         protected final Geometry geometry;
-        protected final WKBReader wkbReader = new WKBReader();
         protected final double[] geoBbox;
+        protected final Map<Long, Object> cache;
 
-        public IntersectsJudge(Geometry geometry) {
+        public IntersectsJudge(Geometry geometry, int cacheSize) {
             this.geometry = geometry;
             geoBbox = GeometryBbox.getBbox(geometry).toDoubleArray();
+            cache = LruCache.buildCache(cacheSize, 32);
         }
 
-        public boolean judge(Object value) {
+        public boolean judge(Node node) {
+            Object value = cache.get(node.getId());
+            if (null == value) {
+                value = node.getProperty(BigShapeManager.keyFieldName);
+                if (value instanceof byte[]) {
+                    try {
+                        value = WkbReaderManager.get().read((byte[]) value);
+                    } catch (ParseException e) {
+                        throw new RuntimeException(e);
+                    }
+                }
+                cache.put(node.getId(), value);
+            }
+            return judgeValue(value);
+        }
+
+        protected boolean judgeValue(Object value) {
             if (value instanceof double[]) {//bbox
                 return judgeBbox((double[]) value);
             } else {//wkb
-                return judgeWkb((byte[]) value);
+                return judgeGeometry((Geometry) value);
             }
         }
 
         abstract boolean judgeBbox(double[] bbox);
 
-        boolean judgeWkb(byte[] wkb) {
-            Geometry geometry;
-            try {
-                geometry = wkbReader.read(wkb);
-            } catch (ParseException e) {
-                throw new RuntimeException(e);
-            }
+        protected boolean judgeGeometry(Geometry geometry) {
 //            double[] gb = GeometryBbox.getBbox(geometry).toDoubleArray();
 //            if(!BboxIntersectUtil.bboxIntersect(gb,geoBbox)){
 //                return false;
@@ -137,8 +151,8 @@ private static class PointIntersectsJudge extends IntersectsJudge {
         private final double x;
         private final double y;
 
-        public PointIntersectsJudge(Geometry geometry) {
-            super(geometry);
+        public PointIntersectsJudge(Geometry geometry, int cacheSize) {
+            super(geometry, cacheSize);
             Point point = (Point) geometry;
             x = point.getX();
             y = point.getY();
@@ -157,8 +171,8 @@ boolean judgeBbox(double[] bbox) {
     private static class OtherIntersectsJudge extends IntersectsJudge {
         private final GeometryFactory geometryFactory = new GeometryFactory();
 
-        public OtherIntersectsJudge(Geometry geometry) {
-            super(geometry);
+        public OtherIntersectsJudge(Geometry geometry, int cacheSize) {
+            super(geometry, cacheSize);
         }
 
         @Override
diff --git a/src/main/java/org/wowtools/neo4j/rtree/util/WkbReaderManager.java b/src/main/java/org/wowtools/neo4j/rtree/util/WkbReaderManager.java
@@ -0,0 +1,22 @@
+package org.wowtools.neo4j.rtree.util;
+
+import org.locationtech.jts.io.WKBReader;
+
+/**
+ * WkbReader的ThreadLocal获取器
+ *
+ * @author liuyu
+ * @date 2020/11/27
+ */
+public class WkbReaderManager {
+    private static final ThreadLocal<WKBReader> wkbReaderThreadLocal = new ThreadLocal<>();
+
+    public static WKBReader get() {
+        WKBReader wkbReader = wkbReaderThreadLocal.get();
+        if (null == wkbReader) {
+            wkbReader = new WKBReader();
+            wkbReaderThreadLocal.set(wkbReader);
+        }
+        return wkbReader;
+    }
+}
diff --git a/src/test/java/org/wowtools/neo4j/rtree/util/WkbReaderManagerTest.java b/src/test/java/org/wowtools/neo4j/rtree/util/WkbReaderManagerTest.java
@@ -0,0 +1,44 @@
+package org.wowtools.neo4j.rtree.util;
+
+import junit.framework.TestCase;
+import org.junit.Test;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.WKBReader;
+import org.locationtech.jts.io.WKBWriter;
+
+public class WkbReaderManagerTest extends TestCase {
+
+    private volatile boolean flag;
+    @Test
+    public void test() {
+        test1();
+    }
+
+    public void test1(){
+        //1、测试单个wkbreader多线程环境,应该会抛异常
+        WKBReader wkbReader = new WKBReader();
+        for (int i = 0; i < 500; i++) {
+            final double d = i;
+            new Thread(()->{
+                byte[] wkb = new WKBWriter().write(new GeometryFactory().createPoint(new Coordinate(d, d)));
+                try {
+                    wkbReader.read(wkb);
+                } catch (Exception e) {
+//                    e.printStackTrace();
+                    flag = true;
+                }
+            }).start();
+
+        }
+        try {
+            Thread.sleep(2000);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+        if(!flag){
+            throw new RuntimeException("wkbreader未产生多线程异常，请多次运行确认，或检查是否jts官方已优化");
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -51,16 +51,16 @@ public class BigShapeManager {`
`51`	`51`	`public static BigShape get(GraphDatabaseService database, String id) {`
`52`	`52`	`String indexName = indexNamePrefix + id;`
`53`	`53`	`int maxNodeReferences;`
`54`		`- int geometryCacheSize = 256;//TODO 改为传入或动态获取`
	`54`	`+ int nodeValueCacheSize = 256;//TODO 改为动态获取或传入`
`55`	`55`	`try (Transaction tx = database.beginTx()) {`
`56`	`56`	`Node rootNode = tx.findNode(Constant.RtreeLabel.ReferenceNode, Constant.RtreeProperty.indexName, indexName);`
`57`	`57`	`if (null == rootNode) {`
`58`	`58`	`throw new RuntimeException("index (" + indexName + ") is nonexistent");`
`59`	`59`	`}`
`60`	`60`	`maxNodeReferences = (int) rootNode.getProperty(Constant.RtreeProperty.maxNodeReferences);`
`61`	`61`	`}`
`62`		`- RTreeIndex rTreeIndex = new RTreeIndex(indexName, keyFieldName, database, new BigShapeReadEnvelopeDecoder(), maxNodeReferences, geometryCacheSize, false);`
`63`		`- BigShape bigShape = new BigShape(rTreeIndex);`
	`62`	`+ RTreeIndex rTreeIndex = new RTreeIndex(indexName, keyFieldName, database, new BigShapeReadEnvelopeDecoder(), maxNodeReferences, 0, false);`
	`63`	`+ BigShape bigShape = new BigShape(rTreeIndex, nodeValueCacheSize);`
`64`	`64`	`return bigShape;`
`65`	`65`	`}`
`66`	`66`