added large polygon query, geometry interning in filters

chrisbennight · chrisbennight · commit dee2de4eff70 · 2015-03-28T10:49:06.000-04:00
diff --git a/geowave-accumulo/pom.xml b/geowave-accumulo/pom.xml
@@ -41,7 +41,7 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-		<dependency>
+        <dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<version>4.11</version>
diff --git a/geowave-accumulo/src/test/java/mil/nga/giat/geowave/accumulo/query/AccumuloRangeQueryTest.java b/geowave-accumulo/src/test/java/mil/nga/giat/geowave/accumulo/query/AccumuloRangeQueryTest.java
@@ -2,13 +2,16 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Random;
 
+import com.vividsolutions.jts.geom.Polygon;
 import junit.framework.Assert;
 import mil.nga.giat.geowave.accumulo.AccumuloDataStore;
 import mil.nga.giat.geowave.accumulo.BasicAccumuloOperations;
 import mil.nga.giat.geowave.index.ByteArrayId;
 import mil.nga.giat.geowave.store.CloseableIterator;
 import mil.nga.giat.geowave.store.DataStore;
+import mil.nga.giat.geowave.store.GeometryUtils;
 import mil.nga.giat.geowave.store.adapter.AbstractDataAdapter;
 import mil.nga.giat.geowave.store.adapter.NativeFieldHandler;
 import mil.nga.giat.geowave.store.adapter.NativeFieldHandler.RowBuilder;
@@ -111,6 +114,24 @@ public void testIntersection() {
 		Assert.assertTrue(resultOfIntersect.hasNext());
 	}
 
+	@Test
+	public void largeQuery() {
+		final Geometry largeGeo = createPolygon(50000);
+		final Query largeQuery = new SpatialQuery(
+				largeGeo);
+		final CloseableIterator itr = mockDataStore.query(
+				index,
+				largeQuery);
+		int numfeats = 0;
+		while (itr.hasNext()) {
+			itr.next();
+			numfeats++;
+		}
+		Assert.assertEquals(
+				numfeats,
+				1);
+	}
+
 	@Test
 	public void testMiss() {
 		final Query intersectQuery = new SpatialQuery(
@@ -161,6 +182,31 @@ public void testEncompass() {
 				geom1.id);
 	}
 
+	private static Polygon createPolygon(
+			int numPoints ) {
+		double centerX = 4;
+		double centerY = 12;
+		int maxRadius = 80;
+
+		List<Coordinate> coords = new ArrayList<Coordinate>();
+		Random rand = new Random(
+				8675309l);
+
+		double increment = (double) 360 / numPoints;
+
+		for (double theta = 0; theta <= 360; theta += increment) {
+			double radius = rand.nextDouble() * maxRadius + 0.1;
+			double rad = theta * Math.PI / 180.0;
+			double x = centerX + radius * Math.sin(rad);
+			double y = centerY + radius * Math.cos(rad);
+			coords.add(new Coordinate(
+					x,
+					y));
+		}
+		coords.add(coords.get(0));
+		return GeometryUtils.GEOMETRY_FACTORY.createPolygon(coords.toArray(new Coordinate[coords.size()]));
+	}
+
 	protected static class TestGeometry
 	{
 		protected final Geometry geom;
diff --git a/geowave-store/src/main/java/mil/nga/giat/geowave/store/filter/SpatialQueryFilter.java b/geowave-store/src/main/java/mil/nga/giat/geowave/store/filter/SpatialQueryFilter.java
@@ -6,6 +6,8 @@
 import java.util.List;
 import java.util.Set;
 
+import com.google.common.collect.Interner;
+import com.google.common.collect.Interners;
 import mil.nga.giat.geowave.index.ByteArrayId;
 import mil.nga.giat.geowave.index.sfc.data.BasicNumericDataset;
 import mil.nga.giat.geowave.index.sfc.data.MultiDimensionalNumericData;
@@ -25,6 +27,9 @@
 public class SpatialQueryFilter extends
 		BasicQueryFilter
 {
+
+	private static final Interner<Geometry> geometryInterner = Interners.newWeakInterner();
+
 	private Geometry queryGeometry;
 
 	private Set<ByteArrayId> geometryFieldIds;
@@ -188,7 +193,7 @@ public void fromBinary(
 					fieldId));
 		}
 		buf.get(theRest);
-		queryGeometry = GeometryUtils.geometryFromBinary(geometryBinary);
+		queryGeometry = geometryInterner.intern(GeometryUtils.geometryFromBinary(geometryBinary));
 
 		super.fromBinary(theRest);
 	}
