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 b6b8cfcdadb IGNITE-21485 : Refactoring of lost code and codestyle
related to GridCacheVersion (#11236)
b6b8cfcdadb is described below
commit b6b8cfcdadbd46e46de6d4c0d8af33323e4748c6
Author: Vladimir Steshin <[email protected]>
AuthorDate: Fri Feb 9 17:13:14 2024 +0300
IGNITE-21485 : Refactoring of lost code and codestyle related to
GridCacheVersion (#11236)
---
.../dht/atomic/DhtAtomicUpdateResult.java | 20 --------------------
.../preloader/GridDhtPartitionsExchangeFuture.java | 2 +-
.../cache/distributed/near/GridNearGetResponse.java | 3 +--
.../processors/cache/version/GridCacheVersion.java | 5 +++++
.../cache/version/GridCacheVersionManager.java | 9 ---------
5 files changed, 7 insertions(+), 32 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/DhtAtomicUpdateResult.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/DhtAtomicUpdateResult.java
index 15db625dc46..c265bf3edd3 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/DhtAtomicUpdateResult.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/DhtAtomicUpdateResult.java
@@ -50,26 +50,6 @@ class DhtAtomicUpdateResult {
*/
private int processedEntriesCount;
- /**
- *
- */
- DhtAtomicUpdateResult() {
- // No-op.
- }
-
- /**
- * @param retVal Return value.
- * @param deleted Deleted entries.
- * @param dhtFut DHT update future.
- */
- DhtAtomicUpdateResult(GridCacheReturn retVal,
- Collection<IgniteBiTuple<GridDhtCacheEntry, GridCacheVersion>> deleted,
- GridDhtAtomicAbstractUpdateFuture dhtFut) {
- this.retVal = retVal;
- this.deleted = deleted;
- this.dhtFut = dhtFut;
- }
-
/**
* @param expiry Expiry policy.
*/
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index c1e49d21107..ede7f87973d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@ -2787,7 +2787,7 @@ public class GridDhtPartitionsExchangeFuture extends
GridDhtTopologyFutureAdapte
while (true) {
GridCacheVersion old = lastVer.get();
- if (old == null || Long.compare(old.order(), ver.order()) < 0) {
+ if (old == null || old.order() < ver.order()) {
if (lastVer.compareAndSet(old, ver))
break;
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java
index 578c46b6ac3..50e3dcdef4e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java
@@ -45,8 +45,7 @@ import org.jetbrains.annotations.NotNull;
/**
* Get response.
*/
-public class GridNearGetResponse extends GridCacheIdMessage implements
GridCacheDeployable,
- GridCacheVersionable {
+public class GridNearGetResponse extends GridCacheIdMessage implements
GridCacheDeployable, GridCacheVersionable {
/** */
private static final long serialVersionUID = 0L;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java
index a54a9f5a54a..9044a15cfd2 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java
@@ -88,6 +88,11 @@ public class GridCacheVersion implements Message,
Externalizable, CacheEntryVers
* @param order Version order.
*/
public GridCacheVersion(int topVer, int nodeOrderDrId, long order) {
+ assert topVer >= 0 : topVer;
+ assert order >= 0 : order;
+ assert (nodeOrderDrId >>> DR_ID_SHIFT) >= 0 : (nodeOrderDrId >>>
DR_ID_SHIFT);
+ assert (nodeOrderDrId & NODE_ORDER_MASK) >= 0 : (nodeOrderDrId &
NODE_ORDER_MASK);
+
this.topVer = topVer;
this.nodeOrderDrId = nodeOrderDrId;
this.order = order;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionManager.java
index ac81bf95780..2ebdf79c665 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionManager.java
@@ -365,13 +365,4 @@ public class GridCacheVersionManager extends
GridCacheSharedManagerAdapter {
public boolean isStartVersion(GridCacheVersion ver) {
return startVer.equals(ver);
}
-
- /**
- * Update grid start time.
- */
- public void gridStartTime(long startTime) {
- offset = (int)((startTime - TOP_VER_BASE_TIME) / 1000);
-
- isolatedStreamerVer = new GridCacheVersion(1 + offset, 0, 1,
dataCenterId);
- }
}
