You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/11/23 09:47:45 UTC
[03/12] ignite git commit: Merge branch 'ignite-1.5' of
https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.5-tx-futs-opts
Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.5-tx-futs-opts
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d92de42d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d92de42d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d92de42d
Branch: refs/heads/ignite-sql-opt
Commit: d92de42de528893920f51711acaa66b6d882549f
Parents: 5e6d0ff ab8298a
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Fri Nov 20 19:18:01 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Fri Nov 20 19:18:01 2015 +0300
----------------------------------------------------------------------
.../stream/camel/IgniteCamelStreamerTest.java | 16 +-
.../camel/IgniteCamelStreamerTestSuite.java | 1 -
.../internal/MarshallerContextAdapter.java | 4 +-
.../GridCachePartitionExchangeManager.java | 34 ++-
.../dht/GridClientPartitionTopology.java | 38 +--
.../dht/GridDhtPartitionTopology.java | 12 +-
.../dht/GridDhtPartitionTopologyImpl.java | 45 +--
.../distributed/dht/GridDhtTxPrepareFuture.java | 1 -
.../dht/GridPartitionedGetFuture.java | 2 +-
.../dht/preloader/GridDhtPartitionFullMap.java | 41 ++-
.../dht/preloader/GridDhtPartitionMap.java | 148 +--------
.../dht/preloader/GridDhtPartitionMap2.java | 306 +++++++++++++++++++
.../GridDhtPartitionsExchangeFuture.java | 24 +-
.../GridDhtPartitionsSingleMessage.java | 6 +-
.../distributed/near/GridNearCacheAdapter.java | 1 -
...arOptimisticSerializableTxPrepareFuture.java | 3 -
.../near/GridNearOptimisticTxPrepareFuture.java | 1 -
.../near/GridNearTxFinishFuture.java | 4 -
.../distributed/near/GridNearTxRemote.java | 1 -
.../processors/cache/local/GridLocalCache.java | 1 -
.../cache/local/GridLocalLockFuture.java | 2 -
.../cache/transactions/IgniteInternalTx.java | 1 -
.../cache/transactions/IgniteTxAdapter.java | 1 -
.../transactions/IgniteTxLocalAdapter.java | 1 -
.../cache/transactions/IgniteTxManager.java | 1 -
.../cache/transactions/IgniteTxStateImpl.java | 1 -
.../ignite/internal/visor/cache/VisorCache.java | 6 +-
.../org/apache/ignite/stream/StreamAdapter.java | 1 -
.../resources/META-INF/classnames.properties | 1 +
.../dht/GridCacheDhtPreloadDelayedSelfTest.java | 12 +-
.../dht/GridCacheDhtPreloadSelfTest.java | 4 +-
.../distributed/dht/GridCacheDhtTestUtils.java | 8 +-
...cingDelayedPartitionMapExchangeSelfTest.java | 178 +++++++++++
.../testsuites/IgniteCacheTestSuite3.java | 2 +
.../h2/twostep/GridReduceQueryExecutor.java | 4 +-
.../cache/WaitMapExchangeFinishCallable.java | 4 +-
.../IgniteFailoverAbstractBenchmark.java | 4 +-
37 files changed, 661 insertions(+), 259 deletions(-)
----------------------------------------------------------------------