Skip to content

IGNITE-28397 Remove IgniteDhtPartitionsToReloadMap #12957

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shishkovilja merged 6 commits into from
Apr 6, 2026
Merged

IGNITE-28397 Remove IgniteDhtPartitionsToReloadMap #12957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a75aab1
IGNITE-28397 Remove IgniteDhtPartitionsToReloadMap
wernerdv Mar 30, 2026
bf6154a
Merge branch 'master' into IGNITE-28397
wernerdv Mar 30, 2026
f2ac1cc
Merge branch 'master' into IGNITE-28397
wernerdv Mar 30, 2026
a254db6
Merge branch 'master' into IGNITE-28397
wernerdv Apr 2, 2026
6e1df64
use synchronized blocks
wernerdv Apr 2, 2026
4b19b46
remove init
wernerdv Apr 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions ...src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,6 @@
import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.IgniteDhtDemandedPartitionsMapSerializer;
import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.IgniteDhtPartitionHistorySuppliersMap;
import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.IgniteDhtPartitionHistorySuppliersMapSerializer;
import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.IgniteDhtPartitionsToReloadMap;
import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.IgniteDhtPartitionsToReloadMapSerializer;
import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.latch.LatchAckMessage;
import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.latch.LatchAckMessageSerializer;
import org.apache.ignite.internal.processors.cache.distributed.near.CacheVersionedValue;
Expand Down Expand Up @@ -551,8 +549,6 @@ public GridIoMessageFactory(Marshaller marsh, ClassLoader clsLdr) {
factory.register(508, GroupPartitionIdPair::new, new GroupPartitionIdPairSerializer());
factory.register(510, IgniteDhtPartitionHistorySuppliersMap::new,
new IgniteDhtPartitionHistorySuppliersMapSerializer());
factory.register(513, IgniteDhtPartitionsToReloadMap::new,
new IgniteDhtPartitionsToReloadMapSerializer());
factory.register(517, GridPartitionStateMap::new, new GridPartitionStateMapSerializer());
factory.register(518, GridDhtPartitionMap::new, new GridDhtPartitionMapSerializer());
factory.register(519, GridDhtPartitionFullMap::new, new GridDhtPartitionFullMapSerializer());
Expand Down
5 changes: 2 additions & 3 deletions ...n/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@
import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsSingleMessage;
import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsSingleRequest;
import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.IgniteDhtPartitionHistorySuppliersMap;
import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.IgniteDhtPartitionsToReloadMap;
import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.PartitionsExchangeAware;
import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.RebalanceReassignExchangeTask;
import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.StopCachesOnClientReconnectExchangeTask;
Expand Down Expand Up @@ -1350,7 +1349,7 @@ public GridDhtPartitionsFullMessage createPartitionsFullMessage(
@Nullable final GridDhtPartitionExchangeId exchId,
@Nullable GridCacheVersion lastVer,
@Nullable IgniteDhtPartitionHistorySuppliersMap partHistSuppliers,
@Nullable IgniteDhtPartitionsToReloadMap partsToReload
@Nullable Map<UUID, Map<Integer, Set<Integer>>> partsToReload
) {
Collection<CacheGroupContext> grps = cctx.cache().cacheGroups();

Expand All @@ -1371,7 +1370,7 @@ public GridDhtPartitionsFullMessage createPartitionsFullMessage(
@Nullable final GridDhtPartitionExchangeId exchId,
@Nullable GridCacheVersion lastVer,
@Nullable IgniteDhtPartitionHistorySuppliersMap partHistSuppliers,
@Nullable IgniteDhtPartitionsToReloadMap partsToReload,
@Nullable Map<UUID, Map<Integer, Set<Integer>>> partsToReload,
Collection<CacheGroupContext> grps
) {
AffinityTopologyVersion ver = exchId != null ? exchId.topologyVersion() : AffinityTopologyVersion.NONE;
Expand Down
13 changes: 10 additions & 3 deletions .../internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@

/** */
@GridToStringExclude
private final IgniteDhtPartitionsToReloadMap partsToReload = new IgniteDhtPartitionsToReloadMap();
private final Map<UUID, Map<Integer, Set<Integer>>> partsToReload = new HashMap<>();

/** */
private final AtomicBoolean done = new AtomicBoolean();
Expand Down Expand Up @@ -3425,8 +3425,15 @@
UUID nodeId = e.getKey();
Set<Integer> parts = e.getValue();

for (int part : parts)
partsToReload.put(nodeId, top.groupId(), part);
for (int part : parts) {
synchronized (partsToReload) {
Map<Integer, Set<Integer>> nodeMap = partsToReload.computeIfAbsent(nodeId, k -> new HashMap<>());

Set<Integer> partsToReload = nodeMap.computeIfAbsent(top.groupId(), k -> new HashSet<>());

Check warning on line 3432 in modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Rename "partsToReload" which hides the field declared at line 342. 


See more on https://sonarcloud.io/project/issues?id=apache_ignite&issues=AZ1TKAMx-tMJpjjAbwFM&open=AZ1TKAMx-tMJpjjAbwFM&pullRequest=12957

partsToReload.add(part);
}
}
}
}

Expand Down
13 changes: 7 additions & 6 deletions ...ite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public class GridDhtPartitionsFullMessage extends GridDhtPartitionsAbstractMessa
@Order(4)
@Compress
@GridToStringInclude
IgniteDhtPartitionsToReloadMap partsToReload;
Map<UUID, Map<Integer, Set<Integer>>> partsToReload;

/** Partition sizes. */
@Order(5)
Expand Down Expand Up @@ -144,7 +144,7 @@ public GridDhtPartitionsFullMessage(@Nullable GridDhtPartitionExchangeId id,
@Nullable GridCacheVersion lastVer,
@NotNull AffinityTopologyVersion topVer,
@Nullable IgniteDhtPartitionHistorySuppliersMap partHistSuppliers,
@Nullable IgniteDhtPartitionsToReloadMap partsToReload) {
@Nullable Map<UUID, Map<Integer, Set<Integer>>> partsToReload) {
super(id, lastVer);

assert id == null || topVer.equals(id.topologyVersion());
Expand Down Expand Up @@ -337,7 +337,11 @@ public Set<Integer> partsToReload(UUID nodeId, int grpId) {
if (partsToReload == null)
return Collections.emptySet();

return partsToReload.get(nodeId, grpId);
synchronized (partsToReload) {
Map<Integer, Set<Integer>> nodeMap = partsToReload.get(nodeId);

return nodeMap == null ? Collections.emptySet() : (Set<Integer>)F.emptyIfNull(nodeMap.get(grpId));
}
}

/**
Expand Down Expand Up @@ -443,9 +447,6 @@ public void topologyVersion(AffinityTopologyVersion topVer) {
if (partHistSuppliers == null)
partHistSuppliers = new IgniteDhtPartitionHistorySuppliersMap();

if (partsToReload == null)
partsToReload = new IgniteDhtPartitionsToReloadMap();

errs = errMsgs == null ? null : F.viewReadOnly(errMsgs, e -> e.error());
}

Expand Down
75 changes: 0 additions & 75 deletions ...e/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionsToReloadMap.java
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion modules/core/src/main/resources/META-INF/classnames.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1193,7 +1193,6 @@ org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPre
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPreloaderAssignments
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.IgniteDhtDemandedPartitionsMap
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.IgniteDhtPartitionHistorySuppliersMap
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.IgniteDhtPartitionsToReloadMap
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.IgniteHistoricalIterator
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.IgniteHistoricalIteratorException
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.IgniteRebalanceIteratorImpl
Expand Down
10 changes: 5 additions & 5 deletions ...rc/test/java/org/apache/ignite/internal/managers/communication/CompressedMessageTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package org.apache.ignite.internal.managers.communication;

import java.nio.ByteBuffer;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
Expand All @@ -29,7 +30,6 @@
import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsFullMessage;
import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GroupPartitionIdPair;
import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.IgniteDhtPartitionHistorySuppliersMap;
import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.IgniteDhtPartitionsToReloadMap;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.plugin.extensions.communication.Message;
import org.apache.ignite.plugin.extensions.communication.MessageFactory;
Expand Down Expand Up @@ -108,13 +108,13 @@ public void testWriteReadHugeMessage() {
/** */
private GridDhtPartitionsFullMessage fullMessage() {
IgniteDhtPartitionHistorySuppliersMap partHistSuppliers = new IgniteDhtPartitionHistorySuppliersMap();
IgniteDhtPartitionsToReloadMap partsToReload = new IgniteDhtPartitionsToReloadMap();
Map<UUID, Map<Integer, Set<Integer>>> partsToReload = new HashMap<>();

for (int i = 0; i < 500; i++) {
UUID uuid = UUID.randomUUID();

partHistSuppliers.put(uuid, i, i + 1, i + 2);
partsToReload.put(uuid, i, i + 1);
partsToReload.put(uuid, Map.of(i, Set.of(i + 1)));
}

return new GridDhtPartitionsFullMessage(null, null, new AffinityTopologyVersion(0), partHistSuppliers, partsToReload);
Expand All @@ -130,8 +130,8 @@ private void assertEqualsFullMsg(GridDhtPartitionsFullMessage expected, GridDhtP
for (Map.Entry<UUID, Map<GroupPartitionIdPair, Long>> entry : expHistSuppliers.entrySet())
assertEquals(entry.getValue(), actHistSuppliers.get(entry.getKey()));

Map<UUID, Map<Integer, Set<Integer>>> expPartsToReload = U.field((Object)U.field(expected, "partsToReload"), "map");
Map<UUID, Map<Integer, Set<Integer>>> actPartsToReload = U.field((Object)U.field(actual, "partsToReload"), "map");
Map<UUID, Map<Integer, Set<Integer>>> expPartsToReload = U.field(expected, "partsToReload");
Map<UUID, Map<Integer, Set<Integer>>> actPartsToReload = U.field(actual, "partsToReload");

assertEquals(expPartsToReload.size(), actPartsToReload.size());

Expand Down
Loading