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/ffe0d9c2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ffe0d9c2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ffe0d9c2 Branch: refs/heads/ignite-gg-9991 Commit: ffe0d9c287560dea417464e8aad79fb56e538bae Parents: 5bf4734 5fcb072 Author: ptupitsyn <ptupit...@gridgain.com> Authored: Thu Apr 9 11:58:17 2015 +0300 Committer: ptupitsyn <ptupit...@gridgain.com> Committed: Thu Apr 9 11:58:17 2015 +0300 ---------------------------------------------------------------------- bin/ignite.bat | 2 +- bin/ignite.sh | 2 +- bin/include/service.sh | 8 +- config/hadoop/default-config.xml | 15 +- .../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 +- .../streaming/StreamTransformerExample.java | 3 +- .../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 | 3 - .../ignite/internal/ClusterMetricsSnapshot.java | 384 +++------ .../apache/ignite/internal/IgniteKernal.java | 72 +- .../org/apache/ignite/internal/IgnitionEx.java | 171 ++-- .../cluster/ClusterStartNodeResultImpl.java | 87 ++ .../cluster/IgniteClusterAsyncImpl.java | 5 +- .../internal/cluster/IgniteClusterImpl.java | 37 +- .../internal/managers/GridManagerAdapter.java | 34 +- .../processors/cache/CacheLazyEntry.java | 10 +- .../cache/DynamicCacheChangeRequest.java | 19 +- .../cache/DynamicCacheDescriptor.java | 17 +- .../processors/cache/GridCacheAdapter.java | 57 +- .../processors/cache/GridCacheIoManager.java | 2 +- .../processors/cache/GridCacheProcessor.java | 373 +++++++- .../cache/GridLoadCacheCloseablePredicate.java | 30 + .../processors/cache/KeyCacheObjectImpl.java | 13 +- .../dht/GridClientPartitionTopology.java | 6 +- .../distributed/dht/GridDhtCacheAdapter.java | 22 +- .../distributed/dht/GridDhtLockFuture.java | 10 +- .../dht/GridDhtPartitionTopologyImpl.java | 6 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 49 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 2 +- .../GridDhtPartitionsExchangeFuture.java | 1 + .../cache/transactions/IgniteTxManager.java | 6 +- .../cacheobject/IgniteCacheObjectProcessor.java | 3 +- .../IgniteCacheObjectProcessorImpl.java | 28 +- .../ipc/shmem/IpcSharedMemoryNativeLoader.java | 48 +- .../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 ++ .../internal/visor/log/VisorLogSearchTask.java | 3 +- .../visor/query/VisorQueryNextPageTask.java | 5 +- .../org/apache/ignite/lang/IgniteImmutable.java | 49 -- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 24 +- .../communication/tcp/TcpCommunicationSpi.java | 14 +- .../discovery/tcp/TcpClientDiscoverySpi.java | 47 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 78 +- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 8 +- .../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 +- .../spi/swapspace/file/FileSwapSpaceSpi.java | 4 +- .../resources/META-INF/classnames.properties | 19 +- .../ignite/IgniteCacheAffinitySelfTest.java | 5 + .../GridCacheOnCopyFlagAbstractSelfTest.java | 112 +-- .../GridCacheReturnValueTransferSelfTest.java | 1 - ...teCacheConfigurationDefaultTemplateTest.java | 111 +++ .../IgniteCacheConfigurationTemplateTest.java | 448 ++++++++++ .../IgniteCacheStoreValueAbstractTest.java | 186 +++- .../cache/IgniteDynamicCacheStartSelfTest.java | 23 + ...ePartitionedBasicStoreMultiNodeSelfTest.java | 110 +-- ...ridCacheFifoBatchEvictionPolicySelfTest.java | 3 +- .../GridAbstractCommunicationSelfTest.java | 3 +- .../GridTcpCommunicationSpiAbstractTest.java | 5 +- ...mmunicationSpiConcurrentConnectSelfTest.java | 3 +- ...cpCommunicationSpiMultithreadedSelfTest.java | 3 +- ...dTcpCommunicationSpiRecoveryAckSelfTest.java | 3 +- ...GridTcpCommunicationSpiRecoverySelfTest.java | 2 +- .../ignite/testframework/junits/IgniteMock.java | 15 + .../IgniteCacheEvictionSelfTestSuite.java | 1 + .../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 | 341 ++++++++ .../query/h2/sql/BaseH2CompareQueryTest.java | 823 ++++++++++++++++++ .../query/h2/sql/GridQueryParsingTest.java | 26 +- .../query/h2/sql/H2CompareBigQueryTest.java | 707 +++++++++++++++ .../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 + .../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 +- parent/pom.xml | 2 +- pom.xml | 14 +- 137 files changed, 5636 insertions(+), 3285 deletions(-) ----------------------------------------------------------------------
