You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by av...@apache.org on 2016/06/16 11:31:09 UTC
[02/13] ignite git commit: Merge remote-tracking branch
'upstream/gridgain-7.6.1' into gridgain-7.6.1
Merge remote-tracking branch 'upstream/gridgain-7.6.1' into gridgain-7.6.1
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/51814fd8
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/51814fd8
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/51814fd8
Branch: refs/heads/master
Commit: 51814fd816f1f3c4bf72c91399c03db7b1358ed1
Parents: dc1d088 5c14928
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed Jun 15 16:25:19 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Jun 15 16:25:19 2016 +0300
----------------------------------------------------------------------
modules/cassandra/pom.xml | 2 +-
.../cassandra/bean/CassandraLifeCycleBean.java | 149 --------
.../ignite/tests/utils/CassandraHelper.java | 2 +-
.../tests/utils/CassandraLifeCycleBean.java | 149 ++++++++
.../affinity/fair/FairAffinityFunction.java | 2 +
.../rendezvous/RendezvousAffinityFunction.java | 2 +
.../configuration/CacheConfiguration.java | 3 +
.../ignite/internal/IgniteServicesImpl.java | 2 +-
.../ignite/internal/MarshallerContextImpl.java | 51 ++-
.../ignite/internal/binary/BinaryContext.java | 43 ++-
.../GridClientConnectionManagerAdapter.java | 25 +-
.../connection/GridClientNioTcpConnection.java | 3 +
.../GridClientOptimizedMarshaller.java | 4 +-
.../GridClientZipOptimizedMarshaller.java | 167 ++++++++
.../impl/GridTcpRouterNioListenerAdapter.java | 11 +-
.../discovery/GridDiscoveryManager.java | 23 +-
.../processors/cache/GridCacheAdapter.java | 46 ++-
.../processors/cache/GridCacheEntryEx.java | 9 +-
.../processors/cache/GridCacheMapEntry.java | 100 +++--
.../processors/cache/GridCacheProcessor.java | 28 +-
.../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 +-
.../dht/preloader/GridDhtPartitionMap2.java | 7 +-
.../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 +-
.../message/GridClientHandshakeRequest.java | 4 +-
.../protocols/tcp/GridTcpRestNioListener.java | 19 +-
.../rest/protocols/tcp/GridTcpRestProtocol.java | 12 +-
.../service/GridServiceProcessor.java | 307 ++++++++-------
.../ignite/internal/util/nio/GridNioServer.java | 10 +-
.../ignite/internal/visor/cache/VisorCache.java | 56 +--
.../visor/cache/VisorCachePartition.java | 89 +++++
.../visor/cache/VisorCachePartitions.java | 88 +++++
.../visor/cache/VisorCachePartitionsTask.java | 152 ++++++++
.../internal/visor/cache/VisorCacheV3.java | 68 +---
.../ignite/spi/discovery/tcp/ServerImpl.java | 4 +-
.../ipfinder/jdbc/BasicJdbcIpFinderDialect.java | 28 ++
.../tcp/ipfinder/jdbc/JdbcIpFinderDialect.java | 28 ++
.../jdbc/OracleJdbcIpFinderDialect.java | 28 ++
.../ipfinder/jdbc/TcpDiscoveryJdbcIpFinder.java | 72 ++--
.../internal/ClusterNodeMetricsSelfTest.java | 101 ++++-
...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 ++++++++++++++
.../IgniteCacheSyncRebalanceModeSelfTest.java | 114 ++++++
.../IgniteCacheLoaderWriterAbstractTest.java | 10 +
...ridCacheContinuousQueryAbstractSelfTest.java | 2 +-
...niteCacheContinuousQueryBackupQueueTest.java | 135 +++++++
.../IgniteNoCustomEventsOnNodeStart.java | 85 +++++
.../service/GridServiceClientNodeTest.java | 102 ++++-
.../unsafe/GridOffheapSnapTreeSelfTest.java | 2 +-
.../testsuites/IgniteCacheTestSuite2.java | 3 +
.../testsuites/IgniteCacheTestSuite4.java | 4 +
.../testsuites/IgniteCacheTestSuite5.java | 2 +
.../query/h2/opt/GridH2AbstractKeyValueRow.java | 23 +-
.../query/h2/opt/GridH2KeyValueRowOffheap.java | 17 +-
.../processors/query/h2/sql/GridSqlConst.java | 5 +
.../processors/query/h2/sql/GridSqlJoin.java | 17 +-
.../processors/query/h2/sql/GridSqlType.java | 5 +
.../cache/IgniteCacheOffheapIndexScanTest.java | 195 ++++++++++
.../query/IgniteSqlSplitterSelfTest.java | 75 ++++
.../IgniteCacheQuerySelfTestSuite.java | 2 +
.../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 +-
.../cache/websession/WebSessionFilter.java | 39 +-
.../internal/websession/WebSessionSelfTest.java | 330 +++++++++++++++-
102 files changed, 4030 insertions(+), 885 deletions(-)
----------------------------------------------------------------------