Skip to content

IGNITE-28403 Remove IgniteDhtPartitionCountersMap #12958

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

Open
wernerdv wants to merge 5 commits into
base: master
Choose a base branch
from
Open

IGNITE-28403 Remove IgniteDhtPartitionCountersMap #12958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
de1b3bb
IGNITE-28403 Remove IgniteDhtPartitionCountersMap
wernerdv Mar 30, 2026
fca07ab
Revert "IGNITE-28403 Remove IgniteDhtPartitionCountersMap"
wernerdv Mar 30, 2026
95251b4
use synchronized blocks
wernerdv Mar 30, 2026
676757a
Merge branch 'master' into IGNITE-28403
wernerdv Mar 31, 2026
a354959
fix CacheExchangeMessageDuplicatedStateTest
wernerdv Mar 31, 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 @@ -189,8 +189,6 @@
import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GroupPartitionIdPairSerializer;
import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.IgniteDhtDemandedPartitionsMap;
import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.IgniteDhtDemandedPartitionsMapSerializer;
import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.IgniteDhtPartitionCountersMap;
import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.IgniteDhtPartitionCountersMapSerializer;
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;
Expand Down Expand Up @@ -550,8 +548,6 @@ public GridIoMessageFactory(Marshaller marsh, ClassLoader clsLdr) {
new BinaryMetadataVersionInfoSerializer());
factory.register(506, CachePartitionFullCountersMap::new,
new CachePartitionFullCountersMapSerializer());
factory.register(507, IgniteDhtPartitionCountersMap::new,
new IgniteDhtPartitionCountersMapSerializer());
factory.register(508, GroupPartitionIdPair::new, new GroupPartitionIdPairSerializer());
factory.register(510, IgniteDhtPartitionHistorySuppliersMap::new,
new IgniteDhtPartitionHistorySuppliersMapSerializer());
Expand Down
20 changes: 14 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 @@ -71,7 +71,7 @@ public class GridDhtPartitionsFullMessage extends GridDhtPartitionsAbstractMessa
@Order(2)
@Compress
@GridToStringInclude
IgniteDhtPartitionCountersMap partCntrs;
Map<Integer, CachePartitionFullCountersMap> partCntrs;

/** Partitions history suppliers. */
@Order(3)
Expand Down Expand Up @@ -127,6 +127,9 @@ public class GridDhtPartitionsFullMessage extends GridDhtPartitionsAbstractMessa
@GridToStringExclude
Map<Integer, int[]> lostParts;

/** Mutex. */
private final Object mux = new Object();

/**
* Empty constructor.
*/
Expand Down Expand Up @@ -278,10 +281,13 @@ public void addFullPartitionsMap(int grpId, GridDhtPartitionFullMap fullMap, @Nu
* @param cntrMap Partition update counters.
*/
public void addPartitionUpdateCounters(int grpId, CachePartitionFullCountersMap cntrMap) {
if (partCntrs == null)
partCntrs = new IgniteDhtPartitionCountersMap();
synchronized (mux) {
if (partCntrs == null)
partCntrs = new HashMap<>();

partCntrs.putIfAbsent(grpId, cntrMap);
if (!partCntrs.containsKey(grpId))
partCntrs.put(grpId, cntrMap);
}
}

/**
Expand Down Expand Up @@ -319,7 +325,9 @@ public void addLostPartitions(int grpId, Collection<Integer> lostParts) {
* @return Partition update counters.
*/
public CachePartitionFullCountersMap partitionUpdateCounters(int grpId) {
return partCntrs == null ? null : partCntrs.get(grpId);
synchronized (mux) {
return partCntrs == null ? null : partCntrs.get(grpId);
}
}

/**
Expand Down Expand Up @@ -442,7 +450,7 @@ public void topologyVersion(AffinityTopologyVersion topVer) {
parts = new HashMap<>();

if (partCntrs == null)
partCntrs = new IgniteDhtPartitionCountersMap();
partCntrs = new HashMap<>();

if (partHistSuppliers == null)
partHistSuppliers = new IgniteDhtPartitionHistorySuppliersMap();
Expand Down
59 changes: 0 additions & 59 deletions ...te/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionCountersMap.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 @@ -1192,7 +1192,6 @@ org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPre
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPreloader$2
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.IgniteDhtPartitionCountersMap
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
Expand Down
3 changes: 1 addition & 2 deletions .../org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,8 +229,7 @@ private void checkFullMessage(GridDhtPartitionsFullMessage msg) {

assertFalse(dupPartsData.containsKey(CU.cacheId(AFF3_CACHE1)));

Map<Integer, CachePartitionFullCountersMap> partCntrs =
getFieldValue(getFieldValue(msg, "partCntrs"), "map");
Map<Integer, CachePartitionFullCountersMap> partCntrs = getFieldValue(msg, "partCntrs");

if (partCntrs != null) {
for (CachePartitionFullCountersMap cntrs : partCntrs.values()) {
Expand Down
Loading