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 625ffa0b036ccb41d394b942e8d77d097d205f35 Author: Lee Rhodes <[email protected]> AuthorDate: Fri May 14 14:12:15 2021 -0700 Initial rename of ../memory to ../memory/internal --- .../java/org/apache/datasketches/memory/Prim.java | 88 ---------------------- .../memory/{ => internal}/AccessByteBuffer.java | 4 +- .../memory/{ => internal}/AllocateDirect.java | 4 +- .../memory/{ => internal}/AllocateDirectMap.java | 4 +- .../{ => internal}/AllocateDirectWritableMap.java | 2 +- .../BBNonNativeWritableBufferImpl.java | 2 +- .../BBNonNativeWritableMemoryImpl.java | 2 +- .../{ => internal}/BBWritableBufferImpl.java | 2 +- .../{ => internal}/BBWritableMemoryImpl.java | 2 +- .../memory/{ => internal}/BaseBuffer.java | 2 +- .../memory/{ => internal}/BaseState.java | 10 +-- .../{ => internal}/BaseWritableBufferImpl.java | 24 +++--- .../{ => internal}/BaseWritableMemoryImpl.java | 24 +++--- .../datasketches/memory/{ => internal}/Buffer.java | 4 +- .../memory/{ => internal}/CompareAndCopy.java | 22 +++--- .../{ => internal}/DefaultMemoryRequestServer.java | 2 +- .../DirectNonNativeWritableBufferImpl.java | 2 +- .../DirectNonNativeWritableMemoryImpl.java | 2 +- .../{ => internal}/DirectWritableBufferImpl.java | 2 +- .../{ => internal}/DirectWritableMemoryImpl.java | 2 +- .../datasketches/memory/{ => internal}/Handle.java | 2 +- .../HeapNonNativeWritableBufferImpl.java | 2 +- .../HeapNonNativeWritableMemoryImpl.java | 2 +- .../{ => internal}/HeapWritableBufferImpl.java | 2 +- .../{ => internal}/HeapWritableMemoryImpl.java | 2 +- .../datasketches/memory/{ => internal}/Ints.java | 2 +- .../datasketches/memory/{ => internal}/Map.java | 2 +- .../memory/{ => internal}/MapHandle.java | 2 +- .../MapNonNativeWritableBufferImpl.java | 2 +- .../MapNonNativeWritableMemoryImpl.java | 2 +- .../{ => internal}/MapWritableBufferImpl.java | 2 +- .../{ => internal}/MapWritableMemoryImpl.java | 2 +- .../datasketches/memory/{ => internal}/Memory.java | 10 +-- .../memory/{ => internal}/MemoryRequestServer.java | 2 +- .../memory/{ => internal}/NioBits.java | 4 +- .../NonNativeWritableBufferImpl.java | 22 +++--- .../NonNativeWritableMemoryImpl.java | 24 +++--- .../apache/datasketches/memory/internal/Prim.java | 88 ++++++++++++++++++++++ .../memory/{ => internal}/ReadOnlyException.java | 2 +- .../memory/{ => internal}/StepBoolean.java | 2 +- .../memory/{ => internal}/UnsafeUtil.java | 2 +- .../datasketches/memory/{ => internal}/Utf8.java | 4 +- .../memory/{ => internal}/Utf8CodingException.java | 2 +- .../datasketches/memory/{ => internal}/Util.java | 4 +- .../memory/{ => internal}/WritableBuffer.java | 2 +- .../memory/{ => internal}/WritableBufferImpl.java | 36 ++++----- .../{ => internal}/WritableDirectHandle.java | 2 +- .../memory/{ => internal}/WritableHandle.java | 2 +- .../memory/{ => internal}/WritableMap.java | 2 +- .../memory/{ => internal}/WritableMapHandle.java | 2 +- .../memory/{ => internal}/WritableMemory.java | 8 +- .../memory/{ => internal}/WritableMemoryImpl.java | 38 +++++----- .../memory/{ => internal}/XxHash64.java | 34 ++++----- .../memory/{ => internal}/package-info.java | 18 ++--- .../memory/test/AllocateDirectMapMemoryTest.java | 6 +- .../memory/test/AllocateDirectMemoryTest.java | 10 +-- .../test/AllocateDirectWritableMapMemoryTest.java | 16 ++-- .../datasketches/memory/test/BaseBufferTest.java | 8 +- .../datasketches/memory/test/BaseStateTest.java | 16 ++-- .../datasketches/memory/test/Buffer2Test.java | 10 +-- .../memory/test/BufferBoundaryCheckTest.java | 2 +- .../memory/test/BufferInvariantsTest.java | 8 +- .../memory/test/BufferReadWriteSafetyTest.java | 8 +- .../datasketches/memory/test/BufferTest.java | 10 +-- .../datasketches/memory/test/CommonBufferTest.java | 6 +- .../datasketches/memory/test/CommonMemoryTest.java | 12 +-- .../memory/test/CopyMemoryOverlapTest.java | 6 +- .../datasketches/memory/test/CopyMemoryTest.java | 8 +- .../test/ExampleMemoryRequestServerTest.java | 6 +- .../memory/test/IgnoredArrayOverflowTest.java | 4 +- .../datasketches/memory/test/LeafImplTest.java | 10 +-- .../memory/test/MemoryBoundaryCheckTest.java | 4 +- .../memory/test/MemoryReadWriteSafetyTest.java | 8 +- .../datasketches/memory/test/MemoryTest.java | 14 ++-- .../memory/test/MemoryWriteToTest.java | 9 ++- .../test/NonNativeWritableBufferImplTest.java | 6 +- .../test/NonNativeWritableMemoryImplTest.java | 4 +- .../datasketches/memory/test/ReflectUtil.java | 12 +-- .../datasketches/memory/test/SpecificLeafTest.java | 12 +-- .../datasketches/memory/test/UnsafeUtilTest.java | 4 +- .../apache/datasketches/memory/test/Utf8Test.java | 9 +-- .../apache/datasketches/memory/test/UtilTest.java | 20 ++--- .../memory/test/WritableBufferImplTest.java | 16 ++-- .../memory/test/WritableDirectCopyTest.java | 6 +- .../memory/test/WritableMemoryImplTest.java | 16 ++-- .../memory/test/WritableMemoryTest.java | 8 +- .../memory/test/XxHash64LoopingTest.java | 2 +- .../datasketches/memory/test/XxHash64Test.java | 13 +--- .../datasketches/memory/test/ZeroCapacityTest.java | 4 +- 89 files changed, 423 insertions(+), 430 deletions(-) diff --git a/src/main/java/org/apache/datasketches/memory/Prim.java b/src/main/java/org/apache/datasketches/memory/Prim.java deleted file mode 100644 index 9b956bd..0000000 --- a/src/main/java/org/apache/datasketches/memory/Prim.java +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.datasketches.memory; - -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_BOOLEAN_BASE_OFFSET; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_BOOLEAN_INDEX_SCALE; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_BYTE_BASE_OFFSET; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_BYTE_INDEX_SCALE; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_CHAR_BASE_OFFSET; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_CHAR_INDEX_SCALE; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_DOUBLE_BASE_OFFSET; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_DOUBLE_INDEX_SCALE; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_FLOAT_BASE_OFFSET; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_FLOAT_INDEX_SCALE; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_INT_BASE_OFFSET; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_INT_INDEX_SCALE; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_LONG_BASE_OFFSET; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_LONG_INDEX_SCALE; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_OBJECT_BASE_OFFSET; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_OBJECT_INDEX_SCALE; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_SHORT_BASE_OFFSET; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_SHORT_INDEX_SCALE; -import static org.apache.datasketches.memory.UnsafeUtil.BOOLEAN_SHIFT; -import static org.apache.datasketches.memory.UnsafeUtil.BYTE_SHIFT; -import static org.apache.datasketches.memory.UnsafeUtil.CHAR_SHIFT; -import static org.apache.datasketches.memory.UnsafeUtil.DOUBLE_SHIFT; -import static org.apache.datasketches.memory.UnsafeUtil.FLOAT_SHIFT; -import static org.apache.datasketches.memory.UnsafeUtil.INT_SHIFT; -import static org.apache.datasketches.memory.UnsafeUtil.LONG_SHIFT; -import static org.apache.datasketches.memory.UnsafeUtil.OBJECT_SHIFT; -import static org.apache.datasketches.memory.UnsafeUtil.SHORT_SHIFT; - -/** - * Creates easy to access association between the major Unsafe constants. - * - * @author Lee Rhodes - */ -public enum Prim { - BOOLEAN(ARRAY_BOOLEAN_BASE_OFFSET, ARRAY_BOOLEAN_INDEX_SCALE, BOOLEAN_SHIFT), - BYTE(ARRAY_BYTE_BASE_OFFSET, ARRAY_BYTE_INDEX_SCALE, BYTE_SHIFT), - CHAR(ARRAY_CHAR_BASE_OFFSET, ARRAY_CHAR_INDEX_SCALE, CHAR_SHIFT), - SHORT(ARRAY_SHORT_BASE_OFFSET, ARRAY_SHORT_INDEX_SCALE, SHORT_SHIFT), - INT(ARRAY_INT_BASE_OFFSET, ARRAY_INT_INDEX_SCALE, INT_SHIFT), - LONG(ARRAY_LONG_BASE_OFFSET, ARRAY_LONG_INDEX_SCALE, LONG_SHIFT), - FLOAT(ARRAY_FLOAT_BASE_OFFSET, ARRAY_FLOAT_INDEX_SCALE, FLOAT_SHIFT), - DOUBLE(ARRAY_DOUBLE_BASE_OFFSET, ARRAY_DOUBLE_INDEX_SCALE, DOUBLE_SHIFT), - OBJECT(ARRAY_OBJECT_BASE_OFFSET, ARRAY_OBJECT_INDEX_SCALE, OBJECT_SHIFT); - - private final long arrBaseOff_; - private final long arrIdxScale_; - private final long sizeShift_; - - private Prim(final long arrBaseOff, final long arrIdxScale, final long sizeShift) { - this.arrBaseOff_ = arrBaseOff; - this.arrIdxScale_ = arrIdxScale; - this.sizeShift_ = sizeShift; - } - - public long off() { - return arrBaseOff_; - } - - public long scale() { - return arrIdxScale_; - } - - public long shift() { - return sizeShift_; - } - -} diff --git a/src/main/java/org/apache/datasketches/memory/AccessByteBuffer.java b/src/main/java/org/apache/datasketches/memory/internal/AccessByteBuffer.java similarity index 96% rename from src/main/java/org/apache/datasketches/memory/AccessByteBuffer.java rename to src/main/java/org/apache/datasketches/memory/internal/AccessByteBuffer.java index 697bbe8..9004beb 100644 --- a/src/main/java/org/apache/datasketches/memory/AccessByteBuffer.java +++ b/src/main/java/org/apache/datasketches/memory/internal/AccessByteBuffer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.datasketches.memory; +package org.apache.datasketches.memory.internal; -import static org.apache.datasketches.memory.UnsafeUtil.unsafe; +import static org.apache.datasketches.memory.internal.UnsafeUtil.unsafe; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/src/main/java/org/apache/datasketches/memory/AllocateDirect.java b/src/main/java/org/apache/datasketches/memory/internal/AllocateDirect.java similarity index 97% rename from src/main/java/org/apache/datasketches/memory/AllocateDirect.java rename to src/main/java/org/apache/datasketches/memory/internal/AllocateDirect.java index b031ce0..423c02c 100644 --- a/src/main/java/org/apache/datasketches/memory/AllocateDirect.java +++ b/src/main/java/org/apache/datasketches/memory/internal/AllocateDirect.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.datasketches.memory; +package org.apache.datasketches.memory.internal; -import static org.apache.datasketches.memory.UnsafeUtil.unsafe; +import static org.apache.datasketches.memory.internal.UnsafeUtil.unsafe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/apache/datasketches/memory/AllocateDirectMap.java b/src/main/java/org/apache/datasketches/memory/internal/AllocateDirectMap.java similarity index 98% rename from src/main/java/org/apache/datasketches/memory/AllocateDirectMap.java rename to src/main/java/org/apache/datasketches/memory/internal/AllocateDirectMap.java index 25bfef7..6272b5b 100644 --- a/src/main/java/org/apache/datasketches/memory/AllocateDirectMap.java +++ b/src/main/java/org/apache/datasketches/memory/internal/AllocateDirectMap.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.datasketches.memory; +package org.apache.datasketches.memory.internal; -import static org.apache.datasketches.memory.UnsafeUtil.unsafe; +import static org.apache.datasketches.memory.internal.UnsafeUtil.unsafe; import java.io.File; import java.io.FileDescriptor; diff --git a/src/main/java/org/apache/datasketches/memory/AllocateDirectWritableMap.java b/src/main/java/org/apache/datasketches/memory/internal/AllocateDirectWritableMap.java similarity index 97% rename from src/main/java/org/apache/datasketches/memory/AllocateDirectWritableMap.java rename to src/main/java/org/apache/datasketches/memory/internal/AllocateDirectWritableMap.java index d0b1046..588dbef 100644 --- a/src/main/java/org/apache/datasketches/memory/AllocateDirectWritableMap.java +++ b/src/main/java/org/apache/datasketches/memory/internal/AllocateDirectWritableMap.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.datasketches.memory; +package org.apache.datasketches.memory.internal; import java.io.File; diff --git a/src/main/java/org/apache/datasketches/memory/BBNonNativeWritableBufferImpl.java b/src/main/java/org/apache/datasketches/memory/internal/BBNonNativeWritableBufferImpl.java similarity index 98% rename from src/main/java/org/apache/datasketches/memory/BBNonNativeWritableBufferImpl.java rename to src/main/java/org/apache/datasketches/memory/internal/BBNonNativeWritableBufferImpl.java index cc01a7e..2e631e7 100644 --- a/src/main/java/org/apache/datasketches/memory/BBNonNativeWritableBufferImpl.java +++ b/src/main/java/org/apache/datasketches/memory/internal/BBNonNativeWritableBufferImpl.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.datasketches.memory; +package org.apache.datasketches.memory.internal; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/src/main/java/org/apache/datasketches/memory/BBNonNativeWritableMemoryImpl.java b/src/main/java/org/apache/datasketches/memory/internal/BBNonNativeWritableMemoryImpl.java similarity index 98% rename from src/main/java/org/apache/datasketches/memory/BBNonNativeWritableMemoryImpl.java rename to src/main/java/org/apache/datasketches/memory/internal/BBNonNativeWritableMemoryImpl.java index 4f83901..3c1c3e7 100644 --- a/src/main/java/org/apache/datasketches/memory/BBNonNativeWritableMemoryImpl.java +++ b/src/main/java/org/apache/datasketches/memory/internal/BBNonNativeWritableMemoryImpl.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.datasketches.memory; +package org.apache.datasketches.memory.internal; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/src/main/java/org/apache/datasketches/memory/BBWritableBufferImpl.java b/src/main/java/org/apache/datasketches/memory/internal/BBWritableBufferImpl.java similarity index 98% rename from src/main/java/org/apache/datasketches/memory/BBWritableBufferImpl.java rename to src/main/java/org/apache/datasketches/memory/internal/BBWritableBufferImpl.java index 20802b9..bf0d2ee 100644 --- a/src/main/java/org/apache/datasketches/memory/BBWritableBufferImpl.java +++ b/src/main/java/org/apache/datasketches/memory/internal/BBWritableBufferImpl.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.datasketches.memory; +package org.apache.datasketches.memory.internal; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/src/main/java/org/apache/datasketches/memory/BBWritableMemoryImpl.java b/src/main/java/org/apache/datasketches/memory/internal/BBWritableMemoryImpl.java similarity index 98% rename from src/main/java/org/apache/datasketches/memory/BBWritableMemoryImpl.java rename to src/main/java/org/apache/datasketches/memory/internal/BBWritableMemoryImpl.java index dd06c0b..364bc8e 100644 --- a/src/main/java/org/apache/datasketches/memory/BBWritableMemoryImpl.java +++ b/src/main/java/org/apache/datasketches/memory/internal/BBWritableMemoryImpl.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.datasketches.memory; +package org.apache.datasketches.memory.internal; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/src/main/java/org/apache/datasketches/memory/BaseBuffer.java b/src/main/java/org/apache/datasketches/memory/internal/BaseBuffer.java similarity index 99% rename from src/main/java/org/apache/datasketches/memory/BaseBuffer.java rename to src/main/java/org/apache/datasketches/memory/internal/BaseBuffer.java index 30e1ea7..1b04f21 100644 --- a/src/main/java/org/apache/datasketches/memory/BaseBuffer.java +++ b/src/main/java/org/apache/datasketches/memory/internal/BaseBuffer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.datasketches.memory; +package org.apache.datasketches.memory.internal; /** * A new positional API. This is different from and simpler than Java Buffer positional approach. diff --git a/src/main/java/org/apache/datasketches/memory/BaseState.java b/src/main/java/org/apache/datasketches/memory/internal/BaseState.java similarity index 98% rename from src/main/java/org/apache/datasketches/memory/BaseState.java rename to src/main/java/org/apache/datasketches/memory/internal/BaseState.java index 82f4e7d..9bb685b 100644 --- a/src/main/java/org/apache/datasketches/memory/BaseState.java +++ b/src/main/java/org/apache/datasketches/memory/internal/BaseState.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.datasketches.memory; +package org.apache.datasketches.memory.internal; -import static org.apache.datasketches.memory.UnsafeUtil.LS; -import static org.apache.datasketches.memory.UnsafeUtil.assertBounds; -import static org.apache.datasketches.memory.UnsafeUtil.checkBounds; -import static org.apache.datasketches.memory.UnsafeUtil.unsafe; +import static org.apache.datasketches.memory.internal.UnsafeUtil.LS; +import static org.apache.datasketches.memory.internal.UnsafeUtil.assertBounds; +import static org.apache.datasketches.memory.internal.UnsafeUtil.checkBounds; +import static org.apache.datasketches.memory.internal.UnsafeUtil.unsafe; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/src/main/java/org/apache/datasketches/memory/BaseWritableBufferImpl.java b/src/main/java/org/apache/datasketches/memory/internal/BaseWritableBufferImpl.java similarity index 94% rename from src/main/java/org/apache/datasketches/memory/BaseWritableBufferImpl.java rename to src/main/java/org/apache/datasketches/memory/internal/BaseWritableBufferImpl.java index 32e43ec..0402e0a 100644 --- a/src/main/java/org/apache/datasketches/memory/BaseWritableBufferImpl.java +++ b/src/main/java/org/apache/datasketches/memory/internal/BaseWritableBufferImpl.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.datasketches.memory; - -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_BOOLEAN_BASE_OFFSET; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_BOOLEAN_INDEX_SCALE; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_BYTE_BASE_OFFSET; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_BYTE_INDEX_SCALE; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_CHAR_INDEX_SCALE; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_INT_INDEX_SCALE; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_LONG_INDEX_SCALE; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_SHORT_INDEX_SCALE; -import static org.apache.datasketches.memory.UnsafeUtil.checkBounds; -import static org.apache.datasketches.memory.UnsafeUtil.unsafe; +package org.apache.datasketches.memory.internal; + +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_BOOLEAN_BASE_OFFSET; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_BOOLEAN_INDEX_SCALE; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_BYTE_BASE_OFFSET; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_BYTE_INDEX_SCALE; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_CHAR_INDEX_SCALE; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_INT_INDEX_SCALE; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_LONG_INDEX_SCALE; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_SHORT_INDEX_SCALE; +import static org.apache.datasketches.memory.internal.UnsafeUtil.checkBounds; +import static org.apache.datasketches.memory.internal.UnsafeUtil.unsafe; import java.nio.ByteOrder; diff --git a/src/main/java/org/apache/datasketches/memory/BaseWritableMemoryImpl.java b/src/main/java/org/apache/datasketches/memory/internal/BaseWritableMemoryImpl.java similarity index 95% rename from src/main/java/org/apache/datasketches/memory/BaseWritableMemoryImpl.java rename to src/main/java/org/apache/datasketches/memory/internal/BaseWritableMemoryImpl.java index 184c1f3..5ba6c27 100644 --- a/src/main/java/org/apache/datasketches/memory/BaseWritableMemoryImpl.java +++ b/src/main/java/org/apache/datasketches/memory/internal/BaseWritableMemoryImpl.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.datasketches.memory; - -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_BOOLEAN_BASE_OFFSET; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_BOOLEAN_INDEX_SCALE; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_BYTE_BASE_OFFSET; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_BYTE_INDEX_SCALE; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_CHAR_INDEX_SCALE; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_INT_INDEX_SCALE; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_LONG_INDEX_SCALE; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_SHORT_INDEX_SCALE; -import static org.apache.datasketches.memory.UnsafeUtil.checkBounds; -import static org.apache.datasketches.memory.UnsafeUtil.unsafe; +package org.apache.datasketches.memory.internal; + +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_BOOLEAN_BASE_OFFSET; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_BOOLEAN_INDEX_SCALE; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_BYTE_BASE_OFFSET; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_BYTE_INDEX_SCALE; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_CHAR_INDEX_SCALE; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_INT_INDEX_SCALE; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_LONG_INDEX_SCALE; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_SHORT_INDEX_SCALE; +import static org.apache.datasketches.memory.internal.UnsafeUtil.checkBounds; +import static org.apache.datasketches.memory.internal.UnsafeUtil.unsafe; import java.io.File; import java.io.IOException; diff --git a/src/main/java/org/apache/datasketches/memory/Buffer.java b/src/main/java/org/apache/datasketches/memory/internal/Buffer.java similarity index 99% rename from src/main/java/org/apache/datasketches/memory/Buffer.java rename to src/main/java/org/apache/datasketches/memory/internal/Buffer.java index 6877057..5380e56 100644 --- a/src/main/java/org/apache/datasketches/memory/Buffer.java +++ b/src/main/java/org/apache/datasketches/memory/internal/Buffer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.datasketches.memory; +package org.apache.datasketches.memory.internal; import java.nio.ByteBuffer; import java.nio.ByteOrder; @@ -29,7 +29,7 @@ import java.nio.ByteOrder; * @author Roman Leventov * @author Lee Rhodes * - * @see org.apache.datasketches.memory + * @see org.apache.datasketches.memory.internal */ public abstract class Buffer extends BaseBuffer { diff --git a/src/main/java/org/apache/datasketches/memory/CompareAndCopy.java b/src/main/java/org/apache/datasketches/memory/internal/CompareAndCopy.java similarity index 97% rename from src/main/java/org/apache/datasketches/memory/CompareAndCopy.java rename to src/main/java/org/apache/datasketches/memory/internal/CompareAndCopy.java index 75cbf0f..fa6662a 100644 --- a/src/main/java/org/apache/datasketches/memory/CompareAndCopy.java +++ b/src/main/java/org/apache/datasketches/memory/internal/CompareAndCopy.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.datasketches.memory; - -import static org.apache.datasketches.memory.UnsafeUtil.CHAR_SHIFT; -import static org.apache.datasketches.memory.UnsafeUtil.DOUBLE_SHIFT; -import static org.apache.datasketches.memory.UnsafeUtil.FLOAT_SHIFT; -import static org.apache.datasketches.memory.UnsafeUtil.INT_SHIFT; -import static org.apache.datasketches.memory.UnsafeUtil.LONG_SHIFT; -import static org.apache.datasketches.memory.UnsafeUtil.SHORT_SHIFT; -import static org.apache.datasketches.memory.UnsafeUtil.checkBounds; -import static org.apache.datasketches.memory.UnsafeUtil.unsafe; -import static org.apache.datasketches.memory.Util.UNSAFE_COPY_THRESHOLD_BYTES; +package org.apache.datasketches.memory.internal; + +import static org.apache.datasketches.memory.internal.UnsafeUtil.CHAR_SHIFT; +import static org.apache.datasketches.memory.internal.UnsafeUtil.DOUBLE_SHIFT; +import static org.apache.datasketches.memory.internal.UnsafeUtil.FLOAT_SHIFT; +import static org.apache.datasketches.memory.internal.UnsafeUtil.INT_SHIFT; +import static org.apache.datasketches.memory.internal.UnsafeUtil.LONG_SHIFT; +import static org.apache.datasketches.memory.internal.UnsafeUtil.SHORT_SHIFT; +import static org.apache.datasketches.memory.internal.UnsafeUtil.checkBounds; +import static org.apache.datasketches.memory.internal.UnsafeUtil.unsafe; +import static org.apache.datasketches.memory.internal.Util.UNSAFE_COPY_THRESHOLD_BYTES; /** * @author Lee Rhodes diff --git a/src/main/java/org/apache/datasketches/memory/DefaultMemoryRequestServer.java b/src/main/java/org/apache/datasketches/memory/internal/DefaultMemoryRequestServer.java similarity index 98% rename from src/main/java/org/apache/datasketches/memory/DefaultMemoryRequestServer.java rename to src/main/java/org/apache/datasketches/memory/internal/DefaultMemoryRequestServer.java index 616f59b..20c481a 100644 --- a/src/main/java/org/apache/datasketches/memory/DefaultMemoryRequestServer.java +++ b/src/main/java/org/apache/datasketches/memory/internal/DefaultMemoryRequestServer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.datasketches.memory; +package org.apache.datasketches.memory.internal; /** * 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/DirectNonNativeWritableBufferImpl.java b/src/main/java/org/apache/datasketches/memory/internal/DirectNonNativeWritableBufferImpl.java similarity index 98% rename from src/main/java/org/apache/datasketches/memory/DirectNonNativeWritableBufferImpl.java rename to src/main/java/org/apache/datasketches/memory/internal/DirectNonNativeWritableBufferImpl.java index db02695..442768c 100644 --- a/src/main/java/org/apache/datasketches/memory/DirectNonNativeWritableBufferImpl.java +++ b/src/main/java/org/apache/datasketches/memory/internal/DirectNonNativeWritableBufferImpl.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.datasketches.memory; +package org.apache.datasketches.memory.internal; import java.nio.ByteOrder; diff --git a/src/main/java/org/apache/datasketches/memory/DirectNonNativeWritableMemoryImpl.java b/src/main/java/org/apache/datasketches/memory/internal/DirectNonNativeWritableMemoryImpl.java similarity index 98% rename from src/main/java/org/apache/datasketches/memory/DirectNonNativeWritableMemoryImpl.java rename to src/main/java/org/apache/datasketches/memory/internal/DirectNonNativeWritableMemoryImpl.java index 6649830..9d38861 100644 --- a/src/main/java/org/apache/datasketches/memory/DirectNonNativeWritableMemoryImpl.java +++ b/src/main/java/org/apache/datasketches/memory/internal/DirectNonNativeWritableMemoryImpl.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.datasketches.memory; +package org.apache.datasketches.memory.internal; import java.nio.ByteOrder; diff --git a/src/main/java/org/apache/datasketches/memory/DirectWritableBufferImpl.java b/src/main/java/org/apache/datasketches/memory/internal/DirectWritableBufferImpl.java similarity index 98% rename from src/main/java/org/apache/datasketches/memory/DirectWritableBufferImpl.java rename to src/main/java/org/apache/datasketches/memory/internal/DirectWritableBufferImpl.java index 076910f..bc54da4 100644 --- a/src/main/java/org/apache/datasketches/memory/DirectWritableBufferImpl.java +++ b/src/main/java/org/apache/datasketches/memory/internal/DirectWritableBufferImpl.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.datasketches.memory; +package org.apache.datasketches.memory.internal; import java.nio.ByteOrder; diff --git a/src/main/java/org/apache/datasketches/memory/DirectWritableMemoryImpl.java b/src/main/java/org/apache/datasketches/memory/internal/DirectWritableMemoryImpl.java similarity index 98% rename from src/main/java/org/apache/datasketches/memory/DirectWritableMemoryImpl.java rename to src/main/java/org/apache/datasketches/memory/internal/DirectWritableMemoryImpl.java index 7295e1c..a377782 100644 --- a/src/main/java/org/apache/datasketches/memory/DirectWritableMemoryImpl.java +++ b/src/main/java/org/apache/datasketches/memory/internal/DirectWritableMemoryImpl.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.datasketches.memory; +package org.apache.datasketches.memory.internal; import java.nio.ByteOrder; diff --git a/src/main/java/org/apache/datasketches/memory/Handle.java b/src/main/java/org/apache/datasketches/memory/internal/Handle.java similarity index 98% rename from src/main/java/org/apache/datasketches/memory/Handle.java rename to src/main/java/org/apache/datasketches/memory/internal/Handle.java index 7575253..dc5493f 100644 --- a/src/main/java/org/apache/datasketches/memory/Handle.java +++ b/src/main/java/org/apache/datasketches/memory/internal/Handle.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.datasketches.memory; +package org.apache.datasketches.memory.internal; /** * A handle for read-only resource. diff --git a/src/main/java/org/apache/datasketches/memory/HeapNonNativeWritableBufferImpl.java b/src/main/java/org/apache/datasketches/memory/internal/HeapNonNativeWritableBufferImpl.java similarity index 98% rename from src/main/java/org/apache/datasketches/memory/HeapNonNativeWritableBufferImpl.java rename to src/main/java/org/apache/datasketches/memory/internal/HeapNonNativeWritableBufferImpl.java index f7e2838..f0f1fef 100644 --- a/src/main/java/org/apache/datasketches/memory/HeapNonNativeWritableBufferImpl.java +++ b/src/main/java/org/apache/datasketches/memory/internal/HeapNonNativeWritableBufferImpl.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.datasketches.memory; +package org.apache.datasketches.memory.internal; import java.nio.ByteOrder; diff --git a/src/main/java/org/apache/datasketches/memory/HeapNonNativeWritableMemoryImpl.java b/src/main/java/org/apache/datasketches/memory/internal/HeapNonNativeWritableMemoryImpl.java similarity index 98% rename from src/main/java/org/apache/datasketches/memory/HeapNonNativeWritableMemoryImpl.java rename to src/main/java/org/apache/datasketches/memory/internal/HeapNonNativeWritableMemoryImpl.java index 359a8c6..89d223b 100644 --- a/src/main/java/org/apache/datasketches/memory/HeapNonNativeWritableMemoryImpl.java +++ b/src/main/java/org/apache/datasketches/memory/internal/HeapNonNativeWritableMemoryImpl.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.datasketches.memory; +package org.apache.datasketches.memory.internal; import java.nio.ByteOrder; diff --git a/src/main/java/org/apache/datasketches/memory/HeapWritableBufferImpl.java b/src/main/java/org/apache/datasketches/memory/internal/HeapWritableBufferImpl.java similarity index 98% rename from src/main/java/org/apache/datasketches/memory/HeapWritableBufferImpl.java rename to src/main/java/org/apache/datasketches/memory/internal/HeapWritableBufferImpl.java index 0e3cb56..e2d35b8 100644 --- a/src/main/java/org/apache/datasketches/memory/HeapWritableBufferImpl.java +++ b/src/main/java/org/apache/datasketches/memory/internal/HeapWritableBufferImpl.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.datasketches.memory; +package org.apache.datasketches.memory.internal; import java.nio.ByteOrder; diff --git a/src/main/java/org/apache/datasketches/memory/HeapWritableMemoryImpl.java b/src/main/java/org/apache/datasketches/memory/internal/HeapWritableMemoryImpl.java similarity index 98% rename from src/main/java/org/apache/datasketches/memory/HeapWritableMemoryImpl.java rename to src/main/java/org/apache/datasketches/memory/internal/HeapWritableMemoryImpl.java index 147702e..ead8a7b 100644 --- a/src/main/java/org/apache/datasketches/memory/HeapWritableMemoryImpl.java +++ b/src/main/java/org/apache/datasketches/memory/internal/HeapWritableMemoryImpl.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.datasketches.memory; +package org.apache.datasketches.memory.internal; import java.nio.ByteOrder; diff --git a/src/main/java/org/apache/datasketches/memory/Ints.java b/src/main/java/org/apache/datasketches/memory/internal/Ints.java similarity index 95% rename from src/main/java/org/apache/datasketches/memory/Ints.java rename to src/main/java/org/apache/datasketches/memory/internal/Ints.java index 455f579..4a80336 100644 --- a/src/main/java/org/apache/datasketches/memory/Ints.java +++ b/src/main/java/org/apache/datasketches/memory/internal/Ints.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.datasketches.memory; +package org.apache.datasketches.memory.internal; /** Equivalent of Guava's Ints. */ public final class Ints { diff --git a/src/main/java/org/apache/datasketches/memory/Map.java b/src/main/java/org/apache/datasketches/memory/internal/Map.java similarity index 96% rename from src/main/java/org/apache/datasketches/memory/Map.java rename to src/main/java/org/apache/datasketches/memory/internal/Map.java index 339ed07..f17a24f 100644 --- a/src/main/java/org/apache/datasketches/memory/Map.java +++ b/src/main/java/org/apache/datasketches/memory/internal/Map.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.datasketches.memory; +package org.apache.datasketches.memory.internal; /** * Read only interface for a memory mapped file diff --git a/src/main/java/org/apache/datasketches/memory/MapHandle.java b/src/main/java/org/apache/datasketches/memory/internal/MapHandle.java similarity index 97% rename from src/main/java/org/apache/datasketches/memory/MapHandle.java rename to src/main/java/org/apache/datasketches/memory/internal/MapHandle.java index 181c818..5e8114c 100644 --- a/src/main/java/org/apache/datasketches/memory/MapHandle.java +++ b/src/main/java/org/apache/datasketches/memory/internal/MapHandle.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.datasketches.memory; +package org.apache.datasketches.memory.internal; /** * A Handle for a memory-mapped, read-only file resource. diff --git a/src/main/java/org/apache/datasketches/memory/MapNonNativeWritableBufferImpl.java b/src/main/java/org/apache/datasketches/memory/internal/MapNonNativeWritableBufferImpl.java similarity index 98% rename from src/main/java/org/apache/datasketches/memory/MapNonNativeWritableBufferImpl.java rename to src/main/java/org/apache/datasketches/memory/internal/MapNonNativeWritableBufferImpl.java index 2ab9c58..28e1e98 100644 --- a/src/main/java/org/apache/datasketches/memory/MapNonNativeWritableBufferImpl.java +++ b/src/main/java/org/apache/datasketches/memory/internal/MapNonNativeWritableBufferImpl.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.datasketches.memory; +package org.apache.datasketches.memory.internal; import java.nio.ByteOrder; diff --git a/src/main/java/org/apache/datasketches/memory/MapNonNativeWritableMemoryImpl.java b/src/main/java/org/apache/datasketches/memory/internal/MapNonNativeWritableMemoryImpl.java similarity index 98% rename from src/main/java/org/apache/datasketches/memory/MapNonNativeWritableMemoryImpl.java rename to src/main/java/org/apache/datasketches/memory/internal/MapNonNativeWritableMemoryImpl.java index 05f6989..9d9e42d 100644 --- a/src/main/java/org/apache/datasketches/memory/MapNonNativeWritableMemoryImpl.java +++ b/src/main/java/org/apache/datasketches/memory/internal/MapNonNativeWritableMemoryImpl.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.datasketches.memory; +package org.apache.datasketches.memory.internal; import java.nio.ByteOrder; diff --git a/src/main/java/org/apache/datasketches/memory/MapWritableBufferImpl.java b/src/main/java/org/apache/datasketches/memory/internal/MapWritableBufferImpl.java similarity index 98% rename from src/main/java/org/apache/datasketches/memory/MapWritableBufferImpl.java rename to src/main/java/org/apache/datasketches/memory/internal/MapWritableBufferImpl.java index 6aab451..cde1289 100644 --- a/src/main/java/org/apache/datasketches/memory/MapWritableBufferImpl.java +++ b/src/main/java/org/apache/datasketches/memory/internal/MapWritableBufferImpl.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.datasketches.memory; +package org.apache.datasketches.memory.internal; import java.nio.ByteOrder; diff --git a/src/main/java/org/apache/datasketches/memory/MapWritableMemoryImpl.java b/src/main/java/org/apache/datasketches/memory/internal/MapWritableMemoryImpl.java similarity index 98% rename from src/main/java/org/apache/datasketches/memory/MapWritableMemoryImpl.java rename to src/main/java/org/apache/datasketches/memory/internal/MapWritableMemoryImpl.java index 1448947..839c23f 100644 --- a/src/main/java/org/apache/datasketches/memory/MapWritableMemoryImpl.java +++ b/src/main/java/org/apache/datasketches/memory/internal/MapWritableMemoryImpl.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.datasketches.memory; +package org.apache.datasketches.memory.internal; import java.nio.ByteOrder; diff --git a/src/main/java/org/apache/datasketches/memory/Memory.java b/src/main/java/org/apache/datasketches/memory/internal/Memory.java similarity index 98% rename from src/main/java/org/apache/datasketches/memory/Memory.java rename to src/main/java/org/apache/datasketches/memory/internal/Memory.java index c6c9ba1..a5d3751 100644 --- a/src/main/java/org/apache/datasketches/memory/Memory.java +++ b/src/main/java/org/apache/datasketches/memory/internal/Memory.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.datasketches.memory; +package org.apache.datasketches.memory.internal; -import static org.apache.datasketches.memory.Util.negativeCheck; -import static org.apache.datasketches.memory.Util.nullCheck; -import static org.apache.datasketches.memory.Util.zeroCheck; +import static org.apache.datasketches.memory.internal.Util.negativeCheck; +import static org.apache.datasketches.memory.internal.Util.nullCheck; +import static org.apache.datasketches.memory.internal.Util.zeroCheck; import java.io.File; import java.io.IOException; @@ -36,7 +36,7 @@ import java.nio.channels.WritableByteChannel; * @author Roman Leventov * @author Lee Rhodes * - * @see org.apache.datasketches.memory + * @see org.apache.datasketches.memory.internal */ public abstract class Memory extends BaseState { diff --git a/src/main/java/org/apache/datasketches/memory/MemoryRequestServer.java b/src/main/java/org/apache/datasketches/memory/internal/MemoryRequestServer.java similarity index 97% rename from src/main/java/org/apache/datasketches/memory/MemoryRequestServer.java rename to src/main/java/org/apache/datasketches/memory/internal/MemoryRequestServer.java index 3d1bd69..d98ab78 100644 --- a/src/main/java/org/apache/datasketches/memory/MemoryRequestServer.java +++ b/src/main/java/org/apache/datasketches/memory/internal/MemoryRequestServer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.datasketches.memory; +package org.apache.datasketches.memory.internal; /** * 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/NioBits.java b/src/main/java/org/apache/datasketches/memory/internal/NioBits.java similarity index 98% rename from src/main/java/org/apache/datasketches/memory/NioBits.java rename to src/main/java/org/apache/datasketches/memory/internal/NioBits.java index d3ef10b..a25985e 100644 --- a/src/main/java/org/apache/datasketches/memory/NioBits.java +++ b/src/main/java/org/apache/datasketches/memory/internal/NioBits.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.datasketches.memory; +package org.apache.datasketches.memory.internal; -import static org.apache.datasketches.memory.UnsafeUtil.unsafe; +import static org.apache.datasketches.memory.internal.UnsafeUtil.unsafe; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/src/main/java/org/apache/datasketches/memory/NonNativeWritableBufferImpl.java b/src/main/java/org/apache/datasketches/memory/internal/NonNativeWritableBufferImpl.java similarity index 93% rename from src/main/java/org/apache/datasketches/memory/NonNativeWritableBufferImpl.java rename to src/main/java/org/apache/datasketches/memory/internal/NonNativeWritableBufferImpl.java index c2ed3bd..818a6ee 100644 --- a/src/main/java/org/apache/datasketches/memory/NonNativeWritableBufferImpl.java +++ b/src/main/java/org/apache/datasketches/memory/internal/NonNativeWritableBufferImpl.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.datasketches.memory; - -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_DOUBLE_INDEX_SCALE; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_FLOAT_INDEX_SCALE; -import static org.apache.datasketches.memory.UnsafeUtil.CHAR_SHIFT; -import static org.apache.datasketches.memory.UnsafeUtil.DOUBLE_SHIFT; -import static org.apache.datasketches.memory.UnsafeUtil.FLOAT_SHIFT; -import static org.apache.datasketches.memory.UnsafeUtil.INT_SHIFT; -import static org.apache.datasketches.memory.UnsafeUtil.LONG_SHIFT; -import static org.apache.datasketches.memory.UnsafeUtil.SHORT_SHIFT; -import static org.apache.datasketches.memory.UnsafeUtil.unsafe; +package org.apache.datasketches.memory.internal; + +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_DOUBLE_INDEX_SCALE; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_FLOAT_INDEX_SCALE; +import static org.apache.datasketches.memory.internal.UnsafeUtil.CHAR_SHIFT; +import static org.apache.datasketches.memory.internal.UnsafeUtil.DOUBLE_SHIFT; +import static org.apache.datasketches.memory.internal.UnsafeUtil.FLOAT_SHIFT; +import static org.apache.datasketches.memory.internal.UnsafeUtil.INT_SHIFT; +import static org.apache.datasketches.memory.internal.UnsafeUtil.LONG_SHIFT; +import static org.apache.datasketches.memory.internal.UnsafeUtil.SHORT_SHIFT; +import static org.apache.datasketches.memory.internal.UnsafeUtil.unsafe; /* * Developer notes: The heavier methods, such as put/get arrays, duplicate, region, clear, fill, diff --git a/src/main/java/org/apache/datasketches/memory/NonNativeWritableMemoryImpl.java b/src/main/java/org/apache/datasketches/memory/internal/NonNativeWritableMemoryImpl.java similarity index 92% rename from src/main/java/org/apache/datasketches/memory/NonNativeWritableMemoryImpl.java rename to src/main/java/org/apache/datasketches/memory/internal/NonNativeWritableMemoryImpl.java index 8a26156..440403b 100644 --- a/src/main/java/org/apache/datasketches/memory/NonNativeWritableMemoryImpl.java +++ b/src/main/java/org/apache/datasketches/memory/internal/NonNativeWritableMemoryImpl.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.datasketches.memory; - -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_DOUBLE_INDEX_SCALE; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_FLOAT_INDEX_SCALE; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_LONG_INDEX_SCALE; -import static org.apache.datasketches.memory.UnsafeUtil.CHAR_SHIFT; -import static org.apache.datasketches.memory.UnsafeUtil.DOUBLE_SHIFT; -import static org.apache.datasketches.memory.UnsafeUtil.FLOAT_SHIFT; -import static org.apache.datasketches.memory.UnsafeUtil.INT_SHIFT; -import static org.apache.datasketches.memory.UnsafeUtil.LONG_SHIFT; -import static org.apache.datasketches.memory.UnsafeUtil.SHORT_SHIFT; -import static org.apache.datasketches.memory.UnsafeUtil.unsafe; +package org.apache.datasketches.memory.internal; + +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_DOUBLE_INDEX_SCALE; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_FLOAT_INDEX_SCALE; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_LONG_INDEX_SCALE; +import static org.apache.datasketches.memory.internal.UnsafeUtil.CHAR_SHIFT; +import static org.apache.datasketches.memory.internal.UnsafeUtil.DOUBLE_SHIFT; +import static org.apache.datasketches.memory.internal.UnsafeUtil.FLOAT_SHIFT; +import static org.apache.datasketches.memory.internal.UnsafeUtil.INT_SHIFT; +import static org.apache.datasketches.memory.internal.UnsafeUtil.LONG_SHIFT; +import static org.apache.datasketches.memory.internal.UnsafeUtil.SHORT_SHIFT; +import static org.apache.datasketches.memory.internal.UnsafeUtil.unsafe; /* * Developer notes: The heavier methods, such as put/get arrays, duplicate, region, clear, fill, diff --git a/src/main/java/org/apache/datasketches/memory/internal/Prim.java b/src/main/java/org/apache/datasketches/memory/internal/Prim.java new file mode 100644 index 0000000..411be5b --- /dev/null +++ b/src/main/java/org/apache/datasketches/memory/internal/Prim.java @@ -0,0 +1,88 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.datasketches.memory.internal; + +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_BOOLEAN_BASE_OFFSET; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_BOOLEAN_INDEX_SCALE; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_BYTE_BASE_OFFSET; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_BYTE_INDEX_SCALE; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_CHAR_BASE_OFFSET; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_CHAR_INDEX_SCALE; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_DOUBLE_BASE_OFFSET; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_DOUBLE_INDEX_SCALE; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_FLOAT_BASE_OFFSET; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_FLOAT_INDEX_SCALE; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_INT_BASE_OFFSET; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_INT_INDEX_SCALE; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_LONG_BASE_OFFSET; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_LONG_INDEX_SCALE; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_OBJECT_BASE_OFFSET; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_OBJECT_INDEX_SCALE; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_SHORT_BASE_OFFSET; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_SHORT_INDEX_SCALE; +import static org.apache.datasketches.memory.internal.UnsafeUtil.BOOLEAN_SHIFT; +import static org.apache.datasketches.memory.internal.UnsafeUtil.BYTE_SHIFT; +import static org.apache.datasketches.memory.internal.UnsafeUtil.CHAR_SHIFT; +import static org.apache.datasketches.memory.internal.UnsafeUtil.DOUBLE_SHIFT; +import static org.apache.datasketches.memory.internal.UnsafeUtil.FLOAT_SHIFT; +import static org.apache.datasketches.memory.internal.UnsafeUtil.INT_SHIFT; +import static org.apache.datasketches.memory.internal.UnsafeUtil.LONG_SHIFT; +import static org.apache.datasketches.memory.internal.UnsafeUtil.OBJECT_SHIFT; +import static org.apache.datasketches.memory.internal.UnsafeUtil.SHORT_SHIFT; + +/** + * Creates easy to access association between the major Unsafe constants. + * + * @author Lee Rhodes + */ +public enum Prim { + BOOLEAN(ARRAY_BOOLEAN_BASE_OFFSET, ARRAY_BOOLEAN_INDEX_SCALE, BOOLEAN_SHIFT), + BYTE(ARRAY_BYTE_BASE_OFFSET, ARRAY_BYTE_INDEX_SCALE, BYTE_SHIFT), + CHAR(ARRAY_CHAR_BASE_OFFSET, ARRAY_CHAR_INDEX_SCALE, CHAR_SHIFT), + SHORT(ARRAY_SHORT_BASE_OFFSET, ARRAY_SHORT_INDEX_SCALE, SHORT_SHIFT), + INT(ARRAY_INT_BASE_OFFSET, ARRAY_INT_INDEX_SCALE, INT_SHIFT), + LONG(ARRAY_LONG_BASE_OFFSET, ARRAY_LONG_INDEX_SCALE, LONG_SHIFT), + FLOAT(ARRAY_FLOAT_BASE_OFFSET, ARRAY_FLOAT_INDEX_SCALE, FLOAT_SHIFT), + DOUBLE(ARRAY_DOUBLE_BASE_OFFSET, ARRAY_DOUBLE_INDEX_SCALE, DOUBLE_SHIFT), + OBJECT(ARRAY_OBJECT_BASE_OFFSET, ARRAY_OBJECT_INDEX_SCALE, OBJECT_SHIFT); + + private final long arrBaseOff_; + private final long arrIdxScale_; + private final long sizeShift_; + + private Prim(final long arrBaseOff, final long arrIdxScale, final long sizeShift) { + this.arrBaseOff_ = arrBaseOff; + this.arrIdxScale_ = arrIdxScale; + this.sizeShift_ = sizeShift; + } + + public long off() { + return arrBaseOff_; + } + + public long scale() { + return arrIdxScale_; + } + + public long shift() { + return sizeShift_; + } + +} diff --git a/src/main/java/org/apache/datasketches/memory/ReadOnlyException.java b/src/main/java/org/apache/datasketches/memory/internal/ReadOnlyException.java similarity index 96% rename from src/main/java/org/apache/datasketches/memory/ReadOnlyException.java rename to src/main/java/org/apache/datasketches/memory/internal/ReadOnlyException.java index ebced06..5bc8391 100644 --- a/src/main/java/org/apache/datasketches/memory/ReadOnlyException.java +++ b/src/main/java/org/apache/datasketches/memory/internal/ReadOnlyException.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.datasketches.memory; +package org.apache.datasketches.memory.internal; /** * The exception thrown when attempting to write into a read-only Resource. diff --git a/src/main/java/org/apache/datasketches/memory/StepBoolean.java b/src/main/java/org/apache/datasketches/memory/internal/StepBoolean.java similarity index 97% rename from src/main/java/org/apache/datasketches/memory/StepBoolean.java rename to src/main/java/org/apache/datasketches/memory/internal/StepBoolean.java index e614d4c..b678516 100644 --- a/src/main/java/org/apache/datasketches/memory/StepBoolean.java +++ b/src/main/java/org/apache/datasketches/memory/internal/StepBoolean.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.datasketches.memory; +package org.apache.datasketches.memory.internal; import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; diff --git a/src/main/java/org/apache/datasketches/memory/UnsafeUtil.java b/src/main/java/org/apache/datasketches/memory/internal/UnsafeUtil.java similarity index 99% rename from src/main/java/org/apache/datasketches/memory/UnsafeUtil.java rename to src/main/java/org/apache/datasketches/memory/internal/UnsafeUtil.java index ffe2414..ecd2ed5 100644 --- a/src/main/java/org/apache/datasketches/memory/UnsafeUtil.java +++ b/src/main/java/org/apache/datasketches/memory/internal/UnsafeUtil.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.datasketches.memory; +package org.apache.datasketches.memory.internal; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; diff --git a/src/main/java/org/apache/datasketches/memory/Utf8.java b/src/main/java/org/apache/datasketches/memory/internal/Utf8.java similarity index 99% rename from src/main/java/org/apache/datasketches/memory/Utf8.java rename to src/main/java/org/apache/datasketches/memory/internal/Utf8.java index 7cf3c28..eb0d978 100644 --- a/src/main/java/org/apache/datasketches/memory/Utf8.java +++ b/src/main/java/org/apache/datasketches/memory/internal/Utf8.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.datasketches.memory; +package org.apache.datasketches.memory.internal; import static java.lang.Character.isSurrogate; import static java.lang.Character.isSurrogatePair; import static java.lang.Character.toCodePoint; -import static org.apache.datasketches.memory.UnsafeUtil.unsafe; +import static org.apache.datasketches.memory.internal.UnsafeUtil.unsafe; import java.io.IOException; import java.nio.BufferOverflowException; diff --git a/src/main/java/org/apache/datasketches/memory/Utf8CodingException.java b/src/main/java/org/apache/datasketches/memory/internal/Utf8CodingException.java similarity index 98% rename from src/main/java/org/apache/datasketches/memory/Utf8CodingException.java rename to src/main/java/org/apache/datasketches/memory/internal/Utf8CodingException.java index a90e01a..2929d7a 100644 --- a/src/main/java/org/apache/datasketches/memory/Utf8CodingException.java +++ b/src/main/java/org/apache/datasketches/memory/internal/Utf8CodingException.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.datasketches.memory; +package org.apache.datasketches.memory.internal; /** * This exception will be thrown for errors encountered during either the encoding of characters diff --git a/src/main/java/org/apache/datasketches/memory/Util.java b/src/main/java/org/apache/datasketches/memory/internal/Util.java similarity index 99% rename from src/main/java/org/apache/datasketches/memory/Util.java rename to src/main/java/org/apache/datasketches/memory/internal/Util.java index bfdc710..7a250c7 100644 --- a/src/main/java/org/apache/datasketches/memory/Util.java +++ b/src/main/java/org/apache/datasketches/memory/internal/Util.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.datasketches.memory; +package org.apache.datasketches.memory.internal; -import static org.apache.datasketches.memory.UnsafeUtil.checkBounds; +import static org.apache.datasketches.memory.internal.UnsafeUtil.checkBounds; import java.io.File; import java.io.IOException; diff --git a/src/main/java/org/apache/datasketches/memory/WritableBuffer.java b/src/main/java/org/apache/datasketches/memory/internal/WritableBuffer.java similarity index 99% rename from src/main/java/org/apache/datasketches/memory/WritableBuffer.java rename to src/main/java/org/apache/datasketches/memory/internal/WritableBuffer.java index 6d00607..cafa879 100644 --- a/src/main/java/org/apache/datasketches/memory/WritableBuffer.java +++ b/src/main/java/org/apache/datasketches/memory/internal/WritableBuffer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.datasketches.memory; +package org.apache.datasketches.memory.internal; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/src/main/java/org/apache/datasketches/memory/WritableBufferImpl.java b/src/main/java/org/apache/datasketches/memory/internal/WritableBufferImpl.java similarity index 90% rename from src/main/java/org/apache/datasketches/memory/WritableBufferImpl.java rename to src/main/java/org/apache/datasketches/memory/internal/WritableBufferImpl.java index 3fbd565..fb84563 100644 --- a/src/main/java/org/apache/datasketches/memory/WritableBufferImpl.java +++ b/src/main/java/org/apache/datasketches/memory/internal/WritableBufferImpl.java @@ -17,24 +17,24 @@ * under the License. */ -package org.apache.datasketches.memory; - -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_CHAR_BASE_OFFSET; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_DOUBLE_BASE_OFFSET; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_DOUBLE_INDEX_SCALE; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_FLOAT_BASE_OFFSET; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_FLOAT_INDEX_SCALE; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_INT_BASE_OFFSET; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_LONG_BASE_OFFSET; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_SHORT_BASE_OFFSET; -import static org.apache.datasketches.memory.UnsafeUtil.CHAR_SHIFT; -import static org.apache.datasketches.memory.UnsafeUtil.DOUBLE_SHIFT; -import static org.apache.datasketches.memory.UnsafeUtil.FLOAT_SHIFT; -import static org.apache.datasketches.memory.UnsafeUtil.INT_SHIFT; -import static org.apache.datasketches.memory.UnsafeUtil.LONG_SHIFT; -import static org.apache.datasketches.memory.UnsafeUtil.SHORT_SHIFT; -import static org.apache.datasketches.memory.UnsafeUtil.checkBounds; -import static org.apache.datasketches.memory.UnsafeUtil.unsafe; +package org.apache.datasketches.memory.internal; + +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_CHAR_BASE_OFFSET; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_DOUBLE_BASE_OFFSET; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_DOUBLE_INDEX_SCALE; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_FLOAT_BASE_OFFSET; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_FLOAT_INDEX_SCALE; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_INT_BASE_OFFSET; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_LONG_BASE_OFFSET; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_SHORT_BASE_OFFSET; +import static org.apache.datasketches.memory.internal.UnsafeUtil.CHAR_SHIFT; +import static org.apache.datasketches.memory.internal.UnsafeUtil.DOUBLE_SHIFT; +import static org.apache.datasketches.memory.internal.UnsafeUtil.FLOAT_SHIFT; +import static org.apache.datasketches.memory.internal.UnsafeUtil.INT_SHIFT; +import static org.apache.datasketches.memory.internal.UnsafeUtil.LONG_SHIFT; +import static org.apache.datasketches.memory.internal.UnsafeUtil.SHORT_SHIFT; +import static org.apache.datasketches.memory.internal.UnsafeUtil.checkBounds; +import static org.apache.datasketches.memory.internal.UnsafeUtil.unsafe; /* * Developer notes: The heavier methods, such as put/get arrays, duplicate, region, clear, fill, diff --git a/src/main/java/org/apache/datasketches/memory/WritableDirectHandle.java b/src/main/java/org/apache/datasketches/memory/internal/WritableDirectHandle.java similarity index 97% rename from src/main/java/org/apache/datasketches/memory/WritableDirectHandle.java rename to src/main/java/org/apache/datasketches/memory/internal/WritableDirectHandle.java index 79246b0..4689191 100644 --- a/src/main/java/org/apache/datasketches/memory/WritableDirectHandle.java +++ b/src/main/java/org/apache/datasketches/memory/internal/WritableDirectHandle.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.datasketches.memory; +package org.apache.datasketches.memory.internal; /** * A Handle for a writable direct memory resource. diff --git a/src/main/java/org/apache/datasketches/memory/WritableHandle.java b/src/main/java/org/apache/datasketches/memory/internal/WritableHandle.java similarity index 95% rename from src/main/java/org/apache/datasketches/memory/WritableHandle.java rename to src/main/java/org/apache/datasketches/memory/internal/WritableHandle.java index f778bf6..e9361ad 100644 --- a/src/main/java/org/apache/datasketches/memory/WritableHandle.java +++ b/src/main/java/org/apache/datasketches/memory/internal/WritableHandle.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.datasketches.memory; +package org.apache.datasketches.memory.internal; /** * A Handle for writable direct memory or a memory-mapped, writable file resource. diff --git a/src/main/java/org/apache/datasketches/memory/WritableMap.java b/src/main/java/org/apache/datasketches/memory/internal/WritableMap.java similarity index 95% rename from src/main/java/org/apache/datasketches/memory/WritableMap.java rename to src/main/java/org/apache/datasketches/memory/internal/WritableMap.java index ee95578..5c35c43 100644 --- a/src/main/java/org/apache/datasketches/memory/WritableMap.java +++ b/src/main/java/org/apache/datasketches/memory/internal/WritableMap.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.datasketches.memory; +package org.apache.datasketches.memory.internal; /** * Writable interface for a memory mapped file diff --git a/src/main/java/org/apache/datasketches/memory/WritableMapHandle.java b/src/main/java/org/apache/datasketches/memory/internal/WritableMapHandle.java similarity index 96% rename from src/main/java/org/apache/datasketches/memory/WritableMapHandle.java rename to src/main/java/org/apache/datasketches/memory/internal/WritableMapHandle.java index d6cdb30..8404855 100644 --- a/src/main/java/org/apache/datasketches/memory/WritableMapHandle.java +++ b/src/main/java/org/apache/datasketches/memory/internal/WritableMapHandle.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.datasketches.memory; +package org.apache.datasketches.memory.internal; /** * A Handle for a memory-mapped, writable file resource. diff --git a/src/main/java/org/apache/datasketches/memory/WritableMemory.java b/src/main/java/org/apache/datasketches/memory/internal/WritableMemory.java similarity index 99% rename from src/main/java/org/apache/datasketches/memory/WritableMemory.java rename to src/main/java/org/apache/datasketches/memory/internal/WritableMemory.java index 84f3d85..e442eb0 100644 --- a/src/main/java/org/apache/datasketches/memory/WritableMemory.java +++ b/src/main/java/org/apache/datasketches/memory/internal/WritableMemory.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.datasketches.memory; +package org.apache.datasketches.memory.internal; -import static org.apache.datasketches.memory.Util.negativeCheck; -import static org.apache.datasketches.memory.Util.nullCheck; -import static org.apache.datasketches.memory.Util.zeroCheck; +import static org.apache.datasketches.memory.internal.Util.negativeCheck; +import static org.apache.datasketches.memory.internal.Util.nullCheck; +import static org.apache.datasketches.memory.internal.Util.zeroCheck; import java.io.File; import java.io.IOException; diff --git a/src/main/java/org/apache/datasketches/memory/WritableMemoryImpl.java b/src/main/java/org/apache/datasketches/memory/internal/WritableMemoryImpl.java similarity index 88% rename from src/main/java/org/apache/datasketches/memory/WritableMemoryImpl.java rename to src/main/java/org/apache/datasketches/memory/internal/WritableMemoryImpl.java index d85fecc..7c416b0 100644 --- a/src/main/java/org/apache/datasketches/memory/WritableMemoryImpl.java +++ b/src/main/java/org/apache/datasketches/memory/internal/WritableMemoryImpl.java @@ -17,25 +17,25 @@ * under the License. */ -package org.apache.datasketches.memory; - -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_CHAR_BASE_OFFSET; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_DOUBLE_BASE_OFFSET; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_DOUBLE_INDEX_SCALE; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_FLOAT_BASE_OFFSET; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_FLOAT_INDEX_SCALE; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_INT_BASE_OFFSET; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_LONG_BASE_OFFSET; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_LONG_INDEX_SCALE; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_SHORT_BASE_OFFSET; -import static org.apache.datasketches.memory.UnsafeUtil.CHAR_SHIFT; -import static org.apache.datasketches.memory.UnsafeUtil.DOUBLE_SHIFT; -import static org.apache.datasketches.memory.UnsafeUtil.FLOAT_SHIFT; -import static org.apache.datasketches.memory.UnsafeUtil.INT_SHIFT; -import static org.apache.datasketches.memory.UnsafeUtil.LONG_SHIFT; -import static org.apache.datasketches.memory.UnsafeUtil.SHORT_SHIFT; -import static org.apache.datasketches.memory.UnsafeUtil.checkBounds; -import static org.apache.datasketches.memory.UnsafeUtil.unsafe; +package org.apache.datasketches.memory.internal; + +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_CHAR_BASE_OFFSET; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_DOUBLE_BASE_OFFSET; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_DOUBLE_INDEX_SCALE; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_FLOAT_BASE_OFFSET; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_FLOAT_INDEX_SCALE; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_INT_BASE_OFFSET; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_LONG_BASE_OFFSET; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_LONG_INDEX_SCALE; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_SHORT_BASE_OFFSET; +import static org.apache.datasketches.memory.internal.UnsafeUtil.CHAR_SHIFT; +import static org.apache.datasketches.memory.internal.UnsafeUtil.DOUBLE_SHIFT; +import static org.apache.datasketches.memory.internal.UnsafeUtil.FLOAT_SHIFT; +import static org.apache.datasketches.memory.internal.UnsafeUtil.INT_SHIFT; +import static org.apache.datasketches.memory.internal.UnsafeUtil.LONG_SHIFT; +import static org.apache.datasketches.memory.internal.UnsafeUtil.SHORT_SHIFT; +import static org.apache.datasketches.memory.internal.UnsafeUtil.checkBounds; +import static org.apache.datasketches.memory.internal.UnsafeUtil.unsafe; /* * Developer notes: The heavier methods, such as put/get arrays, duplicate, region, clear, fill, diff --git a/src/main/java/org/apache/datasketches/memory/XxHash64.java b/src/main/java/org/apache/datasketches/memory/internal/XxHash64.java similarity index 88% rename from src/main/java/org/apache/datasketches/memory/XxHash64.java rename to src/main/java/org/apache/datasketches/memory/internal/XxHash64.java index dd0715c..1942403 100644 --- a/src/main/java/org/apache/datasketches/memory/XxHash64.java +++ b/src/main/java/org/apache/datasketches/memory/internal/XxHash64.java @@ -17,23 +17,23 @@ * under the License. */ -package org.apache.datasketches.memory; - -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_BOOLEAN_BASE_OFFSET; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_BYTE_BASE_OFFSET; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_CHAR_BASE_OFFSET; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_DOUBLE_BASE_OFFSET; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_FLOAT_BASE_OFFSET; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_INT_BASE_OFFSET; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_LONG_BASE_OFFSET; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_SHORT_BASE_OFFSET; -import static org.apache.datasketches.memory.UnsafeUtil.CHAR_SHIFT; -import static org.apache.datasketches.memory.UnsafeUtil.DOUBLE_SHIFT; -import static org.apache.datasketches.memory.UnsafeUtil.FLOAT_SHIFT; -import static org.apache.datasketches.memory.UnsafeUtil.INT_SHIFT; -import static org.apache.datasketches.memory.UnsafeUtil.LONG_SHIFT; -import static org.apache.datasketches.memory.UnsafeUtil.SHORT_SHIFT; -import static org.apache.datasketches.memory.UnsafeUtil.unsafe; +package org.apache.datasketches.memory.internal; + +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_BOOLEAN_BASE_OFFSET; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_BYTE_BASE_OFFSET; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_CHAR_BASE_OFFSET; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_DOUBLE_BASE_OFFSET; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_FLOAT_BASE_OFFSET; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_INT_BASE_OFFSET; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_LONG_BASE_OFFSET; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_SHORT_BASE_OFFSET; +import static org.apache.datasketches.memory.internal.UnsafeUtil.CHAR_SHIFT; +import static org.apache.datasketches.memory.internal.UnsafeUtil.DOUBLE_SHIFT; +import static org.apache.datasketches.memory.internal.UnsafeUtil.FLOAT_SHIFT; +import static org.apache.datasketches.memory.internal.UnsafeUtil.INT_SHIFT; +import static org.apache.datasketches.memory.internal.UnsafeUtil.LONG_SHIFT; +import static org.apache.datasketches.memory.internal.UnsafeUtil.SHORT_SHIFT; +import static org.apache.datasketches.memory.internal.UnsafeUtil.unsafe; /** * The XxHash is a fast, non-cryptographic, 64-bit hash function that has diff --git a/src/main/java/org/apache/datasketches/memory/package-info.java b/src/main/java/org/apache/datasketches/memory/internal/package-info.java similarity index 92% rename from src/main/java/org/apache/datasketches/memory/package-info.java rename to src/main/java/org/apache/datasketches/memory/internal/package-info.java index 6cfbe5f..45ef820 100644 --- a/src/main/java/org/apache/datasketches/memory/package-info.java +++ b/src/main/java/org/apache/datasketches/memory/internal/package-info.java @@ -26,10 +26,10 @@ * * <p>In addition, this package provides:</p> * - * <ul><li>Two different access APIs: read-only {@link org.apache.datasketches.memory.Memory} and - * {@link org.apache.datasketches.memory.WritableMemory} for absolute offset access, - * and read-only {@link org.apache.datasketches.memory.Buffer} and - * {@link org.apache.datasketches.memory.WritableBuffer} + * <ul><li>Two different access APIs: read-only {@link org.apache.datasketches.memory.internal.Memory} and + * {@link org.apache.datasketches.memory.internal.WritableMemory} for absolute offset access, + * and read-only {@link org.apache.datasketches.memory.internal.Buffer} and + * {@link org.apache.datasketches.memory.internal.WritableBuffer} * for relative positional access (similar to ByteBuffer).</li> * * <li>Clean separation of Read-only API from Writable API, which makes writable versus read-only @@ -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.Handle}, which is used exclusively for resources that are + * {@link org.apache.datasketches.memory.internal.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,11 +93,11 @@ * <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.MapHandle} + * <ul><li>{@link org.apache.datasketches.memory.internal.MapHandle} * for read-only access to a memory-mapped file</li> - * <li>{@link org.apache.datasketches.memory.WritableMapHandle} + * <li>{@link org.apache.datasketches.memory.internal.WritableMapHandle} * for writable access to a memory-mapped file</li> - * <li>{@link org.apache.datasketches.memory.WritableDirectHandle} + * <li>{@link org.apache.datasketches.memory.internal.WritableDirectHandle} * for writable access to off-heap memory.</li> * </ul> * @@ -170,4 +170,4 @@ * * @author Lee Rhodes */ -package org.apache.datasketches.memory; +package org.apache.datasketches.memory.internal; 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 c5fae90..c5b7c9f 100644 --- a/src/test/java/org/apache/datasketches/memory/test/AllocateDirectMapMemoryTest.java +++ b/src/test/java/org/apache/datasketches/memory/test/AllocateDirectMapMemoryTest.java @@ -23,7 +23,7 @@ package org.apache.datasketches.memory.test; -import static org.apache.datasketches.memory.Util.*; +import static org.apache.datasketches.memory.internal.Util.*; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; @@ -32,8 +32,8 @@ import static org.testng.Assert.fail; import java.io.File; import java.nio.ByteOrder; -import org.apache.datasketches.memory.MapHandle; -import org.apache.datasketches.memory.Memory; +import org.apache.datasketches.memory.internal.MapHandle; +import org.apache.datasketches.memory.internal.Memory; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; 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 66fc0e9..2f9b8e0 100644 --- a/src/test/java/org/apache/datasketches/memory/test/AllocateDirectMemoryTest.java +++ b/src/test/java/org/apache/datasketches/memory/test/AllocateDirectMemoryTest.java @@ -26,11 +26,11 @@ import static org.testng.Assert.fail; import java.lang.reflect.InvocationTargetException; -import org.apache.datasketches.memory.MemoryRequestServer; -import org.apache.datasketches.memory.Util; -import org.apache.datasketches.memory.WritableDirectHandle; -import org.apache.datasketches.memory.WritableHandle; -import org.apache.datasketches.memory.WritableMemory; +import org.apache.datasketches.memory.internal.MemoryRequestServer; +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 1669e22..b8a9b74 100644 --- a/src/test/java/org/apache/datasketches/memory/test/AllocateDirectWritableMapMemoryTest.java +++ b/src/test/java/org/apache/datasketches/memory/test/AllocateDirectWritableMapMemoryTest.java @@ -24,7 +24,7 @@ package org.apache.datasketches.memory.test; import static java.nio.charset.StandardCharsets.UTF_8; -import static org.apache.datasketches.memory.Util.*; +import static org.apache.datasketches.memory.internal.Util.*; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; @@ -37,13 +37,13 @@ import java.io.UnsupportedEncodingException; import java.lang.reflect.Method; import java.nio.ByteOrder; -import org.apache.datasketches.memory.MapHandle; -import org.apache.datasketches.memory.Memory; -import org.apache.datasketches.memory.ReadOnlyException; -import org.apache.datasketches.memory.Util; -import org.apache.datasketches.memory.WritableHandle; -import org.apache.datasketches.memory.WritableMapHandle; -import org.apache.datasketches.memory.WritableMemory; +import org.apache.datasketches.memory.internal.MapHandle; +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; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; 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 ed02c79..6815fd9 100644 --- a/src/test/java/org/apache/datasketches/memory/test/BaseBufferTest.java +++ b/src/test/java/org/apache/datasketches/memory/test/BaseBufferTest.java @@ -21,10 +21,10 @@ package org.apache.datasketches.memory.test; import static org.testng.Assert.fail; -import org.apache.datasketches.memory.Buffer; -import org.apache.datasketches.memory.Memory; -import org.apache.datasketches.memory.WritableHandle; -import org.apache.datasketches.memory.WritableMemory; +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/BaseStateTest.java b/src/test/java/org/apache/datasketches/memory/test/BaseStateTest.java index 8829271..2ba50b8 100644 --- a/src/test/java/org/apache/datasketches/memory/test/BaseStateTest.java +++ b/src/test/java/org/apache/datasketches/memory/test/BaseStateTest.java @@ -19,7 +19,7 @@ package org.apache.datasketches.memory.test; -import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_DOUBLE_INDEX_SCALE; +import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_DOUBLE_INDEX_SCALE; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; @@ -27,13 +27,13 @@ import static org.testng.Assert.fail; import java.nio.ByteOrder; -import org.apache.datasketches.memory.Buffer; -import org.apache.datasketches.memory.Memory; -import org.apache.datasketches.memory.Prim; -import org.apache.datasketches.memory.StepBoolean; -import org.apache.datasketches.memory.Util; -import org.apache.datasketches.memory.WritableBuffer; -import org.apache.datasketches.memory.WritableMemory; +import org.apache.datasketches.memory.internal.Buffer; +import org.apache.datasketches.memory.internal.Memory; +import org.apache.datasketches.memory.internal.Prim; +import org.apache.datasketches.memory.internal.StepBoolean; +import org.apache.datasketches.memory.internal.Util; +import org.apache.datasketches.memory.internal.WritableBuffer; +import org.apache.datasketches.memory.internal.WritableMemory; import org.testng.annotations.Test; @SuppressWarnings("javadoc") diff --git a/src/test/java/org/apache/datasketches/memory/test/Buffer2Test.java b/src/test/java/org/apache/datasketches/memory/test/Buffer2Test.java index cf984b8..0f9b680 100644 --- a/src/test/java/org/apache/datasketches/memory/test/Buffer2Test.java +++ b/src/test/java/org/apache/datasketches/memory/test/Buffer2Test.java @@ -26,11 +26,11 @@ import static org.testng.Assert.assertTrue; import java.nio.ByteBuffer; import java.nio.ByteOrder; -import org.apache.datasketches.memory.Buffer; -import org.apache.datasketches.memory.Memory; -import org.apache.datasketches.memory.ReadOnlyException; -import org.apache.datasketches.memory.WritableBuffer; -import org.apache.datasketches.memory.WritableMemory; +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.WritableBuffer; +import org.apache.datasketches.memory.internal.WritableMemory; import org.testng.annotations.Test; @SuppressWarnings("javadoc") diff --git a/src/test/java/org/apache/datasketches/memory/test/BufferBoundaryCheckTest.java b/src/test/java/org/apache/datasketches/memory/test/BufferBoundaryCheckTest.java index 03d428d..0970ffb 100644 --- a/src/test/java/org/apache/datasketches/memory/test/BufferBoundaryCheckTest.java +++ b/src/test/java/org/apache/datasketches/memory/test/BufferBoundaryCheckTest.java @@ -19,7 +19,7 @@ package org.apache.datasketches.memory.test; -import org.apache.datasketches.memory.WritableMemory; +import org.apache.datasketches.memory.internal.WritableMemory; import org.testng.annotations.Test; @SuppressWarnings("javadoc") 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 aa4754e..d08ef0d 100644 --- a/src/test/java/org/apache/datasketches/memory/test/BufferInvariantsTest.java +++ b/src/test/java/org/apache/datasketches/memory/test/BufferInvariantsTest.java @@ -24,10 +24,10 @@ import static org.testng.Assert.fail; import java.nio.ByteBuffer; -import org.apache.datasketches.memory.Buffer; -import org.apache.datasketches.memory.WritableBuffer; -import org.apache.datasketches.memory.WritableHandle; -import org.apache.datasketches.memory.WritableMemory; +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/BufferReadWriteSafetyTest.java b/src/test/java/org/apache/datasketches/memory/test/BufferReadWriteSafetyTest.java index 91e0465..24f195f 100644 --- a/src/test/java/org/apache/datasketches/memory/test/BufferReadWriteSafetyTest.java +++ b/src/test/java/org/apache/datasketches/memory/test/BufferReadWriteSafetyTest.java @@ -21,10 +21,10 @@ package org.apache.datasketches.memory.test; import java.nio.ByteBuffer; -import org.apache.datasketches.memory.Buffer; -import org.apache.datasketches.memory.ReadOnlyException; -import org.apache.datasketches.memory.WritableBuffer; -import org.apache.datasketches.memory.WritableMemory; +import org.apache.datasketches.memory.internal.Buffer; +import org.apache.datasketches.memory.internal.ReadOnlyException; +import org.apache.datasketches.memory.internal.WritableBuffer; +import org.apache.datasketches.memory.internal.WritableMemory; import org.testng.annotations.Test; @SuppressWarnings("javadoc") 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 b825659..e80b2a0 100644 --- a/src/test/java/org/apache/datasketches/memory/test/BufferTest.java +++ b/src/test/java/org/apache/datasketches/memory/test/BufferTest.java @@ -25,11 +25,11 @@ import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.util.List; -import org.apache.datasketches.memory.Buffer; -import org.apache.datasketches.memory.Memory; -import org.apache.datasketches.memory.WritableBuffer; -import org.apache.datasketches.memory.WritableHandle; -import org.apache.datasketches.memory.WritableMemory; +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 1b7308d..023270e 100644 --- a/src/test/java/org/apache/datasketches/memory/test/CommonBufferTest.java +++ b/src/test/java/org/apache/datasketches/memory/test/CommonBufferTest.java @@ -21,9 +21,9 @@ package org.apache.datasketches.memory.test; import static org.testng.Assert.assertEquals; -import org.apache.datasketches.memory.WritableBuffer; -import org.apache.datasketches.memory.WritableHandle; -import org.apache.datasketches.memory.WritableMemory; +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; @SuppressWarnings("javadoc") 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 41f2b2f..f28a301 100644 --- a/src/test/java/org/apache/datasketches/memory/test/CommonMemoryTest.java +++ b/src/test/java/org/apache/datasketches/memory/test/CommonMemoryTest.java @@ -19,16 +19,16 @@ package org.apache.datasketches.memory.test; -import static org.apache.datasketches.memory.Util.isAllBitsClear; -import static org.apache.datasketches.memory.Util.isAllBitsSet; -import static org.apache.datasketches.memory.Util.isAnyBitsClear; -import static org.apache.datasketches.memory.Util.isAnyBitsSet; +import static org.apache.datasketches.memory.internal.Util.isAllBitsClear; +import static org.apache.datasketches.memory.internal.Util.isAllBitsSet; +import static org.apache.datasketches.memory.internal.Util.isAnyBitsClear; +import static org.apache.datasketches.memory.internal.Util.isAnyBitsSet; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import org.apache.datasketches.memory.WritableHandle; -import org.apache.datasketches.memory.WritableMemory; +import org.apache.datasketches.memory.internal.WritableHandle; +import org.apache.datasketches.memory.internal.WritableMemory; import org.testng.annotations.Test; @SuppressWarnings("javadoc") 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 0f2f027..67da58a 100644 --- a/src/test/java/org/apache/datasketches/memory/test/CopyMemoryOverlapTest.java +++ b/src/test/java/org/apache/datasketches/memory/test/CopyMemoryOverlapTest.java @@ -21,9 +21,9 @@ package org.apache.datasketches.memory.test; import static org.testng.Assert.assertEquals; -import org.apache.datasketches.memory.Memory; -import org.apache.datasketches.memory.WritableHandle; -import org.apache.datasketches.memory.WritableMemory; +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 a1f21e8..03b4bec 100644 --- a/src/test/java/org/apache/datasketches/memory/test/CopyMemoryTest.java +++ b/src/test/java/org/apache/datasketches/memory/test/CopyMemoryTest.java @@ -19,14 +19,14 @@ package org.apache.datasketches.memory.test; -import static org.apache.datasketches.memory.Util.UNSAFE_COPY_THRESHOLD_BYTES; +import static org.apache.datasketches.memory.internal.Util.UNSAFE_COPY_THRESHOLD_BYTES; import static org.testng.Assert.assertEquals; import java.util.concurrent.ThreadLocalRandom; -import org.apache.datasketches.memory.Memory; -import org.apache.datasketches.memory.WritableHandle; -import org.apache.datasketches.memory.WritableMemory; +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 3934c0e..446a825 100644 --- a/src/test/java/org/apache/datasketches/memory/test/ExampleMemoryRequestServerTest.java +++ b/src/test/java/org/apache/datasketches/memory/test/ExampleMemoryRequestServerTest.java @@ -23,9 +23,9 @@ import static org.testng.Assert.assertFalse; import java.util.IdentityHashMap; -import org.apache.datasketches.memory.MemoryRequestServer; -import org.apache.datasketches.memory.WritableHandle; -import org.apache.datasketches.memory.WritableMemory; +import org.apache.datasketches.memory.internal.MemoryRequestServer; +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/IgnoredArrayOverflowTest.java b/src/test/java/org/apache/datasketches/memory/test/IgnoredArrayOverflowTest.java index 2344beb..462de6c 100644 --- a/src/test/java/org/apache/datasketches/memory/test/IgnoredArrayOverflowTest.java +++ b/src/test/java/org/apache/datasketches/memory/test/IgnoredArrayOverflowTest.java @@ -19,8 +19,8 @@ package org.apache.datasketches.memory.test; -import org.apache.datasketches.memory.WritableHandle; -import org.apache.datasketches.memory.WritableMemory; +import org.apache.datasketches.memory.internal.WritableHandle; +import org.apache.datasketches.memory.internal.WritableMemory; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Ignore; diff --git a/src/test/java/org/apache/datasketches/memory/test/LeafImplTest.java b/src/test/java/org/apache/datasketches/memory/test/LeafImplTest.java index 5b266be..be17b82 100644 --- a/src/test/java/org/apache/datasketches/memory/test/LeafImplTest.java +++ b/src/test/java/org/apache/datasketches/memory/test/LeafImplTest.java @@ -30,11 +30,11 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.nio.ByteOrder; -import org.apache.datasketches.memory.WritableBuffer; -import org.apache.datasketches.memory.WritableDirectHandle; -import org.apache.datasketches.memory.WritableMapHandle; -import org.apache.datasketches.memory.WritableMemory; -import org.apache.datasketches.memory.Util; +import org.apache.datasketches.memory.internal.Util; +import org.apache.datasketches.memory.internal.WritableBuffer; +import org.apache.datasketches.memory.internal.WritableDirectHandle; +import org.apache.datasketches.memory.internal.WritableMapHandle; +import org.apache.datasketches.memory.internal.WritableMemory; import org.testng.annotations.Test; /** diff --git a/src/test/java/org/apache/datasketches/memory/test/MemoryBoundaryCheckTest.java b/src/test/java/org/apache/datasketches/memory/test/MemoryBoundaryCheckTest.java index c45387f..ade4ec4 100644 --- a/src/test/java/org/apache/datasketches/memory/test/MemoryBoundaryCheckTest.java +++ b/src/test/java/org/apache/datasketches/memory/test/MemoryBoundaryCheckTest.java @@ -19,8 +19,8 @@ package org.apache.datasketches.memory.test; -import org.apache.datasketches.memory.WritableBuffer; -import org.apache.datasketches.memory.WritableMemory; +import org.apache.datasketches.memory.internal.WritableBuffer; +import org.apache.datasketches.memory.internal.WritableMemory; import org.testng.annotations.Test; @SuppressWarnings("javadoc") 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 443bb7f..572d019 100644 --- a/src/test/java/org/apache/datasketches/memory/test/MemoryReadWriteSafetyTest.java +++ b/src/test/java/org/apache/datasketches/memory/test/MemoryReadWriteSafetyTest.java @@ -25,10 +25,10 @@ import java.io.RandomAccessFile; import java.nio.ByteBuffer; import java.nio.ByteOrder; -import org.apache.datasketches.memory.MapHandle; -import org.apache.datasketches.memory.Memory; -import org.apache.datasketches.memory.ReadOnlyException; -import org.apache.datasketches.memory.WritableMemory; +import org.apache.datasketches.memory.internal.MapHandle; +import org.apache.datasketches.memory.internal.Memory; +import org.apache.datasketches.memory.internal.ReadOnlyException; +import org.apache.datasketches.memory.internal.WritableMemory; import org.testng.annotations.Test; @SuppressWarnings("javadoc") 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 d099261..3166a12 100644 --- a/src/test/java/org/apache/datasketches/memory/test/MemoryTest.java +++ b/src/test/java/org/apache/datasketches/memory/test/MemoryTest.java @@ -23,7 +23,7 @@ package org.apache.datasketches.memory.test; -import static org.apache.datasketches.memory.Util.*; +import static org.apache.datasketches.memory.internal.Util.*; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNotNull; @@ -35,12 +35,12 @@ import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.util.List; -import org.apache.datasketches.memory.MapHandle; -import org.apache.datasketches.memory.Memory; -import org.apache.datasketches.memory.Util; -import org.apache.datasketches.memory.WritableDirectHandle; -import org.apache.datasketches.memory.WritableHandle; -import org.apache.datasketches.memory.WritableMemory; +import org.apache.datasketches.memory.internal.MapHandle; +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; import org.testng.annotations.Test; 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 09ce3f7..d6c10a9 100644 --- a/src/test/java/org/apache/datasketches/memory/test/MemoryWriteToTest.java +++ b/src/test/java/org/apache/datasketches/memory/test/MemoryWriteToTest.java @@ -19,16 +19,17 @@ package org.apache.datasketches.memory.test; +import static org.apache.datasketches.memory.internal.Util.UNSAFE_COPY_THRESHOLD_BYTES; + import java.io.ByteArrayOutputStream; import java.io.IOException; import java.nio.channels.Channels; import java.nio.channels.WritableByteChannel; import java.util.concurrent.ThreadLocalRandom; -import static org.apache.datasketches.memory.Util.UNSAFE_COPY_THRESHOLD_BYTES; -import org.apache.datasketches.memory.Memory; -import org.apache.datasketches.memory.WritableHandle; -import org.apache.datasketches.memory.WritableMemory; +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/NonNativeWritableBufferImplTest.java b/src/test/java/org/apache/datasketches/memory/test/NonNativeWritableBufferImplTest.java index 8830c23..a70e315 100644 --- a/src/test/java/org/apache/datasketches/memory/test/NonNativeWritableBufferImplTest.java +++ b/src/test/java/org/apache/datasketches/memory/test/NonNativeWritableBufferImplTest.java @@ -23,9 +23,9 @@ import static org.testng.Assert.assertEquals; import java.nio.ByteOrder; -import org.apache.datasketches.memory.Buffer; -import org.apache.datasketches.memory.WritableBuffer; -import org.apache.datasketches.memory.WritableMemory; +import org.apache.datasketches.memory.internal.Buffer; +import org.apache.datasketches.memory.internal.WritableBuffer; +import org.apache.datasketches.memory.internal.WritableMemory; import org.testng.annotations.Test; /** diff --git a/src/test/java/org/apache/datasketches/memory/test/NonNativeWritableMemoryImplTest.java b/src/test/java/org/apache/datasketches/memory/test/NonNativeWritableMemoryImplTest.java index dab4eb1..6388718 100644 --- a/src/test/java/org/apache/datasketches/memory/test/NonNativeWritableMemoryImplTest.java +++ b/src/test/java/org/apache/datasketches/memory/test/NonNativeWritableMemoryImplTest.java @@ -23,8 +23,8 @@ import static org.testng.Assert.assertEquals; import java.nio.ByteOrder; -import org.apache.datasketches.memory.Memory; -import org.apache.datasketches.memory.WritableMemory; +import org.apache.datasketches.memory.internal.Memory; +import org.apache.datasketches.memory.internal.WritableMemory; 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 78f45a2..266ea8e 100644 --- a/src/test/java/org/apache/datasketches/memory/test/ReflectUtil.java +++ b/src/test/java/org/apache/datasketches/memory/test/ReflectUtil.java @@ -23,8 +23,8 @@ import java.io.File; import java.lang.reflect.*; import java.nio.ByteOrder; -import org.apache.datasketches.memory.MemoryRequestServer; -import org.apache.datasketches.memory.WritableDirectHandle; +import org.apache.datasketches.memory.internal.MemoryRequestServer; +import org.apache.datasketches.memory.internal.WritableDirectHandle; public final class ReflectUtil { @@ -61,13 +61,13 @@ public final class ReflectUtil { static { BASE_STATE = - getClass("org.apache.datasketches.memory.BaseState"); + getClass("org.apache.datasketches.memory.internal.BaseState"); BASE_WRITABLE_MEMORY_IMPL = - getClass("org.apache.datasketches.memory.BaseWritableMemoryImpl"); + getClass("org.apache.datasketches.memory.internal.BaseWritableMemoryImpl"); ALLOCATE_DIRECT_MAP = - getClass("org.apache.datasketches.memory.AllocateDirectMap"); + getClass("org.apache.datasketches.memory.internal.AllocateDirectMap"); NIO_BITS = - getClass("org.apache.datasketches.memory.NioBits"); + getClass("org.apache.datasketches.memory.internal.NioBits"); CHECK_VALID = getMethod(BASE_STATE, "checkValid", (Class<?>[])null); //not static diff --git a/src/test/java/org/apache/datasketches/memory/test/SpecificLeafTest.java b/src/test/java/org/apache/datasketches/memory/test/SpecificLeafTest.java index a102e46..b0bb764 100644 --- a/src/test/java/org/apache/datasketches/memory/test/SpecificLeafTest.java +++ b/src/test/java/org/apache/datasketches/memory/test/SpecificLeafTest.java @@ -26,12 +26,12 @@ import java.io.File; import java.io.IOException; import java.nio.ByteBuffer; -import org.apache.datasketches.memory.Buffer; -import org.apache.datasketches.memory.Memory; -import org.apache.datasketches.memory.Util; -import org.apache.datasketches.memory.WritableDirectHandle; -import org.apache.datasketches.memory.WritableMapHandle; -import org.apache.datasketches.memory.WritableMemory; +import org.apache.datasketches.memory.internal.Buffer; +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.WritableMapHandle; +import org.apache.datasketches.memory.internal.WritableMemory; import org.testng.annotations.Test; /** diff --git a/src/test/java/org/apache/datasketches/memory/test/UnsafeUtilTest.java b/src/test/java/org/apache/datasketches/memory/test/UnsafeUtilTest.java index 4966449..b27b995 100644 --- a/src/test/java/org/apache/datasketches/memory/test/UnsafeUtilTest.java +++ b/src/test/java/org/apache/datasketches/memory/test/UnsafeUtilTest.java @@ -26,8 +26,8 @@ import static org.testng.Assert.fail; import java.util.ArrayList; import java.util.List; -import org.apache.datasketches.memory.Ints; -import org.apache.datasketches.memory.UnsafeUtil; +import org.apache.datasketches.memory.internal.Ints; +import org.apache.datasketches.memory.internal.UnsafeUtil; import org.testng.annotations.Test; diff --git a/src/test/java/org/apache/datasketches/memory/test/Utf8Test.java b/src/test/java/org/apache/datasketches/memory/test/Utf8Test.java index 6c01235..8a38b39 100644 --- a/src/test/java/org/apache/datasketches/memory/test/Utf8Test.java +++ b/src/test/java/org/apache/datasketches/memory/test/Utf8Test.java @@ -28,15 +28,14 @@ import java.nio.CharBuffer; import java.util.ArrayList; import java.util.List; +import org.apache.datasketches.memory.internal.Memory; +import org.apache.datasketches.memory.internal.Utf8CodingException; +import org.apache.datasketches.memory.internal.WritableMemory; +import org.apache.datasketches.memory.internal.Util.RandomCodePoints; import org.testng.annotations.Test; import com.google.protobuf.ByteString; -import org.apache.datasketches.memory.Memory; -import org.apache.datasketches.memory.Utf8CodingException; -import org.apache.datasketches.memory.WritableMemory; -import org.apache.datasketches.memory.Util.RandomCodePoints; - /** * Adapted version of * https://github.com/protocolbuffers/protobuf/blob/master/java/core/src/test/java/com/google/protobuf/DecodeUtf8Test.java diff --git a/src/test/java/org/apache/datasketches/memory/test/UtilTest.java b/src/test/java/org/apache/datasketches/memory/test/UtilTest.java index a44d9ec..83228bf 100644 --- a/src/test/java/org/apache/datasketches/memory/test/UtilTest.java +++ b/src/test/java/org/apache/datasketches/memory/test/UtilTest.java @@ -23,13 +23,13 @@ package org.apache.datasketches.memory.test; -import static org.apache.datasketches.memory.Util.characterPad; -import static org.apache.datasketches.memory.Util.getResourceFile; -import static org.apache.datasketches.memory.Util.getResourceBytes; -import static org.apache.datasketches.memory.Util.negativeCheck; -import static org.apache.datasketches.memory.Util.nullCheck; -import static org.apache.datasketches.memory.Util.zeroCheck; -import static org.apache.datasketches.memory.Util.zeroPad; +import static org.apache.datasketches.memory.internal.Util.characterPad; +import static org.apache.datasketches.memory.internal.Util.getResourceBytes; +import static org.apache.datasketches.memory.internal.Util.getResourceFile; +import static org.apache.datasketches.memory.internal.Util.negativeCheck; +import static org.apache.datasketches.memory.internal.Util.nullCheck; +import static org.apache.datasketches.memory.internal.Util.zeroCheck; +import static org.apache.datasketches.memory.internal.Util.zeroPad; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; @@ -42,9 +42,9 @@ import java.nio.file.attribute.PosixFileAttributeView; import java.nio.file.attribute.PosixFileAttributes; import java.nio.file.attribute.PosixFilePermissions; -import org.apache.datasketches.memory.UnsafeUtil; -import org.apache.datasketches.memory.Util; -import org.apache.datasketches.memory.WritableMemory; +import org.apache.datasketches.memory.internal.UnsafeUtil; +import org.apache.datasketches.memory.internal.Util; +import org.apache.datasketches.memory.internal.WritableMemory; import org.testng.annotations.Test; @SuppressWarnings("javadoc") 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 0899336..e3eb97d 100644 --- a/src/test/java/org/apache/datasketches/memory/test/WritableBufferImplTest.java +++ b/src/test/java/org/apache/datasketches/memory/test/WritableBufferImplTest.java @@ -26,14 +26,14 @@ import static org.testng.Assert.assertTrue; import java.nio.ByteBuffer; import java.nio.ByteOrder; -import org.apache.datasketches.memory.Buffer; -import org.apache.datasketches.memory.Memory; -import org.apache.datasketches.memory.ReadOnlyException; -import org.apache.datasketches.memory.UnsafeUtil; -import org.apache.datasketches.memory.Util; -import org.apache.datasketches.memory.WritableBuffer; -import org.apache.datasketches.memory.WritableHandle; -import org.apache.datasketches.memory.WritableMemory; +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 4907e5a..f351c0c 100644 --- a/src/test/java/org/apache/datasketches/memory/test/WritableDirectCopyTest.java +++ b/src/test/java/org/apache/datasketches/memory/test/WritableDirectCopyTest.java @@ -22,9 +22,9 @@ package org.apache.datasketches.memory.test; import static org.testng.Assert.assertEquals; import static org.testng.Assert.fail; -import org.apache.datasketches.memory.Memory; -import org.apache.datasketches.memory.WritableHandle; -import org.apache.datasketches.memory.WritableMemory; +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 561e7d2..afd52fd 100644 --- a/src/test/java/org/apache/datasketches/memory/test/WritableMemoryImplTest.java +++ b/src/test/java/org/apache/datasketches/memory/test/WritableMemoryImplTest.java @@ -27,14 +27,14 @@ import static org.testng.Assert.fail; import java.nio.ByteBuffer; import java.nio.ByteOrder; -import org.apache.datasketches.memory.Buffer; -import org.apache.datasketches.memory.Memory; -import org.apache.datasketches.memory.ReadOnlyException; -import org.apache.datasketches.memory.UnsafeUtil; -import org.apache.datasketches.memory.Util; -import org.apache.datasketches.memory.WritableBuffer; -import org.apache.datasketches.memory.WritableHandle; -import org.apache.datasketches.memory.WritableMemory; +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; @SuppressWarnings("javadoc") diff --git a/src/test/java/org/apache/datasketches/memory/test/WritableMemoryTest.java b/src/test/java/org/apache/datasketches/memory/test/WritableMemoryTest.java index 63c3291..bbbb7ca 100644 --- a/src/test/java/org/apache/datasketches/memory/test/WritableMemoryTest.java +++ b/src/test/java/org/apache/datasketches/memory/test/WritableMemoryTest.java @@ -27,10 +27,10 @@ import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.util.concurrent.ThreadLocalRandom; -import org.apache.datasketches.memory.Memory; -import org.apache.datasketches.memory.Util; -import org.apache.datasketches.memory.WritableBuffer; -import org.apache.datasketches.memory.WritableMemory; +import org.apache.datasketches.memory.internal.Memory; +import org.apache.datasketches.memory.internal.Util; +import org.apache.datasketches.memory.internal.WritableBuffer; +import org.apache.datasketches.memory.internal.WritableMemory; import org.testng.annotations.Test; @SuppressWarnings("javadoc") diff --git a/src/test/java/org/apache/datasketches/memory/test/XxHash64LoopingTest.java b/src/test/java/org/apache/datasketches/memory/test/XxHash64LoopingTest.java index e1df579..7554996 100644 --- a/src/test/java/org/apache/datasketches/memory/test/XxHash64LoopingTest.java +++ b/src/test/java/org/apache/datasketches/memory/test/XxHash64LoopingTest.java @@ -21,7 +21,7 @@ package org.apache.datasketches.memory.test; import static org.testng.Assert.assertEquals; -import org.apache.datasketches.memory.WritableMemory; +import org.apache.datasketches.memory.internal.WritableMemory; import org.testng.annotations.Test; /** diff --git a/src/test/java/org/apache/datasketches/memory/test/XxHash64Test.java b/src/test/java/org/apache/datasketches/memory/test/XxHash64Test.java index f12f78a..b0f6339 100644 --- a/src/test/java/org/apache/datasketches/memory/test/XxHash64Test.java +++ b/src/test/java/org/apache/datasketches/memory/test/XxHash64Test.java @@ -19,22 +19,15 @@ package org.apache.datasketches.memory.test; -import static org.apache.datasketches.memory.XxHash64.hashBooleans; -import static org.apache.datasketches.memory.XxHash64.hashBytes; -import static org.apache.datasketches.memory.XxHash64.hashChars; -import static org.apache.datasketches.memory.XxHash64.hashDoubles; -import static org.apache.datasketches.memory.XxHash64.hashFloats; -import static org.apache.datasketches.memory.XxHash64.hashInts; -import static org.apache.datasketches.memory.XxHash64.hashLongs; -import static org.apache.datasketches.memory.XxHash64.*; +import static org.apache.datasketches.memory.internal.XxHash64.*; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; import java.util.Random; import java.util.concurrent.ThreadLocalRandom; -import org.apache.datasketches.memory.Memory; -import org.apache.datasketches.memory.WritableMemory; +import org.apache.datasketches.memory.internal.Memory; +import org.apache.datasketches.memory.internal.WritableMemory; import org.testng.annotations.Test; import net.openhft.hashing.LongHashFunction; diff --git a/src/test/java/org/apache/datasketches/memory/test/ZeroCapacityTest.java b/src/test/java/org/apache/datasketches/memory/test/ZeroCapacityTest.java index 1c2c7b7..b8b3e3d 100644 --- a/src/test/java/org/apache/datasketches/memory/test/ZeroCapacityTest.java +++ b/src/test/java/org/apache/datasketches/memory/test/ZeroCapacityTest.java @@ -23,8 +23,8 @@ import static org.testng.Assert.assertEquals; import java.nio.ByteBuffer; -import org.apache.datasketches.memory.Memory; -import org.apache.datasketches.memory.WritableMemory; +import org.apache.datasketches.memory.internal.Memory; +import org.apache.datasketches.memory.internal.WritableMemory; import org.testng.Assert; import org.testng.annotations.Test; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
