This is an automated email from the ASF dual-hosted git repository. jmalkin pushed a commit to branch java_version_update in repository https://gitbox.apache.org/repos/asf/datasketches-hive.git
commit df76a8e844c766b4213d0b55e55669f8b06554c3 Author: Jon <[email protected]> AuthorDate: Fri May 10 23:45:38 2024 -0700 WIP: Code compiles but still have failing tests to debug --- .../hive/kll/DataToSketchUDAFTest.java | 32 ++++++------ .../datasketches/hive/kll/GetCdfUDFTest.java | 6 +-- .../apache/datasketches/hive/kll/GetNUDFTest.java | 2 +- .../datasketches/hive/kll/GetPmfUDFTest.java | 6 +-- .../datasketches/hive/kll/GetQuantileUDFTest.java | 2 +- .../datasketches/hive/kll/GetQuantilesUDFTest.java | 4 +- .../datasketches/hive/kll/GetRankUDFTest.java | 2 +- .../hive/kll/SektchToStringUDFTest.java | 2 +- .../datasketches/hive/kll/UnionSketchUDAFTest.java | 40 +++++++-------- .../quantiles/DataToDoublesSketchUDAFTest.java | 36 ++++++------- .../quantiles/DataToStringsSketchUDAFTest.java | 56 ++++++++++---------- .../quantiles/GetCdfFromStringsSketchUDFTest.java | 6 +-- .../quantiles/GetKFromStringsSketchUDFTest.java | 2 +- .../quantiles/GetNFromStringsSketchUDFTest.java | 2 +- .../quantiles/GetPmfFromStringsSketchUDFTest.java | 6 +-- .../GetQuantileFromStringsSketchUDFTest.java | 6 +-- .../GetQuantilesFromDoublesSketchUDFTest.java | 2 +- .../GetQuantilesFromStringsSketchUDFTest.java | 16 +++--- .../quantiles/StringsSketchToStringUDFTest.java | 2 +- .../hive/quantiles/UnionDoublesSketchUDAFTest.java | 30 +++++------ .../hive/quantiles/UnionStringsSketchUDAFTest.java | 60 +++++++++++----------- ...rayOfDoublesSketchToQuantilesSketchUDFTest.java | 8 +-- .../DataToDoubleSummaryWithModeSketchUDAFTest.java | 14 ++--- .../UnionDoubleSummaryWithModeSketchUDAFTest.java | 16 +++--- 24 files changed, 179 insertions(+), 179 deletions(-) diff --git a/src/test/java/org/apache/datasketches/hive/kll/DataToSketchUDAFTest.java b/src/test/java/org/apache/datasketches/hive/kll/DataToSketchUDAFTest.java index d4a0c8c..522ec9d 100644 --- a/src/test/java/org/apache/datasketches/hive/kll/DataToSketchUDAFTest.java +++ b/src/test/java/org/apache/datasketches/hive/kll/DataToSketchUDAFTest.java @@ -115,8 +115,8 @@ public class DataToSketchUDAFTest { KllFloatsSketch resultSketch = KllFloatsSketch.heapify(BytesWritableHelper.wrapAsMemory(bytes)); Assert.assertEquals(resultSketch.getNormalizedRankError(false), KllFloatsSketch.getNormalizedRankError(200, false)); Assert.assertEquals(resultSketch.getNumRetained(), 2); - Assert.assertEquals(resultSketch.getMinValue(), 1f); - Assert.assertEquals(resultSketch.getMaxValue(), 2f); + Assert.assertEquals(resultSketch.getMinItem(), 1f); + Assert.assertEquals(resultSketch.getMaxItem(), 2f); } } @@ -136,8 +136,8 @@ public class DataToSketchUDAFTest { KllFloatsSketch resultSketch = KllFloatsSketch.heapify(BytesWritableHelper.wrapAsMemory(bytes)); Assert.assertEquals(resultSketch.getNormalizedRankError(false), KllFloatsSketch.getNormalizedRankError(400, false)); Assert.assertEquals(resultSketch.getNumRetained(), 2); - Assert.assertEquals(resultSketch.getMinValue(), 1f); - Assert.assertEquals(resultSketch.getMaxValue(), 2f); + Assert.assertEquals(resultSketch.getMinItem(), 1f); + Assert.assertEquals(resultSketch.getMaxItem(), 2f); } } @@ -151,19 +151,19 @@ public class DataToSketchUDAFTest { SketchState state = (SketchState) eval.getNewAggregationBuffer(); - KllFloatsSketch sketch1 = new KllFloatsSketch(); + KllFloatsSketch sketch1 = KllFloatsSketch.newHeapInstance(); sketch1.update(1); eval.merge(state, new BytesWritable(sketch1.toByteArray())); - KllFloatsSketch sketch2 = new KllFloatsSketch(); + KllFloatsSketch sketch2 = KllFloatsSketch.newHeapInstance(); sketch2.update(2); eval.merge(state, new BytesWritable(sketch2.toByteArray())); BytesWritable bytes = (BytesWritable) eval.terminate(state); KllFloatsSketch resultSketch = KllFloatsSketch.heapify(BytesWritableHelper.wrapAsMemory(bytes)); Assert.assertEquals(resultSketch.getNumRetained(), 2); - Assert.assertEquals(resultSketch.getMinValue(), 1f); - Assert.assertEquals(resultSketch.getMaxValue(), 2f); + Assert.assertEquals(resultSketch.getMinItem(), 1f); + Assert.assertEquals(resultSketch.getMaxItem(), 2f); } } @@ -177,11 +177,11 @@ public class DataToSketchUDAFTest { SketchState state = (SketchState) eval.getNewAggregationBuffer(); - KllFloatsSketch sketch1 = new KllFloatsSketch(400); // to check if K is preserved + KllFloatsSketch sketch1 = KllFloatsSketch.newHeapInstance(400); // to check if K is preserved sketch1.update(1); eval.merge(state, new BytesWritable(sketch1.toByteArray())); - KllFloatsSketch sketch2 = new KllFloatsSketch(400); + KllFloatsSketch sketch2 = KllFloatsSketch.newHeapInstance(400); sketch2.update(2); eval.merge(state, new BytesWritable(sketch2.toByteArray())); @@ -189,8 +189,8 @@ public class DataToSketchUDAFTest { KllFloatsSketch resultSketch = KllFloatsSketch.heapify(BytesWritableHelper.wrapAsMemory(bytes)); Assert.assertEquals(resultSketch.getNormalizedRankError(false), KllFloatsSketch.getNormalizedRankError(400, false)); Assert.assertEquals(resultSketch.getNumRetained(), 2); - Assert.assertEquals(resultSketch.getMinValue(), 1f); - Assert.assertEquals(resultSketch.getMaxValue(), 2f); + Assert.assertEquals(resultSketch.getMinItem(), 1f); + Assert.assertEquals(resultSketch.getMaxItem(), 2f); } } @@ -211,8 +211,8 @@ public class DataToSketchUDAFTest { KllFloatsSketch resultSketch = KllFloatsSketch.heapify(BytesWritableHelper.wrapAsMemory(bytes)); Assert.assertEquals(resultSketch.getNormalizedRankError(false), KllFloatsSketch.getNormalizedRankError(200, false)); Assert.assertEquals(resultSketch.getNumRetained(), 2); - Assert.assertEquals(resultSketch.getMinValue(), 1f); - Assert.assertEquals(resultSketch.getMaxValue(), 2f); + Assert.assertEquals(resultSketch.getMinItem(), 1f); + Assert.assertEquals(resultSketch.getMaxItem(), 2f); } } @@ -232,8 +232,8 @@ public class DataToSketchUDAFTest { KllFloatsSketch resultSketch = KllFloatsSketch.heapify(BytesWritableHelper.wrapAsMemory(bytes)); Assert.assertEquals(resultSketch.getNormalizedRankError(false), KllFloatsSketch.getNormalizedRankError(400, false)); Assert.assertEquals(resultSketch.getNumRetained(), 2); - Assert.assertEquals(resultSketch.getMinValue(), 1f); - Assert.assertEquals(resultSketch.getMaxValue(), 2f); + Assert.assertEquals(resultSketch.getMinItem(), 1f); + Assert.assertEquals(resultSketch.getMaxItem(), 2f); } } diff --git a/src/test/java/org/apache/datasketches/hive/kll/GetCdfUDFTest.java b/src/test/java/org/apache/datasketches/hive/kll/GetCdfUDFTest.java index ce84bf6..f14c3fb 100644 --- a/src/test/java/org/apache/datasketches/hive/kll/GetCdfUDFTest.java +++ b/src/test/java/org/apache/datasketches/hive/kll/GetCdfUDFTest.java @@ -37,7 +37,7 @@ public class GetCdfUDFTest { @Test public void emptyListOfSplitPoints() { - KllFloatsSketch sketch = new KllFloatsSketch(); + KllFloatsSketch sketch = KllFloatsSketch.newHeapInstance(); sketch.update(1); sketch.update(2); sketch.update(3); @@ -49,14 +49,14 @@ public class GetCdfUDFTest { @Test public void emptySketch() { - KllFloatsSketch sketch = new KllFloatsSketch(); + KllFloatsSketch sketch = KllFloatsSketch.newHeapInstance(); List<Double> result = new GetCdfUDF().evaluate(new BytesWritable(sketch.toByteArray()), 0f); Assert.assertNull(result); } @Test public void normalCase() { - KllFloatsSketch sketch = new KllFloatsSketch(); + KllFloatsSketch sketch = KllFloatsSketch.newHeapInstance(); sketch.update(1); sketch.update(2); sketch.update(3); diff --git a/src/test/java/org/apache/datasketches/hive/kll/GetNUDFTest.java b/src/test/java/org/apache/datasketches/hive/kll/GetNUDFTest.java index 53d6458..2b1efce 100644 --- a/src/test/java/org/apache/datasketches/hive/kll/GetNUDFTest.java +++ b/src/test/java/org/apache/datasketches/hive/kll/GetNUDFTest.java @@ -36,7 +36,7 @@ public class GetNUDFTest { @Test public void normalCase() { - KllFloatsSketch sketch = new KllFloatsSketch(); + KllFloatsSketch sketch = KllFloatsSketch.newHeapInstance(); sketch.update(1); sketch.update(2); sketch.update(3); diff --git a/src/test/java/org/apache/datasketches/hive/kll/GetPmfUDFTest.java b/src/test/java/org/apache/datasketches/hive/kll/GetPmfUDFTest.java index 2793f45..9f3d2c6 100644 --- a/src/test/java/org/apache/datasketches/hive/kll/GetPmfUDFTest.java +++ b/src/test/java/org/apache/datasketches/hive/kll/GetPmfUDFTest.java @@ -37,7 +37,7 @@ public class GetPmfUDFTest { @Test public void emptyListOfSplitPoints() { - KllFloatsSketch sketch = new KllFloatsSketch(); + KllFloatsSketch sketch = KllFloatsSketch.newHeapInstance(); sketch.update(1); sketch.update(2); sketch.update(3); @@ -49,14 +49,14 @@ public class GetPmfUDFTest { @Test public void emptySketch() { - KllFloatsSketch sketch = new KllFloatsSketch(); + KllFloatsSketch sketch = KllFloatsSketch.newHeapInstance(); List<Double> result = new GetPmfUDF().evaluate(new BytesWritable(sketch.toByteArray()), 0f); Assert.assertNull(result); } @Test public void normalCase() { - KllFloatsSketch sketch = new KllFloatsSketch(); + KllFloatsSketch sketch = KllFloatsSketch.newHeapInstance(); sketch.update(1); sketch.update(2); sketch.update(3); diff --git a/src/test/java/org/apache/datasketches/hive/kll/GetQuantileUDFTest.java b/src/test/java/org/apache/datasketches/hive/kll/GetQuantileUDFTest.java index c9bdccc..7e0f269 100644 --- a/src/test/java/org/apache/datasketches/hive/kll/GetQuantileUDFTest.java +++ b/src/test/java/org/apache/datasketches/hive/kll/GetQuantileUDFTest.java @@ -35,7 +35,7 @@ public class GetQuantileUDFTest { @Test public void normalCase() { - KllFloatsSketch sketch = new KllFloatsSketch(); + KllFloatsSketch sketch = KllFloatsSketch.newHeapInstance(); sketch.update(1); sketch.update(2); sketch.update(3); diff --git a/src/test/java/org/apache/datasketches/hive/kll/GetQuantilesUDFTest.java b/src/test/java/org/apache/datasketches/hive/kll/GetQuantilesUDFTest.java index d471422..6a165df 100644 --- a/src/test/java/org/apache/datasketches/hive/kll/GetQuantilesUDFTest.java +++ b/src/test/java/org/apache/datasketches/hive/kll/GetQuantilesUDFTest.java @@ -37,7 +37,7 @@ public class GetQuantilesUDFTest { @Test public void emptyListOfFractions() { - final KllFloatsSketch sketch = new KllFloatsSketch(); + final KllFloatsSketch sketch = KllFloatsSketch.newHeapInstance(); sketch.update(1); sketch.update(2); sketch.update(3); @@ -48,7 +48,7 @@ public class GetQuantilesUDFTest { @Test public void fractionsNormalCase() { - final KllFloatsSketch sketch = new KllFloatsSketch(); + final KllFloatsSketch sketch = KllFloatsSketch.newHeapInstance(); sketch.update(1); sketch.update(2); sketch.update(3); diff --git a/src/test/java/org/apache/datasketches/hive/kll/GetRankUDFTest.java b/src/test/java/org/apache/datasketches/hive/kll/GetRankUDFTest.java index daa4de5..8c87909 100644 --- a/src/test/java/org/apache/datasketches/hive/kll/GetRankUDFTest.java +++ b/src/test/java/org/apache/datasketches/hive/kll/GetRankUDFTest.java @@ -35,7 +35,7 @@ public class GetRankUDFTest { @Test public void normalCase() { - KllFloatsSketch sketch = new KllFloatsSketch(); + KllFloatsSketch sketch = KllFloatsSketch.newHeapInstance(); sketch.update(1); sketch.update(2); sketch.update(3); diff --git a/src/test/java/org/apache/datasketches/hive/kll/SektchToStringUDFTest.java b/src/test/java/org/apache/datasketches/hive/kll/SektchToStringUDFTest.java index 34db524..d44ca8c 100644 --- a/src/test/java/org/apache/datasketches/hive/kll/SektchToStringUDFTest.java +++ b/src/test/java/org/apache/datasketches/hive/kll/SektchToStringUDFTest.java @@ -36,7 +36,7 @@ public class SektchToStringUDFTest { @Test public void normalCase() { - KllFloatsSketch sketch = new KllFloatsSketch(); + KllFloatsSketch sketch = KllFloatsSketch.newHeapInstance(); sketch.update(1); sketch.update(2); sketch.update(3); diff --git a/src/test/java/org/apache/datasketches/hive/kll/UnionSketchUDAFTest.java b/src/test/java/org/apache/datasketches/hive/kll/UnionSketchUDAFTest.java index 16ba82c..4d9623c 100644 --- a/src/test/java/org/apache/datasketches/hive/kll/UnionSketchUDAFTest.java +++ b/src/test/java/org/apache/datasketches/hive/kll/UnionSketchUDAFTest.java @@ -105,11 +105,11 @@ public class UnionSketchUDAFTest { SketchState state = (SketchState) eval.getNewAggregationBuffer(); - KllFloatsSketch sketch1 = new KllFloatsSketch(400); + KllFloatsSketch sketch1 = KllFloatsSketch.newHeapInstance(400); sketch1.update(1); eval.iterate(state, new Object[] { new BytesWritable(sketch1.toByteArray()) }); - KllFloatsSketch sketch2 = new KllFloatsSketch(400); + KllFloatsSketch sketch2 = KllFloatsSketch.newHeapInstance(400); sketch2.update(2); eval.iterate(state, new Object[] { new BytesWritable(sketch2.toByteArray()) }); @@ -117,8 +117,8 @@ public class UnionSketchUDAFTest { KllFloatsSketch resultSketch = KllFloatsSketch.heapify(BytesWritableHelper.wrapAsMemory(bytes)); Assert.assertEquals(resultSketch.getNormalizedRankError(false), KllFloatsSketch.getNormalizedRankError(200, false)); Assert.assertEquals(resultSketch.getNumRetained(), 2); - Assert.assertEquals(resultSketch.getMinValue(), 1f); - Assert.assertEquals(resultSketch.getMaxValue(), 2f); + Assert.assertEquals(resultSketch.getMinItem(), 1f); + Assert.assertEquals(resultSketch.getMaxItem(), 2f); } } @@ -132,11 +132,11 @@ public class UnionSketchUDAFTest { SketchState state = (SketchState) eval.getNewAggregationBuffer(); - KllFloatsSketch sketch1 = new KllFloatsSketch(400); + KllFloatsSketch sketch1 = KllFloatsSketch.newHeapInstance(400); sketch1.update(1); eval.iterate(state, new Object[] { new BytesWritable(sketch1.toByteArray()), new IntWritable(400) }); - KllFloatsSketch sketch2 = new KllFloatsSketch(400); + KllFloatsSketch sketch2 = KllFloatsSketch.newHeapInstance(400); sketch2.update(2); eval.iterate(state, new Object[] { new BytesWritable(sketch2.toByteArray()), new IntWritable(400) }); @@ -144,8 +144,8 @@ public class UnionSketchUDAFTest { KllFloatsSketch resultSketch = KllFloatsSketch.heapify(BytesWritableHelper.wrapAsMemory(bytes)); Assert.assertEquals(resultSketch.getNormalizedRankError(false), KllFloatsSketch.getNormalizedRankError(400, false)); Assert.assertEquals(resultSketch.getNumRetained(), 2); - Assert.assertEquals(resultSketch.getMinValue(), 1f); - Assert.assertEquals(resultSketch.getMaxValue(), 2f); + Assert.assertEquals(resultSketch.getMinItem(), 1f); + Assert.assertEquals(resultSketch.getMaxItem(), 2f); } } @@ -160,11 +160,11 @@ public class UnionSketchUDAFTest { SketchState state = (SketchState) eval.getNewAggregationBuffer(); - KllFloatsSketch sketch1 = new KllFloatsSketch(400); + KllFloatsSketch sketch1 = KllFloatsSketch.newHeapInstance(400); sketch1.update(1); eval.merge(state, new BytesWritable(sketch1.toByteArray())); - KllFloatsSketch sketch2 = new KllFloatsSketch(400); + KllFloatsSketch sketch2 = KllFloatsSketch.newHeapInstance(400); sketch2.update(2); eval.merge(state, new BytesWritable(sketch2.toByteArray())); @@ -172,8 +172,8 @@ public class UnionSketchUDAFTest { KllFloatsSketch resultSketch = KllFloatsSketch.heapify(BytesWritableHelper.wrapAsMemory(bytes)); Assert.assertEquals(resultSketch.getNormalizedRankError(false), KllFloatsSketch.getNormalizedRankError(400, false)); Assert.assertEquals(resultSketch.getNumRetained(), 2); - Assert.assertEquals(resultSketch.getMinValue(), 1f); - Assert.assertEquals(resultSketch.getMaxValue(), 2f); + Assert.assertEquals(resultSketch.getMinItem(), 1f); + Assert.assertEquals(resultSketch.getMaxItem(), 2f); } } @@ -188,11 +188,11 @@ public class UnionSketchUDAFTest { SketchState state = (SketchState) eval.getNewAggregationBuffer(); - KllFloatsSketch sketch1 = new KllFloatsSketch(400); + KllFloatsSketch sketch1 = KllFloatsSketch.newHeapInstance(400); sketch1.update(1); eval.merge(state, new BytesWritable(sketch1.toByteArray())); - KllFloatsSketch sketch2 = new KllFloatsSketch(400); + KllFloatsSketch sketch2 = KllFloatsSketch.newHeapInstance(400); sketch2.update(2); eval.merge(state, new BytesWritable(sketch2.toByteArray())); @@ -200,8 +200,8 @@ public class UnionSketchUDAFTest { KllFloatsSketch resultSketch = KllFloatsSketch.heapify(BytesWritableHelper.wrapAsMemory(bytes)); Assert.assertEquals(resultSketch.getNormalizedRankError(false), KllFloatsSketch.getNormalizedRankError(400, false)); Assert.assertEquals(resultSketch.getNumRetained(), 2); - Assert.assertEquals(resultSketch.getMinValue(), 1f); - Assert.assertEquals(resultSketch.getMaxValue(), 2f); + Assert.assertEquals(resultSketch.getMinItem(), 1f); + Assert.assertEquals(resultSketch.getMaxItem(), 2f); } } @@ -216,11 +216,11 @@ public class UnionSketchUDAFTest { SketchState state = (SketchState) eval.getNewAggregationBuffer(); - KllFloatsSketch sketch1 = new KllFloatsSketch(); + KllFloatsSketch sketch1 = KllFloatsSketch.newHeapInstance(); sketch1.update(1); eval.iterate(state, new Object[] { new BytesWritable(sketch1.toByteArray()) }); - KllFloatsSketch sketch2 = new KllFloatsSketch(); + KllFloatsSketch sketch2 = KllFloatsSketch.newHeapInstance(); sketch2.update(2); eval.iterate(state, new Object[] { new BytesWritable(sketch2.toByteArray()) }); @@ -228,8 +228,8 @@ public class UnionSketchUDAFTest { KllFloatsSketch resultSketch = KllFloatsSketch.heapify(BytesWritableHelper.wrapAsMemory(bytes)); Assert.assertEquals(resultSketch.getNormalizedRankError(false), KllFloatsSketch.getNormalizedRankError(200, false)); Assert.assertEquals(resultSketch.getNumRetained(), 2); - Assert.assertEquals(resultSketch.getMinValue(), 1f); - Assert.assertEquals(resultSketch.getMaxValue(), 2f); + Assert.assertEquals(resultSketch.getMinItem(), 1f); + Assert.assertEquals(resultSketch.getMaxItem(), 2f); eval.reset(state); Assert.assertNull(eval.terminate(state)); diff --git a/src/test/java/org/apache/datasketches/hive/quantiles/DataToDoublesSketchUDAFTest.java b/src/test/java/org/apache/datasketches/hive/quantiles/DataToDoublesSketchUDAFTest.java index 6368ec7..082b6a8 100644 --- a/src/test/java/org/apache/datasketches/hive/quantiles/DataToDoublesSketchUDAFTest.java +++ b/src/test/java/org/apache/datasketches/hive/quantiles/DataToDoublesSketchUDAFTest.java @@ -115,9 +115,9 @@ public class DataToDoublesSketchUDAFTest { BytesWritable bytes = (BytesWritable) eval.terminatePartial(state); DoublesSketch resultSketch = DoublesSketch.wrap(BytesWritableHelper.wrapAsMemory(bytes)); Assert.assertEquals(resultSketch.getK(), 128); - Assert.assertEquals(resultSketch.getRetainedItems(), 2); - Assert.assertEquals(resultSketch.getMinValue(), 1.0); - Assert.assertEquals(resultSketch.getMaxValue(), 2.0); + Assert.assertEquals(resultSketch.getNumRetained(), 2); + Assert.assertEquals(resultSketch.getMinItem(), 1.0); + Assert.assertEquals(resultSketch.getMaxItem(), 2.0); } } @@ -136,9 +136,9 @@ public class DataToDoublesSketchUDAFTest { BytesWritable bytes = (BytesWritable) eval.terminatePartial(state); DoublesSketch resultSketch = DoublesSketch.wrap(BytesWritableHelper.wrapAsMemory(bytes)); Assert.assertEquals(resultSketch.getK(), 256); - Assert.assertEquals(resultSketch.getRetainedItems(), 2); - Assert.assertEquals(resultSketch.getMinValue(), 1.0); - Assert.assertEquals(resultSketch.getMaxValue(), 2.0); + Assert.assertEquals(resultSketch.getNumRetained(), 2); + Assert.assertEquals(resultSketch.getMinItem(), 1.0); + Assert.assertEquals(resultSketch.getMaxItem(), 2.0); } } @@ -162,9 +162,9 @@ public class DataToDoublesSketchUDAFTest { BytesWritable bytes = (BytesWritable) eval.terminate(state); DoublesSketch resultSketch = DoublesSketch.wrap(BytesWritableHelper.wrapAsMemory(bytes)); - Assert.assertEquals(resultSketch.getRetainedItems(), 2); - Assert.assertEquals(resultSketch.getMinValue(), 1.0); - Assert.assertEquals(resultSketch.getMaxValue(), 2.0); + Assert.assertEquals(resultSketch.getNumRetained(), 2); + Assert.assertEquals(resultSketch.getMinItem(), 1.0); + Assert.assertEquals(resultSketch.getMaxItem(), 2.0); } } @@ -189,9 +189,9 @@ public class DataToDoublesSketchUDAFTest { BytesWritable bytes = (BytesWritable) eval.terminate(state); DoublesSketch resultSketch = DoublesSketch.wrap(BytesWritableHelper.wrapAsMemory(bytes)); Assert.assertEquals(resultSketch.getK(), 256); - Assert.assertEquals(resultSketch.getRetainedItems(), 2); - Assert.assertEquals(resultSketch.getMinValue(), 1.0); - Assert.assertEquals(resultSketch.getMaxValue(), 2.0); + Assert.assertEquals(resultSketch.getNumRetained(), 2); + Assert.assertEquals(resultSketch.getMinItem(), 1.0); + Assert.assertEquals(resultSketch.getMaxItem(), 2.0); } } @@ -211,9 +211,9 @@ public class DataToDoublesSketchUDAFTest { BytesWritable bytes = (BytesWritable) eval.terminate(state); DoublesSketch resultSketch = DoublesSketch.wrap(BytesWritableHelper.wrapAsMemory(bytes)); Assert.assertEquals(resultSketch.getK(), 128); - Assert.assertEquals(resultSketch.getRetainedItems(), 2); - Assert.assertEquals(resultSketch.getMinValue(), 1.0); - Assert.assertEquals(resultSketch.getMaxValue(), 2.0); + Assert.assertEquals(resultSketch.getNumRetained(), 2); + Assert.assertEquals(resultSketch.getMinItem(), 1.0); + Assert.assertEquals(resultSketch.getMaxItem(), 2.0); } } @@ -232,9 +232,9 @@ public class DataToDoublesSketchUDAFTest { BytesWritable bytes = (BytesWritable) eval.terminate(state); DoublesSketch resultSketch = DoublesSketch.wrap(BytesWritableHelper.wrapAsMemory(bytes)); Assert.assertEquals(resultSketch.getK(), 256); - Assert.assertEquals(resultSketch.getRetainedItems(), 2); - Assert.assertEquals(resultSketch.getMinValue(), 1.0); - Assert.assertEquals(resultSketch.getMaxValue(), 2.0); + Assert.assertEquals(resultSketch.getNumRetained(), 2); + Assert.assertEquals(resultSketch.getMinItem(), 1.0); + Assert.assertEquals(resultSketch.getMaxItem(), 2.0); } } diff --git a/src/test/java/org/apache/datasketches/hive/quantiles/DataToStringsSketchUDAFTest.java b/src/test/java/org/apache/datasketches/hive/quantiles/DataToStringsSketchUDAFTest.java index db75b23..6072d2a 100644 --- a/src/test/java/org/apache/datasketches/hive/quantiles/DataToStringsSketchUDAFTest.java +++ b/src/test/java/org/apache/datasketches/hive/quantiles/DataToStringsSketchUDAFTest.java @@ -110,11 +110,11 @@ public class DataToStringsSketchUDAFTest { eval.iterate(state, new Object[] { new org.apache.hadoop.io.Text("b") }); BytesWritable bytes = (BytesWritable) eval.terminatePartial(state); - ItemsSketch<String> resultSketch = ItemsSketch.getInstance(BytesWritableHelper.wrapAsMemory(bytes), comparator, serDe); + ItemsSketch<String> resultSketch = ItemsSketch.getInstance(String.class, BytesWritableHelper.wrapAsMemory(bytes), comparator, serDe); Assert.assertEquals(resultSketch.getK(), 128); - Assert.assertEquals(resultSketch.getRetainedItems(), 2); - Assert.assertEquals(resultSketch.getMinValue(), "a"); - Assert.assertEquals(resultSketch.getMaxValue(), "b"); + Assert.assertEquals(resultSketch.getNumRetained(), 2); + Assert.assertEquals(resultSketch.getMinItem(), "a"); + Assert.assertEquals(resultSketch.getMaxItem(), "b"); } } @@ -132,11 +132,11 @@ public class DataToStringsSketchUDAFTest { eval.iterate(state, new Object[] { new org.apache.hadoop.io.Text("b"), new IntWritable(256) }); BytesWritable bytes = (BytesWritable) eval.terminatePartial(state); - ItemsSketch<String> resultSketch = ItemsSketch.getInstance(BytesWritableHelper.wrapAsMemory(bytes), comparator, serDe); + ItemsSketch<String> resultSketch = ItemsSketch.getInstance(String.class, BytesWritableHelper.wrapAsMemory(bytes), comparator, serDe); Assert.assertEquals(resultSketch.getK(), 256); - Assert.assertEquals(resultSketch.getRetainedItems(), 2); - Assert.assertEquals(resultSketch.getMinValue(), "a"); - Assert.assertEquals(resultSketch.getMaxValue(), "b"); + Assert.assertEquals(resultSketch.getNumRetained(), 2); + Assert.assertEquals(resultSketch.getMinItem(), "a"); + Assert.assertEquals(resultSketch.getMaxItem(), "b"); } } @@ -152,20 +152,20 @@ public class DataToStringsSketchUDAFTest { @SuppressWarnings("unchecked") ItemsUnionState<String> state = (ItemsUnionState<String>) eval.getNewAggregationBuffer(); - ItemsSketch<String> sketch1 = ItemsSketch.getInstance(256, comparator); + ItemsSketch<String> sketch1 = ItemsSketch.getInstance(String.class, 256, comparator); sketch1.update("a"); eval.merge(state, new BytesWritable(sketch1.toByteArray(serDe))); - ItemsSketch<String> sketch2 = ItemsSketch.getInstance(256, comparator); + ItemsSketch<String> sketch2 = ItemsSketch.getInstance(String.class, 256, comparator); sketch2.update("b"); eval.merge(state, new BytesWritable(sketch2.toByteArray(serDe))); BytesWritable bytes = (BytesWritable) eval.terminatePartial(state); - ItemsSketch<String> resultSketch = ItemsSketch.getInstance(BytesWritableHelper.wrapAsMemory(bytes), comparator, serDe); + ItemsSketch<String> resultSketch = ItemsSketch.getInstance(String.class, BytesWritableHelper.wrapAsMemory(bytes), comparator, serDe); Assert.assertEquals(resultSketch.getK(), 256); - Assert.assertEquals(resultSketch.getRetainedItems(), 2); - Assert.assertEquals(resultSketch.getMinValue(), "a"); - Assert.assertEquals(resultSketch.getMaxValue(), "b"); + Assert.assertEquals(resultSketch.getNumRetained(), 2); + Assert.assertEquals(resultSketch.getMinItem(), "a"); + Assert.assertEquals(resultSketch.getMaxItem(), "b"); } } @@ -181,20 +181,20 @@ public class DataToStringsSketchUDAFTest { @SuppressWarnings("unchecked") ItemsUnionState<String> state = (ItemsUnionState<String>) eval.getNewAggregationBuffer(); - ItemsSketch<String> sketch1 = ItemsSketch.getInstance(comparator); + ItemsSketch<String> sketch1 = ItemsSketch.getInstance(String.class, comparator); sketch1.update("a"); eval.merge(state, new BytesWritable(sketch1.toByteArray(serDe))); - ItemsSketch<String> sketch2 = ItemsSketch.getInstance(comparator); + ItemsSketch<String> sketch2 = ItemsSketch.getInstance(String.class, comparator); sketch2.update("b"); eval.merge(state, new BytesWritable(sketch2.toByteArray(serDe))); BytesWritable bytes = (BytesWritable) eval.terminate(state); - ItemsSketch<String> resultSketch = ItemsSketch.getInstance(BytesWritableHelper.wrapAsMemory(bytes), comparator, serDe); + ItemsSketch<String> resultSketch = ItemsSketch.getInstance(String.class, BytesWritableHelper.wrapAsMemory(bytes), comparator, serDe); Assert.assertEquals(resultSketch.getK(), 128); - Assert.assertEquals(resultSketch.getRetainedItems(), 2); - Assert.assertEquals(resultSketch.getMinValue(), "a"); - Assert.assertEquals(resultSketch.getMaxValue(), "b"); + Assert.assertEquals(resultSketch.getNumRetained(), 2); + Assert.assertEquals(resultSketch.getMinItem(), "a"); + Assert.assertEquals(resultSketch.getMaxItem(), "b"); } } @@ -213,11 +213,11 @@ public class DataToStringsSketchUDAFTest { eval.iterate(state, new Object[] { new org.apache.hadoop.io.Text("b") }); BytesWritable bytes = (BytesWritable) eval.terminate(state); - ItemsSketch<String> resultSketch = ItemsSketch.getInstance(BytesWritableHelper.wrapAsMemory(bytes), comparator, serDe); + ItemsSketch<String> resultSketch = ItemsSketch.getInstance(String.class, BytesWritableHelper.wrapAsMemory(bytes), comparator, serDe); Assert.assertEquals(resultSketch.getK(), 128); - Assert.assertEquals(resultSketch.getRetainedItems(), 2); - Assert.assertEquals(resultSketch.getMinValue(), "a"); - Assert.assertEquals(resultSketch.getMaxValue(), "b"); + Assert.assertEquals(resultSketch.getNumRetained(), 2); + Assert.assertEquals(resultSketch.getMinItem(), "a"); + Assert.assertEquals(resultSketch.getMaxItem(), "b"); } } @@ -235,11 +235,11 @@ public class DataToStringsSketchUDAFTest { eval.iterate(state, new Object[] { new org.apache.hadoop.io.Text("b"), new IntWritable(256) }); BytesWritable bytes = (BytesWritable) eval.terminate(state); - ItemsSketch<String> resultSketch = ItemsSketch.getInstance(BytesWritableHelper.wrapAsMemory(bytes), comparator, serDe); + ItemsSketch<String> resultSketch = ItemsSketch.getInstance(String.class, BytesWritableHelper.wrapAsMemory(bytes), comparator, serDe); Assert.assertEquals(resultSketch.getK(), 256); - Assert.assertEquals(resultSketch.getRetainedItems(), 2); - Assert.assertEquals(resultSketch.getMinValue(), "a"); - Assert.assertEquals(resultSketch.getMaxValue(), "b"); + Assert.assertEquals(resultSketch.getNumRetained(), 2); + Assert.assertEquals(resultSketch.getMinItem(), "a"); + Assert.assertEquals(resultSketch.getMaxItem(), "b"); } } diff --git a/src/test/java/org/apache/datasketches/hive/quantiles/GetCdfFromStringsSketchUDFTest.java b/src/test/java/org/apache/datasketches/hive/quantiles/GetCdfFromStringsSketchUDFTest.java index 1ae86b1..b3cdb59 100644 --- a/src/test/java/org/apache/datasketches/hive/quantiles/GetCdfFromStringsSketchUDFTest.java +++ b/src/test/java/org/apache/datasketches/hive/quantiles/GetCdfFromStringsSketchUDFTest.java @@ -43,7 +43,7 @@ public class GetCdfFromStringsSketchUDFTest { @Test public void emptyListOfSplitPoints() { - ItemsSketch<String> sketch = ItemsSketch.getInstance(comparator); + ItemsSketch<String> sketch = ItemsSketch.getInstance(String.class, comparator); sketch.update("a"); sketch.update("b"); sketch.update("c"); @@ -55,14 +55,14 @@ public class GetCdfFromStringsSketchUDFTest { @Test public void emptySketch() { - ItemsSketch<String> sketch = ItemsSketch.getInstance(comparator); + ItemsSketch<String> sketch = ItemsSketch.getInstance(String.class, comparator); List<Double> result = new GetCdfFromStringsSketchUDF().evaluate(new BytesWritable(sketch.toByteArray(serDe)), "a"); Assert.assertNull(result); } @Test public void normalCase() { - ItemsSketch<String> sketch = ItemsSketch.getInstance(comparator); + ItemsSketch<String> sketch = ItemsSketch.getInstance(String.class, comparator); sketch.update("a"); sketch.update("b"); sketch.update("c"); diff --git a/src/test/java/org/apache/datasketches/hive/quantiles/GetKFromStringsSketchUDFTest.java b/src/test/java/org/apache/datasketches/hive/quantiles/GetKFromStringsSketchUDFTest.java index 86c63e2..68a6874 100644 --- a/src/test/java/org/apache/datasketches/hive/quantiles/GetKFromStringsSketchUDFTest.java +++ b/src/test/java/org/apache/datasketches/hive/quantiles/GetKFromStringsSketchUDFTest.java @@ -44,7 +44,7 @@ public class GetKFromStringsSketchUDFTest { @Test public void normalCase() { - ItemsSketch<String> sketch = ItemsSketch.getInstance(comparator); + ItemsSketch<String> sketch = ItemsSketch.getInstance(String.class, comparator); Integer result = new GetKFromStringsSketchUDF().evaluate(new BytesWritable(sketch.toByteArray(serDe))); Assert.assertNotNull(result); Assert.assertEquals(result, Integer.valueOf(128)); diff --git a/src/test/java/org/apache/datasketches/hive/quantiles/GetNFromStringsSketchUDFTest.java b/src/test/java/org/apache/datasketches/hive/quantiles/GetNFromStringsSketchUDFTest.java index 78f11c8..eec5354 100644 --- a/src/test/java/org/apache/datasketches/hive/quantiles/GetNFromStringsSketchUDFTest.java +++ b/src/test/java/org/apache/datasketches/hive/quantiles/GetNFromStringsSketchUDFTest.java @@ -44,7 +44,7 @@ public class GetNFromStringsSketchUDFTest { @Test public void normalCase() { - ItemsSketch<String> sketch = ItemsSketch.getInstance(comparator); + ItemsSketch<String> sketch = ItemsSketch.getInstance(String.class, comparator); sketch.update("a"); sketch.update("b"); sketch.update("c"); diff --git a/src/test/java/org/apache/datasketches/hive/quantiles/GetPmfFromStringsSketchUDFTest.java b/src/test/java/org/apache/datasketches/hive/quantiles/GetPmfFromStringsSketchUDFTest.java index a428eb4..b969c39 100644 --- a/src/test/java/org/apache/datasketches/hive/quantiles/GetPmfFromStringsSketchUDFTest.java +++ b/src/test/java/org/apache/datasketches/hive/quantiles/GetPmfFromStringsSketchUDFTest.java @@ -43,7 +43,7 @@ public class GetPmfFromStringsSketchUDFTest { @Test public void emptyListOfSplitPoints() { - ItemsSketch<String> sketch = ItemsSketch.getInstance(comparator); + ItemsSketch<String> sketch = ItemsSketch.getInstance(String.class, comparator); sketch.update("a"); sketch.update("b"); sketch.update("c"); @@ -55,14 +55,14 @@ public class GetPmfFromStringsSketchUDFTest { @Test public void emptySketch() { - ItemsSketch<String> sketch = ItemsSketch.getInstance(comparator); + ItemsSketch<String> sketch = ItemsSketch.getInstance(String.class, comparator); List<Double> result = new GetPmfFromStringsSketchUDF().evaluate(new BytesWritable(sketch.toByteArray(serDe)), "a"); Assert.assertNull(result); } @Test public void normalCase() { - ItemsSketch<String> sketch = ItemsSketch.getInstance(comparator); + ItemsSketch<String> sketch = ItemsSketch.getInstance(String.class, comparator); sketch.update("a"); sketch.update("b"); sketch.update("c"); diff --git a/src/test/java/org/apache/datasketches/hive/quantiles/GetQuantileFromStringsSketchUDFTest.java b/src/test/java/org/apache/datasketches/hive/quantiles/GetQuantileFromStringsSketchUDFTest.java index edf90b2..650eeb0 100644 --- a/src/test/java/org/apache/datasketches/hive/quantiles/GetQuantileFromStringsSketchUDFTest.java +++ b/src/test/java/org/apache/datasketches/hive/quantiles/GetQuantileFromStringsSketchUDFTest.java @@ -28,7 +28,7 @@ import org.testng.annotations.Test; import org.apache.datasketches.common.ArrayOfItemsSerDe; import org.apache.datasketches.common.ArrayOfLongsSerDe; import org.apache.datasketches.common.ArrayOfStringsSerDe; -import org.apache.datasketches.SketchesArgumentException; +import org.apache.datasketches.common.SketchesArgumentException; import org.apache.datasketches.quantiles.ItemsSketch; @SuppressWarnings("javadoc") @@ -45,7 +45,7 @@ public class GetQuantileFromStringsSketchUDFTest { @Test public void normalCase() { - ItemsSketch<String> sketch = ItemsSketch.getInstance(comparator); + ItemsSketch<String> sketch = ItemsSketch.getInstance(String.class, comparator); sketch.update("a"); sketch.update("b"); sketch.update("c"); @@ -59,7 +59,7 @@ public class GetQuantileFromStringsSketchUDFTest { //If a bounds error is not detected from a wrong type assignment, unexpected results could occur. @Test(expectedExceptions = SketchesArgumentException.class) public void fractionsWrongSketchType() { - ItemsSketch<Long> sketch = ItemsSketch.getInstance(Comparator.naturalOrder()); + ItemsSketch<Long> sketch = ItemsSketch.getInstance(Long.class, Comparator.naturalOrder()); sketch.update(1L); sketch.update(2L); sketch.update(3L); diff --git a/src/test/java/org/apache/datasketches/hive/quantiles/GetQuantilesFromDoublesSketchUDFTest.java b/src/test/java/org/apache/datasketches/hive/quantiles/GetQuantilesFromDoublesSketchUDFTest.java index c399969..4195c54 100644 --- a/src/test/java/org/apache/datasketches/hive/quantiles/GetQuantilesFromDoublesSketchUDFTest.java +++ b/src/test/java/org/apache/datasketches/hive/quantiles/GetQuantilesFromDoublesSketchUDFTest.java @@ -21,7 +21,7 @@ package org.apache.datasketches.hive.quantiles; import java.util.List; -import org.apache.datasketches.SketchesArgumentException; +import org.apache.datasketches.common.SketchesArgumentException; import org.apache.datasketches.quantiles.DoublesSketch; import org.apache.datasketches.quantiles.UpdateDoublesSketch; import org.apache.hadoop.io.BytesWritable; diff --git a/src/test/java/org/apache/datasketches/hive/quantiles/GetQuantilesFromStringsSketchUDFTest.java b/src/test/java/org/apache/datasketches/hive/quantiles/GetQuantilesFromStringsSketchUDFTest.java index 47c0f72..df58b74 100644 --- a/src/test/java/org/apache/datasketches/hive/quantiles/GetQuantilesFromStringsSketchUDFTest.java +++ b/src/test/java/org/apache/datasketches/hive/quantiles/GetQuantilesFromStringsSketchUDFTest.java @@ -29,7 +29,7 @@ import org.testng.annotations.Test; import org.apache.datasketches.common.ArrayOfItemsSerDe; import org.apache.datasketches.common.ArrayOfLongsSerDe; import org.apache.datasketches.common.ArrayOfStringsSerDe; -import org.apache.datasketches.SketchesArgumentException; +import org.apache.datasketches.common.SketchesArgumentException; import org.apache.datasketches.quantiles.ItemsSketch; @SuppressWarnings("javadoc") @@ -46,7 +46,7 @@ public class GetQuantilesFromStringsSketchUDFTest { @Test public void emptyListOfFractions() { - ItemsSketch<String> sketch = ItemsSketch.getInstance(comparator); + ItemsSketch<String> sketch = ItemsSketch.getInstance(String.class, comparator); sketch.update("a"); sketch.update("b"); sketch.update("c"); @@ -57,7 +57,7 @@ public class GetQuantilesFromStringsSketchUDFTest { @Test public void fractionsNormalCase() { - ItemsSketch<String> sketch = ItemsSketch.getInstance(comparator); + ItemsSketch<String> sketch = ItemsSketch.getInstance(String.class, comparator); sketch.update("a"); sketch.update("b"); sketch.update("c"); @@ -71,7 +71,7 @@ public class GetQuantilesFromStringsSketchUDFTest { @Test(expectedExceptions = SketchesArgumentException.class) public void evenlySpacedZero() { - ItemsSketch<String> sketch = ItemsSketch.getInstance(comparator); + ItemsSketch<String> sketch = ItemsSketch.getInstance(String.class, comparator); sketch.update("a"); new GetQuantilesFromStringsSketchUDF() .evaluate(new BytesWritable(sketch.toByteArray(serDe)), 0); @@ -79,14 +79,14 @@ public class GetQuantilesFromStringsSketchUDFTest { @Test public void evenlySpacedEmptySketch() { - ItemsSketch<String> sketch = ItemsSketch.getInstance(comparator); + ItemsSketch<String> sketch = ItemsSketch.getInstance(String.class, comparator); List<String> result = new GetQuantilesFromStringsSketchUDF().evaluate(new BytesWritable(sketch.toByteArray(serDe)), 1); Assert.assertNull(result); } @Test public void evenlySpacedNormalCase() { - ItemsSketch<String> sketch = ItemsSketch.getInstance(comparator); + ItemsSketch<String> sketch = ItemsSketch.getInstance(String.class, comparator); sketch.update("a"); sketch.update("b"); sketch.update("c"); @@ -102,7 +102,7 @@ public class GetQuantilesFromStringsSketchUDFTest { //If a bounds error is not detected from a wrong type assignment, unexpected results could occur. @Test(expectedExceptions = SketchesArgumentException.class) public void fractionsWrongSketchType() { - ItemsSketch<Long> sketch = ItemsSketch.getInstance(Comparator.naturalOrder()); + ItemsSketch<Long> sketch = ItemsSketch.getInstance(Long.class, Comparator.naturalOrder()); sketch.update(1L); sketch.update(2L); sketch.update(3L); @@ -114,7 +114,7 @@ public class GetQuantilesFromStringsSketchUDFTest { //If a bounds error is not detected from a wrong type assignment, unexpected results could occur. @Test(expectedExceptions = SketchesArgumentException.class) public void evenlySpacedWrongSketchType() { - ItemsSketch<Long> sketch = ItemsSketch.getInstance(Comparator.naturalOrder()); + ItemsSketch<Long> sketch = ItemsSketch.getInstance(Long.class, Comparator.naturalOrder()); sketch.update(1L); sketch.update(2L); sketch.update(3L); diff --git a/src/test/java/org/apache/datasketches/hive/quantiles/StringsSketchToStringUDFTest.java b/src/test/java/org/apache/datasketches/hive/quantiles/StringsSketchToStringUDFTest.java index 4a15f30..dc8fa94 100644 --- a/src/test/java/org/apache/datasketches/hive/quantiles/StringsSketchToStringUDFTest.java +++ b/src/test/java/org/apache/datasketches/hive/quantiles/StringsSketchToStringUDFTest.java @@ -44,7 +44,7 @@ public class StringsSketchToStringUDFTest { @Test public void normalCase() { - final ItemsSketch<String> sketch = ItemsSketch.getInstance(COMPARATOR); + final ItemsSketch<String> sketch = ItemsSketch.getInstance(String.class, COMPARATOR); final String result = new StringsSketchToStringUDF().evaluate(new BytesWritable(sketch.toByteArray(SERDE))); Assert.assertNotNull(result); Assert.assertTrue(result.length() > 0); diff --git a/src/test/java/org/apache/datasketches/hive/quantiles/UnionDoublesSketchUDAFTest.java b/src/test/java/org/apache/datasketches/hive/quantiles/UnionDoublesSketchUDAFTest.java index b818a19..1a3d5ee 100644 --- a/src/test/java/org/apache/datasketches/hive/quantiles/UnionDoublesSketchUDAFTest.java +++ b/src/test/java/org/apache/datasketches/hive/quantiles/UnionDoublesSketchUDAFTest.java @@ -117,9 +117,9 @@ public class UnionDoublesSketchUDAFTest { BytesWritable bytes = (BytesWritable) eval.terminatePartial(state); DoublesSketch resultSketch = DoublesSketch.wrap(BytesWritableHelper.wrapAsMemory(bytes)); Assert.assertEquals(resultSketch.getK(), 128); - Assert.assertEquals(resultSketch.getRetainedItems(), 2); - Assert.assertEquals(resultSketch.getMinValue(), 1.0); - Assert.assertEquals(resultSketch.getMaxValue(), 2.0); + Assert.assertEquals(resultSketch.getNumRetained(), 2); + Assert.assertEquals(resultSketch.getMinItem(), 1.0); + Assert.assertEquals(resultSketch.getMaxItem(), 2.0); } } @@ -144,9 +144,9 @@ public class UnionDoublesSketchUDAFTest { BytesWritable bytes = (BytesWritable) eval.terminatePartial(state); DoublesSketch resultSketch = DoublesSketch.wrap(BytesWritableHelper.wrapAsMemory(bytes)); Assert.assertEquals(resultSketch.getK(), 256); - Assert.assertEquals(resultSketch.getRetainedItems(), 2); - Assert.assertEquals(resultSketch.getMinValue(), 1.0); - Assert.assertEquals(resultSketch.getMaxValue(), 2.0); + Assert.assertEquals(resultSketch.getNumRetained(), 2); + Assert.assertEquals(resultSketch.getMinItem(), 1.0); + Assert.assertEquals(resultSketch.getMaxItem(), 2.0); } } @@ -172,9 +172,9 @@ public class UnionDoublesSketchUDAFTest { BytesWritable bytes = (BytesWritable) eval.terminatePartial(state); DoublesSketch resultSketch = DoublesSketch.wrap(BytesWritableHelper.wrapAsMemory(bytes)); Assert.assertEquals(resultSketch.getK(), 256); - Assert.assertEquals(resultSketch.getRetainedItems(), 2); - Assert.assertEquals(resultSketch.getMinValue(), 1.0); - Assert.assertEquals(resultSketch.getMaxValue(), 2.0); + Assert.assertEquals(resultSketch.getNumRetained(), 2); + Assert.assertEquals(resultSketch.getMinItem(), 1.0); + Assert.assertEquals(resultSketch.getMaxItem(), 2.0); } } @@ -200,9 +200,9 @@ public class UnionDoublesSketchUDAFTest { BytesWritable bytes = (BytesWritable) eval.terminate(state); DoublesSketch resultSketch = DoublesSketch.wrap(BytesWritableHelper.wrapAsMemory(bytes)); Assert.assertEquals(resultSketch.getK(), 256); - Assert.assertEquals(resultSketch.getRetainedItems(), 2); - Assert.assertEquals(resultSketch.getMinValue(), 1.0); - Assert.assertEquals(resultSketch.getMaxValue(), 2.0); + Assert.assertEquals(resultSketch.getNumRetained(), 2); + Assert.assertEquals(resultSketch.getMinItem(), 1.0); + Assert.assertEquals(resultSketch.getMaxItem(), 2.0); } } @@ -228,9 +228,9 @@ public class UnionDoublesSketchUDAFTest { BytesWritable bytes = (BytesWritable) eval.terminatePartial(state); DoublesSketch resultSketch = DoublesSketch.wrap(BytesWritableHelper.wrapAsMemory(bytes)); Assert.assertEquals(resultSketch.getK(), 128); - Assert.assertEquals(resultSketch.getRetainedItems(), 2); - Assert.assertEquals(resultSketch.getMinValue(), 1.0); - Assert.assertEquals(resultSketch.getMaxValue(), 2.0); + Assert.assertEquals(resultSketch.getNumRetained(), 2); + Assert.assertEquals(resultSketch.getMinItem(), 1.0); + Assert.assertEquals(resultSketch.getMaxItem(), 2.0); eval.reset(state); Assert.assertNull(eval.terminate(state)); diff --git a/src/test/java/org/apache/datasketches/hive/quantiles/UnionStringsSketchUDAFTest.java b/src/test/java/org/apache/datasketches/hive/quantiles/UnionStringsSketchUDAFTest.java index e69cdcc..098938b 100644 --- a/src/test/java/org/apache/datasketches/hive/quantiles/UnionStringsSketchUDAFTest.java +++ b/src/test/java/org/apache/datasketches/hive/quantiles/UnionStringsSketchUDAFTest.java @@ -112,20 +112,20 @@ public class UnionStringsSketchUDAFTest { @SuppressWarnings("unchecked") ItemsUnionState<String> state = (ItemsUnionState<String>) eval.getNewAggregationBuffer(); - ItemsSketch<String> sketch1 = ItemsSketch.getInstance(256, comparator); + ItemsSketch<String> sketch1 = ItemsSketch.getInstance(String.class, 256, comparator); sketch1.update("a"); eval.iterate(state, new Object[] { new BytesWritable(sketch1.toByteArray(serDe)) }); - ItemsSketch<String> sketch2 = ItemsSketch.getInstance(256, comparator); + ItemsSketch<String> sketch2 = ItemsSketch.getInstance(String.class, 256, comparator); sketch2.update("b"); eval.iterate(state, new Object[] { new BytesWritable(sketch2.toByteArray(serDe)) }); BytesWritable bytes = (BytesWritable) eval.terminatePartial(state); - ItemsSketch<String> resultSketch = ItemsSketch.getInstance(BytesWritableHelper.wrapAsMemory(bytes), comparator, serDe); + ItemsSketch<String> resultSketch = ItemsSketch.getInstance(String.class, BytesWritableHelper.wrapAsMemory(bytes), comparator, serDe); Assert.assertEquals(resultSketch.getK(), 128); - Assert.assertEquals(resultSketch.getRetainedItems(), 2); - Assert.assertEquals(resultSketch.getMinValue(), "a"); - Assert.assertEquals(resultSketch.getMaxValue(), "b"); + Assert.assertEquals(resultSketch.getNumRetained(), 2); + Assert.assertEquals(resultSketch.getMinItem(), "a"); + Assert.assertEquals(resultSketch.getMaxItem(), "b"); } } @@ -140,20 +140,20 @@ public class UnionStringsSketchUDAFTest { @SuppressWarnings("unchecked") ItemsUnionState<String> state = (ItemsUnionState<String>) eval.getNewAggregationBuffer(); - ItemsSketch<String> sketch1 = ItemsSketch.getInstance(256, comparator); + ItemsSketch<String> sketch1 = ItemsSketch.getInstance(String.class, 256, comparator); sketch1.update("a"); eval.iterate(state, new Object[] { new BytesWritable(sketch1.toByteArray(serDe)), new IntWritable(256) }); - ItemsSketch<String> sketch2 = ItemsSketch.getInstance(256, comparator); + ItemsSketch<String> sketch2 = ItemsSketch.getInstance(String.class, 256, comparator); sketch2.update("b"); eval.iterate(state, new Object[] { new BytesWritable(sketch2.toByteArray(serDe)), new IntWritable(256) }); BytesWritable bytes = (BytesWritable) eval.terminatePartial(state); - ItemsSketch<String> resultSketch = ItemsSketch.getInstance(BytesWritableHelper.wrapAsMemory(bytes), comparator, serDe); + ItemsSketch<String> resultSketch = ItemsSketch.getInstance(String.class, BytesWritableHelper.wrapAsMemory(bytes), comparator, serDe); Assert.assertEquals(resultSketch.getK(), 256); - Assert.assertEquals(resultSketch.getRetainedItems(), 2); - Assert.assertEquals(resultSketch.getMinValue(), "a"); - Assert.assertEquals(resultSketch.getMaxValue(), "b"); + Assert.assertEquals(resultSketch.getNumRetained(), 2); + Assert.assertEquals(resultSketch.getMinItem(), "a"); + Assert.assertEquals(resultSketch.getMaxItem(), "b"); } } @@ -169,20 +169,20 @@ public class UnionStringsSketchUDAFTest { @SuppressWarnings("unchecked") ItemsUnionState<String> state = (ItemsUnionState<String>) eval.getNewAggregationBuffer(); - ItemsSketch<String> sketch1 = ItemsSketch.getInstance(256, comparator); + ItemsSketch<String> sketch1 = ItemsSketch.getInstance(String.class, 256, comparator); sketch1.update("a"); eval.merge(state, new BytesWritable(sketch1.toByteArray(serDe))); - ItemsSketch<String> sketch2 = ItemsSketch.getInstance(256, comparator); + ItemsSketch<String> sketch2 = ItemsSketch.getInstance(String.class, 256, comparator); sketch2.update("b"); eval.merge(state, new BytesWritable(sketch2.toByteArray(serDe))); BytesWritable bytes = (BytesWritable) eval.terminatePartial(state); - ItemsSketch<String> resultSketch = ItemsSketch.getInstance(BytesWritableHelper.wrapAsMemory(bytes), comparator, serDe); + ItemsSketch<String> resultSketch = ItemsSketch.getInstance(String.class, BytesWritableHelper.wrapAsMemory(bytes), comparator, serDe); Assert.assertEquals(resultSketch.getK(), 256); - Assert.assertEquals(resultSketch.getRetainedItems(), 2); - Assert.assertEquals(resultSketch.getMinValue(), "a"); - Assert.assertEquals(resultSketch.getMaxValue(), "b"); + Assert.assertEquals(resultSketch.getNumRetained(), 2); + Assert.assertEquals(resultSketch.getMinItem(), "a"); + Assert.assertEquals(resultSketch.getMaxItem(), "b"); } } @@ -198,20 +198,20 @@ public class UnionStringsSketchUDAFTest { @SuppressWarnings("unchecked") ItemsUnionState<String> state = (ItemsUnionState<String>) eval.getNewAggregationBuffer(); - ItemsSketch<String> sketch1 = ItemsSketch.getInstance(256, comparator); + ItemsSketch<String> sketch1 = ItemsSketch.getInstance(String.class, 256, comparator); sketch1.update("a"); eval.merge(state, new BytesWritable(sketch1.toByteArray(serDe))); - ItemsSketch<String> sketch2 = ItemsSketch.getInstance(256, comparator); + ItemsSketch<String> sketch2 = ItemsSketch.getInstance(String.class, 256, comparator); sketch2.update("b"); eval.merge(state, new BytesWritable(sketch2.toByteArray(serDe))); BytesWritable bytes = (BytesWritable) eval.terminate(state); - ItemsSketch<String> resultSketch = ItemsSketch.getInstance(BytesWritableHelper.wrapAsMemory(bytes), comparator, serDe); + ItemsSketch<String> resultSketch = ItemsSketch.getInstance(String.class, BytesWritableHelper.wrapAsMemory(bytes), comparator, serDe); Assert.assertEquals(resultSketch.getK(), 256); - Assert.assertEquals(resultSketch.getRetainedItems(), 2); - Assert.assertEquals(resultSketch.getMinValue(), "a"); - Assert.assertEquals(resultSketch.getMaxValue(), "b"); + Assert.assertEquals(resultSketch.getNumRetained(), 2); + Assert.assertEquals(resultSketch.getMinItem(), "a"); + Assert.assertEquals(resultSketch.getMaxItem(), "b"); } } @@ -227,20 +227,20 @@ public class UnionStringsSketchUDAFTest { @SuppressWarnings("unchecked") ItemsUnionState<String> state = (ItemsUnionState<String>) eval.getNewAggregationBuffer(); - ItemsSketch<String> sketch1 = ItemsSketch.getInstance(comparator); + ItemsSketch<String> sketch1 = ItemsSketch.getInstance(String.class, comparator); sketch1.update("a"); eval.iterate(state, new Object[] { new BytesWritable(sketch1.toByteArray(serDe)) }); - ItemsSketch<String> sketch2 = ItemsSketch.getInstance(comparator); + ItemsSketch<String> sketch2 = ItemsSketch.getInstance(String.class, comparator); sketch2.update("b"); eval.iterate(state, new Object[] { new BytesWritable(sketch2.toByteArray(serDe)) }); BytesWritable bytes = (BytesWritable) eval.terminate(state); - ItemsSketch<String> resultSketch = ItemsSketch.getInstance(BytesWritableHelper.wrapAsMemory(bytes), comparator, serDe); + ItemsSketch<String> resultSketch = ItemsSketch.getInstance(String.class, BytesWritableHelper.wrapAsMemory(bytes), comparator, serDe); Assert.assertEquals(resultSketch.getK(), 128); - Assert.assertEquals(resultSketch.getRetainedItems(), 2); - Assert.assertEquals(resultSketch.getMinValue(), "a"); - Assert.assertEquals(resultSketch.getMaxValue(), "b"); + Assert.assertEquals(resultSketch.getNumRetained(), 2); + Assert.assertEquals(resultSketch.getMinItem(), "a"); + Assert.assertEquals(resultSketch.getMaxItem(), "b"); eval.reset(state); Assert.assertNull(eval.terminate(state)); diff --git a/src/test/java/org/apache/datasketches/hive/tuple/ArrayOfDoublesSketchToQuantilesSketchUDFTest.java b/src/test/java/org/apache/datasketches/hive/tuple/ArrayOfDoublesSketchToQuantilesSketchUDFTest.java index fa3b88e..cc24911 100644 --- a/src/test/java/org/apache/datasketches/hive/tuple/ArrayOfDoublesSketchToQuantilesSketchUDFTest.java +++ b/src/test/java/org/apache/datasketches/hive/tuple/ArrayOfDoublesSketchToQuantilesSketchUDFTest.java @@ -75,8 +75,8 @@ public class ArrayOfDoublesSketchToQuantilesSketchUDFTest { Assert.assertNotNull(result); DoublesSketch qs = DoublesSketch.wrap(BytesWritableHelper.wrapAsMemory(result)); Assert.assertFalse(qs.isEmpty()); - Assert.assertEquals(qs.getMinValue(), 1.0); - Assert.assertEquals(qs.getMaxValue(), 10.0); + Assert.assertEquals(qs.getMinItem(), 1.0); + Assert.assertEquals(qs.getMaxItem(), 10.0); } @Test @@ -94,8 +94,8 @@ public class ArrayOfDoublesSketchToQuantilesSketchUDFTest { DoublesSketch qs = DoublesSketch.wrap(BytesWritableHelper.wrapAsMemory(result)); Assert.assertFalse(qs.isEmpty()); Assert.assertEquals(qs.getK(), k); - Assert.assertEquals(qs.getMinValue(), 2.0); - Assert.assertEquals(qs.getMaxValue(), 20.0); + Assert.assertEquals(qs.getMinItem(), 2.0); + Assert.assertEquals(qs.getMaxItem(), 20.0); } } 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 80bf119..fc4534a 100644 --- a/src/test/java/org/apache/datasketches/hive/tuple/DataToDoubleSummaryWithModeSketchUDAFTest.java +++ b/src/test/java/org/apache/datasketches/hive/tuple/DataToDoubleSummaryWithModeSketchUDAFTest.java @@ -26,7 +26,7 @@ import java.util.List; import org.apache.datasketches.hive.common.BytesWritableHelper; import org.apache.datasketches.tuple.Sketch; -import org.apache.datasketches.tuple.SketchIterator; +import org.apache.datasketches.tuple.TupleSketchIterator; import org.apache.datasketches.tuple.Sketches; import org.apache.datasketches.tuple.UpdatableSketch; import org.apache.datasketches.tuple.UpdatableSketchBuilder; @@ -168,7 +168,7 @@ public class DataToDoubleSummaryWithModeSketchUDAFTest { BytesWritableHelper.wrapAsMemory((BytesWritable) r.get(2)), new DoubleSummaryDeserializer()); Assert.assertFalse(resultSketch.isEstimationMode()); Assert.assertEquals(resultSketch.getEstimate(), 2.0); - SketchIterator<DoubleSummary> it = resultSketch.iterator(); + TupleSketchIterator<DoubleSummary> it = resultSketch.iterator(); while (it.next()) { Assert.assertEquals(it.getSummary().getValue(), 3.0); } @@ -202,7 +202,7 @@ public class DataToDoubleSummaryWithModeSketchUDAFTest { // because of sampling probability < 1 Assert.assertTrue(resultSketch.isEstimationMode()); Assert.assertEquals(resultSketch.getEstimate(), 2.0, 0.05); - SketchIterator<DoubleSummary> it = resultSketch.iterator(); + TupleSketchIterator<DoubleSummary> it = resultSketch.iterator(); while (it.next()) { Assert.assertEquals(it.getSummary().getValue(), 1.0); } @@ -251,7 +251,7 @@ public class DataToDoubleSummaryWithModeSketchUDAFTest { Sketch<DoubleSummary> resultSketch = Sketches.heapifySketch( BytesWritableHelper.wrapAsMemory((BytesWritable) r.get(2)), new DoubleSummaryDeserializer()); Assert.assertEquals(resultSketch.getEstimate(), 2.0); - SketchIterator<DoubleSummary> it = resultSketch.iterator(); + TupleSketchIterator<DoubleSummary> it = resultSketch.iterator(); while (it.next()) { Assert.assertEquals(it.getSummary().getValue(), 3.0); } @@ -300,7 +300,7 @@ public class DataToDoubleSummaryWithModeSketchUDAFTest { Sketch<DoubleSummary> resultSketch = Sketches.heapifySketch( BytesWritableHelper.wrapAsMemory((BytesWritable) result), new DoubleSummaryDeserializer()); Assert.assertEquals(resultSketch.getEstimate(), 2.0); - SketchIterator<DoubleSummary> it = resultSketch.iterator(); + TupleSketchIterator<DoubleSummary> it = resultSketch.iterator(); while (it.next()) { Assert.assertEquals(it.getSummary().getValue(), 3.0); } @@ -329,7 +329,7 @@ public class DataToDoubleSummaryWithModeSketchUDAFTest { Sketch<DoubleSummary> resultSketch = Sketches.heapifySketch( BytesWritableHelper.wrapAsMemory((BytesWritable) result), new DoubleSummaryDeserializer()); Assert.assertEquals(resultSketch.getEstimate(), 2.0); - SketchIterator<DoubleSummary> it = resultSketch.iterator(); + TupleSketchIterator<DoubleSummary> it = resultSketch.iterator(); while (it.next()) { Assert.assertEquals(it.getSummary().getValue(), 3.0); } @@ -364,7 +364,7 @@ public class DataToDoubleSummaryWithModeSketchUDAFTest { // because of sampling probability < 1 Assert.assertTrue(resultSketch.isEstimationMode()); Assert.assertEquals(resultSketch.getEstimate(), 2.0, 0.05); - SketchIterator<DoubleSummary> it = resultSketch.iterator(); + TupleSketchIterator<DoubleSummary> it = resultSketch.iterator(); while (it.next()) { Assert.assertEquals(it.getSummary().getValue(), 2.0); } 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 4b52617..de07ba5 100644 --- a/src/test/java/org/apache/datasketches/hive/tuple/UnionDoubleSummaryWithModeSketchUDAFTest.java +++ b/src/test/java/org/apache/datasketches/hive/tuple/UnionDoubleSummaryWithModeSketchUDAFTest.java @@ -26,7 +26,7 @@ import java.util.List; import org.apache.datasketches.hive.common.BytesWritableHelper; import org.apache.datasketches.tuple.Sketch; -import org.apache.datasketches.tuple.SketchIterator; +import org.apache.datasketches.tuple.TupleSketchIterator; import org.apache.datasketches.tuple.Sketches; import org.apache.datasketches.tuple.UpdatableSketch; import org.apache.datasketches.tuple.UpdatableSketchBuilder; @@ -163,7 +163,7 @@ public class UnionDoubleSummaryWithModeSketchUDAFTest { Sketch<DoubleSummary> resultSketch = Sketches.heapifySketch( BytesWritableHelper.wrapAsMemory((BytesWritable) r.get(2)), new DoubleSummaryDeserializer()); Assert.assertEquals(resultSketch.getEstimate(), 2.0); - SketchIterator<DoubleSummary> it = resultSketch.iterator(); + TupleSketchIterator<DoubleSummary> it = resultSketch.iterator(); while (it.next()) { Assert.assertEquals(it.getSummary().getValue(), 3.0); } @@ -208,7 +208,7 @@ public class UnionDoubleSummaryWithModeSketchUDAFTest { Sketch<DoubleSummary> resultSketch = Sketches.heapifySketch( BytesWritableHelper.wrapAsMemory((BytesWritable) r.get(2)), new DoubleSummaryDeserializer()); Assert.assertEquals(resultSketch.getEstimate(), 2.0); - SketchIterator<DoubleSummary> it = resultSketch.iterator(); + TupleSketchIterator<DoubleSummary> it = resultSketch.iterator(); while (it.next()) { Assert.assertEquals(it.getSummary().getValue(), 2.0); } @@ -257,7 +257,7 @@ public class UnionDoubleSummaryWithModeSketchUDAFTest { Sketch<DoubleSummary> resultSketch = Sketches.heapifySketch( BytesWritableHelper.wrapAsMemory((BytesWritable) r.get(2)), new DoubleSummaryDeserializer()); Assert.assertEquals(resultSketch.getEstimate(), 2.0); - SketchIterator<DoubleSummary> it = resultSketch.iterator(); + TupleSketchIterator<DoubleSummary> it = resultSketch.iterator(); while (it.next()) { Assert.assertEquals(it.getSummary().getValue(), 3.0); } @@ -306,7 +306,7 @@ public class UnionDoubleSummaryWithModeSketchUDAFTest { Sketch<DoubleSummary> resultSketch = Sketches.heapifySketch( BytesWritableHelper.wrapAsMemory((BytesWritable) result), new DoubleSummaryDeserializer()); Assert.assertEquals(resultSketch.getEstimate(), 2.0); - SketchIterator<DoubleSummary> it = resultSketch.iterator(); + TupleSketchIterator<DoubleSummary> it = resultSketch.iterator(); while (it.next()) { Assert.assertEquals(it.getSummary().getValue(), 1.0); } @@ -343,7 +343,7 @@ public class UnionDoubleSummaryWithModeSketchUDAFTest { Sketch<DoubleSummary> resultSketch = Sketches.heapifySketch( BytesWritableHelper.wrapAsMemory((BytesWritable) result), new DoubleSummaryDeserializer()); Assert.assertEquals(resultSketch.getEstimate(), 2.0); - SketchIterator<DoubleSummary> it = resultSketch.iterator(); + TupleSketchIterator<DoubleSummary> it = resultSketch.iterator(); while (it.next()) { Assert.assertEquals(it.getSummary().getValue(), 3.0); } @@ -388,7 +388,7 @@ public class UnionDoubleSummaryWithModeSketchUDAFTest { Sketch<DoubleSummary> resultSketch = Sketches.heapifySketch( BytesWritableHelper.wrapAsMemory((BytesWritable) result), new DoubleSummaryDeserializer()); Assert.assertEquals(resultSketch.getEstimate(), 2.0); - SketchIterator<DoubleSummary> it = resultSketch.iterator(); + TupleSketchIterator<DoubleSummary> it = resultSketch.iterator(); while (it.next()) { Assert.assertEquals(it.getSummary().getValue(), 3.0); } @@ -433,7 +433,7 @@ public class UnionDoubleSummaryWithModeSketchUDAFTest { Sketch<DoubleSummary> resultSketch = Sketches.heapifySketch( BytesWritableHelper.wrapAsMemory((BytesWritable) result), new DoubleSummaryDeserializer()); Assert.assertEquals(resultSketch.getEstimate(), 2.0); - SketchIterator<DoubleSummary> it = resultSketch.iterator(); + TupleSketchIterator<DoubleSummary> it = resultSketch.iterator(); while (it.next()) { Assert.assertEquals(it.getSummary().getValue(), 2.0); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
