You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datasketches.apache.org by le...@apache.org on 2019/07/20 00:45:25 UTC
[incubator-datasketches-memory] branch master updated: Simple
changes to BaseState API to make some methods much more clear.
This is an automated email from the ASF dual-hosted git repository.
leerho pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-datasketches-memory.git
The following commit(s) were added to refs/heads/master by this push:
new 966f9bf Simple changes to BaseState API to make some methods much more clear.
966f9bf is described below
commit 966f9bf388b0a3e8aaaccfe8ef0b3631cba4f567
Author: Lee Rhodes <le...@users.noreply.github.com>
AuthorDate: Fri Jul 19 17:45:18 2019 -0700
Simple changes to BaseState API to make some methods much more clear.
Unfortunately,
these few changes rippled through the code making it
look worse than it really is.
---
scripts/DistDeploymentStructure.txt | 55 ----------------------
scripts/bashDeployToDist.sh | 34 ++++++++-----
scripts/createZip.sh | 38 ---------------
scripts/pomDeployToDist.sh | 40 ----------------
.../memory/BBNonNativeWritableBufferImpl.java | 4 +-
.../memory/BBNonNativeWritableMemoryImpl.java | 4 +-
.../datasketches/memory/BBWritableBufferImpl.java | 4 +-
.../datasketches/memory/BBWritableMemoryImpl.java | 4 +-
.../org/apache/datasketches/memory/BaseState.java | 32 ++++++-------
.../memory/BaseWritableMemoryImpl.java | 8 ++--
.../memory/DirectNonNativeWritableBufferImpl.java | 4 +-
.../memory/DirectNonNativeWritableMemoryImpl.java | 4 +-
.../memory/DirectWritableBufferImpl.java | 4 +-
.../memory/DirectWritableMemoryImpl.java | 4 +-
.../memory/HeapNonNativeWritableBufferImpl.java | 4 +-
.../memory/HeapNonNativeWritableMemoryImpl.java | 4 +-
.../memory/HeapWritableBufferImpl.java | 4 +-
.../memory/HeapWritableMemoryImpl.java | 4 +-
.../memory/MapNonNativeWritableBufferImpl.java | 4 +-
.../memory/MapNonNativeWritableMemoryImpl.java | 4 +-
.../datasketches/memory/MapWritableBufferImpl.java | 4 +-
.../datasketches/memory/MapWritableMemoryImpl.java | 4 +-
.../org/apache/datasketches/memory/Memory.java | 16 +++----
.../apache/datasketches/memory/WritableMemory.java | 22 ++++-----
.../memory/AllocateDirectMemoryTest.java | 2 +-
.../AllocateDirectWritableMapMemoryTest.java | 2 +-
.../apache/datasketches/memory/BaseStateTest.java | 2 +-
.../apache/datasketches/memory/LeafImplTest.java | 50 ++++++++++----------
.../org/apache/datasketches/memory/MemoryTest.java | 6 +--
.../datasketches/memory/SpecificLeafTest.java | 46 +++++++++---------
.../memory/WritableBufferImplTest.java | 2 +-
.../memory/WritableMemoryImplTest.java | 2 +-
.../datasketches/memory/WritableMemoryTest.java | 6 +--
33 files changed, 153 insertions(+), 274 deletions(-)
diff --git a/scripts/DistDeploymentStructure.txt b/scripts/DistDeploymentStructure.txt
deleted file mode 100644
index ada47df..0000000
--- a/scripts/DistDeploymentStructure.txt
+++ /dev/null
@@ -1,55 +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.
-
-
-
-===========The Dist Deployment Structure==========="
-The DataSketche base directories in https://dist.apache.org/repos/dist/ are:"
- - dev/incubator/datasketches/"
- - release/incubator/datasketches/"
-
- Each of these two directories contain a KEYS file, which is where you must have your GPG public key stored."
-
-After graduation the base directories will be the same but without the incubator level."
-
-For both the dev and the release branches, the root contains sub-directories for each of "
-the datasketches-X repositories as follows:"
- - characterization/"
- - core/"
- - cpp/"
- - hive/"
- - memory/"
- - pig/"
- - postgresql/"
- - vector/"
-
-Below these sub=directories is a level of leaf directories that define a particular release or release candidate."
-
-Finally the leaf directories contain the zip and signature files for a release or release candidate."
-The full tree will look something like this example:"
- dist/"
- dev/"
- incubator/"
- datasketches/"
- KEYS"
- memory/"
- 0.12.3-incubating-RC1/"
- apache-datasketches-memory-0.12.3-incubating-src.zip"
- apache-datasketches-memory-0.12.3-incubating-src.zip.asc"
- apache-datasketches-memory-0.12.3-incubating-src.zip.sha512"
- etc."
diff --git a/scripts/bashDeployToDist.sh b/scripts/bashDeployToDist.sh
index c77c8a0..0ca86d4 100755
--- a/scripts/bashDeployToDist.sh
+++ b/scripts/bashDeployToDist.sh
@@ -23,8 +23,9 @@
# It does us Git.
# Input Parameters:
-# \$1 = project.artifactId
-# \$2 = GitHub Tag
+# \$1 = project.basedir
+# \$2 = project.artifactId
+# \$3 = GitHub Tag for this deployment
# For example: $ scripts/<this script>.sh datasketches-memory 0.12.3-incubator
echo
@@ -58,6 +59,19 @@ echo "6. Verify that your local GitHub repository current and the git status is
echo
echo "Proceed? [y|N]"; read confirm; if [[ $confirm != "y" ]]; then echo "Please rerun this script when ready."; exit 1; fi
+# Setup absolute directory references
+MyBase=$(pwd)
+
+# Move to project directory
+cd $1
+ProjectBaseDir=$(pwd) #create as absolute address
+
+## Extract project.artifactId and Tag from input parameters:
+ProjectArtifactId=$2
+Tag=$3
+
+
+
TMP=$(git status --porcelain)
if [[ -n $TMP ]];
then
@@ -67,9 +81,8 @@ then
# exit 1 #Don't exit for now
fi
-
TIME=$(date -u +%Y%m%d.%H%M%S)
-BASE=$(pwd)
+
echo
echo "DateTime: $TIME"
@@ -77,10 +90,7 @@ echo
echo "## Load GPG Agent:"
eval $(gpg-agent --daemon) > /dev/null
-## Extract project.artifactId and project.version from input parameters:
-ProjectArtifactId=$1
-Tag=$2
# Determine the type of release / deployment we are dealing with
# and adjust the target directories and file version to be used in the file name accordingly.
@@ -108,8 +118,8 @@ else
echo "This Tag is for a Release Candidate."
echo "Proceed? [y|N]"; read confirm; if [[ $confirm != "y" ]]; then echo "Please rerun this script when ready."; exit 1; fi
ReleaseCandidate=true
- RCSubStr=$(expr "$Tag" : '.*\(-[rR][cC][0-9]*\)')
- FileVersion=${Tag%$RCSubStr}
+ # RCSubStr=$(expr "$Tag" : '.*\(-[rR][cC][0-9]*\)')
+ FileVersion=$Tag # ${Tag%$RCSubStr}
LeafDir="$Tag"
else
echo "Please confirm that this the Final Release of $ProjectArtifactId : $Tag"
@@ -182,7 +192,7 @@ mkdir -p $LocalSvnBasePath
cd $LocalSvnBasePath
svn co $RemoteSvnBasePath .
-cd $BASE
+cd $ProjectBaseDir
if [ -d "$LocalFilesPath" ] && [ ! $Snapshot ];
then
@@ -255,7 +265,7 @@ echo
echo "## SHA512 Check:"
shasum -a 512 -c $SHA512
-cd $BASE
+cd $ProjectBaseDir
echo
echo "=================DEPLOY TO DIST===================="
@@ -276,6 +286,8 @@ then
exit 1
fi
+cd $ProjectBaseDir
+
echo
echo "Is the remote dist directory structure and content OK?"
echo "Proceed? [y|N]"; read confirm; if [[ $confirm != "y" ]];
diff --git a/scripts/createZip.sh b/scripts/createZip.sh
deleted file mode 100755
index 1c25f85..0000000
--- a/scripts/createZip.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash -e
-
-# 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.
-
-ZipName=$1
-LocalPath=$2 # target/assy-tmp/dist/dev/incubator/datasketches/memory/<leafDir>
-
-# what should be included is a shorter list that all possible excludes!
-cp .travis.yml $LocalPath
-cp .gitignore $LocalPath
-cp DISCLAIMER $LocalPath
-cp LICENSE $LocalPath
-cp NOTICE $LocalPath
-cp pom.xml $LocalPath
-cp README.md $LocalPath
-cp -R scripts $LocalPath
-cp -R src $LocalPath
-cp -R tools $LocalPath
-
-cd $LocalPath
-
-zip -rqmT "$ZipName" "."
-
diff --git a/scripts/pomDeployToDist.sh b/scripts/pomDeployToDist.sh
deleted file mode 100755
index 3c709d9..0000000
--- a/scripts/pomDeployToDist.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash -e
-
-# 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.
-
-# This assumes it is being executed from the project root directory.
-# From the project directory run: scripts/assembleSignVerify.sh
-echo
-echo "=============Deploy using POM Metadata============="
-echo " This script must be run from the base directory of the project."
-echo " This script will extract the 'project.artifactId' and the 'project.version' from the pom.xml "
-echo " which must be found in this directory."
-echo " For example: $ scripts/pomDeployToDist.sh"
-echo " If your project does not have a pom, then you should use the 'bashDeployToDist.sh' instead"
-echo
-echo
-echo "Proceed? [y|N]"; read confirm; if [[ $confirm != "y" ]]; then echo "Please rerun this script when ready."; exit; fi
-
-# extract the project.artifactId
-ProjectArtifactId=$(mvn help:evaluate -Dexpression=project.artifactId -q -DforceStdout)
-
-# extract the project.version
-ProjectVersion=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
-
-scripts/bashDeployToDist.sh $ProjectArtifactId $ProjectVersion
-
diff --git a/src/main/java/org/apache/datasketches/memory/BBNonNativeWritableBufferImpl.java b/src/main/java/org/apache/datasketches/memory/BBNonNativeWritableBufferImpl.java
index aceaac5..44d87b9 100644
--- a/src/main/java/org/apache/datasketches/memory/BBNonNativeWritableBufferImpl.java
+++ b/src/main/java/org/apache/datasketches/memory/BBNonNativeWritableBufferImpl.java
@@ -54,7 +54,7 @@ final class BBNonNativeWritableBufferImpl extends NonNativeWritableBufferImpl {
BaseWritableBufferImpl toWritableRegion(final long offsetBytes, final long capacityBytes,
final boolean readOnly, final ByteOrder byteOrder) {
final int type = typeId | REGION | (readOnly ? READONLY : 0);
- return isNativeCpuByteOrder(byteOrder)
+ return isNativeByteOrder(byteOrder)
? new BBWritableBufferImpl(
unsafeObj, nativeBaseOffset, getRegionOffset(offsetBytes), capacityBytes,
type, byteBuf, originMemory)
@@ -66,7 +66,7 @@ final class BBNonNativeWritableBufferImpl extends NonNativeWritableBufferImpl {
@Override
BaseWritableBufferImpl toDuplicate(final boolean readOnly, final ByteOrder byteOrder) {
final int type = typeId | DUPLICATE | (readOnly ? READONLY : 0);
- return isNativeCpuByteOrder(byteOrder)
+ return isNativeByteOrder(byteOrder)
? new BBWritableBufferImpl(
unsafeObj, nativeBaseOffset, getRegionOffset(), getCapacity(),
type, byteBuf, originMemory)
diff --git a/src/main/java/org/apache/datasketches/memory/BBNonNativeWritableMemoryImpl.java b/src/main/java/org/apache/datasketches/memory/BBNonNativeWritableMemoryImpl.java
index e43f381..1a43bf2 100644
--- a/src/main/java/org/apache/datasketches/memory/BBNonNativeWritableMemoryImpl.java
+++ b/src/main/java/org/apache/datasketches/memory/BBNonNativeWritableMemoryImpl.java
@@ -53,7 +53,7 @@ final class BBNonNativeWritableMemoryImpl extends NonNativeWritableMemoryImpl {
BaseWritableMemoryImpl toWritableRegion(final long offsetBytes, final long capacityBytes,
final boolean readOnly, final ByteOrder byteOrder) {
final int type = typeId | REGION | (readOnly ? READONLY : 0);
- return isNativeCpuByteOrder(byteOrder)
+ return isNativeByteOrder(byteOrder)
? new BBWritableMemoryImpl(
unsafeObj, nativeBaseOffset, getRegionOffset(offsetBytes), capacityBytes,
type, getByteBuffer())
@@ -65,7 +65,7 @@ final class BBNonNativeWritableMemoryImpl extends NonNativeWritableMemoryImpl {
@Override
BaseWritableBufferImpl toWritableBuffer(final boolean readOnly, final ByteOrder byteOrder) {
final int type = typeId | (readOnly ? READONLY : 0);
- return isNativeCpuByteOrder(byteOrder)
+ return isNativeByteOrder(byteOrder)
? new BBWritableBufferImpl(
unsafeObj, nativeBaseOffset, getRegionOffset(), getCapacity(),
type, byteBuf, this)
diff --git a/src/main/java/org/apache/datasketches/memory/BBWritableBufferImpl.java b/src/main/java/org/apache/datasketches/memory/BBWritableBufferImpl.java
index fdf4f87..a44e118 100644
--- a/src/main/java/org/apache/datasketches/memory/BBWritableBufferImpl.java
+++ b/src/main/java/org/apache/datasketches/memory/BBWritableBufferImpl.java
@@ -54,7 +54,7 @@ final class BBWritableBufferImpl extends WritableBufferImpl {
BaseWritableBufferImpl toWritableRegion(final long offsetBytes, final long capacityBytes,
final boolean readOnly, final ByteOrder byteOrder) {
final int type = typeId | REGION | (readOnly ? READONLY : 0);
- return isNativeCpuByteOrder(byteOrder)
+ return isNativeByteOrder(byteOrder)
? new BBWritableBufferImpl(
unsafeObj, nativeBaseOffset, getRegionOffset(offsetBytes), capacityBytes,
type, byteBuf, originMemory)
@@ -66,7 +66,7 @@ final class BBWritableBufferImpl extends WritableBufferImpl {
@Override
BaseWritableBufferImpl toDuplicate(final boolean readOnly, final ByteOrder byteOrder) {
final int type = typeId | DUPLICATE | (readOnly ? READONLY : 0);
- return isNativeCpuByteOrder(byteOrder)
+ return isNativeByteOrder(byteOrder)
? new BBWritableBufferImpl(
unsafeObj, nativeBaseOffset, getRegionOffset(), getCapacity(),
type, byteBuf, originMemory)
diff --git a/src/main/java/org/apache/datasketches/memory/BBWritableMemoryImpl.java b/src/main/java/org/apache/datasketches/memory/BBWritableMemoryImpl.java
index e3207aa..99284e3 100644
--- a/src/main/java/org/apache/datasketches/memory/BBWritableMemoryImpl.java
+++ b/src/main/java/org/apache/datasketches/memory/BBWritableMemoryImpl.java
@@ -53,7 +53,7 @@ final class BBWritableMemoryImpl extends WritableMemoryImpl {
BaseWritableMemoryImpl toWritableRegion(final long offsetBytes, final long capacityBytes,
final boolean readOnly, final ByteOrder byteOrder) {
final int type = typeId | REGION | (readOnly ? READONLY : 0);
- return isNativeCpuByteOrder(byteOrder)
+ return isNativeByteOrder(byteOrder)
? new BBWritableMemoryImpl(
unsafeObj, nativeBaseOffset, getRegionOffset(offsetBytes), capacityBytes,
type, getByteBuffer())
@@ -65,7 +65,7 @@ final class BBWritableMemoryImpl extends WritableMemoryImpl {
@Override
BaseWritableBufferImpl toWritableBuffer(final boolean readOnly, final ByteOrder byteOrder) {
final int type = typeId | (readOnly ? READONLY : 0);
- return isNativeCpuByteOrder(byteOrder)
+ return isNativeByteOrder(byteOrder)
? new BBWritableBufferImpl(
unsafeObj, nativeBaseOffset, getRegionOffset(), getCapacity(),
type, byteBuf, this)
diff --git a/src/main/java/org/apache/datasketches/memory/BaseState.java b/src/main/java/org/apache/datasketches/memory/BaseState.java
index b0398a2..8d9e12d 100644
--- a/src/main/java/org/apache/datasketches/memory/BaseState.java
+++ b/src/main/java/org/apache/datasketches/memory/BaseState.java
@@ -37,8 +37,8 @@ import java.util.concurrent.atomic.AtomicLong;
abstract class BaseState {
//Byte Order related
- static final ByteOrder nativeCpuByteOrder = ByteOrder.nativeOrder();
- static final ByteOrder nonNativeCpuByteOrder = (nativeCpuByteOrder == ByteOrder.LITTLE_ENDIAN)
+ static final ByteOrder nativeByteOrder = ByteOrder.nativeOrder();
+ static final ByteOrder nonNativeByteOrder = (nativeByteOrder == ByteOrder.LITTLE_ENDIAN)
? ByteOrder.BIG_ENDIAN : ByteOrder.LITTLE_ENDIAN;
//Monitoring
@@ -100,44 +100,44 @@ abstract class BaseState {
//Byte Order Related
/**
- * Returns the CPU Byte Order
- * @return the CPU Byte Order
+ * Returns the Native Byte Order
+ * @return the Native Byte Order
*/
- public static final ByteOrder getCpuByteOrder() {
- return nativeCpuByteOrder;
+ public static final ByteOrder getNativeByteOrder() {
+ return nativeByteOrder;
}
/**
* Gets the current Type ByteOrder.
- * This may be different from the ByteOrder of the backing resource and of the CPU Byte Order.
+ * This may be different from the ByteOrder of the backing resource and of the Native Byte Order.
* @return the current Type ByteOrder.
*/
public final ByteOrder getTypeByteOrder() {
- return isNonNativeType() ? BaseState.nonNativeCpuByteOrder : BaseState.nativeCpuByteOrder;
+ return isNonNativeType() ? BaseState.nonNativeByteOrder : BaseState.nativeByteOrder;
}
/**
- * Returns true if the given byteOrder is the same as the native CPU byte order.
+ * Returns true if the given byteOrder is the same as the native byte order.
* @param byteOrder the given byte order
- * @return true if the given byteOrder is the same as the native CPU byte order.
+ * @return true if the given byteOrder is the same as the native byte order.
*/
- static boolean isNativeCpuByteOrder(final ByteOrder byteOrder) {
+ static boolean isNativeByteOrder(final ByteOrder byteOrder) {
if (byteOrder == null) {
throw new IllegalArgumentException("ByteOrder parameter cannot be null.");
}
- return (BaseState.nativeCpuByteOrder == byteOrder);
+ return (BaseState.nativeByteOrder == byteOrder);
}
/**
- * Returns true if the ByteOrder of the CPU is the same as the ByteOrder of the
+ * Returns true if the Native ByteOrder is the same as the ByteOrder of the
* current Buffer or Memory and the same ByteOrder as the given byteOrder.
* @param byteOrder the given ByteOrder
- * @return true if the ByteOrder of the CPU is the same as the ByteOrder of the
+ * @return true if the Native ByteOrder is the same as the ByteOrder of the
* current Buffer or Memory and the same ByteOrder as the given byteOrder.
*/
public final boolean isByteOrderCompatible(final ByteOrder byteOrder) {
final ByteOrder typeBO = getTypeByteOrder();
- return ((typeBO == getCpuByteOrder()) && (typeBO == byteOrder));
+ return ((typeBO == getNativeByteOrder()) && (typeBO == byteOrder));
}
/**
@@ -539,7 +539,7 @@ abstract class BaseState {
sb.append("Valid : ").append(state.isValid()).append(LS);
sb.append("Read Only : ").append(state.isReadOnly()).append(LS);
sb.append("Type Byte Order : ").append(state.getTypeByteOrder().toString()).append(LS);
- sb.append("CPU Byte Order : ").append(nativeCpuByteOrder.toString()).append(LS);
+ sb.append("Native Byte Order : ").append(nativeByteOrder.toString()).append(LS);
sb.append("JDK Major Version : ").append(UnsafeUtil.JDK).append(LS);
//Data detail
sb.append("Data, littleEndian : 0 1 2 3 4 5 6 7");
diff --git a/src/main/java/org/apache/datasketches/memory/BaseWritableMemoryImpl.java b/src/main/java/org/apache/datasketches/memory/BaseWritableMemoryImpl.java
index f046a7a..c0809a3 100644
--- a/src/main/java/org/apache/datasketches/memory/BaseWritableMemoryImpl.java
+++ b/src/main/java/org/apache/datasketches/memory/BaseWritableMemoryImpl.java
@@ -72,7 +72,7 @@ abstract class BaseWritableMemoryImpl extends WritableMemory {
final long lengthBytes, final boolean localReadOnly, final ByteOrder byteOrder) {
if (lengthBytes == 0) { return BaseWritableMemoryImpl.ZERO_SIZE_MEMORY; }
final int typeId = localReadOnly ? READONLY : 0;
- return isNativeCpuByteOrder(byteOrder)
+ return isNativeByteOrder(byteOrder)
? new HeapWritableMemoryImpl(arr, offsetBytes, lengthBytes, typeId)
: new HeapNonNativeWritableMemoryImpl(arr, offsetBytes, lengthBytes, typeId);
}
@@ -84,7 +84,7 @@ abstract class BaseWritableMemoryImpl extends WritableMemory {
throw new ReadOnlyException("ByteBuffer is Read Only");
}
final int typeId = (abb.resourceReadOnly || localReadOnly) ? READONLY : 0;
- return isNativeCpuByteOrder(byteOrder)
+ return isNativeByteOrder(byteOrder)
? new BBWritableMemoryImpl(abb.unsafeObj, abb.nativeBaseOffset,
abb.regionOffset, abb.capacityBytes, typeId, byteBuf)
: new BBNonNativeWritableMemoryImpl(abb.unsafeObj, abb.nativeBaseOffset,
@@ -102,7 +102,7 @@ abstract class BaseWritableMemoryImpl extends WritableMemory {
throw new ReadOnlyException("File is Read Only");
}
final int typeId = (dirWMap.resourceReadOnly || localReadOnly) ? READONLY : 0;
- final BaseWritableMemoryImpl wmem = isNativeCpuByteOrder(byteOrder)
+ final BaseWritableMemoryImpl wmem = isNativeByteOrder(byteOrder)
? new MapWritableMemoryImpl(dirWMap.nativeBaseOffset, 0L, capacityBytes,
typeId, dirWMap.getValid())
: new MapNonNativeWritableMemoryImpl(dirWMap.nativeBaseOffset, 0L, capacityBytes,
@@ -119,7 +119,7 @@ abstract class BaseWritableMemoryImpl extends WritableMemory {
}
final AllocateDirect direct = new AllocateDirect(capacityBytes);
final int typeId = 0; //direct is never read-only on construction
- final BaseWritableMemoryImpl wmem = isNativeCpuByteOrder(byteOrder)
+ final BaseWritableMemoryImpl wmem = isNativeByteOrder(byteOrder)
? new DirectWritableMemoryImpl(direct.getNativeBaseOffset(), 0L, capacityBytes,
typeId, direct.getValid(), memReqSvr)
: new DirectNonNativeWritableMemoryImpl(direct.getNativeBaseOffset(), 0L, capacityBytes,
diff --git a/src/main/java/org/apache/datasketches/memory/DirectNonNativeWritableBufferImpl.java b/src/main/java/org/apache/datasketches/memory/DirectNonNativeWritableBufferImpl.java
index 7a5f08d..c3801da 100644
--- a/src/main/java/org/apache/datasketches/memory/DirectNonNativeWritableBufferImpl.java
+++ b/src/main/java/org/apache/datasketches/memory/DirectNonNativeWritableBufferImpl.java
@@ -54,7 +54,7 @@ final class DirectNonNativeWritableBufferImpl extends NonNativeWritableBufferImp
BaseWritableBufferImpl toWritableRegion(final long offsetBytes, final long capacityBytes,
final boolean readOnly, final ByteOrder byteOrder) {
final int type = typeId | REGION | (readOnly ? READONLY : 0);
- return isNativeCpuByteOrder(byteOrder)
+ return isNativeByteOrder(byteOrder)
? new DirectWritableBufferImpl(
nativeBaseOffset, getRegionOffset(offsetBytes), capacityBytes,
type, valid, memReqSvr, originMemory)
@@ -66,7 +66,7 @@ final class DirectNonNativeWritableBufferImpl extends NonNativeWritableBufferImp
@Override
BaseWritableBufferImpl toDuplicate(final boolean readOnly, final ByteOrder byteOrder) {
final int type = typeId | DUPLICATE | (readOnly ? READONLY : 0);
- return isNativeCpuByteOrder(byteOrder)
+ return isNativeByteOrder(byteOrder)
? new DirectWritableBufferImpl(
nativeBaseOffset, getRegionOffset(), getCapacity(),
type, valid, memReqSvr, originMemory)
diff --git a/src/main/java/org/apache/datasketches/memory/DirectNonNativeWritableMemoryImpl.java b/src/main/java/org/apache/datasketches/memory/DirectNonNativeWritableMemoryImpl.java
index ca6eb98..6e74efa 100644
--- a/src/main/java/org/apache/datasketches/memory/DirectNonNativeWritableMemoryImpl.java
+++ b/src/main/java/org/apache/datasketches/memory/DirectNonNativeWritableMemoryImpl.java
@@ -52,7 +52,7 @@ final class DirectNonNativeWritableMemoryImpl extends NonNativeWritableMemoryImp
BaseWritableMemoryImpl toWritableRegion(final long offsetBytes, final long capacityBytes,
final boolean readOnly, final ByteOrder byteOrder) {
final int type = typeId | REGION | (readOnly ? READONLY : 0);
- return isNativeCpuByteOrder(byteOrder)
+ return isNativeByteOrder(byteOrder)
? new DirectWritableMemoryImpl(
nativeBaseOffset, getRegionOffset(offsetBytes), capacityBytes,
type, valid, memReqSvr)
@@ -64,7 +64,7 @@ final class DirectNonNativeWritableMemoryImpl extends NonNativeWritableMemoryImp
@Override
BaseWritableBufferImpl toWritableBuffer(final boolean readOnly, final ByteOrder byteOrder) {
final int type = typeId | (readOnly ? READONLY : 0);
- return isNativeCpuByteOrder(byteOrder)
+ return isNativeByteOrder(byteOrder)
? new DirectWritableBufferImpl(
nativeBaseOffset, getRegionOffset(), getCapacity(),
type, valid, memReqSvr, this)
diff --git a/src/main/java/org/apache/datasketches/memory/DirectWritableBufferImpl.java b/src/main/java/org/apache/datasketches/memory/DirectWritableBufferImpl.java
index 9bea6f6..4a222f3 100644
--- a/src/main/java/org/apache/datasketches/memory/DirectWritableBufferImpl.java
+++ b/src/main/java/org/apache/datasketches/memory/DirectWritableBufferImpl.java
@@ -54,7 +54,7 @@ final class DirectWritableBufferImpl extends WritableBufferImpl {
BaseWritableBufferImpl toWritableRegion(final long offsetBytes, final long capacityBytes,
final boolean readOnly, final ByteOrder byteOrder) {
final int type = typeId | REGION | (readOnly ? READONLY : 0);
- return isNativeCpuByteOrder(byteOrder)
+ return isNativeByteOrder(byteOrder)
? new DirectWritableBufferImpl(
nativeBaseOffset, getRegionOffset(offsetBytes), capacityBytes,
type, valid, memReqSvr, originMemory)
@@ -66,7 +66,7 @@ final class DirectWritableBufferImpl extends WritableBufferImpl {
@Override
BaseWritableBufferImpl toDuplicate(final boolean readOnly, final ByteOrder byteOrder) {
final int type = typeId | DUPLICATE | (readOnly ? READONLY : 0);
- return isNativeCpuByteOrder(byteOrder)
+ return isNativeByteOrder(byteOrder)
? new DirectWritableBufferImpl(
nativeBaseOffset, getRegionOffset(), getCapacity(),
type, valid, memReqSvr, originMemory)
diff --git a/src/main/java/org/apache/datasketches/memory/DirectWritableMemoryImpl.java b/src/main/java/org/apache/datasketches/memory/DirectWritableMemoryImpl.java
index 00c1607..4c86746 100644
--- a/src/main/java/org/apache/datasketches/memory/DirectWritableMemoryImpl.java
+++ b/src/main/java/org/apache/datasketches/memory/DirectWritableMemoryImpl.java
@@ -52,7 +52,7 @@ final class DirectWritableMemoryImpl extends WritableMemoryImpl {
BaseWritableMemoryImpl toWritableRegion(final long offsetBytes, final long capacityBytes,
final boolean readOnly, final ByteOrder byteOrder) {
final int type = typeId | REGION | (readOnly ? READONLY : 0);
- return isNativeCpuByteOrder(byteOrder)
+ return isNativeByteOrder(byteOrder)
? new DirectWritableMemoryImpl(
nativeBaseOffset, getRegionOffset(offsetBytes), capacityBytes,
type, valid, memReqSvr)
@@ -64,7 +64,7 @@ final class DirectWritableMemoryImpl extends WritableMemoryImpl {
@Override
BaseWritableBufferImpl toWritableBuffer(final boolean readOnly, final ByteOrder byteOrder) {
final int type = typeId | (readOnly ? READONLY : 0);
- return isNativeCpuByteOrder(byteOrder)
+ return isNativeByteOrder(byteOrder)
? new DirectWritableBufferImpl(
nativeBaseOffset, getRegionOffset(), getCapacity(),
type, valid, memReqSvr, this)
diff --git a/src/main/java/org/apache/datasketches/memory/HeapNonNativeWritableBufferImpl.java b/src/main/java/org/apache/datasketches/memory/HeapNonNativeWritableBufferImpl.java
index 62918b6..9ab8ba7 100644
--- a/src/main/java/org/apache/datasketches/memory/HeapNonNativeWritableBufferImpl.java
+++ b/src/main/java/org/apache/datasketches/memory/HeapNonNativeWritableBufferImpl.java
@@ -47,7 +47,7 @@ final class HeapNonNativeWritableBufferImpl extends NonNativeWritableBufferImpl
BaseWritableBufferImpl toWritableRegion(final long offsetBytes, final long capacityBytes,
final boolean readOnly, final ByteOrder byteOrder) {
final int type = typeId | REGION | (readOnly ? READONLY : 0);
- return isNativeCpuByteOrder(byteOrder)
+ return isNativeByteOrder(byteOrder)
? new HeapWritableBufferImpl(
unsafeObj, getRegionOffset(offsetBytes), capacityBytes,
type, originMemory)
@@ -59,7 +59,7 @@ final class HeapNonNativeWritableBufferImpl extends NonNativeWritableBufferImpl
@Override
BaseWritableBufferImpl toDuplicate(final boolean readOnly, final ByteOrder byteOrder) {
final int type = typeId | DUPLICATE | (readOnly ? READONLY : 0);
- return isNativeCpuByteOrder(byteOrder)
+ return isNativeByteOrder(byteOrder)
? new HeapWritableBufferImpl(
unsafeObj, getRegionOffset(), getCapacity(),
type, originMemory)
diff --git a/src/main/java/org/apache/datasketches/memory/HeapNonNativeWritableMemoryImpl.java b/src/main/java/org/apache/datasketches/memory/HeapNonNativeWritableMemoryImpl.java
index 49b5d54..e9957ca 100644
--- a/src/main/java/org/apache/datasketches/memory/HeapNonNativeWritableMemoryImpl.java
+++ b/src/main/java/org/apache/datasketches/memory/HeapNonNativeWritableMemoryImpl.java
@@ -46,7 +46,7 @@ final class HeapNonNativeWritableMemoryImpl extends NonNativeWritableMemoryImpl
BaseWritableMemoryImpl toWritableRegion(final long offsetBytes, final long capacityBytes,
final boolean readOnly, final ByteOrder byteOrder) {
final int type = typeId | REGION | (readOnly ? READONLY : 0);
- return isNativeCpuByteOrder(byteOrder)
+ return isNativeByteOrder(byteOrder)
? new HeapWritableMemoryImpl(
unsafeObj, getRegionOffset(offsetBytes), capacityBytes,
type)
@@ -58,7 +58,7 @@ final class HeapNonNativeWritableMemoryImpl extends NonNativeWritableMemoryImpl
@Override
BaseWritableBufferImpl toWritableBuffer(final boolean readOnly, final ByteOrder byteOrder) {
final int type = typeId | (readOnly ? READONLY : 0);
- return isNativeCpuByteOrder(byteOrder)
+ return isNativeByteOrder(byteOrder)
? new HeapWritableBufferImpl(
unsafeObj, getRegionOffset(), getCapacity(),
type, this)
diff --git a/src/main/java/org/apache/datasketches/memory/HeapWritableBufferImpl.java b/src/main/java/org/apache/datasketches/memory/HeapWritableBufferImpl.java
index cb21267..17f2fb6 100644
--- a/src/main/java/org/apache/datasketches/memory/HeapWritableBufferImpl.java
+++ b/src/main/java/org/apache/datasketches/memory/HeapWritableBufferImpl.java
@@ -47,7 +47,7 @@ final class HeapWritableBufferImpl extends WritableBufferImpl {
BaseWritableBufferImpl toWritableRegion(final long offsetBytes, final long capacityBytes,
final boolean readOnly, final ByteOrder byteOrder) {
final int type = typeId | REGION | (readOnly ? READONLY : 0);
- return isNativeCpuByteOrder(byteOrder)
+ return isNativeByteOrder(byteOrder)
? new HeapWritableBufferImpl(
unsafeObj, getRegionOffset(offsetBytes), capacityBytes,
type, originMemory)
@@ -59,7 +59,7 @@ final class HeapWritableBufferImpl extends WritableBufferImpl {
@Override
BaseWritableBufferImpl toDuplicate(final boolean readOnly, final ByteOrder byteOrder) {
final int type = typeId | DUPLICATE | (readOnly ? READONLY : 0);
- return isNativeCpuByteOrder(byteOrder)
+ return isNativeByteOrder(byteOrder)
? new HeapWritableBufferImpl(
unsafeObj, getRegionOffset(), getCapacity(),
type, originMemory)
diff --git a/src/main/java/org/apache/datasketches/memory/HeapWritableMemoryImpl.java b/src/main/java/org/apache/datasketches/memory/HeapWritableMemoryImpl.java
index 36a821d..a26abcf 100644
--- a/src/main/java/org/apache/datasketches/memory/HeapWritableMemoryImpl.java
+++ b/src/main/java/org/apache/datasketches/memory/HeapWritableMemoryImpl.java
@@ -46,7 +46,7 @@ final class HeapWritableMemoryImpl extends WritableMemoryImpl {
BaseWritableMemoryImpl toWritableRegion(final long offsetBytes, final long capacityBytes,
final boolean readOnly, final ByteOrder byteOrder) {
final int type = typeId | REGION | (readOnly ? READONLY : 0);
- return isNativeCpuByteOrder(byteOrder)
+ return isNativeByteOrder(byteOrder)
? new HeapWritableMemoryImpl(
unsafeObj, getRegionOffset(offsetBytes), capacityBytes,
type)
@@ -58,7 +58,7 @@ final class HeapWritableMemoryImpl extends WritableMemoryImpl {
@Override
BaseWritableBufferImpl toWritableBuffer(final boolean readOnly, final ByteOrder byteOrder) {
final int type = typeId | (readOnly ? READONLY : 0);
- return isNativeCpuByteOrder(byteOrder)
+ return isNativeByteOrder(byteOrder)
? new HeapWritableBufferImpl(
unsafeObj, getRegionOffset(), getCapacity(),
type, this)
diff --git a/src/main/java/org/apache/datasketches/memory/MapNonNativeWritableBufferImpl.java b/src/main/java/org/apache/datasketches/memory/MapNonNativeWritableBufferImpl.java
index bd67755..354030c 100644
--- a/src/main/java/org/apache/datasketches/memory/MapNonNativeWritableBufferImpl.java
+++ b/src/main/java/org/apache/datasketches/memory/MapNonNativeWritableBufferImpl.java
@@ -50,7 +50,7 @@ final class MapNonNativeWritableBufferImpl extends NonNativeWritableBufferImpl {
BaseWritableBufferImpl toWritableRegion(final long offsetBytes, final long capacityBytes,
final boolean readOnly, final ByteOrder byteOrder) {
final int type = REGION | (readOnly ? READONLY : 0);
- return isNativeCpuByteOrder(byteOrder)
+ return isNativeByteOrder(byteOrder)
? new MapWritableBufferImpl(
nativeBaseOffset, getRegionOffset(offsetBytes), capacityBytes,
type, valid, originMemory)
@@ -62,7 +62,7 @@ final class MapNonNativeWritableBufferImpl extends NonNativeWritableBufferImpl {
@Override
BaseWritableBufferImpl toDuplicate(final boolean readOnly, final ByteOrder byteOrder) {
final int type = DUPLICATE | (readOnly ? READONLY : 0);
- return isNativeCpuByteOrder(byteOrder)
+ return isNativeByteOrder(byteOrder)
? new MapWritableBufferImpl(
nativeBaseOffset, getRegionOffset(), getCapacity(),
type, valid, originMemory)
diff --git a/src/main/java/org/apache/datasketches/memory/MapNonNativeWritableMemoryImpl.java b/src/main/java/org/apache/datasketches/memory/MapNonNativeWritableMemoryImpl.java
index a1ebf89..a7e578f 100644
--- a/src/main/java/org/apache/datasketches/memory/MapNonNativeWritableMemoryImpl.java
+++ b/src/main/java/org/apache/datasketches/memory/MapNonNativeWritableMemoryImpl.java
@@ -49,7 +49,7 @@ final class MapNonNativeWritableMemoryImpl extends NonNativeWritableMemoryImpl {
BaseWritableMemoryImpl toWritableRegion(final long offsetBytes, final long capacityBytes,
final boolean readOnly, final ByteOrder byteOrder) {
final int type = typeId | REGION | (readOnly ? READONLY : 0);
- return isNativeCpuByteOrder(byteOrder)
+ return isNativeByteOrder(byteOrder)
? new MapWritableMemoryImpl(
nativeBaseOffset, getRegionOffset(offsetBytes), capacityBytes,
type, valid)
@@ -61,7 +61,7 @@ final class MapNonNativeWritableMemoryImpl extends NonNativeWritableMemoryImpl {
@Override
BaseWritableBufferImpl toWritableBuffer(final boolean readOnly, final ByteOrder byteOrder) {
final int type = typeId | (readOnly ? READONLY : 0);
- return isNativeCpuByteOrder(byteOrder)
+ return isNativeByteOrder(byteOrder)
? new MapWritableBufferImpl(
nativeBaseOffset, getRegionOffset(), getCapacity(),
type, valid, this)
diff --git a/src/main/java/org/apache/datasketches/memory/MapWritableBufferImpl.java b/src/main/java/org/apache/datasketches/memory/MapWritableBufferImpl.java
index 805fa18..ccf0a74 100644
--- a/src/main/java/org/apache/datasketches/memory/MapWritableBufferImpl.java
+++ b/src/main/java/org/apache/datasketches/memory/MapWritableBufferImpl.java
@@ -50,7 +50,7 @@ final class MapWritableBufferImpl extends WritableBufferImpl {
BaseWritableBufferImpl toWritableRegion(final long offsetBytes, final long capacityBytes,
final boolean readOnly, final ByteOrder byteOrder) {
final int type = typeId | REGION | (readOnly ? READONLY : 0);
- return isNativeCpuByteOrder(byteOrder)
+ return isNativeByteOrder(byteOrder)
? new MapWritableBufferImpl(
nativeBaseOffset, getRegionOffset(offsetBytes), capacityBytes,
type, valid, originMemory)
@@ -62,7 +62,7 @@ final class MapWritableBufferImpl extends WritableBufferImpl {
@Override
BaseWritableBufferImpl toDuplicate(final boolean readOnly, final ByteOrder byteOrder) {
final int type = typeId | DUPLICATE | (readOnly ? READONLY : 0);
- return isNativeCpuByteOrder(byteOrder)
+ return isNativeByteOrder(byteOrder)
? new MapWritableBufferImpl(
nativeBaseOffset, getRegionOffset(), getCapacity(),
type, valid, originMemory)
diff --git a/src/main/java/org/apache/datasketches/memory/MapWritableMemoryImpl.java b/src/main/java/org/apache/datasketches/memory/MapWritableMemoryImpl.java
index c099435..fdcbe9b 100644
--- a/src/main/java/org/apache/datasketches/memory/MapWritableMemoryImpl.java
+++ b/src/main/java/org/apache/datasketches/memory/MapWritableMemoryImpl.java
@@ -49,7 +49,7 @@ final class MapWritableMemoryImpl extends WritableMemoryImpl {
BaseWritableMemoryImpl toWritableRegion(final long offsetBytes, final long capacityBytes,
final boolean readOnly, final ByteOrder byteOrder) {
final int type = typeId | REGION | (readOnly ? READONLY : 0);
- return isNativeCpuByteOrder(byteOrder)
+ return isNativeByteOrder(byteOrder)
? new MapWritableMemoryImpl(
nativeBaseOffset, getRegionOffset(offsetBytes), capacityBytes,
type, valid)
@@ -61,7 +61,7 @@ final class MapWritableMemoryImpl extends WritableMemoryImpl {
@Override
BaseWritableBufferImpl toWritableBuffer(final boolean readOnly, final ByteOrder byteOrder) {
final int type = typeId | (readOnly ? READONLY : 0);
- return isNativeCpuByteOrder(byteOrder)
+ return isNativeByteOrder(byteOrder)
? new MapWritableBufferImpl(
nativeBaseOffset, getRegionOffset(), getCapacity(),
type, valid, this)
diff --git a/src/main/java/org/apache/datasketches/memory/Memory.java b/src/main/java/org/apache/datasketches/memory/Memory.java
index 670ffcc..3af3631 100644
--- a/src/main/java/org/apache/datasketches/memory/Memory.java
+++ b/src/main/java/org/apache/datasketches/memory/Memory.java
@@ -227,7 +227,7 @@ public abstract class Memory extends BaseState {
public static Memory wrap(final boolean[] arr) {
final long lengthBytes = arr.length << Prim.BOOLEAN.shift();
return BaseWritableMemoryImpl.wrapHeapArray(arr, 0L, lengthBytes, true,
- BaseState.nativeCpuByteOrder);
+ BaseState.nativeByteOrder);
}
/**
@@ -241,7 +241,7 @@ public abstract class Memory extends BaseState {
* @return a new <i>Memory</i> for read operations
*/
public static Memory wrap(final byte[] arr) {
- return Memory.wrap(arr, 0, arr.length, BaseState.nativeCpuByteOrder);
+ return Memory.wrap(arr, 0, arr.length, BaseState.nativeByteOrder);
}
/**
@@ -289,7 +289,7 @@ public abstract class Memory extends BaseState {
*/
public static Memory wrap(final char[] arr) {
final long lengthBytes = arr.length << Prim.CHAR.shift();
- return BaseWritableMemoryImpl.wrapHeapArray(arr, 0L, lengthBytes, true, BaseState.nativeCpuByteOrder);
+ return BaseWritableMemoryImpl.wrapHeapArray(arr, 0L, lengthBytes, true, BaseState.nativeByteOrder);
}
/**
@@ -303,7 +303,7 @@ public abstract class Memory extends BaseState {
*/
public static Memory wrap(final short[] arr) {
final long lengthBytes = arr.length << Prim.SHORT.shift();
- return BaseWritableMemoryImpl.wrapHeapArray(arr, 0L, lengthBytes, true, BaseState.nativeCpuByteOrder);
+ return BaseWritableMemoryImpl.wrapHeapArray(arr, 0L, lengthBytes, true, BaseState.nativeByteOrder);
}
/**
@@ -317,7 +317,7 @@ public abstract class Memory extends BaseState {
*/
public static Memory wrap(final int[] arr) {
final long lengthBytes = arr.length << Prim.INT.shift();
- return BaseWritableMemoryImpl.wrapHeapArray(arr, 0L, lengthBytes, true, BaseState.nativeCpuByteOrder);
+ return BaseWritableMemoryImpl.wrapHeapArray(arr, 0L, lengthBytes, true, BaseState.nativeByteOrder);
}
/**
@@ -332,7 +332,7 @@ public abstract class Memory extends BaseState {
*/
public static Memory wrap(final long[] arr) {
final long lengthBytes = arr.length << Prim.LONG.shift();
- return BaseWritableMemoryImpl.wrapHeapArray(arr, 0L, lengthBytes, true, BaseState.nativeCpuByteOrder);
+ return BaseWritableMemoryImpl.wrapHeapArray(arr, 0L, lengthBytes, true, BaseState.nativeByteOrder);
}
/**
@@ -347,7 +347,7 @@ public abstract class Memory extends BaseState {
*/
public static Memory wrap(final float[] arr) {
final long lengthBytes = arr.length << Prim.FLOAT.shift();
- return BaseWritableMemoryImpl.wrapHeapArray(arr, 0L, lengthBytes, true, BaseState.nativeCpuByteOrder);
+ return BaseWritableMemoryImpl.wrapHeapArray(arr, 0L, lengthBytes, true, BaseState.nativeByteOrder);
}
/**
@@ -362,7 +362,7 @@ public abstract class Memory extends BaseState {
*/
public static Memory wrap(final double[] arr) {
final long lengthBytes = arr.length << Prim.DOUBLE.shift();
- return BaseWritableMemoryImpl.wrapHeapArray(arr, 0L, lengthBytes, true, BaseState.nativeCpuByteOrder);
+ return BaseWritableMemoryImpl.wrapHeapArray(arr, 0L, lengthBytes, true, BaseState.nativeByteOrder);
}
//PRIMITIVE getX() and getXArray()
diff --git a/src/main/java/org/apache/datasketches/memory/WritableMemory.java b/src/main/java/org/apache/datasketches/memory/WritableMemory.java
index de1201c..39eaef7 100644
--- a/src/main/java/org/apache/datasketches/memory/WritableMemory.java
+++ b/src/main/java/org/apache/datasketches/memory/WritableMemory.java
@@ -90,7 +90,7 @@ public abstract class WritableMemory extends Memory {
* @throws IOException file not found or a RuntimeException.
*/
public static WritableMapHandle map(final File file) throws IOException {
- return map(file, 0, file.length(), BaseState.nativeCpuByteOrder);
+ return map(file, 0, file.length(), BaseState.nativeByteOrder);
}
/**
@@ -157,7 +157,7 @@ public abstract class WritableMemory extends Memory {
*/
public static WritableDirectHandle allocateDirect(final long capacityBytes,
final MemoryRequestServer memReqSvr) {
- return BaseWritableMemoryImpl.wrapDirect(capacityBytes, BaseState.nativeCpuByteOrder, memReqSvr);
+ return BaseWritableMemoryImpl.wrapDirect(capacityBytes, BaseState.nativeByteOrder, memReqSvr);
}
//REGIONS
@@ -243,7 +243,7 @@ public abstract class WritableMemory extends Memory {
*/
public static WritableMemory allocate(final int capacityBytes) {
final byte[] arr = new byte[capacityBytes];
- return wrap(arr, BaseState.nativeCpuByteOrder);
+ return wrap(arr, BaseState.nativeByteOrder);
}
/**
@@ -272,7 +272,7 @@ public abstract class WritableMemory extends Memory {
*/
public static WritableMemory wrap(final boolean[] arr) {
final long lengthBytes = arr.length << Prim.BOOLEAN.shift();
- return BaseWritableMemoryImpl.wrapHeapArray(arr, 0L, lengthBytes, false, BaseState.nativeCpuByteOrder);
+ return BaseWritableMemoryImpl.wrapHeapArray(arr, 0L, lengthBytes, false, BaseState.nativeByteOrder);
}
/**
@@ -286,7 +286,7 @@ public abstract class WritableMemory extends Memory {
* @return a new WritableMemory for write operations on the given primitive array.
*/
public static WritableMemory wrap(final byte[] arr) {
- return WritableMemory.wrap(arr, 0, arr.length, BaseState.nativeCpuByteOrder);
+ return WritableMemory.wrap(arr, 0, arr.length, BaseState.nativeByteOrder);
}
/**
@@ -335,7 +335,7 @@ public abstract class WritableMemory extends Memory {
*/
public static WritableMemory wrap(final char[] arr) {
final long lengthBytes = arr.length << Prim.CHAR.shift();
- return BaseWritableMemoryImpl.wrapHeapArray(arr, 0L, lengthBytes, false, BaseState.nativeCpuByteOrder);
+ return BaseWritableMemoryImpl.wrapHeapArray(arr, 0L, lengthBytes, false, BaseState.nativeByteOrder);
}
/**
@@ -350,7 +350,7 @@ public abstract class WritableMemory extends Memory {
*/
public static WritableMemory wrap(final short[] arr) {
final long lengthBytes = arr.length << Prim.SHORT.shift();
- return BaseWritableMemoryImpl.wrapHeapArray(arr, 0L, lengthBytes, false, BaseState.nativeCpuByteOrder);
+ return BaseWritableMemoryImpl.wrapHeapArray(arr, 0L, lengthBytes, false, BaseState.nativeByteOrder);
}
/**
@@ -365,7 +365,7 @@ public abstract class WritableMemory extends Memory {
*/
public static WritableMemory wrap(final int[] arr) {
final long lengthBytes = arr.length << Prim.INT.shift();
- return BaseWritableMemoryImpl.wrapHeapArray(arr, 0L, lengthBytes, false, BaseState.nativeCpuByteOrder);
+ return BaseWritableMemoryImpl.wrapHeapArray(arr, 0L, lengthBytes, false, BaseState.nativeByteOrder);
}
/**
@@ -380,7 +380,7 @@ public abstract class WritableMemory extends Memory {
*/
public static WritableMemory wrap(final long[] arr) {
final long lengthBytes = arr.length << Prim.LONG.shift();
- return BaseWritableMemoryImpl.wrapHeapArray(arr, 0L, lengthBytes, false, BaseState.nativeCpuByteOrder);
+ return BaseWritableMemoryImpl.wrapHeapArray(arr, 0L, lengthBytes, false, BaseState.nativeByteOrder);
}
/**
@@ -395,7 +395,7 @@ public abstract class WritableMemory extends Memory {
*/
public static WritableMemory wrap(final float[] arr) {
final long lengthBytes = arr.length << Prim.FLOAT.shift();
- return BaseWritableMemoryImpl.wrapHeapArray(arr, 0L, lengthBytes, false, BaseState.nativeCpuByteOrder);
+ return BaseWritableMemoryImpl.wrapHeapArray(arr, 0L, lengthBytes, false, BaseState.nativeByteOrder);
}
/**
@@ -410,7 +410,7 @@ public abstract class WritableMemory extends Memory {
*/
public static WritableMemory wrap(final double[] arr) {
final long lengthBytes = arr.length << Prim.DOUBLE.shift();
- return BaseWritableMemoryImpl.wrapHeapArray(arr, 0L, lengthBytes, false, BaseState.nativeCpuByteOrder);
+ return BaseWritableMemoryImpl.wrapHeapArray(arr, 0L, lengthBytes, false, BaseState.nativeByteOrder);
}
//END OF CONSTRUCTOR-TYPE METHODS
diff --git a/src/test/java/org/apache/datasketches/memory/AllocateDirectMemoryTest.java b/src/test/java/org/apache/datasketches/memory/AllocateDirectMemoryTest.java
index cb8b503..58589b4 100644
--- a/src/test/java/org/apache/datasketches/memory/AllocateDirectMemoryTest.java
+++ b/src/test/java/org/apache/datasketches/memory/AllocateDirectMemoryTest.java
@@ -89,7 +89,7 @@ public class AllocateDirectMemoryTest {
@Test
public void checkNonNativeDirect() { //not allowed in public API
try (WritableDirectHandle h =
- BaseWritableMemoryImpl.wrapDirect(8, BaseState.nonNativeCpuByteOrder, null)) {
+ BaseWritableMemoryImpl.wrapDirect(8, BaseState.nonNativeByteOrder, null)) {
WritableMemory wmem = h.get();
wmem.putChar(0, (char) 1);
assertEquals(wmem.getByte(1), (byte) 1);
diff --git a/src/test/java/org/apache/datasketches/memory/AllocateDirectWritableMapMemoryTest.java b/src/test/java/org/apache/datasketches/memory/AllocateDirectWritableMapMemoryTest.java
index 576a829..b42a592 100644
--- a/src/test/java/org/apache/datasketches/memory/AllocateDirectWritableMapMemoryTest.java
+++ b/src/test/java/org/apache/datasketches/memory/AllocateDirectWritableMapMemoryTest.java
@@ -117,7 +117,7 @@ public class AllocateDirectWritableMapMemoryTest {
file.deleteOnExit(); //comment out if you want to examine the file.
final long bytes = 8;
- try (WritableMapHandle h = WritableMemory.map(file, 0L, bytes, BaseState.nonNativeCpuByteOrder)) {
+ try (WritableMapHandle h = WritableMemory.map(file, 0L, bytes, BaseState.nonNativeByteOrder)) {
WritableMemory wmem = h.get();
wmem.putChar(0, (char) 1);
assertEquals(wmem.getByte(1), (byte) 1);
diff --git a/src/test/java/org/apache/datasketches/memory/BaseStateTest.java b/src/test/java/org/apache/datasketches/memory/BaseStateTest.java
index 27af71d..76c6000 100644
--- a/src/test/java/org/apache/datasketches/memory/BaseStateTest.java
+++ b/src/test/java/org/apache/datasketches/memory/BaseStateTest.java
@@ -94,7 +94,7 @@ public class BaseStateTest {
@Test(expectedExceptions = IllegalArgumentException.class)
public void checkByteOrderNull() {
- BaseState.isNativeCpuByteOrder(null);
+ BaseState.isNativeByteOrder(null);
fail();
}
diff --git a/src/test/java/org/apache/datasketches/memory/LeafImplTest.java b/src/test/java/org/apache/datasketches/memory/LeafImplTest.java
index f9c5eda..2e4449b 100644
--- a/src/test/java/org/apache/datasketches/memory/LeafImplTest.java
+++ b/src/test/java/org/apache/datasketches/memory/LeafImplTest.java
@@ -58,7 +58,7 @@ public class LeafImplTest {
assertEquals(mem.asWritableBuffer(BE).getShort(0), 256);
assertTrue(mem.getByteBuffer() == null);
- assertTrue(mem.getTypeByteOrder() == BaseState.nativeCpuByteOrder);
+ assertTrue(mem.getTypeByteOrder() == BaseState.nativeByteOrder);
assertTrue(mem.getMemoryRequestServer() != null);
assertTrue(mem.isDirect());
assertTrue(mem.getUnsafeObject() == null);
@@ -72,13 +72,13 @@ public class LeafImplTest {
assertEquals(buf.writableDuplicate(BE).getShort(0), 256);
assertTrue(buf.getByteBuffer() == null);
- assertTrue(buf.getTypeByteOrder() == BaseState.nativeCpuByteOrder);
+ assertTrue(buf.getTypeByteOrder() == BaseState.nativeByteOrder);
assertTrue(buf.getMemoryRequestServer() != null);
assertTrue(buf.isDirect());
assertTrue(buf.getUnsafeObject() == null);
assertTrue(buf.isValid() == true);
- WritableMemory nnMem = mem.writableRegion(off, cap, BaseState.nonNativeCpuByteOrder);
+ WritableMemory nnMem = mem.writableRegion(off, cap, BaseState.nonNativeByteOrder);
assertEquals(nnMem.writableRegion(off, cap, LE).getShort(0), 1);
assertEquals(nnMem.writableRegion(off, cap, BE).getShort(0), 256);
@@ -86,13 +86,13 @@ public class LeafImplTest {
assertEquals(nnMem.asWritableBuffer(BE).getShort(0), 256);
assertTrue(nnMem.getByteBuffer() == null);
- assertTrue(nnMem.getTypeByteOrder() == BaseState.nonNativeCpuByteOrder);
+ assertTrue(nnMem.getTypeByteOrder() == BaseState.nonNativeByteOrder);
assertTrue(nnMem.getMemoryRequestServer() != null);
assertTrue(nnMem.isDirect());
assertTrue(nnMem.getUnsafeObject() == null);
assertTrue(nnMem.isValid() == true);
- WritableBuffer nnBuf = mem.asWritableBuffer(BaseState.nonNativeCpuByteOrder);
+ WritableBuffer nnBuf = mem.asWritableBuffer(BaseState.nonNativeByteOrder);
assertEquals(nnBuf.writableRegion(off, cap, LE).getShort(0), 1);
assertEquals(nnBuf.writableRegion(off, cap, BE).getShort(0), 256);
@@ -100,7 +100,7 @@ public class LeafImplTest {
assertEquals(nnBuf.writableDuplicate(BE).getShort(0), 256);
assertTrue(nnBuf.getByteBuffer() == null);
- assertTrue(nnBuf.getTypeByteOrder() == BaseState.nonNativeCpuByteOrder);
+ assertTrue(nnBuf.getTypeByteOrder() == BaseState.nonNativeByteOrder);
assertTrue(nnBuf.getMemoryRequestServer() != null);
assertTrue(nnBuf.isDirect());
assertTrue(nnBuf.getUnsafeObject() == null);
@@ -124,7 +124,7 @@ public class LeafImplTest {
assertTrue(file.isFile());
file.deleteOnExit(); //comment out if you want to examine the file.
- try (WritableMapHandle wmh = WritableMemory.map(file, off, cap, BaseState.nativeCpuByteOrder)) {
+ try (WritableMapHandle wmh = WritableMemory.map(file, off, cap, BaseState.nativeByteOrder)) {
WritableMemory mem = wmh.get();
mem.putShort(0, (short) 1);
assertEquals(mem.getByte(0), (byte) 1);
@@ -139,7 +139,7 @@ public class LeafImplTest {
assertEquals(mem.asWritableBuffer(BE).getShort(0), 256);
assertTrue(mem.getByteBuffer() == null);
- assertTrue(mem.getTypeByteOrder() == BaseState.nativeCpuByteOrder);
+ assertTrue(mem.getTypeByteOrder() == BaseState.nativeByteOrder);
assertTrue(mem.getMemoryRequestServer() == null);
assertTrue(mem.isDirect());
assertTrue(mem.getUnsafeObject() == null);
@@ -153,13 +153,13 @@ public class LeafImplTest {
assertEquals(buf.writableDuplicate(BE).getShort(0), 256);
assertTrue(buf.getByteBuffer() == null);
- assertTrue(buf.getTypeByteOrder() == BaseState.nativeCpuByteOrder);
+ assertTrue(buf.getTypeByteOrder() == BaseState.nativeByteOrder);
assertTrue(buf.getMemoryRequestServer() == null);
assertTrue(buf.isDirect());
assertTrue(buf.getUnsafeObject() == null);
assertTrue(buf.isValid() == true);
- WritableMemory nnMem = mem.writableRegion(off, cap, BaseState.nonNativeCpuByteOrder);
+ WritableMemory nnMem = mem.writableRegion(off, cap, BaseState.nonNativeByteOrder);
assertEquals(nnMem.writableRegion(off, cap, LE).getShort(0), 1);
assertEquals(nnMem.writableRegion(off, cap, BE).getShort(0), 256);
@@ -167,13 +167,13 @@ public class LeafImplTest {
assertEquals(nnMem.asWritableBuffer(BE).getShort(0), 256);
assertTrue(nnMem.getByteBuffer() == null);
- assertTrue(nnMem.getTypeByteOrder() == BaseState.nonNativeCpuByteOrder);
+ assertTrue(nnMem.getTypeByteOrder() == BaseState.nonNativeByteOrder);
assertTrue(nnMem.getMemoryRequestServer() == null);
assertTrue(nnMem.isDirect());
assertTrue(nnMem.getUnsafeObject() == null);
assertTrue(nnMem.isValid() == true);
- WritableBuffer nnBuf = mem.asWritableBuffer(BaseState.nonNativeCpuByteOrder);
+ WritableBuffer nnBuf = mem.asWritableBuffer(BaseState.nonNativeByteOrder);
assertEquals(nnBuf.writableRegion(off, cap, LE).getShort(0), 1);
assertEquals(nnBuf.writableRegion(off, cap, BE).getShort(0), 256);
@@ -181,7 +181,7 @@ public class LeafImplTest {
assertEquals(nnBuf.writableDuplicate(BE).getShort(0), 256);
assertTrue(nnBuf.getByteBuffer() == null);
- assertTrue(nnBuf.getTypeByteOrder() == BaseState.nonNativeCpuByteOrder);
+ assertTrue(nnBuf.getTypeByteOrder() == BaseState.nonNativeByteOrder);
assertTrue(nnBuf.getMemoryRequestServer() == null);
assertTrue(nnBuf.isDirect());
assertTrue(nnBuf.getUnsafeObject() == null);
@@ -212,7 +212,7 @@ public class LeafImplTest {
assertEquals(mem.asWritableBuffer(BE).getShort(0), 256);
assertTrue(mem.getByteBuffer() != null);
- assertTrue(mem.getTypeByteOrder() == BaseState.nativeCpuByteOrder);
+ assertTrue(mem.getTypeByteOrder() == BaseState.nativeByteOrder);
assertTrue(mem.getMemoryRequestServer() == null);
Object obj = mem.getUnsafeObject();
if (direct) {
@@ -232,7 +232,7 @@ public class LeafImplTest {
assertEquals(buf.writableDuplicate(BE).getShort(0), 256);
assertTrue(buf.getByteBuffer() != null);
- assertTrue(buf.getTypeByteOrder() == BaseState.nativeCpuByteOrder);
+ assertTrue(buf.getTypeByteOrder() == BaseState.nativeByteOrder);
assertTrue(buf.getMemoryRequestServer() == null);
obj = buf.getUnsafeObject();
if (direct) {
@@ -244,7 +244,7 @@ public class LeafImplTest {
}
assertTrue(buf.isValid() == true);
- WritableMemory nnMem = mem.writableRegion(off, cap, BaseState.nonNativeCpuByteOrder);
+ WritableMemory nnMem = mem.writableRegion(off, cap, BaseState.nonNativeByteOrder);
assertEquals(nnMem.writableRegion(off, cap, LE).getShort(0), 1);
assertEquals(nnMem.writableRegion(off, cap, BE).getShort(0), 256);
@@ -252,7 +252,7 @@ public class LeafImplTest {
assertEquals(nnMem.asWritableBuffer(BE).getShort(0), 256);
assertTrue(nnMem.getByteBuffer() != null);
- assertTrue(nnMem.getTypeByteOrder() == BaseState.nonNativeCpuByteOrder);
+ assertTrue(nnMem.getTypeByteOrder() == BaseState.nonNativeByteOrder);
assertTrue(nnMem.getMemoryRequestServer() == null);
obj = nnMem.getUnsafeObject();
if (direct) {
@@ -264,7 +264,7 @@ public class LeafImplTest {
}
assertTrue(nnMem.isValid() == true);
- WritableBuffer nnBuf = mem.asWritableBuffer(BaseState.nonNativeCpuByteOrder);
+ WritableBuffer nnBuf = mem.asWritableBuffer(BaseState.nonNativeByteOrder);
assertEquals(nnBuf.writableRegion(off, cap, LE).getShort(0), 1);
assertEquals(nnBuf.writableRegion(off, cap, BE).getShort(0), 256);
@@ -272,7 +272,7 @@ public class LeafImplTest {
assertEquals(nnBuf.writableDuplicate(BE).getShort(0), 256);
assertTrue(nnBuf.getByteBuffer() != null);
- assertTrue(nnBuf.getTypeByteOrder() == BaseState.nonNativeCpuByteOrder);
+ assertTrue(nnBuf.getTypeByteOrder() == BaseState.nonNativeByteOrder);
assertTrue(nnBuf.getMemoryRequestServer() == null);
obj = nnBuf.getUnsafeObject();
if (direct) {
@@ -301,7 +301,7 @@ public class LeafImplTest {
assertEquals(mem.asWritableBuffer(BE).getShort(0), 256);
assertTrue(mem.getByteBuffer() == null);
- assertTrue(mem.getTypeByteOrder() == BaseState.nativeCpuByteOrder);
+ assertTrue(mem.getTypeByteOrder() == BaseState.nativeByteOrder);
assertTrue(mem.getMemoryRequestServer() == null);
assertFalse(mem.isDirect());
assertTrue(mem.getUnsafeObject() != null);
@@ -315,13 +315,13 @@ public class LeafImplTest {
assertEquals(buf.writableDuplicate(BE).getShort(0), 256);
assertTrue(buf.getByteBuffer() == null);
- assertTrue(buf.getTypeByteOrder() == BaseState.nativeCpuByteOrder);
+ assertTrue(buf.getTypeByteOrder() == BaseState.nativeByteOrder);
assertTrue(buf.getMemoryRequestServer() == null);
assertFalse(buf.isDirect());
assertTrue(buf.getUnsafeObject() != null);
assertTrue(buf.isValid() == true);
- WritableMemory nnMem = mem.writableRegion(off, cap, BaseState.nonNativeCpuByteOrder);
+ WritableMemory nnMem = mem.writableRegion(off, cap, BaseState.nonNativeByteOrder);
assertEquals(nnMem.writableRegion(off, cap, LE).getShort(0), 1);
assertEquals(nnMem.writableRegion(off, cap, BE).getShort(0), 256);
@@ -329,13 +329,13 @@ public class LeafImplTest {
assertEquals(nnMem.asWritableBuffer(BE).getShort(0), 256);
assertTrue(nnMem.getByteBuffer() == null);
- assertTrue(nnMem.getTypeByteOrder() == BaseState.nonNativeCpuByteOrder);
+ assertTrue(nnMem.getTypeByteOrder() == BaseState.nonNativeByteOrder);
assertTrue(nnMem.getMemoryRequestServer() == null);
assertFalse(nnMem.isDirect());
assertTrue(nnMem.getUnsafeObject() != null);
assertTrue(nnMem.isValid() == true);
- WritableBuffer nnBuf = mem.asWritableBuffer(BaseState.nonNativeCpuByteOrder);
+ WritableBuffer nnBuf = mem.asWritableBuffer(BaseState.nonNativeByteOrder);
assertEquals(nnBuf.writableRegion(off, cap, LE).getShort(0), 1);
assertEquals(nnBuf.writableRegion(off, cap, BE).getShort(0), 256);
@@ -343,7 +343,7 @@ public class LeafImplTest {
assertEquals(nnBuf.writableDuplicate(BE).getShort(0), 256);
assertTrue(nnBuf.getByteBuffer() == null);
- assertTrue(nnBuf.getTypeByteOrder() == BaseState.nonNativeCpuByteOrder);
+ assertTrue(nnBuf.getTypeByteOrder() == BaseState.nonNativeByteOrder);
assertTrue(nnBuf.getMemoryRequestServer() == null);
assertFalse(nnBuf.isDirect());
assertTrue(nnBuf.getUnsafeObject() != null);
diff --git a/src/test/java/org/apache/datasketches/memory/MemoryTest.java b/src/test/java/org/apache/datasketches/memory/MemoryTest.java
index dd9d894..14df7af 100644
--- a/src/test/java/org/apache/datasketches/memory/MemoryTest.java
+++ b/src/test/java/org/apache/datasketches/memory/MemoryTest.java
@@ -199,7 +199,7 @@ public class MemoryTest {
ByteBuffer bb = ByteBuffer.allocate(n * 8);
bb.order(ByteOrder.BIG_ENDIAN);
Memory mem = Memory.wrap(bb);
- assertFalse(mem.getTypeByteOrder() == BaseState.nativeCpuByteOrder);
+ assertFalse(mem.getTypeByteOrder() == BaseState.nativeByteOrder);
assertEquals(mem.getTypeByteOrder(), ByteOrder.BIG_ENDIAN);
}
@@ -255,7 +255,7 @@ public class MemoryTest {
long[] arr = new long[n];
for (int i = 0; i < n; i++) { arr[i] = i; }
Memory mem = Memory.wrap(arr);
- Memory reg = mem.region(n2 * 8, n2 * 8, BaseState.nonNativeCpuByteOrder); //top half
+ Memory reg = mem.region(n2 * 8, n2 * 8, BaseState.nonNativeByteOrder); //top half
for (int i = 0; i < n2; i++) {
long v = Long.reverseBytes(reg.getLong(i * 8));
long e = i + n2;
@@ -295,7 +295,7 @@ public class MemoryTest {
//println("" + wmem.getLong(i * 8));
}
//println("");
- WritableMemory reg = wmem.writableRegion(n2 * 8, n2 * 8, BaseState.nonNativeCpuByteOrder);
+ WritableMemory reg = wmem.writableRegion(n2 * 8, n2 * 8, BaseState.nonNativeByteOrder);
for (int i = 0; i < n2; i++) { reg.putLong(i * 8, i); }
for (int i = 0; i < n; i++) {
long v = wmem.getLong(i * 8);
diff --git a/src/test/java/org/apache/datasketches/memory/SpecificLeafTest.java b/src/test/java/org/apache/datasketches/memory/SpecificLeafTest.java
index 4210e59..f7421e5 100644
--- a/src/test/java/org/apache/datasketches/memory/SpecificLeafTest.java
+++ b/src/test/java/org/apache/datasketches/memory/SpecificLeafTest.java
@@ -39,17 +39,17 @@ public class SpecificLeafTest {
public void checkByteBufferLeafs() {
int bytes = 128;
ByteBuffer bb = ByteBuffer.allocate(bytes);
- bb.order(BaseState.nativeCpuByteOrder);
+ bb.order(BaseState.nativeByteOrder);
- Memory mem = Memory.wrap(bb).region(0, bytes, BaseState.nativeCpuByteOrder);
+ Memory mem = Memory.wrap(bb).region(0, bytes, BaseState.nativeByteOrder);
assertTrue(mem.isBBType());
assertTrue(mem.isReadOnly());
checkCrossLeafTypeIds(mem);
- Buffer buf = mem.asBuffer().region(0, bytes, BaseState.nativeCpuByteOrder);
+ Buffer buf = mem.asBuffer().region(0, bytes, BaseState.nativeByteOrder);
- bb.order(BaseState.nonNativeCpuByteOrder);
- Memory mem2 = Memory.wrap(bb).region(0, bytes, BaseState.nonNativeCpuByteOrder);
- Buffer buf2 = mem2.asBuffer().region(0, bytes, BaseState.nonNativeCpuByteOrder);
+ bb.order(BaseState.nonNativeByteOrder);
+ Memory mem2 = Memory.wrap(bb).region(0, bytes, BaseState.nonNativeByteOrder);
+ Buffer buf2 = mem2.asBuffer().region(0, bytes, BaseState.nonNativeByteOrder);
Buffer buf3 = buf2.duplicate();
assertTrue((mem.getTypeId() & REGION) > 0);
@@ -67,14 +67,14 @@ public class SpecificLeafTest {
assertTrue(wmem.isDirectType());
assertFalse(wmem.isReadOnly());
checkCrossLeafTypeIds(wmem);
- WritableMemory nnwmem = wmem.writableRegion(0, bytes, BaseState.nonNativeCpuByteOrder);
+ WritableMemory nnwmem = wmem.writableRegion(0, bytes, BaseState.nonNativeByteOrder);
- Memory mem = wmem.region(0, bytes, BaseState.nativeCpuByteOrder);
- Buffer buf = mem.asBuffer().region(0, bytes, BaseState.nativeCpuByteOrder);
+ Memory mem = wmem.region(0, bytes, BaseState.nativeByteOrder);
+ Buffer buf = mem.asBuffer().region(0, bytes, BaseState.nativeByteOrder);
- Memory mem2 = nnwmem.region(0, bytes, BaseState.nonNativeCpuByteOrder);
- Buffer buf2 = mem2.asBuffer().region(0, bytes, BaseState.nonNativeCpuByteOrder);
+ Memory mem2 = nnwmem.region(0, bytes, BaseState.nonNativeByteOrder);
+ Buffer buf2 = mem2.asBuffer().region(0, bytes, BaseState.nonNativeByteOrder);
Buffer buf3 = buf2.duplicate();
assertTrue((mem.getTypeId() & REGION) > 0);
@@ -102,19 +102,19 @@ public class SpecificLeafTest {
final long bytes = 128;
- try (WritableMapHandle h = WritableMemory.map(file, 0L, bytes, BaseState.nativeCpuByteOrder)) {
+ try (WritableMapHandle h = WritableMemory.map(file, 0L, bytes, BaseState.nativeByteOrder)) {
WritableMemory mem = h.get(); //native mem
assertTrue(mem.isMapType());
assertFalse(mem.isReadOnly());
checkCrossLeafTypeIds(mem);
- Memory nnreg = mem.region(0, bytes, BaseState.nonNativeCpuByteOrder);
+ Memory nnreg = mem.region(0, bytes, BaseState.nonNativeByteOrder);
- Memory reg = mem.region(0, bytes, BaseState.nativeCpuByteOrder);
- Buffer buf = reg.asBuffer().region(0, bytes, BaseState.nativeCpuByteOrder);
+ Memory reg = mem.region(0, bytes, BaseState.nativeByteOrder);
+ Buffer buf = reg.asBuffer().region(0, bytes, BaseState.nativeByteOrder);
Buffer buf4 = buf.duplicate();
- Memory reg2 = nnreg.region(0, bytes, BaseState.nonNativeCpuByteOrder);
- Buffer buf2 = reg2.asBuffer().region(0, bytes, BaseState.nonNativeCpuByteOrder);
+ Memory reg2 = nnreg.region(0, bytes, BaseState.nonNativeByteOrder);
+ Buffer buf2 = reg2.asBuffer().region(0, bytes, BaseState.nonNativeByteOrder);
Buffer buf3 = buf2.duplicate();
assertTrue((reg.getTypeId() & REGION) > 0);
@@ -133,14 +133,14 @@ public class SpecificLeafTest {
assertTrue(mem.isHeapType());
assertTrue(mem.isReadOnlyType());
checkCrossLeafTypeIds(mem);
- Memory nnreg = mem.region(0, bytes, BaseState.nonNativeCpuByteOrder);
+ Memory nnreg = mem.region(0, bytes, BaseState.nonNativeByteOrder);
- Memory reg = mem.region(0, bytes, BaseState.nativeCpuByteOrder);
- Buffer buf = reg.asBuffer().region(0, bytes, BaseState.nativeCpuByteOrder);
+ Memory reg = mem.region(0, bytes, BaseState.nativeByteOrder);
+ Buffer buf = reg.asBuffer().region(0, bytes, BaseState.nativeByteOrder);
Buffer buf4 = buf.duplicate();
- Memory reg2 = nnreg.region(0, bytes, BaseState.nonNativeCpuByteOrder);
- Buffer buf2 = reg2.asBuffer().region(0, bytes, BaseState.nonNativeCpuByteOrder);
+ Memory reg2 = nnreg.region(0, bytes, BaseState.nonNativeByteOrder);
+ Buffer buf2 = reg2.asBuffer().region(0, bytes, BaseState.nonNativeByteOrder);
Buffer buf3 = buf2.duplicate();
assertFalse((mem.getTypeId() & REGION) > 0);
@@ -169,7 +169,7 @@ public class SpecificLeafTest {
assertFalse(mem2.isBufferType());
assertFalse(mem2.isDuplicateType());
- Buffer buf3 = buf1.duplicate(BaseState.nonNativeCpuByteOrder);
+ Buffer buf3 = buf1.duplicate(BaseState.nonNativeByteOrder);
assertTrue(buf3.isRegionType());
assertTrue(buf3.isBufferType());
assertTrue(buf3.isDuplicateType());
diff --git a/src/test/java/org/apache/datasketches/memory/WritableBufferImplTest.java b/src/test/java/org/apache/datasketches/memory/WritableBufferImplTest.java
index abb615c..5ee85ca 100644
--- a/src/test/java/org/apache/datasketches/memory/WritableBufferImplTest.java
+++ b/src/test/java/org/apache/datasketches/memory/WritableBufferImplTest.java
@@ -574,7 +574,7 @@ public class WritableBufferImplTest {
public void checkDuplicateNonNative() {
WritableMemory wmem = WritableMemory.allocate(64);
wmem.putShort(0, (short) 1);
- Buffer buf = wmem.asWritableBuffer().duplicate(BaseState.nonNativeCpuByteOrder);
+ Buffer buf = wmem.asWritableBuffer().duplicate(BaseState.nonNativeByteOrder);
assertEquals(buf.getShort(0), 256);
}
diff --git a/src/test/java/org/apache/datasketches/memory/WritableMemoryImplTest.java b/src/test/java/org/apache/datasketches/memory/WritableMemoryImplTest.java
index e30d546..e5dace4 100644
--- a/src/test/java/org/apache/datasketches/memory/WritableMemoryImplTest.java
+++ b/src/test/java/org/apache/datasketches/memory/WritableMemoryImplTest.java
@@ -699,7 +699,7 @@ public class WritableMemoryImplTest {
public void checkAsBufferNonNative() {
WritableMemory wmem = WritableMemory.allocate(64);
wmem.putShort(0, (short) 1);
- Buffer buf = wmem.asBuffer(BaseState.nonNativeCpuByteOrder);
+ Buffer buf = wmem.asBuffer(BaseState.nonNativeByteOrder);
assertEquals(buf.getShort(0), 256);
}
diff --git a/src/test/java/org/apache/datasketches/memory/WritableMemoryTest.java b/src/test/java/org/apache/datasketches/memory/WritableMemoryTest.java
index 3d2444c..9a59ed5 100644
--- a/src/test/java/org/apache/datasketches/memory/WritableMemoryTest.java
+++ b/src/test/java/org/apache/datasketches/memory/WritableMemoryTest.java
@@ -43,7 +43,7 @@ public class WritableMemoryTest {
public void wrapBigEndian2() {
ByteBuffer bb = ByteBuffer.allocate(64);
WritableBuffer wbuf = WritableBuffer.wrap(bb);
- assertFalse(wbuf.getTypeByteOrder() == BaseState.nativeCpuByteOrder);
+ assertFalse(wbuf.getTypeByteOrder() == BaseState.nativeByteOrder);
assertEquals(wbuf.getTypeByteOrder(), ByteOrder.BIG_ENDIAN);
}
@@ -165,11 +165,11 @@ public class WritableMemoryTest {
@Test
public void checkWrapWithBO() {
WritableMemory wmem = WritableMemory.wrap(new byte[0], ByteOrder.BIG_ENDIAN);
- boolean nativeBO = wmem.getTypeByteOrder() == BaseState.nativeCpuByteOrder;
+ boolean nativeBO = wmem.getTypeByteOrder() == BaseState.nativeByteOrder;
assertTrue(nativeBO); //remains true for ZeroSizeMemory
println("" + nativeBO);
wmem = WritableMemory.wrap(new byte[8], ByteOrder.BIG_ENDIAN);
- nativeBO = wmem.getTypeByteOrder() == BaseState.nativeCpuByteOrder;
+ nativeBO = wmem.getTypeByteOrder() == BaseState.nativeByteOrder;
assertFalse(nativeBO);
println("" + nativeBO);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org