Skip to content

Allow padding to be omitted from binary metadata values #2243

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
merged 2 commits into from
May 27, 2025
Merged

Allow padding to be omitted from binary metadata values #2243

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
7936174
Allow padding to be omitted from binary metadata values
glbrntt May 27, 2025
1aa3999
Update thresholds
glbrntt May 27, 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
6 changes: 1 addition & 5 deletions ...s/6.0/GRPCSwiftBenchmark.Metadata_Iterate_binary_values_when_only_strings_stored.p90.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
{
"mallocCountTotal" : 2000,
"memoryLeaked" : 0,
"releaseCount" : 6001,
"retainCount" : 2000,
"syscalls" : 0
"mallocCountTotal": 1000
}
6 changes: 1 addition & 5 deletions ...s/6.1/GRPCSwiftBenchmark.Metadata_Iterate_binary_values_when_only_strings_stored.p90.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
{
"mallocCountTotal" : 2000,
"memoryLeaked" : 0,
"releaseCount" : 6001,
"retainCount" : 2000,
"syscalls" : 0
"mallocCountTotal": 1000
}
6 changes: 1 addition & 5 deletions ...-main/GRPCSwiftBenchmark.Metadata_Iterate_binary_values_when_only_strings_stored.p90.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
{
"mallocCountTotal" : 2000,
"memoryLeaked" : 0,
"releaseCount" : 7001,
"retainCount" : 3000,
"syscalls" : 0
"mallocCountTotal": 1000
}
6 changes: 1 addition & 5 deletions ...-next/GRPCSwiftBenchmark.Metadata_Iterate_binary_values_when_only_strings_stored.p90.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
{
"mallocCountTotal" : 2000,
"memoryLeaked" : 0,
"releaseCount" : 7001,
"retainCount" : 3000,
"syscalls" : 0
"mallocCountTotal": 1000
}
2 changes: 1 addition & 1 deletion Sources/GRPCCore/Metadata.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ extension Metadata {
switch value {
case .string(let stringValue):
do {
return try Base64.decode(string: stringValue)
return try Base64.decode(string: stringValue, options: [.omitPaddingCharacter])
} catch {
continue
}
Expand Down
12 changes: 12 additions & 0 deletions Tests/GRPCCoreTests/MetadataTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,18 @@ struct MetadataTests {
#expect(Array(metadata[binaryValues: "key-bin"]) == expected)
}

@Test("Iterate over unpadded base64 encoded binary values for a key")
@available(gRPCSwift 2.0, *)
func iterateOverUnpaddedBase64BinaryEncodedValuesForKey() {
let metadata: Metadata = [
"key-bin": "YQ==",
"key-bin": "YQ",
]

let expected: [[UInt8]] = [[UInt8(ascii: "a")], [UInt8(ascii: "a")]]
#expect(Array(metadata[binaryValues: "key-bin"]) == expected)
}

@Test("Subscripts are case-insensitive")
@available(gRPCSwift 2.0, *)
func subscriptIsCaseInsensitive() {
Expand Down