Merge branches 'ignite-639' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-639
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b1898776 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b1898776 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b1898776 Branch: refs/heads/ignite-437-sqltests-p2 Commit: b1898776bac93ea164db6d06780f0eb84c6b1e2d Parents: fdf56a5 5a2b46c Author: AKuznetsov <akuznet...@gridgain.com> Authored: Tue Apr 7 09:15:09 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Tue Apr 7 09:15:09 2015 +0700 ---------------------------------------------------------------------- assembly/release-fabric.xml | 5 - modules/clients/readme.md | 2 - .../cache/eviction/fifo/FifoEvictionPolicy.java | 58 ++- .../eviction/fifo/FifoEvictionPolicyMBean.java | 16 + .../apache/ignite/internal/GridComponent.java | 2 +- .../ignite/internal/GridKernalContextImpl.java | 3 +- .../ignite/internal/GridPluginComponent.java | 4 +- .../org/apache/ignite/internal/IgniteEx.java | 7 - .../apache/ignite/internal/IgniteKernal.java | 27 +- .../ignite/internal/IgniteNodeAttributes.java | 3 - .../internal/managers/GridManagerAdapter.java | 6 +- .../processors/GridProcessorAdapter.java | 2 +- .../processors/cache/CacheDistributionMode.java | 67 ---- .../internal/processors/cache/CacheType.java | 77 ++++ .../cache/DynamicCacheChangeRequest.java | 17 + .../cache/DynamicCacheDescriptor.java | 15 +- .../processors/cache/GridCacheAdapter.java | 6 +- .../processors/cache/GridCacheContext.java | 26 +- .../cache/GridCacheDeploymentManager.java | 2 +- .../processors/cache/GridCacheEventManager.java | 4 +- .../processors/cache/GridCacheProcessor.java | 139 ++++--- .../cache/GridCacheSharedContext.java | 4 +- .../dht/GridDhtTransactionalCacheAdapter.java | 4 +- .../near/GridNearTransactionalCache.java | 2 +- .../continuous/CacheContinuousQueryManager.java | 2 +- .../transactions/IgniteTransactionsImpl.java | 19 +- .../transactions/IgniteTxLocalAdapter.java | 2 +- .../cache/transactions/IgniteTxManager.java | 8 +- .../DiscoveryNodeValidationProcessor.java | 27 ++ .../OsDiscoveryNodeValidationProcessor.java | 72 ++++ .../processors/query/GridQueryProcessor.java | 8 +- .../processors/task/GridTaskProcessor.java | 24 +- .../ignite/internal/util/IgniteUtils.java | 46 ++- .../internal/visor/util/VisorTaskUtils.java | 18 +- .../ignite/spi/IgniteNodeValidationResult.java | 66 ++++ .../org/apache/ignite/spi/IgniteSpiAdapter.java | 2 +- .../org/apache/ignite/spi/IgniteSpiContext.java | 2 +- .../spi/IgniteSpiNodeValidationResult.java | 66 ---- .../spi/discovery/tcp/TcpDiscoverySpi.java | 106 +---- .../org/apache/ignite/stream/StreamVisitor.java | 2 +- .../cache/IgniteDynamicCacheStartSelfTest.java | 47 +-- .../cache/IgniteInternalCacheTypesTest.java | 159 ++++++++ .../IgniteCollectionAbstractTest.java | 23 -- .../IgniteCacheSystemTransactionsSelfTest.java | 3 +- ...GridCacheDhtEvictionNearReadersSelfTest.java | 2 +- .../near/GridCacheNearEvictionSelfTest.java | 2 +- ...ePartitionedBasicStoreMultiNodeSelfTest.java | 8 +- ...NearDisabledBasicStoreMultiNodeSelfTest.java | 8 +- .../eviction/GridCacheEvictionAbstractTest.java | 5 +- ...ridCacheFifoBatchEvictionPolicySelfTest.java | 385 +++++++++++++++++++ .../processors/igfs/IgfsStartCacheTest.java | 158 ++++++++ .../processors/igfs/IgsfStartCacheTest.java | 115 ------ .../loadtests/hashmap/GridCacheTestContext.java | 1 + .../testframework/GridSpiTestContext.java | 2 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 2 + .../ignite/testsuites/IgniteIgfsTestSuite.java | 2 + .../HadoopDefaultMapReducePlannerSelfTest.java | 5 - .../query/h2/sql/GridSqlQuerySplitter.java | 22 +- .../h2/twostep/GridReduceQueryExecutor.java | 13 +- .../cache/IgniteCacheAbstractQuerySelfTest.java | 6 +- ...niteCacheAtomicNearEnabledQuerySelfTest.java | 7 +- .../near/IgniteCacheAtomicQuerySelfTest.java | 7 +- .../query/h2/sql/GridQueryParsingTest.java | 1 + .../query/h2/sql/IgniteVsH2QueryTest.java | 7 + modules/schedule/pom.xml | 20 + modules/yardstick/README.md | 3 +- .../yardstick/IgniteAbstractBenchmark.java | 5 +- .../yardstick/IgniteBenchmarkArguments.java | 22 +- .../org/apache/ignite/yardstick/IgniteNode.java | 11 +- parent/pom.xml | 49 +-- pom.xml | 143 ++++++- 71 files changed, 1578 insertions(+), 633 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b1898776/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b1898776/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ----------------------------------------------------------------------
