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 2021/07/15 22:55:42 UTC
[datasketches-java] branch Memory2 updated (7f127e8 -> dd7c3a4)
This is an automated email from the ASF dual-hosted git repository.
leerho pushed a change to branch Memory2
in repository https://gitbox.apache.org/repos/asf/datasketches-java.git.
from 7f127e8 This fixes API changes in the new Memory configuration that will appear in Memory 2.0.
new 0af7a8d Small changes to Checkstyle
new dd7c3a4 Make -java compatible with Memory 2.0
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../datasketches/hll/DirectAuxHashMapTest.java | 4 +-
.../datasketches/hll/DirectCouponListTest.java | 4 +-
.../datasketches/quantiles/DebugUnionTest.java | 4 +-
.../DirectQuantilesMemoryRequestTest.java | 10 ++---
.../datasketches/quantiles/DoublesSketchTest.java | 6 +--
.../datasketches/quantiles/PreambleUtilTest.java | 4 +-
.../datasketches/theta/CompactSketchTest.java | 4 +-
.../theta/DirectQuickSelectSketchTest.java | 52 +++++++++++-----------
.../apache/datasketches/theta/UnionImplTest.java | 12 ++---
tools/SketchesCheckstyle.xml | 31 ++++++-------
10 files changed, 64 insertions(+), 67 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org
[datasketches-java] 01/02: Small changes to Checkstyle
Posted by le...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
leerho pushed a commit to branch Memory2
in repository https://gitbox.apache.org/repos/asf/datasketches-java.git
commit 0af7a8d83daf7568087d9ea7c70da71104dc86c4
Author: Lee Rhodes <le...@users.noreply.github.com>
AuthorDate: Thu Jun 10 12:09:09 2021 -0700
Small changes to Checkstyle
---
tools/SketchesCheckstyle.xml | 31 ++++++++++++++-----------------
1 file changed, 14 insertions(+), 17 deletions(-)
diff --git a/tools/SketchesCheckstyle.xml b/tools/SketchesCheckstyle.xml
index 5a4c83a..5fe40e5 100644
--- a/tools/SketchesCheckstyle.xml
+++ b/tools/SketchesCheckstyle.xml
@@ -23,17 +23,16 @@ under the License.
-->
<!--
- SketchesCheckstyle.xml
+ DataSketcchesCheckstyle.xml
Checkstyle is very configurable. Be sure to read the documentation at
http://checkstyle.sourceforge.net (or in your downloaded distribution).
- To completely disable a check, just comment it out or delete it from the file.
-
- Authors: Max Vetrenko, Ruslan Diachenko, Roman Ivanov.
+ To completely disable a check, comment it out, delete it, or set
+ property name="severity" value="ignore".
-->
-<module name = "Checker">
+<module name="Checker">
<property name="charset" value="UTF-8"/>
<property name="severity" value="warning"/>
<property name="fileExtensions" value="java"/>
@@ -55,7 +54,7 @@ under the License.
<!-- Size Violations -->
<module name="LineLength">
<property name="severity" value="warning"/>
- <property name="max" value="110"/>
+ <property name="max" value="120"/>
<property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
<!-- <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/> -->
</module>
@@ -94,7 +93,7 @@ under the License.
<metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
</module>
- <module name="LeftCurly">
+ <module name="LeftCurly">
<!-- doesn't allow for if (n == 0) { return 0.0; }, which is readable and not corruptable -->
<property name="severity" value="ignore"/>
<metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
@@ -184,7 +183,6 @@ 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,15 +201,13 @@ under the License.
<module name="JavadocMethod">
<property name="scope" value="public"/>
- <property name="allowMissingParamTags" value="false"/>
- <!-- <property name="allowMissingThrowsTags" value="true"/> now not allowed ?!? -->
- <property name="allowMissingReturnTag" value="false"/>
+ <property name="allowMissingParamTags" value="false"/> <!-- default -->
+ <property name="allowMissingReturnTag" value="false"/> <!-- default -->
<property name="allowedAnnotations" value="Override, Test"/>
- <!-- <property name="allowThrowsTagsForSubclasses" value="true"/> now not allowed ?!? -->
</module>
<module name="JavadocParagraph"/>
-
+
<module name="JavadocTagContinuationIndentation">
<property name="severity" value="ignore"/>
<metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
@@ -241,7 +237,7 @@ under the License.
<property name="allowByTailComment" value="true"/>
<property name="allowNonPrintableEscapes" value="true"/>
<metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
- </module>
+ </module>
<module name="CommentsIndentation">
<property name="severity" value="warning"/>
@@ -251,7 +247,7 @@ under the License.
<module name="Indentation">
<property name="severity" value="ignore"/>
<property name="basicOffset" value="2"/>
- <property name="braceAdjustment" value="0"/>
+ <property name="braceAdjustment" value="0"/> <!-- default -->
<property name="caseIndent" value="2"/>
<property name="throwsIndent" value="4"/>
<property name="lineWrappingIndentation" value="4"/>
@@ -277,7 +273,7 @@ under the License.
<module name="ModifierOrder">
<property name="severity" value="ignore"/>
<metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
- </module>
+ </module>
<!-- Naming Conventions -->
<module name="AbbreviationAsWordInName">
@@ -344,7 +340,7 @@ under the License.
value="Type name ''{0}'' must match pattern ''{1}''."/>
</module>
- <!-- Regexp -->
+ <!-- Regexp -->
<module name="Regexp">
<property name="severity" value="ignore"/>
<property name="format" value="[ \t]+$"/>
@@ -398,4 +394,5 @@ under the License.
</module>
</module> <!-- End of TreeWalker -->
+
</module>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org
[datasketches-java] 02/02: Make -java compatible with Memory 2.0
Posted by le...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
leerho pushed a commit to branch Memory2
in repository https://gitbox.apache.org/repos/asf/datasketches-java.git
commit dd7c3a4eb841b5114e6c242333429d83174d41c2
Author: Lee Rhodes <le...@users.noreply.github.com>
AuthorDate: Thu Jul 15 15:55:26 2021 -0700
Make -java compatible with Memory 2.0
---
.../datasketches/hll/DirectAuxHashMapTest.java | 4 +-
.../datasketches/hll/DirectCouponListTest.java | 4 +-
.../datasketches/quantiles/DebugUnionTest.java | 4 +-
.../DirectQuantilesMemoryRequestTest.java | 10 ++---
.../datasketches/quantiles/DoublesSketchTest.java | 6 +--
.../datasketches/quantiles/PreambleUtilTest.java | 4 +-
.../datasketches/theta/CompactSketchTest.java | 4 +-
.../theta/DirectQuickSelectSketchTest.java | 52 +++++++++++-----------
.../apache/datasketches/theta/UnionImplTest.java | 12 ++---
9 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/src/test/java/org/apache/datasketches/hll/DirectAuxHashMapTest.java b/src/test/java/org/apache/datasketches/hll/DirectAuxHashMapTest.java
index 0a83ec0..55bbd92 100644
--- a/src/test/java/org/apache/datasketches/hll/DirectAuxHashMapTest.java
+++ b/src/test/java/org/apache/datasketches/hll/DirectAuxHashMapTest.java
@@ -31,7 +31,7 @@ import java.util.HashMap;
import org.testng.annotations.Test;
import org.apache.datasketches.memory.Memory;
-import org.apache.datasketches.memory.WritableDirectHandle;
+import org.apache.datasketches.memory.WritableHandle;
import org.apache.datasketches.memory.WritableMemory;
import org.apache.datasketches.SketchesStateException;
@@ -49,7 +49,7 @@ public class DirectAuxHashMapTest {
int n = 8; //put lgConfigK == 4 into HLL mode
int bytes = HllSketch.getMaxUpdatableSerializationBytes(lgConfigK, tgtHllType);
HllSketch hllSketch;
- try (WritableDirectHandle handle = WritableMemory.allocateDirect(bytes)) {
+ try (WritableHandle handle = WritableMemory.allocateDirect(bytes)) {
WritableMemory wmem = handle.getWritable();
hllSketch = new HllSketch(lgConfigK, tgtHllType, wmem);
for (int i = 0; i < n; i++) {
diff --git a/src/test/java/org/apache/datasketches/hll/DirectCouponListTest.java b/src/test/java/org/apache/datasketches/hll/DirectCouponListTest.java
index d0927e3..0625094 100644
--- a/src/test/java/org/apache/datasketches/hll/DirectCouponListTest.java
+++ b/src/test/java/org/apache/datasketches/hll/DirectCouponListTest.java
@@ -28,7 +28,7 @@ import static org.testng.Assert.assertTrue;
import org.testng.annotations.Test;
import org.apache.datasketches.memory.Memory;
-import org.apache.datasketches.memory.WritableDirectHandle;
+import org.apache.datasketches.memory.WritableHandle;
import org.apache.datasketches.memory.WritableMemory;
/**
@@ -71,7 +71,7 @@ public class DirectCouponListTest {
//println("DIRECT");
byte[] barr1;
WritableMemory wmem = null;
- try (WritableDirectHandle hand = WritableMemory.allocateDirect(bytes)) {
+ try (WritableHandle hand = WritableMemory.allocateDirect(bytes)) {
wmem = hand.getWritable();
//byte[] byteArr = new byte[bytes];
//WritableMemory wmem = WritableMemory.wrap(byteArr);
diff --git a/src/test/java/org/apache/datasketches/quantiles/DebugUnionTest.java b/src/test/java/org/apache/datasketches/quantiles/DebugUnionTest.java
index cb6096c..d718741 100644
--- a/src/test/java/org/apache/datasketches/quantiles/DebugUnionTest.java
+++ b/src/test/java/org/apache/datasketches/quantiles/DebugUnionTest.java
@@ -27,7 +27,7 @@ import java.util.HashSet;
import org.testng.annotations.Test;
-import org.apache.datasketches.memory.WritableDirectHandle;
+import org.apache.datasketches.memory.WritableHandle;
import org.apache.datasketches.memory.WritableMemory;
/**
@@ -62,7 +62,7 @@ public class DebugUnionTest {
DoublesSketch.setRandom(1); //make deterministic for test
DoublesUnion dUnion;
DoublesSketch dSketch;
- try ( WritableDirectHandle wdh = WritableMemory.allocateDirect(10_000_000) ) {
+ try ( WritableHandle wdh = WritableMemory.allocateDirect(10_000_000) ) {
WritableMemory wmem = wdh.getWritable();
dUnion = DoublesUnion.builder().setMaxK(8).build(wmem);
for (int s = 0; s < numSketches; s++) { dUnion.update(sketchArr[s]); }
diff --git a/src/test/java/org/apache/datasketches/quantiles/DirectQuantilesMemoryRequestTest.java b/src/test/java/org/apache/datasketches/quantiles/DirectQuantilesMemoryRequestTest.java
index 93ac0fd..5285892 100644
--- a/src/test/java/org/apache/datasketches/quantiles/DirectQuantilesMemoryRequestTest.java
+++ b/src/test/java/org/apache/datasketches/quantiles/DirectQuantilesMemoryRequestTest.java
@@ -27,7 +27,7 @@ import static org.testng.Assert.assertTrue;
import org.testng.annotations.Test;
import org.apache.datasketches.memory.Memory;
-import org.apache.datasketches.memory.WritableDirectHandle;
+import org.apache.datasketches.memory.WritableHandle;
import org.apache.datasketches.memory.WritableMemory;
/**
@@ -46,7 +46,7 @@ public class DirectQuantilesMemoryRequestTest {
//########## Owning Implementation
// This part would actually be part of the Memory owning implemention so it is faked here
- try (WritableDirectHandle wdh = WritableMemory.allocateDirect(initBytes)) {
+ try (WritableHandle wdh = WritableMemory.allocateDirect(initBytes)) {
final WritableMemory wmem = wdh.getWritable();
println("Initial mem size: " + wmem.getCapacity());
@@ -81,7 +81,7 @@ public class DirectQuantilesMemoryRequestTest {
final int u = 32; // don't need the BB to fill here
final int initBytes = (4 + (u / 2)) << 3; // not enough to hold everything
- try (WritableDirectHandle memHandler = WritableMemory.allocateDirect(initBytes)) {
+ try (WritableHandle memHandler = WritableMemory.allocateDirect(initBytes)) {
//final MemoryManager memMgr = new MemoryManager();
//final WritableMemory mem1 = memMgr.request(initBytes);
final WritableMemory mem1 = memHandler.getWritable();
@@ -104,7 +104,7 @@ public class DirectQuantilesMemoryRequestTest {
final int u = (2 * k) - 1; //just to fill the BB
final int initBytes = ((2 * k) + 4) << 3; //just room for BB
- try (WritableDirectHandle memHandler = WritableMemory.allocateDirect(initBytes)) {
+ try (WritableHandle memHandler = WritableMemory.allocateDirect(initBytes)) {
//final MemoryManager memMgr = new MemoryManager();
//final WritableMemory mem1 = memMgr.request(initBytes);
final WritableMemory mem1 = memHandler.getWritable();
@@ -133,7 +133,7 @@ public class DirectQuantilesMemoryRequestTest {
final UpdateDoublesSketch usk1 = DoublesSketch.builder().setK(k).build();
final Memory origSketchMem = Memory.wrap(usk1.toByteArray());
- try (WritableDirectHandle memHandle = WritableMemory.allocateDirect(initBytes)) {
+ try (WritableHandle memHandle = WritableMemory.allocateDirect(initBytes)) {
WritableMemory mem = memHandle.getWritable();
origSketchMem.copyTo(0, mem, 0, initBytes);
UpdateDoublesSketch usk2 = DirectUpdateDoublesSketch.wrapInstance(mem);
diff --git a/src/test/java/org/apache/datasketches/quantiles/DoublesSketchTest.java b/src/test/java/org/apache/datasketches/quantiles/DoublesSketchTest.java
index 11498e6..32b47e9 100644
--- a/src/test/java/org/apache/datasketches/quantiles/DoublesSketchTest.java
+++ b/src/test/java/org/apache/datasketches/quantiles/DoublesSketchTest.java
@@ -27,7 +27,7 @@ import static org.testng.Assert.assertTrue;
import org.testng.Assert;
import org.testng.annotations.Test;
-import org.apache.datasketches.memory.WritableDirectHandle;
+import org.apache.datasketches.memory.WritableHandle;
import org.apache.datasketches.memory.WritableMemory;
@SuppressWarnings("javadoc")
@@ -134,7 +134,7 @@ public class DoublesSketchTest {
@Test
public void directSketchShouldMoveOntoHeapEventually() {
- try (WritableDirectHandle wdh = WritableMemory.allocateDirect(1000)) {
+ try (WritableHandle wdh = WritableMemory.allocateDirect(1000)) {
WritableMemory mem = wdh.getWritable();
UpdateDoublesSketch sketch = DoublesSketch.builder().build(mem);
Assert.assertTrue(sketch.isSameResource(mem));
@@ -149,7 +149,7 @@ public class DoublesSketchTest {
@Test
public void checkEmptyDirect() {
- try (WritableDirectHandle wdh = WritableMemory.allocateDirect(1000)) {
+ try (WritableHandle wdh = WritableMemory.allocateDirect(1000)) {
WritableMemory mem = wdh.getWritable();
UpdateDoublesSketch sketch = DoublesSketch.builder().build(mem);
sketch.toByteArray(); //exercises a specific path
diff --git a/src/test/java/org/apache/datasketches/quantiles/PreambleUtilTest.java b/src/test/java/org/apache/datasketches/quantiles/PreambleUtilTest.java
index 7cee84f..1ae21c0 100644
--- a/src/test/java/org/apache/datasketches/quantiles/PreambleUtilTest.java
+++ b/src/test/java/org/apache/datasketches/quantiles/PreambleUtilTest.java
@@ -40,7 +40,7 @@ import static org.testng.Assert.assertEquals;
import org.testng.annotations.Test;
import org.apache.datasketches.memory.Memory;
-import org.apache.datasketches.memory.WritableDirectHandle;
+import org.apache.datasketches.memory.WritableHandle;
import org.apache.datasketches.memory.WritableMemory;
@SuppressWarnings("javadoc")
@@ -49,7 +49,7 @@ public class PreambleUtilTest {
@Test
public void checkInsertsAndExtracts() {
final int bytes = 32;
- try (WritableDirectHandle offHeapMemHandler = WritableMemory.allocateDirect(bytes)) {
+ try (WritableHandle offHeapMemHandler = WritableMemory.allocateDirect(bytes)) {
final WritableMemory offHeapMem = offHeapMemHandler.getWritable();
final WritableMemory onHeapMem = WritableMemory.writableWrap(new byte[bytes]);
diff --git a/src/test/java/org/apache/datasketches/theta/CompactSketchTest.java b/src/test/java/org/apache/datasketches/theta/CompactSketchTest.java
index d8237ad..faf7433 100644
--- a/src/test/java/org/apache/datasketches/theta/CompactSketchTest.java
+++ b/src/test/java/org/apache/datasketches/theta/CompactSketchTest.java
@@ -28,7 +28,7 @@ import static org.testng.Assert.assertTrue;
import org.apache.datasketches.Family;
import org.apache.datasketches.SketchesArgumentException;
import org.apache.datasketches.memory.Memory;
-import org.apache.datasketches.memory.WritableDirectHandle;
+import org.apache.datasketches.memory.WritableHandle;
import org.apache.datasketches.memory.WritableMemory;
import org.testng.annotations.Test;
@@ -78,7 +78,7 @@ public class CompactSketchTest {
//Prepare Memory for direct
int bytes = usk.getCompactBytes(); //for Compact
- try (WritableDirectHandle wdh = WritableMemory.allocateDirect(bytes)) {
+ try (WritableHandle wdh = WritableMemory.allocateDirect(bytes)) {
WritableMemory directMem = wdh.getWritable();
/**Via CompactSketch.compact**/
diff --git a/src/test/java/org/apache/datasketches/theta/DirectQuickSelectSketchTest.java b/src/test/java/org/apache/datasketches/theta/DirectQuickSelectSketchTest.java
index 876a9b4..41f56c8 100644
--- a/src/test/java/org/apache/datasketches/theta/DirectQuickSelectSketchTest.java
+++ b/src/test/java/org/apache/datasketches/theta/DirectQuickSelectSketchTest.java
@@ -47,7 +47,7 @@ import org.apache.datasketches.ResizeFactor;
import org.apache.datasketches.SketchesArgumentException;
import org.apache.datasketches.SketchesReadOnlyException;
import org.apache.datasketches.memory.Memory;
-import org.apache.datasketches.memory.WritableDirectHandle;
+import org.apache.datasketches.memory.WritableHandle;
import org.apache.datasketches.memory.WritableMemory;
import org.testng.annotations.Test;
@@ -60,7 +60,7 @@ public class DirectQuickSelectSketchTest {
@Test//(expectedExceptions = SketchesArgumentException.class)
public void checkBadSerVer() {
int k = 512;
- try (WritableDirectHandle h = makeNativeMemory(k)) {
+ try (WritableHandle h = makeNativeMemory(k)) {
WritableMemory mem = h.getWritable();
UpdateSketch usk = UpdateSketch.builder().setNominalEntries(k).build(mem);
@@ -86,7 +86,7 @@ public class DirectQuickSelectSketchTest {
@Test//(expectedExceptions = SketchesArgumentException.class)
public void checkConstructorKtooSmall() {
int k = 8;
- try (WritableDirectHandle h = makeNativeMemory(k)) {
+ try (WritableHandle h = makeNativeMemory(k)) {
WritableMemory mem = h.getWritable();
UpdateSketch.builder().setNominalEntries(k).build(mem);
} catch (final Exception e) {
@@ -98,7 +98,7 @@ public class DirectQuickSelectSketchTest {
@Test//(expectedExceptions = SketchesArgumentException.class)
public void checkConstructorMemTooSmall() {
int k = 16;
- try (WritableDirectHandle h = makeNativeMemory(k/2)) {
+ try (WritableHandle h = makeNativeMemory(k/2)) {
WritableMemory mem = h.getWritable();
UpdateSketch.builder().setNominalEntries(k).build(mem);
} catch (final Exception e) {
@@ -126,7 +126,7 @@ public class DirectQuickSelectSketchTest {
int u = 2*k;
boolean estimating = (u > k);
- try (WritableDirectHandle h = makeNativeMemory(k)) {
+ try (WritableHandle h = makeNativeMemory(k)) {
WritableMemory mem = h.getWritable();
UpdateSketch sk1 = UpdateSketch.builder().setNominalEntries(k).build(mem);
@@ -198,7 +198,7 @@ public class DirectQuickSelectSketchTest {
int k = 512;
long seed1 = 1021;
long seed2 = DEFAULT_UPDATE_SEED;
- try (WritableDirectHandle h = makeNativeMemory(k)) {
+ try (WritableHandle h = makeNativeMemory(k)) {
WritableMemory mem = h.getWritable();
UpdateSketch usk = UpdateSketch.builder().setSeed(seed1).setNominalEntries(k).build(mem);
@@ -214,7 +214,7 @@ public class DirectQuickSelectSketchTest {
@Test//(expectedExceptions = SketchesArgumentException.class)
public void checkCorruptLgNomLongs() {
int k = 16;
- try (WritableDirectHandle h = makeNativeMemory(k)) {
+ try (WritableHandle h = makeNativeMemory(k)) {
WritableMemory mem = h.getWritable();
UpdateSketch.builder().setNominalEntries(k).build(mem);
mem.putByte(LG_NOM_LONGS_BYTE, (byte)2); //corrupt
@@ -228,7 +228,7 @@ public class DirectQuickSelectSketchTest {
@Test
public void checkHeapifyByteArrayExact() {
int k = 512;
- try (WritableDirectHandle h = makeNativeMemory(k)) {
+ try (WritableHandle h = makeNativeMemory(k)) {
WritableMemory mem = h.getWritable();
UpdateSketch usk = UpdateSketch.builder().setNominalEntries(k).build(mem);
@@ -261,7 +261,7 @@ public class DirectQuickSelectSketchTest {
public void checkHeapifyByteArrayEstimating() {
int k = 4096;
int u = 2*k;
- try (WritableDirectHandle h = makeNativeMemory(k)) {
+ try (WritableHandle h = makeNativeMemory(k)) {
WritableMemory mem = h.getWritable();
UpdateSketch usk = UpdateSketch.builder().setNominalEntries(k).build(mem);
@@ -292,7 +292,7 @@ public class DirectQuickSelectSketchTest {
int u = 2*k;
boolean estimating = (u > k);
- try (WritableDirectHandle h = makeNativeMemory(k)) {
+ try (WritableHandle h = makeNativeMemory(k)) {
WritableMemory mem = h.getWritable();
UpdateSketch sk1 = UpdateSketch.builder().setNominalEntries(k).build(mem);
for (int i=0; i<u; i++) { sk1.update(i); }
@@ -319,7 +319,7 @@ public class DirectQuickSelectSketchTest {
int k = 512;
int u = 4*k;
boolean estimating = (u > k);
- try (WritableDirectHandle h = makeNativeMemory(k)) {
+ try (WritableHandle h = makeNativeMemory(k)) {
WritableMemory mem = h.getWritable();
UpdateSketch usk = UpdateSketch.builder().setNominalEntries(k).build(mem);
@@ -389,7 +389,7 @@ public class DirectQuickSelectSketchTest {
@Test
public void checkDQStoCompactEmptyForms() {
int k = 512;
- try (WritableDirectHandle h = makeNativeMemory(k)) {
+ try (WritableHandle h = makeNativeMemory(k)) {
WritableMemory mem = h.getWritable();
UpdateSketch usk = UpdateSketch.builder().setNominalEntries(k).build(mem);
@@ -435,7 +435,7 @@ public class DirectQuickSelectSketchTest {
int k = 4096;
int u = 2*k;
- try (WritableDirectHandle h = makeNativeMemory(k)) {
+ try (WritableHandle h = makeNativeMemory(k)) {
WritableMemory mem = h.getWritable();
UpdateSketch usk = UpdateSketch.builder().setNominalEntries(k).build(mem);
@@ -456,7 +456,7 @@ public class DirectQuickSelectSketchTest {
int k = 4096;
float p = (float)0.5;
- try (WritableDirectHandle h = makeNativeMemory(k)) {
+ try (WritableHandle h = makeNativeMemory(k)) {
WritableMemory mem = h.getWritable();
UpdateSketch usk = UpdateSketch.builder().setP(p).setNominalEntries(k).build(mem);
@@ -482,7 +482,7 @@ public class DirectQuickSelectSketchTest {
@Test
public void checkErrorBounds() {
int k = 512;
- try (WritableDirectHandle h = makeNativeMemory(k)) {
+ try (WritableHandle h = makeNativeMemory(k)) {
WritableMemory mem = h.getWritable();
UpdateSketch usk = UpdateSketch.builder().setNominalEntries(k).build(mem);
@@ -518,7 +518,7 @@ public class DirectQuickSelectSketchTest {
//virgin, p = 1.0
int k = 1024;
float p = (float)1.0;
- try (WritableDirectHandle h = makeNativeMemory(k)) {
+ try (WritableHandle h = makeNativeMemory(k)) {
WritableMemory mem = h.getWritable();
UpdateSketch usk = UpdateSketch.builder().setP(p).setNominalEntries(k).build(mem);
@@ -558,7 +558,7 @@ public class DirectQuickSelectSketchTest {
public void checkUpperAndLowerBounds() {
int k = 512;
int u = 2*k;
- try (WritableDirectHandle h = makeNativeMemory(k)) {
+ try (WritableHandle h = makeNativeMemory(k)) {
WritableMemory mem = h.getWritable();
UpdateSketch usk = UpdateSketch.builder().setNominalEntries(k).build(mem);
@@ -579,7 +579,7 @@ public class DirectQuickSelectSketchTest {
public void checkRebuild() {
int k = 512;
int u = 4*k;
- try (WritableDirectHandle h = makeNativeMemory(k)) {
+ try (WritableHandle h = makeNativeMemory(k)) {
WritableMemory mem = h.getWritable();
UpdateSketch usk = UpdateSketch.builder().setNominalEntries(k).build(mem);
@@ -608,7 +608,7 @@ public class DirectQuickSelectSketchTest {
public void checkResetAndStartingSubMultiple() {
int k = 512;
int u = 4*k;
- try (WritableDirectHandle h = makeNativeMemory(k)) {
+ try (WritableHandle h = makeNativeMemory(k)) {
WritableMemory mem = h.getWritable();
UpdateSketch usk = UpdateSketch.builder().setNominalEntries(k).build(mem);
@@ -639,7 +639,7 @@ public class DirectQuickSelectSketchTest {
public void checkExactModeMemoryArr() {
int k = 4096;
int u = 4096;
- try (WritableDirectHandle h = makeNativeMemory(k)) {
+ try (WritableHandle h = makeNativeMemory(k)) {
WritableMemory mem = h.getWritable();
UpdateSketch usk = UpdateSketch.builder().setNominalEntries(k).build(mem);
@@ -660,7 +660,7 @@ public class DirectQuickSelectSketchTest {
int k = 4096;
int u = 2*k;
- try (WritableDirectHandle h = makeNativeMemory(k)) {
+ try (WritableHandle h = makeNativeMemory(k)) {
WritableMemory mem = h.getWritable();
UpdateSketch usk = UpdateSketch.builder().setNominalEntries(k).build(mem);
@@ -682,7 +682,7 @@ public class DirectQuickSelectSketchTest {
int u = 2*k;
int memCapacity = (k << 4) + (Family.QUICKSELECT.getMinPreLongs() << 3);
- try(WritableDirectHandle memHandler = WritableMemory.allocateDirect(memCapacity)) {
+ try(WritableHandle memHandler = WritableMemory.allocateDirect(memCapacity)) {
UpdateSketch usk = UpdateSketch.builder().setNominalEntries(k).build(memHandler.getWritable());
DirectQuickSelectSketch sk1 = (DirectQuickSelectSketch)usk; //for internal checks
@@ -703,7 +703,7 @@ public class DirectQuickSelectSketchTest {
int k = 4096;
int u = 2*k;
- try (WritableDirectHandle h = makeNativeMemory(k)) {
+ try (WritableHandle h = makeNativeMemory(k)) {
UpdateSketch usk = UpdateSketch.builder().setNominalEntries(k).build(h.getWritable());
assertTrue(usk.isEmpty());
@@ -872,7 +872,7 @@ public class DirectQuickSelectSketchTest {
int k = 1 << 12;
int u = 2 * k;
int bytes = Sketches.getMaxUpdateSketchBytes(k);
- try (WritableDirectHandle wdh = WritableMemory.allocateDirect(bytes/2)) { //will request
+ try (WritableHandle wdh = WritableMemory.allocateDirect(bytes/2)) { //will request
WritableMemory wmem = wdh.getWritable();
UpdateSketch sketch = Sketches.updateSketchBuilder().setNominalEntries(k).build(wmem);
assertTrue(sketch.isSameResource(wmem));
@@ -888,7 +888,7 @@ public class DirectQuickSelectSketchTest {
int k = 1 << 12;
int u = 2 * k;
int bytes = Sketches.getMaxUpdateSketchBytes(k);
- try (WritableDirectHandle wdh = WritableMemory.allocateDirect(bytes/2)) { //will request
+ try (WritableHandle wdh = WritableMemory.allocateDirect(bytes/2)) { //will request
WritableMemory wmem = wdh.getWritable();
UpdateSketch sketch = Sketches.updateSketchBuilder().setNominalEntries(k).build(wmem);
for (int i = 0; i < u; i++) { sketch.update(i); }
@@ -933,7 +933,7 @@ public class DirectQuickSelectSketchTest {
return (k << 4) + (Family.QUICKSELECT.getMinPreLongs() << 3);
}
- private static WritableDirectHandle makeNativeMemory(int k) {
+ private static WritableHandle makeNativeMemory(int k) {
return WritableMemory.allocateDirect(getMaxBytes(k));
}
diff --git a/src/test/java/org/apache/datasketches/theta/UnionImplTest.java b/src/test/java/org/apache/datasketches/theta/UnionImplTest.java
index b9db91f..b4121fc 100644
--- a/src/test/java/org/apache/datasketches/theta/UnionImplTest.java
+++ b/src/test/java/org/apache/datasketches/theta/UnionImplTest.java
@@ -29,7 +29,7 @@ import static org.testng.Assert.assertTrue;
import org.apache.datasketches.SketchesArgumentException;
import org.apache.datasketches.Util;
import org.apache.datasketches.memory.Memory;
-import org.apache.datasketches.memory.WritableDirectHandle;
+import org.apache.datasketches.memory.WritableHandle;
import org.apache.datasketches.memory.WritableMemory;
import org.testng.annotations.Test;
@@ -169,13 +169,13 @@ public class UnionImplTest {
final int k = 1 << 12;
final int u = 2 * k;
final int bytes = Sketches.getMaxUpdateSketchBytes(k);
- try (WritableDirectHandle wdh = WritableMemory.allocateDirect(bytes/2);
- WritableDirectHandle wdh2 = WritableMemory.allocateDirect(bytes/2) ) {
- final WritableMemory wmem = wdh.getWritable();
+ try (WritableHandle wh = WritableMemory.allocateDirect(bytes/2);
+ WritableHandle wh2 = WritableMemory.allocateDirect(bytes/2) ) {
+ final WritableMemory wmem = wh.getWritable();
final UpdateSketch sketch = Sketches.updateSketchBuilder().setNominalEntries(k).build(wmem);
assertTrue(sketch.isSameResource(wmem));
- final WritableMemory wmem2 = wdh2.getWritable();
+ final WritableMemory wmem2 = wh2.getWritable();
final Union union = SetOperation.builder().buildUnion(wmem2);
assertTrue(union.isSameResource(wmem2));
@@ -207,7 +207,7 @@ public class UnionImplTest {
final double est1 = sk.getEstimate();
final int bytes = Sketches.getMaxCompactSketchBytes(sk.getRetainedEntries(true));
- try (WritableDirectHandle h = WritableMemory.allocateDirect(bytes)) {
+ try (WritableHandle h = WritableMemory.allocateDirect(bytes)) {
final WritableMemory wmem = h.getWritable();
final CompactSketch csk = sk.compact(true, wmem); //ordered, direct
final Union union = Sketches.setOperationBuilder().buildUnion();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org