You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/01/26 18:28:51 UTC

[7/7] ignite git commit: Merge branch 'ignite-3477' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-db-x

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 <al...@gmail.com>
Authored: Thu Jan 26 21:26:25 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
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(-)
----------------------------------------------------------------------