ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [21/50] [abbrv] incubator-ignite git commit: Merge branch 'ignite-51' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-51
Date Wed, 11 Mar 2015 10:33:50 GMT
Merge branch 'ignite-51' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-51


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

Branch: refs/heads/ignite-410
Commit: 3c1eeafc063c0fdaf3ea213415abd503c2b04d31
Parents: ed96021 57ae9ec
Author: ivasilinets <vasilinetc.ira@gmail.com>
Authored: Mon Mar 9 23:46:24 2015 +0300
Committer: ivasilinets <vasilinetc.ira@gmail.com>
Committed: Mon Mar 9 23:46:24 2015 +0300

----------------------------------------------------------------------
 .../apache/ignite/cache/IgniteImmutable.java    |   2 +-
 .../configuration/CacheConfiguration.java       |   2 +-
 .../processors/cache/GridCacheAdapter.java      | 244 ++++++++++---------
 .../cache/GridCacheAffinityManager.java         |   8 +-
 .../processors/cache/GridCacheContext.java      |  20 +-
 .../processors/cache/GridCacheEntryEx.java      |  12 +-
 .../cache/GridCacheManagerAdapter.java          |   2 +-
 .../processors/cache/GridCacheMapEntry.java     |  59 +++--
 .../GridCachePartitionExchangeManager.java      |  82 +++----
 .../processors/cache/GridCachePreloader.java    |   4 +-
 .../cache/GridCachePreloaderAdapter.java        |   4 +-
 .../processors/cache/GridCacheProjectionEx.java |   8 +-
 .../cache/GridCacheProjectionImpl.java          |  37 ++-
 .../processors/cache/GridCacheProxyImpl.java    |   8 +-
 .../processors/cache/GridCacheReturn.java       |   6 +-
 .../cache/GridCacheSharedContext.java           |   4 +-
 .../CacheDataStructuresManager.java             |   6 +-
 .../GridDistributedTxRemoteAdapter.java         |   1 -
 .../dht/GridClientPartitionTopology.java        |   8 +-
 .../dht/GridDhtAssignmentFetchFuture.java       |  10 +-
 .../distributed/dht/GridDhtCacheAdapter.java    |  14 +-
 .../distributed/dht/GridDhtCacheEntry.java      |   4 +-
 .../cache/distributed/dht/GridDhtGetFuture.java |  10 +-
 .../dht/GridDhtPartitionTopology.java           |   4 +-
 .../dht/GridDhtPartitionTopologyImpl.java       |   4 +-
 .../dht/GridDhtTransactionalCacheAdapter.java   |   6 +-
 .../distributed/dht/GridDhtTxLocalAdapter.java  |  12 +-
 .../distributed/dht/GridDhtTxPrepareFuture.java |   4 +-
 .../dht/atomic/GridDhtAtomicCache.java          |  27 +-
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |   4 +-
 .../atomic/GridNearAtomicUpdateResponse.java    |   2 +-
 .../dht/colocated/GridDhtColocatedCache.java    |   6 +-
 .../colocated/GridDhtColocatedLockFuture.java   | 150 ++++++------
 .../dht/preloader/GridDhtForceKeysFuture.java   |   2 +-
 .../preloader/GridDhtPartitionDemandPool.java   |  18 +-
 .../preloader/GridDhtPartitionSupplyPool.java   |   2 +-
 .../GridDhtPartitionsExchangeFuture.java        |  50 ++--
 .../dht/preloader/GridDhtPreloader.java         |  18 +-
 .../preloader/GridDhtPreloaderAssignments.java  |   6 +-
 .../distributed/near/GridNearAtomicCache.java   |   8 +-
 .../distributed/near/GridNearCacheEntry.java    |  12 +-
 .../distributed/near/GridNearGetFuture.java     |   3 +-
 .../distributed/near/GridNearLockFuture.java    |   8 +-
 .../cache/distributed/near/GridNearTxLocal.java |   8 +-
 .../near/GridNearTxPrepareResponse.java         |   6 +-
 .../local/atomic/GridLocalAtomicCache.java      |  14 +-
 .../continuous/CacheContinuousQueryHandler.java |   2 +-
 .../continuous/CacheContinuousQueryManager.java |  83 ++++---
 .../transactions/IgniteTxLocalAdapter.java      |  46 ++--
 .../cache/transactions/IgniteTxLocalEx.java     |   6 +-
 .../dataload/IgniteDataLoaderImpl.java          |  26 +-
 ...eJdbcStoreAbstractMultithreadedSelfTest.java |  11 +-
 .../processors/cache/GridCacheTestEntryEx.java  |  12 +-
 .../dht/GridCacheDhtPreloadDelayedSelfTest.java |   4 +-
 .../GridCacheDhtPreloadDisabledSelfTest.java    |   4 +-
 .../dht/GridCacheDhtPreloadSelfTest.java        |   4 +-
 .../GridCacheDhtPreloadStartStopSelfTest.java   |   2 +-
 .../distributed/dht/GridCacheDhtTestUtils.java  |   6 +-
 .../GridCachePartitionedTxSalvageSelfTest.java  |   2 +-
 .../loadtests/hashmap/GridCacheTestContext.java |   6 +-
 .../ignite/testframework/GridTestUtils.java     |   2 +-
 .../junits/common/GridCommonAbstractTest.java   |   2 +-
 62 files changed, 585 insertions(+), 562 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3c1eeafc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------


Mime
View raw message