This is an automated email from the ASF dual-hosted git repository.
timoninmaxim 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 c6271d08386 IGNITE-26603 Rename IncrementalSnapshotVerificationTask
classes (#12417)
c6271d08386 is described below
commit c6271d0838638cb3b998330528790edcd1c78bb6
Author: Daniil <[email protected]>
AuthorDate: Fri Oct 24 11:53:02 2025 +0300
IGNITE-26603 Rename IncrementalSnapshotVerificationTask classes (#12417)
---
...hotVerificationTask.java => IncrementalSnapshotVerify.java} | 10 +++++-----
...ionTaskResult.java => IncrementalSnapshotVerifyResult.java} | 6 +++---
.../cache/persistence/snapshot/SnapshotCheckProcess.java | 4 ++--
.../processors/cache/persistence/snapshot/SnapshotChecker.java | 10 +++++-----
.../internal/processors/cache/verify/IdleVerifyUtility.java | 2 +-
modules/core/src/main/resources/META-INF/classnames.properties | 5 ++---
6 files changed, 18 insertions(+), 19 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotVerificationTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotVerify.java
similarity index 96%
rename from
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotVerificationTask.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotVerify.java
index d5f744b450c..a206415a498 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotVerificationTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotVerify.java
@@ -54,7 +54,7 @@ import org.apache.ignite.transactions.TransactionState;
import static
org.apache.ignite.internal.managers.discovery.ConsistentIdMapper.ALL_NODES;
/** */
-public class IncrementalSnapshotVerificationTask implements
Supplier<IncrementalSnapshotVerificationTaskResult> {
+public class IncrementalSnapshotVerify implements
Supplier<IncrementalSnapshotVerifyResult> {
/** */
private final IgniteEx ignite;
@@ -71,7 +71,7 @@ public class IncrementalSnapshotVerificationTask implements
Supplier<Incremental
private LongAdder procEntriesCnt;
/** */
- public IncrementalSnapshotVerificationTask(IgniteEx ignite, IgniteLogger
log, SnapshotFileTree sft, int incrementalIdx) {
+ public IncrementalSnapshotVerify(IgniteEx ignite, IgniteLogger log,
SnapshotFileTree sft, int incrementalIdx) {
this.ignite = ignite;
this.log = log;
this.sft = sft;
@@ -81,7 +81,7 @@ public class IncrementalSnapshotVerificationTask implements
Supplier<Incremental
/**
* @return Map containing calculated transactions hash for every remote
node in the cluster.
*/
- @Override public IncrementalSnapshotVerificationTaskResult get() throws
IgniteException {
+ @Override public IncrementalSnapshotVerifyResult get() throws
IgniteException {
try {
if (log.isInfoEnabled()) {
log.info("Verify incremental snapshot procedure has been
initiated " +
@@ -89,7 +89,7 @@ public class IncrementalSnapshotVerificationTask implements
Supplier<Incremental
}
if (incIdx <= 0)
- return new IncrementalSnapshotVerificationTaskResult();
+ return new IncrementalSnapshotVerifyResult();
BaselineTopology blt =
ignite.context().state().clusterState().baselineTopology();
@@ -266,7 +266,7 @@ public class IncrementalSnapshotVerificationTask implements
Supplier<Incremental
", walSegments=" + procSegCnt.get() + ']');
}
- return new IncrementalSnapshotVerificationTaskResult(
+ return new IncrementalSnapshotVerifyResult(
txHashRes,
partHashRes,
partiallyCommittedTxs,
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotVerificationTaskResult.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotVerifyResult.java
similarity index 93%
rename from
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotVerificationTaskResult.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotVerifyResult.java
index 986f0b9dfa8..dc5b3cb6245 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotVerificationTaskResult.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotVerifyResult.java
@@ -27,7 +27,7 @@ import
org.apache.ignite.internal.processors.cache.verify.TransactionsHashRecord
import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
/** */
-public class IncrementalSnapshotVerificationTaskResult implements Serializable
{
+public class IncrementalSnapshotVerifyResult implements Serializable {
/** */
private static final long serialVersionUID = 0L;
@@ -47,12 +47,12 @@ public class IncrementalSnapshotVerificationTaskResult
implements Serializable {
private Collection<Exception> exceptions;
/** */
- public IncrementalSnapshotVerificationTaskResult() {
+ public IncrementalSnapshotVerifyResult() {
// No-op.
}
/** */
- IncrementalSnapshotVerificationTaskResult(
+ IncrementalSnapshotVerifyResult(
Map<Object, TransactionsHashRecord> txHashRes,
Map<PartitionKey, PartitionHashRecord> partHashRes,
Collection<GridCacheVersion> partiallyCommittedTxs,
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCheckProcess.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCheckProcess.java
index 02cc9783050..e8968724a7c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCheckProcess.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCheckProcess.java
@@ -172,7 +172,7 @@ public class SnapshotCheckProcess {
Map<UUID, Throwable> errors,
GridFutureAdapter<SnapshotPartitionsVerifyTaskResult> fut
) {
- Map<ClusterNode, IncrementalSnapshotVerificationTaskResult>
perNodeResults = new HashMap<>(results.size(), 1.0f);
+ Map<ClusterNode, IncrementalSnapshotVerifyResult> perNodeResults = new
HashMap<>(results.size(), 1.0f);
for (Map.Entry<UUID, SnapshotCheckResponse> resEntry :
results.entrySet()) {
UUID nodeId = resEntry.getKey();
@@ -322,7 +322,7 @@ public class SnapshotCheckProcess {
CompletableFuture<SnapshotCheckResponse> resFut = new
CompletableFuture<>();
- CompletableFuture<IncrementalSnapshotVerificationTaskResult>
workingFut = snpChecker.checkIncrementalSnapshot(
+ CompletableFuture<IncrementalSnapshotVerifyResult> workingFut =
snpChecker.checkIncrementalSnapshot(
ctx.locFileTree.get(meta.consistentId()),
ctx.req.incrementalIndex());
workingFut.whenComplete((res, err) -> {
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotChecker.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotChecker.java
index 721d6886def..65c312f1cef 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotChecker.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotChecker.java
@@ -70,14 +70,14 @@ public class SnapshotChecker {
}
/** */
- public CompletableFuture<IncrementalSnapshotVerificationTaskResult>
checkIncrementalSnapshot(
+ public CompletableFuture<IncrementalSnapshotVerifyResult>
checkIncrementalSnapshot(
SnapshotFileTree sft,
int incIdx
) {
assert incIdx > 0;
return CompletableFuture.supplyAsync(
- new IncrementalSnapshotVerificationTask(kctx.grid(), log, sft,
incIdx),
+ new IncrementalSnapshotVerify(kctx.grid(), log, sft, incIdx),
executor
);
}
@@ -86,7 +86,7 @@ public class SnapshotChecker {
public IdleVerifyResult reduceIncrementalResults(
SnapshotFileTree sft,
int incIdx,
- Map<ClusterNode, IncrementalSnapshotVerificationTaskResult> results,
+ Map<ClusterNode, IncrementalSnapshotVerifyResult> results,
Map<ClusterNode, Exception> operationErrors
) {
if (!operationErrors.isEmpty())
@@ -94,8 +94,8 @@ public class SnapshotChecker {
IdleVerifyResult.Builder bldr = IdleVerifyResult.builder();
- for (Map.Entry<ClusterNode, IncrementalSnapshotVerificationTaskResult>
nodeRes: results.entrySet()) {
- IncrementalSnapshotVerificationTaskResult res = nodeRes.getValue();
+ for (Map.Entry<ClusterNode, IncrementalSnapshotVerifyResult> nodeRes:
results.entrySet()) {
+ IncrementalSnapshotVerifyResult res = nodeRes.getValue();
if (!F.isEmpty(res.partiallyCommittedTxs()))
bldr.addPartiallyCommited(nodeRes.getKey(),
res.partiallyCommittedTxs());
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/IdleVerifyUtility.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/IdleVerifyUtility.java
index f0a31b8360a..1dc7c5df03e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/IdleVerifyUtility.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/IdleVerifyUtility.java
@@ -47,7 +47,7 @@ import
org.apache.ignite.internal.processors.cache.distributed.dht.topology.Grid
import
org.apache.ignite.internal.processors.cache.distributed.dht.topology.GridDhtPartitionTopology;
import org.apache.ignite.internal.processors.cache.persistence.CacheDataRow;
import
org.apache.ignite.internal.processors.cache.persistence.file.FilePageStore;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IncrementalSnapshotVerificationTask.HashHolder;
+import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IncrementalSnapshotVerify.HashHolder;
import org.apache.ignite.internal.util.lang.GridIterator;
import org.apache.ignite.internal.util.lang.IgniteThrowableSupplier;
import org.apache.ignite.internal.util.typedef.F;
diff --git a/modules/core/src/main/resources/META-INF/classnames.properties
b/modules/core/src/main/resources/META-INF/classnames.properties
index 36bd6336136..65941e79834 100644
--- a/modules/core/src/main/resources/META-INF/classnames.properties
+++ b/modules/core/src/main/resources/META-INF/classnames.properties
@@ -1308,9 +1308,8 @@
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotM
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotVerifyException
org.apache.ignite.internal.processors.cache.persistence.snapshot.IncrementalSnapshotAwareMessage
org.apache.ignite.internal.processors.cache.persistence.snapshot.IncrementalSnapshotMetadata
-org.apache.ignite.internal.processors.cache.persistence.snapshot.IncrementalSnapshotVerificationTask
-org.apache.ignite.internal.processors.cache.persistence.snapshot.IncrementalSnapshotVerificationTask$VerifyIncrementalSnapshotJob
-org.apache.ignite.internal.processors.cache.persistence.snapshot.IncrementalSnapshotVerificationTaskResult
+org.apache.ignite.internal.processors.cache.persistence.snapshot.IncrementalSnapshotVerify
+org.apache.ignite.internal.processors.cache.persistence.snapshot.IncrementalSnapshotVerifyResult
org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotDiscoveryMessage
org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotFilesFailureMessage
org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotFilesRequestMessage
