Fixed conflict

leerho · leerho · commit 9187165ed8d5 · 2025-07-28T21:17:46.000-07:00
diff --git a/src/test/java/org/apache/datasketches/cpc/CpcSketchCrossLanguageTest.java b/src/test/java/org/apache/datasketches/cpc/CpcSketchCrossLanguageTest.java
@@ -89,7 +89,7 @@ public void checkAllFlavorsGo() throws IOException {
     int flavorIdx = 0;
     for (int n: nArr) {
       final byte[] bytes = Files.readAllBytes(goPath.resolve("cpc_n" + n + "_go.sk"));
-      final CpcSketch sketch = CpcSketch.heapify(Memory.wrap(bytes));
+      final CpcSketch sketch = CpcSketch.heapify(MemorySegment.ofArray(bytes));
       assertEquals(sketch.getFlavor(), flavorArr[flavorIdx++]);
       assertEquals(sketch.getEstimate(), n, n * 0.02);
     }

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public void checkAllFlavorsGo() throws IOException {`
`89`	`89`	`int flavorIdx = 0;`
`90`	`90`	`for (int n: nArr) {`
`91`	`91`	`final byte[] bytes = Files.readAllBytes(goPath.resolve("cpc_n" + n + "_go.sk"));`
`92`		`- final CpcSketch sketch = CpcSketch.heapify(Memory.wrap(bytes));`
	`92`	`+ final CpcSketch sketch = CpcSketch.heapify(MemorySegment.ofArray(bytes));`
`93`	`93`	`assertEquals(sketch.getFlavor(), flavorArr[flavorIdx++]);`
`94`	`94`	`assertEquals(sketch.getEstimate(), n, n * 0.02);`
`95`	`95`	`}`