Merge changelog consistency #1
Open
Conversation
This file contains 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
fix imports changed from auto-import fix imports changed from auto-import put and restore of positions write entire offset on commit added tests cleaning cleanup cleanup pass entire clock to changelog rebase remove import position in changelog and cache store styling add position tracking to changelog stores debugging fixed tests rebase fix test
vvcephei
commented
Dec 4, 2021
Comment on lines
1191
to
1218
| { | ||
| final Position position = Position | ||
| .emptyPosition() | ||
| .withComponent("A", 0, 1); | ||
| final Headers headers = new RecordHeaders(); | ||
| headers.add( | ||
| ChangelogRecordDeserializationHelper.CHANGELOG_VERSION_HEADER_RECORD_CONSISTENCY); | ||
| headers.add(new RecordHeader( | ||
| ChangelogRecordDeserializationHelper.VECTOR_KEY, | ||
| PositionSerde.serialize(position).array())); | ||
| entries.add(new ConsumerRecord<>("", 0, 0L, RecordBatch.NO_TIMESTAMP, | ||
| TimestampType.NO_TIMESTAMP_TYPE, -1, -1, | ||
| "1".getBytes(UTF_8), "a".getBytes(UTF_8), headers, Optional.empty())); | ||
|
|
||
| position = position.update("A", 0, 2); | ||
| headers.add(ChangelogRecordDeserializationHelper.CHANGELOG_VERSION_HEADER_RECORD_CONSISTENCY); | ||
| headers.add(new RecordHeader(Position.VECTOR_KEY, position.serialize().array())); | ||
| entries.add(new ConsumerRecord<>("", 0, 0L, RecordBatch.NO_TIMESTAMP, TimestampType.NO_TIMESTAMP_TYPE, -1, -1, | ||
| } | ||
| { | ||
| final Position position = Position | ||
| .emptyPosition() | ||
| .withComponent("A", 0, 2); | ||
| final Headers headers = new RecordHeaders(); | ||
| headers.add( | ||
| ChangelogRecordDeserializationHelper.CHANGELOG_VERSION_HEADER_RECORD_CONSISTENCY); | ||
| headers.add(new RecordHeader( | ||
| ChangelogRecordDeserializationHelper.VECTOR_KEY, | ||
| PositionSerde.serialize(position).array())); | ||
| entries.add(new ConsumerRecord<>("", 0, 0L, RecordBatch.NO_TIMESTAMP, | ||
| TimestampType.NO_TIMESTAMP_TYPE, -1, -1, | ||
| "1".getBytes(UTF_8), null, headers, Optional.empty())); | ||
|
|
||
| } |
There was a problem hiding this comment.
Most of the changes I made were just trivial conflict resolution, but you should be aware that there were several tests I discovered had this same bug. The Headers object was shared among all the records, so rather than sending several records with different headers, we were actually sending several objects with the same headers. To achieve the scenario you were going for, we need a fresh headers object each time.
vpapavas
force-pushed
the
consistency-changelog
branch
from
1c41696
to
84e1349
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Hey @vpapavas ,
This PR merges trunk into your branch to resolve conflicts with apache#11557
Unfortunately, the diff you'll see here contains all the lines from those other commits as well.
I think, rather than reading through this diff, you'll want to just merge it (to your PR branch), and then check out the resulting diff on your PR.
Committer Checklist (excluded from commit message)