commit 43ea1e78b0db15fad44fa8c6c8b3fd86fdfa6d29
author Maksim Timonin <timonin.maxim@gmail.com> Thu Jul 21 17:24:08 2022 +0300
committer Maksim Timonin <timonin.maxim@gmail.com> Thu Jul 21 17:24:08 2022 +0300
tree c8e798aa497c8487d272757d6a6b9b6997251d02
parent 20ce7e2af3ed0dffa27e2612e7f718a6dbf70955

Check expire policy if needed

modules/cdc-ext/src/main/java/org/apache/ignite/cdc/CdcEventsApplier.java

diff --git a/modules/cdc-ext/src/main/java/org/apache/ignite/cdc/CdcEventsApplier.java b/modules/cdc-ext/src/main/java/org/apache/ignite/cdc/CdcEventsApplier.java
index 179fcb3..41fab27 100644
--- a/modules/cdc-ext/src/main/java/org/apache/ignite/cdc/CdcEventsApplier.java
+++ b/modules/cdc-ext/src/main/java/org/apache/ignite/cdc/CdcEventsApplier.java
@@ -128,11 +128,13 @@
                 else
                     val = new CacheObjectImpl(evt.value(), null);
 
-                updBatch.put(key, new GridCacheDrExpirationInfo(
-                    val,
-                    new GridCacheVersion(order.topologyVersion(), order.order(), order.nodeOrder(), order.clusterId()),
-                    TTL_NOT_CHANGED,
-                    EXPIRE_TIME_CALCULATE));
+                GridCacheVersion ver = new GridCacheVersion(order.topologyVersion(), order.order(), order.nodeOrder(), order.clusterId());
+
+                GridCacheDrInfo drVal = currCache.configuration().getExpiryPolicyFactory() != null ?
+                    new GridCacheDrExpirationInfo(val, ver, TTL_NOT_CHANGED, EXPIRE_TIME_CALCULATE)
+                    : new GridCacheDrInfo(val, ver);
+
+                updBatch.put(key, drVal);
             }
             else {
                 evtsApplied += applyIf(currCache, hasUpdates, () -> isApplyBatch(rmvBatch, key));