@@ -414,8 +414,8 @@ public void serializeToHNSW(OutputStream outputStream, Path tempFile, int buffer
414414 checkNotDestroyed ();
415415 tempFile = tempFile .toAbsolutePath ();
416416
417- try (var arena = Arena .ofConfined ()) {
418- MemorySegment pathSeg = buildMemorySegment (arena , tempFile .toString ());
417+ try (var localArena = Arena .ofConfined ()) {
418+ MemorySegment pathSeg = buildMemorySegment (localArena , tempFile .toString ());
419419
420420 long cuvsRes = resources .getHandle ();
421421 int returnValue =
@@ -611,18 +611,19 @@ public static CagraIndex merge(CagraIndex[] indexes, CagraMergeParams mergeParam
611611 var mergedIndex = createCagraIndex ();
612612 long cuvsRes = resources .getHandle ();
613613
614- try (var arena = Arena .ofConfined ()) {
614+ try (var localArena = Arena .ofConfined ()) {
615615 MemorySegment indexesSegment =
616- arena .allocate (indexes .length * ValueLayout .ADDRESS .byteSize ());
616+ localArena .allocate (indexes .length * ValueLayout .ADDRESS .byteSize ());
617617
618618 for (int i = 0 ; i < indexes .length ; i ++) {
619619 CagraIndexImpl indexImpl = (CagraIndexImpl ) indexes [i ];
620620 indexesSegment .setAtIndex (
621621 ValueLayout .ADDRESS , i , indexImpl .cagraIndexReference .getMemorySegment ());
622622 }
623623
624- // TODO: IMO we should call cuvsCreateMergeParams here, instead of allocating this ourselves
625- var mergeParamsSegment = createMergeParamsSegment (arena , mergeParams );
624+ // TODO: we should call cuvsCreateMergeParams here, instead of allocating this ourselves
625+ // See https://github.com/rapidsai/cuvs/pull/1109
626+ var mergeParamsSegment = createMergeParamsSegment (localArena , mergeParams );
626627
627628 var returnValue =
628629 cuvsCagraMerge (cuvsRes , mergeParamsSegment , indexesSegment , indexes .length , mergedIndex );
0 commit comments