Skip to content

Commit 2c65442

Browse files
DarkAtraDarkAtraclaude
authored
fix(gh-1284): MVStore backend can grow uncontrollably (#1288)
Frequent updates to the same documents left thousands of chunks holding one live page and a great many obsolete ones. Nothing reclaimed them, because autoCompactFillRate(0) had disabled compaction since gh-41, so the file climbed without bound while the live data stayed a few kilobytes - a reported ~800MB around 100 live documents. gh-41 was a cursor reading a chunk that compaction had already reclaimed ("Chunk 162 no longer exists"), which is why compaction was turned off rather than fixed. Every iterator and cursor now registers an MVStore version for its lifetime, so the chunks it is reading cannot be collected underneath it, and compaction is safe to enable again. Abandoned iterators are released by a Cleaner, and by close()/drop() on the map. MVStoreModuleBuilder gains autoCompact, defaulting to true - background compaction runs at MVStore's own 90% target fill rate, and close() compacts the file down before writing it out. Set it false for the previous behaviour. Measured over 25 live documents and 100k updates: the file held at ~213KB against 299KB and climbing, chunk fill rate settled at 37% against a decay to 14%, and close() left 57KB against 299KB. close(-1) is pinned to a single compaction thread for now, working around h2database/h2database#4286, where parallel compaction races on page references in 2.4.240. Remove it when that fix ships. Co-authored-by: DarkAtra <6force@web.de> Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
1 parent 9e8bbdc commit 2c65442

12 files changed

Lines changed: 871 additions & 210 deletions

File tree

‎nitrite-mvstore-adapter/src/main/java/org/dizitart/no2/mvstore/MVStoreModuleBuilder.java‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,26 @@
1616

1717
package org.dizitart.no2.mvstore;
1818

19+
import java.io.File;
20+
import java.util.HashSet;
21+
import java.util.Set;
22+
23+
import org.dizitart.no2.store.events.StoreEventListener;
24+
import org.h2.mvstore.FileStore;
25+
1926
import lombok.AccessLevel;
2027
import lombok.Getter;
2128
import lombok.Setter;
2229
import lombok.experimental.Accessors;
23-
import org.dizitart.no2.store.events.StoreEventListener;
24-
import org.h2.mvstore.FileStore;
25-
26-
import java.io.File;
27-
import java.util.HashSet;
28-
import java.util.Set;
2930

3031
/**
3132
* The MVStoreModuleBuilder class is responsible for building an instance of
3233
* {@link MVStoreModule}. It provides methods to set various configuration
3334
* options for the MVStore database.
34-
*
35-
* @since 4.0
36-
* @see MVStoreModule
35+
*
3736
* @author Anindya Chatterjee
37+
* @see MVStoreModule
38+
* @since 4.0
3839
*/
3940
@Getter
4041
@Setter
@@ -81,6 +82,13 @@ public class MVStoreModuleBuilder {
8182
*/
8283
private boolean autoCommit = true;
8384

85+
/**
86+
* Flag to enable/disable auto-compact mode. If set to true, fragmented
87+
* chunks or chunks that are sufficiently below the target fill rate of 90%
88+
* are reclaimed. This will typically shrink the file.
89+
*/
90+
private boolean autoCompact = true;
91+
8492
/**
8593
* Indicates whether the MVStore should be opened in recovery mode or not.
8694
*/
@@ -174,6 +182,7 @@ public MVStoreModule build() {
174182
dbConfig.compress(compress());
175183
dbConfig.compressHigh(compressHigh());
176184
dbConfig.autoCommit(autoCommit());
185+
dbConfig.autoCompact(autoCompact());
177186
dbConfig.recoveryMode(recoveryMode());
178187
dbConfig.cacheSize(cacheSize());
179188
dbConfig.cacheConcurrency(cacheConcurrency());

‎nitrite-mvstore-adapter/src/main/java/org/dizitart/no2/mvstore/MVStoreUtils.java‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,18 @@
1616

1717
package org.dizitart.no2.mvstore;
1818

19-
import lombok.extern.slf4j.Slf4j;
19+
import static org.dizitart.no2.common.util.StringUtils.isNullOrEmpty;
20+
21+
import java.io.File;
22+
import java.util.Map;
23+
2024
import org.dizitart.no2.exceptions.InvalidOperationException;
2125
import org.dizitart.no2.exceptions.NitriteIOException;
2226
import org.dizitart.no2.mvstore.compat.v1.UpgradeUtil;
2327
import org.h2.mvstore.MVStore;
2428
import org.h2.mvstore.MVStoreException;
2529

26-
import java.io.File;
27-
import java.util.Map;
28-
29-
import static org.dizitart.no2.common.util.StringUtils.isNullOrEmpty;
30+
import lombok.extern.slf4j.Slf4j;
3031

3132
/**
3233
* @author Anindya Chatterjee.
@@ -55,7 +56,7 @@ static MVStore openOrCreate(MVStoreConfig storeConfig) {
5556
}
5657
} catch (MVStoreException me) {
5758
if (me.getMessage().contains("file is locked")) {
58-
throw new NitriteIOException("Database is already opened in other process");
59+
throw new NitriteIOException("Database is already opened in other process", me);
5960
}
6061

6162
if (dbFile != null) {
@@ -128,8 +129,10 @@ private static MVStore.Builder createBuilder(MVStoreConfig mvStoreConfig) {
128129
builder = builder.autoCommitBufferSize(mvStoreConfig.autoCommitBufferSize());
129130
}
130131

131-
// auto compact disabled github issue #41
132-
builder.autoCompactFillRate(0);
132+
if (!mvStoreConfig.autoCompact()) {
133+
// disables background compaction
134+
builder.autoCompactFillRate(0);
135+
}
133136

134137
if (mvStoreConfig.encryptionKey() != null) {
135138
builder = builder.encryptionKey(mvStoreConfig.encryptionKey());

‎nitrite-mvstore-adapter/src/main/java/org/dizitart/no2/mvstore/NitriteMVMap.java‎

Lines changed: 133 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -16,49 +16,58 @@
1616

1717
package org.dizitart.no2.mvstore;
1818

19+
import static org.dizitart.no2.common.util.ValidationUtils.notNull;
20+
21+
import java.lang.ref.Cleaner;
22+
import java.util.AbstractMap;
23+
import java.util.Collections;
24+
import java.util.Iterator;
25+
import java.util.Map;
26+
import java.util.NoSuchElementException;
27+
import java.util.Set;
28+
import java.util.concurrent.ConcurrentHashMap;
29+
import java.util.concurrent.atomic.AtomicBoolean;
30+
import java.util.function.Supplier;
31+
1932
import org.dizitart.no2.common.RecordStream;
2033
import org.dizitart.no2.common.streams.SkippableIterator;
2134
import org.dizitart.no2.common.tuples.Pair;
35+
import org.dizitart.no2.exceptions.NitriteIOException;
2236
import org.dizitart.no2.store.NitriteMap;
2337
import org.dizitart.no2.store.NitriteStore;
2438
import org.h2.mvstore.Cursor;
2539
import org.h2.mvstore.MVMap;
2640
import org.h2.mvstore.MVStore;
2741

28-
import java.util.AbstractMap;
29-
import java.util.Collections;
30-
import java.util.Iterator;
31-
import java.util.Map;
32-
import java.util.concurrent.atomic.AtomicBoolean;
33-
34-
import static org.dizitart.no2.common.util.ValidationUtils.notNull;
35-
3642
/**
37-
* @since 1.0
3843
* @author Anindya Chatterjee
44+
* @since 1.0
3945
*/
4046
class NitriteMVMap<Key, Value> implements NitriteMap<Key, Value> {
47+
4148
private final MVMap<Key, Value> mvMap;
4249
private final NitriteStore<?> nitriteStore;
4350
private final MVStore mvStore;
4451
private final AtomicBoolean droppedFlag;
4552
private final AtomicBoolean closedFlag;
53+
private final Set<VersionUsage> versionUsages;
4654

47-
NitriteMVMap(MVMap<Key, Value> mvMap, NitriteStore<?> nitriteStore) {
55+
NitriteMVMap(final MVMap<Key, Value> mvMap, final NitriteStore<?> nitriteStore) {
4856
this.mvMap = mvMap;
4957
this.nitriteStore = nitriteStore;
5058
this.mvStore = mvMap.getStore();
5159
this.closedFlag = new AtomicBoolean(false);
5260
this.droppedFlag = new AtomicBoolean(false);
61+
this.versionUsages = ConcurrentHashMap.newKeySet();
5362
}
5463

5564
@Override
56-
public boolean containsKey(Key key) {
65+
public boolean containsKey(final Key key) {
5766
return mvMap.containsKey(key);
5867
}
5968

6069
@Override
61-
public Value get(Key key) {
70+
public Value get(final Key key) {
6271
return mvMap.get(key);
6372
}
6473

@@ -69,7 +78,7 @@ public NitriteStore<?> getStore() {
6978

7079
@Override
7180
public void clear() {
72-
MVStore.TxCounter txCounter = mvStore.registerVersionUsage();
81+
final MVStore.TxCounter txCounter = mvStore.registerVersionUsage();
7382
try {
7483
mvMap.clear();
7584
updateLastModifiedTime();
@@ -85,14 +94,14 @@ public String getName() {
8594

8695
@Override
8796
public RecordStream<Value> values() {
88-
return RecordStream.fromIterable(mvMap.values());
97+
return () -> versionedIterator(() -> mvMap.values().iterator());
8998
}
9099

91100
@Override
92-
public Value remove(Key key) {
93-
MVStore.TxCounter txCounter = mvStore.registerVersionUsage();
101+
public Value remove(final Key key) {
102+
final MVStore.TxCounter txCounter = mvStore.registerVersionUsage();
94103
try {
95-
Value value = mvMap.remove(key);
104+
final Value value = mvMap.remove(key);
96105
updateLastModifiedTime();
97106
return value;
98107
} finally {
@@ -102,13 +111,13 @@ public Value remove(Key key) {
102111

103112
@Override
104113
public RecordStream<Key> keys() {
105-
return RecordStream.fromIterable(mvMap.keySet());
114+
return () -> versionedIterator(() -> mvMap.keySet().iterator());
106115
}
107116

108117
@Override
109-
public void put(Key key, Value value) {
118+
public void put(final Key key, final Value value) {
110119
notNull(value, "value cannot be null");
111-
MVStore.TxCounter txCounter = mvStore.registerVersionUsage();
120+
final MVStore.TxCounter txCounter = mvStore.registerVersionUsage();
112121
try {
113122
mvMap.put(key, value);
114123
updateLastModifiedTime();
@@ -123,11 +132,11 @@ public long size() {
123132
}
124133

125134
@Override
126-
public Value putIfAbsent(Key key, Value value) {
135+
public Value putIfAbsent(final Key key, final Value value) {
127136
notNull(value, "value cannot be null");
128-
MVStore.TxCounter txCounter = mvStore.registerVersionUsage();
137+
final MVStore.TxCounter txCounter = mvStore.registerVersionUsage();
129138
try {
130-
Value v = mvMap.putIfAbsent(key, value);
139+
final Value v = mvMap.putIfAbsent(key, value);
131140
updateLastModifiedTime();
132141
return v;
133142
} finally {
@@ -137,7 +146,7 @@ public Value putIfAbsent(Key key, Value value) {
137146

138147
@Override
139148
public RecordStream<Pair<Key, Value>> entries() {
140-
return EntryIterator::new;
149+
return () -> versionedIterator(EntryIterator::new);
141150
}
142151

143152
/**
@@ -201,7 +210,11 @@ public Map.Entry<Key, Value> next() {
201210

202211
@Override
203212
public RecordStream<Pair<Key, Value>> reversedEntries() {
204-
return () -> new ReverseIterator<>(mvMap);
213+
return () -> versionedIterator(() -> new ReverseIterator<>(mvMap));
214+
}
215+
216+
private <Element> Iterator<Element> versionedIterator(final Supplier<Iterator<Element>> iteratorSupplier) {
217+
return new VersionedIterator<>(mvStore, iteratorSupplier, versionUsages);
205218
}
206219

207220
@Override
@@ -215,22 +228,22 @@ public Key lastKey() {
215228
}
216229

217230
@Override
218-
public Key higherKey(Key key) {
231+
public Key higherKey(final Key key) {
219232
return mvMap.higherKey(key);
220233
}
221234

222235
@Override
223-
public Key ceilingKey(Key key) {
236+
public Key ceilingKey(final Key key) {
224237
return mvMap.ceilingKey(key);
225238
}
226239

227240
@Override
228-
public Key lowerKey(Key key) {
241+
public Key lowerKey(final Key key) {
229242
return mvMap.lowerKey(key);
230243
}
231244

232245
@Override
233-
public Key floorKey(Key key) {
246+
public Key floorKey(final Key key) {
234247
return mvMap.floorKey(key);
235248
}
236249

@@ -244,11 +257,12 @@ public void drop() {
244257
if (!droppedFlag.get()) {
245258
droppedFlag.compareAndSet(false, true);
246259
closedFlag.compareAndSet(false, true);
260+
releaseVersionUsages();
247261

248-
MVStore.TxCounter txCounter = mvStore.registerVersionUsage();
262+
final MVStore.TxCounter txCounter = mvStore.registerVersionUsage();
249263
try {
250-
nitriteStore.closeMap(getName());
251-
nitriteStore.removeMap(getName());
264+
nitriteStore.closeMap(mvMap.getName());
265+
nitriteStore.removeMap(mvMap.getName());
252266
} finally {
253267
mvStore.deregisterVersionUsage(txCounter);
254268
}
@@ -264,12 +278,98 @@ public boolean isDropped() {
264278
public void close() {
265279
if (!closedFlag.get() && !droppedFlag.get()) {
266280
closedFlag.compareAndSet(false, true);
267-
nitriteStore.closeMap(getName());
281+
releaseVersionUsages();
282+
nitriteStore.closeMap(mvMap.getName());
268283
}
269284
}
270285

271286
@Override
272287
public boolean isClosed() {
273288
return closedFlag.get();
274289
}
290+
291+
private void releaseVersionUsages() {
292+
for (final VersionUsage versionUsage : versionUsages) {
293+
versionUsage.release();
294+
}
295+
}
296+
297+
private static class VersionedIterator<Element> implements Iterator<Element>, SkippableIterator {
298+
299+
private final Iterator<Element> iterator;
300+
private final Cleaner.Cleanable cleanable;
301+
private final VersionUsage versionUsage;
302+
private boolean exhausted;
303+
304+
private VersionedIterator(final MVStore mvStore,
305+
final Supplier<Iterator<Element>> iteratorSupplier,
306+
final Set<VersionUsage> versionUsages) {
307+
308+
versionUsage = new VersionUsage(mvStore, mvStore.registerVersionUsage(), versionUsages);
309+
versionUsages.add(versionUsage);
310+
311+
try {
312+
this.iterator = iteratorSupplier.get();
313+
this.cleanable = VersionUsage.CLEANER.register(this, versionUsage::release);
314+
} catch (final RuntimeException | Error e) {
315+
versionUsage.release();
316+
throw e;
317+
}
318+
}
319+
320+
@Override
321+
public boolean hasNext() {
322+
if (exhausted) {
323+
return false;
324+
}
325+
ensureOpen();
326+
try {
327+
final boolean hasNext = iterator.hasNext();
328+
if (!hasNext) {
329+
exhausted = true;
330+
cleanable.clean();
331+
}
332+
return hasNext;
333+
} catch (final RuntimeException | Error e) {
334+
cleanable.clean();
335+
throw e;
336+
}
337+
}
338+
339+
@Override
340+
public Element next() {
341+
if (exhausted) {
342+
throw new NoSuchElementException();
343+
}
344+
ensureOpen();
345+
try {
346+
return iterator.next();
347+
} catch (final RuntimeException | Error e) {
348+
cleanable.clean();
349+
throw e;
350+
}
351+
}
352+
353+
@Override
354+
public long skip(final long count) {
355+
ensureOpen();
356+
if (iterator instanceof SkippableIterator) {
357+
return ((SkippableIterator) iterator).skip(count);
358+
}
359+
// The wrapper is uniformly skippable so BoundedStream never has to unwrap it; a
360+
// delegate that cannot seek pays the same loop BoundedStream would have run itself.
361+
long skipped = 0;
362+
while (skipped < count && hasNext()) {
363+
next();
364+
skipped++;
365+
}
366+
return skipped;
367+
}
368+
369+
private void ensureOpen() {
370+
if (versionUsage.isReleased()) {
371+
throw new NitriteIOException("MVStore is closed");
372+
}
373+
}
374+
}
275375
}

0 commit comments

Comments
 (0)