Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-gg-10837
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cc40e1f4 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cc40e1f4 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cc40e1f4 Branch: refs/heads/ignite-gg-10837 Commit: cc40e1f4e3b47b5226e9770e2244e8e6da38b32c Parents: 972a703 49c2988 Author: Tikhonov Nikolay <[email protected]> Authored: Thu Dec 24 16:46:55 2015 +0300 Committer: Tikhonov Nikolay <[email protected]> Committed: Thu Dec 24 16:46:55 2015 +0300 ---------------------------------------------------------------------- README.txt | 4 +- examples/pom.xml | 2 +- examples/schema-import/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/apache-license-gen/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/camel/pom.xml | 2 +- modules/clients/pom.xml | 2 +- .../JettyRestProcessorAbstractSelfTest.java | 25 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 2 +- .../ignite/internal/IgniteVersionUtils.java | 5 +- .../internal/binary/BinaryObjectImpl.java | 2 +- .../connection/GridClientNioTcpConnection.java | 17 +- .../managers/communication/GridIoManager.java | 39 +- .../processors/cache/GridCacheAdapter.java | 47 ++- .../processors/cache/GridCacheProcessor.java | 3 +- .../processors/cache/GridCacheProxyImpl.java | 29 ++ .../cache/GridCacheSharedContext.java | 10 +- .../processors/cache/IgniteCacheProxy.java | 35 ++ .../processors/cache/IgniteInternalCache.java | 26 ++ .../binary/CacheObjectBinaryProcessorImpl.java | 7 +- .../distributed/dht/GridDhtLockFuture.java | 2 +- .../dht/atomic/GridDhtAtomicCache.java | 8 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 149 ++++--- .../colocated/GridDhtColocatedLockFuture.java | 11 +- .../GridDhtPartitionsExchangeFuture.java | 20 +- .../distributed/near/GridNearLockFuture.java | 11 +- ...arOptimisticSerializableTxPrepareFuture.java | 5 +- .../near/GridNearOptimisticTxPrepareFuture.java | 5 +- ...ridNearOptimisticTxPrepareFutureAdapter.java | 20 +- .../query/GridCacheDistributedQueryManager.java | 6 +- .../transactions/IgniteTxLocalAdapter.java | 2 + .../cache/transactions/IgniteTxManager.java | 61 ++- .../datastreamer/DataStreamProcessor.java | 12 +- .../processors/query/GridQueryProcessor.java | 5 + .../client/message/GridClientCacheBean.java | 139 +++++++ .../rest/client/message/GridClientNodeBean.java | 70 ++-- .../top/GridTopologyCommandHandler.java | 38 +- .../ignite/internal/util/lang/GridFunc.java | 1 + .../util/nio/GridNioRecoveryDescriptor.java | 7 - .../ignite/internal/util/nio/GridNioServer.java | 7 + .../internal/visor/util/VisorTaskUtils.java | 122 +++++- .../ignite/lang/IgniteProductVersion.java | 2 +- .../communication/tcp/TcpCommunicationSpi.java | 12 +- .../core/src/main/resources/ignite.properties | 2 +- .../test/config/websession/example-cache.xml | 9 +- .../ignite/IgniteCacheAffinitySelfTest.java | 7 - .../fair/FairAffinityDynamicCacheSelfTest.java | 17 +- ...niteClientReconnectFailoverAbstractTest.java | 3 +- .../binary/BinaryMarshallerSelfTest.java | 87 ++-- .../cache/CrossCacheTxRandomOperationsTest.java | 2 - .../cache/GridCacheAbstractFullApiSelfTest.java | 22 +- .../cache/GridCacheAbstractSelfTest.java | 3 +- ...iteCacheScanPredicateDeploymentSelfTest.java | 114 +++++ ...yMetadataUpdateChangingTopologySelfTest.java | 104 +++-- ...niteBinaryMetadataUpdateNodeRestartTest.java | 411 +++++++++++++++++++ .../distributed/IgniteCacheManyClientsTest.java | 2 + ...ContinuousQueryFailoverAbstractSelfTest.java | 128 +++--- ...ridCacheContinuousQueryAbstractSelfTest.java | 3 + .../service/ClosureServiceClientsNodesTest.java | 22 +- .../GridServiceProcessorStopSelfTest.java | 21 +- .../product/GridProductVersionSelfTest.java | 22 +- .../internal/util/nio/GridNioSelfTest.java | 127 +++--- ...cpCommunicationSpiMultithreadedSelfTest.java | 21 + ...dTcpCommunicationSpiRecoveryAckSelfTest.java | 17 +- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 14 +- .../TcpDiscoveryMulticastIpFinderSelfTest.java | 21 +- .../testframework/GridSpiTestContext.java | 18 +- .../IgniteCacheRestartTestSuite2.java | 3 + .../testsuites/IgniteCacheTestSuite3.java | 2 + modules/extdata/p2p/pom.xml | 2 +- .../p2p/CacheDeploymentAlwaysTruePredicate.java | 29 ++ .../ignite/tests/p2p/cache/PersonWrapper.java | 121 ++++++ .../extdata/uri/modules/uri-dependency/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/flume/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml | 2 +- .../processors/query/h2/IgniteH2Indexing.java | 2 +- .../IgniteBinaryObjectFieldsQuerySelfTest.java | 16 +- ...eBinaryWrappedObjectFieldsQuerySelfTest.java | 28 ++ .../cache/IgniteCacheAbstractQuerySelfTest.java | 2 +- .../IgniteBinaryCacheQueryTestSuite.java | 4 + .../IgniteCacheQuerySelfTestSuite.java | 4 + modules/jcl/pom.xml | 2 +- modules/jms11/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/kafka/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/log4j2/pom.xml | 2 +- modules/mesos/pom.xml | 2 +- modules/mqtt/pom.xml | 2 +- .../stream/mqtt/IgniteMqttStreamerTest.java | 33 +- modules/osgi-karaf/pom.xml | 2 +- modules/osgi-paxlogging/pom.xml | 2 +- modules/osgi/pom.xml | 2 +- modules/platforms/cpp/common/configure.ac | 2 +- modules/platforms/cpp/core-test/configure.ac | 2 +- modules/platforms/cpp/core/configure.ac | 2 +- modules/platforms/cpp/examples/configure.ac | 2 +- modules/platforms/cpp/ignite/configure.ac | 2 +- .../Properties/AssemblyInfo.cs | 6 +- .../Properties/AssemblyInfo.cs | 6 +- .../Properties/AssemblyInfo.cs | 6 +- .../Properties/AssemblyInfo.cs | 6 +- .../Apache.Ignite/Properties/AssemblyInfo.cs | 6 +- .../Properties/AssemblyInfo.cs | 6 +- .../Properties/AssemblyInfo.cs | 6 +- modules/rest-http/pom.xml | 2 +- modules/scalar-2.10/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/twitter/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- .../GridUriDeploymentFileProcessorSelfTest.java | 19 +- modules/visor-console-2.10/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- .../cache/websession/WebSessionFilter.java | 82 ++-- .../cache/websession/WebSessionListener.java | 25 +- .../internal/websession/WebSessionSelfTest.java | 2 - modules/yardstick/pom.xml | 2 +- modules/yarn/pom.xml | 2 +- modules/zookeeper/pom.xml | 2 +- pom.xml | 2 +- 138 files changed, 2044 insertions(+), 643 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/cc40e1f4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java index a8769b0,5d4c386..f21d2fe --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java @@@ -2077,25 -2077,32 +2077,49 @@@ public abstract class GridCacheAdapter< } /** {@inheritDoc} */ + @Nullable @Override public <T> EntryProcessorResult<T> invoke(@Nullable AffinityTopologyVersion topVer, + K key, + EntryProcessor<K, V, T> entryProcessor, + Object... args) throws IgniteCheckedException { + return invoke0(topVer, key, entryProcessor, args); + } + + /** {@inheritDoc} */ + @Override public void invokeAllConflict(final Map<KeyCacheObject, GridCacheDrInfo> map, + final Object... args) throws IgniteCheckedException { + if (F.isEmpty(map)) + return; + + syncOp(new SyncInOp(map.size() == 1) { + @Override public void inOp(IgniteTxLocalAdapter tx) throws IgniteCheckedException { + tx.invokeAllDrAsync(ctx, map, args).get(); + } + + @Override public String toString() { + return "invokeAllDrAsync [drMap=" + map + ']'; + } + }); + } + + /** {@inheritDoc} */ @Override public <T> EntryProcessorResult<T> invoke(final K key, final EntryProcessor<K, V, T> entryProcessor, + final Object... args) throws IgniteCheckedException { + return invoke0(null, key, entryProcessor, args); + } + + /** + * @param topVer Locked topology version. + * @param key Key. + * @param entryProcessor Entry processor. + * @param args Entry processor arguments. + * @return Invoke result. + * @throws IgniteCheckedException If failed. + */ + private <T> EntryProcessorResult<T> invoke0( + @Nullable final AffinityTopologyVersion topVer, + final K key, + final EntryProcessor<K, V, T> entryProcessor, final Object... args) throws IgniteCheckedException { A.notNull(key, "key", entryProcessor, "entryProcessor"); http://git-wip-us.apache.org/repos/asf/ignite/blob/cc40e1f4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/cc40e1f4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java index 91ea822,27a7587..a4fd2ee --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java @@@ -64,10 -64,9 +64,11 @@@ import org.apache.ignite.internal.Async import org.apache.ignite.internal.GridKernalContext; import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.IgniteInternalFuture; + import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; +import org.apache.ignite.internal.processors.cache.dr.GridCacheDrInfo; import org.apache.ignite.internal.processors.cache.query.CacheQuery; import org.apache.ignite.internal.processors.cache.query.CacheQueryFuture; +import org.apache.ignite.internal.processors.cache.version.GridCacheVersion; import org.apache.ignite.internal.processors.query.GridQueryProcessor; import org.apache.ignite.internal.util.GridCloseableIteratorAdapter; import org.apache.ignite.internal.util.GridEmptyIterator; http://git-wip-us.apache.org/repos/asf/ignite/blob/cc40e1f4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/cc40e1f4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/cc40e1f4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java index 8692f84,3c86083..c9e1a11 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java @@@ -998,9 -1032,9 +1032,9 @@@ public class GridNearAtomicUpdateFutur throw new NullPointerException("Null value."); } else if (conflictPutVals != null) { - GridCacheDrInfo conflictPutVal = conflictPutValsIt.next(); + GridCacheDrInfo conflictPutVal = conflictPutValsIt.next(); - val = conflictPutVal.value(); + val = conflictPutVal.valueEx(); conflictVer = conflictPutVal.version(); conflictTtl = conflictPutVal.ttl(); conflictExpireTime = conflictPutVal.expireTime(); http://git-wip-us.apache.org/repos/asf/ignite/blob/cc40e1f4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java ----------------------------------------------------------------------
