From ad34f173c071e8def4ecb992bdc817d4e3d25e43 Mon Sep 17 00:00:00 2001
From: Xin Gao <gaoxin@uber.com>
Date: Tue, 17 Dec 2024 14:11:14 -0800
Subject: [PATCH] Rebase and resolve conflicts

---
 .../helix/core/PinotTableIdealStateBuilder.java |  4 ----
 .../stream/PartitionGroupMetadataFetcher.java   | 17 -----------------
 2 files changed, 21 deletions(-)

diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotTableIdealStateBuilder.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotTableIdealStateBuilder.java
index 94b98e1f14b7..8895d9df50a4 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotTableIdealStateBuilder.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotTableIdealStateBuilder.java
@@ -80,11 +80,7 @@ public static IdealState buildEmptyIdealStateFor(String tableNameWithType, int n
    * the collection of shards in partition group 1, should remain unchanged in the response,
    * whereas shards 3,4 can be added to new partition groups if needed.
    *
-<<<<<<< HEAD
    * @param streamConfigs the List of streamConfig from the tableConfig
-=======
-   * @param streamConfigs the streamConfigs from the tableConfig
->>>>>>> cae4dc5126 (Resolve comments)
    * @param partitionGroupConsumptionStatusList List of {@link PartitionGroupConsumptionStatus} for the current
    *                                            partition groups.
    *                                          The size of this list is equal to the number of partition groups,
diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/stream/PartitionGroupMetadataFetcher.java b/pinot-spi/src/main/java/org/apache/pinot/spi/stream/PartitionGroupMetadataFetcher.java
index e4bd6df12b72..0f8a62f0fba2 100644
--- a/pinot-spi/src/main/java/org/apache/pinot/spi/stream/PartitionGroupMetadataFetcher.java
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/stream/PartitionGroupMetadataFetcher.java
@@ -41,17 +41,10 @@ public class PartitionGroupMetadataFetcher implements Callable<Boolean> {
   private Exception _exception;
   private final List<String> _topicNames;
 
-<<<<<<< HEAD
-  public PartitionGroupMetadataFetcher(StreamConfig streamConfig,
-      List<PartitionGroupConsumptionStatus> partitionGroupConsumptionStatusList) {
-    _topicNames = Arrays.asList(streamConfig.getTopicName());
-    _streamConfigs = Arrays.asList(streamConfig);
-=======
   public PartitionGroupMetadataFetcher(List<StreamConfig> streamConfigs,
       List<PartitionGroupConsumptionStatus> partitionGroupConsumptionStatusList) {
     _topicNames = streamConfigs.stream().map(StreamConfig::getTopicName).collect(Collectors.toList());
     _streamConfigs = streamConfigs;
->>>>>>> cae4dc5126 (Resolve comments)
     _partitionGroupConsumptionStatusList = partitionGroupConsumptionStatusList;
     _newPartitionGroupMetadataList = new ArrayList<>();
   }
@@ -89,20 +82,10 @@ public Boolean call()
               streamConsumerFactory.createStreamMetadataProvider(clientId)) {
         _newPartitionGroupMetadataList.addAll(streamMetadataProvider.computePartitionGroupMetadata(clientId,
             _streamConfigs.get(i),
-<<<<<<< HEAD
-            _partitionGroupConsumptionStatusList, /*maxWaitTimeMs=*/15000).stream().map(
-=======
             topicPartitionGroupConsumptionStatusList, /*maxWaitTimeMs=*/5000).stream().map(
-<<<<<<< HEAD
->>>>>>> ca24d4bf7b (Fix issues, rebase and resolve comments)
-                metadata -> new PartitionGroupMetadata(
-                    IngestionConfigUtils.getPinotPartitionIdFromStreamPartitionId(
-                        metadata.getPartitionGroupId(), index),
-=======
             metadata -> new PartitionGroupMetadata(
                 IngestionConfigUtils.getPinotPartitionIdFromStreamPartitionId(
                     metadata.getPartitionGroupId(), index),
->>>>>>> 1c346671d0 (Fix style)
                 metadata.getStartOffset())).collect(Collectors.toList())
         );
         if (_exception != null) {