From 89b7b552094bec8469f6a3c2e718380f15b2b2e0 Mon Sep 17 00:00:00 2001 From: Rich Fecher Date: Fri, 5 Jun 2020 08:49:36 -0400 Subject: [PATCH] added default to/from binary to aggregation Signed-off-by: Rich Fecher --- .../aggregate/BoundingBoxAggregation.java | 8 -------- .../query/aggregate/TimeRangeAggregation.java | 8 -------- .../geowave/core/store/api/Aggregation.java | 18 ++++++++++++++++++ .../aggregate/DataStatisticsAggregation.java | 8 -------- .../query/aggregate/MergingAggregation.java | 8 -------- .../CompositeVectorAggregation.java | 8 -------- .../aggregation/VectorCountAggregation.java | 8 -------- .../aggregation/VectorMathAggregation.java | 8 -------- .../render/DistributedRenderAggregation.java | 8 -------- 9 files changed, 18 insertions(+), 64 deletions(-) diff --git a/core/geotime/src/main/java/org/locationtech/geowave/core/geotime/store/query/aggregate/BoundingBoxAggregation.java b/core/geotime/src/main/java/org/locationtech/geowave/core/geotime/store/query/aggregate/BoundingBoxAggregation.java index 036b630b88f..0bef526bee2 100644 --- a/core/geotime/src/main/java/org/locationtech/geowave/core/geotime/store/query/aggregate/BoundingBoxAggregation.java +++ b/core/geotime/src/main/java/org/locationtech/geowave/core/geotime/store/query/aggregate/BoundingBoxAggregation.java @@ -21,14 +21,6 @@ public abstract class BoundingBoxAggregation

implement protected double maxX = -Double.MAX_VALUE; protected double maxY = -Double.MAX_VALUE; - @Override - public byte[] toBinary() { - return new byte[0]; - } - - @Override - public void fromBinary(final byte[] bytes) {} - @Override public P getParameters() { return null; diff --git a/core/geotime/src/main/java/org/locationtech/geowave/core/geotime/store/query/aggregate/TimeRangeAggregation.java b/core/geotime/src/main/java/org/locationtech/geowave/core/geotime/store/query/aggregate/TimeRangeAggregation.java index 89621345a0a..741177b9a68 100644 --- a/core/geotime/src/main/java/org/locationtech/geowave/core/geotime/store/query/aggregate/TimeRangeAggregation.java +++ b/core/geotime/src/main/java/org/locationtech/geowave/core/geotime/store/query/aggregate/TimeRangeAggregation.java @@ -21,14 +21,6 @@ public abstract class TimeRangeAggregation

implements protected long min = Long.MAX_VALUE; protected long max = Long.MIN_VALUE; - @Override - public byte[] toBinary() { - return new byte[0]; - } - - @Override - public void fromBinary(final byte[] bytes) {} - @Override public P getParameters() { return null; diff --git a/core/store/src/main/java/org/locationtech/geowave/core/store/api/Aggregation.java b/core/store/src/main/java/org/locationtech/geowave/core/store/api/Aggregation.java index 38ba02a778d..5ac655bdfc2 100644 --- a/core/store/src/main/java/org/locationtech/geowave/core/store/api/Aggregation.java +++ b/core/store/src/main/java/org/locationtech/geowave/core/store/api/Aggregation.java @@ -93,4 +93,22 @@ default R merge(final R result1, final R result2) { * @param entry the new entry to compute an updated aggregation result on */ void aggregate(T entry); + + /** + * Because the serialization of aggregation is just the function without the parameters or the + * result, its expected that this is empty + */ + @Override + default byte[] toBinary() { + return new byte[0]; + } + + /** + * Because the serialization of aggregation is just the function without the parameters or the + * result, its expected that there's nothing to deserialize + */ + @Override + default void fromBinary(byte[] bytes) {} + + } diff --git a/core/store/src/main/java/org/locationtech/geowave/core/store/query/aggregate/DataStatisticsAggregation.java b/core/store/src/main/java/org/locationtech/geowave/core/store/query/aggregate/DataStatisticsAggregation.java index 590f84f7614..774da932881 100644 --- a/core/store/src/main/java/org/locationtech/geowave/core/store/query/aggregate/DataStatisticsAggregation.java +++ b/core/store/src/main/java/org/locationtech/geowave/core/store/query/aggregate/DataStatisticsAggregation.java @@ -53,14 +53,6 @@ public void clearResult() { return statisticsResult; } - @Override - public byte[] toBinary() { - return new byte[] {}; - } - - @Override - public void fromBinary(final byte[] bytes) {} - @Override public byte[] resultToBinary(final InternalDataStatistics result) { return PersistenceUtils.toBinary(result); diff --git a/core/store/src/main/java/org/locationtech/geowave/core/store/query/aggregate/MergingAggregation.java b/core/store/src/main/java/org/locationtech/geowave/core/store/query/aggregate/MergingAggregation.java index 66071d34a4e..a86067bd268 100644 --- a/core/store/src/main/java/org/locationtech/geowave/core/store/query/aggregate/MergingAggregation.java +++ b/core/store/src/main/java/org/locationtech/geowave/core/store/query/aggregate/MergingAggregation.java @@ -16,14 +16,6 @@ public class MergingAggregation implements Aggregation { private T result = null; - @Override - public byte[] toBinary() { - return new byte[0]; - } - - @Override - public void fromBinary(final byte[] bytes) {} - @Override public Persistable getParameters() { return null; diff --git a/extensions/adapters/vector/src/main/java/org/locationtech/geowave/adapter/vector/query/aggregation/CompositeVectorAggregation.java b/extensions/adapters/vector/src/main/java/org/locationtech/geowave/adapter/vector/query/aggregation/CompositeVectorAggregation.java index 9a4b04925cd..7ba4b347d9c 100644 --- a/extensions/adapters/vector/src/main/java/org/locationtech/geowave/adapter/vector/query/aggregation/CompositeVectorAggregation.java +++ b/extensions/adapters/vector/src/main/java/org/locationtech/geowave/adapter/vector/query/aggregation/CompositeVectorAggregation.java @@ -44,14 +44,6 @@ public void add(final Aggregation aggregation) { aggregations.add(aggregation); } - @Override - public byte[] toBinary() { - return new byte[0]; - } - - @Override - public void fromBinary(final byte[] bytes) {} - @Override public PersistableList getParameters() { List persistables = Lists.newArrayListWithCapacity(aggregations.size()); diff --git a/extensions/adapters/vector/src/main/java/org/locationtech/geowave/adapter/vector/query/aggregation/VectorCountAggregation.java b/extensions/adapters/vector/src/main/java/org/locationtech/geowave/adapter/vector/query/aggregation/VectorCountAggregation.java index 407d047dca0..d0e8bc05dcd 100644 --- a/extensions/adapters/vector/src/main/java/org/locationtech/geowave/adapter/vector/query/aggregation/VectorCountAggregation.java +++ b/extensions/adapters/vector/src/main/java/org/locationtech/geowave/adapter/vector/query/aggregation/VectorCountAggregation.java @@ -31,14 +31,6 @@ public VectorCountAggregation(final FieldNameParam fieldNameParam) { this.fieldNameParam = fieldNameParam; } - @Override - public byte[] toBinary() { - return new byte[0]; - } - - @Override - public void fromBinary(final byte[] bytes) {} - @Override public FieldNameParam getParameters() { return fieldNameParam; diff --git a/extensions/adapters/vector/src/main/java/org/locationtech/geowave/adapter/vector/query/aggregation/VectorMathAggregation.java b/extensions/adapters/vector/src/main/java/org/locationtech/geowave/adapter/vector/query/aggregation/VectorMathAggregation.java index bcbadada3ec..b14428c0fa3 100644 --- a/extensions/adapters/vector/src/main/java/org/locationtech/geowave/adapter/vector/query/aggregation/VectorMathAggregation.java +++ b/extensions/adapters/vector/src/main/java/org/locationtech/geowave/adapter/vector/query/aggregation/VectorMathAggregation.java @@ -34,14 +34,6 @@ public VectorMathAggregation(final FieldNameParam fieldNameParam) { this.fieldNameParam = fieldNameParam; } - @Override - public byte[] toBinary() { - return new byte[0]; - } - - @Override - public void fromBinary(final byte[] bytes) {} - @Override public FieldNameParam getParameters() { return fieldNameParam; diff --git a/extensions/adapters/vector/src/main/java/org/locationtech/geowave/adapter/vector/render/DistributedRenderAggregation.java b/extensions/adapters/vector/src/main/java/org/locationtech/geowave/adapter/vector/render/DistributedRenderAggregation.java index b9750213a06..323fd0599ea 100644 --- a/extensions/adapters/vector/src/main/java/org/locationtech/geowave/adapter/vector/render/DistributedRenderAggregation.java +++ b/extensions/adapters/vector/src/main/java/org/locationtech/geowave/adapter/vector/render/DistributedRenderAggregation.java @@ -176,14 +176,6 @@ public void aggregate(final SimpleFeature entry) { queue.add(entry); } - @Override - public byte[] toBinary() { - return new byte[] {}; - } - - @Override - public void fromBinary(final byte[] bytes) {} - @Override public byte[] resultToBinary(final DistributedRenderResult result) { return result.toBinary();