You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/02/25 13:31:34 UTC
[35/51] [abbrv] ignite git commit: Merge branches 'ignite-2523' and
'master' of https://github.com/ilantukh/ignite into ignite-2523
Merge branches 'ignite-2523' and 'master' of https://github.com/ilantukh/ignite into ignite-2523
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9533cb25
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9533cb25
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9533cb25
Branch: refs/heads/ignite-2523
Commit: 9533cb250225c8991e1fe038d889ee5c76f69d81
Parents: 20bbd61 10214cc
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Thu Feb 25 12:11:31 2016 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Thu Feb 25 12:11:31 2016 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/IgniteQueue.java | 27 ++-
.../main/java/org/apache/ignite/IgniteSet.java | 26 ++-
.../apache/ignite/IgniteSystemProperties.java | 3 +
.../internal/GridEventConsumeHandler.java | 4 +-
.../internal/GridMessageListenHandler.java | 4 +-
.../ignite/internal/IgniteComputeImpl.java | 4 +-
.../ignite/internal/binary/BinaryUtils.java | 2 +-
.../internal/managers/GridManagerAdapter.java | 4 +-
.../checkpoint/GridCheckpointManager.java | 2 +-
.../managers/communication/GridIoManager.java | 9 +-
.../deployment/GridDeploymentCommunication.java | 2 +-
.../deployment/GridDeploymentLocalStore.java | 2 +-
.../eventstorage/GridEventStorageManager.java | 10 +-
.../processors/affinity/GridAffinityUtils.java | 3 +-
.../cache/CacheEntrySerializablePredicate.java | 3 +-
.../cache/CacheInvokeDirectResult.java | 3 +-
.../processors/cache/GridCacheAdapter.java | 5 +-
.../cache/GridCacheDeploymentManager.java | 5 +
.../processors/cache/GridCacheMessage.java | 4 +-
.../processors/cache/GridCacheMvccManager.java | 142 ++++++++++------
.../processors/cache/GridCacheProcessor.java | 5 +-
.../GridDistributedLockResponse.java | 3 +-
.../GridDistributedTxPrepareRequest.java | 2 +-
.../GridDistributedTxPrepareResponse.java | 3 +-
.../dht/GridDhtAffinityAssignmentResponse.java | 3 +-
.../distributed/dht/GridDhtLockFuture.java | 17 +-
.../dht/GridDhtTxFinishResponse.java | 3 +-
.../cache/distributed/dht/GridDhtTxRemote.java | 11 +-
.../dht/preloader/GridDhtForceKeysResponse.java | 3 +-
.../GridDhtPartitionDemandMessage.java | 3 +-
.../preloader/GridDhtPartitionsFullMessage.java | 5 +-
.../GridDhtPartitionsSingleMessage.java | 5 +-
.../distributed/near/GridNearGetResponse.java | 3 +-
.../near/GridNearSingleGetResponse.java | 3 +-
.../near/GridNearTxFinishResponse.java | 3 +-
.../distributed/near/GridNearTxRemote.java | 9 +-
.../cache/query/GridCacheLocalQueryFuture.java | 7 +-
.../cache/query/GridCacheQueryRequest.java | 13 +-
.../cache/query/GridCacheQueryResponse.java | 3 +-
.../cache/query/GridCacheSqlQuery.java | 6 +-
.../CacheContinuousQueryBatchAck.java | 4 +
.../continuous/CacheContinuousQueryHandler.java | 12 +-
.../cache/transactions/IgniteTxEntry.java | 6 +-
.../IgniteTxImplicitSingleStateImpl.java | 5 +-
.../transactions/IgniteTxLocalAdapter.java | 4 +
.../IgniteTxRemoteSingleStateImpl.java | 6 +-
.../version/GridCacheRawVersionedEntry.java | 5 +-
.../IgniteCacheObjectProcessorImpl.java | 3 +-
.../closure/GridClosureProcessor.java | 6 +-
.../continuous/GridContinuousProcessor.java | 7 +-
.../datastreamer/DataStreamProcessor.java | 4 +-
.../datastreamer/DataStreamerImpl.java | 21 +--
.../datastructures/GridCacheQueueAdapter.java | 25 +++
.../datastructures/GridCacheQueueProxy.java | 14 +-
.../datastructures/GridCacheSetImpl.java | 38 ++++-
.../datastructures/GridCacheSetProxy.java | 14 +-
.../processors/job/GridJobProcessor.java | 10 +-
.../internal/processors/job/GridJobWorker.java | 2 +-
.../offheap/GridOffHeapProcessor.java | 2 +-
.../handlers/task/GridTaskCommandHandler.java | 6 +-
.../service/GridServiceProcessor.java | 3 +-
.../processors/task/GridTaskProcessor.java | 5 +-
.../processors/task/GridTaskWorker.java | 9 +-
.../ignite/internal/util/GridHandleTable.java | 7 +-
.../ignite/internal/util/IgniteUtils.java | 26 ++-
.../OptimizedObjectStreamRegistry.java | 145 ++++++++++-------
.../ignite/spi/discovery/tcp/ClientImpl.java | 12 +-
.../ignite/spi/discovery/tcp/ServerImpl.java | 16 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 3 +-
.../sharedfs/TcpDiscoverySharedFsIpFinder.java | 35 +++-
.../TcpDiscoveryCustomEventMessage.java | 2 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 65 ++++++++
.../cache/GridCacheAbstractSelfTest.java | 19 +++
.../IgniteCachePutStackOverflowSelfTest.java | 133 +++++++++++++++
.../GridCacheBinaryObjectsAbstractSelfTest.java | 40 +++++
.../GridCacheQueueApiSelfAbstractTest.java | 104 +++++++++++-
.../GridCacheSetAbstractSelfTest.java | 103 +++++++++++-
.../GridCacheReplicatedPreloadSelfTest.java | 163 +++++++++++++++++++
.../internal/util/GridHandleTableSelfTest.java | 50 ++++++
.../OptimizedMarshallerPooledSelfTest.java | 44 +++++
.../TcpDiscoveryIpFinderAbstractSelfTest.java | 15 +-
.../testsuites/IgniteBinaryBasicTestSuite.java | 4 +
.../testsuites/IgniteCacheTestSuite5.java | 2 +
.../IgniteMarshallerSelfTestSuite.java | 8 +-
.../CacheDeploymentExternalizableTestValue.java | 69 ++++++++
.../processors/query/h2/IgniteH2Indexing.java | 4 +-
.../query/h2/twostep/GridMapQueryExecutor.java | 2 +-
87 files changed, 1387 insertions(+), 269 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/9533cb25/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
----------------------------------------------------------------------