From de1b3bb09e0b6d69b8d67ae3736f306514568809 Mon Sep 17 00:00:00 2001 From: Dmitry Werner Date: Mon, 30 Mar 2026 19:41:11 +0500 Subject: [PATCH 1/4] IGNITE-28403 Remove IgniteDhtPartitionCountersMap --- .../communication/GridIoMessageFactory.java | 4 -- .../GridDhtPartitionsFullMessage.java | 10 ++-- .../IgniteDhtPartitionCountersMap.java | 59 ------------------- .../resources/META-INF/classnames.properties | 1 - 4 files changed, 6 insertions(+), 68 deletions(-) delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionCountersMap.java diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java index edeef1147bd58..8659c3d36ff85 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java @@ -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; @@ -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()); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java index 9ee1835e1a913..bb98f9a592f0a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java @@ -23,6 +23,7 @@ import java.util.Map; import java.util.Set; import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; import java.util.stream.IntStream; import org.apache.ignite.IgniteCheckedException; @@ -71,7 +72,7 @@ public class GridDhtPartitionsFullMessage extends GridDhtPartitionsAbstractMessa @Order(2) @Compress @GridToStringInclude - IgniteDhtPartitionCountersMap partCntrs; + Map partCntrs; /** Partitions history suppliers. */ @Order(3) @@ -279,9 +280,10 @@ public void addFullPartitionsMap(int grpId, GridDhtPartitionFullMap fullMap, @Nu */ public void addPartitionUpdateCounters(int grpId, CachePartitionFullCountersMap cntrMap) { if (partCntrs == null) - partCntrs = new IgniteDhtPartitionCountersMap(); + partCntrs = new ConcurrentHashMap<>(); - partCntrs.putIfAbsent(grpId, cntrMap); + if (!partCntrs.containsKey(grpId)) + partCntrs.put(grpId, cntrMap); } /** @@ -442,7 +444,7 @@ public void topologyVersion(AffinityTopologyVersion topVer) { parts = new HashMap<>(); if (partCntrs == null) - partCntrs = new IgniteDhtPartitionCountersMap(); + partCntrs = new ConcurrentHashMap<>(); if (partHistSuppliers == null) partHistSuppliers = new IgniteDhtPartitionHistorySuppliersMap(); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionCountersMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionCountersMap.java deleted file mode 100644 index 62d964d682bf3..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionCountersMap.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * 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.processors.cache.distributed.dht.preloader; - -import java.util.HashMap; -import java.util.Map; -import org.apache.ignite.internal.Order; -import org.apache.ignite.plugin.extensions.communication.Message; - -/** - * Partition counters map. - */ -public class IgniteDhtPartitionCountersMap implements Message { - /** */ - @Order(0) - Map map; - - /** - * @param cacheId Cache ID. - * @param cntrMap Counters map. - */ - public synchronized void putIfAbsent(int cacheId, CachePartitionFullCountersMap cntrMap) { - if (map == null) - map = new HashMap<>(); - - if (!map.containsKey(cacheId)) - map.put(cacheId, cntrMap); - } - - /** - * @param cacheId Cache ID. - * @return Counters map. - */ - public synchronized CachePartitionFullCountersMap get(int cacheId) { - if (map == null) - return null; - - CachePartitionFullCountersMap cntrMap = map.get(cacheId); - - return cntrMap; - } - -} diff --git a/modules/core/src/main/resources/META-INF/classnames.properties b/modules/core/src/main/resources/META-INF/classnames.properties index f16695c2d12b8..5268663d0da9d 100644 --- a/modules/core/src/main/resources/META-INF/classnames.properties +++ b/modules/core/src/main/resources/META-INF/classnames.properties @@ -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 From fca07ab6d27241d144b37830272c80b9ecfba5b0 Mon Sep 17 00:00:00 2001 From: Dmitry Werner Date: Mon, 30 Mar 2026 22:12:46 +0500 Subject: [PATCH 2/4] Revert "IGNITE-28403 Remove IgniteDhtPartitionCountersMap" This reverts commit 4969155b4da6e33e7ea16067087a63e7e5d8ec44. --- .../communication/GridIoMessageFactory.java | 4 ++ .../GridDhtPartitionsFullMessage.java | 10 ++-- .../IgniteDhtPartitionCountersMap.java | 59 +++++++++++++++++++ .../resources/META-INF/classnames.properties | 1 + 4 files changed, 68 insertions(+), 6 deletions(-) create mode 100644 modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionCountersMap.java diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java index 8659c3d36ff85..edeef1147bd58 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java @@ -189,6 +189,8 @@ 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; @@ -548,6 +550,8 @@ 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()); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java index bb98f9a592f0a..9ee1835e1a913 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java @@ -23,7 +23,6 @@ import java.util.Map; import java.util.Set; import java.util.UUID; -import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; import java.util.stream.IntStream; import org.apache.ignite.IgniteCheckedException; @@ -72,7 +71,7 @@ public class GridDhtPartitionsFullMessage extends GridDhtPartitionsAbstractMessa @Order(2) @Compress @GridToStringInclude - Map partCntrs; + IgniteDhtPartitionCountersMap partCntrs; /** Partitions history suppliers. */ @Order(3) @@ -280,10 +279,9 @@ public void addFullPartitionsMap(int grpId, GridDhtPartitionFullMap fullMap, @Nu */ public void addPartitionUpdateCounters(int grpId, CachePartitionFullCountersMap cntrMap) { if (partCntrs == null) - partCntrs = new ConcurrentHashMap<>(); + partCntrs = new IgniteDhtPartitionCountersMap(); - if (!partCntrs.containsKey(grpId)) - partCntrs.put(grpId, cntrMap); + partCntrs.putIfAbsent(grpId, cntrMap); } /** @@ -444,7 +442,7 @@ public void topologyVersion(AffinityTopologyVersion topVer) { parts = new HashMap<>(); if (partCntrs == null) - partCntrs = new ConcurrentHashMap<>(); + partCntrs = new IgniteDhtPartitionCountersMap(); if (partHistSuppliers == null) partHistSuppliers = new IgniteDhtPartitionHistorySuppliersMap(); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionCountersMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionCountersMap.java new file mode 100644 index 0000000000000..62d964d682bf3 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionCountersMap.java @@ -0,0 +1,59 @@ +/* + * 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.processors.cache.distributed.dht.preloader; + +import java.util.HashMap; +import java.util.Map; +import org.apache.ignite.internal.Order; +import org.apache.ignite.plugin.extensions.communication.Message; + +/** + * Partition counters map. + */ +public class IgniteDhtPartitionCountersMap implements Message { + /** */ + @Order(0) + Map map; + + /** + * @param cacheId Cache ID. + * @param cntrMap Counters map. + */ + public synchronized void putIfAbsent(int cacheId, CachePartitionFullCountersMap cntrMap) { + if (map == null) + map = new HashMap<>(); + + if (!map.containsKey(cacheId)) + map.put(cacheId, cntrMap); + } + + /** + * @param cacheId Cache ID. + * @return Counters map. + */ + public synchronized CachePartitionFullCountersMap get(int cacheId) { + if (map == null) + return null; + + CachePartitionFullCountersMap cntrMap = map.get(cacheId); + + return cntrMap; + } + +} diff --git a/modules/core/src/main/resources/META-INF/classnames.properties b/modules/core/src/main/resources/META-INF/classnames.properties index 5268663d0da9d..f16695c2d12b8 100644 --- a/modules/core/src/main/resources/META-INF/classnames.properties +++ b/modules/core/src/main/resources/META-INF/classnames.properties @@ -1192,6 +1192,7 @@ 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 From 95251b40665f19deb295a6188b9dac3805eded58 Mon Sep 17 00:00:00 2001 From: Dmitry Werner Date: Mon, 30 Mar 2026 22:24:23 +0500 Subject: [PATCH 3/4] use synchronized blocks --- .../communication/GridIoMessageFactory.java | 4 -- .../GridDhtPartitionsFullMessage.java | 20 +++++-- .../IgniteDhtPartitionCountersMap.java | 59 ------------------- .../resources/META-INF/classnames.properties | 1 - 4 files changed, 14 insertions(+), 70 deletions(-) delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionCountersMap.java diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java index edeef1147bd58..8659c3d36ff85 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java @@ -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; @@ -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()); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java index 9ee1835e1a913..cffd9805dcf26 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java @@ -71,7 +71,7 @@ public class GridDhtPartitionsFullMessage extends GridDhtPartitionsAbstractMessa @Order(2) @Compress @GridToStringInclude - IgniteDhtPartitionCountersMap partCntrs; + Map partCntrs; /** Partitions history suppliers. */ @Order(3) @@ -127,6 +127,9 @@ public class GridDhtPartitionsFullMessage extends GridDhtPartitionsAbstractMessa @GridToStringExclude Map lostParts; + /** Mutex. */ + private final Object mux = new Object(); + /** * Empty constructor. */ @@ -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); + } } /** @@ -319,7 +325,9 @@ public void addLostPartitions(int grpId, Collection 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); + } } /** @@ -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(); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionCountersMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionCountersMap.java deleted file mode 100644 index 62d964d682bf3..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionCountersMap.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * 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.processors.cache.distributed.dht.preloader; - -import java.util.HashMap; -import java.util.Map; -import org.apache.ignite.internal.Order; -import org.apache.ignite.plugin.extensions.communication.Message; - -/** - * Partition counters map. - */ -public class IgniteDhtPartitionCountersMap implements Message { - /** */ - @Order(0) - Map map; - - /** - * @param cacheId Cache ID. - * @param cntrMap Counters map. - */ - public synchronized void putIfAbsent(int cacheId, CachePartitionFullCountersMap cntrMap) { - if (map == null) - map = new HashMap<>(); - - if (!map.containsKey(cacheId)) - map.put(cacheId, cntrMap); - } - - /** - * @param cacheId Cache ID. - * @return Counters map. - */ - public synchronized CachePartitionFullCountersMap get(int cacheId) { - if (map == null) - return null; - - CachePartitionFullCountersMap cntrMap = map.get(cacheId); - - return cntrMap; - } - -} diff --git a/modules/core/src/main/resources/META-INF/classnames.properties b/modules/core/src/main/resources/META-INF/classnames.properties index f16695c2d12b8..5268663d0da9d 100644 --- a/modules/core/src/main/resources/META-INF/classnames.properties +++ b/modules/core/src/main/resources/META-INF/classnames.properties @@ -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 From a3549597ac13cec98823c0244025888010985360 Mon Sep 17 00:00:00 2001 From: Dmitry Werner Date: Tue, 31 Mar 2026 12:52:33 +0500 Subject: [PATCH 4/4] fix CacheExchangeMessageDuplicatedStateTest --- .../cache/CacheExchangeMessageDuplicatedStateTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java index abbb726906699..a14322a886a41 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java @@ -229,8 +229,7 @@ private void checkFullMessage(GridDhtPartitionsFullMessage msg) { assertFalse(dupPartsData.containsKey(CU.cacheId(AFF3_CACHE1))); - Map partCntrs = - getFieldValue(getFieldValue(msg, "partCntrs"), "map"); + Map partCntrs = getFieldValue(msg, "partCntrs"); if (partCntrs != null) { for (CachePartitionFullCountersMap cntrs : partCntrs.values()) {