Skip to content

Fix incorrect size calculation of cloned messages #404

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

Merged
Ostrzyciel merged 2 commits into from
May 25, 2025
Merged

Fix incorrect size calculation of cloned messages #404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79c2469
Fix incorrect size calculation of cloned messages
Ostrzyciel May 25, 2025
b34da3c
Merge branch 'main' into piotr/fix-misreported-option-size
Karolina-Bogacka May 25, 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
14 changes: 14 additions & 0 deletions core/src/test/scala/eu/neverblink/jelly/core/ProtoAuxiliarySpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,20 @@ class ProtoAuxiliarySpec extends AnyWordSpec, Matchers:
}
exception.getMessage should include("depth exceeded: 65")
}

"not preserve the cached size on clone()" in {
// .clone() should not preserve the cached size, as the cloned object will likely be modified
// right after cloning.
// Cloning while preserving the cached size leads to weird, hard-to-debug issues, for example:
// https://github.com/Jelly-RDF/cli/pull/126
val frame = RdfStreamFrame.newInstance()
.addRows(RdfStreamRow.newInstance().setTriple(RdfTriple.newInstance()))
val s = frame.getSerializedSize
s should be > 0
frame.getCachedSize should be (s)
val clonedFrame = frame.clone()
clonedFrame.getCachedSize should be(-1)
}
}

// Tests for the core-protos-google module
Expand Down
6 changes: 5 additions & 1 deletion crunchy-protoc-plugin/src/main/scala/eu/neverblink/protoc/java/gen/MessageGenerator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,11 @@ class MessageGenerator(val info: MessageInfo):
.addParameter(info.typeName, "other", Modifier.FINAL)
.addModifiers(Modifier.PUBLIC, Modifier.FINAL)
.returns(info.mutableTypeName)
copyFrom.addStatement("cachedSize = other.cachedSize")
// Reset cached size -- definitely do not copy it from the other message, because this object
// will likely be modified right after copying, leading to an incorrect cached size.
// Cloning while preserving the cached size leads to weird, hard-to-debug issues, for example:
// https://github.com/Jelly-RDF/cli/pull/126
copyFrom.addStatement("cachedSize = -1")
fields.foreach(_.generateCopyFromCode(copyFrom))
oneOfGenerators.foreach(_.generateCopyFromCode(copyFrom))
copyFrom.addStatement("return this")
Expand Down