andreacavalli/rockserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix volume path nullability, update gestalt, fix sst options

Browse Source
This commit is contained in:
Andrea Cavalli 2024-09-26 17:16:00 +02:00
parent 4e14ae77db
commit 4d46a32bb4
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -12,7 +12,7 @@
<maven.compiler.source>22</maven.compiler.source> <maven.compiler.source>22</maven.compiler.source>
<maven.compiler.target>22</maven.compiler.target> <maven.compiler.target>22</maven.compiler.target>
<native.maven.plugin.version>0.9.28</native.maven.plugin.version> <native.maven.plugin.version>0.9.28</native.maven.plugin.version>
<gestalt.version>0.25.3</gestalt.version> <gestalt.version>0.32.1</gestalt.version>
<rocksdb.version>9.0.0</rocksdb.version> <rocksdb.version>9.0.0</rocksdb.version>
<slf4j.version>2.0.12</slf4j.version> <slf4j.version>2.0.12</slf4j.version>
<imageName>rockserver-core</imageName> <imageName>rockserver-core</imageName>

2
src/main/java/it/cavallium/rockserver/core/impl/DataSizeDecoder.java
View File

@ -40,7 +40,7 @@ public class DataSizeDecoder implements Decoder<DataSize> {
return GResultOf.errors(new ValidationError.DecodingNumberFormatException(path, return GResultOf.errors(new ValidationError.DecodingNumberFormatException(path,
node, node,
name(), name(),
decoderContext.getSecretConcealer() decoderContext
)); ));
} }
} }

2
src/main/java/it/cavallium/rockserver/core/impl/DbCompressionDecoder.java
View File

@ -41,7 +41,7 @@ public class DbCompressionDecoder implements Decoder<CompressionType> {
return GResultOf.errors(new ValidationError.DecodingNumberFormatException(path, return GResultOf.errors(new ValidationError.DecodingNumberFormatException(path,
node, node,
name(), name(),
decoderContext.getSecretConcealer() decoderContext
)); ));
} }
} }

2
src/main/java/it/cavallium/rockserver/core/impl/EmbeddedDB.java
View File

@ -462,7 +462,7 @@ public class EmbeddedDB implements RocksDBSyncAPI, Closeable {
yield wb; yield wb;
} }
case SST_INGESTION, SST_INGEST_BEHIND -> { case SST_INGESTION, SST_INGEST_BEHIND -> {
var sstWriter = getSSTWriter(columnId, null, null, true, mode == PutBatchMode.SST_INGEST_BEHIND); var sstWriter = getSSTWriter(columnId, null, null, false, mode == PutBatchMode.SST_INGEST_BEHIND);
refs.add(sstWriter); refs.add(sstWriter);
yield sstWriter; yield sstWriter;
} }

6
src/main/java/it/cavallium/rockserver/core/impl/rocksdb/RocksDBLoader.java
View File

@ -488,8 +488,10 @@ public class RocksDBLoader {
.stream() .stream()
.map(volumeConfig -> { .map(volumeConfig -> {
try { try {
return new DbPathRecord(definitiveDbPath.resolve(volumeConfig.volumePath()), volumeConfig.targetSize().longValue()); var volumePath = volumeConfig.volumePath();
} catch (GestaltException e) { Objects.requireNonNull(volumePath, "volumePath is null");
return new DbPathRecord(definitiveDbPath.resolve(volumePath), volumeConfig.targetSize().longValue());
} catch (NullPointerException | GestaltException e) {
throw it.cavallium.rockserver.core.common.RocksDBException.of(RocksDBErrorType.CONFIG_ERROR, "Failed to load volume configurations", e); throw it.cavallium.rockserver.core.common.RocksDBException.of(RocksDBErrorType.CONFIG_ERROR, "Failed to load volume configurations", e);
} }
}) })