removing comments

Author: SaiPrasanna9

consumergroup.go

@@ -952,11 +952,6 @@ func (cg *ConsumerGroup) joinGroup(conn coordinator, memberID string) (string, i
 
 	cg.withLogger(func(l Logger) {
 		l.Printf("joined group %s as member %s in generation %d", cg.config.ID, memberID, generationID)
-		l.Printf("*******joingroupresponse : %v", response)
-	})
-	cg.withLogger(func(l Logger) {
-		l.Printf("joined group %s as member %s in generation %d", cg.config.ID, memberID, generationID)
-		l.Printf("*******in joingroup: joingroupresponse : %v", response)
 	})
 
 	var assignments GroupMemberAssignments
@@ -994,25 +989,23 @@ func (cg *ConsumerGroup) makeJoinGroupRequestV1(memberID string) (joinGroupReque
 		ProtocolType:     defaultProtocolType,
 	}
 	for _, balancer := range cg.config.GroupBalancers {
-		// userData, err := balancer.UserData("", make(map[string][]int32), 0)
-		var userdata []byte
-		// if err != nil {
-		// 	return joinGroupRequestV1{}, fmt.Errorf("unable to construct protocol metadata for member, %v: %w", balancer.ProtocolName(), err)
-		// }
+		userData, err := balancer.UserData(memberID, make(map[string][]int32), -1)
+		if err != nil {
+			return joinGroupRequestV1{}, fmt.Errorf("unable to construct protocol metadata for member, %v: %w", balancer.ProtocolName(), err)
+		}
 		if balancer.ProtocolName() == "sticky" {
-			//userdata = append(userdata, cg.userData...)
-			userdata = cg.userData
-			//userDat.appendcg.userData
+			userData = cg.userData
 		}
 		request.GroupProtocols = append(request.GroupProtocols, joinGroupRequestGroupProtocolV1{
 			ProtocolName: balancer.ProtocolName(),
 			ProtocolMetadata: groupMetadata{
 				Version:  1,
 				Topics:   cg.config.Topics,
-				UserData: userdata,
+				UserData: userData,
 			}.bytes(),
 		})
 	}
+
 	return request, nil
 }
 
@@ -1127,12 +1120,6 @@ func (cg *ConsumerGroup) makeSyncGroupRequestV0(memberID string, generationID in
 	}
 
 	balancer, _ := findGroupBalancer(strategy, cg.config.GroupBalancers)
-	// if !ok {
-	// 	// NOTE : this shouldn't happen in practice...the broker should not
-	// 	//        return successfully from joinGroup unless all members support
-	// 	//        at least one common protocol.
-	// 	return nil, fmt.Errorf("unable to find selected balancer, %v, for group, %v", group.GroupProtocol, cg.config.ID)
-	// }
 
 	if memberAssignments != nil {
 		request.GroupAssignments = make([]syncGroupRequestGroupAssignmentV0, 0, 1)
@@ -1150,13 +1137,7 @@ func (cg *ConsumerGroup) makeSyncGroupRequestV0(memberID string, generationID in
 			if balancer.ProtocolName() == "sticky" {
 				var stickyBalancer StickyGroupBalancer
 				userDataBytes, _ = stickyBalancer.UserData(memberID, topics32, generationID)
-				// if err != nil {
-				// 	return nil, err
-				// }
-				// userDataBytes,_ = encode(&StickyAssignorUserDataV1{
-				// 	Topics:     topics32,
-				// 	Generation: generationID,
-				// }, nil)
+				// see if we can encode userdata here itself without having to call balancer.Userdata, that would avoid changing UserData()meth signatures and passing strategy var over join and sync group func calls
 			}
 			request.GroupAssignments = append(request.GroupAssignments, syncGroupRequestGroupAssignmentV0{
 				MemberID: memberID,

groupbalancer.go

@@ -374,28 +374,6 @@ func (s StickyGroupBalancer) AssignGroups(members []GroupMember, topicPartitions
 		topics[topic] = partitions
 	}
 	fmt.Printf("hello here1")
-	// for topic, members := range membersByTopic {
-	// 	partitions := findPartitions(topic, topicPartitions)
-	// 	partitionCount := len(partitions)
-	// 	memberCount := len(members)
-
-	// 	for memberIndex, member := range members {
-	// 		assignmentsByTopic, ok := groupAssignments[member.ID]
-	// 		if !ok {
-	// 			assignmentsByTopic = map[string][]int{}
-	// 			groupAssignments[member.ID] = assignmentsByTopic
-	// 		}
-
-	// 		minIndex := memberIndex * partitionCount / memberCount
-	// 		maxIndex := (memberIndex + 1) * partitionCount / memberCount
-
-	// 		for partitionIndex, partition := range partitions {
-	// 			if partitionIndex >= minIndex && partitionIndex < maxIndex {
-	// 				assignmentsByTopic[topic] = append(assignmentsByTopic[topic], partition)
-	// 			}
-	// 		}
-	// 	}
-	// }
 
 	// track partition movements during generation of the partition assignment plan
 	s.movements = partitionMovements{
@@ -448,13 +426,11 @@ func (s StickyGroupBalancer) AssignGroups(members []GroupMember, topicPartitions
 		unvisitedPartitions[partition] = true
 	}
 
-	////
 	membersByID := make(map[string]GroupMember)
 	for _, member := range members {
 		membersByID[member.ID] = member
 	}
 
-	/////
 	var unassignedPartitions []topicPartitionAssignment
 	for memberID, partitions := range currentAssignment {
 		var keepPartitions []topicPartitionAssignment
@@ -600,23 +576,9 @@ func prepopulateCurrentAssignments(members []GroupMember) (map[string][]topicPar
 
 // Deserialize topic partition assignment data to aid with creation of a sticky assignment.
 func deserializeTopicPartitionAssignment(userDataBytes []byte) (StickyAssignorUserData, error) {
-	// userDataV1 := &StickyAssignorUserDataV1{}
-	// if err := decode(userDataBytes, userDataV1, nil); err != nil {
-	// 	userDataV0 := &StickyAssignorUserDataV0{}
-	// 	if err := decode(userDataBytes, userDataV0, nil); err != nil {
-	// 		return nil, err
-	// 	}
-	// 	return userDataV0, nil
-	// }
-	// return userDataV1, nil
-	//userDataV2 := &StickyAssignorUserDataV2{}
 	var userDataV2 = &StickyAssignorUserDataV2{}
-	fmt.Printf("userdatabytes : %v", userDataBytes)
-	fmt.Printf("hello hello : userdatabytes : %v", userDataBytes)
-	fmt.Printf("hello hello : str(userdatabytes) : %v", string(userDataBytes))
 	b := bytes.NewBuffer(userDataBytes)
 
-	fmt.Printf("hello hello : bytes.buffer of userdatabytes : %v", b)
 	if b.Len() == 0 {
 		return userDataV2, nil
 	}
@@ -628,7 +590,6 @@ func deserializeTopicPartitionAssignment(userDataBytes []byte) (StickyAssignorUs
 	if remain != 0 {
 		return nil, errors.New("expected 0 remain, got some bytes remaining")
 	}
-	fmt.Println("somehere userdatav2", userDataV2)
 	return userDataV2, nil
 
 }