Skip to content

Commit 6f2c5cb

Browse files
authored
merge main into develop (#5288)
2 parents d4c7101 + 175cebd commit 6f2c5cb

13 files changed

Lines changed: 102 additions & 9 deletions

File tree

core/repository/api/src/main/java/org/eclipse/rdf4j/repository/RepositoryConnection.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ Update prepareUpdate(QueryLanguage ql, String update, String baseURI)
372372
throws RepositoryException, MalformedQueryException;
373373

374374
/**
375-
* Gets all resources that are used as content identifiers. Care should be taken that the returned
375+
* Gets all resources that are used as context identifiers. Care should be taken that the returned
376376
* {@link RepositoryResult} is closed to free any resources that it keeps hold of.
377377
*
378378
* @return a RepositoryResult object containing Resources that are used as context identifiers.

core/rio/jsonld/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
<groupId>org.glassfish</groupId>
4646
<artifactId>jakarta.json</artifactId>
4747
<version>2.0.1</version>
48+
<classifier>module</classifier>
4849
</dependency>
4950
<dependency>
5051
<groupId>org.apache.httpcomponents</groupId>

core/rio/jsonld/src/main/resources/META-INF/services/jakarta.json.spi.JsonProvider

Lines changed: 0 additions & 1 deletion
This file was deleted.

core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/TripleStore.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,8 @@ public int compareRegion(ByteBuffer array1, int startIdx1, ByteBuffer array2, in
201201
env = pp.get(0);
202202
}
203203

204-
E(mdb_env_set_maxdbs(env, 12));
204+
// 1 for contexts, 12 for triple indexes (2 per index)
205+
E(mdb_env_set_maxdbs(env, 13));
205206
E(mdb_env_set_maxreaders(env, 256));
206207

207208
// Open environment
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
/*******************************************************************************
2+
* Copyright (c) 2025 Eclipse RDF4J contributors.
3+
*
4+
* All rights reserved. This program and the accompanying materials
5+
* are made available under the terms of the Eclipse Distribution License v1.0
6+
* which accompanies this distribution, and is available at
7+
* http://www.eclipse.org/org/documents/edl-v10.php.
8+
*
9+
* SPDX-License-Identifier: BSD-3-Clause
10+
*******************************************************************************/
11+
package org.eclipse.rdf4j.sail.lmdb;
12+
13+
import static org.junit.Assert.*;
14+
15+
import java.io.File;
16+
17+
import org.eclipse.rdf4j.sail.lmdb.config.LmdbStoreConfig;
18+
import org.junit.jupiter.api.BeforeEach;
19+
import org.junit.jupiter.api.Test;
20+
import org.junit.jupiter.api.io.TempDir;
21+
22+
/**
23+
* Test ensuring {@link TripleStore} can handle up to 6 indexes.
24+
*/
25+
public class TripleStoreManyIndexesTest {
26+
private File dataDir;
27+
28+
@BeforeEach
29+
public void before(@TempDir File dataDir) throws Exception {
30+
this.dataDir = dataDir;
31+
}
32+
33+
@Test
34+
public void testSixIndexes() throws Exception {
35+
TripleStore tripleStore = new TripleStore(dataDir,
36+
new LmdbStoreConfig("spoc,posc,ospc,cspo,cpos,cosp"));
37+
tripleStore.startTransaction();
38+
tripleStore.storeTriple(1, 2, 3, 1, true);
39+
tripleStore.commit();
40+
41+
try (TxnManager.Txn txn = tripleStore.getTxnManager().createReadTxn()) {
42+
var it = tripleStore.getTriples(txn, 1, 2, 3, 1, true);
43+
assertNotNull("Store should have a stored statement", it.next());
44+
}
45+
}
46+
}

site/content/download.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ toc: true
55

66
You can either retrieve RDF4J via Apache Maven, or download the SDK or onejar directly.
77

8-
## RDF4J 5.1.0 (latest)
8+
## RDF4J 5.1.2 (latest)
99

10-
RDF4J 5.1.0 is our latest stable release. It requires Java 11 minimally.
11-
For details on what’s new and how to upgrade, see the [release and upgrade notes](/release-notes/5.1.0).
10+
RDF4J 5.1.2 is our latest stable release. It requires Java 11 minimally.
11+
For details on what’s new and how to upgrade, see the [release and upgrade notes](/release-notes/5.1.2).
1212

13-
- [RDF4J 5.1.0 SDK (zip)](http://www.eclipse.org/downloads/download.php?file=/rdf4j/eclipse-rdf4j-5.1.0-sdk.zip)<br/>
13+
- [RDF4J 5.1.2 SDK (zip)](http://www.eclipse.org/downloads/download.php?file=/rdf4j/eclipse-rdf4j-5.1.2-sdk.zip)<br/>
1414
Full Eclipse RDF4J SDK, containing all libraries, RDF4J Server, Workbench, and Console applications, and Javadoc API.
1515

16-
- [RDF4J 5.1.0 onejar](http://www.eclipse.org/downloads/download.php?file=/rdf4j/eclipse-rdf4j-5.1.0-onejar.jar)<br/>
16+
- [RDF4J 5.1.2 onejar](http://www.eclipse.org/downloads/download.php?file=/rdf4j/eclipse-rdf4j-5.1.2-onejar.jar)<br/>
1717
Single jar file for easy inclusion of the full RDF4J toolkit in your Java project.
1818

1919
- [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
2828
<dependency>
2929
<groupId>org.eclipse.rdf4j</groupId>
3030
<artifactId>rdf4j-bom</artifactId>
31-
<version>5.1.0</version>
31+
<version>5.1.2</version>
3232
<type>pom</type>
3333
<scope>import</scope>
3434
</dependency>

site/content/news/rdf4j-511.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
title: "RDF4J 5.1.1 released"
3+
date: 2025-01-28T06:36:24+0100
4+
layout: "single"
5+
categories: ["news"]
6+
---
7+
RDF4J 5.1.1 is now available. This is a patch release fixing 9 bugs.
8+
9+
For more details, have a look at the [release notes](/release-notes/5.1.1).
10+
<!--more-->
11+
### Links
12+
13+
- [Download RDF4J](/download/)
14+
- [release notes](/release-notes/5.1.1).

site/content/news/rdf4j-512.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
title: "RDF4J 5.1.2 released"
3+
date: 2025-02-11T12:44:26+0100
4+
layout: "single"
5+
categories: ["news"]
6+
---
7+
RDF4J 5.1.2 is now available. This is a patch release fixing 1 bugs.
8+
9+
For more details, have a look at the [release notes](/release-notes/5.1.2).
10+
<!--more-->
11+
### Links
12+
13+
- [Download RDF4J](/download/)
14+
- [release notes](/release-notes/5.1.2).
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
title: "5.1.1"
3+
toc: true
4+
---
5+
RDF4J 5.1.1 is a patch release that fixes 9 issues.
6+
7+
For a complete overview, see [all issues fixed in 5.1.1](https://github.com/eclipse/rdf4j/milestone/116?closed=1).
8+
9+
### Acknowledgements
10+
11+
This release was made possible by contributions from Håvard M. Ottestad, Andreas Schwarte and Benji Herber.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
title: "5.1.2"
3+
toc: true
4+
---
5+
RDF4J 5.1.2 is a patch release that fixes 1 issues.
6+
7+
For a complete overview, see [all issues fixed in 5.1.2](https://github.com/eclipse/rdf4j/milestone/117?closed=1).

0 commit comments

Comments
 (0)