exposed max duplicates as a commandline option

rfecher · rfecher · commit 12efca61ad3c · 2016-09-25T15:08:18.000-04:00
diff --git a/core/geotime/src/main/java/mil/nga/giat/geowave/core/geotime/ingest/SpatialTemporalDimensionalityTypeProvider.java b/core/geotime/src/main/java/mil/nga/giat/geowave/core/geotime/ingest/SpatialTemporalDimensionalityTypeProvider.java
@@ -114,7 +114,8 @@ private static PrimaryIndex internalCreatePrimaryIndex(
 								options.bias.getSpatialPrecision(),
 								options.bias.getTemporalPrecision()
 							},
-							SFCType.HILBERT),
+							SFCType.HILBERT,
+							options.maxDuplicates),
 					new BasicIndexModel(
 							fields),
 					new ByteArrayId(
@@ -146,6 +147,10 @@ private static class SpatialTemporalOptions implements
 			"--pointTimestampOnly"
 		}, required = false, description = "The index will only be good at handling points and timestamps and will not be optimized for handling lines/polys or time ranges.  The default behavior is to handle any geometry and time ranges well.")
 		protected boolean pointOnly = false;
+		@Parameter(names = {
+			"--maxDuplicates"
+		}, required = false, description = "The max number of duplicates.  The default is 8 (2^dimensions with range values), but if lines and polys are expected without time ranges 4 would be more appropriate, and if time ranges are expected with points, 2 would be more appropriate.")
+		protected long maxDuplicates = -1;
 	}
 
 	public static enum Bias {
@@ -265,6 +270,13 @@ public SpatialTemporalIndexBuilder setPeriodicity(
 					options);
 		}
 
+		public SpatialTemporalIndexBuilder setMaxDupicates(
+				final long maxDuplicates ) {
+			options.maxDuplicates = maxDuplicates;
+			return new SpatialTemporalIndexBuilder(
+					options);
+		}
+
 		public PrimaryIndex createIndex() {
 			return internalCreatePrimaryIndex(options);
 		}
diff --git a/core/index/src/main/java/mil/nga/giat/geowave/core/index/sfc/tiered/TieredSFCIndexFactory.java b/core/index/src/main/java/mil/nga/giat/geowave/core/index/sfc/tiered/TieredSFCIndexFactory.java
@@ -93,6 +93,17 @@ static public TieredSFCIndexStrategy createSingleTierStrategy(
 						(byte) maxBitsOfPrecision));
 	}
 
+	static public TieredSFCIndexStrategy createFullIncrementalTieredStrategy(
+			final NumericDimensionDefinition[] baseDefinitions,
+			final int[] maxBitsPerDimension,
+			final SFCType sfcType ) {
+		return createFullIncrementalTieredStrategy(
+				baseDefinitions,
+				maxBitsPerDimension,
+				sfcType,
+				null);
+	}
+
 	/**
 	 * 
 	 * @param baseDefinitions
@@ -101,13 +112,16 @@ static public TieredSFCIndexStrategy createSingleTierStrategy(
 	 *            the max cardinality for the Index Strategy
 	 * @param sfcType
 	 *            the type of space filling curve (e.g. Hilbert)
+	 * @param maxEstimatedDuplicatedIds
+	 *            the max number of duplicate SFC IDs
 	 * @return an Index Strategy object with a tier for every incremental
 	 *         cardinality between the lowest max bits of precision and 0
 	 */
 	static public TieredSFCIndexStrategy createFullIncrementalTieredStrategy(
 			final NumericDimensionDefinition[] baseDefinitions,
 			final int[] maxBitsPerDimension,
-			final SFCType sfcType ) {
+			final SFCType sfcType,
+			Long maxEstimatedDuplicatedIds ) {
 		if (maxBitsPerDimension.length == 0) {
 			final ImmutableBiMap<Integer, Byte> emptyMap = ImmutableBiMap.of();
 			return new TieredSFCIndexStrategy(
@@ -144,7 +158,13 @@ static public TieredSFCIndexStrategy createFullIncrementalTieredStrategy(
 					sfcType);
 
 		}
-
+		if (maxEstimatedDuplicatedIds != null && maxEstimatedDuplicatedIds > 0) {
+			return new TieredSFCIndexStrategy(
+					baseDefinitions,
+					spaceFillingCurves,
+					sfcIndexToTier.build(),
+					maxEstimatedDuplicatedIds);
+		}
 		return new TieredSFCIndexStrategy(
 				baseDefinitions,
 				spaceFillingCurves,
diff --git a/core/index/src/main/java/mil/nga/giat/geowave/core/index/sfc/tiered/TieredSFCIndexStrategy.java b/core/index/src/main/java/mil/nga/giat/geowave/core/index/sfc/tiered/TieredSFCIndexStrategy.java
@@ -44,7 +44,7 @@ public class TieredSFCIndexStrategy implements
 		HierarchicalNumericIndexStrategy
 {
 	private final static Logger LOGGER = Logger.getLogger(TieredSFCIndexStrategy.class);
-	private final static int MAX_ESTIMATED_DUPLICATE_IDS_PER_DIMENSION = 2;
+	private final static int DEFAULT_MAX_ESTIMATED_DUPLICATE_IDS_PER_DIMENSION = 2;
 	protected static final int DEFAULT_MAX_RANGES = -1;
 	private SpaceFillingCurve[] orderedSfcs;
 	private ImmutableBiMap<Integer, Byte> orderedSfcIndexToTierId;
@@ -66,12 +66,27 @@ public TieredSFCIndexStrategy(
 			final NumericDimensionDefinition[] baseDefinitions,
 			final SpaceFillingCurve[] orderedSfcs,
 			final ImmutableBiMap<Integer, Byte> orderedSfcIndexToTierId ) {
+		this(
+				baseDefinitions,
+				orderedSfcs,
+				orderedSfcIndexToTierId,
+				(long) Math.pow(
+						DEFAULT_MAX_ESTIMATED_DUPLICATE_IDS_PER_DIMENSION,
+						baseDefinitions.length));
+	}
+
+	/**
+	 * Constructor used to create a Tiered Index Strategy.
+	 */
+	public TieredSFCIndexStrategy(
+			final NumericDimensionDefinition[] baseDefinitions,
+			final SpaceFillingCurve[] orderedSfcs,
+			final ImmutableBiMap<Integer, Byte> orderedSfcIndexToTierId,
+			long maxEstimatedDuplicateIds ) {
 		this.orderedSfcs = orderedSfcs;
 		this.baseDefinitions = baseDefinitions;
 		this.orderedSfcIndexToTierId = orderedSfcIndexToTierId;
-		maxEstimatedDuplicateIds = (long) Math.pow(
-				MAX_ESTIMATED_DUPLICATE_IDS_PER_DIMENSION,
-				baseDefinitions.length);
+		this.maxEstimatedDuplicateIds = maxEstimatedDuplicateIds;
 		maxEstimatedDuplicateIdsBigInteger = BigInteger.valueOf(maxEstimatedDuplicateIds);
 	}
 
