Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-sprint-4
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1732608a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1732608a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1732608a Branch: refs/heads/ignite-218 Commit: 1732608a6d26030a1998eed85b358e146b272d7a Parents: ffe0d9c 2bc1c17 Author: ptupitsyn <ptupit...@gridgain.com> Authored: Fri Apr 10 10:36:12 2015 +0300 Committer: ptupitsyn <ptupit...@gridgain.com> Committed: Fri Apr 10 10:36:12 2015 +0300 ---------------------------------------------------------------------- DEVNOTES.txt | 4 +- .../datastructures/IgniteQueueExample.java | 28 +- .../datastructures/IgniteSetExample.java | 30 +- .../ignite/codegen/MessageCodeGenerator.java | 1 - .../java/org/apache/ignite/IgniteCache.java | 15 +- .../java/org/apache/ignite/IgniteCluster.java | 2 +- .../configuration/CacheConfiguration.java | 20 +- .../configuration/CollectionConfiguration.java | 114 ++++- .../configuration/IgniteConfiguration.java | 19 - .../ignite/internal/ClusterMetricsSnapshot.java | 2 +- .../ignite/internal/GridPluginContext.java | 15 +- .../apache/ignite/internal/IgniteKernal.java | 16 +- .../ignite/internal/MarshallerContextImpl.java | 3 + .../discovery/GridDiscoveryManager.java | 3 +- .../affinity/GridAffinityProcessor.java | 5 +- .../processors/cache/GridCacheAdapter.java | 27 +- .../processors/cache/GridCacheContext.java | 58 ++- .../cache/GridCacheEvictionManager.java | 6 +- .../cache/GridCacheExplicitLockSpan.java | 2 +- .../processors/cache/GridCacheIoManager.java | 87 ++-- .../processors/cache/GridCacheMapEntry.java | 6 +- .../processors/cache/GridCacheMessage.java | 7 + .../processors/cache/GridCacheMvcc.java | 2 +- .../cache/GridCacheMvccCandidate.java | 50 +- .../processors/cache/GridCacheMvccManager.java | 44 +- .../GridCachePartitionExchangeManager.java | 136 +++++- .../processors/cache/GridCacheProcessor.java | 115 +++-- .../cache/GridCacheProjectionImpl.java | 2 +- .../processors/cache/GridCacheProxyImpl.java | 2 +- .../distributed/GridDistributedCacheEntry.java | 12 +- .../dht/GridDhtAffinityAssignmentRequest.java | 5 + .../dht/GridDhtAffinityAssignmentResponse.java | 5 + .../distributed/dht/GridDhtCacheEntry.java | 36 +- .../distributed/dht/GridDhtLockFuture.java | 18 +- .../dht/GridDhtTransactionalCacheAdapter.java | 14 +- .../distributed/dht/GridDhtTxFinishFuture.java | 22 +- .../cache/distributed/dht/GridDhtTxLocal.java | 2 + .../distributed/dht/GridDhtTxLocalAdapter.java | 30 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 28 +- .../dht/colocated/GridDhtColocatedCache.java | 32 +- .../colocated/GridDhtColocatedLockFuture.java | 46 +- .../GridDhtPartitionsAbstractMessage.java | 15 +- .../GridDhtPartitionsExchangeFuture.java | 39 +- .../distributed/near/GridNearCacheEntry.java | 10 +- .../distributed/near/GridNearLockFuture.java | 13 +- .../near/GridNearTxFinishFuture.java | 8 +- .../cache/distributed/near/GridNearTxLocal.java | 7 + .../near/GridNearTxPrepareFuture.java | 122 +++-- .../near/GridNearTxPrepareRequest.java | 64 ++- .../cache/query/GridCacheQueriesImpl.java | 2 +- .../continuous/CacheContinuousQueryManager.java | 28 -- .../cache/transactions/IgniteTxAdapter.java | 3 +- .../cache/transactions/IgniteTxHandler.java | 120 +++-- .../transactions/IgniteTxLocalAdapter.java | 76 +-- .../cache/transactions/IgniteTxManager.java | 7 + .../cache/version/GridCacheVersionEx.java | 2 +- .../cacheobject/IgniteCacheObjectProcessor.java | 5 +- .../IgniteCacheObjectProcessorImpl.java | 36 +- .../datastreamer/DataStreamerImpl.java | 8 +- .../CacheDataStructuresCacheKey.java | 62 +++ .../CacheDataStructuresConfigurationKey.java | 2 +- .../datastructures/DataStructuresProcessor.java | 222 ++++++++- .../datastructures/GridCacheQueueAdapter.java | 2 +- .../plugin/IgnitePluginProcessor.java | 58 +-- .../internal/util/future/GridFutureAdapter.java | 20 +- .../util/lang/GridMetadataAwareAdapter.java | 2 +- .../ignite/internal/util/worker/GridWorker.java | 6 +- .../ignite/plugin/CachePluginConfiguration.java | 2 +- .../org/apache/ignite/plugin/IgnitePlugin.java | 3 - .../ignite/plugin/PluginConfiguration.java | 10 +- .../org/apache/ignite/plugin/PluginContext.java | 7 +- .../apache/ignite/plugin/PluginProvider.java | 4 +- .../communication/tcp/TcpCommunicationSpi.java | 2 +- .../discovery/tcp/TcpClientDiscoverySpi.java | 6 +- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 2 +- .../GridCacheAffinityBackupsSelfTest.java | 15 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 13 +- .../GridCacheAbstractIteratorsSelfTest.java | 3 +- .../cache/GridCacheAbstractSelfTest.java | 10 +- .../cache/GridCacheBasicApiAbstractTest.java | 4 +- .../cache/GridCacheClearAllSelfTest.java | 2 +- .../cache/GridCacheDeploymentSelfTest.java | 9 +- .../GridCachePreloadingEvictionsSelfTest.java | 23 +- .../cache/GridCacheSwapPreloadSelfTest.java | 5 +- .../cache/IgniteCachePeekModesAbstractTest.java | 40 +- ...actQueueFailoverDataConsistencySelfTest.java | 4 +- .../GridCacheQueueApiSelfAbstractTest.java | 80 ++++ .../GridCacheQueueCleanupSelfTest.java | 11 +- ...dCacheQueueMultiNodeConsistencySelfTest.java | 11 +- .../GridCacheSetAbstractSelfTest.java | 5 +- .../IgniteCollectionAbstractTest.java | 160 ++----- .../IgniteDataStructureUniqueNameTest.java | 47 +- .../GridCacheLocalAtomicOffheapSetSelfTest.java | 32 ++ .../GridCacheLocalAtomicQueueApiSelfTest.java | 6 + .../local/GridCacheLocalAtomicSetSelfTest.java | 6 + .../GridCacheLocalOffheapQueueApiSelfTest.java | 31 ++ .../local/GridCacheLocalQueueApiSelfTest.java | 6 + .../local/GridCacheLocalSetSelfTest.java | 6 + ...artitionedAtomicOffheapQueueApiSelfTest.java | 32 ++ ...omicOffheapQueueCreateMultiNodeSelfTest.java | 32 ++ ...onedAtomicOffheapQueueMultiNodeSelfTest.java | 32 ++ ...dCachePartitionedAtomicQueueApiSelfTest.java | 6 + ...ionedAtomicQueueCreateMultiNodeSelfTest.java | 6 + ...micQueueFailoverDataConsistencySelfTest.java | 6 + ...PartitionedAtomicQueueMultiNodeSelfTest.java | 6 + ...itionedAtomicQueueRotativeMultiNodeTest.java | 6 + ...chePartitionedAtomicSetFailoverSelfTest.java | 6 + ...rtitionedDataStructuresFailoverSelfTest.java | 6 + ...artitionedOffHeapValuesQueueApiSelfTest.java | 31 ++ ...achePartitionedOffHeapValuesSetSelfTest.java | 32 ++ ...edOffheapDataStructuresFailoverSelfTest.java | 34 ++ ...hePartitionedOffheapSetFailoverSelfTest.java | 32 ++ .../GridCachePartitionedQueueApiSelfTest.java | 6 + ...PartitionedQueueCreateMultiNodeSelfTest.java | 6 + ...dCachePartitionedQueueEntryMoveSelfTest.java | 10 +- ...nedQueueFailoverDataConsistencySelfTest.java | 6 + ...CachePartitionedQueueJoinedNodeSelfTest.java | 6 + ...dCachePartitionedQueueMultiNodeSelfTest.java | 6 + ...hePartitionedQueueRotativeMultiNodeTest.java | 6 + ...GridCachePartitionedSetFailoverSelfTest.java | 6 + .../GridCachePartitionedSetSelfTest.java | 6 + .../IgnitePartitionedSetNoBackupsSelfTest.java | 5 +- ...eplicatedDataStructuresFailoverSelfTest.java | 6 + .../GridCacheReplicatedQueueApiSelfTest.java | 11 + ...idCacheReplicatedQueueMultiNodeSelfTest.java | 6 + ...cheReplicatedQueueRotativeMultiNodeTest.java | 6 + .../GridCacheReplicatedSetSelfTest.java | 6 + .../GridCacheMultiNodeAbstractTest.java | 13 +- .../IgniteCacheAtomicNodeJoinTest.java | 44 ++ .../IgniteCacheNodeJoinAbstractTest.java | 109 +++++ .../distributed/IgniteCacheTxNodeJoinTest.java | 38 ++ .../dht/GridCacheDhtEntrySelfTest.java | 12 +- .../dht/GridCacheDhtPreloadUnloadSelfTest.java | 2 +- .../dht/IgniteCacheLockFailoverSelfTest.java | 156 ++++++ .../dht/IgniteCacheMultiTxLockSelfTest.java | 219 +++++++++ .../near/GridCacheNearMultiNodeSelfTest.java | 26 +- ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 2 +- ...achePartitionedMultiNodeFullApiSelfTest.java | 6 +- .../near/IgniteCacheNearReadCommittedTest.java | 4 +- ...CacheReplicatedPreloadLifecycleSelfTest.java | 5 +- .../GridCacheReplicatedPreloadSelfTest.java | 23 +- .../tcp/TcpClientDiscoverySelfTest.java | 6 +- .../testframework/junits/GridAbstractTest.java | 4 +- .../junits/common/GridCommonAbstractTest.java | 13 +- .../IgniteCacheDataStructuresSelfTestSuite.java | 10 + .../IgniteCacheFailoverTestSuite.java | 4 + .../ignite/testsuites/IgniteCacheTestSuite.java | 3 + .../IgniteSpiDiscoverySelfTestSuite.java | 2 + .../query/h2/sql/GridSqlQueryParser.java | 24 +- ...CacheOffheapTieredMultithreadedSelfTest.java | 4 +- ...hePartitionedQueryMultiThreadedSelfTest.java | 2 +- .../cache/IgniteCacheQueryIndexSelfTest.java | 3 +- .../IgniteCachePartitionedQuerySelfTest.java | 5 +- .../IgniteCacheReplicatedQuerySelfTest.java | 7 +- .../cache/ttl/CacheTtlAbstractSelfTest.java | 14 +- .../h2/sql/AbstractH2CompareQueryTest.java | 13 +- .../query/h2/sql/BaseH2CompareQueryTest.java | 37 +- .../query/h2/sql/H2CompareBigQueryTest.java | 38 +- .../IgniteCacheQuerySelfTestSuite.java | 1 + .../ignite/tools/javadoc/IgniteLinkTaglet.java | 20 +- modules/urideploy/README.txt | 2 +- modules/urideploy/licenses/edtftp-license.pdf | Bin 58355 -> 0 bytes modules/urideploy/licenses/jtidy-license.txt | 50 -- .../urideploy/licenses/jtidy-mit-license.txt | 50 ++ modules/urideploy/pom.xml | 6 - .../spi/deployment/uri/UriDeploymentSpi.java | 182 +++---- .../uri/scanners/GridUriDeploymentScanner.java | 286 ----------- .../GridUriDeploymentScannerListener.java | 2 +- .../uri/scanners/UriDeploymentScanner.java | 47 ++ .../scanners/UriDeploymentScannerContext.java | 92 ++++ .../scanners/UriDeploymentScannerManager.java | 221 +++++++++ .../file/GridUriDeploymentFileScanner.java | 311 ------------ .../scanners/file/UriDeploymentFileScanner.java | 327 +++++++++++++ .../ftp/GridUriDeploymentFtpClient.java | 199 -------- .../ftp/GridUriDeploymentFtpConfiguration.java | 115 ----- .../ftp/GridUriDeploymentFtpException.java | 43 -- .../scanners/ftp/GridUriDeploymentFtpFile.java | 119 ----- .../ftp/GridUriDeploymentFtpScanner.java | 234 --------- .../uri/scanners/ftp/package-info.java | 22 - .../http/GridUriDeploymentHttpScanner.java | 423 ---------------- .../scanners/http/UriDeploymentHttpScanner.java | 478 +++++++++++++++++++ ...loymentMultiScannersErrorThrottlingTest.java | 3 - .../GridUriDeploymentMultiScannersSelfTest.java | 3 +- .../GridFileDeploymentUndeploySelfTest.java | 4 +- .../uri/scanners/ftp/GridFtpDeploymentTest.java | 46 -- .../uri/scanners/ftp/package-info.java | 22 - .../scala/org/apache/ignite/visor/visor.scala | 3 + 187 files changed, 4146 insertions(+), 2953 deletions(-) ----------------------------------------------------------------------
