Skip to content

Commit ea9fda9

Browse files
use default endian - not BE
1 parent e0445ef commit ea9fda9

1 file changed

Lines changed: 18 additions & 18 deletions

File tree

src/main/java/org/apache/datasketches/count/CountMinSketch.java

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
import static java.lang.foreign.ValueLayout.JAVA_BYTE;
3232
import java.util.Random;
3333

34-
import static org.apache.datasketches.common.SpecialValueLayouts.JAVA_INT_UNALIGNED_BIG_ENDIAN;
35-
import static org.apache.datasketches.common.SpecialValueLayouts.JAVA_LONG_UNALIGNED_BIG_ENDIAN;
36-
import static org.apache.datasketches.common.SpecialValueLayouts.JAVA_SHORT_UNALIGNED_BIG_ENDIAN;
34+
import static java.lang.foreign.ValueLayout.JAVA_INT_UNALIGNED;
35+
import static java.lang.foreign.ValueLayout.JAVA_LONG_UNALIGNED;
36+
import static java.lang.foreign.ValueLayout.JAVA_SHORT_UNALIGNED;
3737

3838

3939
public class CountMinSketch {
@@ -113,7 +113,7 @@ int mask() {
113113
*/
114114
private static byte[] longToBytes(final long value) {
115115
final MemorySegment segment = LONG_SEGMENT.get();
116-
segment.set(JAVA_LONG_UNALIGNED_BIG_ENDIAN, 0, value);
116+
segment.set(JAVA_LONG_UNALIGNED, 0, value);
117117
return segment.toArray(JAVA_BYTE);
118118
}
119119

@@ -393,9 +393,9 @@ private int getSerializedSizeBytes() {
393393
public byte[] toByteArray() {
394394
final int serializedSizeBytes = getSerializedSizeBytes();
395395
final MemorySegment wseg = MemorySegment.ofArray(new byte[serializedSizeBytes]);
396-
396+
397397
long offset = 0;
398-
398+
399399
// Long 0
400400
final int preambleLongs = Family.COUNTMIN.getMinPreLongs();
401401
wseg.set(JAVA_BYTE, offset++, (byte) preambleLongs);
@@ -406,31 +406,31 @@ public byte[] toByteArray() {
406406
final int flagsByte = isEmpty() ? Flag.IS_EMPTY.mask() : 0;
407407
wseg.set(JAVA_BYTE, offset++, (byte) flagsByte);
408408
final int NULL_32 = 0;
409-
wseg.set(JAVA_INT_UNALIGNED_BIG_ENDIAN, offset, NULL_32);
409+
wseg.set(JAVA_INT_UNALIGNED, offset, NULL_32);
410410
offset += 4;
411411

412412
// Long 1
413-
wseg.set(JAVA_INT_UNALIGNED_BIG_ENDIAN, offset, numBuckets_);
413+
wseg.set(JAVA_INT_UNALIGNED, offset, numBuckets_);
414414
offset += 4;
415415
wseg.set(JAVA_BYTE, offset++, numHashes_);
416416
short hashSeed = Util.computeSeedHash(seed_);
417-
wseg.set(JAVA_SHORT_UNALIGNED_BIG_ENDIAN, offset, hashSeed);
417+
wseg.set(JAVA_SHORT_UNALIGNED, offset, hashSeed);
418418
offset += 2;
419419
final byte NULL_8 = 0;
420420
wseg.set(JAVA_BYTE, offset++, NULL_8);
421-
421+
422422
if (isEmpty()) {
423423
return wseg.toArray(JAVA_BYTE);
424424
}
425425

426-
wseg.set(JAVA_LONG_UNALIGNED_BIG_ENDIAN, offset, totalWeight_);
426+
wseg.set(JAVA_LONG_UNALIGNED, offset, totalWeight_);
427427
offset += 8;
428428

429429
for (long w: sketchArray_) {
430-
wseg.set(JAVA_LONG_UNALIGNED_BIG_ENDIAN, offset, w);
430+
wseg.set(JAVA_LONG_UNALIGNED, offset, w);
431431
offset += 8;
432432
}
433-
433+
434434
return wseg.toArray(JAVA_BYTE);
435435
}
436436

@@ -448,13 +448,13 @@ public static CountMinSketch deserialize(final byte[] b, final long seed) {
448448
final byte serialVersion = buf.get(JAVA_BYTE, offset++);
449449
final byte familyId = buf.get(JAVA_BYTE, offset++);
450450
final byte flagsByte = buf.get(JAVA_BYTE, offset++);
451-
final int NULL_32 = buf.get(JAVA_INT_UNALIGNED_BIG_ENDIAN, offset);
451+
final int NULL_32 = buf.get(JAVA_INT_UNALIGNED, offset);
452452
offset += 4;
453453

454-
final int numBuckets = buf.get(JAVA_INT_UNALIGNED_BIG_ENDIAN, offset);
454+
final int numBuckets = buf.get(JAVA_INT_UNALIGNED, offset);
455455
offset += 4;
456456
final byte numHashes = buf.get(JAVA_BYTE, offset++);
457-
final short seedHash = buf.get(JAVA_SHORT_UNALIGNED_BIG_ENDIAN, offset);
457+
final short seedHash = buf.get(JAVA_SHORT_UNALIGNED, offset);
458458
offset += 2;
459459
final byte NULL_8 = buf.get(JAVA_BYTE, offset++);
460460

@@ -468,12 +468,12 @@ public static CountMinSketch deserialize(final byte[] b, final long seed) {
468468
if (empty) {
469469
return cms;
470470
}
471-
long w = buf.get(JAVA_LONG_UNALIGNED_BIG_ENDIAN, offset);
471+
long w = buf.get(JAVA_LONG_UNALIGNED, offset);
472472
offset += 8;
473473
cms.totalWeight_ = w;
474474

475475
for (int i = 0; i < cms.sketchArray_.length; i++) {
476-
cms.sketchArray_[i] = buf.get(JAVA_LONG_UNALIGNED_BIG_ENDIAN, offset);
476+
cms.sketchArray_[i] = buf.get(JAVA_LONG_UNALIGNED, offset);
477477
offset += 8;
478478
}
479479

0 commit comments

Comments
 (0)