Merge remote-tracking branch 'remotes/origin/master' into ignite-1093-2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e74a20f5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e74a20f5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e74a20f5 Branch: refs/heads/ignite-1093-2 Commit: e74a20f50d3f279208b5bd482ed8644e276563a9 Parents: 8ea00ea 6844370 Author: Anton Vinogradov <[email protected]> Authored: Tue Oct 13 18:14:19 2015 +0300 Committer: Anton Vinogradov <[email protected]> Committed: Tue Oct 13 18:14:19 2015 +0300 ---------------------------------------------------------------------- .../JettyRestProcessorAbstractSelfTest.java | 225 ++++++++++++ .../org/apache/ignite/IgniteTransactions.java | 4 - .../discovery/GridDiscoveryManager.java | 36 +- .../processors/cache/GridCacheIoManager.java | 29 +- .../processors/cache/GridCacheProcessor.java | 31 +- .../dht/GridClientPartitionTopology.java | 13 +- .../distributed/dht/GridDhtLocalPartition.java | 3 +- .../dht/GridDhtPartitionTopologyImpl.java | 12 +- .../GridDhtPartitionDemandMessage.java | 4 +- .../GridDhtPartitionSupplyMessage.java | 3 +- .../GridDhtPartitionsExchangeFuture.java | 12 +- .../preloader/GridDhtPartitionsFullMessage.java | 12 +- .../GridDhtPartitionsSingleMessage.java | 11 +- .../dht/preloader/GridDhtPreloader.java | 18 +- .../cache/query/GridCacheQueryManager.java | 33 +- .../cache/query/GridCacheSqlIndexMetadata.java | 7 +- .../cache/query/GridCacheSqlMetadata.java | 22 +- .../processors/rest/GridRestCommand.java | 8 +- .../processors/rest/GridRestProcessor.java | 16 +- .../handlers/cache/GridCacheCommandHandler.java | 362 ++++++++++--------- .../handlers/query/QueryCommandHandler.java | 195 +++++++--- .../top/GridTopologyCommandHandler.java | 31 +- .../rest/request/RestQueryRequest.java | 175 +++++++++ .../rest/request/RestSqlQueryRequest.java | 125 ------- .../communication/tcp/TcpCommunicationSpi.java | 22 +- .../IgniteCacheConfigurationTemplateTest.java | 31 ++ .../dht/GridCacheDhtPreloadPerformanceTest.java | 133 +++++++ .../near/GridCacheNearTxForceKeyTest.java | 2 +- .../http/jetty/GridJettyJsonConfig.java | 158 +++++++- .../http/jetty/GridJettyRestHandler.java | 186 +++++----- 30 files changed, 1383 insertions(+), 536 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/e74a20f5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/e74a20f5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/e74a20f5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/e74a20f5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java index 590d034,848ad87..885b0dd --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java @@@ -329,7 -320,7 +327,7 @@@ public class GridDhtPartitionDemandMess /** {@inheritDoc} */ @Override public String toString() { - return S.toString(GridDhtPartitionDemandMessage.class, this, "partCnt", parts.size(), "super", + return S.toString(GridDhtPartitionDemandMessage.class, this, "partCnt", parts != null ? parts.size() : 0, "super", super.toString()); } - } + } http://git-wip-us.apache.org/repos/asf/ignite/blob/e74a20f5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java ----------------------------------------------------------------------
