ignite-1607 merge from master
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/236344c5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/236344c5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/236344c5 Branch: refs/heads/ignite-1607 Commit: 236344c5228dd418c86cf3842b6af193a67ecb7e Parents: 3b7c71d 075e7d0 Author: sboikov <[email protected]> Authored: Mon Oct 12 14:50:34 2015 +0300 Committer: sboikov <[email protected]> Committed: Mon Oct 12 14:50:34 2015 +0300 ---------------------------------------------------------------------- .../JettyRestProcessorAbstractSelfTest.java | 252 +++- .../apache/ignite/IgniteSystemProperties.java | 3 + .../org/apache/ignite/IgniteTransactions.java | 4 - .../discovery/GridDiscoveryManager.java | 532 ++++++- .../internal/portable/PortableContext.java | 7 + .../portable/api/PortableMarshaller.java | 14 +- .../processors/cache/GridCacheProcessor.java | 48 +- .../distributed/dht/GridDhtLockRequest.java | 5 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 8 +- .../colocated/GridDhtColocatedLockFuture.java | 11 +- .../distributed/near/GridNearLockFuture.java | 11 +- .../near/GridNearOptimisticTxPrepareFuture.java | 26 +- .../cache/query/GridCacheQueryManager.java | 74 +- .../cache/query/GridCacheSqlIndexMetadata.java | 7 +- .../cache/query/GridCacheSqlMetadata.java | 22 +- .../datastructures/DataStructuresProcessor.java | 48 +- .../processors/rest/GridRestCommand.java | 8 +- .../processors/rest/GridRestProcessor.java | 411 +++++- .../handlers/cache/GridCacheCommandHandler.java | 364 ++--- .../handlers/query/QueryCommandHandler.java | 195 ++- .../top/GridTopologyCommandHandler.java | 160 ++- .../rest/request/RestQueryRequest.java | 175 +++ .../rest/request/RestSqlQueryRequest.java | 125 -- .../ignite/internal/util/GridJavaProcess.java | 12 +- .../ignite/internal/util/IgniteUtils.java | 2 +- .../ignite/internal/util/lang/GridFunc.java | 12 + .../apache/ignite/marshaller/Marshaller.java | 2 +- .../optimized/OptimizedMarshallerUtils.java | 6 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 486 ++++--- .../GridCacheDeploymentOffHeapSelfTest.java | 15 + .../CacheGetFutureHangsSelfTest.java | 3 + .../CacheNoValueClassOnServerNodeTest.java | 1 + ...niteCacheClientNodeChangingTopologyTest.java | 6 +- ...gniteAtomicLongChangingTopologySelfTest.java | 155 +- ...tomicClientOnlyMultiNodeFullApiSelfTest.java | 71 +- ...achePartitionedMultiNodeFullApiSelfTest.java | 129 +- ...bledFairAffinityMultiJvmFullApiSelfTest.java | 5 + ...tomicNearEnabledMultiJvmFullApiSelfTest.java | 5 + .../tcp/TcpClientDiscoverySpiSelfTest.java | 2 + .../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 +- .../ignite/igfs/Hadoop1DualAbstractTest.java | 5 + .../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 - modules/yardstick/pom.xml | 10 +- 55 files changed, 4633 insertions(+), 1390 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/236344c5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/236344c5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java index 0646aac,1fb33a2..4dc8a84 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java @@@ -449,7 -450,10 +450,10 @@@ public class GridNearOptimisticTxPrepar return; } - prepare(Collections.<IgniteTxEntry>emptyList(), tx.writeEntries()); + prepare( - tx.optimistic() && tx.serializable() ? tx.readEntries() : Collections.<IgniteTxEntry>emptyList(), ++ Collections.<IgniteTxEntry>emptyList(), + tx.writeEntries(), + topLocked); markInitialized(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/236344c5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/236344c5/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java ----------------------------------------------------------------------
