You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/04/10 12:18:48 UTC
[49/50] [abbrv] incubator-ignite git commit: Merge branch
'ignite-sprint-3' into ignite-676
Merge branch 'ignite-sprint-3' into ignite-676
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5fbeff0e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5fbeff0e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5fbeff0e
Branch: refs/heads/ignite-676
Commit: 5fbeff0e078b2bcd38095eb4b7ab78c833b99a30
Parents: e24a5ec 96c616f
Author: Artem Shutak <as...@gridgain.com>
Authored: Fri Apr 10 13:14:41 2015 +0300
Committer: Artem Shutak <as...@gridgain.com>
Committed: Fri Apr 10 13:14:41 2015 +0300
----------------------------------------------------------------------
DEVNOTES.txt | 4 +-
.../examples/datagrid/CacheAffinityExample.java | 9 +-
.../examples/datagrid/CacheApiExample.java | 9 +-
.../examples/datagrid/CacheAsyncApiExample.java | 9 +-
.../datagrid/CacheContinuousQueryExample.java | 8 +-
.../datagrid/CacheDataStreamerExample.java | 9 +-
.../examples/datagrid/CacheEventsExample.java | 9 +-
.../examples/datagrid/CachePutGetExample.java | 10 +-
.../datagrid/CacheTransactionExample.java | 8 +-
.../hibernate/HibernateL2CacheExample.java | 5 +-
.../starschema/CacheStarSchemaExample.java | 10 +-
.../store/auto/CacheAutoStoreExample.java | 8 +-
.../auto/CacheAutoStoreLoadDataExample.java | 5 +-
.../datagrid/store/auto/CacheConfig.java | 4 +-
.../store/dummy/CacheDummyStoreExample.java | 5 +-
.../hibernate/CacheHibernateStoreExample.java | 5 +-
.../store/jdbc/CacheJdbcStoreExample.java | 5 +-
.../datastructures/IgniteQueueExample.java | 28 +-
.../datastructures/IgniteSetExample.java | 30 +-
.../streaming/StreamVisitorExample.java | 5 +-
.../examples/MessagingExamplesSelfTest.java | 2 +-
.../java8/examples/BasicExamplesSelfTest.java | 3 +
.../java8/examples/CacheExamplesSelfTest.java | 4 +
.../examples/CheckpointExamplesSelfTest.java | 3 +
.../examples/ClusterGroupExampleSelfTest.java | 3 +-
.../examples/ContinuationExamplesSelfTest.java | 3 +
.../ContinuousMapperExamplesSelfTest.java | 4 +-
.../DeploymentExamplesMultiNodeSelfTest.java | 2 +
.../examples/DeploymentExamplesSelfTest.java | 2 +
.../HibernateL2CacheExampleSelfTest.java | 3 +
.../java8/examples/IgfsExamplesSelfTest.java | 3 +
.../examples/LifecycleExamplesSelfTest.java | 3 +
.../MemcacheRestExamplesMultiNodeSelfTest.java | 2 +
.../examples/MemcacheRestExamplesSelfTest.java | 2 +
.../examples/MessagingExamplesSelfTest.java | 4 +-
.../examples/MonteCarloExamplesSelfTest.java | 3 +
.../examples/SpringBeanExamplesSelfTest.java | 3 +
.../java8/examples/TaskExamplesSelfTest.java | 2 +
.../client/ClientReconnectionSelfTest.java | 67 +-
.../ignite/codegen/MessageCodeGenerator.java | 1 -
.../src/main/java/org/apache/ignite/Ignite.java | 11 +
.../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 | 388 +++-----
.../ignite/internal/GridPluginContext.java | 15 +-
.../apache/ignite/internal/IgniteKernal.java | 35 +-
.../ignite/internal/MarshallerContextImpl.java | 3 +
.../discovery/GridDiscoveryManager.java | 3 +-
.../affinity/GridAffinityProcessor.java | 5 +-
.../cache/DynamicCacheChangeRequest.java | 2 +-
.../processors/cache/GridCacheAdapter.java | 84 +-
.../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 | 234 +++--
.../cache/GridCacheProjectionImpl.java | 2 +-
.../processors/cache/GridCacheProxyImpl.java | 2 +-
.../cache/GridLoadCacheCloseablePredicate.java | 30 +
.../distributed/GridDistributedCacheEntry.java | 12 +-
.../dht/GridDhtAffinityAssignmentRequest.java | 5 +
.../dht/GridDhtAffinityAssignmentResponse.java | 5 +
.../distributed/dht/GridDhtCacheAdapter.java | 22 +-
.../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 +-
.../cache/VisorCacheQueryConfiguration.java | 9 -
.../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 +-
.../messages/TcpDiscoveryAbstractMessage.java | 24 +-
.../messages/TcpDiscoveryAuthFailedMessage.java | 25 +-
.../TcpDiscoveryCheckFailedMessage.java | 24 +-
.../TcpDiscoveryClientReconnectMessage.java | 30 +-
.../TcpDiscoveryCustomEventMessage.java | 23 +-
.../messages/TcpDiscoveryDiscardMessage.java | 24 +-
.../TcpDiscoveryDuplicateIdMessage.java | 24 +-
.../messages/TcpDiscoveryHandshakeRequest.java | 8 -
.../messages/TcpDiscoveryHandshakeResponse.java | 22 -
.../messages/TcpDiscoveryHeartbeatMessage.java | 44 +-
.../TcpDiscoveryJoinRequestMessage.java | 28 +-
.../TcpDiscoveryLoopbackProblemMessage.java | 28 +-
.../TcpDiscoveryNodeAddFinishedMessage.java | 24 +-
.../messages/TcpDiscoveryNodeAddedMessage.java | 60 +-
.../messages/TcpDiscoveryNodeFailedMessage.java | 28 +-
.../messages/TcpDiscoveryNodeLeftMessage.java | 8 -
.../tcp/messages/TcpDiscoveryPingRequest.java | 25 +-
.../tcp/messages/TcpDiscoveryPingResponse.java | 14 -
.../TcpDiscoveryStatusCheckMessage.java | 30 +-
.../GridCacheAffinityBackupsSelfTest.java | 15 +-
.../ignite/internal/GridStartStopSelfTest.java | 8 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 13 +-
.../GridCacheAbstractIteratorsSelfTest.java | 3 +-
.../cache/GridCacheAbstractSelfTest.java | 10 +-
.../cache/GridCacheBasicApiAbstractTest.java | 4 +-
.../cache/GridCacheClearAllSelfTest.java | 2 +-
.../cache/GridCacheDeploymentSelfTest.java | 9 +-
...CacheOffHeapMultiThreadedUpdateSelfTest.java | 42 +-
.../GridCacheOffHeapTieredAbstractSelfTest.java | 4 +-
.../GridCachePreloadingEvictionsSelfTest.java | 23 +-
.../cache/GridCacheReloadSelfTest.java | 3 +-
.../GridCacheReturnValueTransferSelfTest.java | 15 +-
.../cache/GridCacheSwapPreloadSelfTest.java | 5 +-
...teCacheConfigurationDefaultTemplateTest.java | 111 +++
...eCacheConfigurationTemplateNotFoundTest.java | 114 ---
.../IgniteCacheConfigurationTemplateTest.java | 86 +-
.../cache/IgniteCachePeekModesAbstractTest.java | 40 +-
.../IgniteTxMultiThreadedAbstractTest.java | 5 +-
...actQueueFailoverDataConsistencySelfTest.java | 4 +-
.../GridCacheQueueApiSelfAbstractTest.java | 80 ++
.../GridCacheQueueCleanupSelfTest.java | 11 +-
...GridCacheQueueMultiNodeAbstractSelfTest.java | 5 +-
...dCacheQueueMultiNodeConsistencySelfTest.java | 11 +-
.../GridCacheSetAbstractSelfTest.java | 15 +-
.../GridCacheSetFailoverAbstractSelfTest.java | 6 +-
.../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 +
.../distributed/GridCacheEventAbstractTest.java | 16 +-
.../GridCacheMultiNodeAbstractTest.java | 13 +-
.../GridCacheNodeFailureAbstractTest.java | 15 +-
.../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 +-
...licatedNearOnlyMultiNodeFullApiSelfTest.java | 2 +-
...CacheReplicatedPreloadLifecycleSelfTest.java | 5 +-
.../GridCacheReplicatedPreloadSelfTest.java | 23 +-
.../continuous/GridEventConsumeSelfTest.java | 7 +-
.../processors/igfs/IgfsAbstractSelfTest.java | 8 +-
.../tostring/GridToStringBuilderSelfTest.java | 5 +-
.../GridP2PMissedResourceCacheSizeSelfTest.java | 2 +-
.../tcp/TcpClientDiscoverySelfTest.java | 5 +-
.../testframework/junits/GridAbstractTest.java | 6 +-
.../ignite/testframework/junits/IgniteMock.java | 5 +
.../junits/common/GridCommonAbstractTest.java | 13 +-
.../IgniteCacheDataStructuresSelfTestSuite.java | 10 +
.../IgniteCacheFailoverTestSuite.java | 4 +
.../ignite/testsuites/IgniteCacheTestSuite.java | 5 +-
.../IgniteSpiDiscoverySelfTestSuite.java | 2 +
...rrentLinkedHashMapMultiThreadedSelfTest.java | 4 +-
.../query/h2/sql/GridSqlQueryParser.java | 24 +-
.../GridCacheAbstractFieldsQuerySelfTest.java | 10 +-
.../processors/cache/GridCacheSwapSelfTest.java | 5 +-
...CacheOffheapTieredMultithreadedSelfTest.java | 4 +-
...hePartitionedQueryMultiThreadedSelfTest.java | 2 +-
.../cache/IgniteCacheQueryIndexSelfTest.java | 3 +-
.../IgniteCachePartitionedQuerySelfTest.java | 5 +-
.../IgniteCacheReplicatedQuerySelfTest.java | 18 +-
.../cache/ttl/CacheTtlAbstractSelfTest.java | 14 +-
.../h2/sql/AbstractH2CompareQueryTest.java | 352 ++++++++
.../query/h2/sql/BaseH2CompareQueryTest.java | 836 ++++++++++++++++++
.../query/h2/sql/H2CompareBigQueryTest.java | 677 ++++++++++++++
.../query/h2/sql/IgniteVsH2QueryTest.java | 875 -------------------
.../IgniteCacheQuerySelfTestSuite.java | 6 +-
.../processors/query/h2/sql/bigQuery.sql | 55 ++
.../processors/cache/GridCacheJtaSelfTest.java | 6 +-
.../org/apache/ignite/IgniteSpringBean.java | 7 +
.../p2p/GridP2PUserVersionChangeSelfTest.java | 8 +-
.../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 +
274 files changed, 6801 insertions(+), 4922 deletions(-)
----------------------------------------------------------------------