This is an automated email from the ASF dual-hosted git repository. leerho pushed a commit to branch directoryMoves in repository https://gitbox.apache.org/repos/asf/incubator-datasketches-memory.git
commit 540c0f58e53e92fb24dca74a076eb082c3b6ebc4 Author: Lee Rhodes <[email protected]> AuthorDate: Sun Jun 16 17:55:58 2019 -0700 Refactor to org.apache.datasketches.memory --- src/main/java/com/yahoo/memory/Prim.java | 88 ---------------------- .../datasketches}/memory/AccessByteBuffer.java | 4 +- .../datasketches}/memory/AllocateDirect.java | 4 +- .../datasketches}/memory/AllocateDirectMap.java | 4 +- .../memory/AllocateDirectWritableMap.java | 2 +- .../memory/BBNonNativeWritableBufferImpl.java | 2 +- .../memory/BBNonNativeWritableMemoryImpl.java | 2 +- .../datasketches}/memory/BBWritableBufferImpl.java | 2 +- .../datasketches}/memory/BBWritableMemoryImpl.java | 2 +- .../apache/datasketches}/memory/BaseBuffer.java | 2 +- .../apache/datasketches}/memory/BaseState.java | 10 +-- .../memory/BaseWritableBufferImpl.java | 24 +++--- .../memory/BaseWritableMemoryImpl.java | 24 +++--- .../apache/datasketches}/memory/Buffer.java | 4 +- .../datasketches}/memory/CompareAndCopy.java | 20 ++--- .../memory/DefaultMemoryRequestServer.java | 2 +- .../memory/DirectNonNativeWritableBufferImpl.java | 2 +- .../memory/DirectNonNativeWritableMemoryImpl.java | 2 +- .../memory/DirectWritableBufferImpl.java | 2 +- .../memory/DirectWritableMemoryImpl.java | 2 +- .../apache/datasketches}/memory/Handle.java | 2 +- .../memory/HeapNonNativeWritableBufferImpl.java | 2 +- .../memory/HeapNonNativeWritableMemoryImpl.java | 2 +- .../memory/HeapWritableBufferImpl.java | 2 +- .../memory/HeapWritableMemoryImpl.java | 2 +- .../apache/datasketches}/memory/Ints.java | 2 +- .../datasketches}/memory/JDK7Compatible.java | 2 +- .../apache/datasketches}/memory/Map.java | 2 +- .../apache/datasketches}/memory/MapHandle.java | 2 +- .../memory/MapNonNativeWritableBufferImpl.java | 2 +- .../memory/MapNonNativeWritableMemoryImpl.java | 2 +- .../memory/MapWritableBufferImpl.java | 2 +- .../memory/MapWritableMemoryImpl.java | 2 +- .../apache/datasketches}/memory/Memory.java | 12 +-- .../datasketches}/memory/MemoryRequestServer.java | 2 +- .../apache/datasketches}/memory/NioBits.java | 4 +- .../memory/NonNativeWritableBufferImpl.java | 22 +++--- .../memory/NonNativeWritableMemoryImpl.java | 24 +++--- .../java/org/apache/datasketches/memory/Prim.java | 88 ++++++++++++++++++++++ .../datasketches}/memory/ReadOnlyException.java | 2 +- .../apache/datasketches}/memory/StepBoolean.java | 2 +- .../apache/datasketches}/memory/UnsafeUtil.java | 2 +- .../apache/datasketches}/memory/Utf8.java | 4 +- .../datasketches}/memory/Utf8CodingException.java | 2 +- .../apache/datasketches}/memory/Util.java | 4 +- .../datasketches}/memory/WritableBuffer.java | 2 +- .../datasketches}/memory/WritableBufferImpl.java | 36 ++++----- .../datasketches}/memory/WritableDirectHandle.java | 2 +- .../datasketches}/memory/WritableHandle.java | 2 +- .../apache/datasketches}/memory/WritableMap.java | 2 +- .../datasketches}/memory/WritableMapHandle.java | 2 +- .../datasketches}/memory/WritableMemory.java | 10 +-- .../datasketches}/memory/WritableMemoryImpl.java | 38 +++++----- .../apache/datasketches}/memory/XxHash64.java | 34 ++++----- .../apache/datasketches}/memory/package-info.java | 20 +++-- .../memory/AllocateDirectMapMemoryTest.java | 2 +- .../memory/AllocateDirectMemoryTest.java | 2 +- .../AllocateDirectWritableMapMemoryTest.java | 4 +- .../datasketches}/memory/BaseBufferTest.java | 2 +- .../apache/datasketches}/memory/BaseStateTest.java | 4 +- .../apache/datasketches}/memory/Buffer2Test.java | 2 +- .../memory/BufferBoundaryCheckTest.java | 2 +- .../datasketches}/memory/BufferInvariantsTest.java | 2 +- .../memory/BufferReadWriteSafetyTest.java | 2 +- .../apache/datasketches}/memory/BufferTest.java | 2 +- .../datasketches}/memory/CommonBufferTest.java | 2 +- .../datasketches}/memory/CommonMemoryTest.java | 10 +-- .../memory/CopyMemoryOverlapTest.java | 2 +- .../datasketches}/memory/CopyMemoryTest.java | 4 +- .../memory/ExampleMemoryRequestServerTest.java | 2 +- .../memory/IgnoredArrayOverflowTest.java | 2 +- .../datasketches}/memory/IsValidUtf8TestUtil.java | 2 +- .../apache/datasketches}/memory/LeafImplTest.java | 2 +- .../memory/MemoryBoundaryCheckTest.java | 2 +- .../memory/MemoryReadWriteSafetyTest.java | 2 +- .../apache/datasketches}/memory/MemoryTest.java | 2 +- .../datasketches}/memory/MemoryWriteToTest.java | 2 +- .../apache/datasketches}/memory/NioBitsTest.java | 2 +- .../memory/NonNativeWritableBufferImplTest.java | 2 +- .../memory/NonNativeWritableMemoryImplTest.java | 2 +- .../datasketches}/memory/SpecificLeafTest.java | 10 +-- .../datasketches}/memory/UnsafeUtilTest.java | 2 +- .../apache/datasketches}/memory/Utf8Test.java | 4 +- .../apache/datasketches}/memory/UtilTest.java | 12 +-- .../memory/WritableBufferImplTest.java | 2 +- .../memory/WritableDirectCopyTest.java | 2 +- .../memory/WritableMemoryImplTest.java | 2 +- .../datasketches}/memory/WritableMemoryTest.java | 4 +- .../datasketches}/memory/XxHash64LoopingTest.java | 2 +- .../apache/datasketches}/memory/XxHash64Test.java | 20 ++--- .../datasketches}/memory/ZeroCapacityTest.java | 2 +- 91 files changed, 338 insertions(+), 334 deletions(-) diff --git a/src/main/java/com/yahoo/memory/Prim.java b/src/main/java/com/yahoo/memory/Prim.java deleted file mode 100644 index 9a735a8..0000000 --- a/src/main/java/com/yahoo/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 com.yahoo.memory; - -import static com.yahoo.memory.UnsafeUtil.ARRAY_BOOLEAN_BASE_OFFSET; -import static com.yahoo.memory.UnsafeUtil.ARRAY_BOOLEAN_INDEX_SCALE; -import static com.yahoo.memory.UnsafeUtil.ARRAY_BYTE_BASE_OFFSET; -import static com.yahoo.memory.UnsafeUtil.ARRAY_BYTE_INDEX_SCALE; -import static com.yahoo.memory.UnsafeUtil.ARRAY_CHAR_BASE_OFFSET; -import static com.yahoo.memory.UnsafeUtil.ARRAY_CHAR_INDEX_SCALE; -import static com.yahoo.memory.UnsafeUtil.ARRAY_DOUBLE_BASE_OFFSET; -import static com.yahoo.memory.UnsafeUtil.ARRAY_DOUBLE_INDEX_SCALE; -import static com.yahoo.memory.UnsafeUtil.ARRAY_FLOAT_BASE_OFFSET; -import static com.yahoo.memory.UnsafeUtil.ARRAY_FLOAT_INDEX_SCALE; -import static com.yahoo.memory.UnsafeUtil.ARRAY_INT_BASE_OFFSET; -import static com.yahoo.memory.UnsafeUtil.ARRAY_INT_INDEX_SCALE; -import static com.yahoo.memory.UnsafeUtil.ARRAY_LONG_BASE_OFFSET; -import static com.yahoo.memory.UnsafeUtil.ARRAY_LONG_INDEX_SCALE; -import static com.yahoo.memory.UnsafeUtil.ARRAY_OBJECT_BASE_OFFSET; -import static com.yahoo.memory.UnsafeUtil.ARRAY_OBJECT_INDEX_SCALE; -import static com.yahoo.memory.UnsafeUtil.ARRAY_SHORT_BASE_OFFSET; -import static com.yahoo.memory.UnsafeUtil.ARRAY_SHORT_INDEX_SCALE; -import static com.yahoo.memory.UnsafeUtil.BOOLEAN_SHIFT; -import static com.yahoo.memory.UnsafeUtil.BYTE_SHIFT; -import static com.yahoo.memory.UnsafeUtil.CHAR_SHIFT; -import static com.yahoo.memory.UnsafeUtil.DOUBLE_SHIFT; -import static com.yahoo.memory.UnsafeUtil.FLOAT_SHIFT; -import static com.yahoo.memory.UnsafeUtil.INT_SHIFT; -import static com.yahoo.memory.UnsafeUtil.LONG_SHIFT; -import static com.yahoo.memory.UnsafeUtil.OBJECT_SHIFT; -import static com.yahoo.memory.UnsafeUtil.SHORT_SHIFT; - -/** - * Creates easy to access association between the major Unsafe constants. - * - * @author Lee Rhodes - */ -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; - } - - long off() { - return arrBaseOff_; - } - - long scale() { - return arrIdxScale_; - } - - long shift() { - return sizeShift_; - } - -} diff --git a/src/main/java/com/yahoo/memory/AccessByteBuffer.java b/src/main/java/org/apache/datasketches/memory/AccessByteBuffer.java similarity index 97% rename from src/main/java/com/yahoo/memory/AccessByteBuffer.java rename to src/main/java/org/apache/datasketches/memory/AccessByteBuffer.java index b08b372..a05c1ec 100644 --- a/src/main/java/com/yahoo/memory/AccessByteBuffer.java +++ b/src/main/java/org/apache/datasketches/memory/AccessByteBuffer.java @@ -17,9 +17,9 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; -import static com.yahoo.memory.UnsafeUtil.unsafe; +import static org.apache.datasketches.memory.UnsafeUtil.unsafe; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/src/main/java/com/yahoo/memory/AllocateDirect.java b/src/main/java/org/apache/datasketches/memory/AllocateDirect.java similarity index 97% rename from src/main/java/com/yahoo/memory/AllocateDirect.java rename to src/main/java/org/apache/datasketches/memory/AllocateDirect.java index 388f442..e699e1f 100644 --- a/src/main/java/com/yahoo/memory/AllocateDirect.java +++ b/src/main/java/org/apache/datasketches/memory/AllocateDirect.java @@ -17,9 +17,9 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; -import static com.yahoo.memory.UnsafeUtil.unsafe; +import static org.apache.datasketches.memory.UnsafeUtil.unsafe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/yahoo/memory/AllocateDirectMap.java b/src/main/java/org/apache/datasketches/memory/AllocateDirectMap.java similarity index 99% rename from src/main/java/com/yahoo/memory/AllocateDirectMap.java rename to src/main/java/org/apache/datasketches/memory/AllocateDirectMap.java index a3674f9..9e62a8a 100644 --- a/src/main/java/com/yahoo/memory/AllocateDirectMap.java +++ b/src/main/java/org/apache/datasketches/memory/AllocateDirectMap.java @@ -17,9 +17,9 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; -import static com.yahoo.memory.UnsafeUtil.unsafe; +import static org.apache.datasketches.memory.UnsafeUtil.unsafe; import java.io.File; import java.io.FileDescriptor; diff --git a/src/main/java/com/yahoo/memory/AllocateDirectWritableMap.java b/src/main/java/org/apache/datasketches/memory/AllocateDirectWritableMap.java similarity index 98% rename from src/main/java/com/yahoo/memory/AllocateDirectWritableMap.java rename to src/main/java/org/apache/datasketches/memory/AllocateDirectWritableMap.java index a1e4381..a0d2646 100644 --- a/src/main/java/com/yahoo/memory/AllocateDirectWritableMap.java +++ b/src/main/java/org/apache/datasketches/memory/AllocateDirectWritableMap.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; import java.io.File; diff --git a/src/main/java/com/yahoo/memory/BBNonNativeWritableBufferImpl.java b/src/main/java/org/apache/datasketches/memory/BBNonNativeWritableBufferImpl.java similarity index 98% rename from src/main/java/com/yahoo/memory/BBNonNativeWritableBufferImpl.java rename to src/main/java/org/apache/datasketches/memory/BBNonNativeWritableBufferImpl.java index 3d4b973..0c7f785 100644 --- a/src/main/java/com/yahoo/memory/BBNonNativeWritableBufferImpl.java +++ b/src/main/java/org/apache/datasketches/memory/BBNonNativeWritableBufferImpl.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/src/main/java/com/yahoo/memory/BBNonNativeWritableMemoryImpl.java b/src/main/java/org/apache/datasketches/memory/BBNonNativeWritableMemoryImpl.java similarity index 98% rename from src/main/java/com/yahoo/memory/BBNonNativeWritableMemoryImpl.java rename to src/main/java/org/apache/datasketches/memory/BBNonNativeWritableMemoryImpl.java index a23b264..03ae1dd 100644 --- a/src/main/java/com/yahoo/memory/BBNonNativeWritableMemoryImpl.java +++ b/src/main/java/org/apache/datasketches/memory/BBNonNativeWritableMemoryImpl.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/src/main/java/com/yahoo/memory/BBWritableBufferImpl.java b/src/main/java/org/apache/datasketches/memory/BBWritableBufferImpl.java similarity index 98% rename from src/main/java/com/yahoo/memory/BBWritableBufferImpl.java rename to src/main/java/org/apache/datasketches/memory/BBWritableBufferImpl.java index eb95ee3..25abc6c 100644 --- a/src/main/java/com/yahoo/memory/BBWritableBufferImpl.java +++ b/src/main/java/org/apache/datasketches/memory/BBWritableBufferImpl.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/src/main/java/com/yahoo/memory/BBWritableMemoryImpl.java b/src/main/java/org/apache/datasketches/memory/BBWritableMemoryImpl.java similarity index 98% rename from src/main/java/com/yahoo/memory/BBWritableMemoryImpl.java rename to src/main/java/org/apache/datasketches/memory/BBWritableMemoryImpl.java index 045dfab..886729d 100644 --- a/src/main/java/com/yahoo/memory/BBWritableMemoryImpl.java +++ b/src/main/java/org/apache/datasketches/memory/BBWritableMemoryImpl.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/src/main/java/com/yahoo/memory/BaseBuffer.java b/src/main/java/org/apache/datasketches/memory/BaseBuffer.java similarity index 99% rename from src/main/java/com/yahoo/memory/BaseBuffer.java rename to src/main/java/org/apache/datasketches/memory/BaseBuffer.java index 0dc06a7..30e1ea7 100644 --- a/src/main/java/com/yahoo/memory/BaseBuffer.java +++ b/src/main/java/org/apache/datasketches/memory/BaseBuffer.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; /** * A new positional API. This is different from and simpler than Java Buffer positional approach. diff --git a/src/main/java/com/yahoo/memory/BaseState.java b/src/main/java/org/apache/datasketches/memory/BaseState.java similarity index 98% rename from src/main/java/com/yahoo/memory/BaseState.java rename to src/main/java/org/apache/datasketches/memory/BaseState.java index 9851b51..353455c 100644 --- a/src/main/java/com/yahoo/memory/BaseState.java +++ b/src/main/java/org/apache/datasketches/memory/BaseState.java @@ -17,12 +17,12 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; -import static com.yahoo.memory.UnsafeUtil.LS; -import static com.yahoo.memory.UnsafeUtil.assertBounds; -import static com.yahoo.memory.UnsafeUtil.checkBounds; -import static com.yahoo.memory.UnsafeUtil.unsafe; +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 java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/src/main/java/com/yahoo/memory/BaseWritableBufferImpl.java b/src/main/java/org/apache/datasketches/memory/BaseWritableBufferImpl.java similarity index 94% rename from src/main/java/com/yahoo/memory/BaseWritableBufferImpl.java rename to src/main/java/org/apache/datasketches/memory/BaseWritableBufferImpl.java index 99ede46..8788fd7 100644 --- a/src/main/java/com/yahoo/memory/BaseWritableBufferImpl.java +++ b/src/main/java/org/apache/datasketches/memory/BaseWritableBufferImpl.java @@ -17,18 +17,18 @@ * under the License. */ -package com.yahoo.memory; - -import static com.yahoo.memory.UnsafeUtil.ARRAY_BOOLEAN_BASE_OFFSET; -import static com.yahoo.memory.UnsafeUtil.ARRAY_BOOLEAN_INDEX_SCALE; -import static com.yahoo.memory.UnsafeUtil.ARRAY_BYTE_BASE_OFFSET; -import static com.yahoo.memory.UnsafeUtil.ARRAY_BYTE_INDEX_SCALE; -import static com.yahoo.memory.UnsafeUtil.ARRAY_CHAR_INDEX_SCALE; -import static com.yahoo.memory.UnsafeUtil.ARRAY_INT_INDEX_SCALE; -import static com.yahoo.memory.UnsafeUtil.ARRAY_LONG_INDEX_SCALE; -import static com.yahoo.memory.UnsafeUtil.ARRAY_SHORT_INDEX_SCALE; -import static com.yahoo.memory.UnsafeUtil.checkBounds; -import static com.yahoo.memory.UnsafeUtil.unsafe; +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; import java.nio.ByteOrder; diff --git a/src/main/java/com/yahoo/memory/BaseWritableMemoryImpl.java b/src/main/java/org/apache/datasketches/memory/BaseWritableMemoryImpl.java similarity index 96% rename from src/main/java/com/yahoo/memory/BaseWritableMemoryImpl.java rename to src/main/java/org/apache/datasketches/memory/BaseWritableMemoryImpl.java index 50a62b3..15315c5 100644 --- a/src/main/java/com/yahoo/memory/BaseWritableMemoryImpl.java +++ b/src/main/java/org/apache/datasketches/memory/BaseWritableMemoryImpl.java @@ -17,18 +17,18 @@ * under the License. */ -package com.yahoo.memory; - -import static com.yahoo.memory.UnsafeUtil.ARRAY_BOOLEAN_BASE_OFFSET; -import static com.yahoo.memory.UnsafeUtil.ARRAY_BOOLEAN_INDEX_SCALE; -import static com.yahoo.memory.UnsafeUtil.ARRAY_BYTE_BASE_OFFSET; -import static com.yahoo.memory.UnsafeUtil.ARRAY_BYTE_INDEX_SCALE; -import static com.yahoo.memory.UnsafeUtil.ARRAY_CHAR_INDEX_SCALE; -import static com.yahoo.memory.UnsafeUtil.ARRAY_INT_INDEX_SCALE; -import static com.yahoo.memory.UnsafeUtil.ARRAY_LONG_INDEX_SCALE; -import static com.yahoo.memory.UnsafeUtil.ARRAY_SHORT_INDEX_SCALE; -import static com.yahoo.memory.UnsafeUtil.checkBounds; -import static com.yahoo.memory.UnsafeUtil.unsafe; +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; import java.io.File; import java.io.IOException; diff --git a/src/main/java/com/yahoo/memory/Buffer.java b/src/main/java/org/apache/datasketches/memory/Buffer.java similarity index 99% rename from src/main/java/com/yahoo/memory/Buffer.java rename to src/main/java/org/apache/datasketches/memory/Buffer.java index a57b968..ce16bd1 100644 --- a/src/main/java/com/yahoo/memory/Buffer.java +++ b/src/main/java/org/apache/datasketches/memory/Buffer.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; import java.nio.ByteBuffer; import java.nio.ByteOrder; @@ -29,7 +29,7 @@ import java.nio.ByteOrder; * @author Roman Leventov * @author Lee Rhodes * - * @see com.yahoo.memory + * @see org.apache.datasketches.memory */ public abstract class Buffer extends BaseBuffer { diff --git a/src/main/java/com/yahoo/memory/CompareAndCopy.java b/src/main/java/org/apache/datasketches/memory/CompareAndCopy.java similarity index 97% rename from src/main/java/com/yahoo/memory/CompareAndCopy.java rename to src/main/java/org/apache/datasketches/memory/CompareAndCopy.java index 5fab910..02b647d 100644 --- a/src/main/java/com/yahoo/memory/CompareAndCopy.java +++ b/src/main/java/org/apache/datasketches/memory/CompareAndCopy.java @@ -17,16 +17,16 @@ * under the License. */ -package com.yahoo.memory; - -import static com.yahoo.memory.UnsafeUtil.CHAR_SHIFT; -import static com.yahoo.memory.UnsafeUtil.DOUBLE_SHIFT; -import static com.yahoo.memory.UnsafeUtil.FLOAT_SHIFT; -import static com.yahoo.memory.UnsafeUtil.INT_SHIFT; -import static com.yahoo.memory.UnsafeUtil.LONG_SHIFT; -import static com.yahoo.memory.UnsafeUtil.SHORT_SHIFT; -import static com.yahoo.memory.UnsafeUtil.checkBounds; -import static com.yahoo.memory.UnsafeUtil.unsafe; +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; /** * @author Lee Rhodes diff --git a/src/main/java/com/yahoo/memory/DefaultMemoryRequestServer.java b/src/main/java/org/apache/datasketches/memory/DefaultMemoryRequestServer.java similarity index 98% rename from src/main/java/com/yahoo/memory/DefaultMemoryRequestServer.java rename to src/main/java/org/apache/datasketches/memory/DefaultMemoryRequestServer.java index a39c1b4..616f59b 100644 --- a/src/main/java/com/yahoo/memory/DefaultMemoryRequestServer.java +++ b/src/main/java/org/apache/datasketches/memory/DefaultMemoryRequestServer.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; /** * This is a simple implementation of the MemoryRequestServer that creates space on the Java heap diff --git a/src/main/java/com/yahoo/memory/DirectNonNativeWritableBufferImpl.java b/src/main/java/org/apache/datasketches/memory/DirectNonNativeWritableBufferImpl.java similarity index 98% rename from src/main/java/com/yahoo/memory/DirectNonNativeWritableBufferImpl.java rename to src/main/java/org/apache/datasketches/memory/DirectNonNativeWritableBufferImpl.java index 091c19a..017ba33 100644 --- a/src/main/java/com/yahoo/memory/DirectNonNativeWritableBufferImpl.java +++ b/src/main/java/org/apache/datasketches/memory/DirectNonNativeWritableBufferImpl.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; import java.nio.ByteOrder; diff --git a/src/main/java/com/yahoo/memory/DirectNonNativeWritableMemoryImpl.java b/src/main/java/org/apache/datasketches/memory/DirectNonNativeWritableMemoryImpl.java similarity index 98% rename from src/main/java/com/yahoo/memory/DirectNonNativeWritableMemoryImpl.java rename to src/main/java/org/apache/datasketches/memory/DirectNonNativeWritableMemoryImpl.java index a6d8ada..d0c6f6a 100644 --- a/src/main/java/com/yahoo/memory/DirectNonNativeWritableMemoryImpl.java +++ b/src/main/java/org/apache/datasketches/memory/DirectNonNativeWritableMemoryImpl.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; import java.nio.ByteOrder; diff --git a/src/main/java/com/yahoo/memory/DirectWritableBufferImpl.java b/src/main/java/org/apache/datasketches/memory/DirectWritableBufferImpl.java similarity index 98% rename from src/main/java/com/yahoo/memory/DirectWritableBufferImpl.java rename to src/main/java/org/apache/datasketches/memory/DirectWritableBufferImpl.java index 938480e..a84ac29 100644 --- a/src/main/java/com/yahoo/memory/DirectWritableBufferImpl.java +++ b/src/main/java/org/apache/datasketches/memory/DirectWritableBufferImpl.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; import java.nio.ByteOrder; diff --git a/src/main/java/com/yahoo/memory/DirectWritableMemoryImpl.java b/src/main/java/org/apache/datasketches/memory/DirectWritableMemoryImpl.java similarity index 98% rename from src/main/java/com/yahoo/memory/DirectWritableMemoryImpl.java rename to src/main/java/org/apache/datasketches/memory/DirectWritableMemoryImpl.java index c50e71a..7033529 100644 --- a/src/main/java/com/yahoo/memory/DirectWritableMemoryImpl.java +++ b/src/main/java/org/apache/datasketches/memory/DirectWritableMemoryImpl.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; import java.nio.ByteOrder; diff --git a/src/main/java/com/yahoo/memory/Handle.java b/src/main/java/org/apache/datasketches/memory/Handle.java similarity index 98% rename from src/main/java/com/yahoo/memory/Handle.java rename to src/main/java/org/apache/datasketches/memory/Handle.java index 0ae1f5a..7575253 100644 --- a/src/main/java/com/yahoo/memory/Handle.java +++ b/src/main/java/org/apache/datasketches/memory/Handle.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; /** * A handle for read-only resource. diff --git a/src/main/java/com/yahoo/memory/HeapNonNativeWritableBufferImpl.java b/src/main/java/org/apache/datasketches/memory/HeapNonNativeWritableBufferImpl.java similarity index 98% rename from src/main/java/com/yahoo/memory/HeapNonNativeWritableBufferImpl.java rename to src/main/java/org/apache/datasketches/memory/HeapNonNativeWritableBufferImpl.java index 414919d..97ea836 100644 --- a/src/main/java/com/yahoo/memory/HeapNonNativeWritableBufferImpl.java +++ b/src/main/java/org/apache/datasketches/memory/HeapNonNativeWritableBufferImpl.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; import java.nio.ByteOrder; diff --git a/src/main/java/com/yahoo/memory/HeapNonNativeWritableMemoryImpl.java b/src/main/java/org/apache/datasketches/memory/HeapNonNativeWritableMemoryImpl.java similarity index 98% rename from src/main/java/com/yahoo/memory/HeapNonNativeWritableMemoryImpl.java rename to src/main/java/org/apache/datasketches/memory/HeapNonNativeWritableMemoryImpl.java index bc5e99d..0512ccd 100644 --- a/src/main/java/com/yahoo/memory/HeapNonNativeWritableMemoryImpl.java +++ b/src/main/java/org/apache/datasketches/memory/HeapNonNativeWritableMemoryImpl.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; import java.nio.ByteOrder; diff --git a/src/main/java/com/yahoo/memory/HeapWritableBufferImpl.java b/src/main/java/org/apache/datasketches/memory/HeapWritableBufferImpl.java similarity index 98% rename from src/main/java/com/yahoo/memory/HeapWritableBufferImpl.java rename to src/main/java/org/apache/datasketches/memory/HeapWritableBufferImpl.java index c72af41..72b6c35 100644 --- a/src/main/java/com/yahoo/memory/HeapWritableBufferImpl.java +++ b/src/main/java/org/apache/datasketches/memory/HeapWritableBufferImpl.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; import java.nio.ByteOrder; diff --git a/src/main/java/com/yahoo/memory/HeapWritableMemoryImpl.java b/src/main/java/org/apache/datasketches/memory/HeapWritableMemoryImpl.java similarity index 98% rename from src/main/java/com/yahoo/memory/HeapWritableMemoryImpl.java rename to src/main/java/org/apache/datasketches/memory/HeapWritableMemoryImpl.java index 7a0a594..53e3600 100644 --- a/src/main/java/com/yahoo/memory/HeapWritableMemoryImpl.java +++ b/src/main/java/org/apache/datasketches/memory/HeapWritableMemoryImpl.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; import java.nio.ByteOrder; diff --git a/src/main/java/com/yahoo/memory/Ints.java b/src/main/java/org/apache/datasketches/memory/Ints.java similarity index 96% rename from src/main/java/com/yahoo/memory/Ints.java rename to src/main/java/org/apache/datasketches/memory/Ints.java index 66c3c08..4417fd7 100644 --- a/src/main/java/com/yahoo/memory/Ints.java +++ b/src/main/java/org/apache/datasketches/memory/Ints.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; /** Equivalent of Guava's Ints. */ final class Ints { diff --git a/src/main/java/com/yahoo/memory/JDK7Compatible.java b/src/main/java/org/apache/datasketches/memory/JDK7Compatible.java similarity index 97% rename from src/main/java/com/yahoo/memory/JDK7Compatible.java rename to src/main/java/org/apache/datasketches/memory/JDK7Compatible.java index de6c5d7..5308b19 100644 --- a/src/main/java/com/yahoo/memory/JDK7Compatible.java +++ b/src/main/java/org/apache/datasketches/memory/JDK7Compatible.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; final class JDK7Compatible { diff --git a/src/main/java/com/yahoo/memory/Map.java b/src/main/java/org/apache/datasketches/memory/Map.java similarity index 98% rename from src/main/java/com/yahoo/memory/Map.java rename to src/main/java/org/apache/datasketches/memory/Map.java index eb4e228..5487bbd 100644 --- a/src/main/java/com/yahoo/memory/Map.java +++ b/src/main/java/org/apache/datasketches/memory/Map.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; /** * Read only interface for a memory mapped file diff --git a/src/main/java/com/yahoo/memory/MapHandle.java b/src/main/java/org/apache/datasketches/memory/MapHandle.java similarity index 97% rename from src/main/java/com/yahoo/memory/MapHandle.java rename to src/main/java/org/apache/datasketches/memory/MapHandle.java index 9d34091..181c818 100644 --- a/src/main/java/com/yahoo/memory/MapHandle.java +++ b/src/main/java/org/apache/datasketches/memory/MapHandle.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; /** * A Handle for a memory-mapped, read-only file resource. diff --git a/src/main/java/com/yahoo/memory/MapNonNativeWritableBufferImpl.java b/src/main/java/org/apache/datasketches/memory/MapNonNativeWritableBufferImpl.java similarity index 98% rename from src/main/java/com/yahoo/memory/MapNonNativeWritableBufferImpl.java rename to src/main/java/org/apache/datasketches/memory/MapNonNativeWritableBufferImpl.java index c27a7f6..39155c2 100644 --- a/src/main/java/com/yahoo/memory/MapNonNativeWritableBufferImpl.java +++ b/src/main/java/org/apache/datasketches/memory/MapNonNativeWritableBufferImpl.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; import java.nio.ByteOrder; diff --git a/src/main/java/com/yahoo/memory/MapNonNativeWritableMemoryImpl.java b/src/main/java/org/apache/datasketches/memory/MapNonNativeWritableMemoryImpl.java similarity index 98% rename from src/main/java/com/yahoo/memory/MapNonNativeWritableMemoryImpl.java rename to src/main/java/org/apache/datasketches/memory/MapNonNativeWritableMemoryImpl.java index c9805f1..baa4cf8 100644 --- a/src/main/java/com/yahoo/memory/MapNonNativeWritableMemoryImpl.java +++ b/src/main/java/org/apache/datasketches/memory/MapNonNativeWritableMemoryImpl.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; import java.nio.ByteOrder; diff --git a/src/main/java/com/yahoo/memory/MapWritableBufferImpl.java b/src/main/java/org/apache/datasketches/memory/MapWritableBufferImpl.java similarity index 98% rename from src/main/java/com/yahoo/memory/MapWritableBufferImpl.java rename to src/main/java/org/apache/datasketches/memory/MapWritableBufferImpl.java index 2404af9..f413f4d 100644 --- a/src/main/java/com/yahoo/memory/MapWritableBufferImpl.java +++ b/src/main/java/org/apache/datasketches/memory/MapWritableBufferImpl.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; import java.nio.ByteOrder; diff --git a/src/main/java/com/yahoo/memory/MapWritableMemoryImpl.java b/src/main/java/org/apache/datasketches/memory/MapWritableMemoryImpl.java similarity index 98% rename from src/main/java/com/yahoo/memory/MapWritableMemoryImpl.java rename to src/main/java/org/apache/datasketches/memory/MapWritableMemoryImpl.java index 0eabfae..8a51dbf 100644 --- a/src/main/java/com/yahoo/memory/MapWritableMemoryImpl.java +++ b/src/main/java/org/apache/datasketches/memory/MapWritableMemoryImpl.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; import java.nio.ByteOrder; diff --git a/src/main/java/com/yahoo/memory/Memory.java b/src/main/java/org/apache/datasketches/memory/Memory.java similarity index 98% rename from src/main/java/com/yahoo/memory/Memory.java rename to src/main/java/org/apache/datasketches/memory/Memory.java index 4bac4c4..289ce4b 100644 --- a/src/main/java/com/yahoo/memory/Memory.java +++ b/src/main/java/org/apache/datasketches/memory/Memory.java @@ -17,12 +17,12 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; -import static com.yahoo.memory.Util.nativeOrder; -import static com.yahoo.memory.Util.negativeCheck; -import static com.yahoo.memory.Util.nullCheck; -import static com.yahoo.memory.Util.zeroCheck; +import static org.apache.datasketches.memory.Util.nativeOrder; +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 java.io.File; import java.io.IOException; @@ -37,7 +37,7 @@ import java.nio.channels.WritableByteChannel; * @author Roman Leventov * @author Lee Rhodes * - * @see com.yahoo.memory + * @see org.apache.datasketches.memory */ public abstract class Memory extends BaseState { diff --git a/src/main/java/com/yahoo/memory/MemoryRequestServer.java b/src/main/java/org/apache/datasketches/memory/MemoryRequestServer.java similarity index 97% rename from src/main/java/com/yahoo/memory/MemoryRequestServer.java rename to src/main/java/org/apache/datasketches/memory/MemoryRequestServer.java index 3b039bd..3d1bd69 100644 --- a/src/main/java/com/yahoo/memory/MemoryRequestServer.java +++ b/src/main/java/org/apache/datasketches/memory/MemoryRequestServer.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; /** * The MemoryRequestServer is a callback interface to provide a means for a direct (off-heap), diff --git a/src/main/java/com/yahoo/memory/NioBits.java b/src/main/java/org/apache/datasketches/memory/NioBits.java similarity index 98% rename from src/main/java/com/yahoo/memory/NioBits.java rename to src/main/java/org/apache/datasketches/memory/NioBits.java index 0680482..e8377fd 100644 --- a/src/main/java/com/yahoo/memory/NioBits.java +++ b/src/main/java/org/apache/datasketches/memory/NioBits.java @@ -17,9 +17,9 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; -import static com.yahoo.memory.UnsafeUtil.unsafe; +import static org.apache.datasketches.memory.UnsafeUtil.unsafe; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/src/main/java/com/yahoo/memory/NonNativeWritableBufferImpl.java b/src/main/java/org/apache/datasketches/memory/NonNativeWritableBufferImpl.java similarity index 94% rename from src/main/java/com/yahoo/memory/NonNativeWritableBufferImpl.java rename to src/main/java/org/apache/datasketches/memory/NonNativeWritableBufferImpl.java index 8288ca1..9c30d1f 100644 --- a/src/main/java/com/yahoo/memory/NonNativeWritableBufferImpl.java +++ b/src/main/java/org/apache/datasketches/memory/NonNativeWritableBufferImpl.java @@ -17,17 +17,17 @@ * under the License. */ -package com.yahoo.memory; - -import static com.yahoo.memory.UnsafeUtil.ARRAY_DOUBLE_INDEX_SCALE; -import static com.yahoo.memory.UnsafeUtil.ARRAY_FLOAT_INDEX_SCALE; -import static com.yahoo.memory.UnsafeUtil.CHAR_SHIFT; -import static com.yahoo.memory.UnsafeUtil.DOUBLE_SHIFT; -import static com.yahoo.memory.UnsafeUtil.FLOAT_SHIFT; -import static com.yahoo.memory.UnsafeUtil.INT_SHIFT; -import static com.yahoo.memory.UnsafeUtil.LONG_SHIFT; -import static com.yahoo.memory.UnsafeUtil.SHORT_SHIFT; -import static com.yahoo.memory.UnsafeUtil.unsafe; +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; /* * Developer notes: The heavier methods, such as put/get arrays, duplicate, region, clear, fill, diff --git a/src/main/java/com/yahoo/memory/NonNativeWritableMemoryImpl.java b/src/main/java/org/apache/datasketches/memory/NonNativeWritableMemoryImpl.java similarity index 93% rename from src/main/java/com/yahoo/memory/NonNativeWritableMemoryImpl.java rename to src/main/java/org/apache/datasketches/memory/NonNativeWritableMemoryImpl.java index 5108ee3..ad4430b 100644 --- a/src/main/java/com/yahoo/memory/NonNativeWritableMemoryImpl.java +++ b/src/main/java/org/apache/datasketches/memory/NonNativeWritableMemoryImpl.java @@ -17,18 +17,18 @@ * under the License. */ -package com.yahoo.memory; - -import static com.yahoo.memory.UnsafeUtil.ARRAY_DOUBLE_INDEX_SCALE; -import static com.yahoo.memory.UnsafeUtil.ARRAY_FLOAT_INDEX_SCALE; -import static com.yahoo.memory.UnsafeUtil.ARRAY_LONG_INDEX_SCALE; -import static com.yahoo.memory.UnsafeUtil.CHAR_SHIFT; -import static com.yahoo.memory.UnsafeUtil.DOUBLE_SHIFT; -import static com.yahoo.memory.UnsafeUtil.FLOAT_SHIFT; -import static com.yahoo.memory.UnsafeUtil.INT_SHIFT; -import static com.yahoo.memory.UnsafeUtil.LONG_SHIFT; -import static com.yahoo.memory.UnsafeUtil.SHORT_SHIFT; -import static com.yahoo.memory.UnsafeUtil.unsafe; +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; /* * Developer notes: The heavier methods, such as put/get arrays, duplicate, region, clear, fill, diff --git a/src/main/java/org/apache/datasketches/memory/Prim.java b/src/main/java/org/apache/datasketches/memory/Prim.java new file mode 100644 index 0000000..0178d27 --- /dev/null +++ b/src/main/java/org/apache/datasketches/memory/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; + +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 + */ +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; + } + + long off() { + return arrBaseOff_; + } + + long scale() { + return arrIdxScale_; + } + + long shift() { + return sizeShift_; + } + +} diff --git a/src/main/java/com/yahoo/memory/ReadOnlyException.java b/src/main/java/org/apache/datasketches/memory/ReadOnlyException.java similarity index 96% rename from src/main/java/com/yahoo/memory/ReadOnlyException.java rename to src/main/java/org/apache/datasketches/memory/ReadOnlyException.java index 8d4cec2..e1d1483 100644 --- a/src/main/java/com/yahoo/memory/ReadOnlyException.java +++ b/src/main/java/org/apache/datasketches/memory/ReadOnlyException.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; /** * The exception thrown when attempting to write into a read-only Resource. diff --git a/src/main/java/com/yahoo/memory/StepBoolean.java b/src/main/java/org/apache/datasketches/memory/StepBoolean.java similarity index 98% rename from src/main/java/com/yahoo/memory/StepBoolean.java rename to src/main/java/org/apache/datasketches/memory/StepBoolean.java index 76a0933..16d6b19 100644 --- a/src/main/java/com/yahoo/memory/StepBoolean.java +++ b/src/main/java/org/apache/datasketches/memory/StepBoolean.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; diff --git a/src/main/java/com/yahoo/memory/UnsafeUtil.java b/src/main/java/org/apache/datasketches/memory/UnsafeUtil.java similarity index 99% rename from src/main/java/com/yahoo/memory/UnsafeUtil.java rename to src/main/java/org/apache/datasketches/memory/UnsafeUtil.java index 983ae61..5fc1a31 100644 --- a/src/main/java/com/yahoo/memory/UnsafeUtil.java +++ b/src/main/java/org/apache/datasketches/memory/UnsafeUtil.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; diff --git a/src/main/java/com/yahoo/memory/Utf8.java b/src/main/java/org/apache/datasketches/memory/Utf8.java similarity index 99% rename from src/main/java/com/yahoo/memory/Utf8.java rename to src/main/java/org/apache/datasketches/memory/Utf8.java index 5745099..d4a474d 100644 --- a/src/main/java/com/yahoo/memory/Utf8.java +++ b/src/main/java/org/apache/datasketches/memory/Utf8.java @@ -17,12 +17,12 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; -import static com.yahoo.memory.UnsafeUtil.unsafe; 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 java.io.IOException; import java.nio.BufferOverflowException; diff --git a/src/main/java/com/yahoo/memory/Utf8CodingException.java b/src/main/java/org/apache/datasketches/memory/Utf8CodingException.java similarity index 98% rename from src/main/java/com/yahoo/memory/Utf8CodingException.java rename to src/main/java/org/apache/datasketches/memory/Utf8CodingException.java index aa33331..0c99142 100644 --- a/src/main/java/com/yahoo/memory/Utf8CodingException.java +++ b/src/main/java/org/apache/datasketches/memory/Utf8CodingException.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; /** * This exception will be thrown for errors encountered during either the encoding of characters diff --git a/src/main/java/com/yahoo/memory/Util.java b/src/main/java/org/apache/datasketches/memory/Util.java similarity index 98% rename from src/main/java/com/yahoo/memory/Util.java rename to src/main/java/org/apache/datasketches/memory/Util.java index 41466bf..1fc2e59 100644 --- a/src/main/java/com/yahoo/memory/Util.java +++ b/src/main/java/org/apache/datasketches/memory/Util.java @@ -17,9 +17,9 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; -import static com.yahoo.memory.UnsafeUtil.checkBounds; +import static org.apache.datasketches.memory.UnsafeUtil.checkBounds; import java.nio.ByteOrder; import java.util.Random; diff --git a/src/main/java/com/yahoo/memory/WritableBuffer.java b/src/main/java/org/apache/datasketches/memory/WritableBuffer.java similarity index 99% rename from src/main/java/com/yahoo/memory/WritableBuffer.java rename to src/main/java/org/apache/datasketches/memory/WritableBuffer.java index 2c6ac2f..6d00607 100644 --- a/src/main/java/com/yahoo/memory/WritableBuffer.java +++ b/src/main/java/org/apache/datasketches/memory/WritableBuffer.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/src/main/java/com/yahoo/memory/WritableBufferImpl.java b/src/main/java/org/apache/datasketches/memory/WritableBufferImpl.java similarity index 91% rename from src/main/java/com/yahoo/memory/WritableBufferImpl.java rename to src/main/java/org/apache/datasketches/memory/WritableBufferImpl.java index 54cf2f9..0a4f93a 100644 --- a/src/main/java/com/yahoo/memory/WritableBufferImpl.java +++ b/src/main/java/org/apache/datasketches/memory/WritableBufferImpl.java @@ -17,24 +17,24 @@ * under the License. */ -package com.yahoo.memory; - -import static com.yahoo.memory.UnsafeUtil.ARRAY_CHAR_BASE_OFFSET; -import static com.yahoo.memory.UnsafeUtil.ARRAY_DOUBLE_BASE_OFFSET; -import static com.yahoo.memory.UnsafeUtil.ARRAY_DOUBLE_INDEX_SCALE; -import static com.yahoo.memory.UnsafeUtil.ARRAY_FLOAT_BASE_OFFSET; -import static com.yahoo.memory.UnsafeUtil.ARRAY_FLOAT_INDEX_SCALE; -import static com.yahoo.memory.UnsafeUtil.ARRAY_INT_BASE_OFFSET; -import static com.yahoo.memory.UnsafeUtil.ARRAY_LONG_BASE_OFFSET; -import static com.yahoo.memory.UnsafeUtil.ARRAY_SHORT_BASE_OFFSET; -import static com.yahoo.memory.UnsafeUtil.CHAR_SHIFT; -import static com.yahoo.memory.UnsafeUtil.DOUBLE_SHIFT; -import static com.yahoo.memory.UnsafeUtil.FLOAT_SHIFT; -import static com.yahoo.memory.UnsafeUtil.INT_SHIFT; -import static com.yahoo.memory.UnsafeUtil.LONG_SHIFT; -import static com.yahoo.memory.UnsafeUtil.SHORT_SHIFT; -import static com.yahoo.memory.UnsafeUtil.checkBounds; -import static com.yahoo.memory.UnsafeUtil.unsafe; +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; /* * Developer notes: The heavier methods, such as put/get arrays, duplicate, region, clear, fill, diff --git a/src/main/java/com/yahoo/memory/WritableDirectHandle.java b/src/main/java/org/apache/datasketches/memory/WritableDirectHandle.java similarity index 97% rename from src/main/java/com/yahoo/memory/WritableDirectHandle.java rename to src/main/java/org/apache/datasketches/memory/WritableDirectHandle.java index e28f493..79246b0 100644 --- a/src/main/java/com/yahoo/memory/WritableDirectHandle.java +++ b/src/main/java/org/apache/datasketches/memory/WritableDirectHandle.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; /** * A Handle for a writable direct memory resource. diff --git a/src/main/java/com/yahoo/memory/WritableHandle.java b/src/main/java/org/apache/datasketches/memory/WritableHandle.java similarity index 96% rename from src/main/java/com/yahoo/memory/WritableHandle.java rename to src/main/java/org/apache/datasketches/memory/WritableHandle.java index 1aebf91..f778bf6 100644 --- a/src/main/java/com/yahoo/memory/WritableHandle.java +++ b/src/main/java/org/apache/datasketches/memory/WritableHandle.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; /** * A Handle for writable direct memory or a memory-mapped, writable file resource. diff --git a/src/main/java/com/yahoo/memory/WritableMap.java b/src/main/java/org/apache/datasketches/memory/WritableMap.java similarity index 97% rename from src/main/java/com/yahoo/memory/WritableMap.java rename to src/main/java/org/apache/datasketches/memory/WritableMap.java index d2dd552..30897f0 100644 --- a/src/main/java/com/yahoo/memory/WritableMap.java +++ b/src/main/java/org/apache/datasketches/memory/WritableMap.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; /** * Writable interface for a memory mapped file diff --git a/src/main/java/com/yahoo/memory/WritableMapHandle.java b/src/main/java/org/apache/datasketches/memory/WritableMapHandle.java similarity index 97% rename from src/main/java/com/yahoo/memory/WritableMapHandle.java rename to src/main/java/org/apache/datasketches/memory/WritableMapHandle.java index d6b243b..d6cdb30 100644 --- a/src/main/java/com/yahoo/memory/WritableMapHandle.java +++ b/src/main/java/org/apache/datasketches/memory/WritableMapHandle.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; /** * A Handle for a memory-mapped, writable file resource. diff --git a/src/main/java/com/yahoo/memory/WritableMemory.java b/src/main/java/org/apache/datasketches/memory/WritableMemory.java similarity index 98% rename from src/main/java/com/yahoo/memory/WritableMemory.java rename to src/main/java/org/apache/datasketches/memory/WritableMemory.java index 3bea966..39fdf39 100644 --- a/src/main/java/com/yahoo/memory/WritableMemory.java +++ b/src/main/java/org/apache/datasketches/memory/WritableMemory.java @@ -17,12 +17,12 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; -import static com.yahoo.memory.Util.nativeOrder; -import static com.yahoo.memory.Util.negativeCheck; -import static com.yahoo.memory.Util.nullCheck; -import static com.yahoo.memory.Util.zeroCheck; +import static org.apache.datasketches.memory.Util.nativeOrder; +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 java.io.File; import java.io.IOException; diff --git a/src/main/java/com/yahoo/memory/WritableMemoryImpl.java b/src/main/java/org/apache/datasketches/memory/WritableMemoryImpl.java similarity index 90% rename from src/main/java/com/yahoo/memory/WritableMemoryImpl.java rename to src/main/java/org/apache/datasketches/memory/WritableMemoryImpl.java index e089671..ec0442a 100644 --- a/src/main/java/com/yahoo/memory/WritableMemoryImpl.java +++ b/src/main/java/org/apache/datasketches/memory/WritableMemoryImpl.java @@ -17,25 +17,25 @@ * under the License. */ -package com.yahoo.memory; - -import static com.yahoo.memory.UnsafeUtil.ARRAY_CHAR_BASE_OFFSET; -import static com.yahoo.memory.UnsafeUtil.ARRAY_DOUBLE_BASE_OFFSET; -import static com.yahoo.memory.UnsafeUtil.ARRAY_DOUBLE_INDEX_SCALE; -import static com.yahoo.memory.UnsafeUtil.ARRAY_FLOAT_BASE_OFFSET; -import static com.yahoo.memory.UnsafeUtil.ARRAY_FLOAT_INDEX_SCALE; -import static com.yahoo.memory.UnsafeUtil.ARRAY_INT_BASE_OFFSET; -import static com.yahoo.memory.UnsafeUtil.ARRAY_LONG_BASE_OFFSET; -import static com.yahoo.memory.UnsafeUtil.ARRAY_LONG_INDEX_SCALE; -import static com.yahoo.memory.UnsafeUtil.ARRAY_SHORT_BASE_OFFSET; -import static com.yahoo.memory.UnsafeUtil.CHAR_SHIFT; -import static com.yahoo.memory.UnsafeUtil.DOUBLE_SHIFT; -import static com.yahoo.memory.UnsafeUtil.FLOAT_SHIFT; -import static com.yahoo.memory.UnsafeUtil.INT_SHIFT; -import static com.yahoo.memory.UnsafeUtil.LONG_SHIFT; -import static com.yahoo.memory.UnsafeUtil.SHORT_SHIFT; -import static com.yahoo.memory.UnsafeUtil.checkBounds; -import static com.yahoo.memory.UnsafeUtil.unsafe; +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; /* * Developer notes: The heavier methods, such as put/get arrays, duplicate, region, clear, fill, diff --git a/src/main/java/com/yahoo/memory/XxHash64.java b/src/main/java/org/apache/datasketches/memory/XxHash64.java similarity index 89% rename from src/main/java/com/yahoo/memory/XxHash64.java rename to src/main/java/org/apache/datasketches/memory/XxHash64.java index 2c7b84d..3b42dff 100644 --- a/src/main/java/com/yahoo/memory/XxHash64.java +++ b/src/main/java/org/apache/datasketches/memory/XxHash64.java @@ -17,23 +17,23 @@ * under the License. */ -package com.yahoo.memory; - -import static com.yahoo.memory.UnsafeUtil.ARRAY_BOOLEAN_BASE_OFFSET; -import static com.yahoo.memory.UnsafeUtil.ARRAY_BYTE_BASE_OFFSET; -import static com.yahoo.memory.UnsafeUtil.ARRAY_CHAR_BASE_OFFSET; -import static com.yahoo.memory.UnsafeUtil.ARRAY_DOUBLE_BASE_OFFSET; -import static com.yahoo.memory.UnsafeUtil.ARRAY_FLOAT_BASE_OFFSET; -import static com.yahoo.memory.UnsafeUtil.ARRAY_INT_BASE_OFFSET; -import static com.yahoo.memory.UnsafeUtil.ARRAY_LONG_BASE_OFFSET; -import static com.yahoo.memory.UnsafeUtil.ARRAY_SHORT_BASE_OFFSET; -import static com.yahoo.memory.UnsafeUtil.CHAR_SHIFT; -import static com.yahoo.memory.UnsafeUtil.DOUBLE_SHIFT; -import static com.yahoo.memory.UnsafeUtil.FLOAT_SHIFT; -import static com.yahoo.memory.UnsafeUtil.INT_SHIFT; -import static com.yahoo.memory.UnsafeUtil.LONG_SHIFT; -import static com.yahoo.memory.UnsafeUtil.SHORT_SHIFT; -import static com.yahoo.memory.UnsafeUtil.unsafe; +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; /** * The XxHash is a fast, non-cryptographic, 64-bit hash function that has diff --git a/src/main/java/com/yahoo/memory/package-info.java b/src/main/java/org/apache/datasketches/memory/package-info.java similarity index 90% rename from src/main/java/com/yahoo/memory/package-info.java rename to src/main/java/org/apache/datasketches/memory/package-info.java index c51bc19..476e82a 100644 --- a/src/main/java/com/yahoo/memory/package-info.java +++ b/src/main/java/org/apache/datasketches/memory/package-info.java @@ -26,9 +26,10 @@ * * <p>In addition, this package provides:</p> * - * <ul><li>Two different access APIs: read-only {@link com.yahoo.memory.Memory} and - * {@link com.yahoo.memory.WritableMemory} for absolute offset access, - * and read-only {@link com.yahoo.memory.Buffer} and {@link com.yahoo.memory.WritableBuffer} + * <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} * for relative positional access (similar to ByteBuffer).</li> * * <li>Clean separation of Read-only API from Writable API, which makes writable versus read-only @@ -83,7 +84,7 @@ * * An access API is joined with * a resource either with a static factory method or in combination with a - * {@link com.yahoo.memory.Handle}, which is used exclusively for resources that are external to + * {@link org.apache.datasketches.memory.Handle}, which is used exclusively for resources that are external to * the JVM, such as allocation of direct memory and memory-mapped files. * * <p>The role of a Handle is to hold onto the reference of a resource that is outside the control @@ -92,9 +93,12 @@ * <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: * - * <ul><li>{@link com.yahoo.memory.MapHandle} for read-only access to a memory-mapped file</li> - * <li>{@link com.yahoo.memory.WritableMapHandle} for writable access to a memory-mapped file</li> - * <li>{@link com.yahoo.memory.WritableDirectHandle} for writable access to off-heap memory.</li> + * <ul><li>{@link org.apache.datasketches.memory.MapHandle} + * for read-only access to a memory-mapped file</li> + * <li>{@link org.apache.datasketches.memory.WritableMapHandle} + * for writable access to a memory-mapped file</li> + * <li>{@link org.apache.datasketches.memory.WritableDirectHandle} + * for writable access to off-heap memory.</li> * </ul> * * <p>As long as the implementation handle is valid the JVM will not attempt to close the resource. @@ -166,4 +170,4 @@ * * @author Lee Rhodes */ -package com.yahoo.memory; +package org.apache.datasketches.memory; diff --git a/src/test/java/com/yahoo/memory/AllocateDirectMapMemoryTest.java b/src/test/java/org/apache/datasketches/memory/AllocateDirectMapMemoryTest.java similarity index 99% rename from src/test/java/com/yahoo/memory/AllocateDirectMapMemoryTest.java rename to src/test/java/org/apache/datasketches/memory/AllocateDirectMapMemoryTest.java index 4703bbf..b80ef81 100644 --- a/src/test/java/com/yahoo/memory/AllocateDirectMapMemoryTest.java +++ b/src/test/java/org/apache/datasketches/memory/AllocateDirectMapMemoryTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; diff --git a/src/test/java/com/yahoo/memory/AllocateDirectMemoryTest.java b/src/test/java/org/apache/datasketches/memory/AllocateDirectMemoryTest.java similarity index 98% rename from src/test/java/com/yahoo/memory/AllocateDirectMemoryTest.java rename to src/test/java/org/apache/datasketches/memory/AllocateDirectMemoryTest.java index c3c46d9..2ab9d62 100644 --- a/src/test/java/com/yahoo/memory/AllocateDirectMemoryTest.java +++ b/src/test/java/org/apache/datasketches/memory/AllocateDirectMemoryTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; diff --git a/src/test/java/com/yahoo/memory/AllocateDirectWritableMapMemoryTest.java b/src/test/java/org/apache/datasketches/memory/AllocateDirectWritableMapMemoryTest.java similarity index 98% rename from src/test/java/com/yahoo/memory/AllocateDirectWritableMapMemoryTest.java rename to src/test/java/org/apache/datasketches/memory/AllocateDirectWritableMapMemoryTest.java index 083c14b..29af4d9 100644 --- a/src/test/java/com/yahoo/memory/AllocateDirectWritableMapMemoryTest.java +++ b/src/test/java/org/apache/datasketches/memory/AllocateDirectWritableMapMemoryTest.java @@ -17,9 +17,9 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; -import static com.yahoo.memory.AllocateDirectMap.isFileReadOnly; +import static org.apache.datasketches.memory.AllocateDirectMap.isFileReadOnly; import static java.nio.charset.StandardCharsets.UTF_8; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; diff --git a/src/test/java/com/yahoo/memory/BaseBufferTest.java b/src/test/java/org/apache/datasketches/memory/BaseBufferTest.java similarity index 98% rename from src/test/java/com/yahoo/memory/BaseBufferTest.java rename to src/test/java/org/apache/datasketches/memory/BaseBufferTest.java index 3df14a5..8fbf05d 100644 --- a/src/test/java/com/yahoo/memory/BaseBufferTest.java +++ b/src/test/java/org/apache/datasketches/memory/BaseBufferTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; import static org.testng.Assert.fail; diff --git a/src/test/java/com/yahoo/memory/BaseStateTest.java b/src/test/java/org/apache/datasketches/memory/BaseStateTest.java similarity index 95% rename from src/test/java/com/yahoo/memory/BaseStateTest.java rename to src/test/java/org/apache/datasketches/memory/BaseStateTest.java index f72bad7..048b5b2 100644 --- a/src/test/java/com/yahoo/memory/BaseStateTest.java +++ b/src/test/java/org/apache/datasketches/memory/BaseStateTest.java @@ -17,9 +17,9 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; -import static com.yahoo.memory.UnsafeUtil.ARRAY_DOUBLE_INDEX_SCALE; +import static org.apache.datasketches.memory.UnsafeUtil.ARRAY_DOUBLE_INDEX_SCALE; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; diff --git a/src/test/java/com/yahoo/memory/Buffer2Test.java b/src/test/java/org/apache/datasketches/memory/Buffer2Test.java similarity index 99% rename from src/test/java/com/yahoo/memory/Buffer2Test.java rename to src/test/java/org/apache/datasketches/memory/Buffer2Test.java index a50cbac..7f317ff 100644 --- a/src/test/java/com/yahoo/memory/Buffer2Test.java +++ b/src/test/java/org/apache/datasketches/memory/Buffer2Test.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; diff --git a/src/test/java/com/yahoo/memory/BufferBoundaryCheckTest.java b/src/test/java/org/apache/datasketches/memory/BufferBoundaryCheckTest.java similarity index 99% rename from src/test/java/com/yahoo/memory/BufferBoundaryCheckTest.java rename to src/test/java/org/apache/datasketches/memory/BufferBoundaryCheckTest.java index c9dbce2..e99b759 100644 --- a/src/test/java/com/yahoo/memory/BufferBoundaryCheckTest.java +++ b/src/test/java/org/apache/datasketches/memory/BufferBoundaryCheckTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; import org.testng.annotations.Test; diff --git a/src/test/java/com/yahoo/memory/BufferInvariantsTest.java b/src/test/java/org/apache/datasketches/memory/BufferInvariantsTest.java similarity index 99% rename from src/test/java/com/yahoo/memory/BufferInvariantsTest.java rename to src/test/java/org/apache/datasketches/memory/BufferInvariantsTest.java index 321262a..a12088c 100644 --- a/src/test/java/com/yahoo/memory/BufferInvariantsTest.java +++ b/src/test/java/org/apache/datasketches/memory/BufferInvariantsTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; import static org.testng.Assert.assertEquals; import static org.testng.Assert.fail; diff --git a/src/test/java/com/yahoo/memory/BufferReadWriteSafetyTest.java b/src/test/java/org/apache/datasketches/memory/BufferReadWriteSafetyTest.java similarity index 99% rename from src/test/java/com/yahoo/memory/BufferReadWriteSafetyTest.java rename to src/test/java/org/apache/datasketches/memory/BufferReadWriteSafetyTest.java index b97cc54..ac91bc6 100644 --- a/src/test/java/com/yahoo/memory/BufferReadWriteSafetyTest.java +++ b/src/test/java/org/apache/datasketches/memory/BufferReadWriteSafetyTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; import java.nio.ByteBuffer; diff --git a/src/test/java/com/yahoo/memory/BufferTest.java b/src/test/java/org/apache/datasketches/memory/BufferTest.java similarity index 99% rename from src/test/java/com/yahoo/memory/BufferTest.java rename to src/test/java/org/apache/datasketches/memory/BufferTest.java index 34890f8..1459209 100644 --- a/src/test/java/com/yahoo/memory/BufferTest.java +++ b/src/test/java/org/apache/datasketches/memory/BufferTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; import static org.testng.Assert.assertEquals; diff --git a/src/test/java/com/yahoo/memory/CommonBufferTest.java b/src/test/java/org/apache/datasketches/memory/CommonBufferTest.java similarity index 99% rename from src/test/java/com/yahoo/memory/CommonBufferTest.java rename to src/test/java/org/apache/datasketches/memory/CommonBufferTest.java index c3f678a..2f57358 100644 --- a/src/test/java/com/yahoo/memory/CommonBufferTest.java +++ b/src/test/java/org/apache/datasketches/memory/CommonBufferTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; import static org.testng.Assert.assertEquals; diff --git a/src/test/java/com/yahoo/memory/CommonMemoryTest.java b/src/test/java/org/apache/datasketches/memory/CommonMemoryTest.java similarity index 97% rename from src/test/java/com/yahoo/memory/CommonMemoryTest.java rename to src/test/java/org/apache/datasketches/memory/CommonMemoryTest.java index a6d43f3..5ff4b22 100644 --- a/src/test/java/com/yahoo/memory/CommonMemoryTest.java +++ b/src/test/java/org/apache/datasketches/memory/CommonMemoryTest.java @@ -17,12 +17,12 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; -import static com.yahoo.memory.Util.isAllBitsClear; -import static com.yahoo.memory.Util.isAllBitsSet; -import static com.yahoo.memory.Util.isAnyBitsClear; -import static com.yahoo.memory.Util.isAnyBitsSet; +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.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; diff --git a/src/test/java/com/yahoo/memory/CopyMemoryOverlapTest.java b/src/test/java/org/apache/datasketches/memory/CopyMemoryOverlapTest.java similarity index 99% rename from src/test/java/com/yahoo/memory/CopyMemoryOverlapTest.java rename to src/test/java/org/apache/datasketches/memory/CopyMemoryOverlapTest.java index 5165156..3182e91 100644 --- a/src/test/java/com/yahoo/memory/CopyMemoryOverlapTest.java +++ b/src/test/java/org/apache/datasketches/memory/CopyMemoryOverlapTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; import static org.testng.Assert.assertEquals; diff --git a/src/test/java/com/yahoo/memory/CopyMemoryTest.java b/src/test/java/org/apache/datasketches/memory/CopyMemoryTest.java similarity index 97% rename from src/test/java/com/yahoo/memory/CopyMemoryTest.java rename to src/test/java/org/apache/datasketches/memory/CopyMemoryTest.java index ec65d8f..1127828 100644 --- a/src/test/java/com/yahoo/memory/CopyMemoryTest.java +++ b/src/test/java/org/apache/datasketches/memory/CopyMemoryTest.java @@ -17,9 +17,9 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; -import static com.yahoo.memory.CompareAndCopy.UNSAFE_COPY_THRESHOLD_BYTES; +import static org.apache.datasketches.memory.CompareAndCopy.UNSAFE_COPY_THRESHOLD_BYTES; import static org.testng.Assert.assertEquals; import java.util.concurrent.ThreadLocalRandom; diff --git a/src/test/java/com/yahoo/memory/ExampleMemoryRequestServerTest.java b/src/test/java/org/apache/datasketches/memory/ExampleMemoryRequestServerTest.java similarity index 99% rename from src/test/java/com/yahoo/memory/ExampleMemoryRequestServerTest.java rename to src/test/java/org/apache/datasketches/memory/ExampleMemoryRequestServerTest.java index 95cf7fd..a69f6e4 100644 --- a/src/test/java/com/yahoo/memory/ExampleMemoryRequestServerTest.java +++ b/src/test/java/org/apache/datasketches/memory/ExampleMemoryRequestServerTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; import static org.testng.Assert.assertFalse; diff --git a/src/test/java/com/yahoo/memory/IgnoredArrayOverflowTest.java b/src/test/java/org/apache/datasketches/memory/IgnoredArrayOverflowTest.java similarity index 98% rename from src/test/java/com/yahoo/memory/IgnoredArrayOverflowTest.java rename to src/test/java/org/apache/datasketches/memory/IgnoredArrayOverflowTest.java index 11d675a..699d37e 100644 --- a/src/test/java/com/yahoo/memory/IgnoredArrayOverflowTest.java +++ b/src/test/java/org/apache/datasketches/memory/IgnoredArrayOverflowTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; diff --git a/src/test/java/com/yahoo/memory/IsValidUtf8TestUtil.java b/src/test/java/org/apache/datasketches/memory/IsValidUtf8TestUtil.java similarity index 98% rename from src/test/java/com/yahoo/memory/IsValidUtf8TestUtil.java rename to src/test/java/org/apache/datasketches/memory/IsValidUtf8TestUtil.java index b5b6e57..02f1d83 100644 --- a/src/test/java/com/yahoo/memory/IsValidUtf8TestUtil.java +++ b/src/test/java/org/apache/datasketches/memory/IsValidUtf8TestUtil.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; /** * Stripped down version of diff --git a/src/test/java/com/yahoo/memory/LeafImplTest.java b/src/test/java/org/apache/datasketches/memory/LeafImplTest.java similarity index 99% rename from src/test/java/com/yahoo/memory/LeafImplTest.java rename to src/test/java/org/apache/datasketches/memory/LeafImplTest.java index a02d308..71a6559 100644 --- a/src/test/java/com/yahoo/memory/LeafImplTest.java +++ b/src/test/java/org/apache/datasketches/memory/LeafImplTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; diff --git a/src/test/java/com/yahoo/memory/MemoryBoundaryCheckTest.java b/src/test/java/org/apache/datasketches/memory/MemoryBoundaryCheckTest.java similarity index 99% rename from src/test/java/com/yahoo/memory/MemoryBoundaryCheckTest.java rename to src/test/java/org/apache/datasketches/memory/MemoryBoundaryCheckTest.java index 669a610..03c1009 100644 --- a/src/test/java/com/yahoo/memory/MemoryBoundaryCheckTest.java +++ b/src/test/java/org/apache/datasketches/memory/MemoryBoundaryCheckTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; import org.testng.annotations.Test; diff --git a/src/test/java/com/yahoo/memory/MemoryReadWriteSafetyTest.java b/src/test/java/org/apache/datasketches/memory/MemoryReadWriteSafetyTest.java similarity index 99% rename from src/test/java/com/yahoo/memory/MemoryReadWriteSafetyTest.java rename to src/test/java/org/apache/datasketches/memory/MemoryReadWriteSafetyTest.java index d9e97f0..f984f31 100644 --- a/src/test/java/com/yahoo/memory/MemoryReadWriteSafetyTest.java +++ b/src/test/java/org/apache/datasketches/memory/MemoryReadWriteSafetyTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; import java.io.File; import java.io.IOException; diff --git a/src/test/java/com/yahoo/memory/MemoryTest.java b/src/test/java/org/apache/datasketches/memory/MemoryTest.java similarity index 99% rename from src/test/java/com/yahoo/memory/MemoryTest.java rename to src/test/java/org/apache/datasketches/memory/MemoryTest.java index 10283d7..5abdcd2 100644 --- a/src/test/java/com/yahoo/memory/MemoryTest.java +++ b/src/test/java/org/apache/datasketches/memory/MemoryTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; diff --git a/src/test/java/com/yahoo/memory/MemoryWriteToTest.java b/src/test/java/org/apache/datasketches/memory/MemoryWriteToTest.java similarity index 98% rename from src/test/java/com/yahoo/memory/MemoryWriteToTest.java rename to src/test/java/org/apache/datasketches/memory/MemoryWriteToTest.java index 343255a..b461c00 100644 --- a/src/test/java/com/yahoo/memory/MemoryWriteToTest.java +++ b/src/test/java/org/apache/datasketches/memory/MemoryWriteToTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/test/java/com/yahoo/memory/NioBitsTest.java b/src/test/java/org/apache/datasketches/memory/NioBitsTest.java similarity index 98% rename from src/test/java/com/yahoo/memory/NioBitsTest.java rename to src/test/java/org/apache/datasketches/memory/NioBitsTest.java index c0e0f77..702ca53 100644 --- a/src/test/java/com/yahoo/memory/NioBitsTest.java +++ b/src/test/java/org/apache/datasketches/memory/NioBitsTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; import static org.testng.Assert.assertEquals; diff --git a/src/test/java/com/yahoo/memory/NonNativeWritableBufferImplTest.java b/src/test/java/org/apache/datasketches/memory/NonNativeWritableBufferImplTest.java similarity index 99% rename from src/test/java/com/yahoo/memory/NonNativeWritableBufferImplTest.java rename to src/test/java/org/apache/datasketches/memory/NonNativeWritableBufferImplTest.java index a6ac729..6a73cfb 100644 --- a/src/test/java/com/yahoo/memory/NonNativeWritableBufferImplTest.java +++ b/src/test/java/org/apache/datasketches/memory/NonNativeWritableBufferImplTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; import static org.testng.Assert.assertEquals; diff --git a/src/test/java/com/yahoo/memory/NonNativeWritableMemoryImplTest.java b/src/test/java/org/apache/datasketches/memory/NonNativeWritableMemoryImplTest.java similarity index 99% rename from src/test/java/com/yahoo/memory/NonNativeWritableMemoryImplTest.java rename to src/test/java/org/apache/datasketches/memory/NonNativeWritableMemoryImplTest.java index 12ec453..4b98aa3 100644 --- a/src/test/java/com/yahoo/memory/NonNativeWritableMemoryImplTest.java +++ b/src/test/java/org/apache/datasketches/memory/NonNativeWritableMemoryImplTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; import static org.testng.Assert.assertEquals; diff --git a/src/test/java/com/yahoo/memory/SpecificLeafTest.java b/src/test/java/org/apache/datasketches/memory/SpecificLeafTest.java similarity index 95% rename from src/test/java/com/yahoo/memory/SpecificLeafTest.java rename to src/test/java/org/apache/datasketches/memory/SpecificLeafTest.java index 5a1291b..3988c82 100644 --- a/src/test/java/com/yahoo/memory/SpecificLeafTest.java +++ b/src/test/java/org/apache/datasketches/memory/SpecificLeafTest.java @@ -17,12 +17,12 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; -import static com.yahoo.memory.BaseState.DUPLICATE; -import static com.yahoo.memory.BaseState.REGION; -import static com.yahoo.memory.Util.nativeOrder; -import static com.yahoo.memory.Util.nonNativeOrder; +import static org.apache.datasketches.memory.BaseState.DUPLICATE; +import static org.apache.datasketches.memory.BaseState.REGION; +import static org.apache.datasketches.memory.Util.nativeOrder; +import static org.apache.datasketches.memory.Util.nonNativeOrder; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; diff --git a/src/test/java/com/yahoo/memory/UnsafeUtilTest.java b/src/test/java/org/apache/datasketches/memory/UnsafeUtilTest.java similarity index 98% rename from src/test/java/com/yahoo/memory/UnsafeUtilTest.java rename to src/test/java/org/apache/datasketches/memory/UnsafeUtilTest.java index e9236b6..b7c18c9 100644 --- a/src/test/java/com/yahoo/memory/UnsafeUtilTest.java +++ b/src/test/java/org/apache/datasketches/memory/UnsafeUtilTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; diff --git a/src/test/java/com/yahoo/memory/Utf8Test.java b/src/test/java/org/apache/datasketches/memory/Utf8Test.java similarity index 99% rename from src/test/java/com/yahoo/memory/Utf8Test.java rename to src/test/java/org/apache/datasketches/memory/Utf8Test.java index 0924cd9..d19a999 100644 --- a/src/test/java/com/yahoo/memory/Utf8Test.java +++ b/src/test/java/org/apache/datasketches/memory/Utf8Test.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; import static java.nio.charset.StandardCharsets.UTF_8; import static org.testng.Assert.assertEquals; @@ -31,7 +31,7 @@ import java.util.List; import org.testng.annotations.Test; import com.google.protobuf.ByteString; -import com.yahoo.memory.Util.RandomCodePoints; +import org.apache.datasketches.memory.Util.RandomCodePoints; /** * Adapted version of diff --git a/src/test/java/com/yahoo/memory/UtilTest.java b/src/test/java/org/apache/datasketches/memory/UtilTest.java similarity index 92% rename from src/test/java/com/yahoo/memory/UtilTest.java rename to src/test/java/org/apache/datasketches/memory/UtilTest.java index 80fccaf..52f747f 100644 --- a/src/test/java/com/yahoo/memory/UtilTest.java +++ b/src/test/java/org/apache/datasketches/memory/UtilTest.java @@ -17,13 +17,13 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; -import static com.yahoo.memory.Util.characterPad; -import static com.yahoo.memory.Util.negativeCheck; -import static com.yahoo.memory.Util.nullCheck; -import static com.yahoo.memory.Util.zeroCheck; -import static com.yahoo.memory.Util.zeroPad; +import static org.apache.datasketches.memory.Util.characterPad; +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.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; diff --git a/src/test/java/com/yahoo/memory/WritableBufferImplTest.java b/src/test/java/org/apache/datasketches/memory/WritableBufferImplTest.java similarity index 99% rename from src/test/java/com/yahoo/memory/WritableBufferImplTest.java rename to src/test/java/org/apache/datasketches/memory/WritableBufferImplTest.java index aec3302..469eec4 100644 --- a/src/test/java/com/yahoo/memory/WritableBufferImplTest.java +++ b/src/test/java/org/apache/datasketches/memory/WritableBufferImplTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; diff --git a/src/test/java/com/yahoo/memory/WritableDirectCopyTest.java b/src/test/java/org/apache/datasketches/memory/WritableDirectCopyTest.java similarity index 99% rename from src/test/java/com/yahoo/memory/WritableDirectCopyTest.java rename to src/test/java/org/apache/datasketches/memory/WritableDirectCopyTest.java index 9618add..bb8e4ef 100644 --- a/src/test/java/com/yahoo/memory/WritableDirectCopyTest.java +++ b/src/test/java/org/apache/datasketches/memory/WritableDirectCopyTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; import static org.testng.Assert.assertEquals; import static org.testng.Assert.fail; diff --git a/src/test/java/com/yahoo/memory/WritableMemoryImplTest.java b/src/test/java/org/apache/datasketches/memory/WritableMemoryImplTest.java similarity index 99% rename from src/test/java/com/yahoo/memory/WritableMemoryImplTest.java rename to src/test/java/org/apache/datasketches/memory/WritableMemoryImplTest.java index 1f8f3e6..429afb4 100644 --- a/src/test/java/com/yahoo/memory/WritableMemoryImplTest.java +++ b/src/test/java/org/apache/datasketches/memory/WritableMemoryImplTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; diff --git a/src/test/java/com/yahoo/memory/WritableMemoryTest.java b/src/test/java/org/apache/datasketches/memory/WritableMemoryTest.java similarity index 98% rename from src/test/java/com/yahoo/memory/WritableMemoryTest.java rename to src/test/java/org/apache/datasketches/memory/WritableMemoryTest.java index c7b533f..fad9ae3 100644 --- a/src/test/java/com/yahoo/memory/WritableMemoryTest.java +++ b/src/test/java/org/apache/datasketches/memory/WritableMemoryTest.java @@ -17,9 +17,9 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; -import static com.yahoo.memory.CompareAndCopy.UNSAFE_COPY_THRESHOLD_BYTES; +import static org.apache.datasketches.memory.CompareAndCopy.UNSAFE_COPY_THRESHOLD_BYTES; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; diff --git a/src/test/java/com/yahoo/memory/XxHash64LoopingTest.java b/src/test/java/org/apache/datasketches/memory/XxHash64LoopingTest.java similarity index 99% rename from src/test/java/com/yahoo/memory/XxHash64LoopingTest.java rename to src/test/java/org/apache/datasketches/memory/XxHash64LoopingTest.java index 9f9b74c..f53fec0 100644 --- a/src/test/java/com/yahoo/memory/XxHash64LoopingTest.java +++ b/src/test/java/org/apache/datasketches/memory/XxHash64LoopingTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; import static org.testng.Assert.assertEquals; diff --git a/src/test/java/com/yahoo/memory/XxHash64Test.java b/src/test/java/org/apache/datasketches/memory/XxHash64Test.java similarity index 90% rename from src/test/java/com/yahoo/memory/XxHash64Test.java rename to src/test/java/org/apache/datasketches/memory/XxHash64Test.java index 1571e8a..99670c4 100644 --- a/src/test/java/com/yahoo/memory/XxHash64Test.java +++ b/src/test/java/org/apache/datasketches/memory/XxHash64Test.java @@ -17,16 +17,16 @@ * under the License. */ -package com.yahoo.memory; - -import static com.yahoo.memory.XxHash64.hashBooleans; -import static com.yahoo.memory.XxHash64.hashBytes; -import static com.yahoo.memory.XxHash64.hashChars; -import static com.yahoo.memory.XxHash64.hashDoubles; -import static com.yahoo.memory.XxHash64.hashFloats; -import static com.yahoo.memory.XxHash64.hashInts; -import static com.yahoo.memory.XxHash64.hashLongs; -import static com.yahoo.memory.XxHash64.*; +package org.apache.datasketches.memory; + +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.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; diff --git a/src/test/java/com/yahoo/memory/ZeroCapacityTest.java b/src/test/java/org/apache/datasketches/memory/ZeroCapacityTest.java similarity index 97% rename from src/test/java/com/yahoo/memory/ZeroCapacityTest.java rename to src/test/java/org/apache/datasketches/memory/ZeroCapacityTest.java index c45f361..c0a3d0a 100644 --- a/src/test/java/com/yahoo/memory/ZeroCapacityTest.java +++ b/src/test/java/org/apache/datasketches/memory/ZeroCapacityTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.yahoo.memory; +package org.apache.datasketches.memory; import static org.testng.Assert.assertEquals; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
