Skip to content

Commit 2821333

Browse files
committed
Fix some issues raised by Copilot
1 parent 36e2e08 commit 2821333

4 files changed

Lines changed: 11 additions & 17 deletions

File tree

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ static CompactThetaSketch componentsToCompact( //No error checking
113113
* @param srcSeg the given input source MemorySegment image. Can be Read Only.
114114
* @param dstOrdered the desired ordering of the resulting CompactThetaSketch
115115
* @param dstWSeg Used for the target CompactThetaSketch if it is MemorySegment-based. Must be Writable.
116+
* If null, return on-heap.
116117
* @return a CompactThetaSketch of the correct form.
117118
*/
118119
@SuppressWarnings("unused")

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -369,15 +369,12 @@ public void checkEstimatingIntersect() {
369369
println("Est: "+est);
370370
}
371371

372-
@SuppressWarnings("unused")
373372
@Test(expectedExceptions = SketchesArgumentException.class)
374373
public void checkOverflow() {
375374
final int lgK = 9; //512
376375
final int k = 1<<lgK;
377376
ThetaIntersection inter;
378377
UpdatableThetaSketch sk1;
379-
final UpdatableThetaSketch sk2;
380-
final CompactThetaSketch comp1;
381378
final double est;
382379

383380
final int reqBytes = getMaxIntersectionBytes(k);

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -670,7 +670,6 @@ public void checkFamily() {
670670
assertEquals(sketch.getFamily(), Family.ALPHA);
671671
}
672672

673-
@SuppressWarnings("unused")
674673
@Test(expectedExceptions = SketchesArgumentException.class)
675674
public void corruptionLgNomLongs() {
676675
final int k = 512;
@@ -680,7 +679,7 @@ public void corruptionLgNomLongs() {
680679
byte[] byteArr = sketch.toByteArray();
681680
MemorySegment wseg = MemorySegment.ofArray(byteArr);
682681
wseg.set(JAVA_BYTE, LG_NOM_LONGS_BYTE, (byte) 8); //corrupt LgNomLongs
683-
UpdatableThetaSketch sk = UpdatableThetaSketch.heapify(wseg);
682+
UpdatableThetaSketch.heapify(wseg);
684683
}
685684

686685
@Test

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

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@
3939
import org.apache.datasketches.common.ResizeFactor;
4040
import org.apache.datasketches.common.SketchesArgumentException;
4141
import org.apache.datasketches.common.Util;
42-
import org.apache.datasketches.theta.CompactOperations;
43-
import org.apache.datasketches.theta.CompactThetaSketch;
44-
import org.apache.datasketches.theta.UpdatableThetaSketch;
45-
import org.apache.datasketches.theta.UpdateSketchBuilder;
4642
import org.apache.datasketches.thetacommon.ThetaUtil;
4743
import org.testng.annotations.Test;
4844

@@ -204,8 +200,6 @@ public void checkIsResizeFactorIncorrect() {
204200
}
205201
}
206202

207-
208-
@SuppressWarnings("unused")
209203
@Test
210204
public void checkCompactOpsMemorySegmentToCompact() {
211205
MemorySegment skwseg, cskwseg1, cskwseg2, cskwseg3;
@@ -216,15 +210,18 @@ public void checkCompactOpsMemorySegmentToCompact() {
216210
for (int i = 2; i < n; i++) { sk.update(i); }
217211
final int cbytes = sk.getCompactBytes();
218212
final byte[] byteArr = sk.toByteArray();
219-
skwseg = MemorySegment.ofArray(byteArr);
220-
cskwseg1 = MemorySegment.ofArray(new byte[cbytes]);
221-
cskwseg2 = MemorySegment.ofArray(new byte[cbytes]);
222-
cskwseg3 = MemorySegment.ofArray(new byte[cbytes]);
223-
csk1 = sk.compact(true, cskwseg1);
224-
csk2 = CompactOperations.segmentToCompact(skwseg, true, cskwseg2);
213+
skwseg = MemorySegment.ofArray(byteArr); //updatable seg
214+
cskwseg1 = MemorySegment.ofArray(new byte[cbytes]); //empty
215+
cskwseg2 = MemorySegment.ofArray(new byte[cbytes]); //empty
216+
cskwseg3 = MemorySegment.ofArray(new byte[cbytes]); //empty
217+
csk1 = sk.compact(true, cskwseg1); //cskwseg1 has compact sk image, csk1 is the sketch
218+
csk2 = CompactOperations.segmentToCompact(skwseg, true, cskwseg2); //cskwseg2 has compact skwseg image
225219
csk3 = CompactOperations.segmentToCompact(cskwseg1, true, cskwseg3);
226220
assertTrue(equalContents(cskwseg1,cskwseg2));
227221
assertTrue(equalContents(cskwseg1, cskwseg3));
222+
assertTrue(csk1.hasMemorySegment());
223+
assertTrue(csk2.hasMemorySegment());
224+
assertTrue(csk3.hasMemorySegment());
228225
}
229226

230227
@Test

0 commit comments

Comments
 (0)