Skip to content

IGNITE-28396 Remove NodeSpecificData #12956

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 2 commits into from
Mar 30, 2026
Merged

IGNITE-28396 Remove NodeSpecificData #12956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5207af
IGNITE-28396 Remove NodeSpecificData
wernerdv Mar 30, 2026
6ffc060
Merge branch 'master' into IGNITE-28396
wernerdv Mar 30, 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
3 changes: 0 additions & 3 deletions .../src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,6 @@
import org.apache.ignite.spi.discovery.tcp.messages.InetAddressMessageSerializer;
import org.apache.ignite.spi.discovery.tcp.messages.InetSocketAddressMessage;
import org.apache.ignite.spi.discovery.tcp.messages.InetSocketAddressMessageSerializer;
import org.apache.ignite.spi.discovery.tcp.messages.NodeSpecificData;
import org.apache.ignite.spi.discovery.tcp.messages.NodeSpecificDataSerializer;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryAuthFailedMessage;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryAuthFailedMessageSerializer;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryCacheMetricsMessage;
Expand Down Expand Up @@ -233,7 +231,6 @@ public DiscoveryMessageFactory(Marshaller marsh, ClassLoader clsLdr) {
factory.register(-110, QueryField::new, new QueryFieldMarshallableSerializer(marsh, clsLdr));
factory.register(-109, User::new, new UserSerializer());
factory.register(-108, UserManagementOperation::new, new UserManagementOperationSerializer());
factory.register(-107, NodeSpecificData::new, new NodeSpecificDataSerializer());
factory.register(-106, DiscoveryDataPacket::new, new DiscoveryDataPacketSerializer());
factory.register(-105, TcpDiscoveryNodeFullMetricsMessage::new, new TcpDiscoveryNodeFullMetricsMessageSerializer());
factory.register(-104, TcpDiscoveryClientNodesMetricsMessage::new, new TcpDiscoveryClientNodesMetricsMessageSerializer());
Expand Down
31 changes: 10 additions & 21 deletions .../core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/DiscoveryDataPacket.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
import org.apache.ignite.marshaller.Marshaller;
import org.apache.ignite.plugin.extensions.communication.Message;
import org.apache.ignite.spi.discovery.DiscoveryDataBag;
import org.apache.ignite.spi.discovery.tcp.messages.NodeSpecificData;

import static org.apache.ignite.internal.GridComponent.DiscoveryDataExchangeType.CONTINUOUS_PROC;

Expand Down Expand Up @@ -65,7 +64,7 @@

/** */
@Order(3)
Map<UUID, NodeSpecificData> nodeSpecificData = new HashMap<>();
Map<UUID, Map<Integer, byte[]>> nodeSpecificData = new HashMap<>();

Check failure on line 67 in modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/DiscoveryDataPacket.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Make non-static "nodeSpecificData" private or transient. 


See more on https://sonarcloud.io/project/issues?id=apache_ignite&issues=AZ0-sFCMVxozJeL25Ll4&open=AZ0-sFCMVxozJeL25Ll4&pullRequest=12956

/** */
private transient boolean joiningNodeClient;
Expand Down Expand Up @@ -109,7 +108,7 @@
filterDuplicatedData(marshLocNodeSpecificData);

if (!marshLocNodeSpecificData.isEmpty())
nodeSpecificData.put(nodeId, new NodeSpecificData(marshLocNodeSpecificData));
nodeSpecificData.put(nodeId, marshLocNodeSpecificData);
}
}

Expand Down Expand Up @@ -143,11 +142,8 @@
if (nodeSpecificData != null && !nodeSpecificData.isEmpty()) {
Map<UUID, Map<Integer, Serializable>> unmarshNodeSpecData = U.newLinkedHashMap(nodeSpecificData.size());

for (Map.Entry<UUID, NodeSpecificData> nodeBinEntry : nodeSpecificData.entrySet()) {
if (nodeBinEntry.getValue() == null)
continue;

Map<Integer, byte[]> nodeBinData = nodeBinEntry.getValue().nodeSpecificData();
for (Map.Entry<UUID, Map<Integer, byte[]>> nodeBinEntry : nodeSpecificData.entrySet()) {
Map<Integer, byte[]> nodeBinData = nodeBinEntry.getValue();

if (nodeBinData == null || nodeBinData.isEmpty())
continue;
Expand Down Expand Up @@ -274,17 +270,12 @@
}

if (nodeSpecificData.size() != mrgdSpecifDataKeys.size()) {
for (Map.Entry<UUID, NodeSpecificData> e : nodeSpecificData.entrySet()) {
for (Map.Entry<UUID, Map<Integer, byte[]>> e : nodeSpecificData.entrySet()) {
if (!mrgdSpecifDataKeys.contains(e.getKey())) {
NodeSpecificData dataMsg = existingDataPacket.nodeSpecificData.get(e.getKey());

if (dataMsg == null)
continue;
Map<Integer, byte[]> data = existingDataPacket.nodeSpecificData.get(e.getKey());

Map<Integer, byte[]> data = dataMsg.nodeSpecificData();

if (data != null && mapsEqual(e.getValue().nodeSpecificData(), data)) {
e.setValue(new NodeSpecificData(data));
if (data != null && mapsEqual(e.getValue(), data)) {
e.setValue(data);

boolean add = mrgdSpecifDataKeys.add(e.getKey());

Expand Down Expand Up @@ -428,15 +419,13 @@

/** */
private void filterDuplicatedData(Map<Integer, byte[]> discoData) {
for (NodeSpecificData existingData : nodeSpecificData.values()) {
for (Map<Integer, byte[]> existingData : nodeSpecificData.values()) {
Iterator<Map.Entry<Integer, byte[]>> it = discoData.entrySet().iterator();

while (it.hasNext()) {
Map.Entry<Integer, byte[]> discoDataEntry = it.next();

byte[] curData = (existingData == null || existingData.nodeSpecificData() == null)
? null
: existingData.nodeSpecificData().get(discoDataEntry.getKey());
byte[] curData = existingData.get(discoDataEntry.getKey());

if (Arrays.equals(curData, discoDataEntry.getValue()))
it.remove();
Expand Down
80 changes: 0 additions & 80 deletions ...les/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/NodeSpecificData.java
View file
Open in desktop

This file was deleted.

11 changes: 5 additions & 6 deletions modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@
import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryStatistics;
import org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.spi.discovery.tcp.messages.NodeSpecificData;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryAbstractMessage;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryConnectionCheckMessage;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryCustomEventMessage;
Expand Down Expand Up @@ -2519,7 +2518,7 @@ private static class TestDiscoveryDataDuplicateSpi extends TcpDiscoverySpi {
DiscoveryDataPacket dataPacket = ((TcpDiscoveryNodeAddedMessage)msg).gridDiscoveryData();

if (dataPacket != null) {
Map<UUID, NodeSpecificData> discoData = U.field(dataPacket, "nodeSpecificData");
Map<UUID, Map<Integer, byte[]>> discoData = U.field(dataPacket, "nodeSpecificData");

checkDiscoData(discoData, msg);
}
Expand All @@ -2528,7 +2527,7 @@ else if (msg instanceof TcpDiscoveryNodeAddFinishedMessage) {
DiscoveryDataPacket dataPacket = ((TcpDiscoveryNodeAddFinishedMessage)msg).clientDiscoData();

if (dataPacket != null) {
Map<UUID, NodeSpecificData> discoData = U.field(dataPacket, "nodeSpecificData");
Map<UUID, Map<Integer, byte[]>> discoData = U.field(dataPacket, "nodeSpecificData");

checkDiscoData(discoData, msg);
}
Expand All @@ -2541,12 +2540,12 @@ else if (msg instanceof TcpDiscoveryNodeAddFinishedMessage) {
* @param discoData Discovery data.
* @param msg Message.
*/
private void checkDiscoData(Map<UUID, NodeSpecificData> discoData, TcpDiscoveryAbstractMessage msg) {
private void checkDiscoData(Map<UUID, Map<Integer, byte[]>> discoData, TcpDiscoveryAbstractMessage msg) {
if (discoData != null && discoData.size() > 1) {
int cnt = 0;

for (NodeSpecificData data : discoData.values()) {
if (data.nodeSpecificData().containsKey(GridComponent.DiscoveryDataExchangeType.CACHE_PROC.ordinal()))
for (Map<Integer, byte[]> data : discoData.values()) {
if (data.containsKey(GridComponent.DiscoveryDataExchangeType.CACHE_PROC.ordinal()))
cnt++;
}

Expand Down
Loading