Merge remote-tracking branch 'remotes/origin/ignite-3477' into ignite-3477-compact2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b5049dd1 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b5049dd1 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b5049dd1 Branch: refs/heads/ignite-3477-compact2 Commit: b5049dd1e15885d835ed3270eca9b84bdf0706be Parents: ad70552 5bde9b1 Author: sboikov <[email protected]> Authored: Fri Feb 10 14:20:07 2017 +0300 Committer: sboikov <[email protected]> Committed: Fri Feb 10 14:20:07 2017 +0300 ---------------------------------------------------------------------- .../src/main/java/org/apache/ignite/Ignite.java | 5 ++ .../java/org/apache/ignite/IgniteCache.java | 6 -- .../apache/ignite/internal/IgniteKernal.java | 15 +++++ .../ignite/internal/pagemem/PageMemory.java | 4 -- .../pagemem/impl/PageMemoryNoStoreImpl.java | 22 +------- .../processors/cache/GridCacheProcessor.java | 44 +++++++++++---- .../cache/IgniteCacheOffheapManagerImpl.java | 44 --------------- .../processors/cache/IgniteCacheProxy.java | 26 --------- .../cache/database/MetadataStorage.java | 42 -------------- .../cache/database/freelist/FreeListImpl.java | 5 +- .../cache/database/tree/io/BPlusIO.java | 12 ---- .../dht/GridDhtPartitionTopologyImpl.java | 2 +- .../dht/preloader/GridDhtPartitionDemander.java | 1 - .../GridDhtPartitionsExchangeFuture.java | 41 +++++++++----- .../continuous/CacheContinuousQueryHandler.java | 2 + .../apache/ignite/internal/util/GridUnsafe.java | 45 ++++++++++++++- .../ignite/internal/util/IgniteUtils.java | 3 + .../IgniteCachePartitionLossPolicySelfTest.java | 14 ++--- .../GridCacheRebalancingSyncSelfTest.java | 20 +++++-- .../continuous/GridEventConsumeSelfTest.java | 3 +- .../processors/database/BPlusTreeSelfTest.java | 11 ---- .../processors/igfs/IgfsIgniteMock.java | 5 ++ .../odbc/OdbcProcessorValidationSelfTest.java | 4 +- .../unsafe/GridUnsafeMemorySelfTest.java | 35 ++++++++++++ .../ignite/testframework/junits/IgniteMock.java | 5 ++ .../junits/common/GridCommonAbstractTest.java | 59 ++++++++++++++------ .../multijvm/IgniteCacheProcessProxy.java | 5 -- .../junits/multijvm/IgniteProcessProxy.java | 5 ++ .../ignite/testsuites/IgniteCacheTestSuite.java | 10 ---- .../testsuites/IgniteCacheTestSuite5.java | 19 ++++++- .../query/h2/database/io/H2InnerIO.java | 10 ---- .../query/h2/database/io/H2LeafIO.java | 10 ---- .../org/apache/ignite/IgniteSpringBean.java | 7 +++ 33 files changed, 276 insertions(+), 265 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b5049dd1/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ----------------------------------------------------------------------
