Skip to content

Merge main into develop #5269

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
hmottestad merged 5 commits into from
Mar 14, 2025
Merged

Merge main into develop #5269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cd6509b
next development iteration: 5.1.3-SNAPSHOT (#5251)
hmottestad Feb 14, 2025
875bdaa
GH-5254 LMDB store: Correctly clear common vocabulary cache.
kenwenzel Feb 24, 2025
a5291bb
GH-5254 LMDB store: Correctly clear common vocabulary cache. (#5257)
kenwenzel Mar 5, 2025
114ba62
fix ci and minor shacl caching fix
hmottestad Mar 14, 2025
c931f34
fix ci and minor shacl caching fix (#5270)
hmottestad Mar 14, 2025
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 .github/workflows/develop-status.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
with:
java-version: ${{ matrix.jdk }}
- name: Cache local Maven repository
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-jdk${{ matrix.jdk }}-maven-${{ hashFiles('**/pom.xml') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main-status.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
with:
java-version: ${{ matrix.jdk }}
- name: Cache local Maven repository
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-jdk${{ matrix.jdk }}-maven-${{ hashFiles('**/pom.xml') }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/pr-verify.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
with:
java-version: ${{ matrix.jdk }}
- name: Cache local Maven repository
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-jdk${{ matrix.jdk }}-maven-${{ hashFiles('**/pom.xml') }}
Expand Down Expand Up @@ -48,7 +48,7 @@ jobs:
with:
java-version: 11
- name: Cache local Maven repository
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-jdk11-maven-${{ hashFiles('**/pom.xml') }}
Expand Down Expand Up @@ -81,7 +81,7 @@ jobs:
with:
java-version: 11
- name: Cache local Maven repository
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-jdk11-maven-${{ hashFiles('**/pom.xml') }}
Expand All @@ -107,7 +107,7 @@ jobs:
with:
java-version: 11
- name: Cache local Maven repository
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-jdk11-maven-${{ hashFiles('**/pom.xml') }}
Expand All @@ -133,7 +133,7 @@ jobs:
with:
java-version: 11
- name: Cache local Maven repository
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-jdk11-maven-${{ hashFiles('**/pom.xml') }}
Expand Down
1 change: 1 addition & 0 deletions core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/ValueStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1252,6 +1252,7 @@ protected void clearCaches() {
valueIDCache.clear();
namespaceCache.clear();
namespaceIDCache.clear();
commonVocabulary.clear();
}

/**
Expand Down
47 changes: 28 additions & 19 deletions core/sail/lmdb/src/test/java/org/eclipse/rdf4j/sail/lmdb/ValueStoreTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,19 @@
import java.util.List;
import java.util.Random;
import java.util.Set;
import java.util.stream.Collectors;

import org.eclipse.rdf4j.model.IRI;
import org.eclipse.rdf4j.model.Literal;
import org.eclipse.rdf4j.model.Value;
import org.eclipse.rdf4j.model.util.Values;
import org.eclipse.rdf4j.model.vocabulary.RDF;
import org.eclipse.rdf4j.model.vocabulary.RDFS;
import org.eclipse.rdf4j.model.vocabulary.XSD;
import org.eclipse.rdf4j.sail.lmdb.config.LmdbStoreConfig;
import org.eclipse.rdf4j.sail.lmdb.model.LmdbLiteral;
import org.eclipse.rdf4j.sail.lmdb.model.LmdbValue;
import org.junit.Assert;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
Expand All @@ -58,49 +63,53 @@ private ValueStore createValueStore() throws IOException {

@Test
public void testGcValues() throws Exception {
Random random = new Random(1337);
LmdbValue values[] = new LmdbValue[1000];
Value values[] = new Value[] {
RDF.TYPE, RDFS.CLASS,
Values.iri("some:iri"),
Values.literal("This is a literal.")
};
long ids[] = new long[values.length];
valueStore.startTransaction(true);
for (int i = 0; i < values.length; i++) {
values[i] = valueStore.createLiteral("This is a random literal:" + random.nextLong());
valueStore.storeValue(values[i]);
ids[i] = valueStore.storeValue(values[i]);
}
valueStore.commit();

ValueStoreRevision revBefore = valueStore.getRevision();

valueStore.startTransaction(true);
Set<Long> ids = new HashSet<>();
for (int i = 0; i < 30; i++) {
ids.add(values[i].getInternalID());
}
valueStore.gcIds(ids, new HashSet<>());
Set<Long> idsToGc = new HashSet<>(Arrays.stream(ids).boxed().collect(Collectors.toList()));
valueStore.gcIds(idsToGc, new HashSet<>());
valueStore.commit();

ValueStoreRevision revAfter = valueStore.getRevision();

assertNotEquals("revisions must change after gc of IDs", revBefore, revAfter);

Arrays.fill(values, null);
// GC would collect revision at some point in time
// just add revision ID to free list for this test as forcing GC is not possible
for (int i = 0; i < values.length; i++) {
Assert.assertEquals(LmdbValue.UNKNOWN_ID, valueStore.getId(values[i]));
Assert.assertTrue(valueStore.getValue(ids[i]) != null);
}

// simulate GC of unused revisions
valueStore.unusedRevisionIds.add(revBefore.getRevisionId());

valueStore.forceEvictionOfValues();
valueStore.startTransaction(true);
valueStore.commit();

for (int i = 0; i < values.length; i++) {
Assert.assertEquals(LmdbValue.UNKNOWN_ID, valueStore.getId(values[i]));
Assert.assertTrue(valueStore.getValue(ids[i]) != null);
}

valueStore.startTransaction(true);
for (int i = 0; i < 30; i++) {
LmdbValue value = valueStore.createLiteral("This is a random literal:" + random.nextLong());
values[i] = value;
valueStore.storeValue(value);
for (int i = 0; i < values.length; i++) {
// this ID should have been reused
ids.remove(value.getInternalID());
idsToGc.remove(valueStore.storeValue(values[i]));
}
valueStore.commit();

assertEquals("IDs should have been reused", Collections.emptySet(), ids);
assertEquals("IDs should have been reused", Collections.emptySet(), idsToGc);
}

@Test
Expand Down
6 changes: 6 additions & 0 deletions core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ShaclSailValidationException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
public class ShaclSailValidationException extends SailException implements ValidationException {

private final ValidationReport validationReport;
private Model cachedModel = null;

ShaclSailValidationException(ValidationReport validationReport) {
super("Failed SHACL validation");
Expand All @@ -36,6 +37,9 @@ public class ShaclSailValidationException extends SailException implements Valid
*/
@Override
public Model validationReportAsModel() {
if (cachedModel != null) {
return cachedModel;
}
Model model = getValidationReport().asModel();

model.setNamespace(RSX.NS);
Expand All @@ -45,6 +49,8 @@ public Model validationReportAsModel() {
model.setNamespace(RDF.NS);
model.setNamespace(RDFS.NS);

cachedModel = model;

return model;
}

Expand Down