You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datasketches.apache.org by le...@apache.org on 2020/06/13 00:48:42 UTC
[incubator-datasketches-hive] branch master updated: Minor fixes to
gitignore, travis.yml, SketchesCheckstyle.xml, package-info.
This is an automated email from the ASF dual-hosted git repository.
leerho pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-datasketches-hive.git
The following commit(s) were added to refs/heads/master by this push:
new 3840c79 Minor fixes to gitignore, travis.yml, SketchesCheckstyle.xml, package-info.
3840c79 is described below
commit 3840c79fde9ab58be8dcd8852e73490d8c44a6f4
Author: Lee Rhodes <le...@users.noreply.github.com>
AuthorDate: Fri Jun 12 17:48:19 2020 -0700
Minor fixes to gitignore, travis.yml, SketchesCheckstyle.xml,
package-info.
Added a missing final.
Fixed calls to deprecated methods of datasketches-java 1.3.0.
---
.gitignore | 2 --
.travis.yml | 2 --
.../hive/common/BytesWritableHelper.java | 6 ++--
.../apache/datasketches/hive/kll/GetCdfUDF.java | 3 +-
.../org/apache/datasketches/hive/kll/GetNUDF.java | 3 +-
.../apache/datasketches/hive/kll/GetPmfUDF.java | 3 +-
.../datasketches/hive/kll/GetQuantileUDF.java | 3 +-
.../datasketches/hive/kll/GetQuantilesUDF.java | 3 +-
.../apache/datasketches/hive/kll/GetRankUDF.java | 3 +-
.../datasketches/hive/kll/SketchToStringUDF.java | 3 +-
.../hive/tuple/DataToDoubleSummarySketchUDAF.java | 4 +--
.../datasketches/hive/tuple/SketchEvaluator.java | 4 ++-
.../hive/tuple/UnionDoubleSummarySketchUDAF.java | 2 +-
.../datasketches/hive/tuple/package-info.java | 6 ++--
.../tuple/DataToDoubleSummarySketchUDAFTest.java | 12 ++++---
.../DataToDoubleSummaryWithModeSketchUDAFTest.java | 12 ++++---
.../DoubleSummarySketchToEstimatesUDFTest.java | 13 +++----
.../DoubleSummarySketchToPercentileUDFTest.java | 13 +++----
.../tuple/UnionDoubleSummarySketchUDAFTest.java | 34 +++++++++++-------
.../UnionDoubleSummaryWithModeSketchUDAFTest.java | 42 ++++++++++++++--------
tools/SketchesCheckstyle.xml | 7 ++--
21 files changed, 110 insertions(+), 70 deletions(-)
diff --git a/.gitignore b/.gitignore
index a28a3b9..7ac1ad8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,8 +60,6 @@ build.xml
*.tag
# Jekyll
-Gemfile
-Gemfile.lock
_site/
_*
_*/
diff --git a/.travis.yml b/.travis.yml
index ff150e0..2883397 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,8 +17,6 @@
language: java
-sudo: false # faster builds
-
dist: trusty
jdk:
diff --git a/src/main/java/org/apache/datasketches/hive/common/BytesWritableHelper.java b/src/main/java/org/apache/datasketches/hive/common/BytesWritableHelper.java
index 839c2ed..cd22986 100644
--- a/src/main/java/org/apache/datasketches/hive/common/BytesWritableHelper.java
+++ b/src/main/java/org/apache/datasketches/hive/common/BytesWritableHelper.java
@@ -19,11 +19,11 @@
package org.apache.datasketches.hive.common;
+import java.nio.ByteOrder;
+
import org.apache.datasketches.memory.Memory;
import org.apache.hadoop.io.BytesWritable;
-import java.nio.ByteOrder;
-
/**
* Provides a helper class to simplify frequent operations on BytesWritable.
*/
@@ -33,7 +33,7 @@ public class BytesWritableHelper {
* @param bw Input BytesWritable object
* @return Read-only Memory wrapping the input BytesWritable
*/
- public static Memory wrapAsMemory(BytesWritable bw) {
+ public static Memory wrapAsMemory(final BytesWritable bw) {
return Memory.wrap(bw.getBytes(), 0, bw.getLength(), ByteOrder.nativeOrder());
}
}
diff --git a/src/main/java/org/apache/datasketches/hive/kll/GetCdfUDF.java b/src/main/java/org/apache/datasketches/hive/kll/GetCdfUDF.java
index 12fa3fc..ce58c34 100644
--- a/src/main/java/org/apache/datasketches/hive/kll/GetCdfUDF.java
+++ b/src/main/java/org/apache/datasketches/hive/kll/GetCdfUDF.java
@@ -49,7 +49,8 @@ public class GetCdfUDF extends UDF {
*/
public List<Double> evaluate(final BytesWritable serializedSketch, final Float... splitPoints) {
if (serializedSketch == null) { return null; }
- final KllFloatsSketch sketch = KllFloatsSketch.heapify(BytesWritableHelper.wrapAsMemory(serializedSketch));
+ final KllFloatsSketch sketch =
+ KllFloatsSketch.heapify(BytesWritableHelper.wrapAsMemory(serializedSketch));
final double[] cdf = sketch.getCDF(Util.objectsToPrimitives(splitPoints));
if (cdf == null) { return null; }
return Util.primitivesToList(cdf);
diff --git a/src/main/java/org/apache/datasketches/hive/kll/GetNUDF.java b/src/main/java/org/apache/datasketches/hive/kll/GetNUDF.java
index e129c18..26c126b 100644
--- a/src/main/java/org/apache/datasketches/hive/kll/GetNUDF.java
+++ b/src/main/java/org/apache/datasketches/hive/kll/GetNUDF.java
@@ -37,7 +37,8 @@ public class GetNUDF extends UDF {
*/
public Long evaluate(final BytesWritable serializedSketch) {
if (serializedSketch == null) { return null; }
- final KllFloatsSketch sketch = KllFloatsSketch.heapify(BytesWritableHelper.wrapAsMemory(serializedSketch));
+ final KllFloatsSketch sketch =
+ KllFloatsSketch.heapify(BytesWritableHelper.wrapAsMemory(serializedSketch));
return sketch.getN();
}
diff --git a/src/main/java/org/apache/datasketches/hive/kll/GetPmfUDF.java b/src/main/java/org/apache/datasketches/hive/kll/GetPmfUDF.java
index b30ec31..d5a2c8e 100644
--- a/src/main/java/org/apache/datasketches/hive/kll/GetPmfUDF.java
+++ b/src/main/java/org/apache/datasketches/hive/kll/GetPmfUDF.java
@@ -49,7 +49,8 @@ public class GetPmfUDF extends UDF {
*/
public List<Double> evaluate(final BytesWritable serializedSketch, final Float... splitPoints) {
if (serializedSketch == null) { return null; }
- final KllFloatsSketch sketch = KllFloatsSketch.heapify(BytesWritableHelper.wrapAsMemory(serializedSketch));
+ final KllFloatsSketch sketch =
+ KllFloatsSketch.heapify(BytesWritableHelper.wrapAsMemory(serializedSketch));
final double[] pmf = sketch.getPMF(Util.objectsToPrimitives(splitPoints));
if (pmf == null) { return null; }
return Util.primitivesToList(pmf);
diff --git a/src/main/java/org/apache/datasketches/hive/kll/GetQuantileUDF.java b/src/main/java/org/apache/datasketches/hive/kll/GetQuantileUDF.java
index 966936e..8c5526a 100644
--- a/src/main/java/org/apache/datasketches/hive/kll/GetQuantileUDF.java
+++ b/src/main/java/org/apache/datasketches/hive/kll/GetQuantileUDF.java
@@ -43,7 +43,8 @@ public class GetQuantileUDF extends UDF {
*/
public Float evaluate(final BytesWritable serializedSketch, final double fraction) {
if (serializedSketch == null) { return null; }
- final KllFloatsSketch sketch = KllFloatsSketch.heapify(BytesWritableHelper.wrapAsMemory(serializedSketch));
+ final KllFloatsSketch sketch =
+ KllFloatsSketch.heapify(BytesWritableHelper.wrapAsMemory(serializedSketch));
return sketch.getQuantile(fraction);
}
diff --git a/src/main/java/org/apache/datasketches/hive/kll/GetQuantilesUDF.java b/src/main/java/org/apache/datasketches/hive/kll/GetQuantilesUDF.java
index 599bcd0..32ba7fd 100644
--- a/src/main/java/org/apache/datasketches/hive/kll/GetQuantilesUDF.java
+++ b/src/main/java/org/apache/datasketches/hive/kll/GetQuantilesUDF.java
@@ -46,7 +46,8 @@ public class GetQuantilesUDF extends UDF {
*/
public List<Float> evaluate(final BytesWritable serializedSketch, final Double... fractions) {
if (serializedSketch == null) { return null; }
- final KllFloatsSketch sketch = KllFloatsSketch.heapify(BytesWritableHelper.wrapAsMemory(serializedSketch));
+ final KllFloatsSketch sketch =
+ KllFloatsSketch.heapify(BytesWritableHelper.wrapAsMemory(serializedSketch));
return Util.primitivesToList(sketch.getQuantiles(Util.objectsToPrimitives(fractions)));
}
diff --git a/src/main/java/org/apache/datasketches/hive/kll/GetRankUDF.java b/src/main/java/org/apache/datasketches/hive/kll/GetRankUDF.java
index 3b9ef18..ec17956 100644
--- a/src/main/java/org/apache/datasketches/hive/kll/GetRankUDF.java
+++ b/src/main/java/org/apache/datasketches/hive/kll/GetRankUDF.java
@@ -40,7 +40,8 @@ public class GetRankUDF extends UDF {
*/
public Double evaluate(final BytesWritable serializedSketch, final float value) {
if (serializedSketch == null) { return null; }
- final KllFloatsSketch sketch = KllFloatsSketch.heapify(BytesWritableHelper.wrapAsMemory(serializedSketch));
+ final KllFloatsSketch sketch =
+ KllFloatsSketch.heapify(BytesWritableHelper.wrapAsMemory(serializedSketch));
return sketch.getRank(value);
}
diff --git a/src/main/java/org/apache/datasketches/hive/kll/SketchToStringUDF.java b/src/main/java/org/apache/datasketches/hive/kll/SketchToStringUDF.java
index 80151b2..a8a997a 100644
--- a/src/main/java/org/apache/datasketches/hive/kll/SketchToStringUDF.java
+++ b/src/main/java/org/apache/datasketches/hive/kll/SketchToStringUDF.java
@@ -37,7 +37,8 @@ public class SketchToStringUDF extends UDF {
*/
public String evaluate(final BytesWritable serializedSketch) {
if (serializedSketch == null) { return null; }
- final KllFloatsSketch sketch = KllFloatsSketch.heapify(BytesWritableHelper.wrapAsMemory(serializedSketch));
+ final KllFloatsSketch sketch =
+ KllFloatsSketch.heapify(BytesWritableHelper.wrapAsMemory(serializedSketch));
return sketch.toString();
}
diff --git a/src/main/java/org/apache/datasketches/hive/tuple/DataToDoubleSummarySketchUDAF.java b/src/main/java/org/apache/datasketches/hive/tuple/DataToDoubleSummarySketchUDAF.java
index 19c1284..6e2abdb 100644
--- a/src/main/java/org/apache/datasketches/hive/tuple/DataToDoubleSummarySketchUDAF.java
+++ b/src/main/java/org/apache/datasketches/hive/tuple/DataToDoubleSummarySketchUDAF.java
@@ -71,9 +71,9 @@ public class DataToDoubleSummarySketchUDAF extends DataToSketchUDAF {
private static final SummaryDeserializer<DoubleSummary> SUMMARY_DESERIALIZER =
new DoubleSummaryDeserializer();
private static final SummaryFactory<DoubleSummary> SUMMARY_FACTORY =
- new DoubleSummaryFactory();
+ new DoubleSummaryFactory(DoubleSummary.Mode.Sum);
private static final SummarySetOperations<DoubleSummary> SUMMARY_SET_OPS =
- new DoubleSummarySetOperations();
+ new DoubleSummarySetOperations(DoubleSummary.Mode.Sum);
@Override
protected SummaryDeserializer<DoubleSummary> getSummaryDeserializer() {
diff --git a/src/main/java/org/apache/datasketches/hive/tuple/SketchEvaluator.java b/src/main/java/org/apache/datasketches/hive/tuple/SketchEvaluator.java
index a15b613..03449c2 100644
--- a/src/main/java/org/apache/datasketches/hive/tuple/SketchEvaluator.java
+++ b/src/main/java/org/apache/datasketches/hive/tuple/SketchEvaluator.java
@@ -93,7 +93,9 @@ abstract class SketchEvaluator<S extends Summary> extends GenericUDAFEvaluator {
final BytesWritable serializedSketch =
(BytesWritable) intermediateInspector_.getStructFieldData(
data, intermediateInspector_.getStructFieldRef(SKETCH_FIELD));
- state.update(Sketches.heapifySketch(BytesWritableHelper.wrapAsMemory(serializedSketch), getSummaryDeserializer()));
+ state.update(Sketches.heapifySketch(
+ BytesWritableHelper.wrapAsMemory(serializedSketch),
+ getSummaryDeserializer()));
}
protected void initializeState(final UnionState<S> state, final Object data) {
diff --git a/src/main/java/org/apache/datasketches/hive/tuple/UnionDoubleSummarySketchUDAF.java b/src/main/java/org/apache/datasketches/hive/tuple/UnionDoubleSummarySketchUDAF.java
index 37a7afa..f45c27e 100644
--- a/src/main/java/org/apache/datasketches/hive/tuple/UnionDoubleSummarySketchUDAF.java
+++ b/src/main/java/org/apache/datasketches/hive/tuple/UnionDoubleSummarySketchUDAF.java
@@ -57,7 +57,7 @@ public class UnionDoubleSummarySketchUDAF extends UnionSketchUDAF {
private static final SummaryDeserializer<DoubleSummary> SUMMARY_DESERIALIZER =
new DoubleSummaryDeserializer();
private static final SummarySetOperations<DoubleSummary> SUMMARY_SET_OPS =
- new DoubleSummarySetOperations();
+ new DoubleSummarySetOperations(DoubleSummary.Mode.Sum);
@Override
protected SummaryDeserializer<DoubleSummary> getSummaryDeserializer() {
diff --git a/src/main/java/org/apache/datasketches/hive/tuple/package-info.java b/src/main/java/org/apache/datasketches/hive/tuple/package-info.java
index 366905c..ed031ad 100644
--- a/src/main/java/org/apache/datasketches/hive/tuple/package-info.java
+++ b/src/main/java/org/apache/datasketches/hive/tuple/package-info.java
@@ -27,13 +27,13 @@
*
* <p>There are two sets of Hive UDFs: one for generic Tuple sketch with an example
* implementation for DoubleSummay, and another one for a specialized ArrayOfDoublesSketch.
- *
- * <p> The generic implementation is in the form of abstract classes DataToSketchUDAF and
+ *
+ * <p>The generic implementation is in the form of abstract classes DataToSketchUDAF and
* UnionSketchUDAF to be specialized for particular types of Summary.
* An example implementation for DoubleSumamry is provided: DataToDoubleSummarySketchUDAF and
* UnionDoubleSummarySketchUDAF, as well as UDFs to obtain the results from sketches:
* DoubleSumamrySketchToEstimatesUDF and DoubleSummarySketchToPercentileUDF.
- *
+ *
* <p>UDFs for ArrayOfDoublesSketch: DataToArrayOfDoublesSketchUDAF, UnionArrayOfDoublesSketchUDAF,
* ArrayOfDoublesSketchToEstimatesUDF, ArrayOfDoublesSketchToValuesUDTF.
*
diff --git a/src/test/java/org/apache/datasketches/hive/tuple/DataToDoubleSummarySketchUDAFTest.java b/src/test/java/org/apache/datasketches/hive/tuple/DataToDoubleSummarySketchUDAFTest.java
index 2d7a725..b8a3ba2 100644
--- a/src/test/java/org/apache/datasketches/hive/tuple/DataToDoubleSummarySketchUDAFTest.java
+++ b/src/test/java/org/apache/datasketches/hive/tuple/DataToDoubleSummarySketchUDAFTest.java
@@ -206,14 +206,16 @@ public class DataToDoubleSummarySketchUDAFTest {
@SuppressWarnings("unchecked")
State<DoubleSummary> state = (State<DoubleSummary>) eval.getNewAggregationBuffer();
- UpdatableSketch<Double, DoubleSummary> sketch1 = new UpdatableSketchBuilder<>(new DoubleSummaryFactory()).build();
+ UpdatableSketch<Double, DoubleSummary> sketch1 =
+ new UpdatableSketchBuilder<>(new DoubleSummaryFactory(DoubleSummary.Mode.Sum)).build();
sketch1.update(1, 1.0);
eval.merge(state, Arrays.asList(
new IntWritable(DEFAULT_NOMINAL_ENTRIES),
new BytesWritable(sketch1.compact().toByteArray()))
);
- UpdatableSketch<Double, DoubleSummary> sketch2 = new UpdatableSketchBuilder<>(new DoubleSummaryFactory()).build();
+ UpdatableSketch<Double, DoubleSummary> sketch2 =
+ new UpdatableSketchBuilder<>(new DoubleSummaryFactory(DoubleSummary.Mode.Sum)).build();
sketch2.update(2, 1.0);
eval.merge(state, Arrays.asList(
new IntWritable(DEFAULT_NOMINAL_ENTRIES),
@@ -248,14 +250,16 @@ public class DataToDoubleSummarySketchUDAFTest {
@SuppressWarnings("unchecked")
State<DoubleSummary> state = (State<DoubleSummary>) eval.getNewAggregationBuffer();
- UpdatableSketch<Double, DoubleSummary> sketch1 = new UpdatableSketchBuilder<>(new DoubleSummaryFactory()).build();
+ UpdatableSketch<Double, DoubleSummary> sketch1 =
+ new UpdatableSketchBuilder<>(new DoubleSummaryFactory(DoubleSummary.Mode.Sum)).build();
sketch1.update(1, 1.0);
eval.merge(state, Arrays.asList(
new IntWritable(DEFAULT_NOMINAL_ENTRIES),
new BytesWritable(sketch1.compact().toByteArray()))
);
- UpdatableSketch<Double, DoubleSummary> sketch2 = new UpdatableSketchBuilder<>(new DoubleSummaryFactory()).build();
+ UpdatableSketch<Double, DoubleSummary> sketch2 =
+ new UpdatableSketchBuilder<>(new DoubleSummaryFactory(DoubleSummary.Mode.Sum)).build();
sketch2.update(2, 1.0);
eval.merge(state, Arrays.asList(
new IntWritable(DEFAULT_NOMINAL_ENTRIES),
diff --git a/src/test/java/org/apache/datasketches/hive/tuple/DataToDoubleSummaryWithModeSketchUDAFTest.java b/src/test/java/org/apache/datasketches/hive/tuple/DataToDoubleSummaryWithModeSketchUDAFTest.java
index ab0372c..4ad86ad 100644
--- a/src/test/java/org/apache/datasketches/hive/tuple/DataToDoubleSummaryWithModeSketchUDAFTest.java
+++ b/src/test/java/org/apache/datasketches/hive/tuple/DataToDoubleSummaryWithModeSketchUDAFTest.java
@@ -221,7 +221,8 @@ public class DataToDoubleSummaryWithModeSketchUDAFTest {
@SuppressWarnings("unchecked")
State<DoubleSummary> state = (State<DoubleSummary>) eval.getNewAggregationBuffer();
- UpdatableSketch<Double, DoubleSummary> sketch1 = new UpdatableSketchBuilder<>(new DoubleSummaryFactory()).build();
+ UpdatableSketch<Double, DoubleSummary> sketch1 =
+ new UpdatableSketchBuilder<>(new DoubleSummaryFactory(DoubleSummary.Mode.Sum)).build();
sketch1.update(1, 1.0);
sketch1.update(2, 2.0);
eval.merge(state, Arrays.asList(
@@ -230,7 +231,8 @@ public class DataToDoubleSummaryWithModeSketchUDAFTest {
new BytesWritable(sketch1.compact().toByteArray()))
);
- UpdatableSketch<Double, DoubleSummary> sketch2 = new UpdatableSketchBuilder<>(new DoubleSummaryFactory()).build();
+ UpdatableSketch<Double, DoubleSummary> sketch2 =
+ new UpdatableSketchBuilder<>(new DoubleSummaryFactory(DoubleSummary.Mode.Sum)).build();
sketch2.update(1, 2.0);
sketch2.update(2, 1.0);
eval.merge(state, Arrays.asList(
@@ -272,7 +274,8 @@ public class DataToDoubleSummaryWithModeSketchUDAFTest {
@SuppressWarnings("unchecked")
State<DoubleSummary> state = (State<DoubleSummary>) eval.getNewAggregationBuffer();
- UpdatableSketch<Double, DoubleSummary> sketch1 = new UpdatableSketchBuilder<>(new DoubleSummaryFactory()).build();
+ UpdatableSketch<Double, DoubleSummary> sketch1 =
+ new UpdatableSketchBuilder<>(new DoubleSummaryFactory(DoubleSummary.Mode.Sum)).build();
sketch1.update(1, 1.0);
sketch1.update(2, 2.0);
eval.merge(state, Arrays.asList(
@@ -281,7 +284,8 @@ public class DataToDoubleSummaryWithModeSketchUDAFTest {
new BytesWritable(sketch1.compact().toByteArray()))
);
- UpdatableSketch<Double, DoubleSummary> sketch2 = new UpdatableSketchBuilder<>(new DoubleSummaryFactory()).build();
+ UpdatableSketch<Double, DoubleSummary> sketch2 =
+ new UpdatableSketchBuilder<>(new DoubleSummaryFactory(DoubleSummary.Mode.Sum)).build();
sketch2.update(1, 2.0);
sketch2.update(2, 1.0);
eval.merge(state, Arrays.asList(
diff --git a/src/test/java/org/apache/datasketches/hive/tuple/DoubleSummarySketchToEstimatesUDFTest.java b/src/test/java/org/apache/datasketches/hive/tuple/DoubleSummarySketchToEstimatesUDFTest.java
index 7deb0ae..735491c 100644
--- a/src/test/java/org/apache/datasketches/hive/tuple/DoubleSummarySketchToEstimatesUDFTest.java
+++ b/src/test/java/org/apache/datasketches/hive/tuple/DoubleSummarySketchToEstimatesUDFTest.java
@@ -21,14 +21,13 @@ package org.apache.datasketches.hive.tuple;
import java.util.List;
-import org.apache.hadoop.io.BytesWritable;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
import org.apache.datasketches.tuple.UpdatableSketch;
import org.apache.datasketches.tuple.UpdatableSketchBuilder;
import org.apache.datasketches.tuple.adouble.DoubleSummary;
import org.apache.datasketches.tuple.adouble.DoubleSummaryFactory;
+import org.apache.hadoop.io.BytesWritable;
+import org.testng.Assert;
+import org.testng.annotations.Test;
@SuppressWarnings("javadoc")
public class DoubleSummarySketchToEstimatesUDFTest {
@@ -41,7 +40,8 @@ public class DoubleSummarySketchToEstimatesUDFTest {
@Test
public void emptySketch() {
- UpdatableSketch<Double, DoubleSummary> sketch = new UpdatableSketchBuilder<>(new DoubleSummaryFactory()).build();
+ UpdatableSketch<Double, DoubleSummary> sketch =
+ new UpdatableSketchBuilder<>(new DoubleSummaryFactory(DoubleSummary.Mode.Sum)).build();
List<Double> result = new DoubleSummarySketchToEstimatesUDF().evaluate(new BytesWritable(sketch.compact().toByteArray()));
Assert.assertNotNull(result);
Assert.assertEquals(result.size(), 2);
@@ -51,7 +51,8 @@ public class DoubleSummarySketchToEstimatesUDFTest {
@Test
public void normalCase() {
- UpdatableSketch<Double, DoubleSummary> sketch = new UpdatableSketchBuilder<>(new DoubleSummaryFactory()).build();
+ UpdatableSketch<Double, DoubleSummary> sketch =
+ new UpdatableSketchBuilder<>(new DoubleSummaryFactory(DoubleSummary.Mode.Sum)).build();
sketch.update(1, 1.0);
sketch.update(2, 1.0);
List<Double> result = new DoubleSummarySketchToEstimatesUDF().evaluate(new BytesWritable(sketch.compact().toByteArray()));
diff --git a/src/test/java/org/apache/datasketches/hive/tuple/DoubleSummarySketchToPercentileUDFTest.java b/src/test/java/org/apache/datasketches/hive/tuple/DoubleSummarySketchToPercentileUDFTest.java
index a98b947..3374566 100644
--- a/src/test/java/org/apache/datasketches/hive/tuple/DoubleSummarySketchToPercentileUDFTest.java
+++ b/src/test/java/org/apache/datasketches/hive/tuple/DoubleSummarySketchToPercentileUDFTest.java
@@ -19,14 +19,13 @@
package org.apache.datasketches.hive.tuple;
-import org.apache.hadoop.io.BytesWritable;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
import org.apache.datasketches.tuple.UpdatableSketch;
import org.apache.datasketches.tuple.UpdatableSketchBuilder;
import org.apache.datasketches.tuple.adouble.DoubleSummary;
import org.apache.datasketches.tuple.adouble.DoubleSummaryFactory;
+import org.apache.hadoop.io.BytesWritable;
+import org.testng.Assert;
+import org.testng.annotations.Test;
@SuppressWarnings("javadoc")
public class DoubleSummarySketchToPercentileUDFTest {
@@ -39,7 +38,8 @@ public class DoubleSummarySketchToPercentileUDFTest {
@Test
public void emptySketch() {
- UpdatableSketch<Double, DoubleSummary> sketch = new UpdatableSketchBuilder<>(new DoubleSummaryFactory()).build();
+ UpdatableSketch<Double, DoubleSummary> sketch =
+ new UpdatableSketchBuilder<>(new DoubleSummaryFactory(DoubleSummary.Mode.Sum)).build();
Double result = new DoubleSummarySketchToPercentileUDF().evaluate(new BytesWritable(sketch.compact().toByteArray()), 0.0);
Assert.assertNotNull(result);
Assert.assertEquals(result, Double.NaN);
@@ -47,7 +47,8 @@ public class DoubleSummarySketchToPercentileUDFTest {
@Test
public void normalCase() {
- UpdatableSketch<Double, DoubleSummary> sketch = new UpdatableSketchBuilder<>(new DoubleSummaryFactory()).build();
+ UpdatableSketch<Double, DoubleSummary> sketch =
+ new UpdatableSketchBuilder<>(new DoubleSummaryFactory(DoubleSummary.Mode.Sum)).build();
int iterations = 100000;
for (int i = 0; i < iterations; i++) {
sketch.update(i, (double) i);
diff --git a/src/test/java/org/apache/datasketches/hive/tuple/UnionDoubleSummarySketchUDAFTest.java b/src/test/java/org/apache/datasketches/hive/tuple/UnionDoubleSummarySketchUDAFTest.java
index 5d441c5..95d84e9 100644
--- a/src/test/java/org/apache/datasketches/hive/tuple/UnionDoubleSummarySketchUDAFTest.java
+++ b/src/test/java/org/apache/datasketches/hive/tuple/UnionDoubleSummarySketchUDAFTest.java
@@ -119,11 +119,11 @@ public class UnionDoubleSummarySketchUDAFTest {
@SuppressWarnings("unchecked")
State<DoubleSummary> state = (State<DoubleSummary>) eval.getNewAggregationBuffer();
- UpdatableSketch<Double, DoubleSummary> sketch1 = new UpdatableSketchBuilder<>(new DoubleSummaryFactory()).build();
+ UpdatableSketch<Double, DoubleSummary> sketch1 = new UpdatableSketchBuilder<>(new DoubleSummaryFactory(DoubleSummary.Mode.Sum)).build();
sketch1.update(1, 1.0);
eval.iterate(state, new Object[] {new BytesWritable(sketch1.compact().toByteArray())});
- UpdatableSketch<Double, DoubleSummary> sketch2 = new UpdatableSketchBuilder<>(new DoubleSummaryFactory()).build();
+ UpdatableSketch<Double, DoubleSummary> sketch2 = new UpdatableSketchBuilder<>(new DoubleSummaryFactory(DoubleSummary.Mode.Sum)).build();
sketch2.update(2, 1.0);
eval.iterate(state, new Object[] {new BytesWritable(sketch2.compact().toByteArray())});
@@ -152,13 +152,15 @@ public class UnionDoubleSummarySketchUDAFTest {
State<DoubleSummary> state = (State<DoubleSummary>) eval.getNewAggregationBuffer();
UpdatableSketch<Double, DoubleSummary> sketch1 =
- new UpdatableSketchBuilder<>(new DoubleSummaryFactory()).setNominalEntries(nomNumEntries).build();
+ new UpdatableSketchBuilder<>(new DoubleSummaryFactory(DoubleSummary.Mode.Sum))
+ .setNominalEntries(nomNumEntries).build();
sketch1.update(1, 1.0);
eval.iterate(state, new Object[] {new BytesWritable(sketch1.compact().toByteArray()),
new IntWritable(nomNumEntries)});
UpdatableSketch<Double, DoubleSummary> sketch2 =
- new UpdatableSketchBuilder<>(new DoubleSummaryFactory()).setNominalEntries(nomNumEntries).build();
+ new UpdatableSketchBuilder<>(new DoubleSummaryFactory(DoubleSummary.Mode.Sum))
+ .setNominalEntries(nomNumEntries).build();
sketch2.update(2, 1.0);
eval.iterate(state, new Object[] {new BytesWritable(sketch2.compact().toByteArray()),
new IntWritable(nomNumEntries)});
@@ -187,14 +189,16 @@ public class UnionDoubleSummarySketchUDAFTest {
@SuppressWarnings("unchecked")
State<DoubleSummary> state = (State<DoubleSummary>) eval.getNewAggregationBuffer();
- UpdatableSketch<Double, DoubleSummary> sketch1 = new UpdatableSketchBuilder<>(new DoubleSummaryFactory()).build();
+ UpdatableSketch<Double, DoubleSummary> sketch1 =
+ new UpdatableSketchBuilder<>(new DoubleSummaryFactory(DoubleSummary.Mode.Sum)).build();
sketch1.update(1, 1.0);
eval.merge(state, Arrays.asList(
new IntWritable(DEFAULT_NOMINAL_ENTRIES),
new BytesWritable(sketch1.compact().toByteArray()))
);
- UpdatableSketch<Double, DoubleSummary> sketch2 = new UpdatableSketchBuilder<>(new DoubleSummaryFactory()).build();
+ UpdatableSketch<Double, DoubleSummary> sketch2 =
+ new UpdatableSketchBuilder<>(new DoubleSummaryFactory(DoubleSummary.Mode.Sum)).build();
sketch2.update(2, 1.0);
eval.merge(state, Arrays.asList(
new IntWritable(DEFAULT_NOMINAL_ENTRIES),
@@ -229,14 +233,16 @@ public class UnionDoubleSummarySketchUDAFTest {
@SuppressWarnings("unchecked")
State<DoubleSummary> state = (State<DoubleSummary>) eval.getNewAggregationBuffer();
- UpdatableSketch<Double, DoubleSummary> sketch1 = new UpdatableSketchBuilder<>(new DoubleSummaryFactory()).build();
+ UpdatableSketch<Double, DoubleSummary> sketch1 =
+ new UpdatableSketchBuilder<>(new DoubleSummaryFactory(DoubleSummary.Mode.Sum)).build();
sketch1.update(1, 1.0);
eval.merge(state, Arrays.asList(
new IntWritable(DEFAULT_NOMINAL_ENTRIES),
new BytesWritable(sketch1.compact().toByteArray()))
);
- UpdatableSketch<Double, DoubleSummary> sketch2 = new UpdatableSketchBuilder<>(new DoubleSummaryFactory()).build();
+ UpdatableSketch<Double, DoubleSummary> sketch2 =
+ new UpdatableSketchBuilder<>(new DoubleSummaryFactory(DoubleSummary.Mode.Sum)).build();
sketch2.update(2, 1.0);
eval.merge(state, Arrays.asList(
new IntWritable(DEFAULT_NOMINAL_ENTRIES),
@@ -264,11 +270,13 @@ public class UnionDoubleSummarySketchUDAFTest {
@SuppressWarnings("unchecked")
State<DoubleSummary> state = (State<DoubleSummary>) eval.getNewAggregationBuffer();
- UpdatableSketch<Double, DoubleSummary> sketch1 = new UpdatableSketchBuilder<>(new DoubleSummaryFactory()).build();
+ UpdatableSketch<Double, DoubleSummary> sketch1 =
+ new UpdatableSketchBuilder<>(new DoubleSummaryFactory(DoubleSummary.Mode.Sum)).build();
sketch1.update(1, 1.0);
eval.iterate(state, new Object[] {new BytesWritable(sketch1.compact().toByteArray())});
- UpdatableSketch<Double, DoubleSummary> sketch2 = new UpdatableSketchBuilder<>(new DoubleSummaryFactory()).build();
+ UpdatableSketch<Double, DoubleSummary> sketch2 =
+ new UpdatableSketchBuilder<>(new DoubleSummaryFactory(DoubleSummary.Mode.Sum)).build();
sketch2.update(2, 1.0);
eval.iterate(state, new Object[] {new BytesWritable(sketch2.compact().toByteArray())});
@@ -298,13 +306,15 @@ public class UnionDoubleSummarySketchUDAFTest {
State<DoubleSummary> state = (State<DoubleSummary>) eval.getNewAggregationBuffer();
UpdatableSketch<Double, DoubleSummary> sketch1 =
- new UpdatableSketchBuilder<>(new DoubleSummaryFactory()).setNominalEntries(nomNumEntries).build();
+ new UpdatableSketchBuilder<>(new DoubleSummaryFactory(DoubleSummary.Mode.Sum))
+ .setNominalEntries(nomNumEntries).build();
sketch1.update(1, 1.0);
eval.iterate(state, new Object[] {new BytesWritable(sketch1.compact().toByteArray()),
new IntWritable(nomNumEntries)});
UpdatableSketch<Double, DoubleSummary> sketch2 =
- new UpdatableSketchBuilder<>(new DoubleSummaryFactory()).setNominalEntries(nomNumEntries).build();
+ new UpdatableSketchBuilder<>(new DoubleSummaryFactory(DoubleSummary.Mode.Sum))
+ .setNominalEntries(nomNumEntries).build();
sketch2.update(2, 1.0);
eval.iterate(state, new Object[] {new BytesWritable(sketch2.compact().toByteArray()),
new IntWritable(nomNumEntries)});
diff --git a/src/test/java/org/apache/datasketches/hive/tuple/UnionDoubleSummaryWithModeSketchUDAFTest.java b/src/test/java/org/apache/datasketches/hive/tuple/UnionDoubleSummaryWithModeSketchUDAFTest.java
index 67a5309..41cce66 100644
--- a/src/test/java/org/apache/datasketches/hive/tuple/UnionDoubleSummaryWithModeSketchUDAFTest.java
+++ b/src/test/java/org/apache/datasketches/hive/tuple/UnionDoubleSummaryWithModeSketchUDAFTest.java
@@ -141,12 +141,14 @@ public class UnionDoubleSummaryWithModeSketchUDAFTest {
@SuppressWarnings("unchecked")
State<DoubleSummary> state = (State<DoubleSummary>) eval.getNewAggregationBuffer();
- UpdatableSketch<Double, DoubleSummary> sketch1 = new UpdatableSketchBuilder<>(new DoubleSummaryFactory()).build();
+ UpdatableSketch<Double, DoubleSummary> sketch1 =
+ new UpdatableSketchBuilder<>(new DoubleSummaryFactory(DoubleSummary.Mode.Sum)).build();
sketch1.update(1, 1.0);
sketch1.update(2, 2.0);
eval.iterate(state, new Object[] {new BytesWritable(sketch1.compact().toByteArray())});
- UpdatableSketch<Double, DoubleSummary> sketch2 = new UpdatableSketchBuilder<>(new DoubleSummaryFactory()).build();
+ UpdatableSketch<Double, DoubleSummary> sketch2 =
+ new UpdatableSketchBuilder<>(new DoubleSummaryFactory(DoubleSummary.Mode.Sum)).build();
sketch2.update(1, 2.0);
sketch2.update(2, 1.0);
eval.iterate(state, new Object[] {new BytesWritable(sketch2.compact().toByteArray())});
@@ -181,14 +183,16 @@ public class UnionDoubleSummaryWithModeSketchUDAFTest {
State<DoubleSummary> state = (State<DoubleSummary>) eval.getNewAggregationBuffer();
UpdatableSketch<Double, DoubleSummary> sketch1 =
- new UpdatableSketchBuilder<>(new DoubleSummaryFactory()).setNominalEntries(nomNumEntries).build();
+ new UpdatableSketchBuilder<>(new DoubleSummaryFactory(DoubleSummary.Mode.Sum))
+ .setNominalEntries(nomNumEntries).build();
sketch1.update(1, 1.0);
sketch1.update(2, 2.0);
eval.iterate(state, new Object[] {new BytesWritable(sketch1.compact().toByteArray()),
new IntWritable(nomNumEntries), new Text("Max")});
UpdatableSketch<Double, DoubleSummary> sketch2 =
- new UpdatableSketchBuilder<>(new DoubleSummaryFactory()).setNominalEntries(nomNumEntries).build();
+ new UpdatableSketchBuilder<>(new DoubleSummaryFactory(DoubleSummary.Mode.Sum))
+ .setNominalEntries(nomNumEntries).build();
sketch2.update(1, 2.0);
sketch2.update(2, 1.0);
eval.iterate(state, new Object[] {new BytesWritable(sketch2.compact().toByteArray()),
@@ -223,7 +227,8 @@ public class UnionDoubleSummaryWithModeSketchUDAFTest {
@SuppressWarnings("unchecked")
State<DoubleSummary> state = (State<DoubleSummary>) eval.getNewAggregationBuffer();
- UpdatableSketch<Double, DoubleSummary> sketch1 = new UpdatableSketchBuilder<>(new DoubleSummaryFactory()).build();
+ UpdatableSketch<Double, DoubleSummary> sketch1 =
+ new UpdatableSketchBuilder<>(new DoubleSummaryFactory(DoubleSummary.Mode.Sum)).build();
sketch1.update(1, 1.0);
sketch1.update(2, 2.0);
eval.merge(state, Arrays.asList(
@@ -232,7 +237,8 @@ public class UnionDoubleSummaryWithModeSketchUDAFTest {
new BytesWritable(sketch1.compact().toByteArray()))
);
- UpdatableSketch<Double, DoubleSummary> sketch2 = new UpdatableSketchBuilder<>(new DoubleSummaryFactory()).build();
+ UpdatableSketch<Double, DoubleSummary> sketch2 =
+ new UpdatableSketchBuilder<>(new DoubleSummaryFactory(DoubleSummary.Mode.Sum)).build();
sketch2.update(1, 2.0);
sketch2.update(2, 1.0);
eval.merge(state, Arrays.asList(
@@ -274,7 +280,8 @@ public class UnionDoubleSummaryWithModeSketchUDAFTest {
@SuppressWarnings("unchecked")
State<DoubleSummary> state = (State<DoubleSummary>) eval.getNewAggregationBuffer();
- UpdatableSketch<Double, DoubleSummary> sketch1 = new UpdatableSketchBuilder<>(new DoubleSummaryFactory()).build();
+ UpdatableSketch<Double, DoubleSummary> sketch1 =
+ new UpdatableSketchBuilder<>(new DoubleSummaryFactory(DoubleSummary.Mode.Sum)).build();
sketch1.update(1, 1.0);
sketch1.update(2, 2.0);
eval.merge(state, Arrays.asList(
@@ -283,7 +290,8 @@ public class UnionDoubleSummaryWithModeSketchUDAFTest {
new BytesWritable(sketch1.compact().toByteArray()))
);
- UpdatableSketch<Double, DoubleSummary> sketch2 = new UpdatableSketchBuilder<>(new DoubleSummaryFactory()).build();
+ UpdatableSketch<Double, DoubleSummary> sketch2 =
+ new UpdatableSketchBuilder<>(new DoubleSummaryFactory(DoubleSummary.Mode.Sum)).build();
sketch2.update(1, 2.0);
sketch2.update(2, 1.0);
eval.merge(state, Arrays.asList(
@@ -317,12 +325,14 @@ public class UnionDoubleSummaryWithModeSketchUDAFTest {
@SuppressWarnings("unchecked")
State<DoubleSummary> state = (State<DoubleSummary>) eval.getNewAggregationBuffer();
- UpdatableSketch<Double, DoubleSummary> sketch1 = new UpdatableSketchBuilder<>(new DoubleSummaryFactory()).build();
+ UpdatableSketch<Double, DoubleSummary> sketch1 =
+ new UpdatableSketchBuilder<>(new DoubleSummaryFactory(DoubleSummary.Mode.Sum)).build();
sketch1.update(1, 1.0);
sketch1.update(2, 2.0);
eval.iterate(state, new Object[] {new BytesWritable(sketch1.compact().toByteArray())});
- UpdatableSketch<Double, DoubleSummary> sketch2 = new UpdatableSketchBuilder<>(new DoubleSummaryFactory()).build();
+ UpdatableSketch<Double, DoubleSummary> sketch2 =
+ new UpdatableSketchBuilder<>(new DoubleSummaryFactory(DoubleSummary.Mode.Sum)).build();
sketch2.update(1, 2.0);
sketch2.update(2, 1.0);
eval.iterate(state, new Object[] {new BytesWritable(sketch2.compact().toByteArray())});
@@ -357,14 +367,16 @@ public class UnionDoubleSummaryWithModeSketchUDAFTest {
State<DoubleSummary> state = (State<DoubleSummary>) eval.getNewAggregationBuffer();
UpdatableSketch<Double, DoubleSummary> sketch1 =
- new UpdatableSketchBuilder<>(new DoubleSummaryFactory()).setNominalEntries(nomNumEntries).build();
+ new UpdatableSketchBuilder<>(new DoubleSummaryFactory(DoubleSummary.Mode.Sum))
+ .setNominalEntries(nomNumEntries).build();
sketch1.update(1, 1.0);
sketch1.update(2, 2.0);
eval.iterate(state, new Object[] {new BytesWritable(sketch1.compact().toByteArray()),
new IntWritable(nomNumEntries)});
UpdatableSketch<Double, DoubleSummary> sketch2 =
- new UpdatableSketchBuilder<>(new DoubleSummaryFactory()).setNominalEntries(nomNumEntries).build();
+ new UpdatableSketchBuilder<>(new DoubleSummaryFactory(DoubleSummary.Mode.Sum))
+ .setNominalEntries(nomNumEntries).build();
sketch2.update(1, 2.0);
sketch2.update(2, 1.0);
eval.iterate(state, new Object[] {new BytesWritable(sketch2.compact().toByteArray()),
@@ -400,14 +412,16 @@ public class UnionDoubleSummaryWithModeSketchUDAFTest {
State<DoubleSummary> state = (State<DoubleSummary>) eval.getNewAggregationBuffer();
UpdatableSketch<Double, DoubleSummary> sketch1 =
- new UpdatableSketchBuilder<>(new DoubleSummaryFactory()).setNominalEntries(nomNumEntries).build();
+ new UpdatableSketchBuilder<>(new DoubleSummaryFactory(DoubleSummary.Mode.Sum))
+ .setNominalEntries(nomNumEntries).build();
sketch1.update(1, 1.0);
sketch1.update(2, 2.0);
eval.iterate(state, new Object[] {new BytesWritable(sketch1.compact().toByteArray()),
new IntWritable(nomNumEntries), new Text("Max")});
UpdatableSketch<Double, DoubleSummary> sketch2 =
- new UpdatableSketchBuilder<>(new DoubleSummaryFactory()).setNominalEntries(nomNumEntries).build();
+ new UpdatableSketchBuilder<>(new DoubleSummaryFactory(DoubleSummary.Mode.Sum))
+ .setNominalEntries(nomNumEntries).build();
sketch2.update(1, 2.0);
sketch2.update(2, 1.0);
eval.iterate(state, new Object[] {new BytesWritable(sketch2.compact().toByteArray()),
diff --git a/tools/SketchesCheckstyle.xml b/tools/SketchesCheckstyle.xml
index 90597a9..03a69c3 100644
--- a/tools/SketchesCheckstyle.xml
+++ b/tools/SketchesCheckstyle.xml
@@ -39,7 +39,7 @@ under the License.
<property name="fileExtensions" value="java"/>
<module name="BeforeExecutionExclusionFileFilter">
- <property name="fileNamePattern" value=".*Test\.java$"/>
+ <property name="fileNamePattern" value="src/test/java/.+$"/>
</module>
<module name="FileTabCharacter">
@@ -184,6 +184,7 @@ under the License.
<module name="UnusedImports"/>
+
<!-- Filters -->
<!-- Enable suppression using comments: //CHECKSTYLE.OFF: "RULE" and //CHECKSTYLE.ON: "RULE"
You must specify the specific rule, as in: //CHECKSTYLE.OFF: LineLength -->
@@ -203,10 +204,10 @@ under the License.
<module name="JavadocMethod">
<property name="scope" value="public"/>
<property name="allowMissingParamTags" value="false"/>
- <property name="allowMissingThrowsTags" value="true"/>
+ <!-- <property name="allowMissingThrowsTags" value="true"/> now not allowed ?!? -->
<property name="allowMissingReturnTag" value="false"/>
<property name="allowedAnnotations" value="Override, Test"/>
- <property name="allowThrowsTagsForSubclasses" value="true"/>
+ <!-- <property name="allowThrowsTagsForSubclasses" value="true"/> now not allowed ?!? -->
</module>
<module name="JavadocParagraph"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org