Skip to content

Commit 7cf3cd6

Browse files
hmottestadhmottestad
committed
formatting
1 parent d128452 commit 7cf3cd6

3 files changed

Lines changed: 58 additions & 58 deletions

File tree

‎core/sail/nativerdf/src/main/java/org/eclipse/rdf4j/sail/nativerdf/TripleStore.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ class TripleStore implements Closeable {
8080
*/
8181
private static final String INDEXES_KEY = "triple-indexes";
8282

83-
/**
84-
* The version number for the current triple store.
85-
* <ul>
83+
/**
84+
* The version number for the current triple store.
85+
* <ul>
8686
* <li>version 0: The first version which used a single spo-index. This version did not have a properties file yet.
8787
* <li>version 1: Introduces configurable triple indexes and the properties file.
8888
* <li>version 10: Introduces a context field, essentially making this a quad store.
@@ -228,12 +228,12 @@ public TripleStore(File dir, String indexSpecStr, boolean forceSync, Boolean mem
228228
}
229229
}
230230

231-
private static TxnStatusFile createTxnStatusFile(File dir, Boolean memoryMappedTxnStatusFileEnabled)
232-
throws IOException {
233-
boolean enabled = Boolean.TRUE.equals(memoryMappedTxnStatusFileEnabled);
234-
if (enabled) {
235-
return new MemoryMappedTxnStatusFile(dir);
236-
}
231+
private static TxnStatusFile createTxnStatusFile(File dir, Boolean memoryMappedTxnStatusFileEnabled)
232+
throws IOException {
233+
boolean enabled = Boolean.TRUE.equals(memoryMappedTxnStatusFileEnabled);
234+
if (enabled) {
235+
return new MemoryMappedTxnStatusFile(dir);
236+
}
237237
return new TxnStatusFile(dir);
238238
}
239239

‎core/sail/nativerdf/src/test/java/org/eclipse/rdf4j/sail/nativerdf/MemoryMappedTxnStatusFileConfigTest.java‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,24 @@
2020
import org.junit.jupiter.api.io.TempDir;
2121

2222
/**
23-
* Verifies that the implementation used for the transaction status file is controlled through configuration rather than a
24-
* JVM system property.
23+
* Verifies that the implementation used for the transaction status file is controlled through configuration rather than
24+
* a JVM system property.
2525
*/
2626
public class MemoryMappedTxnStatusFileConfigTest {
2727

28-
private static final String MEMORY_MAPPED_ENABLED_PROP = "org.eclipse.rdf4j.sail.nativerdf.MemoryMappedTxnStatusFile.enabled";
28+
private static final String MEMORY_MAPPED_ENABLED_PROP = "org.eclipse.rdf4j.sail.nativerdf.MemoryMappedTxnStatusFile.enabled";
2929

30-
@TempDir
31-
File dataDir;
30+
@TempDir
31+
File dataDir;
3232

33-
@AfterEach
34-
public void clearProperty() {
35-
System.clearProperty(MEMORY_MAPPED_ENABLED_PROP);
36-
}
33+
@AfterEach
34+
public void clearProperty() {
35+
System.clearProperty(MEMORY_MAPPED_ENABLED_PROP);
36+
}
3737

38-
@Test
39-
public void defaultUsesNioTxnStatusFile() throws Exception {
40-
TripleStore tripleStore = new TripleStore(dataDir, "spoc");
38+
@Test
39+
public void defaultUsesNioTxnStatusFile() throws Exception {
40+
TripleStore tripleStore = new TripleStore(dataDir, "spoc");
4141
try {
4242
tripleStore.startTransaction();
4343
tripleStore.storeTriple(1, 2, 3, 4);
@@ -53,21 +53,21 @@ public void defaultUsesNioTxnStatusFile() throws Exception {
5353
}
5454

5555
@Test
56-
public void systemPropertyIsIgnored() throws Exception {
57-
System.setProperty(MEMORY_MAPPED_ENABLED_PROP, "true");
56+
public void systemPropertyIsIgnored() throws Exception {
57+
System.setProperty(MEMORY_MAPPED_ENABLED_PROP, "true");
5858

59-
TripleStore tripleStore = new TripleStore(dataDir, "spoc");
60-
try {
61-
tripleStore.startTransaction();
62-
tripleStore.storeTriple(1, 2, 3, 4);
59+
TripleStore tripleStore = new TripleStore(dataDir, "spoc");
60+
try {
61+
tripleStore.startTransaction();
62+
tripleStore.storeTriple(1, 2, 3, 4);
6363
tripleStore.commit();
6464
} finally {
6565
tripleStore.close();
66-
}
66+
}
6767

68-
File txnStatusFile = new File(dataDir, TxnStatusFile.FILE_NAME);
69-
assertTrue(txnStatusFile.exists(), "Transaction status file should exist");
70-
assertEquals(0L, txnStatusFile.length(),
71-
"System property does not switch to memory-mapped TxnStatusFile");
72-
}
68+
File txnStatusFile = new File(dataDir, TxnStatusFile.FILE_NAME);
69+
assertTrue(txnStatusFile.exists(), "Transaction status file should exist");
70+
assertEquals(0L, txnStatusFile.length(),
71+
"System property does not switch to memory-mapped TxnStatusFile");
72+
}
7373
}

‎core/sail/nativerdf/src/test/java/org/eclipse/rdf4j/sail/nativerdf/NativeStoreTxnStatusConfigTest.java‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -31,39 +31,39 @@ class NativeStoreTxnStatusConfigTest {
3131
@TempDir
3232
File dataDir;
3333

34-
@Test
35-
void configEnablesMemoryMappedTxnStatusFile() throws Exception {
34+
@Test
35+
void configEnablesMemoryMappedTxnStatusFile() throws Exception {
3636
NativeStoreConfig cfg = new NativeStoreConfig("spoc");
3737
cfg.setMemoryMappedTxnStatusFileEnabled(true);
3838

3939
NativeStoreFactory factory = new NativeStoreFactory();
40-
NativeStore sail = (NativeStore) factory.getSail(cfg);
41-
sail.setDataDir(dataDir);
40+
NativeStore sail = (NativeStore) factory.getSail(cfg);
41+
sail.setDataDir(dataDir);
4242

43-
Repository repo = new SailRepository(sail);
44-
repo.init();
45-
assertThat(extractTxnStatusFile(sail)).isInstanceOf(MemoryMappedTxnStatusFile.class);
46-
try (RepositoryConnection conn = repo.getConnection()) {
47-
ValueFactory vf = SimpleValueFactory.getInstance();
48-
IRI p = vf.createIRI("http://example.com/p");
49-
conn.add(vf.createIRI("http://example.com/s"), p, vf.createLiteral("o"));
50-
}
43+
Repository repo = new SailRepository(sail);
44+
repo.init();
45+
assertThat(extractTxnStatusFile(sail)).isInstanceOf(MemoryMappedTxnStatusFile.class);
46+
try (RepositoryConnection conn = repo.getConnection()) {
47+
ValueFactory vf = SimpleValueFactory.getInstance();
48+
IRI p = vf.createIRI("http://example.com/p");
49+
conn.add(vf.createIRI("http://example.com/s"), p, vf.createLiteral("o"));
50+
}
5151
repo.shutDown();
5252

53-
File txnStatusFile = new File(dataDir, TxnStatusFile.FILE_NAME);
54-
assertThat(txnStatusFile).exists();
55-
assertThat(txnStatusFile.length()).isEqualTo(1L);
56-
}
53+
File txnStatusFile = new File(dataDir, TxnStatusFile.FILE_NAME);
54+
assertThat(txnStatusFile).exists();
55+
assertThat(txnStatusFile.length()).isEqualTo(1L);
56+
}
5757

58-
private TxnStatusFile extractTxnStatusFile(NativeStore sail) throws Exception {
59-
NativeSailStore store = (NativeSailStore) sail.getSailStore();
58+
private TxnStatusFile extractTxnStatusFile(NativeStore sail) throws Exception {
59+
NativeSailStore store = (NativeSailStore) sail.getSailStore();
6060

61-
Field tripleStoreField = NativeSailStore.class.getDeclaredField("tripleStore");
62-
tripleStoreField.setAccessible(true);
63-
TripleStore tripleStore = (TripleStore) tripleStoreField.get(store);
61+
Field tripleStoreField = NativeSailStore.class.getDeclaredField("tripleStore");
62+
tripleStoreField.setAccessible(true);
63+
TripleStore tripleStore = (TripleStore) tripleStoreField.get(store);
6464

65-
Field txnStatusFileField = TripleStore.class.getDeclaredField("txnStatusFile");
66-
txnStatusFileField.setAccessible(true);
67-
return (TxnStatusFile) txnStatusFileField.get(tripleStore);
68-
}
65+
Field txnStatusFileField = TripleStore.class.getDeclaredField("txnStatusFile");
66+
txnStatusFileField.setAccessible(true);
67+
return (TxnStatusFile) txnStatusFileField.get(tripleStore);
68+
}
6969
}

0 commit comments

Comments
 (0)