Skip to content

Fix OnDiskGraphIndex#ramBytesUsed NPE #588

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

Open
michaeljmarshall wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −4
Open

Fix OnDiskGraphIndex#ramBytesUsed NPE #588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 13 additions & 4 deletions jvector-base/src/main/java/io/github/jbellis/jvector/graph/disk/OnDiskGraphIndex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,11 +402,20 @@ public long ramBytesUsed() {
List<Int2ObjectHashMap<int[]>> inMemoryNeighborsLocal = inMemoryNeighbors.get();

long inMemoryNeighborsBytes = RamUsageEstimator.NUM_BYTES_OBJECT_REF;
for (Int2ObjectHashMap<int[]> neighbors : inMemoryNeighborsLocal) {
inMemoryNeighborsBytes += neighbors.values().stream().mapToLong(is -> Integer.BYTES * (long) is.length).sum();
inMemoryNeighborsBytes += RamUsageEstimator.NUM_BYTES_OBJECT_REF;
if (inMemoryNeighborsLocal != null) {
for (Int2ObjectHashMap<int[]> neighbors : inMemoryNeighborsLocal) {
if (neighbors != null) {
inMemoryNeighborsBytes += neighbors.values().stream().mapToLong(is -> Integer.BYTES * (long) is.length).sum();
}
inMemoryNeighborsBytes += RamUsageEstimator.NUM_BYTES_OBJECT_REF;
}
}

Int2ObjectHashMap<FusedFeature.InlineSource> inMemoryFeaturesLocal = inMemoryFeatures.get();
long inMemoryFeaturesBytes = 0;
if (inMemoryFeaturesLocal != null) {
inMemoryFeaturesBytes = inMemoryFeaturesLocal.values().stream().mapToLong(is -> Integer.BYTES * is.ramBytesUsed()).sum();
}
long inMemoryFeaturesBytes = inMemoryFeatures.get().values().stream().mapToLong(is -> Integer.BYTES * is.ramBytesUsed()).sum();
inMemoryFeaturesBytes += RamUsageEstimator.NUM_BYTES_OBJECT_REF;

return Long.BYTES + 6 * Integer.BYTES + RamUsageEstimator.NUM_BYTES_OBJECT_REF
Expand Down
1 change: 1 addition & 0 deletions jvector-tests/src/test/java/io/github/jbellis/jvector/graph/disk/TestOnDiskGraphIndex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,7 @@ public void testV0Read() throws IOException {
var onDiskGraph = OnDiskGraphIndex.load(readerSupplier);
var onDiskView = onDiskGraph.getView())
{
assertEquals(88, onDiskGraph.ramBytesUsed()); // Current size of graph that hasn't been read from
assertEquals(32, onDiskGraph.getDegree(0));
assertEquals(2, onDiskGraph.version);
assertEquals(100_000, onDiskGraph.size(0));
Expand Down
Loading