Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5

Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5beed16e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5beed16e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5beed16e

Branch: refs/heads/ignite-1.5.1
Commit: 5beed16e3af924e367dffec841d39d09d326d110
Parents: dc0131d 50f6c01
Author: Anton Vinogradov <a...@apache.org>
Authored: Thu Dec 3 16:54:50 2015 +0300
Committer: Anton Vinogradov <a...@apache.org>
Committed: Thu Dec 3 16:54:50 2015 +0300

----------------------------------------------------------------------
 .../internal/portable/BinaryReaderExImpl.java   |   2 +-
 .../internal/portable/PortableContext.java      |  34 +-
 .../processors/cache/GridCacheContext.java      |  30 ++
 .../CacheDataStructuresManager.java             |  31 +-
 .../dht/atomic/GridDhtAtomicCache.java          |  20 +-
 .../CacheObjectBinaryProcessorImpl.java         |   8 +
 .../cache/query/GridCacheQueryManager.java      |  12 +-
 .../transactions/IgniteTxLocalAdapter.java      |  11 +-
 .../datastructures/CollocatedQueueItemKey.java  |  75 ++++
 .../datastructures/CollocatedSetItemKey.java    |  87 +++++
 .../datastructures/DataStructuresProcessor.java |   7 +-
 .../GridAtomicCacheQueueImpl.java               |   8 +-
 .../datastructures/GridCacheQueueAdapter.java   |  30 +-
 .../datastructures/GridCacheQueueItemKey.java   |   9 +-
 .../datastructures/GridCacheSetImpl.java        |  37 +-
 .../datastructures/GridCacheSetItemKey.java     |  21 +-
 .../GridTransactionalCacheQueueImpl.java        |   2 +-
 .../processors/datastructures/QueueItemKey.java |  27 ++
 .../processors/datastructures/SetItemKey.java   |  36 ++
 .../cache/IgniteCacheInvokeAbstractTest.java    | 369 ++++++++++++++-----
 ...eAbstractDataStructuresFailoverSelfTest.java |   7 +-
 .../GridCacheQueueApiSelfAbstractTest.java      |  18 +-
 .../GridCacheSetFailoverAbstractSelfTest.java   |   6 +-
 .../GridCachePartitionedQueueApiSelfTest.java   |   5 +
 ...dCachePartitionedQueueEntryMoveSelfTest.java |   2 +-
 .../IgnitePartitionedQueueNoBackupsTest.java    |  92 +++++
 .../GridCacheReplicatedQueueApiSelfTest.java    |   5 +
 .../GridCacheWriteBehindStoreAbstractTest.java  |   2 +-
 .../IgniteCacheDataStructuresSelfTestSuite.java |   3 +
 29 files changed, 778 insertions(+), 218 deletions(-)
----------------------------------------------------------------------


Reply via email to