Merge branch 'ignite-51' into ignite-51-int
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bbc815d6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bbc815d6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bbc815d6 Branch: refs/heads/ignite-user-req Commit: bbc815d67dcb8a6904f3d5d7b5dc185f19646430 Parents: ce37315 c3416bc Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Thu Mar 5 12:22:14 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Thu Mar 5 12:22:14 2015 +0300 ---------------------------------------------------------------------- .../ignite/codegen/MessageCodeGenerator.java | 5 +- .../internal/IgniteCodeGeneratingFail.java | 29 +++ .../communication/GridIoMessageFactory.java | 5 - .../processors/cache/GridCacheContext.java | 12 -- .../processors/cache/GridCacheMapEntry.java | 90 +++------ .../processors/cache/GridCacheSwapManager.java | 21 -- .../processors/cache/GridCacheValueBytes.java | 194 ------------------- .../GridDistributedCacheAdapter.java | 9 +- .../preloader/GridDhtPartitionSupplyPool.java | 9 - .../cache/transactions/IgniteTxEntry.java | 4 +- .../dataload/IgniteDataLoaderImpl.java | 9 + .../util/offheap/unsafe/GridUnsafeMemory.java | 20 -- 12 files changed, 73 insertions(+), 334 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bbc815d6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bbc815d6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java ----------------------------------------------------------------------
