Skip to content

Commit 72c7a24

Browse files
committed
In response to the incorrect Pilot objection, I am adding a few sanity
parenthesis to make expressions easier to understand.
1 parent 8c66f20 commit 72c7a24

4 files changed

Lines changed: 4 additions & 4 deletions

File tree

src/main/java/org/apache/datasketches/theta/HeapUpdateSketch.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ short getSeedHash() {
9696
byte[] toByteArray(final int preLongs, final byte familyID) {
9797
if (isDirty()) { rebuild(); }
9898
checkIllegalCurCountAndEmpty(isEmpty(), getRetainedEntries(true));
99-
final int preBytes = preLongs << 3 & 0X3F; //24 bytes; mask to 6 bits
99+
final int preBytes = (preLongs << 3) & 0X3F; //24 bytes; mask to 6 bits
100100
final int dataBytes = getCurrentDataLongs() << 3;
101101
final byte[] byteArrOut = new byte[preBytes + dataBytes];
102102

src/main/java/org/apache/datasketches/theta/PreambleUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ static void insertLgResizeFactor(final MemorySegment seg, final int rf) {
450450
final int curByte = seg.get(JAVA_BYTE, PREAMBLE_LONGS_BYTE) & 0xFF;
451451
final int shift = LG_RESIZE_FACTOR_BIT; // shift in bits
452452
final int mask = 3;
453-
final byte newByte = (byte) ((rf & mask) << shift | ~(mask << shift) & curByte);
453+
final byte newByte = (byte) (((rf & mask) << shift) | (~(mask << shift) & curByte));
454454
seg.set(JAVA_BYTE, PREAMBLE_LONGS_BYTE, newByte);
455455
}
456456

src/main/java/org/apache/datasketches/theta/UpdateSketch.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ public CompactSketch compact(final boolean dstOrdered, final MemorySegment dstWS
173173
public int getCompactBytes() {
174174
final int preLongs = getCompactPreambleLongs();
175175
final int dataLongs = getRetainedEntries(true);
176-
return preLongs + dataLongs << 3;
176+
return (preLongs + dataLongs) << 3;
177177
}
178178

179179
@Override

src/test/java/org/apache/datasketches/theta/UpdateSketchTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ public void checkCompactOpsMemorySegmentToCompact() {
212212
CompactSketch csk1, csk2, csk3;
213213
final int lgK = 6;
214214
final UpdateSketch sk = UpdateSketch.builder().setLogNominalEntries(lgK).build();
215-
final int n = 1 << lgK + 1;
215+
final int n = 1 << (lgK + 1);
216216
for (int i = 2; i < n; i++) { sk.update(i); }
217217
final int cbytes = sk.getCompactBytes();
218218
final byte[] byteArr = sk.toByteArray();

0 commit comments

Comments
 (0)