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 79C3917324 for ; Fri, 8 May 2015 14:14:01 +0000 (UTC) Received: (qmail 83978 invoked by uid 500); 8 May 2015 14:14:01 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 83952 invoked by uid 500); 8 May 2015 14:14:01 -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 83943 invoked by uid 99); 8 May 2015 14:14:01 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 May 2015 14:14:01 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id EEDDDC2899 for ; Fri, 8 May 2015 14:14:00 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.771 X-Spam-Level: X-Spam-Status: No, score=0.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id UJtd-kLkfRBd for ; Fri, 8 May 2015 14:13:48 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 14B9B474D6 for ; Fri, 8 May 2015 14:13:43 +0000 (UTC) Received: (qmail 82744 invoked by uid 99); 8 May 2015 14:13:42 -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, 08 May 2015 14:13:42 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 98B5DE3CC1; Fri, 8 May 2015 14:13:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yzhdanov@apache.org To: commits@ignite.incubator.apache.org Date: Fri, 08 May 2015 14:14:28 -0000 Message-Id: <7a17aebef3f64b69b18d18903c120469@git.apache.org> In-Reply-To: <6f334daff9254e679500ba8c625f70a8@git.apache.org> References: <6f334daff9254e679500ba8c625f70a8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [48/50] [abbrv] incubator-ignite git commit: Merge branch 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-5 Merge branch 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-5 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/23616406 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/23616406 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/23616406 Branch: refs/heads/ignite-709_2 Commit: 23616406ee0989c743bbb2e9f088db3dcdc6d6e1 Parents: a983125 f62afc6 Author: Denis Magda Authored: Fri May 8 15:16:37 2015 +0300 Committer: Denis Magda Committed: Fri May 8 15:16:37 2015 +0300 ---------------------------------------------------------------------- examples/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 2 +- .../processors/cache/GridCacheAdapter.java | 26 ++- .../cache/GridCacheEvictionManager.java | 2 +- .../processors/cache/GridCacheProxyImpl.java | 24 -- .../processors/cache/GridCacheSwapManager.java | 215 +++++++++++++----- .../processors/cache/IgniteInternalCache.java | 27 --- .../colocated/GridDhtColocatedLockFuture.java | 2 + .../distributed/near/GridNearCacheAdapter.java | 10 - .../processors/cache/local/GridLocalCache.java | 8 +- .../local/atomic/GridLocalAtomicCache.java | 27 ++- .../cache/query/GridCacheQueryManager.java | 21 +- .../transactions/IgniteTxLocalAdapter.java | 12 +- .../processors/igfs/IgfsDeleteWorker.java | 4 + .../offheap/GridOffHeapProcessor.java | 17 ++ .../util/offheap/GridOffHeapPartitionedMap.java | 9 + .../unsafe/GridUnsafePartitionedMap.java | 155 ++++++------- .../core/src/main/resources/ignite.properties | 2 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 227 +++++++++++-------- .../cache/GridCacheAbstractSelfTest.java | 4 +- .../cache/OffHeapTieredTransactionSelfTest.java | 127 +++++++++++ ...icOffHeapTieredMultiNodeFullApiSelfTest.java | 43 ++++ ...ionedNearDisabledOffHeapFullApiSelfTest.java | 8 +- ...DisabledOffHeapMultiNodeFullApiSelfTest.java | 8 +- ...abledOffHeapTieredAtomicFullApiSelfTest.java | 56 +++++ ...earDisabledOffHeapTieredFullApiSelfTest.java | 33 +++ ...edOffHeapTieredMultiNodeFullApiSelfTest.java | 33 +++ ...CacheAtomicOffHeapTieredFullApiSelfTest.java | 32 +++ ...icOffHeapTieredMultiNodeFullApiSelfTest.java | 33 +++ ...yWriteOrderOffHeapTieredFullApiSelfTest.java | 33 +++ ...erOffHeapTieredMultiNodeFullApiSelfTest.java | 33 +++ ...achePartitionedMultiNodeFullApiSelfTest.java | 15 +- ...dCachePartitionedOffHeapFullApiSelfTest.java | 8 +- ...titionedOffHeapMultiNodeFullApiSelfTest.java | 8 +- ...PartitionedOffHeapTieredFullApiSelfTest.java | 32 +++ ...edOffHeapTieredMultiNodeFullApiSelfTest.java | 72 ++++++ ...idCacheReplicatedOffHeapFullApiSelfTest.java | 8 +- ...plicatedOffHeapMultiNodeFullApiSelfTest.java | 8 +- ...eReplicatedOffHeapTieredFullApiSelfTest.java | 33 +++ ...edOffHeapTieredMultiNodeFullApiSelfTest.java | 33 +++ ...LocalAtomicOffHeapTieredFullApiSelfTest.java | 32 +++ .../GridCacheLocalOffHeapFullApiSelfTest.java | 6 +- ...dCacheLocalOffHeapTieredFullApiSelfTest.java | 32 +++ .../ignite/testsuites/IgniteBasicTestSuite.java | 1 + .../IgniteCacheFullApiSelfTestSuite.java | 18 ++ .../testsuites/IgniteCacheTestSuite3.java | 3 - modules/extdata/p2p/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml | 2 +- ...eQueryMultiThreadedOffHeapTiredSelfTest.java | 37 +++ .../IgniteCacheQueryMultiThreadedSelfTest.java | 29 ++- .../IgniteCacheQuerySelfTestSuite.java | 1 + modules/jcl/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/rest-http/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- modules/yardstick/pom.xml | 2 +- pom.xml | 6 +- 78 files changed, 1269 insertions(+), 404 deletions(-) ----------------------------------------------------------------------