Skip to content

De/serialization performance improvements and span computation improvements #1810

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
joshhaug wants to merge 3 commits into
base: develop
Choose a base branch
from
Draft

De/serialization performance improvements and span computation improvements #1810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
660b71b
Testing Jackson refactor at a more reasonable seam point in the code
joshhaug Mar 25, 2026
1f801c6
Fix for type inference with massive maps, using static initializer
joshhaug Mar 25, 2026
47f1610
More fixes
joshhaug Mar 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions ...ib/src/main/java/gov/nasa/jpl/aerie/contrib/serialization/mappers/BooleanValueMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package gov.nasa.jpl.aerie.contrib.serialization.mappers;

import com.fasterxml.jackson.core.JsonGenerator;
import gov.nasa.jpl.aerie.merlin.framework.Result;
import gov.nasa.jpl.aerie.merlin.framework.ValueMapper;
import gov.nasa.jpl.aerie.merlin.protocol.types.SerializedValue;
import gov.nasa.jpl.aerie.merlin.protocol.types.ValueSchema;

import java.io.IOException;
import java.util.function.Function;

public final class BooleanValueMapper implements ValueMapper<Boolean> {
Expand All @@ -25,4 +27,9 @@ public Result<Boolean, String> deserializeValue(final SerializedValue serialized
public SerializedValue serializeValue(final Boolean value) {
return SerializedValue.of(value);
}

@Override
public void writeJson(final Boolean value, final JsonGenerator gen) throws IOException {
gen.writeBoolean(value);
}
}
8 changes: 8 additions & 0 deletions ...rib/src/main/java/gov/nasa/jpl/aerie/contrib/serialization/mappers/DoubleValueMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
package gov.nasa.jpl.aerie.contrib.serialization.mappers;

import com.fasterxml.jackson.core.JsonGenerator;
import gov.nasa.jpl.aerie.merlin.framework.Result;
import gov.nasa.jpl.aerie.merlin.framework.ValueMapper;
import gov.nasa.jpl.aerie.merlin.protocol.types.SerializedValue;
import gov.nasa.jpl.aerie.merlin.protocol.types.ValueSchema;

import java.io.IOException;
import java.math.BigDecimal;
import java.util.function.Function;

public final class DoubleValueMapper implements ValueMapper<Double> {
Expand All @@ -25,4 +28,9 @@ public Result<Double, String> deserializeValue(final SerializedValue serializedV
public SerializedValue serializeValue(final Double value) {
return SerializedValue.of(value);
}

@Override
public void writeJson(final Double value, final JsonGenerator gen) throws IOException {
gen.writeNumber(BigDecimal.valueOf(value));
}
}
7 changes: 7 additions & 0 deletions ...ib/src/main/java/gov/nasa/jpl/aerie/contrib/serialization/mappers/IntegerValueMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package gov.nasa.jpl.aerie.contrib.serialization.mappers;

import com.fasterxml.jackson.core.JsonGenerator;
import gov.nasa.jpl.aerie.merlin.framework.Result;
import gov.nasa.jpl.aerie.merlin.framework.ValueMapper;
import gov.nasa.jpl.aerie.merlin.protocol.types.SerializedValue;
import gov.nasa.jpl.aerie.merlin.protocol.types.ValueSchema;

import java.io.IOException;
import java.util.function.Function;

public final class IntegerValueMapper implements ValueMapper<Integer> {
Expand Down Expand Up @@ -36,4 +38,9 @@ public Result<Integer, String> deserializeValue(final SerializedValue serialized
public SerializedValue serializeValue(final Integer value) {
return SerializedValue.of(value);
}

@Override
public void writeJson(final Integer value, final JsonGenerator gen) throws IOException {
gen.writeNumber(value);
}
}
11 changes: 11 additions & 0 deletions contrib/src/main/java/gov/nasa/jpl/aerie/contrib/serialization/mappers/ListValueMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package gov.nasa.jpl.aerie.contrib.serialization.mappers;

import com.fasterxml.jackson.core.JsonGenerator;
import gov.nasa.jpl.aerie.merlin.framework.Result;
import gov.nasa.jpl.aerie.merlin.framework.ValueMapper;
import gov.nasa.jpl.aerie.merlin.protocol.types.SerializedValue;
import gov.nasa.jpl.aerie.merlin.protocol.types.ValueSchema;

import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.function.Function;
Expand Down Expand Up @@ -51,4 +53,13 @@ public SerializedValue serializeValue(final List<T> elements) {
}
return SerializedValue.of(serializedElements);
}

@Override
public void writeJson(final List<T> elements, final JsonGenerator gen) throws IOException {
gen.writeStartArray();
for (final var element : elements) {
this.elementMapper.writeJson(element, gen);
}
gen.writeEndArray();
}
}
7 changes: 7 additions & 0 deletions contrib/src/main/java/gov/nasa/jpl/aerie/contrib/serialization/mappers/LongValueMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package gov.nasa.jpl.aerie.contrib.serialization.mappers;

import com.fasterxml.jackson.core.JsonGenerator;
import gov.nasa.jpl.aerie.merlin.framework.Result;
import gov.nasa.jpl.aerie.merlin.framework.ValueMapper;
import gov.nasa.jpl.aerie.merlin.protocol.types.SerializedValue;
import gov.nasa.jpl.aerie.merlin.protocol.types.ValueSchema;

import java.io.IOException;
import java.util.function.Function;

public final class LongValueMapper implements ValueMapper<Long> {
Expand All @@ -25,4 +27,9 @@ public Result<Long, String> deserializeValue(final SerializedValue serializedVal
public SerializedValue serializeValue(final Long value) {
return SerializedValue.of(value);
}

@Override
public void writeJson(final Long value, final JsonGenerator gen) throws IOException {
gen.writeNumber(value);
}
}
16 changes: 16 additions & 0 deletions contrib/src/main/java/gov/nasa/jpl/aerie/contrib/serialization/mappers/MapValueMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package gov.nasa.jpl.aerie.contrib.serialization.mappers;

import com.fasterxml.jackson.core.JsonGenerator;
import gov.nasa.jpl.aerie.merlin.framework.Result;
import gov.nasa.jpl.aerie.merlin.framework.ValueMapper;
import gov.nasa.jpl.aerie.merlin.protocol.types.SerializedValue;
import gov.nasa.jpl.aerie.merlin.protocol.types.ValueSchema;

import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
Expand Down Expand Up @@ -75,4 +77,18 @@ public SerializedValue serializeValue(final Map<K, V> fields) {
}
return SerializedValue.of(elementSpecs);
}

@Override
public void writeJson(final Map<K, V> fields, final JsonGenerator gen) throws IOException {
gen.writeStartArray();
for (final var entry : fields.entrySet()) {
gen.writeStartObject();
gen.writeFieldName("key");
keyMapper.writeJson(entry.getKey(), gen);
gen.writeFieldName("value");
elementMapper.writeJson(entry.getValue(), gen);
gen.writeEndObject();
}
gen.writeEndArray();
}
}
16 changes: 16 additions & 0 deletions ...rib/src/main/java/gov/nasa/jpl/aerie/contrib/serialization/mappers/RecordValueMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package gov.nasa.jpl.aerie.contrib.serialization.mappers;

import com.fasterxml.jackson.core.JsonGenerator;
import gov.nasa.jpl.aerie.merlin.framework.Result;
import gov.nasa.jpl.aerie.merlin.framework.ValueMapper;
import gov.nasa.jpl.aerie.merlin.protocol.types.SerializedValue;
import gov.nasa.jpl.aerie.merlin.protocol.types.ValueSchema;

import java.io.IOException;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.RecordComponent;
Expand Down Expand Up @@ -86,6 +88,20 @@ public SerializedValue serializeValue(final R value) {
return SerializedValue.of(map);
}

@Override
public void writeJson(final R value, final JsonGenerator gen) throws IOException {
gen.writeStartObject();
for (final var component : components) {
gen.writeFieldName(component.name);
writeJsonHelper(value, component, gen);
}
gen.writeEndObject();
}

private <T> void writeJsonHelper(final R value, final Component<R, T> component, final JsonGenerator gen) throws IOException {
component.mapper.writeJson(component.projection.apply(value), gen);
}

private <T> SerializedValue serializeHelper(final R value, final Component<R, T> component) {
return component.mapper.serializeValue(component.projection.apply(value));
}
Expand Down
7 changes: 7 additions & 0 deletions ...rib/src/main/java/gov/nasa/jpl/aerie/contrib/serialization/mappers/StringValueMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package gov.nasa.jpl.aerie.contrib.serialization.mappers;

import com.fasterxml.jackson.core.JsonGenerator;
import gov.nasa.jpl.aerie.merlin.framework.Result;
import gov.nasa.jpl.aerie.merlin.framework.ValueMapper;
import gov.nasa.jpl.aerie.merlin.protocol.types.SerializedValue;
import gov.nasa.jpl.aerie.merlin.protocol.types.ValueSchema;

import java.io.IOException;
import java.util.function.Function;

public final class StringValueMapper implements ValueMapper<String> {
Expand All @@ -25,4 +27,9 @@ public Result<String, String> deserializeValue(final SerializedValue serializedV
public SerializedValue serializeValue(final String value) {
return SerializedValue.of(value);
}

@Override
public void writeJson(final String value, final JsonGenerator gen) throws IOException {
gen.writeString(value);
}
}
Loading
Loading