This is an automated email from the ASF dual-hosted git repository.
shishkovilja pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 792bb215e78 IGNITE-26827 Minor refactoring after ErrorMessage updates
(#12496)
792bb215e78 is described below
commit 792bb215e7800ef282a7c45a666980599bac01dd
Author: Ilya Shishkov <[email protected]>
AuthorDate: Thu Nov 6 17:12:42 2025 +0300
IGNITE-26827 Minor refactoring after ErrorMessage updates (#12496)
---
.../dht/atomic/GridDhtAtomicUpdateResponse.java | 5 ++---
.../dht/atomic/GridNearAtomicSingleUpdateFuture.java | 4 ++--
.../distributed/dht/atomic/GridNearAtomicUpdateFuture.java | 4 ++--
.../dht/atomic/GridNearAtomicUpdateResponse.java | 5 ++---
.../cache/distributed/dht/atomic/UpdateErrors.java | 14 ++++++++++++++
5 files changed, 22 insertions(+), 10 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
index 454cde16a60..4ba3453e8da 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
@@ -22,7 +22,6 @@ import java.util.List;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.internal.Order;
-import org.apache.ignite.internal.managers.communication.ErrorMessage;
import org.apache.ignite.internal.processors.cache.GridCacheContext;
import org.apache.ignite.internal.processors.cache.GridCacheDeployable;
import org.apache.ignite.internal.processors.cache.GridCacheIdMessage;
@@ -117,12 +116,12 @@ public class GridDhtAtomicUpdateResponse extends
GridCacheIdMessage implements G
if (errs == null)
errs = new UpdateErrors();
- errs.errorMessage(new ErrorMessage(err));
+ errs.error(err);
}
/** {@inheritDoc} */
@Override public Throwable error() {
- return errs != null ? errs.errorMessage().error() : null;
+ return errs != null ? errs.error() : null;
}
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
index 7c089656b7d..e5a6352de9a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
@@ -206,9 +206,9 @@ public class GridNearAtomicSingleUpdateFuture extends
GridNearAtomicAbstractUpda
UpdateErrors errors = res.errors();
if (errors != null) {
- assert errors.errorMessage() != null;
+ assert errors.error() != null;
- completeFuture(null, errors.errorMessage().error(),
res.futureId());
+ completeFuture(null, errors.error(), res.futureId());
return;
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
index 32e8c2774a4..8c2bb97940a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
@@ -332,9 +332,9 @@ public class GridNearAtomicUpdateFuture extends
GridNearAtomicAbstractUpdateFutu
UpdateErrors errors = res.errors();
if (errors != null) {
- assert errors.errorMessage() != null;
+ assert errors.error() != null;
- completeFuture(null, errors.errorMessage().error(),
res.futureId());
+ completeFuture(null, errors.error(), res.futureId());
return;
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
index 55c4cb96cb5..11793c34376 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
@@ -23,7 +23,6 @@ import java.util.UUID;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.internal.Order;
-import org.apache.ignite.internal.managers.communication.ErrorMessage;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.processors.cache.CacheObject;
import org.apache.ignite.internal.processors.cache.GridCacheContext;
@@ -188,12 +187,12 @@ public class GridNearAtomicUpdateResponse extends
GridCacheIdMessage implements
if (errs == null)
errs = new UpdateErrors();
- errs.errorMessage(new ErrorMessage(err));
+ errs.error(err);
}
/** {@inheritDoc} */
@Override public Throwable error() {
- return errs != null ? errs.errorMessage().error() : null;
+ return errs != null ? errs.error() : null;
}
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/UpdateErrors.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/UpdateErrors.java
index c55c5982e2c..7d1250a915f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/UpdateErrors.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/UpdateErrors.java
@@ -60,6 +60,20 @@ public class UpdateErrors implements Message {
errMsg = new ErrorMessage(err);
}
+ /**
+ * @param err Error.
+ */
+ public void error(Throwable err) {
+ errMsg = new ErrorMessage(err);
+ }
+
+ /**
+ * @return Error.
+ */
+ public Throwable error() {
+ return ErrorMessage.error(errMsg);
+ }
+
/**
* @param errMsg New error message.
*/
