Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6C48D180F2 for ; Fri, 24 Jul 2015 10:36:42 +0000 (UTC) Received: (qmail 83015 invoked by uid 500); 24 Jul 2015 10:36:29 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 82982 invoked by uid 500); 24 Jul 2015 10:36:29 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 82966 invoked by uid 99); 24 Jul 2015 10:36:29 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Jul 2015 10:36:29 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 4D1D91A77F7 for ; Fri, 24 Jul 2015 10:36:29 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id uu7CWDc1itAo for ; Fri, 24 Jul 2015 10:36:16 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id F345123117 for ; Fri, 24 Jul 2015 10:36:14 +0000 (UTC) Received: (qmail 82107 invoked by uid 99); 24 Jul 2015 10:36:13 -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, 24 Jul 2015 10:36:13 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AB10CE685E; Fri, 24 Jul 2015 10:36:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Fri, 24 Jul 2015 10:36:34 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [22/24] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-630' Merge remote-tracking branch 'remotes/origin/ignite-630' Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ed5d3ed1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ed5d3ed1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ed5d3ed1 Branch: refs/heads/ignite-1139 Commit: ed5d3ed1c03f062d29cfc53a35b6b35436859f28 Parents: 06b2504 80cec1b Author: Anton Vinogradov Authored: Thu Jul 23 18:47:00 2015 +0300 Committer: Anton Vinogradov Committed: Thu Jul 23 18:47:00 2015 +0300 ---------------------------------------------------------------------- .../rest/protocols/tcp/MockNioSession.java | 15 - .../cache/CacheEvictableEntryImpl.java | 2 +- .../processors/cache/GridCacheAdapter.java | 13 +- .../processors/cache/GridCacheEntryEx.java | 32 +- .../cache/GridCacheEvictionManager.java | 12 +- .../processors/cache/GridCacheMapEntry.java | 208 +------------ .../processors/cache/GridCacheUtils.java | 18 +- .../extras/GridCacheAttributesEntryExtras.java | 37 +-- .../GridCacheAttributesMvccEntryExtras.java | 35 +-- ...dCacheAttributesMvccObsoleteEntryExtras.java | 35 +-- ...cheAttributesMvccObsoleteTtlEntryExtras.java | 35 +-- .../GridCacheAttributesMvccTtlEntryExtras.java | 35 +-- .../GridCacheAttributesObsoleteEntryExtras.java | 36 +-- ...idCacheAttributesObsoleteTtlEntryExtras.java | 36 +-- .../GridCacheAttributesTtlEntryExtras.java | 36 +-- .../cache/extras/GridCacheEntryExtras.java | 14 - .../extras/GridCacheEntryExtrasAdapter.java | 8 - .../cache/extras/GridCacheMvccEntryExtras.java | 8 - .../GridCacheMvccObsoleteEntryExtras.java | 8 - .../GridCacheMvccObsoleteTtlEntryExtras.java | 9 - .../extras/GridCacheMvccTtlEntryExtras.java | 8 - .../extras/GridCacheObsoleteEntryExtras.java | 8 - .../extras/GridCacheObsoleteTtlEntryExtras.java | 9 - .../cache/extras/GridCacheTtlEntryExtras.java | 8 - .../store/GridCacheStoreManagerAdapter.java | 2 +- .../cache/transactions/IgniteInternalTx.java | 16 +- .../cache/transactions/IgniteTxAdapter.java | 6 +- .../util/lang/GridMetadataAwareAdapter.java | 296 +++++++++---------- .../cache/eviction/GridCacheMockEntry.java | 12 +- .../nio/impl/GridNioFilterChainSelfTest.java | 15 - .../GridMetadataAwareAdapterLoadSelfTest.java | 135 +++++++++ .../lang/GridMetadataAwareAdapterSelfTest.java | 58 ++-- 32 files changed, 409 insertions(+), 796 deletions(-) ----------------------------------------------------------------------