Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id BF236200BD9 for ; Fri, 9 Dec 2016 10:57:36 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id BE059160B1C; Fri, 9 Dec 2016 09:57:36 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id D6EB4160B32 for ; Fri, 9 Dec 2016 10:57:35 +0100 (CET) Received: (qmail 43723 invoked by uid 500); 9 Dec 2016 09:57:35 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 43603 invoked by uid 99); 9 Dec 2016 09:57:34 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Dec 2016 09:57:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A0730F16B3; Fri, 9 Dec 2016 09:57:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Fri, 09 Dec 2016 09:57:36 -0000 Message-Id: <3acd5dae5bb449dd8d2fc3df252ff39d@git.apache.org> In-Reply-To: <4330a618478444348da192db82a02e07@git.apache.org> References: <4330a618478444348da192db82a02e07@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/8] ignite git commit: IGNITE-3699: passing ttl to versionedValue and set if old and new topology versions match archived-at: Fri, 09 Dec 2016 09:57:36 -0000 IGNITE-3699: passing ttl to versionedValue and set if old and new topology versions match Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b1d2d604 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b1d2d604 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b1d2d604 Branch: refs/heads/ignite-3699 Commit: b1d2d604820e6792a55eb89c2cc1beab5393198b Parents: ff608f2 Author: Amir Akhmedov Authored: Thu Nov 17 20:48:38 2016 -0500 Committer: Amir Akhmedov Committed: Thu Nov 17 20:48:38 2016 -0500 ---------------------------------------------------------------------- .../internal/processors/cache/GridCacheAdapter.java | 11 +++-------- .../internal/processors/cache/GridCacheEntryEx.java | 3 ++- .../internal/processors/cache/GridCacheMapEntry.java | 5 ++--- .../cache/distributed/dht/atomic/GridDhtAtomicCache.java | 2 +- .../cache/transactions/IgniteTxLocalAdapter.java | 2 +- .../internal/processors/cache/GridCacheTestEntryEx.java | 3 ++- 6 files changed, 11 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b1d2d604/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java index ba3ecc3..3dfaa28 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java @@ -1867,7 +1867,7 @@ public abstract class GridCacheAdapter implements IgniteInternalCache implements IgniteInternalCache extends GridDhtCacheAdapter { try { GridCacheVersion ver = entry.version(); - entry.versionedValue(ctx.toCacheObject(v), null, ver); + entry.versionedValue(ctx.toCacheObject(v), null, ver, entry.ttl()); } catch (GridCacheEntryRemovedException e) { assert false : "Entry should not get obsolete while holding lock [entry=" + entry + http://git-wip-us.apache.org/repos/asf/ignite/blob/b1d2d604/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java index 9ad7fb0..c567535 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java @@ -491,7 +491,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter implements Ig GridCacheEntryEx entry = cacheCtx.cache().entryEx(key); try { - GridCacheVersion setVer = entry.versionedValue(cacheVal, ver, null); + GridCacheVersion setVer = entry.versionedValue(cacheVal, ver, null, entry.ttl()); boolean set = setVer != null; http://git-wip-us.apache.org/repos/asf/ignite/blob/b1d2d604/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java index 400fb14..de5404a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java @@ -688,7 +688,8 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr /** @inheritDoc */ @Override public GridCacheVersion versionedValue(CacheObject val, GridCacheVersion curVer, - GridCacheVersion newVer) { + GridCacheVersion newVer, + long ttl) { assert false; return null;