You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vk...@apache.org on 2016/02/05 01:09:49 UTC

[2/7] ignite git commit: Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-2249

Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-2249


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3f5a099c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3f5a099c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3f5a099c

Branch: refs/heads/ignite-2249
Commit: 3f5a099c030fe80d718e9329e087ce1c9a37466f
Parents: 2467df5 49c2988
Author: Valentin Kulichenko <va...@gmail.com>
Authored: Thu Dec 24 14:30:25 2015 -0800
Committer: Valentin Kulichenko <va...@gmail.com>
Committed: Thu Dec 24 14:30:25 2015 -0800

----------------------------------------------------------------------
 README.txt                                      |   4 +-
 .../JettyRestProcessorAbstractSelfTest.java     |  25 +-
 .../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  | 150 ++++---
 .../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 +++++-
 .../communication/tcp/TcpCommunicationSpi.java  |  12 +-
 .../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 +-
 .../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 +
 .../p2p/CacheDeploymentAlwaysTruePredicate.java |  29 ++
 .../ignite/tests/p2p/cache/PersonWrapper.java   | 121 ++++++
 .../processors/query/h2/IgniteH2Indexing.java   |   2 +-
 .../IgniteBinaryObjectFieldsQuerySelfTest.java  |  16 +-
 ...eBinaryWrappedObjectFieldsQuerySelfTest.java |  28 ++
 .../cache/IgniteCacheAbstractQuerySelfTest.java |   2 +-
 .../IgniteBinaryCacheQueryTestSuite.java        |   4 +
 .../IgniteCacheQuerySelfTestSuite.java          |   4 +
 .../stream/mqtt/IgniteMqttStreamerTest.java     |  33 +-
 .../GridUriDeploymentFileProcessorSelfTest.java |  19 +-
 .../cache/websession/WebSessionFilter.java      |  82 ++--
 .../cache/websession/WebSessionListener.java    |  25 +-
 .../internal/websession/WebSessionSelfTest.java |   2 -
 71 files changed, 1945 insertions(+), 558 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/3f5a099c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
----------------------------------------------------------------------