Skip to content

Commit 2c4c806

Browse files
committed
addressing forbidden api stuffs
1 parent 3e61aee commit 2c4c806

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

server/src/main/java/org/elasticsearch/index/codec/vectors/IVFVectorsReader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
import org.apache.lucene.util.BitSet;
3131
import org.apache.lucene.util.Bits;
3232
import org.apache.lucene.util.FixedBitSet;
33-
import org.apache.lucene.util.IOUtils;
3433
import org.apache.lucene.util.hnsw.NeighborQueue;
34+
import org.elasticsearch.core.IOUtils;
3535

3636
import java.io.IOException;
3737
import java.util.function.IntPredicate;

server/src/main/java/org/elasticsearch/index/codec/vectors/IVFVectorsWriter.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,10 @@
2929
import org.apache.lucene.store.IOContext;
3030
import org.apache.lucene.store.IndexInput;
3131
import org.apache.lucene.store.IndexOutput;
32-
import org.apache.lucene.util.IOUtils;
3332
import org.apache.lucene.util.InfoStream;
3433
import org.apache.lucene.util.VectorUtil;
34+
import org.elasticsearch.core.IOUtils;
35+
import org.elasticsearch.core.SuppressForbidden;
3536

3637
import java.io.IOException;
3738
import java.io.UncheckedIOException;
@@ -250,6 +251,7 @@ static IVFVectorsReader getIVFReader(KnnVectorsReader vectorsReader, String fiel
250251
}
251252

252253
@Override
254+
@SuppressForbidden(reason = "require usage of Lucene's IOUtils#deleteFilesIgnoringExceptions(...)")
253255
public final void mergeOneField(FieldInfo fieldInfo, MergeState mergeState) throws IOException {
254256
rawVectorDelegate.mergeOneField(fieldInfo, mergeState);
255257
if (fieldInfo.getVectorEncoding().equals(VectorEncoding.FLOAT32)) {
@@ -267,7 +269,7 @@ public final void mergeOneField(FieldInfo fieldInfo, MergeState mergeState) thro
267269
success = true;
268270
} finally {
269271
if (success == false && name != null) {
270-
IOUtils.deleteFilesIgnoringExceptions(mergeState.segmentInfo.dir, name);
272+
org.apache.lucene.util.IOUtils.deleteFilesIgnoringExceptions(mergeState.segmentInfo.dir, name);
271273
}
272274
}
273275
float[] globalCentroid = new float[fieldInfo.getVectorDimension()];
@@ -318,7 +320,7 @@ public final void mergeOneField(FieldInfo fieldInfo, MergeState mergeState) thro
318320
} finally {
319321
if (success == false && centroidTempName != null) {
320322
IOUtils.closeWhileHandlingException(centroidTemp);
321-
IOUtils.deleteFilesIgnoringExceptions(mergeState.segmentInfo.dir, centroidTempName);
323+
org.apache.lucene.util.IOUtils.deleteFilesIgnoringExceptions(mergeState.segmentInfo.dir, centroidTempName);
322324
}
323325
}
324326
try {
@@ -356,11 +358,10 @@ public final void mergeOneField(FieldInfo fieldInfo, MergeState mergeState) thro
356358
writeMeta(fieldInfo, centroidOffset, centroidLength, offsets, globalCentroid);
357359
}
358360
} finally {
359-
IOUtils.deleteFilesIgnoringExceptions(mergeState.segmentInfo.dir, name);
360-
IOUtils.deleteFilesIgnoringExceptions(mergeState.segmentInfo.dir, centroidTempName);
361+
org.apache.lucene.util.IOUtils.deleteFilesIgnoringExceptions(mergeState.segmentInfo.dir, name, centroidTempName);
361362
}
362363
} finally {
363-
IOUtils.deleteFilesIgnoringExceptions(mergeState.segmentInfo.dir, name);
364+
org.apache.lucene.util.IOUtils.deleteFilesIgnoringExceptions(mergeState.segmentInfo.dir, name);
364365
}
365366
}
366367
}

0 commit comments

Comments
 (0)