Merge remote-tracking branch 'origin/ignite-51' into ignite-51
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/832d1eee Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/832d1eee Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/832d1eee Branch: refs/heads/ignite-user-req Commit: 832d1eeef4eea64c67764a7ff18090fff6fa8da7 Parents: 69fecdc 88bc98d Author: sboikov <sboi...@gridgain.com> Authored: Wed Mar 4 16:31:30 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Wed Mar 4 16:31:30 2015 +0300 ---------------------------------------------------------------------- .../internal/direct/DirectByteBufferStream.java | 22 +- .../communication/GridIoMessageFactory.java | 15 + .../cache/CacheEntrySerializablePredicate.java | 8 +- .../processors/cache/CacheObjectImpl.java | 2 + .../GridDistributedTxPrepareRequest.java | 113 +---- .../dht/GridDhtTxPrepareRequest.java | 90 ++-- .../near/GridNearTxPrepareFuture.java | 13 +- .../near/GridNearTxPrepareResponse.java | 92 ++-- .../near/NearTxPrepareResponseOwnedValue.java | 157 ++++++ .../cache/transactions/IgniteTxEntry.java | 506 ++++++++----------- .../cache/transactions/IgniteTxKey.java | 17 +- .../cache/transactions/TxEntryValueHolder.java | 233 +++++++++ 12 files changed, 770 insertions(+), 498 deletions(-) ----------------------------------------------------------------------
