Merge branch 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-51
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dfba5bf0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dfba5bf0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dfba5bf0 Branch: refs/heads/ignite-96 Commit: dfba5bf0790c41821721efe427ea94e07db6f409 Parents: d9f4e3b ce0c94a Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Mon Feb 9 15:44:48 2015 -0800 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Mon Feb 9 15:44:48 2015 -0800 ---------------------------------------------------------------------- bin/ignite-schema-load.bat | 2 +- bin/ignite-schema-load.sh | 2 +- .../HibernateL2CacheExampleNodeStartup.java | 1 - .../datastructures/IgniteQueueExample.java | 2 +- .../datastructures/IgniteSetExample.java | 2 +- .../singlesplit/SingleSplitsLoadTest.java | 4 - .../gridify/GridifySingleSplitLoadTest.java | 2 - .../ClientAbstractMultiNodeSelfTest.java | 26 +- .../internal/TaskEventSubjectIdSelfTest.java | 2 +- .../JettyRestProcessorAbstractSelfTest.java | 2 +- .../rest/RestProcessorMultiStartSelfTest.java | 2 +- .../ignite/jdbc/JdbcComplexQuerySelfTest.java | 2 +- .../ignite/jdbc/JdbcEmptyCacheSelfTest.java | 2 +- .../ignite/jdbc/JdbcLocalCachesSelfTest.java | 2 +- .../ignite/jdbc/JdbcMetadataSelfTest.java | 2 +- .../jdbc/JdbcPreparedStatementSelfTest.java | 2 +- .../ignite/jdbc/JdbcResultSetSelfTest.java | 2 +- .../ignite/jdbc/JdbcStatementSelfTest.java | 2 +- .../src/test/resources/spring-server-node.xml | 35 +- .../test/resources/spring-server-ssl-node.xml | 35 +- .../java/org/apache/ignite/IgniteCache.java | 2 - .../apache/ignite/cache/CacheProjection.java | 39 + .../cache/query/QueryAffinityPredicate.java | 3 + .../cache/query/QueryContinuousPredicate.java | 3 + .../ignite/cache/query/QuerySqlPredicate.java | 3 + .../ignite/cache/query/QueryTextPredicate.java | 3 + .../client/impl/GridClientThreadFactory.java | 2 +- .../ComputeExecutionRejectedException.java | 2 +- .../ClientConnectionConfiguration.java | 66 +- .../configuration/IgniteConfiguration.java | 407 +---- .../configuration/TransactionConfiguration.java | 3 + .../DataStructureRemovedException.java | 61 - .../ignite/internal/ClusterGroupAdapter.java | 6 + .../apache/ignite/internal/ClusterGroupEx.java | 9 + .../apache/ignite/internal/GridDiagnostic.java | 2 +- .../ignite/internal/GridJobContextImpl.java | 2 +- .../ignite/internal/GridKernalContext.java | 44 + .../ignite/internal/GridKernalContextImpl.java | 88 +- .../apache/ignite/internal/GridProperties.java | 4 - .../apache/ignite/internal/IgniteKernal.java | 54 +- .../org/apache/ignite/internal/IgnitionEx.java | 275 +-- .../managers/communication/GridIoManager.java | 14 +- .../swapspace/GridSwapSpaceManager.java | 17 + .../processors/cache/CacheEntryImpl0.java | 60 + .../cache/CacheStorePartialUpdateException.java | 3 + .../cache/CacheWeakQueryIteratorsHolder.java | 7 +- .../processors/cache/GridCacheAdapter.java | 591 ++++++- .../processors/cache/GridCacheMapEntry.java | 2 +- .../cache/GridCacheProjectionImpl.java | 33 +- .../processors/cache/GridCacheProxyImpl.java | 73 + .../processors/cache/GridCacheSwapManager.java | 206 +++ .../processors/cache/GridCacheUtils.java | 6 +- .../processors/cache/IgniteCacheProxy.java | 56 +- .../distributed/GridCacheTtlUpdateRequest.java | 3 + .../GridDistributedCacheAdapter.java | 71 +- .../distributed/dht/GridDhtCacheAdapter.java | 80 +- .../distributed/near/GridNearAtomicCache.java | 5 + .../distributed/near/GridNearCacheAdapter.java | 8 + .../processors/cache/local/GridLocalCache.java | 12 + .../local/atomic/GridLocalAtomicCache.java | 11 + .../cache/query/GridCacheSqlQuery.java | 3 + .../cache/query/GridCacheTwoStepQuery.java | 3 + .../cache/transactions/IgniteTxKey.java | 3 + .../transactions/IgniteTxMetricsAdapter.java | 3 + .../closure/GridClosureProcessor.java | 21 +- .../datastructures/GridCacheAtomicLongImpl.java | 7 +- .../GridCacheAtomicReferenceImpl.java | 7 +- .../GridCacheAtomicSequenceImpl.java | 7 +- .../GridCacheAtomicStampedImpl.java | 7 +- .../datastructures/GridCacheQueueAdapter.java | 9 +- .../datastructures/GridCacheSetImpl.java | 5 +- .../datastructures/GridCacheSetProxy.java | 3 +- .../processors/fs/GridGgfsDataManager.java | 2 +- .../internal/processors/fs/GridGgfsImpl.java | 8 +- .../hadoop/GridHadoopJobProperty.java | 2 +- .../processors/job/GridJobProcessor.java | 2 +- .../offheap/GridOffHeapProcessor.java | 15 + .../processors/query/GridQueryProcessor.java | 2 +- .../processors/rest/GridRestProcessor.java | 2 +- .../processors/task/GridTaskProcessor.java | 4 +- .../ignite/internal/util/IgniteUtils.java | 26 +- .../internal/util/future/IgniteFutureImpl.java | 3 + .../ignite/internal/util/lang/GridFunc.java | 149 ++ .../internal/util/offheap/GridOffHeapMap.java | 7 + .../util/offheap/GridOffHeapPartitionedMap.java | 11 + .../util/offheap/unsafe/GridUnsafeMap.java | 12 +- .../unsafe/GridUnsafePartitionedMap.java | 10 + .../util/portscanner/GridJmxPortFinder.java | 2 +- .../node/VisorExecutorServiceConfiguration.java | 149 +- .../org/apache/ignite/lang/IgniteBiTuple.java | 4 +- .../optimized/optimized-classnames.properties | 1657 ++++++++++++++++++ .../jobstealing/JobStealingCollisionSpi.java | 16 +- .../spi/collision/noop/NoopCollisionSpi.java | 2 +- .../WeightedRandomLoadBalancingSpi.java | 4 +- .../ignite/spi/swapspace/SwapSpaceSpi.java | 11 + .../spi/swapspace/file/FileSwapSpaceSpi.java | 27 + .../spi/swapspace/noop/NoopSwapSpaceSpi.java | 5 + .../test/config/default-spring-url-testing.xml | 2 - modules/core/src/test/config/example-cache.xml | 2 - .../src/test/config/io-manager-benchmark.xml | 1 - .../src/test/config/job-loadtest/client.xml | 41 +- .../src/test/config/job-loadtest/server.xml | 15 +- modules/core/src/test/config/jobs-load-base.xml | 28 +- .../src/test/config/load/cache-benchmark.xml | 2 - .../test/config/load/cache-client-benchmark.xml | 2 - .../core/src/test/config/load/dsi-load-base.xml | 28 +- .../src/test/config/load/merge-sort-base.xml | 41 +- .../test/config/loaders/grid-cfg-2-grids.xml | 4 - .../core/src/test/config/loaders/grid-cfg.xml | 5 - .../config/spring-cache-put-remove-load.xml | 2 - .../core/src/test/config/spring-multicache.xml | 39 +- .../src/test/config/spring-start-nodes-attr.xml | 2 - .../core/src/test/config/spring-start-nodes.xml | 2 - .../config/streamer/spring-streamer-base.xml | 2 - .../test/config/websession/spring-cache-1.xml | 2 - .../test/config/websession/spring-cache-2.xml | 2 - .../test/config/websession/spring-cache-3.xml | 2 - .../store/jdbc/CacheJdbcPojoStoreTest.java | 22 +- ...eJdbcStoreAbstractMultithreadedSelfTest.java | 27 +- .../internal/GridCancelUnusedJobSelfTest.java | 9 +- .../internal/GridDiscoveryEventSelfTest.java | 2 - .../internal/GridManagementJobSelfTest.java | 168 -- .../ignite/internal/GridStartStopSelfTest.java | 6 - .../cache/GridCacheAbstractFullApiSelfTest.java | 228 ++- .../GridCacheAbstractIteratorsSelfTest.java | 2 - .../cache/GridCacheAbstractSelfTest.java | 10 +- .../GridCacheDaemonNodeAbstractSelfTest.java | 2 - .../cache/GridCacheDeploymentSelfTest.java | 2 - .../cache/GridCacheLuceneQueryIndexTest.java | 1 - .../IgniteCacheAtomicLocalPeekModesTest.java | 43 + .../cache/IgniteCacheAtomicLocalPeekTest.java | 43 - .../cache/IgniteCacheAtomicPeekModesTest.java | 49 + .../cache/IgniteCacheAtomicPeekTest.java | 49 - ...gniteCacheAtomicReplicatedPeekModesTest.java | 32 + .../IgniteCacheAtomicReplicatedPeekTest.java | 32 - .../cache/IgniteCachePeekAbstractTest.java | 333 ---- .../cache/IgniteCachePeekModesAbstractTest.java | 1131 ++++++++++++ .../cache/IgniteCacheTxLocalPeekModesTest.java | 43 + .../cache/IgniteCacheTxLocalPeekTest.java | 43 - .../cache/IgniteCacheTxPeekModesTest.java | 49 + .../processors/cache/IgniteCacheTxPeekTest.java | 49 - .../IgniteCacheTxReplicatedPeekModesTest.java | 32 + .../cache/IgniteCacheTxReplicatedPeekTest.java | 32 - ...CacheAtomicReferenceApiSelfAbstractTest.java | 3 +- ...idCacheAtomicStampedApiSelfAbstractTest.java | 3 +- .../GridCacheQueueApiSelfAbstractTest.java | 4 +- ...GridCacheQueueMultiNodeAbstractSelfTest.java | 19 +- ...CacheQueueRotativeMultiNodeAbstractTest.java | 3 +- .../GridCacheSequenceApiSelfAbstractTest.java | 3 +- .../GridCacheSetAbstractSelfTest.java | 9 +- .../IgniteAtomicLongApiAbstractSelfTest.java | 3 +- ...dCacheMultithreadedFailoverAbstractTest.java | 1 - .../GridCachePreloadLifecycleAbstractTest.java | 9 +- ...tomicClientOnlyMultiNodeFullApiSelfTest.java | 16 +- ...eAtomicNearOnlyMultiNodeFullApiSelfTest.java | 5 +- ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 221 ++- .../GridCacheNearReaderPreloadSelfTest.java | 1 - ...achePartitionedMultiNodeFullApiSelfTest.java | 18 +- .../local/GridCacheLocalIteratorsSelfTest.java | 80 - .../dataload/GridDataLoaderPerformanceTest.java | 2 - ...heGgfsPerBlockLruEvictionPolicySelfTest.java | 2 - .../processors/fs/GridGgfsAbstractSelfTest.java | 7 +- .../fs/GridGgfsDualAbstractSelfTest.java | 2 +- .../processors/fs/GridGgfsModesSelfTest.java | 138 +- .../cache/GridCacheCommandHandlerSelfTest.java | 6 +- .../GridServiceReassignmentSelfTest.java | 17 +- ...dStartupWithUndefinedIgniteHomeSelfTest.java | 1 - .../util/future/GridFutureAdapterSelfTest.java | 8 +- .../offheap/GridOffHeapMapAbstractSelfTest.java | 52 +- .../cache/GridCacheSingleNodeLoadTest.java | 6 +- .../loadtests/colocation/spring-colocation.xml | 26 +- .../multisplit/GridMultiSplitsLoadTest.java | 2 - .../GridMultiSplitsRedeployLoadTest.java | 2 - ...ridSingleSplitsNewNodesAbstractLoadTest.java | 9 +- .../GridSingleSplitsRedeployLoadTest.java | 2 - ...SessionCancelSiblingsFromFutureSelfTest.java | 9 +- ...ridSessionCancelSiblingsFromJobSelfTest.java | 9 +- ...idSessionCancelSiblingsFromTaskSelfTest.java | 9 +- ...GridSessionJobWaitTaskAttributeSelfTest.java | 10 +- .../GridSessionSetFutureAttributeSelfTest.java | 9 +- ...nSetFutureAttributeWaitListenerSelfTest.java | 9 +- .../GridSessionSetJobAttributeSelfTest.java | 10 +- ...sionSetJobAttributeWaitListenerSelfTest.java | 9 +- .../GridSessionWaitAttributeSelfTest.java | 10 +- .../spi/GridTcpSpiForwardingSelfTest.java | 1 - .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 2 - .../tcp/TcpDiscoverySnapshotHistoryTest.java | 1 - .../inmemory/GridTestSwapSpaceSpi.java | 41 + .../ignite/testframework/GridTestUtils.java | 2 +- .../testframework/junits/GridAbstractTest.java | 2 - .../junits/GridTestKernalContext.java | 26 + .../IgniteCacheFullApiSelfTestSuite.java | 2 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 12 +- .../testsuites/IgniteComputeGridTestSuite.java | 1 - .../src/test/resources/load/html/index.html | 958 ---------- .../resources/load/js/gg-loadtest-server.js | 96 - .../client/hadoop/GridHadoopClientProtocol.java | 4 +- .../processors/hadoop/GridHadoopSetup.java | 2 +- .../processors/hadoop/GridHadoopUtils.java | 8 +- .../counter/GridHadoopFSCounterWriter.java | 2 +- .../GridHadoopExternalTaskExecutor.java | 2 +- .../GridGgfsHadoopDualAbstractSelfTest.java | 1 - ...idGgfsHadoopFileSystemHandshakeSelfTest.java | 1 - ...GgfsHadoopFileSystemLoggerStateSelfTest.java | 1 - .../hadoop/GridHadoopAbstractSelfTest.java | 7 +- ...idHadoopDefaultMapReducePlannerSelfTest.java | 5 + .../hadoop/GridHadoopPopularWordsTest.java | 4 +- .../processors/hadoop/GridHadoopStartup.java | 2 +- .../h2/twostep/GridReduceQueryExecutor.java | 3 + .../twostep/messages/GridNextPageRequest.java | 3 + .../twostep/messages/GridNextPageResponse.java | 3 + .../query/h2/twostep/messages/GridQueryAck.java | 3 + .../twostep/messages/GridQueryFailResponse.java | 3 + .../h2/twostep/messages/GridQueryRequest.java | 3 + .../log4j/GridLog4jCorrectFileNameTest.java | 1 - .../http/jetty/GridJettyRestHandler.java | 6 +- .../rest/protocols/http/jetty/rest.html | 4 +- .../apache/ignite/schema/ui/SchemaLoadApp.java | 245 ++- .../ignite/internal/GridFactorySelfTest.java | 11 +- .../GridSpringBeanSerializationSelfTest.java | 2 - .../config/VisorConfigurationCommand.scala | 4 - .../scala/org/apache/ignite/visor/visor.scala | 8 +- .../yardstick/config/benchmark-store.properties | 2 +- modules/yardstick/config/ignite-base-config.xml | 2 - .../yardstick/config/ignite-store-config.xml | 2 - .../jdbc/IgniteJdbcStoreAbstractBenchmark.java | 2 + pom.xml | 50 +- 227 files changed, 5884 insertions(+), 3760 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dfba5bf0/modules/clients/src/test/resources/spring-server-node.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dfba5bf0/modules/clients/src/test/resources/spring-server-ssl-node.xml ---------------------------------------------------------------------- diff --cc modules/clients/src/test/resources/spring-server-ssl-node.xml index f05a625,0989154..3db6f48 --- a/modules/clients/src/test/resources/spring-server-ssl-node.xml +++ b/modules/clients/src/test/resources/spring-server-ssl-node.xml @@@ -291,44 -288,16 +288,16 @@@ Explicitly set custom public and system thread pools to increase possible started nodes count in one VM. --> - <property name="executorService"> - <bean class="org.apache.ignite.thread.IgniteThreadPoolExecutor"> - <constructor-arg value="SERVER"/> - <constructor-arg type="int" value="15"/> - <constructor-arg type="int" value="15"/> - <constructor-arg type="long"> - <util:constant static-field="java.lang.Long.MAX_VALUE"/> - </constructor-arg> - <constructor-arg type="java.util.concurrent.BlockingQueue"> - <bean class="java.util.concurrent.LinkedBlockingQueue"/> - </constructor-arg> - </bean> - </property> - - <property name="executorServiceShutdown" value="true"/> - - <property name="systemExecutorService"> - <bean class="org.apache.ignite.thread.IgniteThreadPoolExecutor"> - <constructor-arg value="SYS-SERVER"/> - <constructor-arg type="int" value="15"/> - <constructor-arg type="int" value="15"/> - <constructor-arg type="long"> - <util:constant static-field="java.lang.Long.MAX_VALUE"/> - </constructor-arg> - <constructor-arg type="java.util.concurrent.BlockingQueue"> - <bean class="java.util.concurrent.LinkedBlockingQueue"/> - </constructor-arg> - </bean> - </property> + <property name="publicThreadPoolSize" value="15"/> - <property name="systemExecutorServiceShutdown" value="true"/> + <property name="systemThreadPoolSize" value="15"/> <property name="portableConfiguration"> - <bean class="org.apache.ignite.portables.PortableConfiguration"> + <bean class="org.gridgain.grid.portables.PortableConfiguration"> <property name="typeConfigurations"> <list> - <bean class="org.apache.ignite.portables.PortableTypeConfiguration"> - <property name="className" value="org.apache.ignite.client.ClientTestPortable"/> + <bean class="org.gridgain.grid.portables.PortableTypeConfiguration"> + <property name="className" value="org.gridgain.client.ClientTestPortable"/> </bean> </list> </property> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dfba5bf0/modules/core/src/main/java/org/apache/ignite/IgniteCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dfba5bf0/modules/core/src/main/java/org/apache/ignite/cache/CacheProjection.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dfba5bf0/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java index 014daba,a07092b..31a4fb0 --- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java @@@ -599,12 -569,11 +565,10 @@@ public class IgniteConfiguration p2pEnabled = cfg.isPeerClassLoadingEnabled(); p2pLocClsPathExcl = cfg.getPeerClassLoadingLocalClassPathExclude(); p2pMissedCacheSize = cfg.getPeerClassLoadingMissedResourcesCacheSize(); - p2pSvc = cfg.getPeerClassLoadingExecutorService(); - p2pSvcShutdown = cfg.getPeerClassLoadingExecutorServiceShutdown(); + p2pPoolSize = cfg.getPeerClassLoadingThreadPoolSize(); pluginCfgs = cfg.getPluginConfigurations(); - portableCfg = cfg.getPortableConfiguration(); qryCfg = cfg.getQueryConfiguration(); restAccessibleFolders = cfg.getRestAccessibleFolders(); - restEnabled = cfg.isRestEnabled(); restIdleTimeout = cfg.getRestIdleTimeout(); restPortRange = cfg.getRestPortRange(); restSecretKey = cfg.getRestSecretKey(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dfba5bf0/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dfba5bf0/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dfba5bf0/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dfba5bf0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dfba5bf0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dfba5bf0/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dfba5bf0/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dfba5bf0/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dfba5bf0/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java ----------------------------------------------------------------------
