Merge branch sprint-1 into ignite-9655-merge
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7f865550 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7f865550 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7f865550 Branch: refs/heads/ignite-9655-merge Commit: 7f8655508491e7998520337b39adeaa75d5e5c7e Parents: 7d1671b 3feb05f Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Sat Feb 14 11:07:43 2015 -0800 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Sat Feb 14 11:07:43 2015 -0800 ---------------------------------------------------------------------- assembly/core-jar.xml | 26 +- assembly/dependencies-fabric.xml | 13 +- assembly/dependencies-optional-fabric.xml | 1 - assembly/dependencies-optional-hadoop.xml | 1 - examples/pom-standalone.xml | 6 + examples/pom.xml | 6 + .../client/memcache/MemcacheRestExample.java | 3 +- modules/core/licenses/sun-bcl-license.txt | 50 + modules/core/pom.xml | 16 - .../java/org/apache/ignite/IgniteCache.java | 2 +- .../org/apache/ignite/cache/CacheManager.java | 4 +- .../store/jdbc/CacheAbstractJdbcStore.java | 3 +- .../configuration/CacheConfiguration.java | 4 +- .../ignite/internal/GridKernalGateway.java | 7 + .../ignite/internal/GridKernalGatewayImpl.java | 16 + .../apache/ignite/internal/IgniteKernal.java | 23 +- .../deployment/GridDeploymentManager.java | 2 +- .../cache/GridCacheConcurrentMap.java | 7 +- .../processors/cache/GridCacheEntrySet.java | 3 +- .../processors/cache/GridCacheMvccManager.java | 15 + .../processors/cache/GridCacheProcessor.java | 8 + .../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 +- .../optimized/optimized-classnames.properties | 254 +- .../fifoqueue/FifoQueueCollisionSpi.java | 6 +- .../PriorityQueueCollisionSpi.java | 6 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 70 +- .../ignite/startup/BasicWarmupClosure.java | 3 +- .../org/jdk8/backport/ConcurrentHashMap8.java | 3825 ++++++++++++++++++ .../jdk8/backport/ConcurrentLinkedDeque8.java | 1983 +++++++++ .../jdk8/backport/ConcurrentLinkedHashMap.java | 2170 ++++++++++ .../main/java/org/jdk8/backport/LongAdder.java | 235 ++ .../main/java/org/jdk8/backport/Striped64.java | 370 ++ .../org/jdk8/backport/ThreadLocalRandom8.java | 231 ++ .../META-INF/licenses/gnu-gplv2ce-license.txt | 349 ++ .../internal/GridReleaseTypeSelfTest.java | 35 +- .../GridTopologyBuildVersionSelfTest.java | 101 - .../internal/GridUpdateNotifierSelfTest.java | 4 + .../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 +- .../IgniteCacheAbstractStopBusySelfTest.java | 381 ++ .../IgniteCacheAtomicStopBusySelfTest.java | 59 + ...gniteCacheTransactionalStopBusySelfTest.java | 53 + .../cache/IgniteTxMultiNodeAbstractTest.java | 6 +- ...niteCacheContinuousExecutionContextTest.java | 34 + ...IgniteCacheIsolatedExecutionContextTest.java | 34 + ...niteCacheP2PDisableExecutionContextTest.java | 34 + .../IgniteCachePrivateExecutionContextTest.java | 34 + .../IgniteCacheSharedExecutionContextTest.java | 34 + .../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 +- .../ignite/testsuites/IgniteBasicTestSuite.java | 1 - .../ignite/testsuites/IgniteCacheTestSuite.java | 7 + modules/extdata/p2p/pom.xml | 6 + .../query/h2/GridH2IndexingGeoSelfTest.java | 8 +- modules/hadoop/pom.xml | 6 + modules/hibernate/pom.xml | 6 + .../GridHibernateAccessStrategyAdapter.java | 3 +- .../hibernate/GridHibernateRegionFactory.java | 7 +- modules/indexing/pom.xml | 6 + .../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 +- .../jdk8-backport/licenses/sun-bcl-license.txt | 50 - modules/jdk8-backport/pom.xml | 36 - .../org/jdk8/backport/ConcurrentHashMap8.java | 3825 ------------------ .../jdk8/backport/ConcurrentLinkedDeque8.java | 1983 --------- .../jdk8/backport/ConcurrentLinkedHashMap.java | 2170 ---------- .../main/java/org/jdk8/backport/LongAdder.java | 235 -- .../main/java/org/jdk8/backport/Striped64.java | 370 -- .../org/jdk8/backport/ThreadLocalRandom8.java | 231 -- .../META-INF/licenses/gnu-gplv2ce-license.txt | 349 -- 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 | 11 +- modules/visor-console/pom.xml | 6 + .../commands/cache/VisorCacheCommand.scala | 2 +- modules/web/pom.xml | 6 + pom.xml | 140 +- 122 files changed, 10568 insertions(+), 9946 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7f865550/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java index e0569ed,1bc59ea..b0a145d --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java @@@ -22,7 -22,6 +22,8 @@@ import org.apache.ignite.cache.* import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; +import org.apache.ignite.internal.processors.cache.*; ++import org.apache.ignite.internal.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.marshaller.optimized.*; import org.apache.ignite.resources.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7f865550/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java ----------------------------------------------------------------------
