snleee commented on code in PR #9309:
URL: https://github.com/apache/pinot/pull/9309#discussion_r969175475
##########
pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/segment/BaseSegmentAssignment.java:
##########
@@ -93,62 +96,22 @@ public void init(HelixManager helixManager, TableConfig
tableConfig) {
protected abstract int getReplication(TableConfig tableConfig);
/**
- * Helper method to check whether the number of replica-groups matches the
table replication for replica-group based
- * instance partitions. Log a warning if they do not match and use the one
inside the instance partitions. The
- * mismatch can happen when table is not configured correctly (table
replication and numReplicaGroups does not match
- * or replication changed without reassigning instances).
+ * Set Segment assignment strategy for different instance partitions and
puts into a map of
+ * Map<InstancePartitionsType, SegmentAssignmentStrategy>
*/
- protected void checkReplication(InstancePartitions instancePartitions) {
- int numReplicaGroups = instancePartitions.getNumReplicaGroups();
- if (numReplicaGroups != _replication) {
- _logger.warn(
- "Number of replica-groups in instance partitions {}: {} does not
match replication in table config: {} for "
- + "table: {}, using: {}",
instancePartitions.getInstancePartitionsName(), numReplicaGroups, _replication,
- _tableNameWithType, numReplicaGroups);
- }
- }
-
- /**
- * Helper method to assign instances based on the current assignment and
instance partitions.
- */
- protected List<String> assignSegment(String segmentName, Map<String,
Map<String, String>> currentAssignment,
- InstancePartitions instancePartitions) {
- int numReplicaGroups = instancePartitions.getNumReplicaGroups();
- int numPartitions = instancePartitions.getNumPartitions();
-
- if (numReplicaGroups == 1 && numPartitions == 1) {
- // Non-replica-group based assignment
-
- return
SegmentAssignmentUtils.assignSegmentWithoutReplicaGroup(currentAssignment,
instancePartitions,
- _replication);
- } else {
- // Replica-group based assignment
-
- checkReplication(instancePartitions);
-
- int partitionId;
- if (_partitionColumn == null || numPartitions == 1) {
- partitionId = 0;
- } else {
- // Uniformly spray the segment partitions over the instance partitions
- partitionId = getSegmentPartitionId(segmentName) % numPartitions;
- }
-
- return
SegmentAssignmentUtils.assignSegmentWithReplicaGroup(currentAssignment,
instancePartitions, partitionId);
- }
+ protected void setSegmentAssignmentStrategyMap(
Review Comment:
Let's remove this function. We don't need this.
we can directly call factory to get the assignment instance. No need to
cache the strategy map.
##########
pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/segment/BaseSegmentAssignment.java:
##########
@@ -93,62 +96,22 @@ public void init(HelixManager helixManager, TableConfig
tableConfig) {
protected abstract int getReplication(TableConfig tableConfig);
/**
- * Helper method to check whether the number of replica-groups matches the
table replication for replica-group based
- * instance partitions. Log a warning if they do not match and use the one
inside the instance partitions. The
- * mismatch can happen when table is not configured correctly (table
replication and numReplicaGroups does not match
- * or replication changed without reassigning instances).
+ * Set Segment assignment strategy for different instance partitions and
puts into a map of
+ * Map<InstancePartitionsType, SegmentAssignmentStrategy>
*/
- protected void checkReplication(InstancePartitions instancePartitions) {
- int numReplicaGroups = instancePartitions.getNumReplicaGroups();
- if (numReplicaGroups != _replication) {
- _logger.warn(
- "Number of replica-groups in instance partitions {}: {} does not
match replication in table config: {} for "
- + "table: {}, using: {}",
instancePartitions.getInstancePartitionsName(), numReplicaGroups, _replication,
- _tableNameWithType, numReplicaGroups);
- }
- }
-
- /**
- * Helper method to assign instances based on the current assignment and
instance partitions.
- */
- protected List<String> assignSegment(String segmentName, Map<String,
Map<String, String>> currentAssignment,
- InstancePartitions instancePartitions) {
- int numReplicaGroups = instancePartitions.getNumReplicaGroups();
- int numPartitions = instancePartitions.getNumPartitions();
-
- if (numReplicaGroups == 1 && numPartitions == 1) {
- // Non-replica-group based assignment
-
- return
SegmentAssignmentUtils.assignSegmentWithoutReplicaGroup(currentAssignment,
instancePartitions,
- _replication);
- } else {
- // Replica-group based assignment
-
- checkReplication(instancePartitions);
-
- int partitionId;
- if (_partitionColumn == null || numPartitions == 1) {
- partitionId = 0;
- } else {
- // Uniformly spray the segment partitions over the instance partitions
- partitionId = getSegmentPartitionId(segmentName) % numPartitions;
- }
-
- return
SegmentAssignmentUtils.assignSegmentWithReplicaGroup(currentAssignment,
instancePartitions, partitionId);
- }
+ protected void setSegmentAssignmentStrategyMap(
+ Map<InstancePartitionsType, InstancePartitions> instancePartitionsMap) {
+ _assignmentStrategyMap = SegmentAssignmentStrategyFactory
+ .getSegmentAssignmentStrategy(_helixManager, _tableConfig,
instancePartitionsMap);
Review Comment:
@jackjlli Can you elaborate what's contradicting?
##########
pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/segment/BaseSegmentAssignment.java:
##########
@@ -68,11 +68,15 @@ public abstract class BaseSegmentAssignment implements
SegmentAssignment {
protected String _tableNameWithType;
protected int _replication;
protected String _partitionColumn;
+ protected TableConfig _tableConfig;
+ protected Map<InstancePartitionsType, SegmentAssignmentStrategy>
_assignmentStrategyMap;
@Override
- public void init(HelixManager helixManager, TableConfig tableConfig) {
+ public void init(HelixManager helixManager, TableConfig tableConfig,
+ Map<InstancePartitionsType, InstancePartitions> instancePartitionsMap) {
_helixManager = helixManager;
_tableNameWithType = tableConfig.getTableName();
+ _tableConfig = tableConfig;
Review Comment:
+1 let's delete this.
##########
pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/segment/strategy/SegmentAssignmentStrategyFactory.java:
##########
@@ -0,0 +1,110 @@
+/**
+ * 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 java.util.HashMap;
+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 Map<InstancePartitionsType, SegmentAssignmentStrategy>
+ getSegmentAssignmentStrategy(HelixManager helixManager,
+ TableConfig tableConfig, Map<InstancePartitionsType, InstancePartitions>
instancePartitionsMap) {
+ String assignmentStrategy = null;
+ Map<InstancePartitionsType, SegmentAssignmentStrategy>
segmentAssignmentStrategyMap = new HashMap<>();
+
+ TableType currentTableType = tableConfig.getTableType();
+ // TODO: Handle segment assignment strategy in future for CONSUMING
segments in follow up PR
+ InstancePartitionsType instancePartitionsType = currentTableType ==
TableType.OFFLINE
+ ? InstancePartitionsType.OFFLINE
+ : InstancePartitionsType.COMPLETED;
+
+ // Accommodate new changes for assignment strategy
+ Map<String, SegmentAssignmentConfig>
+ segmentAssignmentConfigMap =
tableConfig.getSegmentAssignmentConfigMap();
+
+ if (tableConfig.isDimTable()) {
+ // Segment Assignment Strategy for DIM tables
+ SegmentAssignmentStrategy segmentAssignmentStrategy = new
DimTableSegmentAssignmentStrategy();
+ segmentAssignmentStrategy.init(helixManager, tableConfig);
+ segmentAssignmentStrategyMap.put(instancePartitionsType,
segmentAssignmentStrategy);
+ return segmentAssignmentStrategyMap;
+ } 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());
Review Comment:
We should consider to standardize the key to be `toUpperCase()` so make the
input config more robust.
##########
pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/segment/strategy/SegmentAssignmentStrategyFactory.java:
##########
@@ -0,0 +1,114 @@
+/**
+ * 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 java.util.HashMap;
+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 Map<InstancePartitionsType, SegmentAssignmentStrategy>
+ getSegmentAssignmentStrategy(HelixManager helixManager,
Review Comment:
@GSharayu I think that @Jackie-Jiang's suggestion is simpler.
```
--> OfflineSegmentAssignment
strategy = getSegmentAssignmentStrategy(OFFLINE)
// deal with oflfine
--> RealtimeSegmentAssignment
strategy = getSegmentAssignmentStrategy(COMPLETED)
// deal with completed
...
strategy = getSegmentAssignmentStrategy(CONSUMING)
// deal with consuming
```
--
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
