Skip to content

perf: improve strings handling #636

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

Closed
anthony-swirldslabs wants to merge 3 commits into from
Closed

perf: improve strings handling #636

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
4b876bc
perf: improve strings handling
anthony-swirldslabs Oct 1, 2025
df64a92
merge from upstream
anthony-swirldslabs Oct 3, 2025
67e2746
address comments, fix previous merge, spotless
anthony-swirldslabs Oct 3, 2025
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
152 changes: 111 additions & 41 deletions pbj-core/pbj-compiler/src/main/java/com/hedera/pbj/compiler/impl/Common.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,15 @@ public static String getFieldsHashCode(final List<Field> fields, String generate
.replace("$fieldName", f.nameCamelFirstLower());
} else if (f.type() == Field.FieldType.MAP) {
generatedCodeSoFar += getMapHashCodeGeneration(generatedCodeSoFar, f);
} else if (f.type() == Field.FieldType.STRING || f.parent() == null) { // process sub message
} else if (f.isString()) {
generatedCodeSoFar +=
("""
if (!Arrays.equals($fieldName, DEFAULT.$fieldName)) {
result = 31 * result + Arrays.hashCode($fieldName);
}
""")
.replace("$fieldName", f.nameCamelFirstLower());
} else if (f.parent() == null) { // process sub message
generatedCodeSoFar +=
("""
if ($fieldName != null && !$fieldName.equals(DEFAULT.$fieldName)) {
Expand All @@ -310,7 +318,7 @@ public static String getFieldsHashCode(final List<Field> fields, String generate
}

/**
* Get the hashcode codegen for a optional field.
* Get the hashcode codegen for an optional field.
*
* @param generatedCodeSoFar The string that the codegen is generated into.
* @param f The field for which to generate the hash code.
Expand All @@ -320,55 +328,62 @@ public static String getFieldsHashCode(final List<Field> fields, String generate
@NonNull
private static String getPrimitiveWrapperHashCodeGeneration(String generatedCodeSoFar, Field f) {
switch (f.messageType()) {
case "StringValue" -> generatedCodeSoFar +=
("""
if ($fieldName != null && !$fieldName.equals(DEFAULT.$fieldName)) {
result = 31 * result + $fieldName.hashCode();
case "StringValue" ->
generatedCodeSoFar +=
("""
if ($fieldName != null && !Arrays.equals($fieldName, DEFAULT.$fieldName)) {
result = 31 * result + Arrays.hashCode($fieldName);
}
""")
.replace("$fieldName", f.nameCamelFirstLower());
case "BoolValue" -> generatedCodeSoFar +=
("""
.replace("$fieldName", f.nameCamelFirstLower());
case "BoolValue" ->
generatedCodeSoFar +=
("""
if ($fieldName != null && !$fieldName.equals(DEFAULT.$fieldName)) {
result = 31 * result + Boolean.hashCode($fieldName);
}
""")
.replace("$fieldName", f.nameCamelFirstLower());
case "Int32Value", "UInt32Value" -> generatedCodeSoFar +=
("""
.replace("$fieldName", f.nameCamelFirstLower());
case "Int32Value", "UInt32Value" ->
generatedCodeSoFar +=
("""
if ($fieldName != null && !$fieldName.equals(DEFAULT.$fieldName)) {
result = 31 * result + Integer.hashCode($fieldName);
}
""")
.replace("$fieldName", f.nameCamelFirstLower());
case "Int64Value", "UInt64Value" -> generatedCodeSoFar +=
("""
.replace("$fieldName", f.nameCamelFirstLower());
case "Int64Value", "UInt64Value" ->
generatedCodeSoFar +=
("""
if ($fieldName != null && !$fieldName.equals(DEFAULT.$fieldName)) {
result = 31 * result + Long.hashCode($fieldName);
}
""")
.replace("$fieldName", f.nameCamelFirstLower());
case "FloatValue" -> generatedCodeSoFar +=
("""
.replace("$fieldName", f.nameCamelFirstLower());
case "FloatValue" ->
generatedCodeSoFar +=
("""
if ($fieldName != null && !$fieldName.equals(DEFAULT.$fieldName)) {
result = 31 * result + Float.hashCode($fieldName);
}
""")
.replace("$fieldName", f.nameCamelFirstLower());
case "DoubleValue" -> generatedCodeSoFar +=
("""
.replace("$fieldName", f.nameCamelFirstLower());
case "DoubleValue" ->
generatedCodeSoFar +=
("""
if ($fieldName != null && !$fieldName.equals(DEFAULT.$fieldName)) {
result = 31 * result + Double.hashCode($fieldName);
}
""")
.replace("$fieldName", f.nameCamelFirstLower());
case "BytesValue" -> generatedCodeSoFar +=
("""
.replace("$fieldName", f.nameCamelFirstLower());
case "BytesValue" ->
generatedCodeSoFar +=
("""
if ($fieldName != null && !$fieldName.equals(DEFAULT.$fieldName)) {
result = 31 * result + ($fieldName == null ? 0 : $fieldName.hashCode());
}
""")
.replace("$fieldName", f.nameCamelFirstLower());
.replace("$fieldName", f.nameCamelFirstLower());
default -> throw new UnsupportedOperationException("Unhandled optional message type:" + f.messageType());
}
return generatedCodeSoFar;
Expand All @@ -390,14 +405,16 @@ private static String getRepeatedHashCodeGeneration(String generatedCodeSoFar, F
if (list$$fieldName != null) {
for (Object o : list$$fieldName) {
if (o != null) {
result = 31 * result + o.hashCode();
result = 31 * result + $singleHashCodeGetter;
} else {
result = 31 * result;
}
}
}
""")
.replace("$fieldName", f.nameCamelFirstLower());
.replace("$fieldName", f.nameCamelFirstLower())
.replace(
"$singleHashCodeGetter", f.isString() ? "Arrays.hashCode((byte[]) o)" : "o.hashCode()");
return generatedCodeSoFar;
}

Expand Down Expand Up @@ -500,8 +517,15 @@ public static String getFieldsEqualsStatements(final List<Field> fields, String
}
"""
.replace("$fieldName", f.nameCamelFirstLower());
} else if (f.type() == Field.FieldType.STRING
|| f.type() == Field.FieldType.BYTES
} else if (f.type() == Field.FieldType.STRING) {
generatedCodeSoFar +=
("""
if (!Arrays.equals($fieldName, thatObj.$fieldName)) {
return false;
}
""")
.replace("$fieldName", f.nameCamelFirstLower());
} else if (f.type() == Field.FieldType.BYTES
|| f.type() == Field.FieldType.ENUM
|| f.type() == Field.FieldType.MAP
|| f.parent() == null /* Process a sub-message */) {
Expand Down Expand Up @@ -535,24 +559,32 @@ public static String getFieldsEqualsStatements(final List<Field> fields, String
@NonNull
private static String getPrimitiveWrapperEqualsGeneration(String generatedCodeSoFar, Field f) {
switch (f.messageType()) {
case "StringValue",
"BoolValue",
case "StringValue" ->
generatedCodeSoFar +=
("""
if (!Arrays.equals($fieldName, thatObj.$fieldName)) {
return false;
}
""")
.replace("$fieldName", f.nameCamelFirstLower());
case "BoolValue",
"Int32Value",
"UInt32Value",
"Int64Value",
"UInt64Value",
"FloatValue",
"DoubleValue",
"BytesValue" -> generatedCodeSoFar +=
("""
"BytesValue" ->
generatedCodeSoFar +=
("""
if (this.$fieldName == null && thatObj.$fieldName != null) {
return false;
}
if (this.$fieldName != null && !$fieldName.equals(thatObj.$fieldName)) {
return false;
}
""")
.replace("$fieldName", f.nameCamelFirstLower());
.replace("$fieldName", f.nameCamelFirstLower());
default -> throw new UnsupportedOperationException("Unhandled optional message type:" + f.messageType());
}
return generatedCodeSoFar;
Expand All @@ -574,11 +606,33 @@ private static String getRepeatedEqualsGeneration(String generatedCodeSoFar, Fie
return false;
}

""")
.replace("$fieldName", f.nameCamelFirstLower());
if (f.isString()) {
generatedCodeSoFar +=
("""
if (this.$fieldName != null) {
if (thatObj.$fieldName == null || this.$fieldName.size() != thatObj.$fieldName.size()) {
return false;
}
for (int i = this.$fieldName.size() - 1; i >= 0; i--) {
if (!Arrays.equals(this.$fieldName.get(i), thatObj.$fieldName.get(i))) {
return false;
}
}
}
""")
.replace("$fieldName", f.nameCamelFirstLower());

} else {
generatedCodeSoFar +=
("""
if (this.$fieldName != null && !$fieldName.equals(thatObj.$fieldName)) {
return false;
}
""")
.replace("$fieldName", f.nameCamelFirstLower());
.replace("$fieldName", f.nameCamelFirstLower());
}
return generatedCodeSoFar;
}

Expand Down Expand Up @@ -667,9 +721,24 @@ public static String getFieldsCompareToStatements(final List<Field> fields, Stri
}
"""
.replace("$fieldName", f.nameCamelFirstLower());
} else if (f.type() == Field.FieldType.STRING
|| f.type() == Field.FieldType.BYTES
|| f.type() == Field.FieldType.ENUM) {
} else if (f.type() == Field.FieldType.STRING) {
generatedCodeSoFar +=
"""
if ($fieldName == null && thatObj.$fieldName != null) {
return -1;
}
if ($fieldName != null && thatObj.$fieldName == null) {
return 1;
}
if ($fieldName != null) {
result = Arrays.compare($fieldName, thatObj.$fieldName);
}
if (result != 0) {
return result;
}
"""
.replace("$fieldName", f.nameCamelFirstLower());
} else if (f.type() == Field.FieldType.BYTES || f.type() == Field.FieldType.ENUM) {
generatedCodeSoFar += generateCompareToForObject(f);
} else if (f.type() == Field.FieldType.MESSAGE || f.type() == Field.FieldType.ONE_OF) {
verifyComparable(f);
Expand Down Expand Up @@ -752,16 +821,17 @@ private static String getPrimitiveWrapperCompareToGeneration(Field f) {

final String compareStatement =
switch (f.messageType()) {
case "StringValue", "BytesValue" -> "$fieldName.compareTo(thatObj.$fieldName)";
case "StringValue" -> "Arrays.compare($fieldName, thatObj.$fieldName)";
case "BytesValue" -> "$fieldName.compareTo(thatObj.$fieldName)";
case "BoolValue" -> "java.lang.Boolean.compare($fieldName, thatObj.$fieldName)";
case "Int32Value" -> "java.lang.Integer.compare($fieldName, thatObj.$fieldName)";
case "UInt32Value" -> "java.lang.Integer.compareUnsigned($fieldName, thatObj.$fieldName)";
case "Int64Value" -> "java.lang.Long.compare($fieldName, thatObj.$fieldName)";
case "UInt64Value" -> "java.lang.Long.compareUnsigned($fieldName, thatObj.$fieldName)";
case "FloatValue" -> "java.lang.Float.compare($fieldName, thatObj.$fieldName)";
case "DoubleValue" -> "java.lang.Double.compare($fieldName, thatObj.$fieldName)";
default -> throw new UnsupportedOperationException(
"Unhandled optional message type:" + f.messageType());
default ->
throw new UnsupportedOperationException("Unhandled optional message type:" + f.messageType());
};

return template.replace("$compareStatement", compareStatement).replace("$fieldName", f.nameCamelFirstLower());
Expand Down
Loading
Loading