Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-683-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/826b2704 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/826b2704 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/826b2704 Branch: refs/heads/ignite-218 Commit: 826b2704156224ee7d3c5ddf288e25d3c9110018 Parents: c669dfe fceebf2 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Mon Apr 13 11:15:58 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Mon Apr 13 11:15:58 2015 +0300 ---------------------------------------------------------------------- RELEASE_NOTES.txt | 13 + examples/pom.xml | 2 +- .../streaming/wordcount/CacheConfig.java | 5 + .../streaming/wordcount/QueryWords.java | 4 +- modules/aop/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/clients/pom.xml | 2 +- .../client/ClientReconnectionSelfTest.java | 2 + modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 2 +- .../java/org/apache/ignite/IgniteCache.java | 10 +- .../apache/ignite/IgniteSystemProperties.java | 7 + .../apache/ignite/cache/query/ScanQuery.java | 2 +- .../ignite/cache/query/SqlFieldsQuery.java | 55 +++- .../configuration/CacheConfiguration.java | 7 +- .../ignite/internal/ClusterMetricsSnapshot.java | 3 - .../apache/ignite/internal/GridComponent.java | 5 +- .../ignite/internal/GridPluginComponent.java | 5 +- .../internal/managers/GridManagerAdapter.java | 4 +- .../discovery/GridDiscoveryManager.java | 10 +- .../processors/GridProcessorAdapter.java | 5 +- .../processors/cache/GridCacheProcessor.java | 4 +- .../GridDhtPartitionsExchangeFuture.java | 3 + .../cache/local/GridLocalLockFuture.java | 2 + .../continuous/GridContinuousProcessor.java | 4 +- .../processors/igfs/IgfsInputStreamImpl.java | 2 +- .../processors/igfs/IgfsOutputStreamImpl.java | 6 +- .../plugin/IgnitePluginProcessor.java | 13 +- .../query/GridQueryFieldMetadata.java | 2 +- .../processors/query/GridQueryProcessor.java | 89 +++--- .../ignite/internal/util/GridJavaProcess.java | 38 ++- .../visor/cache/VisorCacheConfiguration.java | 2 +- .../internal/visor/cache/VisorCacheMetrics.java | 2 +- .../visor/node/VisorNodeDataCollectorTask.java | 1 + .../internal/visor/query/VisorQueryArg.java | 82 ++++++ .../visor/query/VisorQueryCleanupTask.java | 10 +- .../internal/visor/query/VisorQueryCursor.java | 96 +++++++ .../internal/visor/query/VisorQueryField.java | 66 ++++- .../internal/visor/query/VisorQueryJob.java | 174 ++++++++++++ .../visor/query/VisorQueryNextPageTask.java | 75 +++-- .../internal/visor/query/VisorQueryResult.java | 6 +- .../visor/query/VisorQueryResultEx.java | 16 +- .../internal/visor/query/VisorQueryTask.java | 283 ++----------------- .../internal/visor/query/VisorQueryUtils.java | 55 ++-- .../apache/ignite/plugin/PluginProvider.java | 5 +- .../spi/discovery/DiscoverySpiDataExchange.java | 5 +- .../discovery/tcp/TcpClientDiscoverySpi.java | 10 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 110 +++++-- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 27 ++ .../tcp/internal/TcpDiscoveryNode.java | 12 +- .../TcpDiscoveryCustomEventMessage.java | 23 +- .../TcpDiscoveryJoinRequestMessage.java | 6 +- .../messages/TcpDiscoveryNodeAddedMessage.java | 16 +- .../ignite/startup/BasicWarmupClosure.java | 9 +- .../resources/META-INF/classnames.properties | 36 ++- .../cache/IgniteWarmupClosureSelfTest.java | 82 ++++++ .../fair/GridFairAffinityFunctionSelfTest.java | 2 - .../IgniteFairAffinityDynamicCacheSelfTest.java | 97 +++++++ .../CacheMetricsForClusterGroupSelfTest.java | 18 +- ...CacheOffHeapMultiThreadedUpdateSelfTest.java | 5 + .../GridCacheSetFailoverAbstractSelfTest.java | 2 + .../continuous/GridEventConsumeSelfTest.java | 3 +- .../discovery/AbstractDiscoverySelfTest.java | 4 +- ...ClusterMetricsSnapshotSerializeSelfTest.java | 28 ++ .../tcp/TcpDiscoverySpiStartStopSelfTest.java | 5 +- .../junits/spi/GridSpiAbstractTest.java | 4 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 6 + modules/extdata/p2p/pom.xml | 2 +- .../p2p/startcache/CacheAllNodesFilter.java | 31 ++ .../CacheConfigurationP2PTestClient.java | 118 ++++++++ .../tests/p2p/startcache/Organization1.java | 52 ++++ .../tests/p2p/startcache/Organization2.java | 52 ++++ modules/extdata/uri/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/docs/hadoop_readme.pdf | Bin 82297 -> 82219 bytes modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml | 2 +- .../processors/query/h2/IgniteH2Indexing.java | 19 +- .../query/h2/sql/GridSqlQuerySplitter.java | 18 +- .../query/h2/twostep/GridMergeIndex.java | 17 +- .../h2/twostep/GridReduceQueryExecutor.java | 2 +- .../cache/CacheConfigurationP2PTest.java | 179 ++++++++++++ .../cache/CacheConfigurationP2PTestServer.java | 49 ++++ .../IgniteCacheCollocatedQuerySelfTest.java | 209 ++++++++++++++ .../cache/IgniteCacheLargeResultSelfTest.java | 104 +++++++ .../query/h2/sql/BaseH2CompareQueryTest.java | 20 ++ .../IgniteCacheQuerySelfTestSuite.java | 2 + .../IgniteCacheWithIndexingTestSuite.java | 2 + modules/jcl/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/rest-http/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- .../commands/cache/VisorCacheScanCommand.scala | 13 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- modules/yardstick/pom.xml | 2 +- pom.xml | 51 ++-- 107 files changed, 2086 insertions(+), 591 deletions(-) ----------------------------------------------------------------------
