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/05/18 19:57:09 UTC
[datasketches-memory] 02/08: Interim changes

This is an automated email from the ASF dual-hosted git repository.

leerho pushed a commit to branch CreateInternal2
in repository https://gitbox.apache.org/repos/asf/datasketches-memory.git

commit 6ccfa2dccfd61f50dd897395b7e3c636c248d5ce
Author: Lee Rhodes <le...@users.noreply.github.com>
AuthorDate: Sat May 15 15:23:11 2021 -0700

    Interim changes
    
    Created MapHandleImpl
---
 .../{internal => }/DefaultMemoryRequestServer.java |  4 +++-
 .../datasketches/memory/{internal => }/Handle.java |  4 +++-
 .../datasketches/memory/{internal => }/Map.java    |  4 ++--
 .../WritableHandle.java => MapHandle.java}         | 28 +++++++++++++++-------
 .../memory/{internal => }/MemoryRequestServer.java |  5 +++-
 .../memory/{internal => }/WritableHandle.java      |  4 +++-
 .../memory/{internal => }/WritableMap.java         |  4 ++--
 .../memory/internal/AllocateDirectMap.java         |  1 +
 .../memory/internal/AllocateDirectWritableMap.java |  2 ++
 .../datasketches/memory/internal/BaseState.java    |  3 +++
 .../memory/internal/BaseWritableMemoryImpl.java    |  2 ++
 .../DirectNonNativeWritableBufferImpl.java         |  2 ++
 .../DirectNonNativeWritableMemoryImpl.java         |  2 ++
 .../memory/internal/DirectWritableBufferImpl.java  |  2 ++
 .../memory/internal/DirectWritableMemoryImpl.java  |  2 ++
 .../{MapHandle.java => MapHandleImpl.java}         | 15 ++++--------
 .../datasketches/memory/internal/Memory.java       |  3 +++
 .../memory/internal/WritableBuffer.java            |  3 +++
 .../memory/internal/WritableDirectHandle.java      |  3 +++
 .../memory/internal/WritableMapHandle.java         |  6 ++++-
 .../memory/internal/WritableMemory.java            |  5 ++++
 .../datasketches/memory/internal/package-info.java |  4 ++--
 .../WritableHandle.java => package-info.java}      | 17 ++-----------
 .../memory/test/AllocateDirectMapMemoryTest.java   |  2 +-
 .../memory/test/AllocateDirectMemoryTest.java      |  4 ++--
 .../test/AllocateDirectWritableMapMemoryTest.java  |  4 ++--
 .../datasketches/memory/test/BaseBufferTest.java   |  2 +-
 .../memory/test/BufferInvariantsTest.java          |  2 +-
 .../datasketches/memory/test/BufferTest.java       |  2 +-
 .../datasketches/memory/test/CommonBufferTest.java |  2 +-
 .../datasketches/memory/test/CommonMemoryTest.java |  2 +-
 .../memory/test/CopyMemoryOverlapTest.java         |  2 +-
 .../datasketches/memory/test/CopyMemoryTest.java   |  2 +-
 .../test/ExampleMemoryRequestServerTest.java       |  4 ++--
 .../memory/test/IgnoredArrayOverflowTest.java      |  2 +-
 .../memory/test/MemoryReadWriteSafetyTest.java     |  2 +-
 .../datasketches/memory/test/MemoryTest.java       |  4 ++--
 .../memory/test/MemoryWriteToTest.java             |  2 +-
 .../datasketches/memory/test/ReflectUtil.java      |  2 +-
 .../memory/test/WritableBufferImplTest.java        |  2 +-
 .../memory/test/WritableDirectCopyTest.java        |  2 +-
 .../memory/test/WritableMemoryImplTest.java        |  2 +-
 42 files changed, 103 insertions(+), 68 deletions(-)

diff --git a/src/main/java/org/apache/datasketches/memory/internal/DefaultMemoryRequestServer.java b/src/main/java/org/apache/datasketches/memory/DefaultMemoryRequestServer.java
similarity index 96%
rename from src/main/java/org/apache/datasketches/memory/internal/DefaultMemoryRequestServer.java
rename to src/main/java/org/apache/datasketches/memory/DefaultMemoryRequestServer.java
index 20c481a..8f789f6 100644
--- a/src/main/java/org/apache/datasketches/memory/internal/DefaultMemoryRequestServer.java
+++ b/src/main/java/org/apache/datasketches/memory/DefaultMemoryRequestServer.java
@@ -17,7 +17,9 @@
  * under the License.
  */
 
-package org.apache.datasketches.memory.internal;
+package org.apache.datasketches.memory;
+
+import org.apache.datasketches.memory.internal.WritableMemory;
 
 /**
  * This is a simple implementation of the MemoryRequestServer that creates space on the Java heap
diff --git a/src/main/java/org/apache/datasketches/memory/internal/Handle.java b/src/main/java/org/apache/datasketches/memory/Handle.java
similarity index 96%
rename from src/main/java/org/apache/datasketches/memory/internal/Handle.java
rename to src/main/java/org/apache/datasketches/memory/Handle.java
index dc5493f..f92b284 100644
--- a/src/main/java/org/apache/datasketches/memory/internal/Handle.java
+++ b/src/main/java/org/apache/datasketches/memory/Handle.java
@@ -17,7 +17,9 @@
  * under the License.
  */
 
-package org.apache.datasketches.memory.internal;
+package org.apache.datasketches.memory;
+
+import org.apache.datasketches.memory.internal.Memory;
 
 /**
  * A handle for read-only resource.
diff --git a/src/main/java/org/apache/datasketches/memory/internal/Map.java b/src/main/java/org/apache/datasketches/memory/Map.java
similarity index 93%
rename from src/main/java/org/apache/datasketches/memory/internal/Map.java
rename to src/main/java/org/apache/datasketches/memory/Map.java
index f17a24f..6b99059 100644
--- a/src/main/java/org/apache/datasketches/memory/internal/Map.java
+++ b/src/main/java/org/apache/datasketches/memory/Map.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.datasketches.memory.internal;
+package org.apache.datasketches.memory;
 
 /**
  * Read only interface for a memory mapped file
@@ -26,7 +26,7 @@ package org.apache.datasketches.memory.internal;
  * @author Lee Rhodes
  * @author Praveenkumar Venkatesan
  */
-interface Map extends AutoCloseable {
+public interface Map extends AutoCloseable {
 
   /**
    * @see <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/MappedByteBuffer.html#load--">
diff --git a/src/main/java/org/apache/datasketches/memory/internal/WritableHandle.java b/src/main/java/org/apache/datasketches/memory/MapHandle.java
similarity index 67%
copy from src/main/java/org/apache/datasketches/memory/internal/WritableHandle.java
copy to src/main/java/org/apache/datasketches/memory/MapHandle.java
index e9361ad..fc61ec5 100644
--- a/src/main/java/org/apache/datasketches/memory/internal/WritableHandle.java
+++ b/src/main/java/org/apache/datasketches/memory/MapHandle.java
@@ -17,21 +17,31 @@
  * under the License.
  */
 
-package org.apache.datasketches.memory.internal;
+
+package org.apache.datasketches.memory;
+
+import org.apache.datasketches.memory.internal.Memory;
+
 
 /**
- * A Handle for writable direct memory or a memory-mapped, writable file resource.
- * Please read Javadocs for {@link Handle}.
+ * A Handle for a memory-mapped, read-only file resource. This
+ * joins a Read-only Handle with an AutoCloseable Map resource.
+ * Please read Javadocs for {@link Handle}. 
  *
  * @author Lee Rhodes
  * @author Roman Leventov
  */
-public interface WritableHandle extends Handle {
+public interface MapHandle extends Map, Handle {
 
-  /**
-   * Gets a WritableMemory
-   * @return a WritableMemory
-   */
   @Override
-  WritableMemory get();
+  Memory get();
+  
+  @Override
+  void close();
+  
+  @Override
+  void load();
+  
+  @Override
+  boolean isLoaded();
 }
diff --git a/src/main/java/org/apache/datasketches/memory/internal/MemoryRequestServer.java b/src/main/java/org/apache/datasketches/memory/MemoryRequestServer.java
similarity index 91%
rename from src/main/java/org/apache/datasketches/memory/internal/MemoryRequestServer.java
rename to src/main/java/org/apache/datasketches/memory/MemoryRequestServer.java
index d98ab78..977664c 100644
--- a/src/main/java/org/apache/datasketches/memory/internal/MemoryRequestServer.java
+++ b/src/main/java/org/apache/datasketches/memory/MemoryRequestServer.java
@@ -17,7 +17,10 @@
  * under the License.
  */
 
-package org.apache.datasketches.memory.internal;
+package org.apache.datasketches.memory;
+
+import org.apache.datasketches.memory.internal.WritableDirectHandle;
+import org.apache.datasketches.memory.internal.WritableMemory;
 
 /**
  * The MemoryRequestServer is a callback interface to provide a means for a direct (off-heap),
diff --git a/src/main/java/org/apache/datasketches/memory/internal/WritableHandle.java b/src/main/java/org/apache/datasketches/memory/WritableHandle.java
similarity index 91%
copy from src/main/java/org/apache/datasketches/memory/internal/WritableHandle.java
copy to src/main/java/org/apache/datasketches/memory/WritableHandle.java
index e9361ad..8b2aaa7 100644
--- a/src/main/java/org/apache/datasketches/memory/internal/WritableHandle.java
+++ b/src/main/java/org/apache/datasketches/memory/WritableHandle.java
@@ -17,7 +17,9 @@
  * under the License.
  */
 
-package org.apache.datasketches.memory.internal;
+package org.apache.datasketches.memory;
+
+import org.apache.datasketches.memory.internal.WritableMemory;
 
 /**
  * A Handle for writable direct memory or a memory-mapped, writable file resource.
diff --git a/src/main/java/org/apache/datasketches/memory/internal/WritableMap.java b/src/main/java/org/apache/datasketches/memory/WritableMap.java
similarity index 92%
rename from src/main/java/org/apache/datasketches/memory/internal/WritableMap.java
rename to src/main/java/org/apache/datasketches/memory/WritableMap.java
index 5c35c43..21502a7 100644
--- a/src/main/java/org/apache/datasketches/memory/internal/WritableMap.java
+++ b/src/main/java/org/apache/datasketches/memory/WritableMap.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.datasketches.memory.internal;
+package org.apache.datasketches.memory;
 
 /**
  * Writable interface for a memory mapped file
@@ -26,7 +26,7 @@ package org.apache.datasketches.memory.internal;
  * @author Lee Rhodes
  * @author Praveenkumar Venkatesan
  */
-interface WritableMap extends Map {
+public interface WritableMap extends Map {
 
   /**
    * @see <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/MappedByteBuffer.html#force--">
diff --git a/src/main/java/org/apache/datasketches/memory/internal/AllocateDirectMap.java b/src/main/java/org/apache/datasketches/memory/internal/AllocateDirectMap.java
index 6272b5b..324c89e 100644
--- a/src/main/java/org/apache/datasketches/memory/internal/AllocateDirectMap.java
+++ b/src/main/java/org/apache/datasketches/memory/internal/AllocateDirectMap.java
@@ -30,6 +30,7 @@ import java.lang.reflect.Method;
 import java.nio.MappedByteBuffer;
 import java.nio.channels.FileChannel;
 
+import org.apache.datasketches.memory.Map;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/org/apache/datasketches/memory/internal/AllocateDirectWritableMap.java b/src/main/java/org/apache/datasketches/memory/internal/AllocateDirectWritableMap.java
index 588dbef..0d7d609 100644
--- a/src/main/java/org/apache/datasketches/memory/internal/AllocateDirectWritableMap.java
+++ b/src/main/java/org/apache/datasketches/memory/internal/AllocateDirectWritableMap.java
@@ -21,6 +21,8 @@ package org.apache.datasketches.memory.internal;
 
 import java.io.File;
 
+import org.apache.datasketches.memory.WritableMap;
+
 /**
  * Allocates direct memory used to memory map files for write operations
  * (including those &gt; 2GB).
diff --git a/src/main/java/org/apache/datasketches/memory/internal/BaseState.java b/src/main/java/org/apache/datasketches/memory/internal/BaseState.java
index 9bb685b..791a31d 100644
--- a/src/main/java/org/apache/datasketches/memory/internal/BaseState.java
+++ b/src/main/java/org/apache/datasketches/memory/internal/BaseState.java
@@ -28,6 +28,9 @@ import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.concurrent.atomic.AtomicLong;
 
+import org.apache.datasketches.memory.DefaultMemoryRequestServer;
+import org.apache.datasketches.memory.MemoryRequestServer;
+
 /**
  * Keeps key configuration state for Memory and Buffer plus some common static variables
  * and check methods.
diff --git a/src/main/java/org/apache/datasketches/memory/internal/BaseWritableMemoryImpl.java b/src/main/java/org/apache/datasketches/memory/internal/BaseWritableMemoryImpl.java
index 5ba6c27..7ab8494 100644
--- a/src/main/java/org/apache/datasketches/memory/internal/BaseWritableMemoryImpl.java
+++ b/src/main/java/org/apache/datasketches/memory/internal/BaseWritableMemoryImpl.java
@@ -36,6 +36,8 @@ import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.channels.WritableByteChannel;
 
+import org.apache.datasketches.memory.MemoryRequestServer;
+
 /*
  * Developer notes: The heavier methods, such as put/get arrays, duplicate, region, clear, fill,
  * compareTo, etc., use hard checks (checkValid*() and checkBounds()), which execute at runtime and
diff --git a/src/main/java/org/apache/datasketches/memory/internal/DirectNonNativeWritableBufferImpl.java b/src/main/java/org/apache/datasketches/memory/internal/DirectNonNativeWritableBufferImpl.java
index 442768c..6d8f159 100644
--- a/src/main/java/org/apache/datasketches/memory/internal/DirectNonNativeWritableBufferImpl.java
+++ b/src/main/java/org/apache/datasketches/memory/internal/DirectNonNativeWritableBufferImpl.java
@@ -21,6 +21,8 @@ package org.apache.datasketches.memory.internal;
 
 import java.nio.ByteOrder;
 
+import org.apache.datasketches.memory.MemoryRequestServer;
+
 /**
  * Implementation of {@link WritableBuffer} for direct memory, non-native byte order.
  *
diff --git a/src/main/java/org/apache/datasketches/memory/internal/DirectNonNativeWritableMemoryImpl.java b/src/main/java/org/apache/datasketches/memory/internal/DirectNonNativeWritableMemoryImpl.java
index 9d38861..e8f5a64 100644
--- a/src/main/java/org/apache/datasketches/memory/internal/DirectNonNativeWritableMemoryImpl.java
+++ b/src/main/java/org/apache/datasketches/memory/internal/DirectNonNativeWritableMemoryImpl.java
@@ -21,6 +21,8 @@ package org.apache.datasketches.memory.internal;
 
 import java.nio.ByteOrder;
 
+import org.apache.datasketches.memory.MemoryRequestServer;
+
 /**
  * Implementation of {@link WritableMemory} for direct memory, non-native byte order.
  *
diff --git a/src/main/java/org/apache/datasketches/memory/internal/DirectWritableBufferImpl.java b/src/main/java/org/apache/datasketches/memory/internal/DirectWritableBufferImpl.java
index bc54da4..c6cd0e6 100644
--- a/src/main/java/org/apache/datasketches/memory/internal/DirectWritableBufferImpl.java
+++ b/src/main/java/org/apache/datasketches/memory/internal/DirectWritableBufferImpl.java
@@ -21,6 +21,8 @@ package org.apache.datasketches.memory.internal;
 
 import java.nio.ByteOrder;
 
+import org.apache.datasketches.memory.MemoryRequestServer;
+
 /**
  * Implementation of {@link WritableBuffer} for direct memory, native byte order.
  *
diff --git a/src/main/java/org/apache/datasketches/memory/internal/DirectWritableMemoryImpl.java b/src/main/java/org/apache/datasketches/memory/internal/DirectWritableMemoryImpl.java
index a377782..21eb03c 100644
--- a/src/main/java/org/apache/datasketches/memory/internal/DirectWritableMemoryImpl.java
+++ b/src/main/java/org/apache/datasketches/memory/internal/DirectWritableMemoryImpl.java
@@ -21,6 +21,8 @@ package org.apache.datasketches.memory.internal;
 
 import java.nio.ByteOrder;
 
+import org.apache.datasketches.memory.MemoryRequestServer;
+
 /**
  * Implementation of {@link WritableMemory} for direct memory, native byte order.
  *
diff --git a/src/main/java/org/apache/datasketches/memory/internal/MapHandle.java b/src/main/java/org/apache/datasketches/memory/internal/MapHandleImpl.java
similarity index 79%
rename from src/main/java/org/apache/datasketches/memory/internal/MapHandle.java
rename to src/main/java/org/apache/datasketches/memory/internal/MapHandleImpl.java
index 5e8114c..075b577 100644
--- a/src/main/java/org/apache/datasketches/memory/internal/MapHandle.java
+++ b/src/main/java/org/apache/datasketches/memory/internal/MapHandleImpl.java
@@ -19,22 +19,17 @@
 
 package org.apache.datasketches.memory.internal;
 
-/**
- * A Handle for a memory-mapped, read-only file resource.
- * Please read Javadocs for {@link Handle}.
- *
- * @author Lee Rhodes
- * @author Roman Leventov
- */
-//Joins a Read-only Handle with an AutoCloseable Map resource.
-public class MapHandle implements Map, Handle {
+import org.apache.datasketches.memory.MapHandle;
+
+public class MapHandleImpl implements MapHandle {
+
   /**
    * Having at least one final field makes this class safe for concurrent publication.
    */
   final AllocateDirectMap dirMap;
   private BaseWritableMemoryImpl wMem;
 
-  MapHandle(final AllocateDirectMap dirMap, final BaseWritableMemoryImpl wMem) {
+  MapHandleImpl(final AllocateDirectMap dirMap, final BaseWritableMemoryImpl wMem) {
     this.dirMap = dirMap;
     this.wMem = wMem;
   }
diff --git a/src/main/java/org/apache/datasketches/memory/internal/Memory.java b/src/main/java/org/apache/datasketches/memory/internal/Memory.java
index a5d3751..a369977 100644
--- a/src/main/java/org/apache/datasketches/memory/internal/Memory.java
+++ b/src/main/java/org/apache/datasketches/memory/internal/Memory.java
@@ -29,6 +29,9 @@ import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.channels.WritableByteChannel;
 
+import org.apache.datasketches.memory.Handle;
+import org.apache.datasketches.memory.MapHandle;
+
 /**
  * Provides read-only primitive and primitive array methods to any of the four resources
  * mentioned in the package level documentation.
diff --git a/src/main/java/org/apache/datasketches/memory/internal/WritableBuffer.java b/src/main/java/org/apache/datasketches/memory/internal/WritableBuffer.java
index cafa879..d6f5e88 100644
--- a/src/main/java/org/apache/datasketches/memory/internal/WritableBuffer.java
+++ b/src/main/java/org/apache/datasketches/memory/internal/WritableBuffer.java
@@ -22,6 +22,9 @@ package org.apache.datasketches.memory.internal;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
+import org.apache.datasketches.memory.DefaultMemoryRequestServer;
+import org.apache.datasketches.memory.MemoryRequestServer;
+
 /**
  * Provides read and write, positional primitive and primitive array access to any of the four
  * resources mentioned at the package level.
diff --git a/src/main/java/org/apache/datasketches/memory/internal/WritableDirectHandle.java b/src/main/java/org/apache/datasketches/memory/internal/WritableDirectHandle.java
index 4689191..8e490b8 100644
--- a/src/main/java/org/apache/datasketches/memory/internal/WritableDirectHandle.java
+++ b/src/main/java/org/apache/datasketches/memory/internal/WritableDirectHandle.java
@@ -19,6 +19,9 @@
 
 package org.apache.datasketches.memory.internal;
 
+import org.apache.datasketches.memory.Handle;
+import org.apache.datasketches.memory.WritableHandle;
+
 /**
  * A Handle for a writable direct memory resource.
  * Please read Javadocs for {@link Handle}.
diff --git a/src/main/java/org/apache/datasketches/memory/internal/WritableMapHandle.java b/src/main/java/org/apache/datasketches/memory/internal/WritableMapHandle.java
index 8404855..0cefbd6 100644
--- a/src/main/java/org/apache/datasketches/memory/internal/WritableMapHandle.java
+++ b/src/main/java/org/apache/datasketches/memory/internal/WritableMapHandle.java
@@ -19,6 +19,10 @@
 
 package org.apache.datasketches.memory.internal;
 
+import org.apache.datasketches.memory.Handle;
+import org.apache.datasketches.memory.WritableHandle;
+import org.apache.datasketches.memory.WritableMap;
+
 /**
  * A Handle for a memory-mapped, writable file resource.
  * Please read Javadocs for {@link Handle}.
@@ -27,7 +31,7 @@ package org.apache.datasketches.memory.internal;
  * @author Lee Rhodes
  */
 //Joins a WritableHandle with an AutoCloseable WritableMap resource
-public final class WritableMapHandle extends MapHandle implements WritableMap, WritableHandle {
+public final class WritableMapHandle extends MapHandleImpl implements WritableMap, WritableHandle {
 
   WritableMapHandle(final AllocateDirectWritableMap dirWmap,
       final BaseWritableMemoryImpl wMem) {
diff --git a/src/main/java/org/apache/datasketches/memory/internal/WritableMemory.java b/src/main/java/org/apache/datasketches/memory/internal/WritableMemory.java
index e442eb0..6f9d8fd 100644
--- a/src/main/java/org/apache/datasketches/memory/internal/WritableMemory.java
+++ b/src/main/java/org/apache/datasketches/memory/internal/WritableMemory.java
@@ -28,6 +28,11 @@ import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
+import org.apache.datasketches.memory.DefaultMemoryRequestServer;
+import org.apache.datasketches.memory.Handle;
+import org.apache.datasketches.memory.MemoryRequestServer;
+import org.apache.datasketches.memory.WritableHandle;
+
 /**
  * Provides read and write primitive and primitive array access to any of the four resources
  * mentioned at the package level.
diff --git a/src/main/java/org/apache/datasketches/memory/internal/package-info.java b/src/main/java/org/apache/datasketches/memory/internal/package-info.java
index 45ef820..1ca7aef 100644
--- a/src/main/java/org/apache/datasketches/memory/internal/package-info.java
+++ b/src/main/java/org/apache/datasketches/memory/internal/package-info.java
@@ -84,7 +84,7 @@
  *
  * <p>An access API is joined with
  * a resource either with a static factory method or in combination with a
- * {@link org.apache.datasketches.memory.internal.Handle}, which is used exclusively for resources that are
+ * {@link org.apache.datasketches.memory.Handle}, which is used exclusively for resources that are
  * external to the JVM, such as allocation of direct memory and memory-mapped files.</p>
  *
  * <p>The role of a Handle is to hold onto the reference of a resource that is outside the control
@@ -93,7 +93,7 @@
  * <p>When a handle is extended for an AutoCloseable resource and then joined with an access API
  * it becomes an <i>implementation handle</i>. There are 3 implementation handles:</p>
  *
- * <ul><li>{@link org.apache.datasketches.memory.internal.MapHandle}
+ * <ul><li>{@link org.apache.datasketches.memory.internal.MapHandleImpl}
  * for read-only access to a memory-mapped file</li>
  * <li>{@link org.apache.datasketches.memory.internal.WritableMapHandle}
  * for writable access to a memory-mapped file</li>
diff --git a/src/main/java/org/apache/datasketches/memory/internal/WritableHandle.java b/src/main/java/org/apache/datasketches/memory/package-info.java
similarity index 68%
rename from src/main/java/org/apache/datasketches/memory/internal/WritableHandle.java
rename to src/main/java/org/apache/datasketches/memory/package-info.java
index e9361ad..0474617 100644
--- a/src/main/java/org/apache/datasketches/memory/internal/WritableHandle.java
+++ b/src/main/java/org/apache/datasketches/memory/package-info.java
@@ -17,21 +17,8 @@
  * under the License.
  */
 
-package org.apache.datasketches.memory.internal;
-
 /**
- * A Handle for writable direct memory or a memory-mapped, writable file resource.
- * Please read Javadocs for {@link Handle}.
+ * @author lrhodes
  *
- * @author Lee Rhodes
- * @author Roman Leventov
  */
-public interface WritableHandle extends Handle {
-
-  /**
-   * Gets a WritableMemory
-   * @return a WritableMemory
-   */
-  @Override
-  WritableMemory get();
-}
+package org.apache.datasketches.memory;
diff --git a/src/test/java/org/apache/datasketches/memory/test/AllocateDirectMapMemoryTest.java b/src/test/java/org/apache/datasketches/memory/test/AllocateDirectMapMemoryTest.java
index c5b7c9f..bfe2d05 100644
--- a/src/test/java/org/apache/datasketches/memory/test/AllocateDirectMapMemoryTest.java
+++ b/src/test/java/org/apache/datasketches/memory/test/AllocateDirectMapMemoryTest.java
@@ -32,7 +32,7 @@ import static org.testng.Assert.fail;
 import java.io.File;
 import java.nio.ByteOrder;
 
-import org.apache.datasketches.memory.internal.MapHandle;
+import org.apache.datasketches.memory.MapHandle;
 import org.apache.datasketches.memory.internal.Memory;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
diff --git a/src/test/java/org/apache/datasketches/memory/test/AllocateDirectMemoryTest.java b/src/test/java/org/apache/datasketches/memory/test/AllocateDirectMemoryTest.java
index 2f9b8e0..5618423 100644
--- a/src/test/java/org/apache/datasketches/memory/test/AllocateDirectMemoryTest.java
+++ b/src/test/java/org/apache/datasketches/memory/test/AllocateDirectMemoryTest.java
@@ -26,10 +26,10 @@ import static org.testng.Assert.fail;
 
 import java.lang.reflect.InvocationTargetException;
 
-import org.apache.datasketches.memory.internal.MemoryRequestServer;
+import org.apache.datasketches.memory.MemoryRequestServer;
+import org.apache.datasketches.memory.WritableHandle;
 import org.apache.datasketches.memory.internal.Util;
 import org.apache.datasketches.memory.internal.WritableDirectHandle;
-import org.apache.datasketches.memory.internal.WritableHandle;
 import org.apache.datasketches.memory.internal.WritableMemory;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.Test;
diff --git a/src/test/java/org/apache/datasketches/memory/test/AllocateDirectWritableMapMemoryTest.java b/src/test/java/org/apache/datasketches/memory/test/AllocateDirectWritableMapMemoryTest.java
index b8a9b74..735f52c 100644
--- a/src/test/java/org/apache/datasketches/memory/test/AllocateDirectWritableMapMemoryTest.java
+++ b/src/test/java/org/apache/datasketches/memory/test/AllocateDirectWritableMapMemoryTest.java
@@ -37,11 +37,11 @@ import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Method;
 import java.nio.ByteOrder;
 
-import org.apache.datasketches.memory.internal.MapHandle;
+import org.apache.datasketches.memory.MapHandle;
+import org.apache.datasketches.memory.WritableHandle;
 import org.apache.datasketches.memory.internal.Memory;
 import org.apache.datasketches.memory.internal.ReadOnlyException;
 import org.apache.datasketches.memory.internal.Util;
-import org.apache.datasketches.memory.internal.WritableHandle;
 import org.apache.datasketches.memory.internal.WritableMapHandle;
 import org.apache.datasketches.memory.internal.WritableMemory;
 import org.testng.annotations.AfterClass;
diff --git a/src/test/java/org/apache/datasketches/memory/test/BaseBufferTest.java b/src/test/java/org/apache/datasketches/memory/test/BaseBufferTest.java
index 6815fd9..51b2ded 100644
--- a/src/test/java/org/apache/datasketches/memory/test/BaseBufferTest.java
+++ b/src/test/java/org/apache/datasketches/memory/test/BaseBufferTest.java
@@ -21,9 +21,9 @@ package org.apache.datasketches.memory.test;
 
 import static org.testng.Assert.fail;
 
+import org.apache.datasketches.memory.WritableHandle;
 import org.apache.datasketches.memory.internal.Buffer;
 import org.apache.datasketches.memory.internal.Memory;
-import org.apache.datasketches.memory.internal.WritableHandle;
 import org.apache.datasketches.memory.internal.WritableMemory;
 import org.testng.annotations.Test;
 
diff --git a/src/test/java/org/apache/datasketches/memory/test/BufferInvariantsTest.java b/src/test/java/org/apache/datasketches/memory/test/BufferInvariantsTest.java
index d08ef0d..50b6557 100644
--- a/src/test/java/org/apache/datasketches/memory/test/BufferInvariantsTest.java
+++ b/src/test/java/org/apache/datasketches/memory/test/BufferInvariantsTest.java
@@ -24,9 +24,9 @@ import static org.testng.Assert.fail;
 
 import java.nio.ByteBuffer;
 
+import org.apache.datasketches.memory.WritableHandle;
 import org.apache.datasketches.memory.internal.Buffer;
 import org.apache.datasketches.memory.internal.WritableBuffer;
-import org.apache.datasketches.memory.internal.WritableHandle;
 import org.apache.datasketches.memory.internal.WritableMemory;
 import org.testng.annotations.Test;
 
diff --git a/src/test/java/org/apache/datasketches/memory/test/BufferTest.java b/src/test/java/org/apache/datasketches/memory/test/BufferTest.java
index e80b2a0..86b379e 100644
--- a/src/test/java/org/apache/datasketches/memory/test/BufferTest.java
+++ b/src/test/java/org/apache/datasketches/memory/test/BufferTest.java
@@ -25,10 +25,10 @@ import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.List;
 
+import org.apache.datasketches.memory.WritableHandle;
 import org.apache.datasketches.memory.internal.Buffer;
 import org.apache.datasketches.memory.internal.Memory;
 import org.apache.datasketches.memory.internal.WritableBuffer;
-import org.apache.datasketches.memory.internal.WritableHandle;
 import org.apache.datasketches.memory.internal.WritableMemory;
 import org.testng.annotations.Test;
 import org.testng.collections.Lists;
diff --git a/src/test/java/org/apache/datasketches/memory/test/CommonBufferTest.java b/src/test/java/org/apache/datasketches/memory/test/CommonBufferTest.java
index 023270e..f3b78ee 100644
--- a/src/test/java/org/apache/datasketches/memory/test/CommonBufferTest.java
+++ b/src/test/java/org/apache/datasketches/memory/test/CommonBufferTest.java
@@ -21,8 +21,8 @@ package org.apache.datasketches.memory.test;
 
 import static org.testng.Assert.assertEquals;
 
+import org.apache.datasketches.memory.WritableHandle;
 import org.apache.datasketches.memory.internal.WritableBuffer;
-import org.apache.datasketches.memory.internal.WritableHandle;
 import org.apache.datasketches.memory.internal.WritableMemory;
 import org.testng.annotations.Test;
 
diff --git a/src/test/java/org/apache/datasketches/memory/test/CommonMemoryTest.java b/src/test/java/org/apache/datasketches/memory/test/CommonMemoryTest.java
index f28a301..5cde091 100644
--- a/src/test/java/org/apache/datasketches/memory/test/CommonMemoryTest.java
+++ b/src/test/java/org/apache/datasketches/memory/test/CommonMemoryTest.java
@@ -27,7 +27,7 @@ import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
-import org.apache.datasketches.memory.internal.WritableHandle;
+import org.apache.datasketches.memory.WritableHandle;
 import org.apache.datasketches.memory.internal.WritableMemory;
 import org.testng.annotations.Test;
 
diff --git a/src/test/java/org/apache/datasketches/memory/test/CopyMemoryOverlapTest.java b/src/test/java/org/apache/datasketches/memory/test/CopyMemoryOverlapTest.java
index 67da58a..f82561a 100644
--- a/src/test/java/org/apache/datasketches/memory/test/CopyMemoryOverlapTest.java
+++ b/src/test/java/org/apache/datasketches/memory/test/CopyMemoryOverlapTest.java
@@ -21,8 +21,8 @@ package org.apache.datasketches.memory.test;
 
 import static org.testng.Assert.assertEquals;
 
+import org.apache.datasketches.memory.WritableHandle;
 import org.apache.datasketches.memory.internal.Memory;
-import org.apache.datasketches.memory.internal.WritableHandle;
 import org.apache.datasketches.memory.internal.WritableMemory;
 import org.testng.annotations.Test;
 
diff --git a/src/test/java/org/apache/datasketches/memory/test/CopyMemoryTest.java b/src/test/java/org/apache/datasketches/memory/test/CopyMemoryTest.java
index 03b4bec..dc6a162 100644
--- a/src/test/java/org/apache/datasketches/memory/test/CopyMemoryTest.java
+++ b/src/test/java/org/apache/datasketches/memory/test/CopyMemoryTest.java
@@ -24,8 +24,8 @@ import static org.testng.Assert.assertEquals;
 
 import java.util.concurrent.ThreadLocalRandom;
 
+import org.apache.datasketches.memory.WritableHandle;
 import org.apache.datasketches.memory.internal.Memory;
-import org.apache.datasketches.memory.internal.WritableHandle;
 import org.apache.datasketches.memory.internal.WritableMemory;
 import org.testng.Assert;
 import org.testng.annotations.Test;
diff --git a/src/test/java/org/apache/datasketches/memory/test/ExampleMemoryRequestServerTest.java b/src/test/java/org/apache/datasketches/memory/test/ExampleMemoryRequestServerTest.java
index 446a825..cbff8d5 100644
--- a/src/test/java/org/apache/datasketches/memory/test/ExampleMemoryRequestServerTest.java
+++ b/src/test/java/org/apache/datasketches/memory/test/ExampleMemoryRequestServerTest.java
@@ -23,8 +23,8 @@ import static org.testng.Assert.assertFalse;
 
 import java.util.IdentityHashMap;
 
-import org.apache.datasketches.memory.internal.MemoryRequestServer;
-import org.apache.datasketches.memory.internal.WritableHandle;
+import org.apache.datasketches.memory.MemoryRequestServer;
+import org.apache.datasketches.memory.WritableHandle;
 import org.apache.datasketches.memory.internal.WritableMemory;
 import org.testng.annotations.Test;
 
diff --git a/src/test/java/org/apache/datasketches/memory/test/IgnoredArrayOverflowTest.java b/src/test/java/org/apache/datasketches/memory/test/IgnoredArrayOverflowTest.java
index 462de6c..2b6b36a 100644
--- a/src/test/java/org/apache/datasketches/memory/test/IgnoredArrayOverflowTest.java
+++ b/src/test/java/org/apache/datasketches/memory/test/IgnoredArrayOverflowTest.java
@@ -19,7 +19,7 @@
 
 package org.apache.datasketches.memory.test;
 
-import org.apache.datasketches.memory.internal.WritableHandle;
+import org.apache.datasketches.memory.WritableHandle;
 import org.apache.datasketches.memory.internal.WritableMemory;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
diff --git a/src/test/java/org/apache/datasketches/memory/test/MemoryReadWriteSafetyTest.java b/src/test/java/org/apache/datasketches/memory/test/MemoryReadWriteSafetyTest.java
index 572d019..b712060 100644
--- a/src/test/java/org/apache/datasketches/memory/test/MemoryReadWriteSafetyTest.java
+++ b/src/test/java/org/apache/datasketches/memory/test/MemoryReadWriteSafetyTest.java
@@ -25,7 +25,7 @@ import java.io.RandomAccessFile;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
-import org.apache.datasketches.memory.internal.MapHandle;
+import org.apache.datasketches.memory.MapHandle;
 import org.apache.datasketches.memory.internal.Memory;
 import org.apache.datasketches.memory.internal.ReadOnlyException;
 import org.apache.datasketches.memory.internal.WritableMemory;
diff --git a/src/test/java/org/apache/datasketches/memory/test/MemoryTest.java b/src/test/java/org/apache/datasketches/memory/test/MemoryTest.java
index 3166a12..1281b26 100644
--- a/src/test/java/org/apache/datasketches/memory/test/MemoryTest.java
+++ b/src/test/java/org/apache/datasketches/memory/test/MemoryTest.java
@@ -35,11 +35,11 @@ import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.List;
 
-import org.apache.datasketches.memory.internal.MapHandle;
+import org.apache.datasketches.memory.MapHandle;
+import org.apache.datasketches.memory.WritableHandle;
 import org.apache.datasketches.memory.internal.Memory;
 import org.apache.datasketches.memory.internal.Util;
 import org.apache.datasketches.memory.internal.WritableDirectHandle;
-import org.apache.datasketches.memory.internal.WritableHandle;
 import org.apache.datasketches.memory.internal.WritableMemory;
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
diff --git a/src/test/java/org/apache/datasketches/memory/test/MemoryWriteToTest.java b/src/test/java/org/apache/datasketches/memory/test/MemoryWriteToTest.java
index d6c10a9..01f06e0 100644
--- a/src/test/java/org/apache/datasketches/memory/test/MemoryWriteToTest.java
+++ b/src/test/java/org/apache/datasketches/memory/test/MemoryWriteToTest.java
@@ -27,8 +27,8 @@ import java.nio.channels.Channels;
 import java.nio.channels.WritableByteChannel;
 import java.util.concurrent.ThreadLocalRandom;
 
+import org.apache.datasketches.memory.WritableHandle;
 import org.apache.datasketches.memory.internal.Memory;
-import org.apache.datasketches.memory.internal.WritableHandle;
 import org.apache.datasketches.memory.internal.WritableMemory;
 import org.testng.Assert;
 import org.testng.annotations.Test;
diff --git a/src/test/java/org/apache/datasketches/memory/test/ReflectUtil.java b/src/test/java/org/apache/datasketches/memory/test/ReflectUtil.java
index 266ea8e..d57af89 100644
--- a/src/test/java/org/apache/datasketches/memory/test/ReflectUtil.java
+++ b/src/test/java/org/apache/datasketches/memory/test/ReflectUtil.java
@@ -23,7 +23,7 @@ import java.io.File;
 import java.lang.reflect.*;
 import java.nio.ByteOrder;
 
-import org.apache.datasketches.memory.internal.MemoryRequestServer;
+import org.apache.datasketches.memory.MemoryRequestServer;
 import org.apache.datasketches.memory.internal.WritableDirectHandle;
 
 public final class ReflectUtil {
diff --git a/src/test/java/org/apache/datasketches/memory/test/WritableBufferImplTest.java b/src/test/java/org/apache/datasketches/memory/test/WritableBufferImplTest.java
index e3eb97d..bdb0354 100644
--- a/src/test/java/org/apache/datasketches/memory/test/WritableBufferImplTest.java
+++ b/src/test/java/org/apache/datasketches/memory/test/WritableBufferImplTest.java
@@ -26,13 +26,13 @@ import static org.testng.Assert.assertTrue;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
+import org.apache.datasketches.memory.WritableHandle;
 import org.apache.datasketches.memory.internal.Buffer;
 import org.apache.datasketches.memory.internal.Memory;
 import org.apache.datasketches.memory.internal.ReadOnlyException;
 import org.apache.datasketches.memory.internal.UnsafeUtil;
 import org.apache.datasketches.memory.internal.Util;
 import org.apache.datasketches.memory.internal.WritableBuffer;
-import org.apache.datasketches.memory.internal.WritableHandle;
 import org.apache.datasketches.memory.internal.WritableMemory;
 import org.testng.Assert;
 import org.testng.annotations.Test;
diff --git a/src/test/java/org/apache/datasketches/memory/test/WritableDirectCopyTest.java b/src/test/java/org/apache/datasketches/memory/test/WritableDirectCopyTest.java
index f351c0c..cd3e7ad 100644
--- a/src/test/java/org/apache/datasketches/memory/test/WritableDirectCopyTest.java
+++ b/src/test/java/org/apache/datasketches/memory/test/WritableDirectCopyTest.java
@@ -22,8 +22,8 @@ package org.apache.datasketches.memory.test;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.fail;
 
+import org.apache.datasketches.memory.WritableHandle;
 import org.apache.datasketches.memory.internal.Memory;
-import org.apache.datasketches.memory.internal.WritableHandle;
 import org.apache.datasketches.memory.internal.WritableMemory;
 import org.testng.annotations.Test;
 
diff --git a/src/test/java/org/apache/datasketches/memory/test/WritableMemoryImplTest.java b/src/test/java/org/apache/datasketches/memory/test/WritableMemoryImplTest.java
index afd52fd..292ba0a 100644
--- a/src/test/java/org/apache/datasketches/memory/test/WritableMemoryImplTest.java
+++ b/src/test/java/org/apache/datasketches/memory/test/WritableMemoryImplTest.java
@@ -27,13 +27,13 @@ import static org.testng.Assert.fail;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
+import org.apache.datasketches.memory.WritableHandle;
 import org.apache.datasketches.memory.internal.Buffer;
 import org.apache.datasketches.memory.internal.Memory;
 import org.apache.datasketches.memory.internal.ReadOnlyException;
 import org.apache.datasketches.memory.internal.UnsafeUtil;
 import org.apache.datasketches.memory.internal.Util;
 import org.apache.datasketches.memory.internal.WritableBuffer;
-import org.apache.datasketches.memory.internal.WritableHandle;
 import org.apache.datasketches.memory.internal.WritableMemory;
 import org.testng.annotations.Test;
 

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org