From 3f146ee42e4698a503e61b06ce23ee5712ea14ec Mon Sep 17 00:00:00 2001 From: Lee Rhodes Date: Tue, 19 Apr 2022 14:30:47 -0700 Subject: [PATCH 1/2] Made the public heapify method throw if the given memory is in updatable format. --- .../apache/datasketches/kll/KllDoublesSketch.java | 8 ++++---- .../apache/datasketches/kll/KllFloatsSketch.java | 8 ++++---- .../datasketches/kll/KllHeapDoublesSketch.java | 14 ++++++++++++-- .../datasketches/kll/KllHeapFloatsSketch.java | 14 ++++++++++++-- .../org/apache/datasketches/kll/KllSketch.java | 3 ++- .../kll/KllDirectDoublesSketchTest.java | 4 ++-- .../kll/KllDirectFloatsSketchTest.java | 4 ++-- .../datasketches/kll/MiscDirectDoublesTest.java | 6 +++--- .../datasketches/kll/MiscDirectFloatsTest.java | 6 +++--- .../apache/datasketches/kll/MiscDoublesTest.java | 12 ++++++------ .../apache/datasketches/kll/MiscFloatsTest.java | 12 ++++++------ 11 files changed, 56 insertions(+), 35 deletions(-) diff --git a/src/main/java/org/apache/datasketches/kll/KllDoublesSketch.java b/src/main/java/org/apache/datasketches/kll/KllDoublesSketch.java index b51624988..6ef6a172e 100644 --- a/src/main/java/org/apache/datasketches/kll/KllDoublesSketch.java +++ b/src/main/java/org/apache/datasketches/kll/KllDoublesSketch.java @@ -21,8 +21,9 @@ import static java.lang.Math.max; import static java.lang.Math.min; +import static org.apache.datasketches.kll.KllPreambleUtil.getMemoryUpdatableFormatFlag; +import static org.apache.datasketches.kll.KllSketch.Error.MUST_NOT_BE_UPDATABLE_FORMAT; import static org.apache.datasketches.kll.KllSketch.Error.MUST_NOT_CALL; -import static org.apache.datasketches.kll.KllSketch.Error.SRC_MUST_BE_DOUBLE; import static org.apache.datasketches.kll.KllSketch.Error.TGT_IS_READ_ONLY; import static org.apache.datasketches.kll.KllSketch.Error.kllSketchThrow; @@ -58,9 +59,8 @@ public static int getMaxSerializedSizeBytes(final int k, final long n, final boo */ public static KllDoublesSketch heapify(final Memory srcMem) { Objects.requireNonNull(srcMem, "Parameter 'srcMem' must not be null"); - final KllMemoryValidate memVal = new KllMemoryValidate(srcMem); - if (!memVal.doublesSketch) { Error.kllSketchThrow(SRC_MUST_BE_DOUBLE); } - return new KllHeapDoublesSketch(srcMem, memVal); + if (getMemoryUpdatableFormatFlag(srcMem)) { Error.kllSketchThrow(MUST_NOT_BE_UPDATABLE_FORMAT); } + return KllHeapDoublesSketch.heapifyImpl(srcMem); } /** diff --git a/src/main/java/org/apache/datasketches/kll/KllFloatsSketch.java b/src/main/java/org/apache/datasketches/kll/KllFloatsSketch.java index 17275d42f..7f0b0f10c 100644 --- a/src/main/java/org/apache/datasketches/kll/KllFloatsSketch.java +++ b/src/main/java/org/apache/datasketches/kll/KllFloatsSketch.java @@ -21,8 +21,9 @@ import static java.lang.Math.max; import static java.lang.Math.min; +import static org.apache.datasketches.kll.KllPreambleUtil.getMemoryUpdatableFormatFlag; +import static org.apache.datasketches.kll.KllSketch.Error.MUST_NOT_BE_UPDATABLE_FORMAT; import static org.apache.datasketches.kll.KllSketch.Error.MUST_NOT_CALL; -import static org.apache.datasketches.kll.KllSketch.Error.SRC_MUST_BE_FLOAT; import static org.apache.datasketches.kll.KllSketch.Error.TGT_IS_READ_ONLY; import static org.apache.datasketches.kll.KllSketch.Error.kllSketchThrow; @@ -58,9 +59,8 @@ public static int getMaxSerializedSizeBytes(final int k, final long n, final boo */ public static KllFloatsSketch heapify(final Memory srcMem) { Objects.requireNonNull(srcMem, "Parameter 'srcMem' must not be null"); - final KllMemoryValidate memVal = new KllMemoryValidate(srcMem); - if (memVal.doublesSketch) { Error.kllSketchThrow(SRC_MUST_BE_FLOAT); } - return new KllHeapFloatsSketch(srcMem, memVal); + if (getMemoryUpdatableFormatFlag(srcMem)) { Error.kllSketchThrow(MUST_NOT_BE_UPDATABLE_FORMAT); } + return KllHeapFloatsSketch.heapifyImpl(srcMem); } /** diff --git a/src/main/java/org/apache/datasketches/kll/KllHeapDoublesSketch.java b/src/main/java/org/apache/datasketches/kll/KllHeapDoublesSketch.java index 7383ddf38..189b95606 100644 --- a/src/main/java/org/apache/datasketches/kll/KllHeapDoublesSketch.java +++ b/src/main/java/org/apache/datasketches/kll/KllHeapDoublesSketch.java @@ -23,8 +23,11 @@ import static org.apache.datasketches.kll.KllPreambleUtil.DATA_START_ADR_SINGLE_ITEM; import static org.apache.datasketches.kll.KllSketch.Error.MUST_NOT_CALL; import static org.apache.datasketches.kll.KllSketch.Error.NOT_SINGLE_ITEM; +import static org.apache.datasketches.kll.KllSketch.Error.SRC_MUST_BE_DOUBLE; import static org.apache.datasketches.kll.KllSketch.Error.kllSketchThrow; +import java.util.Objects; + import org.apache.datasketches.memory.Memory; /** @@ -74,9 +77,9 @@ final class KllHeapDoublesSketch extends KllDoublesSketch { /** * Heapify constructor. * @param srcMem Memory object that contains data serialized by this sketch. - * @param memVal the MemoryCheck object + * @param memVal the MemoryVaidate object */ - KllHeapDoublesSketch(final Memory srcMem, final KllMemoryValidate memVal) { + private KllHeapDoublesSketch(final Memory srcMem, final KllMemoryValidate memVal) { super(null, null ); k_ = memVal.k; m_ = memVal.m; @@ -117,6 +120,13 @@ else if (memVal.singleItem && !updatableMemFormat) { } } + static KllHeapDoublesSketch heapifyImpl(final Memory srcMem) { + Objects.requireNonNull(srcMem, "Parameter 'srcMem' must not be null"); + final KllMemoryValidate memVal = new KllMemoryValidate(srcMem); + if (!memVal.doublesSketch) { Error.kllSketchThrow(SRC_MUST_BE_DOUBLE); } + return new KllHeapDoublesSketch(srcMem, memVal); + } + @Override public int getK() { return k_; } diff --git a/src/main/java/org/apache/datasketches/kll/KllHeapFloatsSketch.java b/src/main/java/org/apache/datasketches/kll/KllHeapFloatsSketch.java index 32c331bd5..3499850e6 100644 --- a/src/main/java/org/apache/datasketches/kll/KllHeapFloatsSketch.java +++ b/src/main/java/org/apache/datasketches/kll/KllHeapFloatsSketch.java @@ -23,8 +23,11 @@ import static org.apache.datasketches.kll.KllPreambleUtil.DATA_START_ADR_SINGLE_ITEM; import static org.apache.datasketches.kll.KllSketch.Error.MUST_NOT_CALL; import static org.apache.datasketches.kll.KllSketch.Error.NOT_SINGLE_ITEM; +import static org.apache.datasketches.kll.KllSketch.Error.SRC_MUST_BE_FLOAT; import static org.apache.datasketches.kll.KllSketch.Error.kllSketchThrow; +import java.util.Objects; + import org.apache.datasketches.memory.Memory; /** @@ -74,9 +77,9 @@ final class KllHeapFloatsSketch extends KllFloatsSketch { /** * Heapify constructor. * @param srcMem Memory object that contains data serialized by this sketch. - * @param memVal the MemoryCheck object + * @param memVal the MemoryValidate object */ - KllHeapFloatsSketch(final Memory srcMem, final KllMemoryValidate memVal) { + private KllHeapFloatsSketch(final Memory srcMem, final KllMemoryValidate memVal) { super(null, null); k_ = memVal.k; m_ = memVal.m; @@ -117,6 +120,13 @@ else if (memVal.singleItem && !updatableMemFormat) { } } + static KllHeapFloatsSketch heapifyImpl(final Memory srcMem) { + Objects.requireNonNull(srcMem, "Parameter 'srcMem' must not be null"); + final KllMemoryValidate memVal = new KllMemoryValidate(srcMem); + if (memVal.doublesSketch) { Error.kllSketchThrow(SRC_MUST_BE_FLOAT); } + return new KllHeapFloatsSketch(srcMem, memVal); + } + @Override public int getK() { return k_; } diff --git a/src/main/java/org/apache/datasketches/kll/KllSketch.java b/src/main/java/org/apache/datasketches/kll/KllSketch.java index e71623488..d2d16bc8e 100644 --- a/src/main/java/org/apache/datasketches/kll/KllSketch.java +++ b/src/main/java/org/apache/datasketches/kll/KllSketch.java @@ -81,7 +81,8 @@ enum Error { MUST_NOT_CALL("This is an artifact of inheritance and should never be called."), SINGLE_ITEM_IMPROPER_CALL("Improper method use for single-item sketch"), MRS_MUST_NOT_BE_NULL("MemoryRequestServer cannot be null."), - NOT_SINGLE_ITEM("Sketch is not single item."); + NOT_SINGLE_ITEM("Sketch is not single item."), + MUST_NOT_BE_UPDATABLE_FORMAT("Given Memory object must not be in updatableFormat."); private String msg; diff --git a/src/test/java/org/apache/datasketches/kll/KllDirectDoublesSketchTest.java b/src/test/java/org/apache/datasketches/kll/KllDirectDoublesSketchTest.java index 599368d6b..d43751e01 100644 --- a/src/test/java/org/apache/datasketches/kll/KllDirectDoublesSketchTest.java +++ b/src/test/java/org/apache/datasketches/kll/KllDirectDoublesSketchTest.java @@ -550,7 +550,7 @@ public void checkGetWritableMemory() { assertFalse(sketch.isFloatsSketch()); final WritableMemory wmem = sketch.getWritableMemory(); - final KllDoublesSketch sk = KllDoublesSketch.heapify(wmem); + final KllDoublesSketch sk = KllHeapDoublesSketch.heapifyImpl(wmem); assertEquals(sk.getK(), 200); assertEquals(sk.getN(), 200); assertFalse(sk.isEmpty()); @@ -584,7 +584,7 @@ public void checkHeapify() { WritableMemory dstMem = WritableMemory.allocate(6000); KllDoublesSketch sk = KllDoublesSketch.newDirectInstance(20, dstMem, memReqSvr); for (int i = 1; i <= 100; i++) { sk.update(i); } - KllDoublesSketch sk2 = KllDoublesSketch.heapify(dstMem); + KllDoublesSketch sk2 = KllHeapDoublesSketch.heapifyImpl(dstMem); assertEquals(sk2.getMinValue(), 1.0); assertEquals(sk2.getMaxValue(), 100.0); } diff --git a/src/test/java/org/apache/datasketches/kll/KllDirectFloatsSketchTest.java b/src/test/java/org/apache/datasketches/kll/KllDirectFloatsSketchTest.java index 2e202f3aa..a159dc545 100644 --- a/src/test/java/org/apache/datasketches/kll/KllDirectFloatsSketchTest.java +++ b/src/test/java/org/apache/datasketches/kll/KllDirectFloatsSketchTest.java @@ -550,7 +550,7 @@ public void checkGetWritableMemory() { assertFalse(sketch.isDoublesSketch()); final WritableMemory wmem = sketch.getWritableMemory(); - final KllFloatsSketch sk = KllFloatsSketch.heapify(wmem); + final KllFloatsSketch sk = KllHeapFloatsSketch.heapifyImpl(wmem); assertEquals(sk.getK(), 200); assertEquals(sk.getN(), 200); assertFalse(sk.isEmpty()); @@ -584,7 +584,7 @@ public void checkHeapify() { WritableMemory dstMem = WritableMemory.allocate(6000); KllFloatsSketch sk = KllFloatsSketch.newDirectInstance(20, dstMem, memReqSvr); for (int i = 1; i <= 100; i++) { sk.update(i); } - KllFloatsSketch sk2 = KllFloatsSketch.heapify(dstMem); + KllFloatsSketch sk2 = KllHeapFloatsSketch.heapifyImpl(dstMem); assertEquals(sk2.getMinValue(), 1.0); assertEquals(sk2.getMaxValue(), 100.0); } diff --git a/src/test/java/org/apache/datasketches/kll/MiscDirectDoublesTest.java b/src/test/java/org/apache/datasketches/kll/MiscDirectDoublesTest.java index 15337ad7a..84f5f37b2 100644 --- a/src/test/java/org/apache/datasketches/kll/MiscDirectDoublesTest.java +++ b/src/test/java/org/apache/datasketches/kll/MiscDirectDoublesTest.java @@ -245,7 +245,7 @@ public void checkSketchInitializeDoubleHeapifyUpdatableMem() { //println(sk2.toString(true, true)); compBytes = KllHelper.toUpdatableByteArrayImpl(sk2); wmem = WritableMemory.writableWrap(compBytes); - sk = KllDoublesSketch.heapify(wmem); + sk = KllHeapDoublesSketch.heapifyImpl(wmem); println(sk.toString(true, true)); assertEquals(sk.getK(), k); assertEquals(sk.getN(), k + 1); @@ -266,7 +266,7 @@ public void checkSketchInitializeDoubleHeapifyUpdatableMem() { compBytes = KllHelper.toUpdatableByteArrayImpl(sk2); wmem = WritableMemory.writableWrap(compBytes); //println(KllPreambleUtil.toString(wmem)); - sk = KllDoublesSketch.heapify(wmem); + sk = KllHeapDoublesSketch.heapifyImpl(wmem); assertEquals(sk.getK(), k); assertEquals(sk.getN(), 0); assertEquals(sk.getNumRetained(), 0); @@ -287,7 +287,7 @@ public void checkSketchInitializeDoubleHeapifyUpdatableMem() { compBytes = KllHelper.toUpdatableByteArrayImpl(sk2); wmem = WritableMemory.writableWrap(compBytes); //println(KllPreambleUtil.memoryToString(wmem, true)); - sk = KllDoublesSketch.heapify(wmem); + sk = KllHeapDoublesSketch.heapifyImpl(wmem); assertEquals(sk.getK(), k); assertEquals(sk.getN(), 1); assertEquals(sk.getNumRetained(), 1); diff --git a/src/test/java/org/apache/datasketches/kll/MiscDirectFloatsTest.java b/src/test/java/org/apache/datasketches/kll/MiscDirectFloatsTest.java index b8a9aadc2..6810dc2dd 100644 --- a/src/test/java/org/apache/datasketches/kll/MiscDirectFloatsTest.java +++ b/src/test/java/org/apache/datasketches/kll/MiscDirectFloatsTest.java @@ -246,7 +246,7 @@ public void checkSketchInitializeFloatHeapifyUpdatableMem() { compBytes = KllHelper.toUpdatableByteArrayImpl(sk2); wmem = WritableMemory.writableWrap(compBytes); //println(KllPreambleUtil.toString(wmem)); - sk = KllFloatsSketch.heapify(wmem); + sk = KllHeapFloatsSketch.heapifyImpl(wmem); assertEquals(sk.getK(), k); assertEquals(sk.getN(), k + 1); assertEquals(sk.getNumRetained(), 11); @@ -266,7 +266,7 @@ public void checkSketchInitializeFloatHeapifyUpdatableMem() { compBytes = KllHelper.toUpdatableByteArrayImpl(sk2); wmem = WritableMemory.writableWrap(compBytes); //println(KllPreambleUtil.toString(wmem)); - sk = KllFloatsSketch.heapify(wmem); + sk = KllHeapFloatsSketch.heapifyImpl(wmem); assertEquals(sk.getK(), k); assertEquals(sk.getN(), 0); assertEquals(sk.getNumRetained(), 0); @@ -287,7 +287,7 @@ public void checkSketchInitializeFloatHeapifyUpdatableMem() { compBytes = KllHelper.toUpdatableByteArrayImpl(sk2); wmem = WritableMemory.writableWrap(compBytes); //println(KllPreambleUtil.toString(wmem)); - sk = KllFloatsSketch.heapify(wmem); + sk = KllHeapFloatsSketch.heapifyImpl(wmem); assertEquals(sk.getK(), k); assertEquals(sk.getN(), 1); assertEquals(sk.getNumRetained(), 1); diff --git a/src/test/java/org/apache/datasketches/kll/MiscDoublesTest.java b/src/test/java/org/apache/datasketches/kll/MiscDoublesTest.java index d2711411f..e86488aab 100644 --- a/src/test/java/org/apache/datasketches/kll/MiscDoublesTest.java +++ b/src/test/java/org/apache/datasketches/kll/MiscDoublesTest.java @@ -305,7 +305,7 @@ public void checkSketchInitializeDoubleHeapifyUpdatableMem() { compBytes = KllHelper.toUpdatableByteArrayImpl(sk2); wmem = WritableMemory.writableWrap(compBytes); println(KllPreambleUtil.toString(wmem, true)); - sk = KllDoublesSketch.heapify(wmem); + sk = KllHeapDoublesSketch.heapifyImpl(wmem); assertEquals(sk.getK(), k); assertEquals(sk.getN(), k + 1); assertEquals(sk.getNumRetained(), 11); @@ -325,7 +325,7 @@ public void checkSketchInitializeDoubleHeapifyUpdatableMem() { compBytes = KllHelper.toUpdatableByteArrayImpl(sk2); wmem = WritableMemory.writableWrap(compBytes); println(KllPreambleUtil.toString(wmem, true)); - sk = KllDoublesSketch.heapify(wmem); + sk = KllHeapDoublesSketch.heapifyImpl(wmem); assertEquals(sk.getK(), k); assertEquals(sk.getN(), 0); assertEquals(sk.getNumRetained(), 0); @@ -346,7 +346,7 @@ public void checkSketchInitializeDoubleHeapifyUpdatableMem() { compBytes = KllHelper.toUpdatableByteArrayImpl(sk2); wmem = WritableMemory.writableWrap(compBytes); println(KllPreambleUtil.toString(wmem, true)); - sk = KllDoublesSketch.heapify(wmem); + sk = KllHeapDoublesSketch.heapifyImpl(wmem); assertEquals(sk.getK(), k); assertEquals(sk.getN(), 1); assertEquals(sk.getNumRetained(), 1); @@ -437,7 +437,7 @@ public void checkMemoryToStringDoubleUpdatable() { s = KllPreambleUtil.toString(wmem, true); println("step 1: sketch to byte[]/memory & analyze memory"); println(s); - sk2 = KllDoublesSketch.heapify(wmem); + sk2 = KllHeapDoublesSketch.heapifyImpl(wmem); upBytes2 = KllHelper.toUpdatableByteArrayImpl(sk2); wmem = WritableMemory.writableWrap(upBytes2); s = KllPreambleUtil.toString(wmem, true); @@ -455,7 +455,7 @@ public void checkMemoryToStringDoubleUpdatable() { s = KllPreambleUtil.toString(wmem, true); println("step 1: sketch to byte[]/memory & analyze memory"); println(s); - sk2 = KllDoublesSketch.heapify(wmem); + sk2 = KllHeapDoublesSketch.heapifyImpl(wmem); upBytes2 = KllHelper.toUpdatableByteArrayImpl(sk2); wmem = WritableMemory.writableWrap(upBytes2); s = KllPreambleUtil.toString(wmem, true); @@ -471,7 +471,7 @@ public void checkMemoryToStringDoubleUpdatable() { s = KllPreambleUtil.toString(wmem, true); println("step 1: sketch to byte[]/memory & analyze memory"); println(s); - sk2 = KllDoublesSketch.heapify(wmem); + sk2 = KllHeapDoublesSketch.heapifyImpl(wmem); upBytes2 = KllHelper.toUpdatableByteArrayImpl(sk2); wmem = WritableMemory.writableWrap(upBytes2); s = KllPreambleUtil.toString(wmem, true); diff --git a/src/test/java/org/apache/datasketches/kll/MiscFloatsTest.java b/src/test/java/org/apache/datasketches/kll/MiscFloatsTest.java index 406e98c37..57cc244a0 100644 --- a/src/test/java/org/apache/datasketches/kll/MiscFloatsTest.java +++ b/src/test/java/org/apache/datasketches/kll/MiscFloatsTest.java @@ -305,7 +305,7 @@ public void checkSketchInitializeFloatHeapifyUpdatableMem() { compBytes = KllHelper.toUpdatableByteArrayImpl(sk2); wmem = WritableMemory.writableWrap(compBytes); println(KllPreambleUtil.toString(wmem, true)); - sk = KllFloatsSketch.heapify(wmem); + sk = KllHeapFloatsSketch.heapifyImpl(wmem); assertEquals(sk.getK(), k); assertEquals(sk.getN(), k + 1); assertEquals(sk.getNumRetained(), 11); @@ -325,7 +325,7 @@ public void checkSketchInitializeFloatHeapifyUpdatableMem() { compBytes = KllHelper.toUpdatableByteArrayImpl(sk2); wmem = WritableMemory.writableWrap(compBytes); println(KllPreambleUtil.toString(wmem, true)); - sk = KllFloatsSketch.heapify(wmem); + sk = KllHeapFloatsSketch.heapifyImpl(wmem); assertEquals(sk.getK(), k); assertEquals(sk.getN(), 0); assertEquals(sk.getNumRetained(), 0); @@ -346,7 +346,7 @@ public void checkSketchInitializeFloatHeapifyUpdatableMem() { compBytes = KllHelper.toUpdatableByteArrayImpl(sk2); wmem = WritableMemory.writableWrap(compBytes); println(KllPreambleUtil.toString(wmem, true)); - sk = KllFloatsSketch.heapify(wmem); + sk = KllHeapFloatsSketch.heapifyImpl(wmem); assertEquals(sk.getK(), k); assertEquals(sk.getN(), 1); assertEquals(sk.getNumRetained(), 1); @@ -437,7 +437,7 @@ public void checkMemoryToStringFloatUpdatable() { s = KllPreambleUtil.toString(wmem, true); println("step 1: sketch to byte[]/memory & analyze memory"); println(s); - sk2 = KllFloatsSketch.heapify(wmem); + sk2 = KllHeapFloatsSketch.heapifyImpl(wmem); upBytes2 = KllHelper.toUpdatableByteArrayImpl(sk2); wmem = WritableMemory.writableWrap(upBytes2); s = KllPreambleUtil.toString(wmem, true); @@ -455,7 +455,7 @@ public void checkMemoryToStringFloatUpdatable() { s = KllPreambleUtil.toString(wmem, true); println("step 1: sketch to byte[]/memory & analyze memory"); println(s); - sk2 = KllFloatsSketch.heapify(wmem); + sk2 = KllHeapFloatsSketch.heapifyImpl(wmem); upBytes2 = KllHelper.toUpdatableByteArrayImpl(sk2); wmem = WritableMemory.writableWrap(upBytes2); s = KllPreambleUtil.toString(wmem, true); @@ -471,7 +471,7 @@ public void checkMemoryToStringFloatUpdatable() { s = KllPreambleUtil.toString(wmem, true); println("step 1: sketch to byte[]/memory & analyze memory"); println(s); - sk2 = KllFloatsSketch.heapify(wmem); + sk2 = KllHeapFloatsSketch.heapifyImpl(wmem); upBytes2 = KllHelper.toUpdatableByteArrayImpl(sk2); wmem = WritableMemory.writableWrap(upBytes2); s = KllPreambleUtil.toString(wmem, true); From 8e5b91dd549c7b79a085d8488d2dbf06527bb6b7 Mon Sep 17 00:00:00 2001 From: Lee Rhodes Date: Tue, 19 Apr 2022 19:51:45 -0700 Subject: [PATCH 2/2] Make KllSketch public again as per request from Alex. --- .../org/apache/datasketches/kll/KllSketch.java | 2 +- .../apache/datasketches/kll/package-info.java | 17 ++--------------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/src/main/java/org/apache/datasketches/kll/KllSketch.java b/src/main/java/org/apache/datasketches/kll/KllSketch.java index d2d16bc8e..896cb1b9d 100644 --- a/src/main/java/org/apache/datasketches/kll/KllSketch.java +++ b/src/main/java/org/apache/datasketches/kll/KllSketch.java @@ -67,7 +67,7 @@ * * @author Lee Rhodes, Kevin Lang */ -abstract class KllSketch { +public abstract class KllSketch { /** * Used to define the variable type of the current instance of this class. diff --git a/src/main/java/org/apache/datasketches/kll/package-info.java b/src/main/java/org/apache/datasketches/kll/package-info.java index e42e6cb7c..87c410c3a 100644 --- a/src/main/java/org/apache/datasketches/kll/package-info.java +++ b/src/main/java/org/apache/datasketches/kll/package-info.java @@ -148,21 +148,8 @@ *
  • Then vlo ≤ v ≤ vhi, with 99% confidence.
    • * * - *

    The current implementations of the KLL sketch in the DataSketches Java library component include:

    - * - * - * - *

    Please visit our website: DataSketches Home Page for more - * information.

    + *

    Please visit our website: DataSketches Home Page and + * the Javadocs for more information.

    * * @author Kevin Lang * @author Alexander Saydakov