Merge remote-tracking branch 'remotes/apache-main/master' into ignite-1272
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c2c61704 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c2c61704 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c2c61704 Branch: refs/heads/ignite-1272 Commit: c2c61704aa34ccc025104398cddf377a19ddfaee Parents: 645a355 6844370 Author: Denis Magda <[email protected]> Authored: Mon Oct 12 20:52:06 2015 +0300 Committer: Denis Magda <[email protected]> Committed: Mon Oct 12 20:52:06 2015 +0300 ---------------------------------------------------------------------- .../JettyRestProcessorAbstractSelfTest.java | 225 +++ .../org/apache/ignite/IgniteTransactions.java | 4 - .../discovery/GridDiscoveryManager.java | 53 +- .../internal/portable/PortableContext.java | 7 + .../portable/api/PortableMarshaller.java | 14 +- .../processors/cache/GridCacheIoManager.java | 27 +- .../processors/cache/GridCacheProcessor.java | 31 +- .../dht/GridClientPartitionTopology.java | 13 +- .../distributed/dht/GridDhtLocalPartition.java | 3 +- .../dht/GridDhtPartitionTopologyImpl.java | 12 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 8 +- .../colocated/GridDhtColocatedLockFuture.java | 11 +- .../GridDhtPartitionDemandMessage.java | 4 +- .../GridDhtPartitionSupplyMessage.java | 3 +- .../GridDhtPartitionsExchangeFuture.java | 12 +- .../preloader/GridDhtPartitionsFullMessage.java | 12 +- .../GridDhtPartitionsSingleMessage.java | 11 +- .../dht/preloader/GridDhtPreloader.java | 18 +- .../distributed/near/GridNearLockFuture.java | 11 +- .../near/GridNearOptimisticTxPrepareFuture.java | 24 +- .../cache/query/GridCacheQueryManager.java | 33 +- .../cache/query/GridCacheSqlIndexMetadata.java | 7 +- .../cache/query/GridCacheSqlMetadata.java | 22 +- .../datastructures/DataStructuresProcessor.java | 48 +- .../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 -- .../ignite/internal/util/GridJavaProcess.java | 12 +- .../ignite/internal/util/lang/GridFunc.java | 12 + .../apache/ignite/marshaller/Marshaller.java | 2 +- .../optimized/OptimizedMarshallerUtils.java | 6 +- .../communication/tcp/TcpCommunicationSpi.java | 22 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 486 ++++--- .../IgniteCacheConfigurationTemplateTest.java | 31 + .../CacheGetFutureHangsSelfTest.java | 3 + .../CacheNoValueClassOnServerNodeTest.java | 1 + ...niteCacheClientNodeChangingTopologyTest.java | 6 +- .../dht/GridCacheDhtPreloadPerformanceTest.java | 133 ++ ...gniteAtomicLongChangingTopologySelfTest.java | 155 +- ...tomicClientOnlyMultiNodeFullApiSelfTest.java | 71 +- .../near/GridCacheNearTxForceKeyTest.java | 2 +- ...achePartitionedMultiNodeFullApiSelfTest.java | 129 +- .../testframework/junits/GridAbstractTest.java | 116 +- .../junits/IgniteTestResources.java | 8 +- .../junits/common/GridCommonAbstractTest.java | 15 +- .../junits/multijvm/AffinityProcessProxy.java | 440 ++++-- .../multijvm/IgniteCacheProcessProxy.java | 1346 ++++++++++++++---- .../multijvm/IgniteClusterProcessProxy.java | 115 +- .../multijvm/IgniteEventsProcessProxy.java | 50 +- .../junits/multijvm/IgniteNodeRunner.java | 39 +- .../junits/multijvm/IgniteProcessProxy.java | 107 +- .../cache/CacheConfigurationP2PTest.java | 3 + .../http/jetty/GridJettyJsonConfig.java | 158 +- .../http/jetty/GridJettyRestHandler.java | 186 +-- .../visor/commands/kill/VisorKillCommand.scala | 2 +- .../scala/org/apache/ignite/visor/visor.scala | 1 - 60 files changed, 3785 insertions(+), 1397 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/c2c61704/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/c2c61704/modules/core/src/main/java/org/apache/ignite/internal/portable/api/PortableMarshaller.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/c2c61704/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java ----------------------------------------------------------------------
