Merge branch ignite-sprint-3 into ignite-721
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/17574737 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/17574737 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/17574737 Branch: refs/heads/ignite-sprint-3 Commit: 1757473754a94e0e3ac0fb75c9767126de278dbb Parents: b8543dc 232b10b Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Fri Apr 10 10:25:05 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Fri Apr 10 10:25:05 2015 -0700 ---------------------------------------------------------------------- examples/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 2 +- .../configuration/CacheConfiguration.java | 7 +- .../query/GridQueryFieldMetadata.java | 2 +- .../processors/query/GridQueryProcessor.java | 89 +++--- .../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 | 281 ++----------------- .../internal/visor/query/VisorQueryUtils.java | 55 ++-- .../ignite/startup/BasicWarmupClosure.java | 9 +- .../resources/META-INF/classnames.properties | 36 ++- .../cache/IgniteWarmupClosureSelfTest.java | 82 ++++++ .../ignite/testsuites/IgniteCacheTestSuite.java | 4 + modules/extdata/p2p/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml | 2 +- .../processors/query/h2/IgniteH2Indexing.java | 17 +- .../query/h2/sql/BaseH2CompareQueryTest.java | 20 ++ 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 | 48 ++-- 52 files changed, 781 insertions(+), 468 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/17574737/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java index b023e0d,02f82ce..e167614 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java @@@ -81,9 -82,11 +82,12 @@@ public class IgniteCacheTestSuite exten suite.addTestSuite(IgniteCachePrivateExecutionContextTest.class); suite.addTestSuite(IgniteCacheSharedExecutionContextTest.class); + // Warmup closure tests. + suite.addTestSuite(IgniteWarmupClosureSelfTest.class); + // Affinity tests. suite.addTestSuite(GridFairAffinityFunctionNodesSelfTest.class); + suite.addTestSuite(GridFairAffinityFunctionSelfTest.class); suite.addTestSuite(IgniteFairAffinityDynamicCacheSelfTest.class); suite.addTestSuite(GridCacheAffinityBackupsSelfTest.class); suite.addTestSuite(IgniteCacheAffinitySelfTest.class);
