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 DA8D3179F9 for ; Fri, 3 Apr 2015 15:31:20 +0000 (UTC) Received: (qmail 73243 invoked by uid 500); 3 Apr 2015 15:31:20 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 73212 invoked by uid 500); 3 Apr 2015 15:31:20 -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 73199 invoked by uid 99); 3 Apr 2015 15:31:20 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Apr 2015 15:31:20 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 03 Apr 2015 15:31:19 +0000 Received: (qmail 72570 invoked by uid 99); 3 Apr 2015 15:30:59 -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, 03 Apr 2015 15:30:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1FD5BE2F74; Fri, 3 Apr 2015 15:30:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.incubator.apache.org Date: Fri, 03 Apr 2015 15:31:28 -0000 Message-Id: <3f9f1c5c77df490481fff13c785f7c4e@git.apache.org> In-Reply-To: <4fddaab423b34e87ab9c050ee0357183@git.apache.org> References: <4fddaab423b34e87ab9c050ee0357183@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [31/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-670' into ignite-sprint-3 X-Virus-Checked: Checked by ClamAV on apache.org Merge remote-tracking branch 'remotes/origin/ignite-670' into ignite-sprint-3 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6c3f1013 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6c3f1013 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6c3f1013 Branch: refs/heads/ignite-639 Commit: 6c3f1013a5dc981ee139668369ae75a427ebc49a Parents: b10fdc7 f19a611 Author: sboikov Authored: Fri Apr 3 08:59:57 2015 +0300 Committer: sboikov Committed: Fri Apr 3 08:59:57 2015 +0300 ---------------------------------------------------------------------- .../configuration/CacheConfiguration.java | 29 -- .../processors/cache/GridCacheAdapter.java | 3 +- .../processors/cache/GridCacheAttributes.java | 8 - .../cache/GridCacheConcurrentMap.java | 34 +- .../processors/cache/GridCacheMapEntry.java | 28 +- .../cache/GridCacheMapEntryFactory.java | 2 - .../processors/cache/GridCacheProcessor.java | 3 - .../distributed/GridDistributedCacheEntry.java | 4 +- .../distributed/dht/GridDhtCacheAdapter.java | 16 +- .../distributed/dht/GridDhtCacheEntry.java | 4 +- .../distributed/dht/GridNoStorageCacheMap.java | 11 +- .../dht/atomic/GridDhtAtomicCache.java | 3 +- .../dht/atomic/GridDhtAtomicCacheEntry.java | 4 +- .../dht/colocated/GridDhtColocatedCache.java | 5 +- .../colocated/GridDhtColocatedCacheEntry.java | 4 +- .../colocated/GridDhtDetachedCacheEntry.java | 5 +- .../distributed/near/GridNearCacheAdapter.java | 3 +- .../distributed/near/GridNearCacheEntry.java | 4 +- .../processors/cache/local/GridLocalCache.java | 3 +- .../cache/local/GridLocalCacheEntry.java | 3 +- .../local/atomic/GridLocalAtomicCache.java | 3 +- .../datastreamer/DataStreamerImpl.java | 21 +- .../cache/VisorCacheDefaultConfiguration.java | 11 - ...idCacheConfigurationConsistencySelfTest.java | 3 - .../GridCacheDhtEvictionsDisabledSelfTest.java | 8 +- .../distributed/dht/GridCacheDhtTestUtils.java | 2 +- .../loadtests/hashmap/GridHashMapLoadTest.java | 2 +- .../cache/ttl/CacheTtlAbstractSelfTest.java | 368 +++++++++++++++++++ .../ttl/CacheTtlOffheapAbstractSelfTest.java | 29 ++ .../CacheTtlOffheapAtomicAbstractSelfTest.java | 29 ++ .../ttl/CacheTtlOffheapAtomicLocalSelfTest.java | 34 ++ ...acheTtlOffheapAtomicPartitionedSelfTest.java | 34 ++ ...TtlOffheapTransactionalAbstractSelfTest.java | 29 ++ ...cheTtlOffheapTransactionalLocalSelfTest.java | 34 ++ ...OffheapTransactionalPartitionedSelfTest.java | 34 ++ .../ttl/CacheTtlOnheapAbstractSelfTest.java | 29 ++ .../CacheTtlOnheapAtomicAbstractSelfTest.java | 29 ++ .../ttl/CacheTtlOnheapAtomicLocalSelfTest.java | 34 ++ ...CacheTtlOnheapAtomicPartitionedSelfTest.java | 34 ++ ...eTtlOnheapTransactionalAbstractSelfTest.java | 29 ++ ...acheTtlOnheapTransactionalLocalSelfTest.java | 34 ++ ...lOnheapTransactionalPartitionedSelfTest.java | 34 ++ .../IgniteCacheWithIndexingTestSuite.java | 51 +++ .../IgniteH2IndexingSpiTestSuite.java | 7 - .../commands/cache/VisorCacheCommand.scala | 1 - 45 files changed, 950 insertions(+), 149 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c3f1013/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c3f1013/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c3f1013/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c3f1013/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c3f1013/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c3f1013/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c3f1013/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java ----------------------------------------------------------------------