You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/12/24 04:30:40 UTC
[09/10] ignite git commit: Merge branches 'ignite-1.5' and
'ignite-gg-10889' of https://git-wip-us.apache.org/repos/asf/ignite into
ignite-gg-10889
Merge branches 'ignite-1.5' and 'ignite-gg-10889' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-gg-10889
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/85ffd5a3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/85ffd5a3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/85ffd5a3
Branch: refs/heads/ignite-gg-10889
Commit: 85ffd5a30fd8ed8adfee79bdb724bb86bce6dfb1
Parents: 7daa2b5 bd05fa9
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Thu Dec 24 10:15:56 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Thu Dec 24 10:15:56 2015 +0700
----------------------------------------------------------------------
.../ignite/internal/binary/BinaryContext.java | 2 +-
.../internal/binary/BinaryObjectImpl.java | 2 +-
.../managers/communication/GridIoManager.java | 39 +-
.../processors/cache/GridCacheAdapter.java | 47 ++-
.../processors/cache/GridCacheProxyImpl.java | 29 ++
.../cache/GridCacheSharedContext.java | 10 +-
.../processors/cache/IgniteCacheProxy.java | 35 ++
.../processors/cache/IgniteInternalCache.java | 26 ++
.../binary/CacheObjectBinaryProcessorImpl.java | 4 +-
.../distributed/dht/GridDhtLockFuture.java | 2 +-
.../dht/atomic/GridDhtAtomicCache.java | 95 +++--
.../dht/atomic/GridNearAtomicUpdateFuture.java | 150 ++++---
.../colocated/GridDhtColocatedLockFuture.java | 11 +-
.../distributed/near/GridNearLockFuture.java | 11 +-
...arOptimisticSerializableTxPrepareFuture.java | 5 +-
.../near/GridNearOptimisticTxPrepareFuture.java | 5 +-
...ridNearOptimisticTxPrepareFutureAdapter.java | 12 +-
.../query/GridCacheDistributedQueryManager.java | 6 +-
.../transactions/IgniteTxLocalAdapter.java | 2 +
.../cache/transactions/IgniteTxManager.java | 61 ++-
.../datastreamer/DataStreamProcessor.java | 12 +-
.../processors/query/GridQueryProcessor.java | 5 +
.../ignite/internal/util/lang/GridFunc.java | 1 +
.../test/config/websession/example-cache.xml | 9 +-
...niteClientReconnectFailoverAbstractTest.java | 3 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 22 +-
.../cache/GridCacheAbstractSelfTest.java | 3 +-
...iteCacheScanPredicateDeploymentSelfTest.java | 114 +++++
...yMetadataUpdateChangingTopologySelfTest.java | 7 +-
...niteBinaryMetadataUpdateNodeRestartTest.java | 411 +++++++++++++++++++
.../distributed/IgniteCacheManyClientsTest.java | 2 +
...ContinuousQueryFailoverAbstractSelfTest.java | 128 +++---
...ridCacheContinuousQueryAbstractSelfTest.java | 3 +
.../service/ClosureServiceClientsNodesTest.java | 22 +-
.../GridServiceProcessorStopSelfTest.java | 21 +-
...cpCommunicationSpiMultithreadedSelfTest.java | 21 +
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 14 +-
.../testframework/GridSpiTestContext.java | 18 +-
.../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 +
.../cache/websession/WebSessionFilter.java | 82 ++--
.../cache/websession/WebSessionListener.java | 25 +-
.../internal/websession/WebSessionSelfTest.java | 2 -
50 files changed, 1349 insertions(+), 338 deletions(-)
----------------------------------------------------------------------