Improved Geometry processing (issue 535).

h2/src/docsrc/html/changelog.html

@@ -18,7 +18,8 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
-<ul><li>The collation can now be set in the database URL, even if there are data tables,
+<ul><li>Improved Geometry processing (issue 535).
+</li><li>The collation can now be set in the database URL, even if there are data tables,
     if the collection is the same as the current collation.
 </li><li>Improved Oracle compatibility for CASE WHEN and DECODE.
 </li><li>The statement "drop all objects" did not work if a table depends on a view via a constraint.

h2/src/main/org/h2/value/ValueGeometry.java

@@ -33,14 +33,27 @@ import com.vividsolutions.jts.io.WKTWriter;
 public class ValueGeometry extends Value {
 
     /**
-     * The value.
+     * The value. Converted from WKB only on request as conversion from/to WKB
+     * cost a significant amount of cpu cycles.
      */
-    private final Geometry geometry;
+    private Geometry geometry;
+    
+    /**
+     * As conversion from/to WKB cost a significant amount of cpu cycles, WKB
+     * are kept in ValueGeometry instance
+     */
+    private byte[] bytes;
+    
+    private int hashCode;
 
     private ValueGeometry(Geometry geometry) {
         this.geometry = geometry;
     }
 
+    private ValueGeometry(byte[] bytes) {
+        this.bytes = bytes;
+    }
+
     /**
      * Get or create a geometry value for the given geometry.
      *
@@ -79,10 +92,13 @@ public class ValueGeometry extends Value {
      * @return the value
      */
     public static ValueGeometry get(byte[] bytes) {
-        return (ValueGeometry) Value.cache(new ValueGeometry(fromWKB(bytes)));
+        return (ValueGeometry) Value.cache(new ValueGeometry(bytes));
     }
 
     public Geometry getGeometry() {
+        if (geometry == null && bytes != null) {
+            geometry = fromWKB(bytes);
+        }
         return geometry;
     }
 
@@ -95,7 +111,7 @@ public class ValueGeometry extends Value {
      */
     public boolean intersectsBoundingBox(ValueGeometry r) {
         // the Geometry object caches the envelope
-        return geometry.getEnvelopeInternal().intersects(r.getGeometry().getEnvelopeInternal());
+        return getGeometry().getEnvelopeInternal().intersects(r.getGeometry().getEnvelopeInternal());
     }
 
     /**
@@ -106,7 +122,7 @@ public class ValueGeometry extends Value {
      */
     public Value getEnvelopeUnion(ValueGeometry r) {
         GeometryFactory gf = new GeometryFactory();
-        Envelope mergedEnvelope = new Envelope(geometry.getEnvelopeInternal());
+        Envelope mergedEnvelope = new Envelope(getGeometry().getEnvelopeInternal());
         mergedEnvelope.expandToInclude(r.getGeometry().getEnvelopeInternal());
         return get(gf.toGeometry(mergedEnvelope));
     }
@@ -118,7 +134,7 @@ public class ValueGeometry extends Value {
      * @return the intersection of this geometry envelope and another
      */
     public ValueGeometry getEnvelopeIntersection(ValueGeometry r) {
-        Envelope e1 = geometry.getEnvelopeInternal();
+        Envelope e1 = getGeometry().getEnvelopeInternal();
         Envelope e2 = r.getGeometry().getEnvelopeInternal();
         Envelope e3 = e1.intersection(e2);
         // try to re-use the object
@@ -143,8 +159,8 @@ public class ValueGeometry extends Value {
 
     @Override
     protected int compareSecure(Value v, CompareMode mode) {
-        Geometry g = ((ValueGeometry) v).geometry;
-        return geometry.compareTo(g);
+        Geometry g = ((ValueGeometry) v).getGeometry();
+        return getGeometry().compareTo(g);
     }
 
     @Override
@@ -154,17 +170,20 @@ public class ValueGeometry extends Value {
 
     @Override
     public long getPrecision() {
-        return toWKT().length();
+        return 0;
     }
 
     @Override
     public int hashCode() {
-        return geometry.hashCode();
+        if (hashCode == 0) {
+            hashCode = Arrays.hashCode(toWKB());
+        }
+        return hashCode;
     }
 
     @Override
     public Object getObject() {
-        return geometry;
+        return getGeometry();
     }
 
     @Override
@@ -179,7 +198,7 @@ public class ValueGeometry extends Value {
 
     @Override
     public void set(PreparedStatement prep, int parameterIndex) throws SQLException {
-        prep.setObject(parameterIndex, geometry);
+        prep.setObject(parameterIndex, getGeometry());
     }
 
     @Override
@@ -205,7 +224,7 @@ public class ValueGeometry extends Value {
      * @return the well-known-text
      */
     public String toWKT() {
-        return new WKTWriter().write(geometry);
+        return new WKTWriter().write(getGeometry());
     }
 
     /**
@@ -214,7 +233,10 @@ public class ValueGeometry extends Value {
      * @return the well-known-binary
      */
     public byte[] toWKB() {
-        return toWKB(geometry);
+        if (bytes != null) {
+            return bytes;
+        }
+        return toWKB(getGeometry());
     }
 
     private static byte[] toWKB(Geometry geometry) {

h2/src/test/org/h2/test/db/TestSpatial.java

@@ -63,10 +63,22 @@ public class TestSpatial extends TestBase {
             testWKB();
             testValueConversion();
             testEquals();
+            testHashCode();
             deleteDb("spatial");
         }
     }
 
+    private void testHashCode() {
+        ValueGeometry geomA = ValueGeometry
+                .get("POLYGON ((67 13 6, 67 18 5, 59 18 4, 59 13 6,  67 13 6))");
+        ValueGeometry geomB = ValueGeometry
+                .get("POLYGON ((67 13 6, 67 18 5, 59 18 4, 59 13 6,  67 13 6))");
+        ValueGeometry geomC = ValueGeometry
+                .get("POLYGON ((67 13 6, 67 18 5, 59 18 4, 59 13 5,  67 13 6))");
+        assertEquals(geomA.hashCode(), geomB.hashCode());
+        assertFalse(geomA.hashCode() == geomC.hashCode());
+    }
+
     private void testSpatialValues() throws SQLException {
         deleteDb("spatial");
         Connection conn = getConnection("spatial");