snleee commented on code in PR #9309:
URL: https://github.com/apache/pinot/pull/9309#discussion_r970399076
##########
pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/segment/RealtimeSegmentAssignment.java:
##########
@@ -182,9 +185,21 @@ public Map<String, Map<String, String>>
rebalanceTable(Map<String, Map<String, S
boolean bootstrap =
config.getBoolean(RebalanceConfigConstants.BOOTSTRAP,
RebalanceConfigConstants.DEFAULT_BOOTSTRAP);
+ // TODO: remove this check after we also refactor consuming segments
assignment strategy
+ // See https://github.com/apache/pinot/issues/9047
+ SegmentAssignmentStrategy segmentAssignmentStrategy = null;
+ if (completedInstancePartitions != null) {
Review Comment:
if `completedInstancePartitions = null`, we may get
`segmentAssignmentStrategy = null`. rebalanceTiers can potentially face the
null pointer exception in this case?
Also, is `completedInstancePartitions = null` even the valid case? If not,
we can add the Precondition check.
##########
pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/segment/RealtimeSegmentAssignment.java:
##########
@@ -90,9 +89,20 @@ public List<String> assignSegment(String segmentName,
Map<String, Map<String, St
InstancePartitions instancePartitions =
typeToInstancePartitions.getValue();
_logger.info("Assigning segment: {} with instance partitions: {} for
table: {}", segmentName, instancePartitions,
_tableNameWithType);
+
+ SegmentAssignmentStrategy segmentAssignmentStrategy = null;
Review Comment:
I think that the L93-105 can be written as the following:
```
List<String> instancesAssigned;
if (instancePartitionsType == InstancePartitionsType.COMPLETED) {
// Gets Segment assignment strategy for instance partitions
SegmentAssignmentStrategy segmentAssignmentStrategy =
SegmentAssignmentStrategyFactory
.getSegmentAssignmentStrategy(_helixManager, _tableConfig,
instancePartitions, instancePartitionsType);
instancesAssigned =
segmentAssignmentStrategy.assignSegment(segmentName,
currentAssignment, instancePartitions,
InstancePartitionsType.COMPLETED);
} else {
instancesAssigned = assignConsumingSegment(SegmentName,
instancePartitions);
}
```
```
##########
pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/segment/strategy/SegmentAssignmentStrategyFactory.java:
##########
@@ -0,0 +1,105 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pinot.controller.helix.core.assignment.segment.strategy;
+
+import com.google.common.base.Preconditions;
+import java.util.Map;
+import org.apache.helix.HelixManager;
+import org.apache.pinot.common.assignment.InstancePartitions;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.config.table.TableType;
+import org.apache.pinot.spi.config.table.assignment.InstancePartitionsType;
+import org.apache.pinot.spi.config.table.assignment.SegmentAssignmentConfig;
+import org.apache.pinot.spi.utils.CommonConstants.Segment.AssignmentStrategy;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * Factory for SegmentAssignmentStrategy
+ */
+public class SegmentAssignmentStrategyFactory {
+
+ private static final Logger LOGGER =
LoggerFactory.getLogger(SegmentAssignmentStrategyFactory.class);
+ private SegmentAssignmentStrategyFactory() {
+ }
+
+ /**
+ * Determine Segment Assignment strategy
+ */
+ public static SegmentAssignmentStrategy
+ getSegmentAssignmentStrategy(HelixManager helixManager, TableConfig
tableConfig,
+ InstancePartitions instancePartitions, InstancePartitionsType
instancePartitionsType) {
+ String assignmentStrategy = null;
+
+ TableType currentTableType = tableConfig.getTableType();
+ // TODO: Handle segment assignment strategy in future for CONSUMING
segments in follow up PR
+ // See https://github.com/apache/pinot/issues/9047
+ // Accommodate new changes for assignment strategy
+ Map<String, SegmentAssignmentConfig>
+ segmentAssignmentConfigMap =
tableConfig.getSegmentAssignmentConfigMap();
+
+ if (tableConfig.isDimTable()) {
+ // Segment Assignment Strategy for DIM tables
+ Preconditions.checkState(currentTableType == TableType.OFFLINE,
+ "DIM table Segment assignment Strategy is only applicable to
OfflineTables");
+ SegmentAssignmentStrategy segmentAssignmentStrategy = new
DimTableSegmentAssignmentStrategy();
+ segmentAssignmentStrategy.init(helixManager, tableConfig);
+ return segmentAssignmentStrategy;
+ } else {
+ // Try to determine segment assignment strategy from table config
+ if (segmentAssignmentConfigMap != null) {
+ SegmentAssignmentConfig segmentAssignmentConfig;
+ // Use the pre defined segment assignment strategy
+ segmentAssignmentConfig =
segmentAssignmentConfigMap.get(instancePartitionsType.toString().toUpperCase());
+ // Segment assignment config is only applicable to offline tables and
completed segments of real time tables
+ if (segmentAssignmentConfig != null) {
+ assignmentStrategy = segmentAssignmentConfig.getAssignmentStrategy();
+ }
+ }
+ }
+
+ // Use the existing information to determine segment assignment strategy
+ SegmentAssignmentStrategy segmentAssignmentStrategy;
+ if (assignmentStrategy == null) {
+ // Calculate numReplicaGroups and numPartitions to determine segment
assignment strategy
+ int numReplicaGroups = instancePartitions.getNumReplicaGroups();
Review Comment:
I think that we will get the `null pointer error` if `instancePartitions =
null`.
##########
pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/segment/OfflineSegmentAssignment.java:
##########
@@ -53,62 +49,57 @@ protected int getReplication(TableConfig tableConfig) {
public List<String> assignSegment(String segmentName, Map<String,
Map<String, String>> currentAssignment,
Map<InstancePartitionsType, InstancePartitions> instancePartitionsMap) {
InstancePartitions instancePartitions =
instancePartitionsMap.get(InstancePartitionsType.OFFLINE);
+ // Gets Segment assignment strategy for instance partitions
+ SegmentAssignmentStrategy segmentAssignmentStrategy =
SegmentAssignmentStrategyFactory
+ .getSegmentAssignmentStrategy(_helixManager, _tableConfig,
instancePartitions, InstancePartitionsType.OFFLINE);
Preconditions.checkState(instancePartitions != null, "Failed to find
OFFLINE instance partitions for table: %s",
_tableNameWithType);
_logger.info("Assigning segment: {} with instance partitions: {} for
table: {}", segmentName, instancePartitions,
_tableNameWithType);
- List<String> instancesAssigned = assignSegment(segmentName,
currentAssignment, instancePartitions);
+ List<String> instancesAssigned =
segmentAssignmentStrategy.assignSegment(segmentName,
+ currentAssignment, instancePartitions, InstancePartitionsType.OFFLINE);
_logger.info("Assigned segment: {} to instances: {} for table: {}",
segmentName, instancesAssigned,
_tableNameWithType);
return instancesAssigned;
}
- @Override
- protected int getSegmentPartitionId(String segmentName) {
- SegmentZKMetadata segmentZKMetadata =
-
ZKMetadataProvider.getSegmentZKMetadata(_helixManager.getHelixPropertyStore(),
_tableNameWithType, segmentName);
- Preconditions.checkState(segmentZKMetadata != null,
- "Failed to find segment ZK metadata for segment: %s of table: %s",
segmentName, _tableNameWithType);
- return getPartitionId(segmentZKMetadata);
- }
-
- private int getPartitionId(SegmentZKMetadata segmentZKMetadata) {
- String segmentName = segmentZKMetadata.getSegmentName();
- ColumnPartitionMetadata partitionMetadata =
-
segmentZKMetadata.getPartitionMetadata().getColumnPartitionMap().get(_partitionColumn);
- Preconditions.checkState(partitionMetadata != null,
- "Segment ZK metadata for segment: %s of table: %s does not contain
partition metadata for column: %s",
- segmentName, _tableNameWithType, _partitionColumn);
- Set<Integer> partitions = partitionMetadata.getPartitions();
- Preconditions.checkState(partitions.size() == 1,
- "Segment ZK metadata for segment: %s of table: %s contains multiple
partitions for column: %s", segmentName,
- _tableNameWithType, _partitionColumn);
- return partitions.iterator().next();
- }
-
@Override
public Map<String, Map<String, String>> rebalanceTable(Map<String,
Map<String, String>> currentAssignment,
Map<InstancePartitionsType, InstancePartitions> instancePartitionsMap,
@Nullable List<Tier> sortedTiers,
@Nullable Map<String, InstancePartitions> tierInstancePartitionsMap,
Configuration config) {
InstancePartitions offlineInstancePartitions =
instancePartitionsMap.get(InstancePartitionsType.OFFLINE);
+ // Gets Segment assignment strategy for instance partitions
+ SegmentAssignmentStrategy segmentAssignmentStrategy =
SegmentAssignmentStrategyFactory
Review Comment:
Do we need the null check for `offlineInstancePartitions`?
##########
pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/segment/OfflineSegmentAssignment.java:
##########
@@ -53,62 +49,57 @@ protected int getReplication(TableConfig tableConfig) {
public List<String> assignSegment(String segmentName, Map<String,
Map<String, String>> currentAssignment,
Map<InstancePartitionsType, InstancePartitions> instancePartitionsMap) {
InstancePartitions instancePartitions =
instancePartitionsMap.get(InstancePartitionsType.OFFLINE);
+ // Gets Segment assignment strategy for instance partitions
+ SegmentAssignmentStrategy segmentAssignmentStrategy =
SegmentAssignmentStrategyFactory
+ .getSegmentAssignmentStrategy(_helixManager, _tableConfig,
instancePartitions, InstancePartitionsType.OFFLINE);
Preconditions.checkState(instancePartitions != null, "Failed to find
OFFLINE instance partitions for table: %s",
Review Comment:
Let's move this line up so that we call the precondition and then pass
`instancePartitions` to the factory. Then, we will have the guarantee that
`instanceParittions` is always not null.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org
