Skip to content

fix(segment): close removed PinotDataBuffer in FilePerIndexDirectory #18405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jackie-Jiang merged 3 commits into from
May 7, 2026
+14 −2
Merged

fix(segment): close removed PinotDataBuffer in FilePerIndexDirectory #18405

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
77c19b7
fix(segment): close removed PinotDataBuffer in FilePerIndexDirectory.…
dkranchii May 3, 2026
44afbfa
Apply suggestion from @xiangfu0
dkranchii May 5, 2026
c42fa0f
Remove unused LOGGER per review feedback from @Jackie-Jiang
dkranchii May 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions ...cal/src/main/java/org/apache/pinot/segment/local/segment/store/FilePerIndexDirectory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,13 @@
import org.apache.pinot.segment.spi.memory.PinotDataBuffer;
import org.apache.pinot.segment.spi.store.ColumnIndexDirectory;
import org.apache.pinot.spi.utils.ReadMode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;


class FilePerIndexDirectory extends ColumnIndexDirectory {
private static final Logger LOGGER = LoggerFactory.getLogger(FilePerIndexDirectory.class);

Comment thread
dkranchii marked this conversation as resolved.
Outdated
private final File _segmentDirectory;
private SegmentMetadataImpl _segmentMetadata;
private final ReadMode _readMode;
Expand Down Expand Up @@ -99,8 +103,20 @@ public void close()

@Override
public void removeIndex(String columnName, IndexType<?, ?, ?> indexType) {
// TODO: this leaks the removed data buffer (it's not going to be freed in close() method)
_indexBuffers.remove(new IndexKey(columnName, indexType));
IndexKey key = new IndexKey(columnName, indexType);
// Fetch the buffer without removing it from the map first; the mapping is removed only after close() succeeds.
// If close() throws, the entry stays in _indexBuffers so a subsequent directory close() can attempt to release
// it on a best-effort basis (this class is not thread-safe; callers must serialize access).
PinotDataBuffer buffer = _indexBuffers.get(key);
if (buffer != null) {
try {
buffer.close();
_indexBuffers.remove(key);
} catch (Exception e) {
throw new RuntimeException(
String.format("Failed to close index buffer for column: %s, indexType: %s", columnName, indexType), e);
}
}
if (indexType == StandardIndexes.text()) {
TextIndexUtils.cleanupTextIndex(_segmentDirectory, columnName);
} else if (indexType == StandardIndexes.vector()) {
Expand Down
Loading