sanpwc commented on code in PR #3226: URL: https://github.com/apache/ignite-3/pull/3226#discussion_r1494316249
########## modules/affinity/src/main/java/org/apache/ignite/internal/affinity/Assignments.java: ########## @@ -0,0 +1,84 @@ +/* + * 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.ignite.internal.affinity; + +import java.io.Serializable; +import java.util.Collections; +import java.util.Set; +import org.apache.ignite.internal.tostring.IgniteToStringInclude; +import org.apache.ignite.internal.tostring.S; +import org.apache.ignite.internal.util.ByteUtils; + +/** + * Class that encapsulates a set of nodes and its metadata. + */ +public class Assignments implements Serializable { + /** Serial version UID. */ + private static final long serialVersionUID = -59553172012153869L; + + /** Empty assignments. */ + public static final Assignments NO_ASSIGNMENTS = new Assignments(Collections.emptySet()); + + /** Set of nodes. */ + @IgniteToStringInclude + private final Set<Assignment> nodes; + + /** + * Constructor. + * + * @param nodes Set of nodes. + */ + public Assignments(Set<Assignment> nodes) { Review Comment: I'd rather add some sugar with either factory method `of()` or at least extra constructor `Assignments(Assignment ... nodes)`. To be honest, private constructor and factory method seems better from my point of view. It will help with immutability. Please check the comment below. ########## modules/affinity/src/main/java/org/apache/ignite/internal/affinity/Assignments.java: ########## @@ -0,0 +1,84 @@ +/* + * 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.ignite.internal.affinity; + +import java.io.Serializable; +import java.util.Collections; +import java.util.Set; +import org.apache.ignite.internal.tostring.IgniteToStringInclude; +import org.apache.ignite.internal.tostring.S; +import org.apache.ignite.internal.util.ByteUtils; + +/** + * Class that encapsulates a set of nodes and its metadata. + */ +public class Assignments implements Serializable { + /** Serial version UID. */ + private static final long serialVersionUID = -59553172012153869L; + + /** Empty assignments. */ + public static final Assignments NO_ASSIGNMENTS = new Assignments(Collections.emptySet()); Review Comment: I'd rather name it EMPTY. Seems more common. Up to you. ########## modules/affinity/src/main/java/org/apache/ignite/internal/affinity/Assignments.java: ########## @@ -0,0 +1,84 @@ +/* + * 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.ignite.internal.affinity; + +import java.io.Serializable; +import java.util.Collections; +import java.util.Set; +import org.apache.ignite.internal.tostring.IgniteToStringInclude; +import org.apache.ignite.internal.tostring.S; +import org.apache.ignite.internal.util.ByteUtils; + +/** + * Class that encapsulates a set of nodes and its metadata. + */ +public class Assignments implements Serializable { + /** Serial version UID. */ + private static final long serialVersionUID = -59553172012153869L; + + /** Empty assignments. */ + public static final Assignments NO_ASSIGNMENTS = new Assignments(Collections.emptySet()); + + /** Set of nodes. */ + @IgniteToStringInclude + private final Set<Assignment> nodes; + + /** + * Constructor. + * + * @param nodes Set of nodes. + */ + public Assignments(Set<Assignment> nodes) { + this.nodes = nodes; + } + + /** + * Returns a set of nodes, represented by this assignments instance. + */ + public Set<Assignment> nodes() { Review Comment: I'd rather make it immutable. Otherwise, we may have something like `assignments.nodes.add()`, which is actually not desired. ########## modules/placement-driver/src/main/java/org/apache/ignite/internal/placementdriver/AssignmentsTracker.java: ########## @@ -97,7 +97,7 @@ public void startTrack() { TablePartitionId grpId = TablePartitionId.fromString(strKey); - Set<Assignment> assignments = ByteUtils.fromBytes(entry.value()); + Set<Assignment> assignments = Assignments.fromBytes(entry.value()).nodes(); groupAssignments.put(grpId, assignments); Review Comment: Why do we still have Set<Assignment> instead of Assignments in groupAssignments? ########## modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java: ########## @@ -2153,24 +2154,27 @@ protected CompletableFuture<Void> handleChangeStableAssignmentEvent( TablePartitionId tablePartitionId = new TablePartitionId(tableId, partitionId); - Set<Assignment> stableAssignments = ByteUtils.fromBytes(stableAssignmentsWatchEvent.value()); + return supplyAsync(() -> { + Set<Assignment> stableAssignments = stableAssignmentsWatchEvent.value() == null Review Comment: Seems that we may handle null value inside Assignments.fromBytes itself. ########## modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java: ########## @@ -2153,24 +2154,27 @@ protected CompletableFuture<Void> handleChangeStableAssignmentEvent( TablePartitionId tablePartitionId = new TablePartitionId(tableId, partitionId); - Set<Assignment> stableAssignments = ByteUtils.fromBytes(stableAssignmentsWatchEvent.value()); + return supplyAsync(() -> { + Set<Assignment> stableAssignments = stableAssignmentsWatchEvent.value() == null + ? emptySet() + : Assignments.fromBytes(stableAssignmentsWatchEvent.value()).nodes(); - return metaStorageMgr.get(pendingPartAssignmentsKey(tablePartitionId), revision) - .thenComposeAsync(pendingAssignmentsEntry -> { - byte[] pendingAssignmentsFromMetaStorage = pendingAssignmentsEntry.value(); + Entry pendingAssignmentsEntry = metaStorageMgr.getLocally(pendingPartAssignmentsKey(tablePartitionId), revision); - Set<Assignment> pendingAssignments = pendingAssignmentsFromMetaStorage == null - ? Set.of() - : ByteUtils.fromBytes(pendingAssignmentsFromMetaStorage); + byte[] pendingAssignmentsFromMetaStorage = pendingAssignmentsEntry.value(); - return stopAndDestroyPartitionAndUpdateClients( - tablePartitionId, - stableAssignments, - pendingAssignments, - isRecovery, - revision - ); - }, ioExecutor); + Assignments pendingAssignments = pendingAssignmentsFromMetaStorage == null + ? Assignments.NO_ASSIGNMENTS Review Comment: Same as above. ########## modules/affinity/src/main/java/org/apache/ignite/internal/affinity/Assignments.java: ########## @@ -0,0 +1,84 @@ +/* + * 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.ignite.internal.affinity; + +import java.io.Serializable; +import java.util.Collections; +import java.util.Set; +import org.apache.ignite.internal.tostring.IgniteToStringInclude; +import org.apache.ignite.internal.tostring.S; +import org.apache.ignite.internal.util.ByteUtils; + +/** + * Class that encapsulates a set of nodes and its metadata. + */ +public class Assignments implements Serializable { + /** Serial version UID. */ + private static final long serialVersionUID = -59553172012153869L; + + /** Empty assignments. */ + public static final Assignments NO_ASSIGNMENTS = new Assignments(Collections.emptySet()); + + /** Set of nodes. */ + @IgniteToStringInclude + private final Set<Assignment> nodes; + + /** + * Constructor. + * + * @param nodes Set of nodes. + */ + public Assignments(Set<Assignment> nodes) { + this.nodes = nodes; + } + + /** + * Returns a set of nodes, represented by this assignments instance. + */ + public Set<Assignment> nodes() { + return nodes; + } + + /** + * Serializes the instance into an array of bytes. + */ + public byte[] toBytes() { + return ByteUtils.toBytes(this); + } + + /** + * Serializes assignments into an array of bytes. + * + * @see #toBytes() + */ + public static byte[] toBytes(Set<Assignment> assignments) { + return new Assignments(assignments).toBytes(); + } + + /** + * Deserializes assignments from the array of bytes. + */ + public static Assignments fromBytes(byte[] bytes) { Review Comment: What do we get in case of 1) empty 2) null bytes? ########## modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/rebalance/DistributionZoneRebalanceEngineTest.java: ########## @@ -384,8 +384,10 @@ void replicasTriggersAssignmentsChangingOnNonDefaultZones() throws Exception { when(distributionZoneManager.dataNodes(anyLong(), anyInt(), anyInt())).thenReturn(completedFuture(Set.of("node0"))); + byte[] assignmentsBytes = Assignments.toBytes(Set.of(Assignment.forPeer("node0"))); Review Comment: Should be `Assignments.of(Assignment.of("node0"));`, don't you think? -- 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: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
