Merge branch 'sprint-1' into ignite-250
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c1ac729c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c1ac729c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c1ac729c Branch: refs/heads/ignite-nio Commit: c1ac729ce2e4a69bcdffb99e04ea92d1d78fcc9d Parents: ee27d24 e06e973 Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Sat Feb 14 15:22:42 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Sat Feb 14 15:22:42 2015 +0300 ---------------------------------------------------------------------- examples/pom-standalone.xml | 6 ++ examples/pom.xml | 12 +++ .../client/memcache/MemcacheRestExample.java | 3 +- .../java/org/apache/ignite/IgniteCache.java | 2 +- .../org/apache/ignite/cache/CacheManager.java | 4 +- .../store/jdbc/CacheAbstractJdbcStore.java | 3 +- .../configuration/CacheConfiguration.java | 4 +- .../cache/GridCacheConcurrentMap.java | 7 +- .../processors/cache/GridCacheEntrySet.java | 3 +- .../cache/affinity/GridCacheAffinityProxy.java | 2 +- .../handlers/cache/GridCacheCommandHandler.java | 2 +- .../cache/GridCacheQueryCommandHandler.java | 6 +- .../protocols/tcp/GridTcpRestNioListener.java | 16 +++- .../cache/VisorCacheMetricsCollectorTask.java | 10 ++- .../node/VisorNodeEventsCollectorTask.java | 3 +- .../internal/visor/query/VisorQueryTask.java | 45 ++++++----- .../internal/visor/util/VisorTaskUtils.java | 4 +- .../ignite/startup/BasicWarmupClosure.java | 3 +- .../GridCacheConcurrentTxMultiNodeTest.java | 4 +- ...CacheFullTextQueryMultithreadedSelfTest.java | 2 +- .../cache/GridCacheLuceneQueryIndexTest.java | 16 ++-- .../cache/GridCacheOffHeapSelfTest.java | 2 +- .../cache/GridCacheP2PUndeploySelfTest.java | 2 +- .../cache/GridCacheQueryIndexSelfTest.java | 5 +- .../GridCacheQueryInternalKeysSelfTest.java | 2 +- .../cache/GridCacheSwapPreloadSelfTest.java | 2 +- .../GridCacheVariableTopologySelfTest.java | 2 +- .../cache/IgniteTxMultiNodeAbstractTest.java | 6 +- .../GridCacheQueueCleanupSelfTest.java | 8 +- .../GridCacheAbstractJobExecutionTest.java | 7 +- .../GridCacheClientModesAbstractSelfTest.java | 9 ++- ...ePartitionedNearDisabledMetricsSelfTest.java | 2 +- ...achePartitionedPreloadLifecycleSelfTest.java | 8 +- ...hePartitionedQueryMultiThreadedSelfTest.java | 2 +- ...CacheReplicatedPreloadLifecycleSelfTest.java | 7 +- .../GridCacheSwapScanQueryAbstractSelfTest.java | 13 ++-- ...ridCacheContinuousQueryAbstractSelfTest.java | 44 +++++------ ...dCacheContinuousQueryReplicatedSelfTest.java | 9 ++- ...dCacheAbstractReduceFieldsQuerySelfTest.java | 11 +-- ...cheReduceFieldsQueryPartitionedSelfTest.java | 3 +- .../GridContinuousOperationsLoadTest.java | 2 +- modules/extdata/p2p/pom.xml | 6 ++ .../query/h2/GridH2IndexingGeoSelfTest.java | 8 +- modules/hadoop/pom.xml | 12 +++ modules/hibernate/pom.xml | 6 ++ .../GridHibernateAccessStrategyAdapter.java | 3 +- .../hibernate/GridHibernateRegionFactory.java | 7 +- modules/indexing/pom.xml | 12 +++ .../GridCacheAbstractFieldsQuerySelfTest.java | 47 +++++------ .../cache/GridCacheAbstractQuerySelfTest.java | 82 ++++++++++---------- .../cache/GridCacheCrossCacheQuerySelfTest.java | 5 +- .../cache/GridCacheOffHeapAndSwapSelfTest.java | 4 +- .../GridCacheQueryMultiThreadedSelfTest.java | 30 +++---- .../GridCacheSqlQueryMultiThreadedSelfTest.java | 3 +- .../processors/cache/GridCacheSwapSelfTest.java | 7 +- .../cache/GridIndexingWithNoopSwapSelfTest.java | 3 +- .../GridCacheAtomicFieldsQuerySelfTest.java | 3 +- ...GridCachePartitionedFieldsQuerySelfTest.java | 3 +- ...idCachePartitionedHitsAndMissesSelfTest.java | 2 +- .../near/GridCachePartitionedQuerySelfTest.java | 23 +++--- .../near/GridCacheQueryNodeRestartSelfTest.java | 2 +- .../GridCacheReplicatedFieldsQuerySelfTest.java | 4 +- .../GridCacheReplicatedQuerySelfTest.java | 6 +- .../local/GridCacheLocalQuerySelfTest.java | 5 +- .../query/h2/GridH2IndexRebuildTest.java | 16 ++-- .../query/h2/sql/GridQueryParsingTest.java | 2 +- .../tcp/GridOrderedMessageCancelSelfTest.java | 2 +- modules/jta/pom.xml | 6 ++ modules/scalar/pom.xml | 6 ++ modules/spring/pom.xml | 6 ++ .../org/apache/ignite/IgniteSpringBean.java | 3 +- .../ignite/cache/spring/SpringCacheManager.java | 3 +- .../cache/spring/SpringDynamicCacheManager.java | 2 +- modules/visor-console/pom.xml | 12 +++ .../commands/cache/VisorCacheCommand.scala | 2 +- modules/web/pom.xml | 6 ++ 76 files changed, 388 insertions(+), 264 deletions(-) ----------------------------------------------------------------------
