KAFKA-20158: Fix header-based key deserialization in MeteredSessionStoreWithHeaders iterator methods#21734
Open
bbejeck wants to merge 1 commit intoapache:trunkfrom
Conversation
…ds deserializing keys
mjsax
approved these changes
Mar 14, 2026
Member
mjsax
left a comment
mjsax
left a comment
There was a problem hiding this comment.
Overall LGTM. Some minor suggestions. Feel free to merge after addressed.
| } | ||
|
|
||
| final KeyValue<Windowed<Bytes>, byte[]> next = iter.next(); | ||
| if (next == null) { |
Member
There was a problem hiding this comment.
I think we should remove this check. Cf my comments on #21736
| if (cachedNext == null) { | ||
| cachedNext = next(); | ||
| } | ||
| return cachedNext == null ? null : cachedNext.key; |
Member
There was a problem hiding this comment.
Similar -- I would remove the null check (cf #21736)
| public void shouldUseHeadersFromValueToDeserializeKeyInFetch() { | ||
| setUp(); | ||
| final Serde<String> keySerde = mock(Serde.class); | ||
| final Serde<AggregationWithHeaders<String>> valueSerde = mock(Serde.class); |
Member
There was a problem hiding this comment.
It seem we don't use valueSerde below, but only pass it into createStoreWithMockSerdes(...) -- can't we move it inside createStoreWithMockSerdes(...) directly, and removing the parameter?
| final KeyValueIterator<Windowed<String>, AggregationWithHeaders<String>> iterator = store.fetch(KEY); | ||
|
|
||
| assertTrue(iterator.hasNext()); | ||
| final KeyValue<Windowed<String>, AggregationWithHeaders<String>> result = iterator.next(); |
Member
There was a problem hiding this comment.
Should we insert a assertEquals(KEY, iterator.peekNextKey().key); before this call? (Same for other tests below)
cf #21736
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes a bug where MeteredSessionStoreWithHeaders iterator methods fail
when key deserializers require headers.
The class inherits iterator-returning methods from
MeteredSessionStore: - fetch(K) / backwardFetch(K) - fetch(K, K) /
backwardFetch(K, K) - findSessions(K, long, long) /
backwardFindSessions(K, long, long) - findSessions(K, K, long, long)
/ backwardFindSessions(K, K, long, long) - findSessions(long, long)
These methods use serdes.keyFrom(bytes, new RecordHeaders()) which
provides empty headers, causing deserialization failures when headers
are required.
The fix overrides each method in MeteredSessionStoreWithHeaders with a
custom iterator that deserializes the value first to extract headers
from AggregationWithHeaders, then uses those headers to deserialize the
key.
This is the session store equivalent of #21705 which fixed the same
issue for MeteredTimestampedWindowStoreWithHeaders.