You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/10/29 12:12:32 UTC
[21/50] [abbrv] ignite git commit: Merge remote-tracking branch
'apache/master'
Merge remote-tracking branch 'apache/master'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a4d625d0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a4d625d0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a4d625d0
Branch: refs/heads/ignite-1753-1282
Commit: a4d625d0af58437f680b7c136bf7cef72e540303
Parents: b09939f b5a3069
Author: ashutak <as...@gridgain.com>
Authored: Tue Oct 27 14:42:06 2015 +0300
Committer: ashutak <as...@gridgain.com>
Committed: Tue Oct 27 14:42:06 2015 +0300
----------------------------------------------------------------------
DEVNOTES.txt | 3 +-
.../apache/ignite/IgniteSystemProperties.java | 9 +
.../configuration/CacheConfiguration.java | 28 ++-
.../internal/GridEventConsumeHandler.java | 19 +-
.../apache/ignite/internal/IgniteKernal.java | 2 +
.../ignite/internal/IgniteNodeAttributes.java | 3 +
.../deployment/GridDeploymentLocalStore.java | 8 +-
.../GridDeploymentPerLoaderStore.java | 8 +-
.../GridDeploymentPerVersionStore.java | 8 +-
.../internal/portable/PortableContext.java | 91 +++++---
.../portable/api/PortableMarshaller.java | 5 +
.../processors/cache/CacheObjectContext.java | 17 +-
.../processors/cache/GridCacheContext.java | 10 +-
.../cache/GridCacheEvictionManager.java | 5 +-
.../cache/GridCacheEvictionRequest.java | 18 +-
.../cache/GridCacheEvictionResponse.java | 7 +-
.../processors/cache/GridCacheIoManager.java | 34 +--
.../processors/cache/GridCacheMessage.java | 72 +++++--
.../cache/GridCacheSharedContext.java | 3 +
.../processors/cache/GridCacheUtils.java | 20 +-
.../distributed/GridCacheTtlUpdateRequest.java | 7 +-
.../distributed/GridCacheTxRecoveryFuture.java | 9 +-
.../distributed/GridCacheTxRecoveryRequest.java | 8 +-
.../GridCacheTxRecoveryResponse.java | 10 +-
.../distributed/GridDistributedBaseMessage.java | 16 +-
.../distributed/GridDistributedLockRequest.java | 8 +-
.../GridDistributedLockResponse.java | 20 +-
.../GridDistributedTxFinishRequest.java | 6 +-
.../GridDistributedTxFinishResponse.java | 7 +-
.../GridDistributedTxPrepareRequest.java | 13 +-
.../GridDistributedTxPrepareResponse.java | 12 +-
.../GridDistributedTxRemoteAdapter.java | 5 +
.../GridDistributedUnlockRequest.java | 7 +-
.../dht/GridDhtAffinityAssignmentRequest.java | 7 +-
.../dht/GridDhtAffinityAssignmentResponse.java | 7 +-
.../distributed/dht/GridDhtCacheAdapter.java | 3 +-
.../distributed/dht/GridDhtLockFuture.java | 5 +-
.../distributed/dht/GridDhtLockRequest.java | 7 +-
.../distributed/dht/GridDhtLockResponse.java | 14 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 22 +-
.../distributed/dht/GridDhtTxFinishFuture.java | 9 +-
.../distributed/dht/GridDhtTxFinishRequest.java | 7 +-
.../dht/GridDhtTxFinishResponse.java | 2 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 9 +-
.../dht/GridDhtTxPrepareRequest.java | 28 ++-
.../dht/GridDhtTxPrepareResponse.java | 13 +-
.../distributed/dht/GridDhtUnlockRequest.java | 7 +-
.../dht/GridPartitionedGetFuture.java | 3 +-
.../dht/atomic/GridDhtAtomicCache.java | 12 +-
.../GridDhtAtomicDeferredUpdateResponse.java | 12 +-
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 6 +-
.../dht/atomic/GridDhtAtomicUpdateRequest.java | 25 ++-
.../dht/atomic/GridDhtAtomicUpdateResponse.java | 11 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 12 +-
.../dht/atomic/GridNearAtomicUpdateRequest.java | 33 ++-
.../atomic/GridNearAtomicUpdateResponse.java | 11 +-
.../dht/colocated/GridDhtColocatedCache.java | 8 +-
.../colocated/GridDhtColocatedLockFuture.java | 3 +-
.../dht/preloader/GridDhtForceKeysFuture.java | 5 +-
.../dht/preloader/GridDhtForceKeysRequest.java | 35 ++-
.../dht/preloader/GridDhtForceKeysResponse.java | 11 +-
.../GridDhtPartitionDemandMessage.java | 5 +
.../GridDhtPartitionSupplyMessage.java | 9 +-
.../preloader/GridDhtPartitionSupplyPool.java | 10 +-
.../GridDhtPartitionsAbstractMessage.java | 7 +-
.../dht/preloader/GridDhtPreloader.java | 3 +-
.../distributed/near/GridNearGetFuture.java | 5 +-
.../distributed/near/GridNearGetRequest.java | 12 +-
.../distributed/near/GridNearGetResponse.java | 12 +-
.../distributed/near/GridNearLockFuture.java | 3 +-
.../distributed/near/GridNearLockRequest.java | 8 +-
.../distributed/near/GridNearLockResponse.java | 8 +-
.../near/GridNearOptimisticTxPrepareFuture.java | 3 +-
.../GridNearPessimisticTxPrepareFuture.java | 3 +-
.../near/GridNearTransactionalCache.java | 8 +-
.../near/GridNearTxFinishFuture.java | 8 +-
.../near/GridNearTxFinishRequest.java | 7 +-
.../near/GridNearTxFinishResponse.java | 2 +-
.../near/GridNearTxPrepareRequest.java | 8 +-
.../near/GridNearTxPrepareResponse.java | 8 +-
.../distributed/near/GridNearUnlockRequest.java | 7 +-
.../portable/CacheObjectPortableContext.java | 6 +-
.../CacheObjectPortableProcessorImpl.java | 5 +-
.../query/GridCacheDistributedQueryFuture.java | 5 +-
.../query/GridCacheDistributedQueryManager.java | 25 ++-
.../cache/query/GridCacheQueryRequest.java | 46 ++--
.../cache/query/GridCacheQueryResponse.java | 29 ++-
.../continuous/CacheContinuousQueryHandler.java | 8 +-
.../continuous/CacheContinuousQueryManager.java | 6 +-
.../cache/transactions/IgniteInternalTx.java | 8 +-
.../cache/transactions/IgniteTxAdapter.java | 5 +
.../cache/transactions/IgniteTxEntry.java | 8 +-
.../cache/transactions/IgniteTxHandler.java | 16 +-
.../transactions/IgniteTxLocalAdapter.java | 11 +
.../IgniteCacheObjectProcessorImpl.java | 7 +-
.../ignite/internal/util/lang/GridFunc.java | 8 +-
.../ignite/marshaller/AbstractMarshaller.java | 12 +-
.../ignite/marshaller/jdk/JdkMarshaller.java | 7 +-
.../optimized/OptimizedMarshaller.java | 14 +-
.../optimized/OptimizedMarshallerUtils.java | 35 ++-
.../ignite/spi/discovery/tcp/ServerImpl.java | 52 +++++
.../GridDiscoveryManagerAttributesSelfTest.java | 44 +++-
...eAtomicEntryProcessorDeploymentSelfTest.java | 211 +++++++++++++++++++
.../GridCacheConditionalDeploymentSelfTest.java | 190 +++++++++++++++++
.../GridCacheDeploymentOffHeapSelfTest.java | 17 +-
.../cache/GridCacheDeploymentSelfTest.java | 26 +--
...ctionalEntryProcessorDeploymentSelfTest.java | 31 +++
.../IgniteCacheEntryListenerAbstractTest.java | 50 ++++-
.../communication/GridCacheMessageSelfTest.java | 17 +-
.../ignite/testframework/GridTestUtils.java | 19 +-
.../ignite/testsuites/IgniteBasicTestSuite.java | 4 +-
.../ignite/testsuites/IgniteCacheTestSuite.java | 18 +-
.../testsuites/IgniteCacheTestSuite3.java | 8 +-
.../testsuites/IgniteP2PSelfTestSuite.java | 16 +-
.../p2p/CacheDeploymentEntryProcessor.java | 35 +++
.../CacheDeploymentPortableEntryProcessor.java | 35 +++
modules/spark-2.10/pom.xml | 4 +-
modules/spark/pom.xml | 4 +-
.../ipfinder/zk/ZookeeperIpFinderTestSuite.java | 32 +++
parent/pom.xml | 1 +
120 files changed, 1614 insertions(+), 422 deletions(-)
----------------------------------------------------------------------