andreacavalli/CavalliumDBEngine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bugfixes

Browse Source
This commit is contained in:
Andrea Cavalli 2022-03-30 18:36:07 +02:00
parent 7d0951956d
commit cb83c17811
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/it/cavallium/dbengine/database/disk/AbstractRocksDBColumn.java
View File

@ -69,7 +69,8 @@ public sealed abstract class AbstractRocksDBColumn<T extends RocksDB> implements
private final BufferAllocator alloc; private final BufferAllocator alloc;
private final ColumnFamilyHandle cfh; private final ColumnFamilyHandle cfh;
private final MeterRegistry meterRegistry; protected final MeterRegistry meterRegistry;
protected final String columnName;
protected final DistributionSummary keyBufferSize; protected final DistributionSummary keyBufferSize;
protected final DistributionSummary readValueNotFoundWithoutBloomBufferSize; protected final DistributionSummary readValueNotFoundWithoutBloomBufferSize;
@ -99,14 +100,13 @@ public sealed abstract class AbstractRocksDBColumn<T extends RocksDB> implements
this.nettyDirect = opts.allowNettyDirect() && alloc.getAllocationType() == OFF_HEAP; this.nettyDirect = opts.allowNettyDirect() && alloc.getAllocationType() == OFF_HEAP;
this.alloc = alloc; this.alloc = alloc;
this.cfh = cfh; this.cfh = cfh;
String columnName; String columnName;
try { try {
columnName = new String(cfh.getName(), StandardCharsets.UTF_8); columnName = new String(cfh.getName(), StandardCharsets.UTF_8);
} catch (RocksDBException e) { } catch (RocksDBException e) {
throw new IllegalStateException(e); throw new IllegalStateException(e);
} }
this.columnName = columnName;
this.meterRegistry = meterRegistry; this.meterRegistry = meterRegistry;
this.keyBufferSize = DistributionSummary this.keyBufferSize = DistributionSummary

17
src/main/java/it/cavallium/dbengine/database/disk/OptimisticRocksDBColumn.java
View File

@ -2,6 +2,7 @@ package it.cavallium.dbengine.database.disk;
import static it.cavallium.dbengine.database.LLUtils.MARKER_ROCKSDB; import static it.cavallium.dbengine.database.LLUtils.MARKER_ROCKSDB;
import io.micrometer.core.instrument.DistributionSummary;
import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.MeterRegistry;
import io.netty5.buffer.api.Buffer; import io.netty5.buffer.api.Buffer;
import io.netty5.buffer.api.BufferAllocator; import io.netty5.buffer.api.BufferAllocator;
@ -20,6 +21,7 @@ import org.jetbrains.annotations.Nullable;
import org.rocksdb.ColumnFamilyHandle; import org.rocksdb.ColumnFamilyHandle;
import org.rocksdb.OptimisticTransactionDB; import org.rocksdb.OptimisticTransactionDB;
import org.rocksdb.ReadOptions; import org.rocksdb.ReadOptions;
import org.rocksdb.RocksDB;
import org.rocksdb.RocksDBException; import org.rocksdb.RocksDBException;
import org.rocksdb.Status.Code; import org.rocksdb.Status.Code;
import org.rocksdb.Transaction; import org.rocksdb.Transaction;
@ -31,13 +33,23 @@ public final class OptimisticRocksDBColumn extends AbstractRocksDBColumn<Optimis
private static final boolean ALWAYS_PRINT_OPTIMISTIC_RETRIES = false; private static final boolean ALWAYS_PRINT_OPTIMISTIC_RETRIES = false;
private final DistributionSummary optimisticAttempts;
public OptimisticRocksDBColumn(OptimisticTransactionDB db, public OptimisticRocksDBColumn(OptimisticTransactionDB db,
DatabaseOptions databaseOptions, DatabaseOptions databaseOptions,
BufferAllocator alloc, BufferAllocator alloc,
String dbName, String databaseName,
ColumnFamilyHandle cfh, ColumnFamilyHandle cfh,
MeterRegistry meterRegistry) { MeterRegistry meterRegistry) {
super(db, databaseOptions, alloc, dbName, cfh, meterRegistry); super(db, databaseOptions, alloc, databaseName, cfh, meterRegistry);
this.optimisticAttempts = DistributionSummary
.builder("db.optimistic.attempts.distribution")
.publishPercentiles(0.2, 0.5, 0.95)
.baseUnit("times")
.scale(1)
.publishPercentileHistogram()
.tags("db.name", databaseName, "db.column", columnName)
.register(meterRegistry);
} }
@Override @Override
@ -184,6 +196,7 @@ public final class OptimisticRocksDBColumn extends AbstractRocksDBColumn<Optimis
if (retries > 5) { if (retries > 5) {
logger.warn(MARKER_ROCKSDB, "Took {} retries to update key {}", retries, LLUtils.toStringSafe(key)); logger.warn(MARKER_ROCKSDB, "Took {} retries to update key {}", retries, LLUtils.toStringSafe(key));
} }
optimisticAttempts.record(retries);
return switch (returnMode) { return switch (returnMode) {
case NOTHING -> { case NOTHING -> {
if (sentPrevData != null) { if (sentPrevData != null) {