Skip to content

Apache Lucene open-source search software

Dedup vector reader / writer initialization: close all files on hitting exceptions. (#16753)

Kaival Parikh2a3ff1faf4cd
diff --git a/lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/dedup/DedupFlatVectorsReader.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/dedup/DedupFlatVectorsReader.java
index 914ab55f993..82f0e9cba97 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/dedup/DedupFlatVectorsReader.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/dedup/DedupFlatVectorsReader.java
@@ -104,16 +104,18 @@ final class DedupFlatVectorsReader extends FlatVectorsReader {
} finally {
CodecUtil.checkFooter(meta, priorE);
}
+ this.vectorData =
+ openDataInput(
+ state,
+ versionMeta,
+ vectorDataCodecName,
+ vectorDataExtension,
+ versionStart,
+ versionCurrent);
+ } catch (Throwable t) {
+ IOUtils.closeWhileSuppressingExceptions(t, this);
+ throw t;
}
-
- this.vectorData =
- openDataInput(
- state,
- versionMeta,
- vectorDataCodecName,
- vectorDataExtension,
- versionStart,
- versionCurrent);
}
private void readMetaBody(ChecksumIndexInput meta, FieldInfos fieldInfos) throws IOException {
diff --git a/lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/dedup/DedupFlatVectorsWriter.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/dedup/DedupFlatVectorsWriter.java
index 1e3b6418cd7..dde1401ddfa 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/dedup/DedupFlatVectorsWriter.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/dedup/DedupFlatVectorsWriter.java
@@ -85,7 +85,6 @@ final class DedupFlatVectorsWriter extends FlatVectorsWriter {
IndexFileNames.segmentFileName(
state.segmentInfo.name, state.segmentSuffix, vectorDataExtension);
- boolean success = false;
try {
this.meta = state.directory.createOutput(metaFileName, state.context);
CodecUtil.writeIndexHeader(
@@ -114,11 +113,9 @@ final class DedupFlatVectorsWriter extends FlatVectorsWriter {
} else {
this.quantizedVectorData = null;
}
- success = true;
- } finally {
- if (success == false) {
- IOUtils.closeWhileHandlingException(this);
- }
+ } catch (Throwable t) {
+ IOUtils.closeWhileSuppressingExceptions(t, this);
+ throw t;
}
}
diff --git a/lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/dedup/DedupScalarQuantizedVectorsReader.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/dedup/DedupScalarQuantizedVectorsReader.java
index 63d1e92411d..66ed85c7208 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/dedup/DedupScalarQuantizedVectorsReader.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/dedup/DedupScalarQuantizedVectorsReader.java
@@ -125,25 +125,26 @@ final class DedupScalarQuantizedVectorsReader extends FlatVectorsReader
} finally {
CodecUtil.checkFooter(meta, priorE);
}
+ this.vectorData =
+ openDataInput(
+ state,
+ versionMeta,
+ vectorDataCodecName,
+ vectorDataExtension,
+ versionStart,
+ versionCurrent);
+ this.quantizedVectorData =
+ openDataInput(
+ state,
+ versionMeta,
+ quantizedVectorDataCodecName,
+ quantizedVectorDataExtension,
+ versionStart,
+ versionCurrent);
+ } catch (Throwable t) {
+ IOUtils.closeWhileSuppressingExceptions(t, this);
+ throw t;
}
-
- this.vectorData =
- openDataInput(
- state,
- versionMeta,
- vectorDataCodecName,
- vectorDataExtension,
- versionStart,
- versionCurrent);
-
- this.quantizedVectorData =
- openDataInput(
- state,
- versionMeta,
- quantizedVectorDataCodecName,
- quantizedVectorDataExtension,
- versionStart,
- versionCurrent);
}
private void readMetaBody(ChecksumIndexInput meta, FieldInfos fieldInfos) throws IOException {