Merge remote-tracking branch 'remotes/origin/ignite-gg-11810' into ignite-gg-11810-1
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c7bd20c5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c7bd20c5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c7bd20c5 Branch: refs/heads/ignite-gg-11810-1 Commit: c7bd20c5decf79cad225c5f0cb9fd7f2e432bacc Parents: 3202edd fc9c488 Author: sboikov <sboi...@gridgain.com> Authored: Fri Jan 13 16:14:10 2017 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri Jan 13 16:14:10 2017 +0300 ---------------------------------------------------------------------- .../ignite/internal/pagemem/PageUtils.java | 2 +- .../pagemem/impl/PageMemoryNoStoreImpl.java | 43 ++++++++++--------- .../internal/pagemem/impl/PageNoStoreImpl.java | 13 ++---- .../cache/IgniteCacheOffheapManagerImpl.java | 44 +++----------------- .../cache/database/CacheDataRowAdapter.java | 28 +++++-------- .../util/GridCursorIteratorWrapper.java | 17 ++++++++ ...niteCachePartitionedFieldsQuerySelfTest.java | 8 ++-- ...gniteCacheReplicatedFieldsQuerySelfTest.java | 6 +-- .../query/h2/opt/GridH2TableSelfTest.java | 6 +-- .../query/h2/sql/GridQueryParsingTest.java | 4 +- 10 files changed, 69 insertions(+), 102 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/c7bd20c5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java ----------------------------------------------------------------------
