Merge branch 'ignite-sprint-3' into gg-10046
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d84bccd1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d84bccd1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d84bccd1 Branch: refs/heads/gg-10046 Commit: d84bccd1d977381b93a7f32c92fa62327e35479c Parents: 1f9097d e7fa0a9 Author: Artem Shutak <ashu...@gridgain.com> Authored: Thu Apr 9 18:31:09 2015 +0300 Committer: Artem Shutak <ashu...@gridgain.com> Committed: Thu Apr 9 18:31:09 2015 +0300 ---------------------------------------------------------------------- .../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 +- .../src/main/java/org/apache/ignite/Ignite.java | 26 + .../java/org/apache/ignite/IgniteCluster.java | 9 +- .../ignite/cluster/ClusterStartNodeResult.java | 46 + .../configuration/CacheConfiguration.java | 20 +- .../configuration/CollectionConfiguration.java | 114 ++- .../ignite/internal/ClusterMetricsSnapshot.java | 388 +++------ .../ignite/internal/GridPluginContext.java | 15 +- .../apache/ignite/internal/IgniteKernal.java | 68 +- .../org/apache/ignite/internal/IgnitionEx.java | 171 ++-- .../ignite/internal/MarshallerContextImpl.java | 3 + .../cluster/ClusterStartNodeResultImpl.java | 87 ++ .../cluster/IgniteClusterAsyncImpl.java | 5 +- .../internal/cluster/IgniteClusterImpl.java | 37 +- .../internal/managers/GridManagerAdapter.java | 34 +- .../affinity/GridAffinityProcessor.java | 5 +- .../cache/DynamicCacheChangeRequest.java | 19 +- .../cache/DynamicCacheDescriptor.java | 17 +- .../processors/cache/GridCacheAdapter.java | 57 +- .../processors/cache/GridCacheIoManager.java | 89 +- .../processors/cache/GridCacheMessage.java | 7 + .../GridCachePartitionExchangeManager.java | 136 ++- .../processors/cache/GridCacheProcessor.java | 422 +++++++-- .../cache/GridLoadCacheCloseablePredicate.java | 30 + .../dht/GridClientPartitionTopology.java | 6 +- .../dht/GridDhtAffinityAssignmentRequest.java | 5 + .../dht/GridDhtAffinityAssignmentResponse.java | 5 + .../distributed/dht/GridDhtCacheAdapter.java | 22 +- .../distributed/dht/GridDhtLockFuture.java | 10 +- .../dht/GridDhtPartitionTopologyImpl.java | 6 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 49 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 2 +- .../GridDhtPartitionsAbstractMessage.java | 15 +- .../GridDhtPartitionsExchangeFuture.java | 1 + .../continuous/CacheContinuousQueryManager.java | 28 - .../cache/transactions/IgniteTxManager.java | 6 +- .../cacheobject/IgniteCacheObjectProcessor.java | 5 +- .../IgniteCacheObjectProcessorImpl.java | 34 +- .../datastreamer/DataStreamerImpl.java | 8 +- .../CacheDataStructuresCacheKey.java | 62 ++ .../CacheDataStructuresConfigurationKey.java | 2 +- .../datastructures/DataStructuresProcessor.java | 222 ++++- .../plugin/IgnitePluginProcessor.java | 58 +- .../ignite/internal/util/lang/GridFunc.java | 33 + .../util/nodestart/IgniteNodeCallable.java | 30 - .../util/nodestart/IgniteSshHelper.java | 2 +- .../util/nodestart/StartNodeCallable.java | 30 + .../ignite/internal/visor/cache/VisorCache.java | 2 +- .../cache/VisorCacheAggregatedMetrics.java | 38 +- .../visor/cache/VisorCacheConfiguration.java | 17 +- .../internal/visor/cache/VisorCacheMetrics.java | 53 +- .../cache/VisorCacheMetricsCollectorTask.java | 59 +- .../visor/cache/VisorCacheStopTask.java | 69 ++ .../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 +- .../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 +- .../resources/META-INF/classnames.properties | 19 +- ...teCacheConfigurationDefaultTemplateTest.java | 111 +++ .../IgniteCacheConfigurationTemplateTest.java | 448 ++++++++++ .../cache/IgniteDynamicCacheStartSelfTest.java | 23 + ...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 + .../IgniteCacheAtomicNodeJoinTest.java | 44 + .../IgniteCacheNodeJoinAbstractTest.java | 109 +++ .../distributed/IgniteCacheTxNodeJoinTest.java | 38 + ...ePartitionedBasicStoreMultiNodeSelfTest.java | 110 +-- .../ignite/testframework/junits/IgniteMock.java | 15 + .../IgniteCacheDataStructuresSelfTestSuite.java | 10 + .../IgniteCacheFailoverTestSuite.java | 4 + .../ignite/testsuites/IgniteCacheTestSuite.java | 5 +- .../processors/query/h2/sql/GridSqlElement.java | 8 - .../processors/query/h2/sql/GridSqlQuery.java | 183 ++++ .../query/h2/sql/GridSqlQueryParser.java | 97 ++- .../query/h2/sql/GridSqlQuerySplitter.java | 111 ++- .../processors/query/h2/sql/GridSqlSelect.java | 209 ++--- .../query/h2/sql/GridSqlSubquery.java | 8 +- .../processors/query/h2/sql/GridSqlUnion.java | 134 +++ .../h2/twostep/GridReduceQueryExecutor.java | 2 +- .../h2/sql/AbstractH2CompareQueryTest.java | 352 ++++++++ .../query/h2/sql/BaseH2CompareQueryTest.java | 834 ++++++++++++++++++ .../query/h2/sql/GridQueryParsingTest.java | 26 +- .../query/h2/sql/H2CompareBigQueryTest.java | 677 +++++++++++++++ .../query/h2/sql/IgniteVsH2QueryTest.java | 860 ------------------- .../IgniteCacheQuerySelfTestSuite.java | 5 +- .../processors/query/h2/sql/bigQuery.sql | 55 ++ .../org/apache/ignite/IgniteSpringBean.java | 21 + .../util/nodestart/IgniteNodeCallableImpl.java | 308 ------- .../util/nodestart/IgniteSshHelperImpl.java | 4 +- .../util/nodestart/StartNodeCallableImpl.java | 309 +++++++ ...gniteProjectionStartStopRestartSelfTest.java | 261 +++--- .../IgniteStartStopRestartTestSuite.java | 1 + 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 - .../commands/cache/VisorCacheClearCommand.scala | 3 +- .../commands/cache/VisorCacheCommand.scala | 423 +++++---- .../commands/cache/VisorCacheStopCommand.scala | 145 ++++ .../commands/start/VisorStartCommand.scala | 4 +- .../scala/org/apache/ignite/visor/visor.scala | 12 +- 201 files changed, 8028 insertions(+), 5401 deletions(-) ----------------------------------------------------------------------
