Skip to content

GH-3900: misc mem improvements #3901

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
arne-bdt wants to merge 2 commits into
base: main
Choose a base branch
from
Open

GH-3900: misc mem improvements #3901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c74ef42
GH-3900: misc mem improvements
bern-soptim May 5, 2026
d97a3a5
GH-3900: misc mem improvements
bern-soptim May 6, 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
2 changes: 1 addition & 1 deletion jena-benchmarks/jena-benchmarks-jmh/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.jena</groupId>
<artifactId>jena-benchmarks</artifactId>
<version>6.1.0</version>
<version>6.2.0-SNAPSHOT</version>
</parent>

<name>Apache Jena - Benchmarks JMH</name>
Expand Down
9 changes: 8 additions & 1 deletion ...est/java/org/apache/jena/mem/spliterator/TestSparseArraySpliteratorsForeachRemaining.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import org.apache.jena.atlas.iterator.ActionCount;
import org.apache.jena.jmh.JmhDefaultOptions;

import org.apache.jena.mem.collection.Sized;
import org.junit.Assert;
import org.junit.Test;

Expand Down Expand Up @@ -75,12 +76,18 @@ public Spliterator<Object> createSut(Object[] arrayWithNulls, int elementsCount)
if (count != elementsCount) {
throw new RuntimeException("Concurrent modification detected");
}
} ;
final var sized = new Sized() {
@Override
public int size() {
return elementsCount;
}
};
return switch (param1_iteratorImplementation) {
case "memvalue.SparseArraySpliterator" ->
new org.apache.jena.memvalue.SparseArraySpliterator<>(arrayWithNulls, count, checkForConcurrentModification);
case "mem2.SparseArraySpliterator" ->
new SparseArraySpliterator<>(arrayWithNulls, checkForConcurrentModification);
new SparseArraySpliterator<>(arrayWithNulls, sized);
default ->
throw new IllegalArgumentException("Unknown spliterator implementation: " + param1_iteratorImplementation);
};
Expand Down
9 changes: 8 additions & 1 deletion .../test/java/org/apache/jena/mem/spliterator/TestSparseArraySpliteratorsStreamParallel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.apache.jena.atlas.iterator.ActionCount;
import org.apache.jena.jmh.JmhDefaultOptions;

import org.apache.jena.mem.collection.Sized;
import org.junit.Assert;
import org.junit.Test;

Expand Down Expand Up @@ -77,11 +78,17 @@ public Spliterator<Object> createSut(Object[] arrayWithNulls, int elementsCount)
throw new RuntimeException("Concurrent modification detected");
}
};
final var sized = new Sized() {
@Override
public int size() {
return elementsCount;
}
};
return switch (param1_iteratorImplementation) {
case "memvalue.SparseArraySpliterator" ->
new org.apache.jena.memvalue.SparseArraySpliterator<>(arrayWithNulls, count, checkForConcurrentModification);
case "mem2.SparseArraySpliterator" ->
new SparseArraySpliterator<>(arrayWithNulls, checkForConcurrentModification);
new SparseArraySpliterator<>(arrayWithNulls, sized);
default ->
throw new IllegalArgumentException("Unknown spliterator implementation: " + param1_iteratorImplementation);
};
Expand Down
9 changes: 8 additions & 1 deletion .../src/test/java/org/apache/jena/mem/spliterator/TestSparseArraySpliteratorsTryAdvance.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import org.apache.jena.atlas.iterator.ActionCount;
import org.apache.jena.jmh.JmhDefaultOptions;

import org.apache.jena.mem.collection.Sized;
import org.junit.Assert;
import org.junit.Test;

Expand Down Expand Up @@ -78,11 +79,17 @@ public Spliterator<Object> createSut(Object[] arrayWithNulls, int elementsCount)
throw new RuntimeException("Concurrent modification detected");
}
};
final var sized = new Sized() {
@Override
public int size() {
return elementsCount;
}
};
return switch (param1_iteratorImplementation) {
case "memvalue.SparseArraySpliterator" ->
new org.apache.jena.memvalue.SparseArraySpliterator<>(arrayWithNulls, count, checkForConcurrentModification);
case "mem2.SparseArraySpliterator" ->
new SparseArraySpliterator<>(arrayWithNulls, checkForConcurrentModification);
new SparseArraySpliterator<>(arrayWithNulls, sized);
default ->
throw new IllegalArgumentException("Unknown spliterator implementation: " + param1_iteratorImplementation);
};
Expand Down
2 changes: 1 addition & 1 deletion jena-benchmarks/jena-benchmarks-shadedJena560/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.jena</groupId>
<artifactId>jena-benchmarks</artifactId>
<version>6.1.0</version>
<version>6.2.0-SNAPSHOT</version>
</parent>

<name>Apache Jena - Benchmarks Shaded Jena 5.6.0</name>
Expand Down
2 changes: 1 addition & 1 deletion jena-benchmarks/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.jena</groupId>
<artifactId>jena</artifactId>
<version>6.1.0</version>
<version>6.2.0-SNAPSHOT</version>
</parent>

<name>Apache Jena - Benchmark Suite</name>
Expand Down
Loading