Skip to content

Demo- toJson Performance improvements with Direct String operation on Attrib maps #6462

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+178 −7
Open

Demo- toJson Performance improvements with Direct String operation on Attrib maps #6462

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
185 changes: 178 additions & 7 deletions ...a/software/amazon/awssdk/enhanced/dynamodb/internal/document/DefaultEnhancedDocument.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
import software.amazon.awssdk.protocols.jsoncore.JsonNode;
import software.amazon.awssdk.protocols.jsoncore.JsonNodeParser;
import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
import software.amazon.awssdk.utils.BinaryUtils;
import software.amazon.awssdk.utils.Lazy;
import software.amazon.awssdk.utils.StringUtils;
import software.amazon.awssdk.utils.Validate;
Expand Down Expand Up @@ -224,18 +225,188 @@ public Map<String, AttributeValue> getMapOfUnknownType(String attributeName) {
}
return attributeValue.m();
}

@Override
public String toJson() {
if (nonAttributeValueMap.isEmpty()) {
return "{}";
}
return attributeValueMap.getValue().entrySet().stream()
.map(entry -> "\""
+ addEscapeCharacters(entry.getKey())
+ "\":"
+ stringValue(JSON_ATTRIBUTE_CONVERTER.transformTo(entry.getValue())))
.collect(Collectors.joining(",", "{", "}"));

StringBuilder sb = new StringBuilder(nonAttributeValueMap.size() * 50);
sb.append('{');

boolean first = true;
for (Map.Entry<String, Object> entry : nonAttributeValueMap.entrySet()) {
if (!first) {
sb.append(',');
}
first = false;

sb.append('"');
appendEscaped(entry.getKey(), sb);
sb.append("\":");

serializeValueDirect(sb, entry.getValue());
}

sb.append('}');
return sb.toString();
}

private void serializeValueDirect(StringBuilder sb, Object value) {
if (value == null || NULL_ATTRIBUTE_VALUE.equals(value)) {
sb.append("null");
} else if (value instanceof AttributeValue) {
serializeAttributeValue(sb, (AttributeValue) value);
} else if (value instanceof String) {
sb.append('"');
appendEscaped((String) value, sb);
sb.append('"');
} else if (value instanceof Number) {
sb.append(value);
} else if (value instanceof Boolean) {
sb.append(value);
} else if (value instanceof SdkBytes) {
sb.append('"');
sb.append(BinaryUtils.toBase64(((SdkBytes) value).asByteArray()));
sb.append('"');
} else if (value instanceof List) {
serializeListDirect(sb, (List<?>) value);
} else if (value instanceof Map) {
serializeMapDirect(sb, (Map<?, ?>) value);
} else if (value instanceof Set) {
serializeSetDirect(sb, (Set<?>) value);
} else {
@SuppressWarnings("unchecked")
AttributeValue av = toAttributeValue(value, (EnhancedType) EnhancedType.of(value.getClass()));
serializeAttributeValue(sb, av);
}
}

private void serializeAttributeValue(StringBuilder sb, AttributeValue av) {
if (av.nul() != null && av.nul()) {
sb.append("null");
} else if (av.s() != null) {
sb.append('"');
appendEscaped(av.s(), sb);
sb.append('"');
} else if (av.n() != null) {
sb.append(av.n());
} else if (av.bool() != null) {
sb.append(av.bool());
} else if (av.b() != null) {
sb.append('"');
sb.append(BinaryUtils.toBase64((av.b().asByteArray())));
sb.append('"');
} else if (av.hasL()) {
sb.append('[');
boolean first = true;
for (AttributeValue item : av.l()) {
if (!first) sb.append(',');
first = false;
serializeAttributeValue(sb, item);
}
sb.append(']');
} else if (av.hasM()) {
sb.append('{');
boolean first = true;
for (Map.Entry<String, AttributeValue> entry : av.m().entrySet()) {
if (!first) sb.append(',');
first = false;
sb.append('"');
appendEscaped(entry.getKey(), sb);
sb.append("\":");
serializeAttributeValue(sb, entry.getValue());
}
sb.append('}');
} else if (av.hasSs()) {
sb.append('[');
boolean first = true;
for (String s : av.ss()) {
if (!first) sb.append(',');
first = false;
sb.append('"');
appendEscaped(s, sb);
sb.append('"');
}
sb.append(']');
} else if (av.hasNs()) {
sb.append('[');
boolean first = true;
for (String n : av.ns()) {
if (!first) sb.append(',');
first = false;
sb.append(n);
}
sb.append(']');
} else if (av.hasBs()) {
sb.append('[');
boolean first = true;
for (SdkBytes b : av.bs()) {
if (!first) sb.append(',');
first = false;
sb.append('"');
sb.append(b.asUtf8String()); // Changed from asUtf8String()
sb.append('"');
}
sb.append(']');
}
}

private void serializeListDirect(StringBuilder sb, List<?> list) {
sb.append('[');
boolean first = true;
for (Object item : list) {
if (!first) sb.append(',');
first = false;
serializeValueDirect(sb, item);
}
sb.append(']');
}

private void serializeMapDirect(StringBuilder sb, Map<?, ?> map) {
sb.append('{');
boolean first = true;
for (Map.Entry<?, ?> entry : map.entrySet()) {
if (!first) sb.append(',');
first = false;
sb.append('"');
appendEscaped(String.valueOf(entry.getKey()), sb);
sb.append("\":");
serializeValueDirect(sb, entry.getValue());
}
sb.append('}');
}

private void serializeSetDirect(StringBuilder sb, Set<?> set) {
sb.append('[');
boolean first = true;
for (Object item : set) {
if (!first) sb.append(',');
first = false;
serializeValueDirect(sb, item);
}
sb.append(']');
}

private void appendEscaped(String input, StringBuilder output) {
for (int i = 0, len = input.length(); i < len; i++) {
char ch = input.charAt(i);
switch (ch) {
case '\\': output.append("\\\\"); break;
case '"': output.append("\\\""); break;
case '\n': output.append("\\n"); break;
case '\r': output.append("\\r"); break;
case '\t': output.append("\\t"); break;
case '\f': output.append("\\f"); break;
case '\b': output.append("\\b"); break;
default:
if (ch < 0x20) {
output.append(String.format("\\u%04X", (int) ch));
} else {
output.append(ch);
}
}
}
}

@Override
Expand Down
Loading