Important bugfixes

This commit is contained in:
Andrea Cavalli 2023-03-02 23:13:54 +01:00
parent ea1b464ddf
commit a21c1f3cf4
3 changed files with 15 additions and 8 deletions

View File

@ -16,7 +16,7 @@
<lucene.version>9.5.0</lucene.version>
<rocksdb.version>7.9.2</rocksdb.version>
<junit.jupiter.version>5.9.0</junit.jupiter.version>
<data.generator.version>1.0.249</data.generator.version>
<data.generator.version>1.0.252</data.generator.version>
</properties>
<repositories>
<repository>

View File

@ -287,7 +287,7 @@ public class LLUtils {
}
public static String toStringSafe(byte @Nullable[] key) {
if (key == null) {
if (key != null) {
return toString(key);
} else {
return "(released)";
@ -295,7 +295,7 @@ public class LLUtils {
}
public static String toStringSafe(@Nullable Buf key) {
if (key == null) {
if (key != null) {
return toString(key);
} else {
return "(released)";
@ -303,7 +303,7 @@ public class LLUtils {
}
public static String toStringSafe(@Nullable LLRange range) {
if (range == null) {
if (range != null) {
return toString(range);
} else {
return "(released)";
@ -327,10 +327,10 @@ public class LLUtils {
}
public static String toString(@Nullable Buf key) {
if (key == null) {
return "null";
} else {
if (key != null) {
return toString(key.asArray());
} else {
return "null";
}
}

View File

@ -21,6 +21,7 @@ import it.cavallium.dbengine.database.serialization.SerializationException;
import it.cavallium.dbengine.database.serialization.SerializationFunction;
import it.cavallium.dbengine.database.serialization.Serializer;
import it.cavallium.dbengine.database.serialization.SerializerFixedBinaryLength;
import it.cavallium.dbengine.utils.DBException;
import it.cavallium.dbengine.utils.StreamUtils;
import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap;
import it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap;
@ -138,7 +139,13 @@ public class DatabaseMapDictionary<T, U> extends DatabaseMapDictionaryDeep<T, U,
var valSizeHint = valueSerializer.getSerializedSizeHint();
if (valSizeHint == -1) valSizeHint = 128;
var valBuf = BufDataOutput.create(valSizeHint);
valueSerializer.serialize(value, valBuf);
try {
valueSerializer.serialize(value, valBuf);
} catch (SerializationException ex) {
throw ex;
} catch (Exception ex) {
throw new SerializationException("Failed to serialize value");
}
return valBuf.asList();
}