IGNITE-7159 - Fix IgniteCacheAtomicExpiryPolicyWithStoreTest.testGetReadThrough
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e3d70a82 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e3d70a82 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e3d70a82 Branch: refs/heads/ignite-zk-ce Commit: e3d70a8240c97765d3f3f96e183a1a9d4ac5deea Parents: 77e9a87 Author: xmitya <dkarachent...@gridgain.com> Authored: Mon Dec 11 14:11:40 2017 +0300 Committer: Alexey Goncharuk <alexey.goncha...@gmail.com> Committed: Mon Dec 11 18:00:17 2017 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheUtils.java | 6 ++++-- .../cache/distributed/dht/GridPartitionedGetFuture.java | 2 +- .../cache/distributed/dht/GridPartitionedSingleGetFuture.java | 3 ++- .../processors/cache/distributed/near/GridNearGetFuture.java | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/e3d70a82/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java index 4bf54bf..17d599b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java @@ -1699,6 +1699,7 @@ public class GridCacheUtils { * @param log Logger. * @param cctx Cache context. * @param key Key. + * @param expiryPlc Expiry policy. * @param readThrough Read through. * @param skipVals Skip values. */ @@ -1707,6 +1708,7 @@ public class GridCacheUtils { final IgniteLogger log, final GridCacheContext cctx, final @Nullable KeyCacheObject key, + final @Nullable IgniteCacheExpiryPolicy expiryPlc, boolean readThrough, boolean skipVals ) { @@ -1725,8 +1727,8 @@ public class GridCacheUtils { entry.initialValue( val, ver, - 0, - 0, + expiryPlc == null ? 0 : expiryPlc.forCreate(), + expiryPlc == null ? 0 : toExpireTime(expiryPlc.forCreate()), false, topVer, GridDrType.DR_BACKUP, http://git-wip-us.apache.org/repos/asf/ignite/blob/e3d70a82/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java index 3954cf9..4148ba9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java @@ -333,7 +333,7 @@ public class GridPartitionedGetFuture<K, V> extends CacheDistributedGetFutureAda } else { MiniFuture fut = new MiniFuture(n, mappedKeys, topVer, - CU.createBackupPostProcessingClosure(topVer, log, cctx, null, readThrough, skipVals)); + CU.createBackupPostProcessingClosure(topVer, log, cctx, null, expiryPlc, readThrough, skipVals)); GridCacheMessage req = new GridNearGetRequest( cctx.cacheId(), http://git-wip-us.apache.org/repos/asf/ignite/blob/e3d70a82/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java index f761b9c..61c7785 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java @@ -282,7 +282,8 @@ public class GridPartitionedSingleGetFuture extends GridCacheFutureAdapter<Objec boolean needVer = this.needVer; - final BackupPostProcessingClosure postClos = CU.createBackupPostProcessingClosure(topVer, log, cctx, key, readThrough, skipVals); + final BackupPostProcessingClosure postClos = CU.createBackupPostProcessingClosure(topVer, log, + cctx, key, expiryPlc, readThrough, skipVals); if (postClos != null) { // Need version to correctly store value. http://git-wip-us.apache.org/repos/asf/ignite/blob/e3d70a82/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java index 75b9baf..a1a3917 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java @@ -365,7 +365,7 @@ public final class GridNearGetFuture<K, V> extends CacheDistributedGetFutureAdap } MiniFuture fut = new MiniFuture(n, mappedKeys, saved, topVer, - CU.createBackupPostProcessingClosure(topVer, log, cctx, null, readThrough, skipVals)); + CU.createBackupPostProcessingClosure(topVer, log, cctx, null, expiryPlc, readThrough, skipVals)); GridCacheMessage req = new GridNearGetRequest( cctx.cacheId(),