diff --git a/core/repository/api/src/main/java/org/eclipse/rdf4j/repository/RepositoryConnection.java b/core/repository/api/src/main/java/org/eclipse/rdf4j/repository/RepositoryConnection.java index 0f1107e2ba8..0a63fdb2291 100644 --- a/core/repository/api/src/main/java/org/eclipse/rdf4j/repository/RepositoryConnection.java +++ b/core/repository/api/src/main/java/org/eclipse/rdf4j/repository/RepositoryConnection.java @@ -372,7 +372,7 @@ Update prepareUpdate(QueryLanguage ql, String update, String baseURI) throws RepositoryException, MalformedQueryException; /** - * Gets all resources that are used as content identifiers. Care should be taken that the returned + * Gets all resources that are used as context identifiers. Care should be taken that the returned * {@link RepositoryResult} is closed to free any resources that it keeps hold of. * * @return a RepositoryResult object containing Resources that are used as context identifiers. diff --git a/core/rio/jsonld/pom.xml b/core/rio/jsonld/pom.xml index a2e006866f5..88774984f11 100644 --- a/core/rio/jsonld/pom.xml +++ b/core/rio/jsonld/pom.xml @@ -45,6 +45,7 @@ org.glassfish jakarta.json 2.0.1 + module org.apache.httpcomponents diff --git a/core/rio/jsonld/src/main/resources/META-INF/services/jakarta.json.spi.JsonProvider b/core/rio/jsonld/src/main/resources/META-INF/services/jakarta.json.spi.JsonProvider deleted file mode 100644 index 52f1a6b2e45..00000000000 --- a/core/rio/jsonld/src/main/resources/META-INF/services/jakarta.json.spi.JsonProvider +++ /dev/null @@ -1 +0,0 @@ -org.glassfish.json.JsonProviderImpl diff --git a/core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/TripleStore.java b/core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/TripleStore.java index d848d30dd5b..ef3ab8ebc67 100644 --- a/core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/TripleStore.java +++ b/core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/TripleStore.java @@ -201,7 +201,8 @@ public int compareRegion(ByteBuffer array1, int startIdx1, ByteBuffer array2, in env = pp.get(0); } - E(mdb_env_set_maxdbs(env, 12)); + // 1 for contexts, 12 for triple indexes (2 per index) + E(mdb_env_set_maxdbs(env, 13)); E(mdb_env_set_maxreaders(env, 256)); // Open environment diff --git a/core/sail/lmdb/src/test/java/org/eclipse/rdf4j/sail/lmdb/TripleStoreManyIndexesTest.java b/core/sail/lmdb/src/test/java/org/eclipse/rdf4j/sail/lmdb/TripleStoreManyIndexesTest.java new file mode 100644 index 00000000000..7d027cefc13 --- /dev/null +++ b/core/sail/lmdb/src/test/java/org/eclipse/rdf4j/sail/lmdb/TripleStoreManyIndexesTest.java @@ -0,0 +1,46 @@ +/******************************************************************************* + * Copyright (c) 2025 Eclipse RDF4J contributors. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Distribution License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + *******************************************************************************/ +package org.eclipse.rdf4j.sail.lmdb; + +import static org.junit.Assert.*; + +import java.io.File; + +import org.eclipse.rdf4j.sail.lmdb.config.LmdbStoreConfig; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; + +/** + * Test ensuring {@link TripleStore} can handle up to 6 indexes. + */ +public class TripleStoreManyIndexesTest { + private File dataDir; + + @BeforeEach + public void before(@TempDir File dataDir) throws Exception { + this.dataDir = dataDir; + } + + @Test + public void testSixIndexes() throws Exception { + TripleStore tripleStore = new TripleStore(dataDir, + new LmdbStoreConfig("spoc,posc,ospc,cspo,cpos,cosp")); + tripleStore.startTransaction(); + tripleStore.storeTriple(1, 2, 3, 1, true); + tripleStore.commit(); + + try (TxnManager.Txn txn = tripleStore.getTxnManager().createReadTxn()) { + var it = tripleStore.getTriples(txn, 1, 2, 3, 1, true); + assertNotNull("Store should have a stored statement", it.next()); + } + } +} diff --git a/site/content/download.md b/site/content/download.md index a7e49a1db8a..6fc33d05a05 100644 --- a/site/content/download.md +++ b/site/content/download.md @@ -5,15 +5,15 @@ toc: true You can either retrieve RDF4J via Apache Maven, or download the SDK or onejar directly. -## RDF4J 5.1.0 (latest) +## RDF4J 5.1.2 (latest) -RDF4J 5.1.0 is our latest stable release. It requires Java 11 minimally. -For details on what’s new and how to upgrade, see the [release and upgrade notes](/release-notes/5.1.0). +RDF4J 5.1.2 is our latest stable release. It requires Java 11 minimally. +For details on what’s new and how to upgrade, see the [release and upgrade notes](/release-notes/5.1.2). -- [RDF4J 5.1.0 SDK (zip)](http://www.eclipse.org/downloads/download.php?file=/rdf4j/eclipse-rdf4j-5.1.0-sdk.zip)
+- [RDF4J 5.1.2 SDK (zip)](http://www.eclipse.org/downloads/download.php?file=/rdf4j/eclipse-rdf4j-5.1.2-sdk.zip)
Full Eclipse RDF4J SDK, containing all libraries, RDF4J Server, Workbench, and Console applications, and Javadoc API. -- [RDF4J 5.1.0 onejar](http://www.eclipse.org/downloads/download.php?file=/rdf4j/eclipse-rdf4j-5.1.0-onejar.jar)
+- [RDF4J 5.1.2 onejar](http://www.eclipse.org/downloads/download.php?file=/rdf4j/eclipse-rdf4j-5.1.2-onejar.jar)
Single jar file for easy inclusion of the full RDF4J toolkit in your Java project. - [RDF4J artifacts](https://search.maven.org/search?q=org.eclipse.rdf4j) on the [Maven Central Repository](http://search.maven.org/) @@ -28,7 +28,7 @@ You can include RDF4J as a Maven dependency in your Java project by including th org.eclipse.rdf4j rdf4j-bom - 5.1.0 + 5.1.2 pom import diff --git a/site/content/news/rdf4j-511.md b/site/content/news/rdf4j-511.md new file mode 100644 index 00000000000..cd51076cf24 --- /dev/null +++ b/site/content/news/rdf4j-511.md @@ -0,0 +1,14 @@ +--- +title: "RDF4J 5.1.1 released" +date: 2025-01-28T06:36:24+0100 +layout: "single" +categories: ["news"] +--- +RDF4J 5.1.1 is now available. This is a patch release fixing 9 bugs. + +For more details, have a look at the [release notes](/release-notes/5.1.1). + +### Links + +- [Download RDF4J](/download/) +- [release notes](/release-notes/5.1.1). diff --git a/site/content/news/rdf4j-512.md b/site/content/news/rdf4j-512.md new file mode 100644 index 00000000000..092e46834f2 --- /dev/null +++ b/site/content/news/rdf4j-512.md @@ -0,0 +1,14 @@ +--- +title: "RDF4J 5.1.2 released" +date: 2025-02-11T12:44:26+0100 +layout: "single" +categories: ["news"] +--- +RDF4J 5.1.2 is now available. This is a patch release fixing 1 bugs. + +For more details, have a look at the [release notes](/release-notes/5.1.2). + +### Links + +- [Download RDF4J](/download/) +- [release notes](/release-notes/5.1.2). diff --git a/site/content/release-notes/5.1.1.md b/site/content/release-notes/5.1.1.md new file mode 100644 index 00000000000..a4499098416 --- /dev/null +++ b/site/content/release-notes/5.1.1.md @@ -0,0 +1,11 @@ +--- +title: "5.1.1" +toc: true +--- +RDF4J 5.1.1 is a patch release that fixes 9 issues. + +For a complete overview, see [all issues fixed in 5.1.1](https://github.com/eclipse/rdf4j/milestone/116?closed=1). + +### Acknowledgements + +This release was made possible by contributions from Håvard M. Ottestad, Andreas Schwarte and Benji Herber. diff --git a/site/content/release-notes/5.1.2.md b/site/content/release-notes/5.1.2.md new file mode 100644 index 00000000000..83986e6f143 --- /dev/null +++ b/site/content/release-notes/5.1.2.md @@ -0,0 +1,7 @@ +--- +title: "5.1.2" +toc: true +--- +RDF4J 5.1.2 is a patch release that fixes 1 issues. + +For a complete overview, see [all issues fixed in 5.1.2](https://github.com/eclipse/rdf4j/milestone/117?closed=1). diff --git a/site/static/javadoc/5.1.1.tgz b/site/static/javadoc/5.1.1.tgz new file mode 100644 index 00000000000..40903ed2aa9 Binary files /dev/null and b/site/static/javadoc/5.1.1.tgz differ diff --git a/site/static/javadoc/5.1.2.tgz b/site/static/javadoc/5.1.2.tgz new file mode 100644 index 00000000000..c2c008a8e34 Binary files /dev/null and b/site/static/javadoc/5.1.2.tgz differ diff --git a/site/static/javadoc/latest.tgz b/site/static/javadoc/latest.tgz index 22c480c131f..c2c008a8e34 100644 Binary files a/site/static/javadoc/latest.tgz and b/site/static/javadoc/latest.tgz differ