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 B499017A3E for ; Fri, 11 Sep 2015 11:36:12 +0000 (UTC) Received: (qmail 9031 invoked by uid 500); 11 Sep 2015 11:36:12 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 8951 invoked by uid 500); 11 Sep 2015 11:36:12 -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 8643 invoked by uid 99); 11 Sep 2015 11:36:12 -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, 11 Sep 2015 11:36:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 600BBE0B2F; Fri, 11 Sep 2015 11:36:12 +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, 11 Sep 2015 11:36:21 -0000 Message-Id: <4563801da41f436b87a758861ec7150f@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [10/22] ignite git commit: Merge remote-tracking branch 'origin/master' Merge remote-tracking branch 'origin/master' Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/72e9973d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/72e9973d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/72e9973d Branch: refs/heads/ignite-1093-2 Commit: 72e9973df3b12deeaeca0a0050aa0d517d08ae41 Parents: d96e0d2 9abbe90 Author: vozerov-gridgain Authored: Thu Sep 10 11:53:32 2015 +0300 Committer: vozerov-gridgain Committed: Thu Sep 10 11:53:32 2015 +0300 ---------------------------------------------------------------------- examples/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/apache-license-gen/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/CacheMetricsImpl.java | 2 +- .../processors/cache/GridCacheEntryEx.java | 13 ++ .../cache/GridCacheEvictionManager.java | 18 +- .../processors/cache/GridCacheMapEntry.java | 45 ++++- .../cache/GridCacheSwapEntryImpl.java | 24 +-- .../processors/cache/GridCacheSwapManager.java | 168 +++++++++++++++---- .../processors/cache/GridCacheUtils.java | 21 +-- .../distributed/dht/GridDhtLocalPartition.java | 7 +- .../offheap/GridOffHeapProcessor.java | 25 ++- .../util/offheap/GridOffHeapEvictListener.java | 5 + .../internal/util/offheap/GridOffHeapMap.java | 13 +- .../util/offheap/GridOffHeapMapFactory.java | 28 ++-- .../util/offheap/GridOffHeapPartitionedMap.java | 11 ++ .../util/offheap/unsafe/GridUnsafeMap.java | 128 +++++++++----- .../unsafe/GridUnsafePartitionedMap.java | 9 + .../core/src/main/resources/ignite.properties | 2 +- .../cache/CacheSwapUnswapGetTest.java | 85 +++++++++- .../processors/cache/GridCacheTestEntryEx.java | 6 + .../offheap/GridOffHeapMapAbstractSelfTest.java | 16 +- .../GridOffHeapMapPerformanceAbstractTest.java | 4 +- ...idOffHeapPartitionedMapAbstractSelfTest.java | 20 +++ .../unsafe/GridUnsafeMapPerformanceTest.java | 2 +- .../offheap/unsafe/GridUnsafeMapSelfTest.java | 2 +- .../GridOffHeapMapPerformanceAbstractTest.java | 4 +- .../unsafe/GridUnsafeMapPerformanceTest.java | 2 +- modules/extdata/p2p/pom.xml | 2 +- .../extdata/uri/modules/uri-dependency/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 +- .../cache/GridCacheOffHeapAndSwapSelfTest.java | 4 + .../IgniteCacheQueryMultiThreadedSelfTest.java | 9 +- ...QueryOffheapEvictsMultiThreadedSelfTest.java | 2 +- modules/jcl/pom.xml | 2 +- modules/jms11/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/kafka/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/log4j2/pom.xml | 2 +- modules/mesos/pom.xml | 2 +- modules/platform/pom.xml | 2 +- .../platform/src/main/cpp/common/configure.ac | 2 +- .../src/main/cpp/core-test/configure.ac | 2 +- modules/platform/src/main/cpp/core/configure.ac | 2 +- .../Properties/AssemblyInfo.cs | 4 +- .../Apache.Ignite/Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- modules/rest-http/pom.xml | 2 +- modules/scalar-2.10/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/spark-2.10/pom.xml | 2 +- modules/spark/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-2.10/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 +- modules/yarn/pom.xml | 2 +- modules/zookeeper/pom.xml | 2 +- pom.xml | 2 +- 79 files changed, 584 insertions(+), 201 deletions(-) ----------------------------------------------------------------------