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 8EF7C200BD9 for ; Fri, 9 Dec 2016 10:57:36 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 8DBC3160B1D; 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 B708D160B2A for ; Fri, 9 Dec 2016 10:57:35 +0100 (CET) Received: (qmail 43617 invoked by uid 500); 9 Dec 2016 09:57:34 -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 43591 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 9ED78DFF75; 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:35 -0000 Message-Id: <42288ae356f84b459cfc98e3d7faad28@git.apache.org> In-Reply-To: <4330a618478444348da192db82a02e07@git.apache.org> References: <4330a618478444348da192db82a02e07@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/8] ignite git commit: IGNITE-3699: Fixed ttl calculation for invoke in transaction mode archived-at: Fri, 09 Dec 2016 09:57:36 -0000 IGNITE-3699: Fixed ttl calculation for invoke in transaction mode Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ff608f22 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ff608f22 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ff608f22 Branch: refs/heads/ignite-3699 Commit: ff608f2244cb80d521833d7ecbb5c31c8e81af4b Parents: 431bdb0 Author: Amir Akhmedov Authored: Mon Sep 5 22:30:51 2016 -0400 Committer: Amir Akhmedov Committed: Mon Sep 5 22:30:51 2016 -0400 ---------------------------------------------------------------------- .../distributed/dht/GridDhtTxPrepareFuture.java | 4 ++- ...eCacheExpiryPolicyWithStoreAbstractTest.java | 33 +++++++++++++++++++- 2 files changed, 35 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ff608f22/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java index 3cb0fbc..a6f9033 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java @@ -432,7 +432,9 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture() { + @Override public Integer process(MutableEntry e, Object... args) { + return e.getValue(); + } + }); + + assertEquals((Integer)100, res); + + checkTtl(key, 500, true); + + assertEquals((Integer)100, cache.localPeek(key, CachePeekMode.ONHEAP)); + + U.sleep(600); + + checkExpired(key); + } + finally { + cache.removeAll(); + } + } + + /** + * @throws Exception If failed. + */ + public void testGetReadThrough() throws Exception { + IgniteCache cache = jcache(0); + + final Integer key = primaryKeys(cache, 1, 100_000).get(0); + + storeMap.put(key, 100); + + try { Integer res = cache.get(key); assertEquals((Integer)100, res);