This is an automated email from the ASF dual-hosted git repository.
wangweipeng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-fury.git
The following commit(s) were added to refs/heads/main by this push:
new 125e43bb chore(java): rename remaing get/put int/float (#1500)
125e43bb is described below
commit 125e43bb0eeeed820e6f2cf08fafd7f6890ab4fc
Author: Shawn Yang <shawn.ck.y...@gmail.com>
AuthorDate: Sat Apr 13 12:28:05 2024 +0800
chore(java): rename remaing get/put int/float (#1500)
<!--
**Thanks for contributing to Fury.**
**If this is your first time opening a PR on fury, you can refer to
[CONTRIBUTING.md](https://github.com/apache/incubator-fury/blob/main/CONTRIBUTING.md).**
Contribution Checklist
- The **Apache Fury (incubating)** community has restrictions on the
naming of pr titles. You can also find instructions in
[CONTRIBUTING.md](https://github.com/apache/incubator-fury/blob/main/CONTRIBUTING.md).
- Fury has a strong focus on performance. If the PR you submit will have
an impact on performance, please benchmark it first and provide the
benchmark result here.
-->
## What does this PR do?
rename remaing get/put int/float
<!-- Describe the purpose of this PR. -->
## Related issues
<!--
Is there any related issue? Please attach here.
- #xxxx0
- #xxxx1
- #xxxx2
-->
#1480
## Does this PR introduce any user-facing change?
<!--
If any user-facing interface changes, please [open an
issue](https://github.com/apache/incubator-fury/issues/new/choose)
describing the need to do so and update the document if necessary.
-->
- [ ] Does this PR introduce any public API change?
- [ ] Does this PR introduce any binary protocol compatibility change?
## Benchmark
<!--
When the PR has an impact on performance (if you don't know whether the
PR will have an impact on performance, you can submit the PR first, and
if it will have impact on performance, the code reviewer will explain
it), be sure to attach a benchmark data here.
-->
---
.../apache/fury/benchmark/CompressStringSuite.java | 6 +-
.../src/main/java/org/apache/fury/Fury.java | 12 +-
.../apache/fury/builder/ObjectCodecBuilder.java | 12 +-
.../java/org/apache/fury/io/FuryInputStream.java | 2 +-
.../main/java/org/apache/fury/memory/BitUtils.java | 26 ++--
.../java/org/apache/fury/memory/MemoryBuffer.java | 139 +++++++++++----------
.../apache/fury/resolver/EnumStringResolver.java | 10 +-
.../apache/fury/serializer/BufferSerializers.java | 2 +-
.../fury/serializer/PrimitiveSerializers.java | 2 +-
.../apache/fury/serializer/StringSerializer.java | 29 ++---
.../java/org/apache/fury/memory/BitUtilsTest.java | 2 +-
.../org/apache/fury/memory/MemoryBufferTest.java | 68 +++++-----
.../java/org/apache/fury/format/row/Getters.java | 10 +-
.../java/org/apache/fury/format/row/Setters.java | 10 +-
.../org/apache/fury/format/row/ValueVisitor.java | 10 +-
.../apache/fury/format/row/binary/BinaryArray.java | 2 +-
.../apache/fury/format/row/binary/BinaryMap.java | 6 +-
.../apache/fury/format/row/binary/BinaryRow.java | 4 +-
.../apache/fury/format/row/binary/BinaryUtils.java | 10 +-
.../apache/fury/format/row/binary/UnsafeTrait.java | 62 ++++-----
.../row/binary/writer/BinaryArrayWriter.java | 16 +--
.../format/row/binary/writer/BinaryRowWriter.java | 22 ++--
.../format/row/binary/writer/BinaryWriter.java | 18 +--
.../org/apache/fury/format/type/DataTypes.java | 2 +-
.../apache/fury/format/vectorized/ArrowWriter.java | 14 +--
.../fury/format/row/binary/BinaryArrayTest.java | 4 +-
.../fury/format/row/binary/BinaryMapTest.java | 2 +-
.../fury/format/row/binary/BinaryRowTest.java | 24 ++--
28 files changed, 267 insertions(+), 259 deletions(-)
diff --git
a/java/benchmark/src/main/java/org/apache/fury/benchmark/CompressStringSuite.java
b/java/benchmark/src/main/java/org/apache/fury/benchmark/CompressStringSuite.java
index 3bc042e9..dc66db92 100644
---
a/java/benchmark/src/main/java/org/apache/fury/benchmark/CompressStringSuite.java
+++
b/java/benchmark/src/main/java/org/apache/fury/benchmark/CompressStringSuite.java
@@ -53,7 +53,7 @@ public class CompressStringSuite {
MemoryBuffer directBuffer = CompressStringSuite.directBuffer;
char[] latinStrChars = CompressStringSuite.latinStrChars;
for (int i = 0; i < latinStrChars.length; i++) {
- directBuffer.put(i, (byte) (latinStrChars[i]));
+ directBuffer.putByte(i, (byte) (latinStrChars[i]));
}
return directBuffer;
}
@@ -81,8 +81,8 @@ public class CompressStringSuite {
for (int i = 0; i < utf16StrChars.length; i++) {
int index = i << 1;
char c = utf16StrChars[i];
- directBuffer.put(index++, (byte) (c));
- directBuffer.put(index, (byte) (c >> 8));
+ directBuffer.putByte(index++, (byte) (c));
+ directBuffer.putByte(index, (byte) (c >> 8));
}
return directBuffer;
}
diff --git a/java/fury-core/src/main/java/org/apache/fury/Fury.java
b/java/fury-core/src/main/java/org/apache/fury/Fury.java
index d9f875a4..90b31913 100644
--- a/java/fury-core/src/main/java/org/apache/fury/Fury.java
+++ b/java/fury-core/src/main/java/org/apache/fury/Fury.java
@@ -228,7 +228,7 @@ public final class Fury implements BaseFury {
byte bitmap = 0;
if (obj == null) {
bitmap |= isNilFlag;
- buffer.put(maskIndex, bitmap);
+ buffer.putByte(maskIndex, bitmap);
return buffer;
}
// set endian.
@@ -244,7 +244,7 @@ public final class Fury implements BaseFury {
if (bufferCallback != null) {
bitmap |= isOutOfBandFlag;
}
- buffer.put(maskIndex, bitmap);
+ buffer.putByte(maskIndex, bitmap);
try {
jitContext.lock();
if (depth != 0) {
@@ -311,7 +311,7 @@ public final class Fury implements BaseFury {
int startOffset = buffer.writerIndex();
buffer.writeInt32(-1); // preserve 4-byte for nativeObjects start
offsets.
writeRef(buffer, obj);
- buffer.putInt(startOffset, buffer.writerIndex());
+ buffer.putInt32(startOffset, buffer.writerIndex());
classResolver.writeClassDefs(buffer);
} else {
writeRef(buffer, obj);
@@ -323,8 +323,8 @@ public final class Fury implements BaseFury {
buffer.writeInt32(-1); // preserve 4-byte for nativeObjects start offsets.
buffer.writeInt32(-1); // preserve 4-byte for nativeObjects size
xwriteRef(buffer, obj);
- buffer.putInt(startOffset, buffer.writerIndex());
- buffer.putInt(startOffset + 4, nativeObjects.size());
+ buffer.putInt32(startOffset, buffer.writerIndex());
+ buffer.putInt32(startOffset + 4, nativeObjects.size());
refResolver.resetWrite();
// fury write opaque object classname which cause later write of classname
only write an id.
classResolver.resetWrite();
@@ -1033,7 +1033,7 @@ public final class Fury implements BaseFury {
ClassInfo classInfo =
classResolver.getOrUpdateClassInfo(obj.getClass());
writeData(buffer, classInfo, obj);
}
- buffer.putInt(startOffset, buffer.writerIndex());
+ buffer.putInt32(startOffset, buffer.writerIndex());
classResolver.writeClassDefs(buffer);
} else {
if (!refResolver.writeRefOrNull(buffer, obj)) {
diff --git
a/java/fury-core/src/main/java/org/apache/fury/builder/ObjectCodecBuilder.java
b/java/fury-core/src/main/java/org/apache/fury/builder/ObjectCodecBuilder.java
index 4da618f6..d9c4d5f3 100644
---
a/java/fury-core/src/main/java/org/apache/fury/builder/ObjectCodecBuilder.java
+++
b/java/fury-core/src/main/java/org/apache/fury/builder/ObjectCodecBuilder.java
@@ -229,7 +229,7 @@ public class ObjectCodecBuilder extends
BaseObjectCodecBuilder {
// Must grow first, otherwise may get invalid address.
Expression base = new Invoke(buffer, "getHeapMemory", "base",
PRIMITIVE_BYTE_ARRAY_TYPE);
Expression writerAddr =
- new Invoke(buffer, "getUnsafeWriterAddress", "writerAddr",
PRIMITIVE_LONG_TYPE);
+ new Invoke(buffer, "_unsafeWriterAddress", "writerAddr",
PRIMITIVE_LONG_TYPE);
expressions.add(base);
expressions.add(writerAddr);
int acc = 0;
@@ -282,7 +282,9 @@ public class ObjectCodecBuilder extends
BaseObjectCodecBuilder {
}
Expression increaseWriterIndex =
new Invoke(
- buffer, "increaseWriterIndexUnsafe", new Literal(totalSizeLiteral,
PRIMITIVE_INT_TYPE));
+ buffer,
+ "_increaseWriterIndexUnsafe",
+ new Literal(totalSizeLiteral, PRIMITIVE_INT_TYPE));
expressions.add(increaseWriterIndex);
return expressions;
}
@@ -312,7 +314,7 @@ public class ObjectCodecBuilder extends
BaseObjectCodecBuilder {
for (List<Descriptor> group : primitiveGroups) {
ListExpression groupExpressions = new ListExpression();
Expression writerAddr =
- new Invoke(buffer, "getUnsafeWriterAddress", "writerAddr",
PRIMITIVE_LONG_TYPE);
+ new Invoke(buffer, "_unsafeWriterAddress", "writerAddr",
PRIMITIVE_LONG_TYPE);
// use Reference to cut-off expr dependency.
int acc = 0;
boolean compressStarted = false;
@@ -352,7 +354,7 @@ public class ObjectCodecBuilder extends
BaseObjectCodecBuilder {
addIncWriterIndexExpr(groupExpressions, buffer, acc);
compressStarted = true;
}
- groupExpressions.add(new Invoke(buffer, "_unsafeWriteVarInt",
fieldValue));
+ groupExpressions.add(new Invoke(buffer, "_unsafeWriteVarInt32",
fieldValue));
acc += 0;
}
} else if (clz == long.class) {
@@ -389,7 +391,7 @@ public class ObjectCodecBuilder extends
BaseObjectCodecBuilder {
private void addIncWriterIndexExpr(ListExpression expressions, Expression
buffer, int diff) {
if (diff != 0) {
- expressions.add(new Invoke(buffer, "increaseWriterIndexUnsafe",
Literal.ofInt(diff)));
+ expressions.add(new Invoke(buffer, "_increaseWriterIndexUnsafe",
Literal.ofInt(diff)));
}
}
diff --git
a/java/fury-core/src/main/java/org/apache/fury/io/FuryInputStream.java
b/java/fury-core/src/main/java/org/apache/fury/io/FuryInputStream.java
index f5006b4b..4b81de9b 100644
--- a/java/fury-core/src/main/java/org/apache/fury/io/FuryInputStream.java
+++ b/java/fury-core/src/main/java/org/apache/fury/io/FuryInputStream.java
@@ -129,7 +129,7 @@ public class FuryInputStream extends InputStream implements
FuryStreamReader {
fillBuffer(length - remaining);
}
byte[] heapMemory = buf.getHeapMemory();
- dst.put(heapMemory, buf.unsafeHeapReaderIndex(), length);
+ dst.put(heapMemory, buf._unsafeHeapReaderIndex(), length);
buf.increaseReaderIndex(length);
}
diff --git a/java/fury-core/src/main/java/org/apache/fury/memory/BitUtils.java
b/java/fury-core/src/main/java/org/apache/fury/memory/BitUtils.java
index e29fee8a..942abbe8 100644
--- a/java/fury-core/src/main/java/org/apache/fury/memory/BitUtils.java
+++ b/java/fury-core/src/main/java/org/apache/fury/memory/BitUtils.java
@@ -36,10 +36,10 @@ public class BitUtils {
public static void set(MemoryBuffer bitmapBuffer, int baseOffset, int index)
{
final int byteIndex = baseOffset + (index >> 3);
final int bitIndex = index & 7;
- byte currentByte = bitmapBuffer.get(byteIndex);
+ byte currentByte = bitmapBuffer.getByte(byteIndex);
final byte bitMask = (byte) (1L << bitIndex);
currentByte |= bitMask;
- bitmapBuffer.put(byteIndex, currentByte);
+ bitmapBuffer.putByte(byteIndex, currentByte);
}
public static void setAll(MemoryBuffer bitmapBuffer, int baseOffset, int
valueCount) {
@@ -50,7 +50,7 @@ public class BitUtils {
final int sizeInBytesMinus1 = sizeInBytes - 1;
int bytesMinus1EndOffset = baseOffset + sizeInBytesMinus1;
for (int i = baseOffset; i < bytesMinus1EndOffset; i++) {
- bitmapBuffer.put(i, (byte) 0xff);
+ bitmapBuffer.putByte(i, (byte) 0xff);
}
// handling with the last byte
@@ -60,7 +60,7 @@ public class BitUtils {
if (remainder != 0) {
// Every byte is set form right to left
byte byteValue = (byte) (0xff >>> (8 - remainder));
- bitmapBuffer.put(baseOffset + sizeInBytesMinus1, byteValue);
+ bitmapBuffer.putByte(baseOffset + sizeInBytesMinus1, byteValue);
}
}
@@ -72,27 +72,27 @@ public class BitUtils {
public static void setBit(MemoryBuffer bitmapBuffer, int baseOffset, int
index, int value) {
final int byteIndex = baseOffset + (index >> 3);
final int bitIndex = index & 7;
- byte current = bitmapBuffer.get(byteIndex);
+ byte current = bitmapBuffer.getByte(byteIndex);
final byte bitMask = (byte) (1L << bitIndex);
if (value != 0) {
current |= bitMask;
} else {
current -= (bitMask & current);
}
- bitmapBuffer.put(byteIndex, current);
+ bitmapBuffer.putByte(byteIndex, current);
}
public static boolean isSet(MemoryBuffer bitmapBuffer, int baseOffset, int
index) {
final int byteIndex = baseOffset + (index >> 3);
final int bitIndex = index & 7;
- final byte b = bitmapBuffer.get(byteIndex);
+ final byte b = bitmapBuffer.getByte(byteIndex);
return ((b >> bitIndex) & 0x01) != 0;
}
public static boolean isNotSet(MemoryBuffer bitmapBuffer, int baseOffset,
int index) {
final int byteIndex = baseOffset + (index >> 3);
final int bitIndex = index & 7;
- final byte b = bitmapBuffer.get(byteIndex);
+ final byte b = bitmapBuffer.getByte(byteIndex);
return ((b >> bitIndex) & 0x01) == 0;
}
@@ -101,7 +101,7 @@ public class BitUtils {
int addr = baseOffset;
int bitmapWidthInWords = bitmapWidthInBytes / WORD_SIZE;
for (int i = 0; i < bitmapWidthInWords; i++, addr += WORD_SIZE) {
- if (bitmapBuffer.getLong(addr) != 0) {
+ if (bitmapBuffer.getInt64(addr) != 0) {
return true;
}
}
@@ -117,7 +117,7 @@ public class BitUtils {
final int sizeInBytesMinus1 = sizeInBytes - 1;
int bytesMinus1EndOffset = baseOffset + sizeInBytesMinus1;
for (int i = baseOffset; i < bytesMinus1EndOffset; i++) {
- if (bitmapBuffer.get(i) != (byte) 0xFF) {
+ if (bitmapBuffer.getByte(i) != (byte) 0xFF) {
return true;
}
}
@@ -128,7 +128,7 @@ public class BitUtils {
// for bit operations, native byte order may be subject to change between
machine,
// so we use getByte
if (remainder != 0) {
- byte byteValue = bitmapBuffer.get(baseOffset + sizeInBytesMinus1);
+ byte byteValue = bitmapBuffer.getByte(baseOffset + sizeInBytesMinus1);
// Every byte is set form right to left
byte mask = (byte) (0xFF >>> (8 - remainder));
return byteValue != mask;
@@ -154,14 +154,14 @@ public class BitUtils {
final int sizeInBytesMinus1 = sizeInBytes - 1;
int bytesMinus1EndOffset = baseOffset + sizeInBytesMinus1;
for (int i = baseOffset; i < bytesMinus1EndOffset; i++) {
- byte byteValue = bitmapBuffer.get(i);
+ byte byteValue = bitmapBuffer.getByte(i);
// byteValue & 0xFF: sets int to the (unsigned) 8 bits value resulting
from
// putting the 8 bits of value in the lowest 8 bits of int.
count += Integer.bitCount(byteValue & 0xFF);
}
// handling with the last byte
- byte byteValue = bitmapBuffer.get(baseOffset + sizeInBytesMinus1);
+ byte byteValue = bitmapBuffer.getByte(baseOffset + sizeInBytesMinus1);
if (remainder != 0) {
// making the remaining bits all 1s if it is not fully filled
byte mask = (byte) (0xFF << remainder);
diff --git
a/java/fury-core/src/main/java/org/apache/fury/memory/MemoryBuffer.java
b/java/fury-core/src/main/java/org/apache/fury/memory/MemoryBuffer.java
index 9d0b9c31..1079931f 100644
--- a/java/fury-core/src/main/java/org/apache/fury/memory/MemoryBuffer.java
+++ b/java/fury-core/src/main/java/org/apache/fury/memory/MemoryBuffer.java
@@ -292,17 +292,6 @@ public final class MemoryBuffer {
// Random Access get() and put() methods
// ------------------------------------------------------------------------
- // ------------------------------------------------------------------------
- // Notes on the implementation: We try to collapse as many checks as
- // possible. We need to obey the following rules to make this safe
- // against segfaults:
- //
- // - Grab mutable fields onto the stack before checking and using. This
- // guards us against concurrent modifications which invalidate the
- // pointers
- // - Use subtractions for range checks, as they are tolerant
- // ------------------------------------------------------------------------
-
private void checkPosition(long index, long pos, long length) {
if (BoundsChecking.BOUNDS_CHECKING_ENABLED) {
if (index < 0 || pos > addressLimit - length) {
@@ -311,12 +300,6 @@ public final class MemoryBuffer {
}
}
- public byte get(int index) {
- final long pos = address + index;
- checkPosition(index, pos, 1);
- return UNSAFE.getByte(heapMemory, pos);
- }
-
public void get(int index, byte[] dst) {
get(index, dst, 0, dst.length);
}
@@ -382,12 +365,6 @@ public final class MemoryBuffer {
source.position(sourcePos + numBytes);
}
- public void put(int index, byte b) {
- final long pos = address + index;
- checkPosition(index, pos, 1);
- UNSAFE.putByte(heapMemory, pos, b);
- }
-
public void put(int index, byte[] src) {
put(index, src, 0, src.length);
}
@@ -408,19 +385,31 @@ public final class MemoryBuffer {
Platform.copyMemory(src, arrayAddress, heapMemory, pos, length);
}
+ public byte getByte(int index) {
+ final long pos = address + index;
+ checkPosition(index, pos, 1);
+ return UNSAFE.getByte(heapMemory, pos);
+ }
+
+ public void putByte(int index, byte b) {
+ final long pos = address + index;
+ checkPosition(index, pos, 1);
+ UNSAFE.putByte(heapMemory, pos, b);
+ }
+
// CHECKSTYLE.OFF:MethodName
- public void _unsafePut(int index, byte b) {
+ public void _unsafePutByte(int index, byte b) {
// CHECKSTYLE.ON:MethodName
final long pos = address + index;
UNSAFE.putByte(heapMemory, pos, b);
}
public boolean getBoolean(int index) {
- return get(index) != 0;
+ return getByte(index) != 0;
}
public void putBoolean(int index, boolean value) {
- put(index, (byte) (value ? 1 : 0));
+ putByte(index, (byte) (value ? 1 : 0));
}
public char getChar(int index) {
@@ -439,7 +428,7 @@ public final class MemoryBuffer {
UNSAFE.putChar(heapMemory, pos, value);
}
- public short getShort(int index) {
+ public short getInt16(int index) {
final long pos = address + index;
checkPosition(index, pos, 2);
if (LITTLE_ENDIAN) {
@@ -449,7 +438,7 @@ public final class MemoryBuffer {
}
}
- public void putShort(int index, short value) {
+ public void putInt16(int index, short value) {
final long pos = address + index;
checkPosition(index, pos, 2);
if (LITTLE_ENDIAN) {
@@ -460,7 +449,7 @@ public final class MemoryBuffer {
}
// CHECKSTYLE.OFF:MethodName
- public void _unsafePutShort(int index, short value) {
+ public void _unsafePutInt16(int index, short value) {
// CHECKSTYLE.ON:MethodName
final long pos = address + index;
if (LITTLE_ENDIAN) {
@@ -470,7 +459,7 @@ public final class MemoryBuffer {
}
}
- public int getInt(int index) {
+ public int getInt32(int index) {
final long pos = address + index;
checkPosition(index, pos, 4);
if (LITTLE_ENDIAN) {
@@ -480,7 +469,7 @@ public final class MemoryBuffer {
}
}
- public void putInt(int index, int value) {
+ public void putInt32(int index, int value) {
final long pos = address + index;
checkPosition(index, pos, 4);
if (LITTLE_ENDIAN) {
@@ -490,7 +479,9 @@ public final class MemoryBuffer {
}
}
- private int unsafeGetInt(int index) {
+ // CHECKSTYLE.OFF:MethodName
+ private int _unsafeGetInt32(int index) {
+ // CHECKSTYLE.ON:MethodName
final long pos = address + index;
if (LITTLE_ENDIAN) {
return UNSAFE.getInt(heapMemory, pos);
@@ -499,7 +490,9 @@ public final class MemoryBuffer {
}
}
- private void unsafePutInt(int index, int value) {
+ // CHECKSTYLE.OFF:MethodName
+ private void _unsafePutInt32(int index, int value) {
+ // CHECKSTYLE.ON:MethodName
final long pos = address + index;
if (LITTLE_ENDIAN) {
UNSAFE.putInt(heapMemory, pos, value);
@@ -508,7 +501,7 @@ public final class MemoryBuffer {
}
}
- public long getLong(int index) {
+ public long getInt64(int index) {
final long pos = address + index;
checkPosition(index, pos, 8);
if (LITTLE_ENDIAN) {
@@ -518,7 +511,7 @@ public final class MemoryBuffer {
}
}
- public void putLong(int index, long value) {
+ public void putInt64(int index, long value) {
final long pos = address + index;
checkPosition(index, pos, 8);
if (LITTLE_ENDIAN) {
@@ -529,7 +522,7 @@ public final class MemoryBuffer {
}
// CHECKSTYLE.OFF:MethodName
- long _unsafeGetLong(int index) {
+ long _unsafeGetInt64(int index) {
// CHECKSTYLE.ON:MethodName
final long pos = address + index;
if (LITTLE_ENDIAN) {
@@ -540,7 +533,7 @@ public final class MemoryBuffer {
}
// CHECKSTYLE.OFF:MethodName
- public void _unsafePutLong(int index, long value) {
+ public void _unsafePutInt64(int index, long value) {
// CHECKSTYLE.ON:MethodName
final long pos = address + index;
if (LITTLE_ENDIAN) {
@@ -550,7 +543,7 @@ public final class MemoryBuffer {
}
}
- public float getFloat(int index) {
+ public float getFloat32(int index) {
final long pos = address + index;
if (LITTLE_ENDIAN) {
return Float.intBitsToFloat(UNSAFE.getInt(heapMemory, pos));
@@ -559,7 +552,7 @@ public final class MemoryBuffer {
}
}
- public void putFloat(int index, float value) {
+ public void putFloat32(int index, float value) {
final long pos = address + index;
checkPosition(index, pos, 4);
if (LITTLE_ENDIAN) {
@@ -569,7 +562,7 @@ public final class MemoryBuffer {
}
}
- public double getDouble(int index) {
+ public double getFloat64(int index) {
final long pos = address + index;
checkPosition(index, pos, 8);
if (LITTLE_ENDIAN) {
@@ -579,7 +572,7 @@ public final class MemoryBuffer {
}
}
- public void putDouble(int index, double value) {
+ public void putFloat64(int index, double value) {
final long pos = address + index;
checkPosition(index, pos, 8);
if (LITTLE_ENDIAN) {
@@ -623,20 +616,28 @@ public final class MemoryBuffer {
"writerIndex: %d (expected: 0 <= writerIndex <= size(%d))",
writerIndex, size));
}
- public void unsafeWriterIndex(int writerIndex) {
+ // CHECKSTYLE.OFF:MethodName
+ public void _unsafeWriterIndex(int writerIndex) {
+ // CHECKSTYLE.ON:MethodName
this.writerIndex = writerIndex;
}
/** Returns heap index for writer index if buffer is a heap buffer. */
- public int unsafeHeapWriterIndex() {
+ // CHECKSTYLE.OFF:MethodName
+ public int _unsafeHeapWriterIndex() {
+ // CHECKSTYLE.ON:MethodName
return writerIndex + heapOffset;
}
- public long getUnsafeWriterAddress() {
+ // CHECKSTYLE.OFF:MethodName
+ public long _unsafeWriterAddress() {
+ // CHECKSTYLE.ON:MethodName
return address + writerIndex;
}
- public void increaseWriterIndexUnsafe(int diff) {
+ // CHECKSTYLE.OFF:MethodName
+ public void _increaseWriterIndexUnsafe(int diff) {
+ // CHECKSTYLE.ON:MethodName
this.writerIndex = writerIndex + diff;
}
@@ -763,7 +764,7 @@ public final class MemoryBuffer {
*/
public int writeVarInt32(int v) {
ensure(writerIndex + 8);
- return _unsafeWriteVarInt(v);
+ return _unsafeWriteVarInt32(v);
}
/**
@@ -785,7 +786,7 @@ public final class MemoryBuffer {
*/
@CodegenInvoke
// CHECKSTYLE.OFF:MethodName
- public int _unsafeWriteVarInt(int v) {
+ public int _unsafeWriteVarInt32(int v) {
// CHECKSTYLE.ON:MethodName
// Ensure negatives close to zero is encode in little bytes.
v = (v << 1) ^ (v >> 31);
@@ -819,7 +820,7 @@ public final class MemoryBuffer {
// 0x3f80: 0b1111111 << 7
encoded |= (((value & 0x3f80) << 1) | 0x80);
if (value >>> 14 == 0) {
- unsafePutInt(index, (int) encoded);
+ _unsafePutInt32(index, (int) encoded);
return 2;
}
return continuePutVarInt36(index, encoded, value);
@@ -829,18 +830,18 @@ public final class MemoryBuffer {
// 0x1fc000: 0b1111111 << 14
encoded |= (((value & 0x1fc000) << 2) | 0x8000);
if (value >>> 21 == 0) {
- unsafePutInt(index, (int) encoded);
+ _unsafePutInt32(index, (int) encoded);
return 3;
}
// 0xfe00000: 0b1111111 << 21
encoded |= ((value & 0xfe00000) << 3) | 0x800000;
if (value >>> 28 == 0) {
- unsafePutInt(index, (int) encoded);
+ _unsafePutInt32(index, (int) encoded);
return 4;
}
// 0xff0000000: 0b11111111 << 28. Note eight `1` here instead of seven.
encoded |= ((value & 0xff0000000L) << 4) | 0x80000000L;
- _unsafePutLong(index, encoded);
+ _unsafePutInt64(index, encoded);
return 5;
}
@@ -1049,7 +1050,7 @@ public final class MemoryBuffer {
@CodegenInvoke
// CHECKSTYLE.OFF:MethodName
- public int _unsafeWriteVarInt64(long value) {
+ public int _unsafeWriteVarInt3264(long value) {
// CHECKSTYLE.ON:MethodName
value = (value << 1) ^ (value >> 63);
return _unsafeWriteVarUint64(value);
@@ -1076,49 +1077,49 @@ public final class MemoryBuffer {
}
varInt |= (int) (((value & 0x3f80) << 1) | 0x80);
if (value >>> 14 == 0) {
- unsafePutInt(writerIndex, varInt);
+ _unsafePutInt32(writerIndex, varInt);
this.writerIndex = writerIndex + 2;
return 2;
}
varInt |= (int) (((value & 0x1fc000) << 2) | 0x8000);
if (value >>> 21 == 0) {
- unsafePutInt(writerIndex, varInt);
+ _unsafePutInt32(writerIndex, varInt);
this.writerIndex = writerIndex + 3;
return 3;
}
varInt |= (int) (((value & 0xfe00000) << 3) | 0x800000);
if (value >>> 28 == 0) {
- unsafePutInt(writerIndex, varInt);
+ _unsafePutInt32(writerIndex, varInt);
this.writerIndex = writerIndex + 4;
return 4;
}
long varLong = (varInt & 0xFFFFFFFFL);
varLong |= ((value & 0x7f0000000L) << 4) | 0x80000000L;
if (value >>> 35 == 0) {
- _unsafePutLong(writerIndex, varLong);
+ _unsafePutInt64(writerIndex, varLong);
this.writerIndex = writerIndex + 5;
return 5;
}
varLong |= ((value & 0x3f800000000L) << 5) | 0x8000000000L;
if (value >>> 42 == 0) {
- _unsafePutLong(writerIndex, varLong);
+ _unsafePutInt64(writerIndex, varLong);
this.writerIndex = writerIndex + 6;
return 6;
}
varLong |= ((value & 0x1fc0000000000L) << 6) | 0x800000000000L;
if (value >>> 49 == 0) {
- _unsafePutLong(writerIndex, varLong);
+ _unsafePutInt64(writerIndex, varLong);
this.writerIndex = writerIndex + 7;
return 7;
}
varLong |= ((value & 0xfe000000000000L) << 7) | 0x80000000000000L;
value >>>= 56;
if (value == 0) {
- _unsafePutLong(writerIndex, varLong);
+ _unsafePutInt64(writerIndex, varLong);
this.writerIndex = writerIndex + 8;
return 8;
}
- _unsafePutLong(writerIndex, varLong | 0x8000000000000000L);
+ _unsafePutInt64(writerIndex, varLong | 0x8000000000000000L);
UNSAFE.putByte(heapMemory, address + writerIndex + 8, (byte) (value &
0xFF));
this.writerIndex = writerIndex + 9;
return 9;
@@ -1280,11 +1281,15 @@ public final class MemoryBuffer {
}
/** Returns array index for reader index if buffer is a heap buffer. */
- public int unsafeHeapReaderIndex() {
+ // CHECKSTYLE.OFF:MethodName
+ public int _unsafeHeapReaderIndex() {
+ // CHECKSTYLE.ON:MethodName
return readerIndex + heapOffset;
}
- public void increaseReaderIndexUnsafe(int diff) {
+ // CHECKSTYLE.OFF:MethodName
+ public void _increaseReaderIndexUnsafe(int diff) {
+ // CHECKSTYLE.ON:MethodName
readerIndex += diff;
}
@@ -1716,7 +1721,7 @@ public final class MemoryBuffer {
// noinspection Duplicates
int readIdx = readerIndex;
if (size - readIdx >= 9) {
- long bulkValue = _unsafeGetLong(readIdx++);
+ long bulkValue = _unsafeGetInt64(readIdx++);
// noinspection Duplicates
long result = bulkValue & 0x7F;
if ((bulkValue & 0x80) != 0) {
@@ -1787,7 +1792,7 @@ public final class MemoryBuffer {
return readVarUint32Slow();
}
// | 1bit + 7bits | 1bit + 7bits | 1bit + 7bits | 1bit + 7bits |
- int fourByteValue = unsafeGetInt(readIdx);
+ int fourByteValue = _unsafeGetInt32(readIdx);
readIdx++;
int result = fourByteValue & 0x7F;
// Duplicate and manual inline for performance.
@@ -1823,7 +1828,7 @@ public final class MemoryBuffer {
public int readVarUintSmall() {
int readIdx = readerIndex;
if (size - readIdx >= 5) {
- int fourByteValue = unsafeGetInt(readIdx++);
+ int fourByteValue = _unsafeGetInt32(readIdx++);
int binarySize = fourByteValue & 0x7F;
// Duplicate and manual inline for performance.
// noinspection Duplicates
@@ -1942,7 +1947,7 @@ public final class MemoryBuffer {
return readVarUint64Slow();
}
// varint are written using little endian byte order, so read by little
endian byte order.
- long bulkValue = _unsafeGetLong(readIdx);
+ long bulkValue = _unsafeGetInt64(readIdx);
// Duplicate and manual inline for performance.
// noinspection Duplicates
readIdx++;
@@ -2207,7 +2212,7 @@ public final class MemoryBuffer {
int binarySize;
int readIdx = readerIndex;
if (size - readIdx >= 5) {
- int fourByteValue = unsafeGetInt(readIdx++);
+ int fourByteValue = _unsafeGetInt32(readIdx++);
binarySize = fourByteValue & 0x7F;
// Duplicate and manual inline for performance.
// noinspection Duplicates
diff --git
a/java/fury-core/src/main/java/org/apache/fury/resolver/EnumStringResolver.java
b/java/fury-core/src/main/java/org/apache/fury/resolver/EnumStringResolver.java
index 73a57e06..feb98931 100644
---
a/java/fury-core/src/main/java/org/apache/fury/resolver/EnumStringResolver.java
+++
b/java/fury-core/src/main/java/org/apache/fury/resolver/EnumStringResolver.java
@@ -94,16 +94,16 @@ public final class EnumStringResolver {
dynamicWrittenEnumString[id] = byteString;
int bytesLen = byteString.bytes.length;
buffer.increaseWriterIndex(11 + bytesLen);
- buffer._unsafePut(writerIndex, USE_STRING_VALUE);
+ buffer._unsafePutByte(writerIndex, USE_STRING_VALUE);
// Since duplicate enum string writing are avoided by dynamic id,
// use 8-byte hash won't increase too much space.
- buffer._unsafePutLong(writerIndex + 1, byteString.hashCode);
- buffer._unsafePutShort(writerIndex + 9, (short) bytesLen);
+ buffer._unsafePutInt64(writerIndex + 1, byteString.hashCode);
+ buffer._unsafePutInt16(writerIndex + 9, (short) bytesLen);
buffer.put(writerIndex + 11, byteString.bytes, 0, bytesLen);
} else {
buffer.increaseWriterIndex(3);
- buffer._unsafePut(writerIndex, USE_STRING_ID);
- buffer._unsafePutShort(writerIndex + 1, id);
+ buffer._unsafePutByte(writerIndex, USE_STRING_ID);
+ buffer._unsafePutInt16(writerIndex + 1, id);
}
}
diff --git
a/java/fury-core/src/main/java/org/apache/fury/serializer/BufferSerializers.java
b/java/fury-core/src/main/java/org/apache/fury/serializer/BufferSerializers.java
index 35ad9a88..c7ea6ee7 100644
---
a/java/fury-core/src/main/java/org/apache/fury/serializer/BufferSerializers.java
+++
b/java/fury-core/src/main/java/org/apache/fury/serializer/BufferSerializers.java
@@ -50,7 +50,7 @@ public class BufferSerializers {
int readerIndex = newBuffer.readerIndex();
int size = newBuffer.remaining();
ByteBuffer originalBuffer = newBuffer.sliceAsByteBuffer(readerIndex,
size - 1);
- byte isBigEndian = newBuffer.get(readerIndex + size - 1);
+ byte isBigEndian = newBuffer.getByte(readerIndex + size - 1);
originalBuffer.order(
isBigEndian == (byte) 1 ? ByteOrder.BIG_ENDIAN :
ByteOrder.LITTLE_ENDIAN);
return originalBuffer;
diff --git
a/java/fury-core/src/main/java/org/apache/fury/serializer/PrimitiveSerializers.java
b/java/fury-core/src/main/java/org/apache/fury/serializer/PrimitiveSerializers.java
index a8c5a36d..d0117be1 100644
---
a/java/fury-core/src/main/java/org/apache/fury/serializer/PrimitiveSerializers.java
+++
b/java/fury-core/src/main/java/org/apache/fury/serializer/PrimitiveSerializers.java
@@ -232,7 +232,7 @@ public class PrimitiveSerializers {
case SLI:
return new Invoke(buffer, ensureBounds ? "writeSliInt64" :
"_unsafeWriteSliInt64", v);
case PVL:
- return new Invoke(buffer, ensureBounds ? "writeVarInt64" :
"_unsafeWriteVarInt64", v);
+ return new Invoke(buffer, ensureBounds ? "writeVarInt64" :
"_unsafeWriteVarInt3264", v);
default:
throw new UnsupportedOperationException("Unsupported long encoding "
+ longEncoding);
}
diff --git
a/java/fury-core/src/main/java/org/apache/fury/serializer/StringSerializer.java
b/java/fury-core/src/main/java/org/apache/fury/serializer/StringSerializer.java
index 77a5d779..71cb9a15 100644
---
a/java/fury-core/src/main/java/org/apache/fury/serializer/StringSerializer.java
+++
b/java/fury-core/src/main/java/org/apache/fury/serializer/StringSerializer.java
@@ -230,8 +230,8 @@ public final class StringSerializer extends
Serializer<String> {
byte[] bytes;
byte[] heapMemory = buffer.getHeapMemory();
if (heapMemory != null) {
- final int arrIndex = buffer.unsafeHeapReaderIndex();
- buffer.increaseReaderIndexUnsafe(numBytes);
+ final int arrIndex = buffer._unsafeHeapReaderIndex();
+ buffer._increaseReaderIndexUnsafe(numBytes);
bytes = new byte[numBytes];
System.arraycopy(heapMemory, arrIndex, bytes, 0, numBytes);
} else {
@@ -353,7 +353,7 @@ public final class StringSerializer extends
Serializer<String> {
if (targetArray != null) {
// Some JDK11 Unsafe.copyMemory will `copyMemoryChecks`, and
// jvm doesn't eliminate well in some jdk.
- final int targetIndex = buffer.unsafeHeapWriterIndex();
+ final int targetIndex = buffer._unsafeHeapWriterIndex();
int arrIndex = targetIndex;
arrIndex += LittleEndian.putVarUint36Small(targetArray, arrIndex,
header);
writerIndex += arrIndex - targetIndex;
@@ -365,7 +365,7 @@ public final class StringSerializer extends
Serializer<String> {
bytes, Platform.BYTE_ARRAY_OFFSET, null, offHeapAddress +
writerIndex, bytesLen);
}
writerIndex += bytesLen;
- buffer.unsafeWriterIndex(writerIndex);
+ buffer._unsafeWriterIndex(writerIndex);
}
public void writeCharsLatin(MemoryBuffer buffer, char[] chars, final int
strLen) {
@@ -376,14 +376,14 @@ public final class StringSerializer extends
Serializer<String> {
long header = ((long) strLen << 2) | LATIN1;
final byte[] targetArray = buffer.getHeapMemory();
if (targetArray != null) {
- int arrIndex = buffer.unsafeHeapWriterIndex();
+ int arrIndex = buffer._unsafeHeapWriterIndex();
int written = LittleEndian.putVarUint36Small(targetArray, arrIndex,
header);
arrIndex += written;
writerIndex += written + strLen;
for (int i = 0; i < strLen; i++) {
targetArray[arrIndex + i] = (byte) chars[i];
}
- buffer.unsafeWriterIndex(writerIndex);
+ buffer._unsafeWriterIndex(writerIndex);
} else {
writerIndex += buffer._unsafePutVarUint36Small(writerIndex, header);
final byte[] tmpArray = getByteArray(strLen);
@@ -393,7 +393,7 @@ public final class StringSerializer extends
Serializer<String> {
}
buffer.put(writerIndex, tmpArray, 0, strLen);
writerIndex += strLen;
- buffer.unsafeWriterIndex(writerIndex);
+ buffer._unsafeWriterIndex(writerIndex);
}
}
@@ -406,7 +406,7 @@ public final class StringSerializer extends
Serializer<String> {
buffer.ensure(writerIndex + 9 + numBytes);
byte[] targetArray = buffer.getHeapMemory();
if (targetArray != null) {
- int arrIndex = buffer.unsafeHeapWriterIndex();
+ int arrIndex = buffer._unsafeHeapWriterIndex();
int written = LittleEndian.putVarUint36Small(targetArray, arrIndex,
header);
arrIndex += written;
writerIndex += written + numBytes;
@@ -424,7 +424,7 @@ public final class StringSerializer extends
Serializer<String> {
} else {
writerIndex = offHeapWriteCharsUTF16(buffer, chars, writerIndex, header,
numBytes);
}
- buffer.unsafeWriterIndex(writerIndex);
+ buffer._unsafeWriterIndex(writerIndex);
}
private static void heapWriteCharsUTF16BE(
@@ -458,11 +458,11 @@ public final class StringSerializer extends
Serializer<String> {
buffer.checkReadableBytes(numBytes);
byte[] targetArray = buffer.getHeapMemory();
if (targetArray != null) {
- int srcIndex = buffer.unsafeHeapReaderIndex();
+ int srcIndex = buffer._unsafeHeapReaderIndex();
for (int i = 0; i < numBytes; i++) {
chars[i] = (char) (targetArray[srcIndex++] & 0xff);
}
- buffer.increaseReaderIndexUnsafe(numBytes);
+ buffer._increaseReaderIndexUnsafe(numBytes);
} else {
byte[] byteArray = getByteArray(numBytes);
buffer.readBytes(byteArray, 0, numBytes);
@@ -483,14 +483,14 @@ public final class StringSerializer extends
Serializer<String> {
final byte[] targetArray = buffer.getHeapMemory();
if (targetArray != null) {
int charIndex = 0;
- for (int i = buffer.unsafeHeapReaderIndex(), end = i + numBytes; i <
end; i += 2) {
+ for (int i = buffer._unsafeHeapReaderIndex(), end = i + numBytes; i <
end; i += 2) {
char c =
(char)
((targetArray[i] & 0xff << StringUTF16.HI_BYTE_SHIFT)
| ((targetArray[i + 1] & 0xff) <<
StringUTF16.LO_BYTE_SHIFT));
chars[charIndex++] = c;
}
- buffer.increaseReaderIndexUnsafe(numBytes);
+ buffer._increaseReaderIndexUnsafe(numBytes);
} else {
final byte[] tmpArray = getByteArray(numBytes);
buffer.readBytes(tmpArray, 0, numBytes);
@@ -651,7 +651,8 @@ public final class StringSerializer extends
Serializer<String> {
final byte[] targetArray = buffer.getHeapMemory();
if (targetArray != null) {
String str =
- new String(targetArray, buffer.unsafeHeapReaderIndex(), numBytes,
StandardCharsets.UTF_8);
+ new String(
+ targetArray, buffer._unsafeHeapReaderIndex(), numBytes,
StandardCharsets.UTF_8);
buffer.increaseReaderIndex(numBytes);
return str;
} else {
diff --git
a/java/fury-core/src/test/java/org/apache/fury/memory/BitUtilsTest.java
b/java/fury-core/src/test/java/org/apache/fury/memory/BitUtilsTest.java
index 88c2c0b4..0dc9cc5a 100644
--- a/java/fury-core/src/test/java/org/apache/fury/memory/BitUtilsTest.java
+++ b/java/fury-core/src/test/java/org/apache/fury/memory/BitUtilsTest.java
@@ -50,7 +50,7 @@ public class BitUtilsTest {
public void getNullCount() {
int valueCount = 14;
MemoryBuffer buffer = MemoryUtils.buffer(valueCount);
- buffer.put(0, (byte) 0b11000000);
+ buffer.putByte(0, (byte) 0b11000000);
assertEquals(BitUtils.getNullCount(buffer, 0, 8), 6);
}
diff --git
a/java/fury-core/src/test/java/org/apache/fury/memory/MemoryBufferTest.java
b/java/fury-core/src/test/java/org/apache/fury/memory/MemoryBufferTest.java
index 7adda9fd..58f12aa9 100644
--- a/java/fury-core/src/test/java/org/apache/fury/memory/MemoryBufferTest.java
+++ b/java/fury-core/src/test/java/org/apache/fury/memory/MemoryBufferTest.java
@@ -33,20 +33,20 @@ public class MemoryBufferTest {
@Test
public void testBufferPut() {
MemoryBuffer buffer = MemoryUtils.buffer(16);
- buffer.put(0, (byte) 10);
- assertEquals(buffer.get(0), (byte) 10);
+ buffer.putByte(0, (byte) 10);
+ assertEquals(buffer.getByte(0), (byte) 10);
buffer.putChar(0, 'a');
assertEquals(buffer.getChar(0), 'a');
- buffer.putShort(0, (short) 10);
- assertEquals(buffer.getShort(0), (short) 10);
- buffer.putInt(0, Integer.MAX_VALUE);
- assertEquals(buffer.getInt(0), Integer.MAX_VALUE);
- buffer.putLong(0, Long.MAX_VALUE);
- assertEquals(buffer.getLong(0), Long.MAX_VALUE);
- buffer.putFloat(0, Float.MAX_VALUE);
- assertEquals(buffer.getFloat(0), Float.MAX_VALUE);
- buffer.putDouble(0, Double.MAX_VALUE);
- assertEquals(buffer.getDouble(0), Double.MAX_VALUE);
+ buffer.putInt16(0, (short) 10);
+ assertEquals(buffer.getInt16(0), (short) 10);
+ buffer.putInt32(0, Integer.MAX_VALUE);
+ assertEquals(buffer.getInt32(0), Integer.MAX_VALUE);
+ buffer.putInt64(0, Long.MAX_VALUE);
+ assertEquals(buffer.getInt64(0), Long.MAX_VALUE);
+ buffer.putFloat32(0, Float.MAX_VALUE);
+ assertEquals(buffer.getFloat32(0), Float.MAX_VALUE);
+ buffer.putFloat64(0, Double.MAX_VALUE);
+ assertEquals(buffer.getFloat64(0), Double.MAX_VALUE);
}
@Test
@@ -81,7 +81,7 @@ public class MemoryBufferTest {
MemoryBuffer buffer = MemoryUtils.buffer(1024);
byte[] heapMemory = buffer.getHeapMemory();
long pos = buffer.getUnsafeAddress();
- assertEquals(buffer.getUnsafeWriterAddress(), pos);
+ assertEquals(buffer._unsafeWriterAddress(), pos);
assertEquals(buffer.getUnsafeReaderAddress(), pos);
Platform.putByte(heapMemory, pos, Byte.MIN_VALUE);
pos += 1;
@@ -94,43 +94,43 @@ public class MemoryBufferTest {
LittleEndian.putFloat64(heapMemory, pos, -1);
pos += 8;
LittleEndian.putFloat32(heapMemory, pos, -1);
- assertEquals(buffer.getFloat((int) (pos - Platform.BYTE_ARRAY_OFFSET)),
-1);
+ assertEquals(buffer.getFloat32((int) (pos -
Platform.BYTE_ARRAY_OFFSET)), -1);
pos -= 8;
- assertEquals(buffer.getDouble((int) (pos - Platform.BYTE_ARRAY_OFFSET)),
-1);
+ assertEquals(buffer.getFloat64((int) (pos -
Platform.BYTE_ARRAY_OFFSET)), -1);
pos -= 8;
assertEquals(LittleEndian.getInt64(heapMemory, pos), Long.MAX_VALUE);
pos -= 4;
assertEquals(LittleEndian.getInt32(heapMemory, pos), Integer.MIN_VALUE);
pos -= 2;
- assertEquals(buffer.getShort((int) (pos - Platform.BYTE_ARRAY_OFFSET)),
Short.MAX_VALUE);
+ assertEquals(buffer.getInt16((int) (pos - Platform.BYTE_ARRAY_OFFSET)),
Short.MAX_VALUE);
pos -= 1;
- assertEquals(buffer.get((int) (pos - Platform.BYTE_ARRAY_OFFSET)),
Byte.MIN_VALUE);
+ assertEquals(buffer.getByte((int) (pos - Platform.BYTE_ARRAY_OFFSET)),
Byte.MIN_VALUE);
}
{
MemoryBuffer buffer = MemoryUtils.buffer(1024);
int index = 0;
- buffer._unsafePut(index, Byte.MIN_VALUE);
+ buffer._unsafePutByte(index, Byte.MIN_VALUE);
index += 1;
- buffer._unsafePutShort(index, Short.MAX_VALUE);
+ buffer._unsafePutInt16(index, Short.MAX_VALUE);
index += 2;
- buffer.putInt(index, Integer.MIN_VALUE);
+ buffer.putInt32(index, Integer.MIN_VALUE);
index += 4;
- buffer._unsafePutLong(index, Long.MAX_VALUE);
+ buffer._unsafePutInt64(index, Long.MAX_VALUE);
index += 8;
- buffer.putDouble(index, -1);
+ buffer.putFloat64(index, -1);
index += 8;
- buffer.putFloat(index, -1);
- assertEquals(buffer.getFloat(index), -1);
+ buffer.putFloat32(index, -1);
+ assertEquals(buffer.getFloat32(index), -1);
index -= 8;
- assertEquals(buffer.getDouble(index), -1);
+ assertEquals(buffer.getFloat64(index), -1);
index -= 8;
- assertEquals(buffer._unsafeGetLong(index), Long.MAX_VALUE);
+ assertEquals(buffer._unsafeGetInt64(index), Long.MAX_VALUE);
index -= 4;
- assertEquals(buffer.getInt(index), Integer.MIN_VALUE);
+ assertEquals(buffer.getInt32(index), Integer.MIN_VALUE);
index -= 2;
- assertEquals(buffer.getShort(index), Short.MAX_VALUE);
+ assertEquals(buffer.getInt16(index), Short.MAX_VALUE);
index -= 1;
- assertEquals(buffer.get(index), Byte.MIN_VALUE);
+ assertEquals(buffer.getByte(index), Byte.MIN_VALUE);
}
}
@@ -198,12 +198,12 @@ public class MemoryBufferTest {
public void testEqualTo() {
MemoryBuffer buf1 = MemoryUtils.buffer(16);
MemoryBuffer buf2 = MemoryUtils.buffer(16);
- buf1.putLong(0, 10);
- buf2.putLong(0, 10);
- buf1.put(9, (byte) 1);
- buf2.put(9, (byte) 1);
+ buf1.putInt64(0, 10);
+ buf2.putInt64(0, 10);
+ buf1.putByte(9, (byte) 1);
+ buf2.putByte(9, (byte) 1);
Assert.assertTrue(buf1.equalTo(buf2, 0, 0, buf1.size()));
- buf1.put(9, (byte) 2);
+ buf1.putByte(9, (byte) 2);
Assert.assertFalse(buf1.equalTo(buf2, 0, 0, buf1.size()));
}
diff --git
a/java/fury-format/src/main/java/org/apache/fury/format/row/Getters.java
b/java/fury-format/src/main/java/org/apache/fury/format/row/Getters.java
index 9cb46396..33447d69 100644
--- a/java/fury-format/src/main/java/org/apache/fury/format/row/Getters.java
+++ b/java/fury-format/src/main/java/org/apache/fury/format/row/Getters.java
@@ -35,15 +35,15 @@ public interface Getters {
byte getByte(int ordinal);
- short getShort(int ordinal);
+ short getInt16(int ordinal);
- int getInt(int ordinal);
+ int getInt32(int ordinal);
- long getLong(int ordinal);
+ long getInt64(int ordinal);
- float getFloat(int ordinal);
+ float getFloat32(int ordinal);
- double getDouble(int ordinal);
+ double getFloat64(int ordinal);
BigDecimal getDecimal(int ordinal);
diff --git
a/java/fury-format/src/main/java/org/apache/fury/format/row/Setters.java
b/java/fury-format/src/main/java/org/apache/fury/format/row/Setters.java
index 257555ad..87edc77a 100644
--- a/java/fury-format/src/main/java/org/apache/fury/format/row/Setters.java
+++ b/java/fury-format/src/main/java/org/apache/fury/format/row/Setters.java
@@ -31,15 +31,15 @@ public interface Setters {
void setByte(int ordinal, byte value);
- void setShort(int ordinal, short value);
+ void setInt16(int ordinal, short value);
- void setInt(int ordinal, int value);
+ void setInt32(int ordinal, int value);
- void setLong(int ordinal, long value);
+ void setInt64(int ordinal, long value);
- void setFloat(int ordinal, float value);
+ void setFloat32(int ordinal, float value);
- void setDouble(int ordinal, double value);
+ void setFloat64(int ordinal, double value);
void setDate(int ordinal, int value);
diff --git
a/java/fury-format/src/main/java/org/apache/fury/format/row/ValueVisitor.java
b/java/fury-format/src/main/java/org/apache/fury/format/row/ValueVisitor.java
index b68086ab..1beece0b 100644
---
a/java/fury-format/src/main/java/org/apache/fury/format/row/ValueVisitor.java
+++
b/java/fury-format/src/main/java/org/apache/fury/format/row/ValueVisitor.java
@@ -44,11 +44,11 @@ class ValueVisitor extends
DefaultTypeVisitor<Function<Integer, Object>> {
case 1:
return getters::getByte;
case 2:
- return getters::getShort;
+ return getters::getInt16;
case 4:
- return getters::getInt;
+ return getters::getInt32;
case 8:
- return getters::getLong;
+ return getters::getInt64;
default:
return unsupported(type);
}
@@ -60,9 +60,9 @@ class ValueVisitor extends
DefaultTypeVisitor<Function<Integer, Object>> {
public Function<Integer, Object> visit(ArrowType.FloatingPoint type) {
switch (type.getPrecision()) {
case SINGLE:
- return getters::getFloat;
+ return getters::getFloat32;
case DOUBLE:
- return getters::getDouble;
+ return getters::getFloat64;
default:
return unsupported(type);
}
diff --git
a/java/fury-format/src/main/java/org/apache/fury/format/row/binary/BinaryArray.java
b/java/fury-format/src/main/java/org/apache/fury/format/row/binary/BinaryArray.java
index c8e263a0..c69114fe 100644
---
a/java/fury-format/src/main/java/org/apache/fury/format/row/binary/BinaryArray.java
+++
b/java/fury-format/src/main/java/org/apache/fury/format/row/binary/BinaryArray.java
@@ -67,7 +67,7 @@ public class BinaryArray extends UnsafeTrait implements
ArrayData {
public void pointTo(MemoryBuffer buffer, int offset, int sizeInBytes) {
// Read the numElements of key array from the aligned first 8 bytes as int.
- final int numElements = (int) buffer.getLong(offset);
+ final int numElements = (int) buffer.getInt64(offset);
assert numElements >= 0 : "numElements (" + numElements + ") should >= 0";
this.numElements = numElements;
this.buffer = buffer;
diff --git
a/java/fury-format/src/main/java/org/apache/fury/format/row/binary/BinaryMap.java
b/java/fury-format/src/main/java/org/apache/fury/format/row/binary/BinaryMap.java
index f79f0988..ea942baf 100644
---
a/java/fury-format/src/main/java/org/apache/fury/format/row/binary/BinaryMap.java
+++
b/java/fury-format/src/main/java/org/apache/fury/format/row/binary/BinaryMap.java
@@ -57,8 +57,8 @@ public class BinaryMap implements MapData {
this.sizeInBytes = keys.getSizeInBytes() + values.getSizeInBytes() + 8;
MemoryBuffer copyBuf = MemoryUtils.buffer(sizeInBytes);
- copyBuf.putInt(0, keys.getSizeInBytes());
- copyBuf.putInt(4, 0);
+ copyBuf.putInt32(0, keys.getSizeInBytes());
+ copyBuf.putInt32(4, 0);
keys.getBuffer().copyTo(baseOffset, copyBuf, 8, keys.getSizeInBytes());
values
.getBuffer()
@@ -71,7 +71,7 @@ public class BinaryMap implements MapData {
this.baseOffset = offset;
this.sizeInBytes = sizeInBytes;
// Read the numBytes of key array from the aligned first 8 bytes as int.
- final int keyArrayBytes = buf.getInt(offset);
+ final int keyArrayBytes = buf.getInt32(offset);
assert keyArrayBytes >= 0 : "keyArrayBytes (" + keyArrayBytes + ") should
>= 0";
final int valueArrayBytes = sizeInBytes - keyArrayBytes - 8;
assert valueArrayBytes >= 0 : "valueArraySize (" + valueArrayBytes + ")
should >= 0";
diff --git
a/java/fury-format/src/main/java/org/apache/fury/format/row/binary/BinaryRow.java
b/java/fury-format/src/main/java/org/apache/fury/format/row/binary/BinaryRow.java
index 194e200d..59d95d42 100644
---
a/java/fury-format/src/main/java/org/apache/fury/format/row/binary/BinaryRow.java
+++
b/java/fury-format/src/main/java/org/apache/fury/format/row/binary/BinaryRow.java
@@ -140,7 +140,7 @@ public class BinaryRow extends UnsafeTrait implements Row {
// To preserve row equality, zero out the value when setting the column to
null.
// Since this row does not currently support updates to variable-length
values, we don't
// have to worry about zeroing out that data.
- buffer.putLong(getOffset(ordinal), 0);
+ buffer.putInt64(getOffset(ordinal), 0);
}
public void setNotNullAt(int ordinal) {
@@ -210,7 +210,7 @@ public class BinaryRow extends UnsafeTrait implements Row {
if (i != 0) {
build.append(',');
}
- build.append(Long.toHexString(buffer.getLong(baseOffset + i)));
+ build.append(Long.toHexString(buffer.getInt64(baseOffset + i)));
}
return build.toString();
}
diff --git
a/java/fury-format/src/main/java/org/apache/fury/format/row/binary/BinaryUtils.java
b/java/fury-format/src/main/java/org/apache/fury/format/row/binary/BinaryUtils.java
index 8d09dc7b..f3e0bb1b 100644
---
a/java/fury-format/src/main/java/org/apache/fury/format/row/binary/BinaryUtils.java
+++
b/java/fury-format/src/main/java/org/apache/fury/format/row/binary/BinaryUtils.java
@@ -33,15 +33,15 @@ public class BinaryUtils {
|| TypeUtils.BOOLEAN_TYPE.equals(type)) {
return "getBoolean";
} else if (TypeUtils.PRIMITIVE_SHORT_TYPE.equals(type) ||
TypeUtils.SHORT_TYPE.equals(type)) {
- return "getShort";
+ return "getInt16";
} else if (TypeUtils.PRIMITIVE_INT_TYPE.equals(type) ||
TypeUtils.INT_TYPE.equals(type)) {
- return "getInt";
+ return "getInt32";
} else if (TypeUtils.PRIMITIVE_LONG_TYPE.equals(type) ||
TypeUtils.LONG_TYPE.equals(type)) {
- return "getLong";
+ return "getInt64";
} else if (TypeUtils.PRIMITIVE_FLOAT_TYPE.equals(type) ||
TypeUtils.FLOAT_TYPE.equals(type)) {
- return "getFloat";
+ return "getFloat32";
} else if (TypeUtils.PRIMITIVE_DOUBLE_TYPE.equals(type) ||
TypeUtils.DOUBLE_TYPE.equals(type)) {
- return "getDouble";
+ return "getFloat64";
} else if (TypeUtils.BIG_DECIMAL_TYPE.equals(type)) {
return "getDecimal";
} else if (TypeUtils.DATE_TYPE.equals(type)) {
diff --git
a/java/fury-format/src/main/java/org/apache/fury/format/row/binary/UnsafeTrait.java
b/java/fury-format/src/main/java/org/apache/fury/format/row/binary/UnsafeTrait.java
index e0714c10..0b7d1d5f 100644
---
a/java/fury-format/src/main/java/org/apache/fury/format/row/binary/UnsafeTrait.java
+++
b/java/fury-format/src/main/java/org/apache/fury/format/row/binary/UnsafeTrait.java
@@ -43,7 +43,7 @@ abstract class UnsafeTrait implements Getters, Setters {
if (isNullAt(ordinal)) {
return null;
}
- final long offsetAndSize = getLong(ordinal);
+ final long offsetAndSize = getInt64(ordinal);
final int relativeOffset = (int) (offsetAndSize >> 32);
final int size = (int) offsetAndSize;
return getBuffer().slice(getBaseOffset() + relativeOffset, size);
@@ -66,42 +66,42 @@ abstract class UnsafeTrait implements Getters, Setters {
public byte getByte(int ordinal) {
assertIndexIsValid(ordinal);
- return getBuffer().get(getOffset(ordinal));
+ return getBuffer().getByte(getOffset(ordinal));
}
- public short getShort(int ordinal) {
+ public short getInt16(int ordinal) {
assertIndexIsValid(ordinal);
- return getBuffer().getShort(getOffset(ordinal));
+ return getBuffer().getInt16(getOffset(ordinal));
}
- public int getInt(int ordinal) {
+ public int getInt32(int ordinal) {
assertIndexIsValid(ordinal);
- return getBuffer().getInt(getOffset(ordinal));
+ return getBuffer().getInt32(getOffset(ordinal));
}
- public long getLong(int ordinal) {
+ public long getInt64(int ordinal) {
assertIndexIsValid(ordinal);
- return getBuffer().getLong(getOffset(ordinal));
+ return getBuffer().getInt64(getOffset(ordinal));
}
- public float getFloat(int ordinal) {
+ public float getFloat32(int ordinal) {
assertIndexIsValid(ordinal);
- return getBuffer().getFloat(getOffset(ordinal));
+ return getBuffer().getFloat32(getOffset(ordinal));
}
- public double getDouble(int ordinal) {
+ public double getFloat64(int ordinal) {
assertIndexIsValid(ordinal);
- return getBuffer().getDouble(getOffset(ordinal));
+ return getBuffer().getFloat64(getOffset(ordinal));
}
public int getDate(int ordinal) {
assertIndexIsValid(ordinal);
- return getBuffer().getInt(getOffset(ordinal));
+ return getBuffer().getInt32(getOffset(ordinal));
}
public long getTimestamp(int ordinal) {
assertIndexIsValid(ordinal);
- return getBuffer().getLong(getOffset(ordinal));
+ return getBuffer().getInt64(getOffset(ordinal));
}
// TODO when length of string utf-8 bytes is less than 8, store it in
fixed-width region. Use one
@@ -121,7 +121,7 @@ abstract class UnsafeTrait implements Getters, Setters {
if (isNullAt(ordinal)) {
return null;
} else {
- final long offsetAndSize = getLong(ordinal);
+ final long offsetAndSize = getInt64(ordinal);
final int relativeOffset = (int) (offsetAndSize >> 32);
final int size = (int) offsetAndSize;
final byte[] bytes = new byte[size];
@@ -147,7 +147,7 @@ abstract class UnsafeTrait implements Getters, Setters {
if (isNullAt(ordinal)) {
return null;
}
- final long offsetAndSize = getLong(ordinal);
+ final long offsetAndSize = getInt64(ordinal);
final int relativeOffset = (int) (offsetAndSize >> 32);
final int size = (int) offsetAndSize;
BinaryRow row = new BinaryRow(DataTypes.createSchema(field));
@@ -159,7 +159,7 @@ abstract class UnsafeTrait implements Getters, Setters {
if (isNullAt(ordinal)) {
return null;
}
- final long offsetAndSize = getLong(ordinal);
+ final long offsetAndSize = getInt64(ordinal);
final int relativeOffset = (int) (offsetAndSize >> 32);
final int size = (int) offsetAndSize;
BinaryArray array = new BinaryArray(field);
@@ -171,7 +171,7 @@ abstract class UnsafeTrait implements Getters, Setters {
if (isNullAt(ordinal)) {
return null;
}
- final long offsetAndSize = getLong(ordinal);
+ final long offsetAndSize = getInt64(ordinal);
final int relativeOffset = (int) (offsetAndSize >> 32);
final int size = (int) offsetAndSize;
BinaryMap map = new BinaryMap(field);
@@ -194,57 +194,57 @@ abstract class UnsafeTrait implements Getters, Setters {
public void setByte(int ordinal, byte value) {
assertIndexIsValid(ordinal);
setNotNullAt(ordinal);
- getBuffer().put(getOffset(ordinal), value);
+ getBuffer().putByte(getOffset(ordinal), value);
}
protected abstract void setNotNullAt(int ordinal);
@Override
- public void setShort(int ordinal, short value) {
+ public void setInt16(int ordinal, short value) {
assertIndexIsValid(ordinal);
setNotNullAt(ordinal);
- getBuffer().putShort(getOffset(ordinal), value);
+ getBuffer().putInt16(getOffset(ordinal), value);
}
@Override
- public void setInt(int ordinal, int value) {
+ public void setInt32(int ordinal, int value) {
assertIndexIsValid(ordinal);
setNotNullAt(ordinal);
- getBuffer().putInt(getOffset(ordinal), value);
+ getBuffer().putInt32(getOffset(ordinal), value);
}
@Override
- public void setLong(int ordinal, long value) {
+ public void setInt64(int ordinal, long value) {
assertIndexIsValid(ordinal);
setNotNullAt(ordinal);
- getBuffer().putLong(getOffset(ordinal), value);
+ getBuffer().putInt64(getOffset(ordinal), value);
}
@Override
- public void setFloat(int ordinal, float value) {
+ public void setFloat32(int ordinal, float value) {
assertIndexIsValid(ordinal);
setNotNullAt(ordinal);
- getBuffer().putFloat(getOffset(ordinal), value);
+ getBuffer().putFloat32(getOffset(ordinal), value);
}
@Override
- public void setDouble(int ordinal, double value) {
+ public void setFloat64(int ordinal, double value) {
assertIndexIsValid(ordinal);
setNotNullAt(ordinal);
- getBuffer().putDouble(getOffset(ordinal), value);
+ getBuffer().putFloat64(getOffset(ordinal), value);
}
@Override
public void setDate(int ordinal, int value) {
assertIndexIsValid(ordinal);
setNotNullAt(ordinal);
- getBuffer().putInt(getOffset(ordinal), value);
+ getBuffer().putInt32(getOffset(ordinal), value);
}
@Override
public void setTimestamp(int ordinal, long value) {
assertIndexIsValid(ordinal);
setNotNullAt(ordinal);
- getBuffer().putLong(getOffset(ordinal), value);
+ getBuffer().putInt64(getOffset(ordinal), value);
}
}
diff --git
a/java/fury-format/src/main/java/org/apache/fury/format/row/binary/writer/BinaryArrayWriter.java
b/java/fury-format/src/main/java/org/apache/fury/format/row/binary/writer/BinaryArrayWriter.java
index 5d201dba..9bd72d8b 100644
---
a/java/fury-format/src/main/java/org/apache/fury/format/row/binary/writer/BinaryArrayWriter.java
+++
b/java/fury-format/src/main/java/org/apache/fury/format/row/binary/writer/BinaryArrayWriter.java
@@ -104,17 +104,17 @@ public class BinaryArrayWriter extends BinaryWriter {
// Write numElements and clear out null bits to header
// store numElements in header in aligned 8 byte, though numElements is 4
byte int
- buffer.putLong(startIndex, numElements);
+ buffer.putInt64(startIndex, numElements);
int end = startIndex + headerInBytes;
for (int i = startIndex + 8; i < end; i += 8) {
- buffer.putLong(i, 0L);
+ buffer.putInt64(i, 0L);
}
// fill 0 into reminder part of 8-bytes alignment
for (int i = elementSize * numElements; i < fixedPartInBytes; i++) {
- buffer.put(startIndex + headerInBytes + i, (byte) 0);
+ buffer.putByte(startIndex + headerInBytes + i, (byte) 0);
}
- buffer.increaseWriterIndexUnsafe(headerInBytes + fixedPartInBytes);
+ buffer._increaseWriterIndexUnsafe(headerInBytes + fixedPartInBytes);
}
private void assertIndexIsValid(int index) {
@@ -130,7 +130,7 @@ public class BinaryArrayWriter extends BinaryWriter {
@Override
public void write(int ordinal, byte value) {
setNotNullAt(ordinal);
- buffer.put(getOffset(ordinal), value);
+ buffer.putByte(getOffset(ordinal), value);
}
@Override
@@ -142,19 +142,19 @@ public class BinaryArrayWriter extends BinaryWriter {
@Override
public void write(int ordinal, short value) {
setNotNullAt(ordinal);
- buffer.putShort(getOffset(ordinal), value);
+ buffer.putInt16(getOffset(ordinal), value);
}
@Override
public void write(int ordinal, int value) {
setNotNullAt(ordinal);
- buffer.putInt(getOffset(ordinal), value);
+ buffer.putInt32(getOffset(ordinal), value);
}
@Override
public void write(int ordinal, float value) {
setNotNullAt(ordinal);
- buffer.putFloat(getOffset(ordinal), value);
+ buffer.putFloat32(getOffset(ordinal), value);
}
@Override
diff --git
a/java/fury-format/src/main/java/org/apache/fury/format/row/binary/writer/BinaryRowWriter.java
b/java/fury-format/src/main/java/org/apache/fury/format/row/binary/writer/BinaryRowWriter.java
index aa0f9d4a..04bcd336 100644
---
a/java/fury-format/src/main/java/org/apache/fury/format/row/binary/writer/BinaryRowWriter.java
+++
b/java/fury-format/src/main/java/org/apache/fury/format/row/binary/writer/BinaryRowWriter.java
@@ -76,10 +76,10 @@ public class BinaryRowWriter extends BinaryWriter {
public void reset() {
super.startIndex = buffer.writerIndex();
grow(fixedSize);
- buffer.increaseWriterIndexUnsafe(fixedSize);
+ buffer._increaseWriterIndexUnsafe(fixedSize);
int end = startIndex + headerInBytes;
for (int i = startIndex; i < end; i += 8) {
- buffer.putLong(i, 0L);
+ buffer.putInt64(i, 0L);
}
}
@@ -91,36 +91,36 @@ public class BinaryRowWriter extends BinaryWriter {
@Override
public void write(int ordinal, byte value) {
final int offset = getOffset(ordinal);
- buffer.putLong(offset, 0L);
- buffer.put(offset, value);
+ buffer.putInt64(offset, 0L);
+ buffer.putByte(offset, value);
}
@Override
public void write(int ordinal, boolean value) {
final int offset = getOffset(ordinal);
- buffer.putLong(offset, 0L);
+ buffer.putInt64(offset, 0L);
buffer.putBoolean(offset, value);
}
@Override
public void write(int ordinal, short value) {
final int offset = getOffset(ordinal);
- buffer.putLong(offset, 0L);
- buffer.putShort(offset, value);
+ buffer.putInt64(offset, 0L);
+ buffer.putInt16(offset, value);
}
@Override
public void write(int ordinal, int value) {
final int offset = getOffset(ordinal);
- buffer.putLong(offset, 0L);
- buffer.putInt(offset, value);
+ buffer.putInt64(offset, 0L);
+ buffer.putInt32(offset, value);
}
@Override
public void write(int ordinal, float value) {
final int offset = getOffset(ordinal);
- buffer.putLong(offset, 0L);
- buffer.putFloat(offset, value);
+ buffer.putInt64(offset, 0L);
+ buffer.putFloat32(offset, value);
}
@Override
diff --git
a/java/fury-format/src/main/java/org/apache/fury/format/row/binary/writer/BinaryWriter.java
b/java/fury-format/src/main/java/org/apache/fury/format/row/binary/writer/BinaryWriter.java
index ba35fc2e..b3454e3b 100644
---
a/java/fury-format/src/main/java/org/apache/fury/format/row/binary/writer/BinaryWriter.java
+++
b/java/fury-format/src/main/java/org/apache/fury/format/row/binary/writer/BinaryWriter.java
@@ -93,7 +93,7 @@ public abstract class BinaryWriter {
int newVal = end - writerIndex;
buffer.grow(newVal);
for (int i = maybeEnd; i < end; i++) {
- buffer.put(i, (byte) 0);
+ buffer.putByte(i, (byte) 0);
}
buffer.increaseWriterIndex(newVal);
}
@@ -116,7 +116,7 @@ public abstract class BinaryWriter {
/** if numBytes is not multiple of 8, zero 8 byte until multiple of 8. */
protected final void zeroOutPaddingBytes(int numBytes) {
if ((numBytes & 0x07) > 0) {
- buffer.putLong(buffer.writerIndex() + ((numBytes >> 3) << 3), 0L);
+ buffer.putInt64(buffer.writerIndex() + ((numBytes >> 3) << 3), 0L);
}
}
@@ -151,11 +151,11 @@ public abstract class BinaryWriter {
public abstract void write(int ordinal, BigDecimal input);
public final void write(int ordinal, long value) {
- buffer.putLong(getOffset(ordinal), value);
+ buffer.putInt64(getOffset(ordinal), value);
}
public final void write(int ordinal, double value) {
- buffer.putDouble(getOffset(ordinal), value);
+ buffer.putFloat64(getOffset(ordinal), value);
}
// String is not 8-byte aligned
@@ -190,7 +190,7 @@ public abstract class BinaryWriter {
zeroOutPaddingBytes(numBytes);
buffer.put(buffer.writerIndex(), input, offset, numBytes);
setOffsetAndSize(ordinal, numBytes);
- buffer.increaseWriterIndexUnsafe(roundedSize);
+ buffer._increaseWriterIndexUnsafe(roundedSize);
}
/** This operation will increase writerIndex by aligned 8-byte. */
@@ -200,7 +200,7 @@ public abstract class BinaryWriter {
zeroOutPaddingBytes(numBytes);
buffer.copyFrom(buffer.writerIndex(), input, offset, numBytes);
setOffsetAndSize(ordinal, numBytes);
- buffer.increaseWriterIndexUnsafe(roundedSize);
+ buffer._increaseWriterIndexUnsafe(roundedSize);
}
public final void writeAlignedBytes(
@@ -231,13 +231,13 @@ public abstract class BinaryWriter {
/** write long value to position pointed by current writerIndex. */
public final void writeDirectly(long value) {
buffer.grow(8);
- buffer.putLong(writerIndex(), value);
- buffer.increaseWriterIndexUnsafe(8);
+ buffer.putInt64(writerIndex(), value);
+ buffer._increaseWriterIndexUnsafe(8);
}
/** write long value to position pointed by offset. */
public final void writeDirectly(int offset, long value) {
- buffer.putLong(offset, value);
+ buffer.putInt64(offset, value);
}
public final void copyTo(BinaryWriter writer, int ordinal) {
diff --git
a/java/fury-format/src/main/java/org/apache/fury/format/type/DataTypes.java
b/java/fury-format/src/main/java/org/apache/fury/format/type/DataTypes.java
index fb832e44..383be40c 100644
--- a/java/fury-format/src/main/java/org/apache/fury/format/type/DataTypes.java
+++ b/java/fury-format/src/main/java/org/apache/fury/format/type/DataTypes.java
@@ -503,7 +503,7 @@ public class DataTypes {
Type typeID = getTypeId(field.getType());
while (true) {
try {
- hash = Math.addExact(Math.multiplyExact(hash, 31), typeID.getId());
+ hash = Math.addExact(Math.multiplyExact(hash, 31), (long)
typeID.getId());
break;
} catch (ArithmeticException e) {
hash = hash >> 2;
diff --git
a/java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowWriter.java
b/java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowWriter.java
index 4f1f5b00..353f160d 100644
---
a/java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowWriter.java
+++
b/java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowWriter.java
@@ -289,7 +289,7 @@ class ShortWriter extends ArrowArrayWriter {
@Override
void appendValue(Getters getters, int fieldIndex) {
- valueVector.setSafe(rowCount, getters.getShort(fieldIndex));
+ valueVector.setSafe(rowCount, getters.getInt16(fieldIndex));
}
@Override
@@ -312,7 +312,7 @@ class IntWriter extends ArrowArrayWriter {
@Override
void appendValue(Getters getters, int fieldIndex) {
- valueVector.setSafe(rowCount, getters.getInt(fieldIndex));
+ valueVector.setSafe(rowCount, getters.getInt32(fieldIndex));
}
@Override
@@ -335,7 +335,7 @@ class LongWriter extends ArrowArrayWriter {
@Override
void appendValue(Getters getters, int fieldIndex) {
- valueVector.setSafe(rowCount, getters.getLong(fieldIndex));
+ valueVector.setSafe(rowCount, getters.getInt64(fieldIndex));
}
@Override
@@ -358,7 +358,7 @@ class FloatWriter extends ArrowArrayWriter {
@Override
void appendValue(Getters getters, int fieldIndex) {
- valueVector.setSafe(rowCount, getters.getFloat(fieldIndex));
+ valueVector.setSafe(rowCount, getters.getFloat32(fieldIndex));
}
@Override
@@ -381,7 +381,7 @@ class DoubleWriter extends ArrowArrayWriter {
@Override
void appendValue(Getters getters, int fieldIndex) {
- valueVector.setSafe(rowCount, getters.getDouble(fieldIndex));
+ valueVector.setSafe(rowCount, getters.getFloat64(fieldIndex));
}
@Override
@@ -479,7 +479,7 @@ class DateWriter extends ArrowArrayWriter {
@Override
void appendValue(Getters getters, int fieldIndex) {
- valueVector.setSafe(rowCount, getters.getInt(fieldIndex));
+ valueVector.setSafe(rowCount, getters.getInt32(fieldIndex));
}
@Override
@@ -502,7 +502,7 @@ class TimestampWriter extends ArrowArrayWriter {
@Override
void appendValue(Getters getters, int fieldIndex) {
- valueVector.setSafe(rowCount, getters.getLong(fieldIndex));
+ valueVector.setSafe(rowCount, getters.getInt64(fieldIndex));
}
@Override
diff --git
a/java/fury-format/src/test/java/org/apache/fury/format/row/binary/BinaryArrayTest.java
b/java/fury-format/src/test/java/org/apache/fury/format/row/binary/BinaryArrayTest.java
index 4ddba406..f907b2f1 100644
---
a/java/fury-format/src/test/java/org/apache/fury/format/row/binary/BinaryArrayTest.java
+++
b/java/fury-format/src/test/java/org/apache/fury/format/row/binary/BinaryArrayTest.java
@@ -71,14 +71,14 @@ public class BinaryArrayTest {
for (int i = 0; i < iterNums; i++) {
for (int j = 0; j < length; j++) {
- elem = binaryArray.getInt(j);
+ elem = binaryArray.getInt32(j);
}
}
// test binary array
startTime = System.nanoTime();
for (int i = 0; i < iterNums; i++) {
for (int j = 0; j < length; j++) {
- elem = binaryArray.getInt(j);
+ elem = binaryArray.getInt32(j);
}
}
duration = System.nanoTime() - startTime;
diff --git
a/java/fury-format/src/test/java/org/apache/fury/format/row/binary/BinaryMapTest.java
b/java/fury-format/src/test/java/org/apache/fury/format/row/binary/BinaryMapTest.java
index be900bc0..b5c57977 100644
---
a/java/fury-format/src/test/java/org/apache/fury/format/row/binary/BinaryMapTest.java
+++
b/java/fury-format/src/test/java/org/apache/fury/format/row/binary/BinaryMapTest.java
@@ -47,7 +47,7 @@ public class BinaryMapTest {
keyArrayWriter.getStartIndex(),
keyArrayWriter.size());
writerIndex += keyArrayWriter.size();
- buffer.putLong(0, keyArrayWriter.size());
+ buffer.putInt64(0, keyArrayWriter.size());
BinaryArrayWriter valueArrayWriter =
new BinaryArrayWriter(DataTypes.arrayField(DataTypes.utf8()));
valueArrayWriter.reset(2);
diff --git
a/java/fury-format/src/test/java/org/apache/fury/format/row/binary/BinaryRowTest.java
b/java/fury-format/src/test/java/org/apache/fury/format/row/binary/BinaryRowTest.java
index 3cd0336b..03e4d75d 100644
---
a/java/fury-format/src/test/java/org/apache/fury/format/row/binary/BinaryRowTest.java
+++
b/java/fury-format/src/test/java/org/apache/fury/format/row/binary/BinaryRowTest.java
@@ -41,34 +41,34 @@ public class BinaryRowTest {
@Test(enabled = false)
public void testAlign() {
MemoryBuffer buf = MemoryUtils.buffer(64);
- buf.putLong(6, 100L);
- buf.putLong(14, 100L);
+ buf.putInt64(6, 100L);
+ buf.putInt64(14, 100L);
long nums = 1000_000_000;
// warm
for (int i = 0; i < nums; i++) {
- buf.getLong(6);
- buf.getLong(14);
+ buf.getInt64(6);
+ buf.getInt64(14);
}
long t = System.nanoTime();
for (int i = 0; i < nums; i++) {
- buf.getLong(6);
- buf.getLong(14);
+ buf.getInt64(6);
+ buf.getInt64(14);
}
long duration = System.nanoTime() - t;
System.out.format("non-aligned cost:\ttotal %sns %sms\n", duration,
duration / 1000_000);
MemoryBuffer buf2 = MemoryUtils.buffer(64);
- buf2.putLong(8, 100L);
- buf2.putLong(16, 100L);
+ buf2.putInt64(8, 100L);
+ buf2.putInt64(16, 100L);
// warm
for (int i = 0; i < nums; i++) {
- buf2.getLong(8);
- buf2.getLong(16);
+ buf2.getInt64(8);
+ buf2.getInt64(16);
}
t = System.nanoTime();
for (int i = 0; i < nums; i++) {
- buf2.getLong(8);
- buf2.getLong(16);
+ buf2.getInt64(8);
+ buf2.getInt64(16);
}
duration = System.nanoTime() - t;
System.out.format("aligned cost:\ttotal %sns %sms\n", duration, duration /
1000_000);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@fury.apache.org
For additional commands, e-mail: commits-h...@fury.apache.org
