Skip to content
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

Improve packed field decoding #959

Draft
wants to merge 12 commits into
base: master
Choose a base branch
from
Draft

Improve packed field decoding #959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1ed72f9
Add pragmas
osa1 Feb 6, 2025
5073a40
Inline _readPacked manually
osa1 Feb 10, 2025
8c41b3c
More inline pragmas
osa1 Feb 10, 2025
edfe97a
Remove redundant checkNotNull calls from pre-null-safe days
osa1 Feb 10, 2025
b7288f5
Merge branch 'redundant_checkNotNull' into vm_inlines
osa1 Feb 10, 2025
69562f6
More tweaks
osa1 Feb 10, 2025
899badb
More tweaks, not sure worth it
osa1 Feb 10, 2025
dc6e8fb
Fix warnings
osa1 Feb 10, 2025
b799c4c
Merge branch 'redundant_checkNotNull' into vm_inlines
osa1 Feb 10, 2025
f39ddce
Fix formatting
osa1 Feb 10, 2025
23b884d
Make _mergeFromCodedBufferReader parameters final
osa1 Feb 10, 2025
20155c5
Merge remote-tracking branch 'origin/master' into vm_inlines
osa1 Feb 11, 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
190 changes: 152 additions & 38 deletions protobuf/lib/src/protobuf/coded_buffer.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ void _writeToCodedBufferWriter(_FieldSet fs, CodedBufferWriter out) {
}
}

void _mergeFromCodedBufferReader(BuilderInfo meta, _FieldSet fs,
CodedBufferReader input, ExtensionRegistry registry) {
void _mergeFromCodedBufferReader(final BuilderInfo meta, final _FieldSet fs,
final CodedBufferReader input, final ExtensionRegistry registry) {
fs._ensureWritable();
while (true) {
final tag = input.readTag();
Expand Down Expand Up @@ -129,33 +129,65 @@ void _mergeFromCodedBufferReader(BuilderInfo meta, _FieldSet fs,
case PbFieldType._REPEATED_BOOL:
final list = fs._ensureRepeatedField(meta, fi);
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
_readPacked(input, () => list.add(input.readBool()));
final limit = input.readInt32();
if (limit != 0) {
list._checkModifiable('add');
// No need to check the element as for `bool` fields we only need to
// check that the value is not null, and we know in `add` below that
// the value isn't null (`readBool` doesn't return `null`).
input._withLimit(limit, () {
while (!input.isAtEnd()) {
list._addUnchecked(input.readBool());
}
});
}
} else {
list.add(input.readBool());
list._checkModifiable('add');
list._addUnchecked(input.readBool());
}
break;
case PbFieldType._REPEATED_BYTES:
final list = fs._ensureRepeatedField(meta, fi);
list.add(input.readBytes());
list._checkModifiable('add');
list._addUnchecked(input.readBytes());
break;
case PbFieldType._REPEATED_STRING:
final list = fs._ensureRepeatedField(meta, fi);
list.add(input.readString());
list._checkModifiable('add');
list._addUnchecked(input.readString());
break;
case PbFieldType._REPEATED_FLOAT:
final list = fs._ensureRepeatedField(meta, fi);
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
_readPacked(input, () => list.add(input.readFloat()));
final limit = input.readInt32();
if (limit != 0) {
list._checkModifiable('add');
input._withLimit(limit, () {
while (!input.isAtEnd()) {
list._addUnchecked(input.readFloat());
}
});
}
} else {
list.add(input.readFloat());
list._checkModifiable('add');
list._addUnchecked(input.readFloat());
}
break;
case PbFieldType._REPEATED_DOUBLE:
final list = fs._ensureRepeatedField(meta, fi);
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
_readPacked(input, () => list.add(input.readDouble()));
final limit = input.readInt32();
if (limit != 0) {
list._checkModifiable('add');
input._withLimit(limit, () {
while (!input.isAtEnd()) {
list._addUnchecked(input.readDouble());
}
});
}
} else {
list.add(input.readDouble());
list._checkModifiable('add');
list._addUnchecked(input.readDouble());
}
break;
case PbFieldType._REPEATED_ENUM:
Expand All @@ -172,81 +204,171 @@ void _mergeFromCodedBufferReader(BuilderInfo meta, _FieldSet fs,
case PbFieldType._REPEATED_INT32:
final list = fs._ensureRepeatedField(meta, fi);
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
_readPacked(input, () => list.add(input.readInt32()));
final limit = input.readInt32();
if (limit != 0) {
list._checkModifiable('add');
input._withLimit(limit, () {
while (!input.isAtEnd()) {
list._addUnchecked(input.readInt32());
}
});
}
} else {
list.add(input.readInt32());
list._checkModifiable('add');
list._addUnchecked(input.readInt32());
}
break;
case PbFieldType._REPEATED_INT64:
final list = fs._ensureRepeatedField(meta, fi);
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
_readPacked(input, () => list.add(input.readInt64()));
final limit = input.readInt32();
if (limit != 0) {
list._checkModifiable('add');
input._withLimit(limit, () {
while (!input.isAtEnd()) {
list._addUnchecked(input.readInt64());
}
});
}
} else {
list.add(input.readInt64());
list._checkModifiable('add');
list._addUnchecked(input.readInt64());
}
break;
case PbFieldType._REPEATED_SINT32:
final list = fs._ensureRepeatedField(meta, fi);
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
_readPacked(input, () => list.add(input.readSint32()));
final limit = input.readInt32();
if (limit != 0) {
list._checkModifiable('add');
input._withLimit(limit, () {
while (!input.isAtEnd()) {
list._addUnchecked(input.readSint32());
}
});
}
} else {
list.add(input.readSint32());
list._checkModifiable('add');
list._addUnchecked(input.readSint32());
}
break;
case PbFieldType._REPEATED_SINT64:
final list = fs._ensureRepeatedField(meta, fi);
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
_readPacked(input, () => list.add(input.readSint64()));
final limit = input.readInt32();
if (limit != 0) {
list._checkModifiable('add');
input._withLimit(limit, () {
while (!input.isAtEnd()) {
list._addUnchecked(input.readSint64());
}
});
}
} else {
list.add(input.readSint64());
list._checkModifiable('add');
list._addUnchecked(input.readSint64());
}
break;
case PbFieldType._REPEATED_UINT32:
final list = fs._ensureRepeatedField(meta, fi);
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
_readPacked(input, () => list.add(input.readUint32()));
final limit = input.readInt32();
if (limit != 0) {
list._checkModifiable('add');
input._withLimit(limit, () {
while (!input.isAtEnd()) {
list._addUnchecked(input.readUint32());
}
});
}
} else {
list.add(input.readUint32());
list._checkModifiable('add');
list._addUnchecked(input.readUint32());
}
break;
case PbFieldType._REPEATED_UINT64:
final list = fs._ensureRepeatedField(meta, fi);
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
_readPacked(input, () => list.add(input.readUint64()));
final limit = input.readInt32();
if (limit != 0) {
list._checkModifiable('add');
input._withLimit(limit, () {
while (!input.isAtEnd()) {
list._addUnchecked(input.readUint64());
}
});
}
} else {
list.add(input.readUint64());
list._checkModifiable('add');
list._addUnchecked(input.readUint64());
}
break;
case PbFieldType._REPEATED_FIXED32:
final list = fs._ensureRepeatedField(meta, fi);
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
_readPacked(input, () => list.add(input.readFixed32()));
final limit = input.readInt32();
if (limit != 0) {
list._checkModifiable('add');
input._withLimit(limit, () {
while (!input.isAtEnd()) {
list._addUnchecked(input.readFixed32());
}
});
}
} else {
list.add(input.readFixed32());
list._checkModifiable('add');
list._addUnchecked(input.readFixed32());
}
break;
case PbFieldType._REPEATED_FIXED64:
final list = fs._ensureRepeatedField(meta, fi);
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
_readPacked(input, () => list.add(input.readFixed64()));
final limit = input.readInt32();
if (limit != 0) {
list._checkModifiable('add');
input._withLimit(limit, () {
while (!input.isAtEnd()) {
list._addUnchecked(input.readFixed64());
}
});
}
} else {
list.add(input.readFixed64());
list._checkModifiable('add');
list._addUnchecked(input.readFixed64());
}
break;
case PbFieldType._REPEATED_SFIXED32:
final list = fs._ensureRepeatedField(meta, fi);
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
_readPacked(input, () => list.add(input.readSfixed32()));
final limit = input.readInt32();
if (limit != 0) {
list._checkModifiable('add');
input._withLimit(limit, () {
while (!input.isAtEnd()) {
list._addUnchecked(input.readSfixed32());
}
});
}
} else {
list.add(input.readSfixed32());
list._checkModifiable('add');
list._addUnchecked(input.readSfixed32());
}
break;
case PbFieldType._REPEATED_SFIXED64:
final list = fs._ensureRepeatedField(meta, fi);
if (wireType == WIRETYPE_LENGTH_DELIMITED) {
_readPacked(input, () => list.add(input.readSfixed64()));
final limit = input.readInt32();
if (limit != 0) {
list._checkModifiable('add');
input._withLimit(limit, () {
while (!input.isAtEnd()) {
list._addUnchecked(input.readSfixed64());
}
});
}
} else {
list.add(input.readSfixed64());
list._checkModifiable('add');
list._addUnchecked(input.readSfixed64());
}
break;
case PbFieldType._REPEATED_MESSAGE:
Expand All @@ -268,14 +390,6 @@ void _mergeFromCodedBufferReader(BuilderInfo meta, _FieldSet fs,
}
}

void _readPacked(CodedBufferReader input, void Function() readFunc) {
input._withLimit(input.readInt32(), () {
while (!input.isAtEnd()) {
readFunc();
}
});
}

void _readPackableToListEnum(
List list,
BuilderInfo meta,
Expand Down
Loading