IGNITE-6595 Cleanup entries after index rebuild
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/12bc7566 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/12bc7566 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/12bc7566 Branch: refs/heads/ignite-3478 Commit: 12bc756624b196e68e049987265399d2fd9b782b Parents: 879bf58 Author: Alexey Goncharuk <alexey.goncha...@gmail.com> Authored: Wed Oct 18 10:59:53 2017 +0300 Committer: Alexey Goncharuk <alexey.goncha...@gmail.com> Committed: Wed Oct 18 10:59:53 2017 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/query/h2/IgniteH2Indexing.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/12bc7566/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java index ff6ff4d..eed1f19 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java @@ -1934,8 +1934,10 @@ public class IgniteH2Indexing implements GridQueryIndexing { KeyCacheObject key = keyIter.next(); while (true) { + GridCacheEntryEx entry = null; + try { - GridCacheEntryEx entry = cctx.isNear() ? + entry = cctx.isNear() ? cctx.near().dht().entryEx(key) : cctx.cache().entryEx(key); entry.ensureIndexed(); @@ -1948,6 +1950,9 @@ public class IgniteH2Indexing implements GridQueryIndexing { catch (GridDhtInvalidPartitionException ignore) { break; } + finally { + entry.context().evicts().touch(entry, AffinityTopologyVersion.NONE); + } } } finally {
