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

Jump to bottom

KAFKA-5216 fix error on peekNextKey in cached window/session store iterators #3016

Closed
wants to merge 2 commits into from
Closed

KAFKA-5216 fix error on peekNextKey in cached window/session store iterators #3016

wants to merge 2 commits into from

Conversation

xvrl
Copy link
Member

@xvrl xvrl commented May 10, 2017

mjsax
mjsax approved these changes May 11, 2017
View reviewed changes
Copy link
Member

@mjsax mjsax left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@asfbot
Copy link

asfbot commented May 11, 2017

Refer to this link for build results (access rights to CI server needed):
https://builds.apache.org/job/kafka-pr-jdk8-scala2.11/3740/
Test PASSed (JDK 8 and Scala 2.11).

@asfbot
Copy link

asfbot commented May 11, 2017

Refer to this link for build results (access rights to CI server needed):
https://builds.apache.org/job/kafka-pr-jdk7-scala2.10/3734/
Test PASSed (JDK 7 and Scala 2.10).

@asfbot
Copy link

asfbot commented May 11, 2017

Refer to this link for build results (access rights to CI server needed):
https://builds.apache.org/job/kafka-pr-jdk8-scala2.12/3730/
Test PASSed (JDK 8 and Scala 2.12).

dguy
dguy approved these changes May 11, 2017
View reviewed changes
Copy link
Contributor

@dguy dguy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

guozhangwang
guozhangwang reviewed May 12, 2017
View reviewed changes
...rg/apache/kafka/streams/state/internals/MergedSortedCacheWrappedWindowStoreIteratorTest.java Outdated
@Test
public void shouldPeekNextKey2() throws Exception {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we just replace the shouldPeekNextKey with this one since its coverage seems to be the "superset" of the old one?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

they both check different code paths, shouldPeekNextKey checks the code path here https://github.com/apache/kafka/pull/3016/files#diff-6ea5070fb98ce2270ef8a94a2eb14511L133 vs. shouldPeekNextKey2 checks the code path here https://github.com/apache/kafka/pull/3016/files#diff-6ea5070fb98ce2270ef8a94a2eb14511R137

guozhangwang
guozhangwang approved these changes May 12, 2017
View reviewed changes
Copy link
Contributor

@guozhangwang guozhangwang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merged to trunk. Thanks @xvrl !

@asfgit asfgit closed this in da0b5b8 May 12, 2017
@asfbot
Copy link

asfbot commented May 12, 2017

Refer to this link for build results (access rights to CI server needed):
https://builds.apache.org/job/kafka-pr-jdk8-scala2.12/3831/
Test FAILed (JDK 8 and Scala 2.12).

@asfbot
Copy link

asfbot commented May 12, 2017

Refer to this link for build results (access rights to CI server needed):
https://builds.apache.org/job/kafka-pr-jdk7-scala2.11/3843/
Test PASSed (JDK 7 and Scala 2.11).

asfgit pushed a commit that referenced this pull request May 12, 2017
@xvrl @guozhangwang
KAFKA-5216: Fix peekNextKey in cached window/session store iterators
05c1355 
guozhangwang mjsax dguy

Author: Xavier Léauté <xavier@confluent.io>

Reviewers: Damian Guy, Matthias J. Sax, Guozhang Wang

Closes #3016 from xvrl/kafka-5216
guozhangwang
guozhangwang reviewed May 12, 2017
View reviewed changes
Copy link
Contributor

@guozhangwang guozhangwang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also cherry-picked to 0.10.2.

@xvrl xvrl mentioned this pull request May 17, 2017
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@guozhangwang guozhangwang guozhangwang approved these changes

@mjsax mjsax mjsax approved these changes

@dguy dguy dguy approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@xvrl @asfbot @dguy @mjsax @guozhangwang