Merge branch 'sprint-1' into ignite-160
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e0ca5b61 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e0ca5b61 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e0ca5b61 Branch: refs/heads/ignite-96 Commit: e0ca5b61f6768e3b6aed919efeaf19d3fa8d6291 Parents: 62cb1e4 148753c Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Mon Feb 9 16:12:28 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Mon Feb 9 16:18:51 2015 +0300 ---------------------------------------------------------------------- .../JettyRestProcessorAbstractSelfTest.java | 2 +- .../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 +- .../ClientConnectionConfiguration.java | 12 +- .../configuration/TransactionConfiguration.java | 3 + .../apache/ignite/internal/GridDiagnostic.java | 2 +- .../apache/ignite/internal/GridProperties.java | 4 - .../org/apache/ignite/internal/IgnitionEx.java | 2 +- .../cache/CacheStorePartialUpdateException.java | 3 + .../cache/CacheWeakQueryIteratorsHolder.java | 3 + .../processors/cache/GridCacheAdapter.java | 12 + .../processors/cache/GridCacheMapEntry.java | 2 +- .../processors/cache/IgniteCacheProxy.java | 2 +- .../distributed/GridCacheTtlUpdateRequest.java | 3 + .../cache/query/GridCacheSqlQuery.java | 3 + .../cache/query/GridCacheTwoStepQuery.java | 3 + .../cache/transactions/IgniteTxKey.java | 3 + .../transactions/IgniteTxMetricsAdapter.java | 3 + .../closure/GridClosureProcessor.java | 15 + .../internal/processors/fs/GridGgfsImpl.java | 8 +- .../hadoop/GridHadoopJobProperty.java | 2 +- .../ignite/internal/util/IgniteUtils.java | 26 +- .../internal/util/future/IgniteFutureImpl.java | 3 + .../util/portscanner/GridJmxPortFinder.java | 2 +- .../optimized/optimized-classnames.properties | 1657 ++++++++++++++++++ .../jobstealing/JobStealingCollisionSpi.java | 16 +- .../WeightedRandomLoadBalancingSpi.java | 4 +- ...eJdbcStoreAbstractMultithreadedSelfTest.java | 9 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 31 +- .../GridCacheAbstractIteratorsSelfTest.java | 2 - ...acheEntrySetIterationPreloadingSelfTest.java | 3 +- ...tomicClientOnlyMultiNodeFullApiSelfTest.java | 3 +- ...achePartitionedMultiNodeFullApiSelfTest.java | 18 +- .../local/GridCacheLocalIteratorsSelfTest.java | 80 - .../processors/fs/GridGgfsAbstractSelfTest.java | 6 +- .../fs/GridGgfsDualAbstractSelfTest.java | 2 +- .../processors/fs/GridGgfsModesSelfTest.java | 136 +- .../GridServiceReassignmentSelfTest.java | 17 +- .../ignite/testframework/GridTestUtils.java | 2 +- .../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 +- .../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 + .../http/jetty/GridJettyRestHandler.java | 6 +- .../rest/protocols/http/jetty/rest.html | 4 +- .../ignite/internal/GridFactorySelfTest.java | 2 +- .../yardstick/config/benchmark-store.properties | 2 +- pom.xml | 50 +- 61 files changed, 1973 insertions(+), 1303 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e0ca5b61/modules/core/src/main/java/org/apache/ignite/configuration/ClientConnectionConfiguration.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/configuration/ClientConnectionConfiguration.java index 72d5720,14650d6..770d794 --- a/modules/core/src/main/java/org/apache/ignite/configuration/ClientConnectionConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/ClientConnectionConfiguration.java @@@ -101,8 -102,11 +101,8 @@@ public class ClientConnectionConfigurat /** Folders accessible by REST. */ private String[] restAccessibleFolders; - /** REST requests executor service. */ - private ExecutorService restExecSvc; - - /** REST executor service shutdown flag. */ - private boolean restSvcShutdown = true; + /** REST requests thread pool size. */ - private int restSvcPoolSz = DFLT_REST_CORE_THREAD_CNT; ++ private int restSvcPoolSize = DFLT_REST_CORE_THREAD_CNT; /** Client message interceptor. */ private ClientMessageInterceptor clientMsgInterceptor; @@@ -125,7 -129,8 +125,7 @@@ clientMsgInterceptor = cfg.getClientMessageInterceptor(); restAccessibleFolders = cfg.getRestAccessibleFolders(); - restSvcPoolSz = cfg.getRestThreadPoolSize(); - restExecSvc = cfg.getRestExecutorService(); - restSvcShutdown = cfg.isRestExecutorServiceShutdown(); ++ restSvcPoolSize = cfg.getRestThreadPoolSize(); restIdleTimeout = cfg.getRestIdleTimeout(); jettyPath = cfg.getRestJettyPath(); restPortRange = cfg.getRestPortRange(); @@@ -487,24 -492,55 +487,24 @@@ } /** - * Should return an instance of fully configured thread pool to be used for + * Should return a thread pool size to be used for * processing of client messages (REST requests). - * <p> - * If not provided, new executor service will be created using the following - * configuration: - * <ul> - * <li>Core pool size - {@link #DFLT_REST_CORE_THREAD_CNT}</li> - * <li>Max pool size - {@link #DFLT_REST_MAX_THREAD_CNT}</li> - * <li>Queue capacity - {@link #DFLT_REST_THREADPOOL_QUEUE_CAP}</li> - * </ul> - * - * @return Thread pool implementation to be used for processing of client - * messages. - */ - public ExecutorService getRestExecutorService() { - return restExecSvc; - } - - /** - * Sets thread pool to use for processing of client messages (REST requests). * - * @param restExecSvc Thread pool to use for processing of client messages. - * @see IgniteConfiguration#getRestExecutorService() - */ - public void setRestExecutorService(ExecutorService restExecSvc) { - this.restExecSvc = restExecSvc; - } - - /** - * Sets REST executor service shutdown flag. - * - * @param restSvcShutdown REST executor service shutdown flag. - * @see IgniteConfiguration#getRestExecutorService() + * @return Thread pool size to be used for processing of client + * messages. */ - public void setRestExecutorServiceShutdown(boolean restSvcShutdown) { - this.restSvcShutdown = restSvcShutdown; + public int getRestThreadPoolSize() { - return restSvcPoolSz; ++ return restSvcPoolSize; } /** - * Shutdown flag for REST executor service. - * <p> - * If not provided, default value {@code true} will be used which will shutdown - * executor service when Ignite stops regardless whether it was started before Ignition - * or by Ignition. + * Sets thread pool size to use for processing of client messages (REST requests). * - * @param restSvcPoolSz Thread pool size to use for processing of client messages. - * @return REST executor service shutdown flag. ++ * @param restSvcPoolSize Thread pool size to use for processing of client messages. + * @see #getRestThreadPoolSize() */ - public void setRestThreadPoolSize(int restSvcPoolSz) { - this.restSvcPoolSz = restSvcPoolSz; - public boolean isRestExecutorServiceShutdown() { - return restSvcShutdown; ++ public void setRestThreadPoolSize(int restSvcPoolSize) { ++ this.restSvcPoolSize = restSvcPoolSize; } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e0ca5b61/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e0ca5b61/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e0ca5b61/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e0ca5b61/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsModesSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e0ca5b61/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java ----------------------------------------------------------------------
