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 3DD2F200C17 for ; Thu, 26 Jan 2017 19:28:48 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 3C9A9160B4C; Thu, 26 Jan 2017 18:28:48 +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 88DAD160B31 for ; Thu, 26 Jan 2017 19:28:47 +0100 (CET) Received: (qmail 41644 invoked by uid 500); 26 Jan 2017 18:28:46 -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 41599 invoked by uid 99); 26 Jan 2017 18:28:46 -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; Thu, 26 Jan 2017 18:28:46 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7D28EDFF59; Thu, 26 Jan 2017 18:28:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agoncharuk@apache.org To: commits@ignite.apache.org Date: Thu, 26 Jan 2017 18:28:51 -0000 Message-Id: <37c2d36acb3940499cb7ff45a11af9d5@git.apache.org> In-Reply-To: <9b2a00aab7b34383ba4b8eb9da4b051d@git.apache.org> References: <9b2a00aab7b34383ba4b8eb9da4b051d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [7/7] ignite git commit: Merge branch 'ignite-3477' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-db-x archived-at: Thu, 26 Jan 2017 18:28:48 -0000 Merge branch 'ignite-3477' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-db-x Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ad061021 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ad061021 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ad061021 Branch: refs/heads/ignite-3477 Commit: ad061021be40569de7402bf1f480ab6bc2fe1ea5 Parents: b7d24dc 788d9bb Author: Alexey Goncharuk Authored: Thu Jan 26 21:26:25 2017 +0300 Committer: Alexey Goncharuk Committed: Thu Jan 26 21:26:25 2017 +0300 ---------------------------------------------------------------------- .../ignite/internal/pagemem/PageMemory.java | 13 +- .../pagemem/impl/PageMemoryNoStoreImpl.java | 13 +- .../internal/pagemem/impl/PageNoStoreImpl.java | 2 + .../internal/pagemem/wal/record/WALRecord.java | 5 +- .../wal/record/delta/DataPageUpdateRecord.java | 79 +++++++++ .../processors/cache/CacheLazyEntry.java | 2 +- .../processors/cache/GridCacheMapEntry.java | 64 +++++--- .../cache/IgniteCacheOffheapManager.java | 8 +- .../cache/IgniteCacheOffheapManagerImpl.java | 160 +++++++++++++++---- .../cache/database/CacheDataRowAdapter.java | 70 +++++--- .../processors/cache/database/RowStore.java | 12 ++ .../cache/database/freelist/FreeList.java | 8 + .../cache/database/freelist/FreeListImpl.java | 69 ++++++-- .../cache/database/tree/BPlusTree.java | 44 ++++- .../cache/database/tree/io/DataPageIO.java | 57 ++++++- .../cache/database/tree/io/IOVersions.java | 7 +- .../distributed/dht/GridDhtCacheEntry.java | 4 +- .../distributed/dht/GridDhtLocalPartition.java | 14 +- .../colocated/GridDhtDetachedCacheEntry.java | 9 +- .../distributed/near/GridNearCacheEntry.java | 5 +- .../apache/ignite/internal/util/GridUnsafe.java | 3 + .../database/IgniteDbPutGetAbstractTest.java | 77 +++++++++ .../query/h2/database/H2RowFactory.java | 2 +- 23 files changed, 586 insertions(+), 141 deletions(-) ----------------------------------------------------------------------