Skip to content

MINOR; Small refactor in GroupMetadata #10236

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
dajac merged 1 commit into from
Mar 1, 2021
+13 −5
Merged

MINOR; Small refactor in GroupMetadata #10236

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 13 additions & 5 deletions core/src/main/scala/kafka/coordinator/group/GroupMetadata.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ private[group] class GroupMetadata(val groupId: String, initialState: GroupState
leaderId = Some(member.memberId)

members.put(member.memberId, member)
member.supportedProtocols.foreach { case (protocol, _) => supportedProtocols(protocol) += 1 }
incSupportedProtocols(member)
member.awaitingJoinCallback = callback

if (member.isAwaitingJoin)
Expand All @@ -263,7 +263,7 @@ private[group] class GroupMetadata(val groupId: String, initialState: GroupState

def remove(memberId: String): Unit = {
members.remove(memberId).foreach { member =>
member.supportedProtocols.foreach { case (protocol, _) => supportedProtocols(protocol) -= 1 }
decSupportedProtocols(member)
if (member.isAwaitingJoin)
numMembersAwaitingJoin -= 1

Expand Down Expand Up @@ -426,6 +426,14 @@ private[group] class GroupMetadata(val groupId: String, initialState: GroupState
protocol
}

private def incSupportedProtocols(member: MemberMetadata): Unit = {
member.supportedProtocols.foreach { case (protocol, _) => supportedProtocols(protocol) += 1 }
}

private def decSupportedProtocols(member: MemberMetadata): Unit = {
member.supportedProtocols.foreach { case (protocol, _) => supportedProtocols(protocol) -= 1 }
}

private def candidateProtocols: Set[String] = {
// get the set of protocols that are commonly supported by all members
val numMembers = members.size
Expand All @@ -434,7 +442,7 @@ private[group] class GroupMetadata(val groupId: String, initialState: GroupState

def supportsProtocols(memberProtocolType: String, memberProtocols: Set[String]): Boolean = {
if (is(Empty))
!memberProtocolType.isEmpty && memberProtocols.nonEmpty
memberProtocolType.nonEmpty && memberProtocols.nonEmpty
else
protocolType.contains(memberProtocolType) && memberProtocols.exists(supportedProtocols(_) == members.size)
}
Expand Down Expand Up @@ -489,9 +497,9 @@ private[group] class GroupMetadata(val groupId: String, initialState: GroupState
def updateMember(member: MemberMetadata,
protocols: List[(String, Array[Byte])],
callback: JoinCallback): Unit = {
member.supportedProtocols.foreach { case (protocol, _) => supportedProtocols(protocol) -= 1 }
protocols.foreach { case (protocol, _) => supportedProtocols(protocol) += 1 }
decSupportedProtocols(member)
member.supportedProtocols = protocols
incSupportedProtocols(member)

if (callback != null && !member.isAwaitingJoin) {
numMembersAwaitingJoin += 1
Expand Down