ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vkuliche...@apache.org
Subject [16/16] ignite git commit: Merge branch 'gridgain-7.6.1'
Date Wed, 15 Jun 2016 12:06:03 GMT
Merge branch 'gridgain-7.6.1'

# Conflicts:
#	modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheSyncRebalanceModeSelfTest.java


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

Branch: refs/heads/master
Commit: b742f5fc8eadd850a01246be7f88f08f424a471f
Parents: b500d3a 5c14928
Author: Valentin Kulichenko <valentin.lulichenko@gmail.com>
Authored: Wed Jun 15 15:04:34 2016 +0300
Committer: Valentin Kulichenko <valentin.lulichenko@gmail.com>
Committed: Wed Jun 15 15:04:34 2016 +0300

----------------------------------------------------------------------
 .../ignite/internal/MarshallerContextImpl.java  |  51 ++-
 .../ignite/internal/binary/BinaryContext.java   |  43 ++-
 .../processors/cache/GridCacheAdapter.java      |  46 ++-
 .../processors/cache/GridCacheEntryEx.java      |   9 +-
 .../processors/cache/GridCacheMapEntry.java     | 100 +++--
 .../processors/cache/GridCacheUtils.java        |   3 +
 .../binary/CacheObjectBinaryProcessorImpl.java  |  29 +-
 .../distributed/dht/GridDhtCacheAdapter.java    |  10 +-
 .../distributed/dht/GridDhtLockFuture.java      |  18 +-
 .../dht/GridDhtTransactionalCacheAdapter.java   |   2 -
 .../distributed/dht/GridDhtTxPrepareFuture.java |  19 +-
 .../dht/GridPartitionedGetFuture.java           |   2 -
 .../dht/GridPartitionedSingleGetFuture.java     |   2 -
 .../dht/atomic/GridDhtAtomicCache.java          |   8 -
 .../dht/colocated/GridDhtColocatedCache.java    |   4 +-
 .../dht/preloader/GridDhtForceKeysFuture.java   |   3 +-
 .../dht/preloader/GridDhtPartitionDemander.java |   3 +-
 .../distributed/near/GridNearGetFuture.java     |   4 -
 .../cache/distributed/near/GridNearTxLocal.java |   7 +-
 .../local/atomic/GridLocalAtomicCache.java      |   8 -
 .../continuous/CacheContinuousQueryEntry.java   |  16 +
 .../continuous/CacheContinuousQueryHandler.java |   2 +-
 .../continuous/CacheContinuousQueryManager.java | 135 +++++++
 .../cache/transactions/IgniteTxAdapter.java     |   2 -
 .../cache/transactions/IgniteTxEntry.java       |  24 +-
 .../cache/transactions/IgniteTxHandler.java     |  46 +++
 .../transactions/IgniteTxLocalAdapter.java      |  34 +-
 .../cacheobject/IgniteCacheObjectProcessor.java |   7 +
 .../IgniteCacheObjectProcessorImpl.java         |   5 +
 .../continuous/GridContinuousProcessor.java     | 216 ++++++++---
 .../datastreamer/DataStreamerImpl.java          |   3 +-
 .../service/GridServiceProcessor.java           | 305 ++++++++-------
 .../ignite/spi/discovery/tcp/ServerImpl.java    |   4 +-
 ...eClientReconnectContinuousProcessorTest.java |  60 ++-
 .../ignite/internal/binary/AffinityKey.java     |  69 ++++
 .../binary/GridBinaryAffinityKeySelfTest.java   |  15 +
 ...aultBinaryMappersBinaryMetaDataSelfTest.java |  17 +
 .../processors/cache/GridCacheTestEntryEx.java  |   5 +-
 .../cache/IgniteCacheAbstractTest.java          |   2 +-
 ...gniteCacheInvokeReadThroughAbstractTest.java | 382 +++++++++++++++++++
 ...iteCacheInvokeReadThroughSingleNodeTest.java | 106 +++++
 .../cache/IgniteCacheInvokeReadThroughTest.java | 182 +++++----
 .../IgniteCacheReadThroughStoreCallTest.java    | 288 ++++++++++++++
 .../IgniteCacheLoaderWriterAbstractTest.java    |  10 +
 ...ridCacheContinuousQueryAbstractSelfTest.java |   2 +-
 ...niteCacheContinuousQueryBackupQueueTest.java | 135 +++++++
 .../IgniteNoCustomEventsOnNodeStart.java        |  85 +++++
 .../service/GridServiceClientNodeTest.java      | 102 ++++-
 .../testsuites/IgniteCacheTestSuite2.java       |   3 +
 .../testsuites/IgniteCacheTestSuite4.java       |   4 +
 .../IgniteCacheQuerySelfTestSuite3.java         |   2 +
 .../org/apache/ignite/spark/IgniteContext.scala |   4 +-
 .../org/apache/ignite/spark/IgniteRDD.scala     |  25 +-
 .../apache/ignite/spark/JavaIgniteContext.scala |   4 +-
 .../org/apache/ignite/spark/JavaIgniteRDD.scala |   2 +
 .../ignite/spark/impl/IgniteAbstractRDD.scala   |  15 +-
 .../apache/ignite/spark/impl/IgniteSqlRDD.scala |   5 +-
 .../spark/impl/JavaIgniteAbstractRDD.scala      |  34 --
 .../org/apache/ignite/spark/IgniteRDDSpec.scala |  25 +-
 59 files changed, 2242 insertions(+), 511 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/b742f5fc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/b742f5fc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/b742f5fc/modules/spark/src/main/scala/org/apache/ignite/spark/JavaIgniteRDD.scala
----------------------------------------------------------------------


Mime
View raw message