You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dm...@apache.org on 2015/11/10 10:48:47 UTC
[49/50] [abbrv] ignite git commit: Merge remote-tracking branch
'remotes/apache-main/ignite-1.5' into ignite-801
Merge remote-tracking branch 'remotes/apache-main/ignite-1.5' into ignite-801
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/af804863
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/af804863
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/af804863
Branch: refs/heads/ignite-801
Commit: af8048638d5319d062f348d56dc7a5143a2aeebb
Parents: 97c859d 3de9d47
Author: Denis Magda <dm...@gridgain.com>
Authored: Tue Nov 10 10:29:35 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Tue Nov 10 10:29:35 2015 +0300
----------------------------------------------------------------------
.../java8/messaging/MessagingExample.java | 7 +-
.../ClientAbstractMultiThreadedSelfTest.java | 3 +-
.../rest/AbstractRestProcessorSelfTest.java | 5 +-
.../JettyRestProcessorAbstractSelfTest.java | 142 +-
.../src/main/java/org/apache/ignite/Ignite.java | 12 +-
.../java/org/apache/ignite/IgniteCache.java | 1 +
.../apache/ignite/IgniteSystemProperties.java | 3 +
.../affinity/fair/FairAffinityFunction.java | 497 +-
.../rendezvous/RendezvousAffinityFunction.java | 140 +-
.../eviction/random/RandomEvictionPolicy.java | 4 +
.../configuration/CacheConfiguration.java | 54 +-
.../configuration/ConnectorConfiguration.java | 61 +-
.../configuration/IgniteConfiguration.java | 32 +-
.../configuration/TransactionConfiguration.java | 6 +-
.../apache/ignite/internal/IgniteKernal.java | 137 +-
.../org/apache/ignite/internal/IgnitionEx.java | 3 +
.../managers/communication/GridIoMessage.java | 4 +-
.../communication/GridIoMessageFactory.java | 10 +-
.../discovery/GridDiscoveryManager.java | 5 +-
.../internal/portable/PortableWriterExImpl.java | 66 +-
.../affinity/GridAffinityAssignmentCache.java | 13 +
.../processors/cache/CacheMetricsImpl.java | 12 +-
.../processors/cache/GridCacheAdapter.java | 481 +-
.../cache/GridCacheAffinityManager.java | 28 +-
.../processors/cache/GridCacheContext.java | 29 +-
.../processors/cache/GridCacheEntryEx.java | 66 +-
.../processors/cache/GridCacheIoManager.java | 47 +-
.../processors/cache/GridCacheMapEntry.java | 228 +-
.../processors/cache/GridCacheMvcc.java | 143 +-
.../cache/GridCacheMvccCandidate.java | 26 +-
.../processors/cache/GridCacheMvccManager.java | 145 +-
.../GridCachePartitionExchangeManager.java | 188 +-
.../processors/cache/GridCachePreloader.java | 60 +-
.../cache/GridCachePreloaderAdapter.java | 45 +-
.../processors/cache/GridCacheProcessor.java | 177 +-
.../processors/cache/GridCacheUtils.java | 50 +
.../processors/cache/IgniteCacheProxy.java | 6 +
.../distributed/GridCacheTxRecoveryFuture.java | 13 +-
.../distributed/GridDistributedCacheEntry.java | 14 +-
.../distributed/GridDistributedTxMapping.java | 8 +-
.../GridDistributedTxRemoteAdapter.java | 57 +-
.../dht/CacheDistributedGetFutureAdapter.java | 158 +
.../distributed/dht/GridDhtCacheAdapter.java | 17 +-
.../distributed/dht/GridDhtCacheEntry.java | 34 +-
.../cache/distributed/dht/GridDhtGetFuture.java | 199 +-
.../distributed/dht/GridDhtLocalPartition.java | 71 +-
.../distributed/dht/GridDhtLockFuture.java | 12 +-
.../dht/GridDhtPartitionsReservation.java | 2 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 118 +-
.../cache/distributed/dht/GridDhtTxLocal.java | 4 +-
.../distributed/dht/GridDhtTxLocalAdapter.java | 43 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 203 +-
.../cache/distributed/dht/GridDhtTxRemote.java | 45 +-
.../dht/GridPartitionedGetFuture.java | 179 +-
.../dht/atomic/GridDhtAtomicCache.java | 17 +-
.../dht/colocated/GridDhtColocatedCache.java | 137 +-
.../colocated/GridDhtColocatedLockFuture.java | 6 +-
.../dht/preloader/GridDhtForceKeysFuture.java | 14 +
.../GridDhtPartitionDemandMessage.java | 14 +-
.../preloader/GridDhtPartitionDemandPool.java | 1192 -----
.../dht/preloader/GridDhtPartitionDemander.java | 1389 ++++++
.../dht/preloader/GridDhtPartitionSupplier.java | 1034 +++++
.../GridDhtPartitionSupplyMessageV2.java | 380 ++
.../preloader/GridDhtPartitionSupplyPool.java | 555 ---
.../GridDhtPartitionsExchangeFuture.java | 8 +
.../dht/preloader/GridDhtPreloader.java | 303 +-
.../distributed/near/GridNearAtomicCache.java | 2 -
.../distributed/near/GridNearCacheAdapter.java | 32 +-
.../distributed/near/GridNearCacheEntry.java | 81 +-
.../distributed/near/GridNearGetFuture.java | 340 +-
.../distributed/near/GridNearGetRequest.java | 3 -
...arOptimisticSerializableTxPrepareFuture.java | 936 ++++
.../near/GridNearOptimisticTxPrepareFuture.java | 263 +-
...ridNearOptimisticTxPrepareFutureAdapter.java | 222 +
.../GridNearPessimisticTxPrepareFuture.java | 8 +-
.../near/GridNearTransactionalCache.java | 21 +-
.../near/GridNearTxFinishFuture.java | 169 +-
.../cache/distributed/near/GridNearTxLocal.java | 178 +-
.../near/GridNearTxPrepareFutureAdapter.java | 13 +-
.../cache/local/GridLocalCacheEntry.java | 23 +-
.../cache/local/GridLocalLockFuture.java | 2 +
.../local/atomic/GridLocalAtomicCache.java | 9 -
.../CacheObjectPortableProcessorImpl.java | 9 +
.../cache/transactions/IgniteInternalTx.java | 3 +-
.../transactions/IgniteTransactionsImpl.java | 6 -
.../cache/transactions/IgniteTxAdapter.java | 374 +-
.../cache/transactions/IgniteTxEntry.java | 51 +-
.../cache/transactions/IgniteTxHandler.java | 41 +-
.../transactions/IgniteTxLocalAdapter.java | 858 ++--
.../cache/transactions/IgniteTxLocalEx.java | 27 +-
.../cache/transactions/IgniteTxManager.java | 500 +-
.../cache/version/GridCacheVersionManager.java | 73 +-
.../datastreamer/DataStreamerImpl.java | 2 +-
.../datastructures/DataStructuresProcessor.java | 3 +
.../processors/job/GridJobProcessor.java | 96 +-
.../handlers/cache/GridCacheCommandHandler.java | 128 +-
.../handlers/query/QueryCommandHandler.java | 254 +-
.../top/GridTopologyCommandHandler.java | 4 -
.../service/GridServiceProcessor.java | 31 +-
.../processors/task/GridTaskWorker.java | 4 +-
.../GridBoundedConcurrentLinkedHashMap.java | 7 +-
.../GridBoundedConcurrentLinkedHashSet.java | 7 +-
.../util/GridBoundedConcurrentOrderedMap.java | 39 +-
.../internal/util/GridConcurrentFactory.java | 11 +-
.../util/GridConcurrentLinkedHashSet.java | 9 +-
.../ignite/internal/util/IgniteUuidCache.java | 6 +-
.../util/future/GridCompoundFuture.java | 155 +-
.../ignite/internal/util/lang/GridTuple4.java | 2 +-
.../util/nio/GridNioRecoveryDescriptor.java | 11 +-
.../ignite/internal/visor/cache/VisorCache.java | 5 +-
.../communication/tcp/TcpCommunicationSpi.java | 40 +-
.../ignite/spi/discovery/tcp/ClientImpl.java | 205 +-
.../ignite/spi/discovery/tcp/ServerImpl.java | 220 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +-
.../messages/TcpDiscoveryAbstractMessage.java | 11 +
.../TcpDiscoveryClientReconnectMessage.java | 1 +
.../messages/TcpDiscoveryDiscardMessage.java | 1 +
.../messages/TcpDiscoveryNodeAddedMessage.java | 39 +
.../apache/ignite/transactions/Transaction.java | 2 +-
.../transactions/TransactionIsolation.java | 3 +-
.../java/org/jsr166/ConcurrentHashMap8.java | 2 +-
.../java/org/jsr166/ConcurrentLinkedDeque8.java | 2 +-
.../org/jsr166/ConcurrentLinkedHashMap.java | 195 +-
.../GridCacheAffinityBackupsSelfTest.java | 8 +
.../AbstractAffinityFunctionSelfTest.java | 293 ++
.../affinity/AffinityClientNodeSelfTest.java | 194 +
...ityFunctionBackupFilterAbstractSelfTest.java | 138 +
...unctionExcludeNeighborsAbstractSelfTest.java | 182 +
.../affinity/IgniteClientNodeAffinityTest.java | 194 -
.../fair/FairAffinityDynamicCacheSelfTest.java | 99 +
...airAffinityFunctionBackupFilterSelfTest.java | 35 +
...ffinityFunctionExcludeNeighborsSelfTest.java | 31 +
.../fair/FairAffinityFunctionNodesSelfTest.java | 245 +
.../fair/FairAffinityFunctionSelfTest.java | 31 +
.../GridFairAffinityFunctionNodesSelfTest.java | 245 -
.../fair/GridFairAffinityFunctionSelfTest.java | 270 --
.../IgniteFairAffinityDynamicCacheSelfTest.java | 97 -
...ousAffinityFunctionBackupFilterSelfTest.java | 35 +
...ffinityFunctionExcludeNeighborsSelfTest.java | 32 +
.../RendezvousAffinityFunctionSelfTest.java | 50 +
.../GridTaskFailoverAffinityRunTest.java | 3 +
.../IgniteClientReconnectCacheTest.java | 33 +
.../GridDiscoveryManagerAttributesSelfTest.java | 23 +-
.../processors/cache/CacheNamesSelfTest.java | 69 +
.../cache/CacheNearReaderUpdateTest.java | 390 ++
.../CacheSerializableTransactionsTest.java | 4392 ++++++++++++++++++
.../cache/CrossCacheTxRandomOperationsTest.java | 10 +-
.../GridCacheAbstractFailoverSelfTest.java | 14 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 11 +-
.../GridCacheAbstractLocalStoreSelfTest.java | 5 +
.../GridCacheAbstractRemoveFailureTest.java | 98 +-
.../GridCacheConcurrentTxMultiNodeTest.java | 3 -
...idCacheConfigurationConsistencySelfTest.java | 17 -
.../GridCacheMissingCommitVersionSelfTest.java | 40 +-
.../cache/GridCacheMvccFlagsTest.java | 6 +-
.../cache/GridCacheMvccPartitionedSelfTest.java | 164 +
.../processors/cache/GridCacheMvccSelfTest.java | 3 +-
.../processors/cache/GridCacheTestEntryEx.java | 56 +-
.../cache/IgniteCacheCreateRestartSelfTest.java | 4 +-
.../IgniteCacheP2pUnmarshallingErrorTest.java | 2 +-
.../cache/IgniteCachePutAllRestartTest.java | 3 +
.../cache/IgniteCacheTxNearPeekModesTest.java | 7 +-
.../cache/IgniteCacheTxPeekModesTest.java | 5 +
.../processors/cache/IgniteTxAbstractTest.java | 42 +-
.../IgniteTxMultiThreadedAbstractTest.java | 106 +-
.../IgniteCountDownLatchAbstractSelfTest.java | 4 +-
...PartitionedQueueCreateMultiNodeSelfTest.java | 5 +-
...IgnitePartitionedCountDownLatchSelfTest.java | 7 +-
.../CacheGetFutureHangsSelfTest.java | 11 +-
...dCachePartitionedAffinityFilterSelfTest.java | 143 -
...onedNearDisabledTxMultiThreadedSelfTest.java | 31 +
...niteCacheClientNodeChangingTopologyTest.java | 176 +-
.../IgniteCacheClientReconnectTest.java | 2 +
.../distributed/IgniteCacheManyClientsTest.java | 14 +-
.../dht/GridCacheDhtPreloadPutGetSelfTest.java | 3 +
.../dht/GridCacheTxNodeFailureSelfTest.java | 21 +-
.../IgniteCacheCrossCacheTxFailoverTest.java | 23 +-
.../dht/IgniteCacheLockFailoverSelfTest.java | 11 +
.../IgniteCachePutRetryAbstractSelfTest.java | 4 +-
...eAtomicInvalidPartitionHandlingSelfTest.java | 6 +-
...unctionExcludeNeighborsAbstractSelfTest.java | 184 -
...omicMultiNodeP2PDisabledFullApiSelfTest.java | 7 +-
...ledFairAffinityMultiNodeFullApiSelfTest.java | 5 -
...omicNearEnabledMultiNodeFullApiSelfTest.java | 2 +-
...icOffHeapTieredMultiNodeFullApiSelfTest.java | 5 -
.../near/GridCacheNearTxExceptionSelfTest.java | 16 +
...achePartitionedMultiNodeFullApiSelfTest.java | 2 +-
...CachePartitionedTxMultiThreadedSelfTest.java | 15 +-
...ffinityFunctionExcludeNeighborsSelfTest.java | 32 -
.../GridCacheRebalancingAsyncSelfTest.java | 68 +
.../GridCacheRebalancingSyncSelfTest.java | 506 ++
...eRebalancingUnmarshallingFailedSelfTest.java | 147 +
...xcludeNeighborsMultiNodeFullApiSelfTest.java | 36 +
...tedFairAffinityMultiNodeFullApiSelfTest.java | 35 +
...xcludeNeighborsMultiNodeFullApiSelfTest.java | 36 +
...dezvousAffinityMultiNodeFullApiSelfTest.java | 36 +
.../GridCacheReplicatedPreloadSelfTest.java | 22 +-
.../continuous/GridEventConsumeSelfTest.java | 2 +-
.../DataStreamerUpdateAfterLoadTest.java | 184 +
.../GridServiceProcessorStopSelfTest.java | 103 +
...dBoundedConcurrentLinkedHashMapSelfTest.java | 2 +-
.../GridConcurrentLinkedHashMapSelfTest.java | 62 +-
.../loadtests/hashmap/GridHashMapLoadTest.java | 6 +-
...gniteClientReconnectMassiveShutdownTest.java | 329 ++
.../tcp/TcpDiscoveryMultiThreadedTest.java | 288 +-
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 17 -
.../spi/discovery/tcp/TestTcpDiscoverySpi.java | 46 +
.../inmemory/GridTestSwapSpaceSpi.java | 8 +
.../ignite/testframework/GridTestUtils.java | 4 +-
.../testframework/junits/GridAbstractTest.java | 3 +-
.../ignite/testframework/junits/IgniteMock.java | 5 +
.../junits/common/GridCommonAbstractTest.java | 44 +-
.../junits/multijvm/IgniteProcessProxy.java | 7 +-
.../IgniteCacheFullApiSelfTestSuite.java | 8 +
.../ignite/testsuites/IgniteCacheTestSuite.java | 22 +-
.../testsuites/IgniteCacheTestSuite2.java | 14 +-
.../testsuites/IgniteCacheTestSuite3.java | 4 +
.../testsuites/IgniteCacheTestSuite5.java | 40 +
.../testsuites/IgniteKernalSelfTestSuite.java | 2 +
...rrentLinkedHashMapMultiThreadedSelfTest.java | 104 +-
.../processors/query/h2/IgniteH2Indexing.java | 2 +-
.../cache/IgniteCacheAbstractQuerySelfTest.java | 4 +
...niteCacheP2pUnmarshallingQueryErrorTest.java | 32 +-
.../cache/SqlFieldsQuerySelfTest.java | 2 -
.../tcp/GridOrderedMessageCancelSelfTest.java | 18 +-
modules/jms11/pom.xml | 9 +-
.../stream/jms11/IgniteJmsStreamerTest.java | 9 +-
.../ignite/logger/log4j2/Log4J2Logger.java~ | 542 ---
.../ignite/logger/log4j2/Log4j2FileAware.java~ | 33 -
.../ignite/logger/log4j2/Log4jFileAware.java~ | 13 -
.../apache/ignite/stream/mqtt/MqttStreamer.java | 386 +-
.../stream/mqtt/IgniteMqttStreamerTest.java | 142 +-
.../mqtt/IgniteMqttStreamerTestSuite.java | 4 +-
modules/rest-http/pom.xml | 6 +
.../http/jetty/GridJettyRestProtocol.java | 4 +-
.../scala/org/apache/ignite/spark/Entity.scala | 2 +-
.../org/apache/ignite/spark/IgniteRDDSpec.scala | 249 +
.../org/apache/ignite/spark/IgniteRddSpec.scala | 249 -
.../org/apache/ignite/IgniteSpringBean.java | 10 +-
modules/ssh/pom.xml | 2 +-
.../visor/commands/open/VisorOpenCommand.scala | 14 +-
.../config/benchmark-client-mode.properties | 4 +-
.../config/benchmark-failover.properties | 107 +
.../config/benchmark-multicast.properties | 68 +-
.../yardstick/config/benchmark-store.properties | 4 +-
modules/yardstick/config/benchmark.properties | 4 +-
.../config/ignite-failover-base-config.xml | 126 +
.../config/ignite-failover-localhost-config.xml | 56 +
modules/yardstick/pom.xml | 3 +-
.../yardstick/IgniteAbstractBenchmark.java | 2 +-
.../yardstick/IgniteBenchmarkArguments.java | 66 +-
.../IgniteAccountSerializableTxBenchmark.java | 81 +
.../cache/IgniteAccountTxAbstractBenchmark.java | 61 +
.../cache/IgniteAccountTxBenchmark.java | 74 +
.../cache/IgniteCacheAbstractBenchmark.java | 15 +-
.../yardstick/cache/IgniteGetBenchmark.java | 4 +-
.../cache/IgniteJdbcSqlQueryBenchmark.java | 4 +-
.../yardstick/cache/IgnitePutAllBenchmark.java | 4 +-
.../IgnitePutAllSerializableTxBenchmark.java | 77 +
.../cache/IgnitePutAllTxBenchmark.java | 4 +-
.../yardstick/cache/IgnitePutBenchmark.java | 4 +-
.../yardstick/cache/IgnitePutGetBenchmark.java | 4 +-
.../cache/IgnitePutGetTxBenchmark.java | 4 +-
.../cache/IgnitePutIndexedValue1Benchmark.java | 4 +-
.../cache/IgnitePutIndexedValue2Benchmark.java | 4 +-
.../cache/IgnitePutIndexedValue8Benchmark.java | 4 +-
.../yardstick/cache/IgnitePutTxBenchmark.java | 14 +-
.../cache/IgnitePutTxPrimaryOnlyBenchmark.java | 65 +
.../IgnitePutTxSkipLocalBackupBenchmark.java | 65 +
.../cache/IgniteSqlQueryBenchmark.java | 4 +-
.../cache/IgniteSqlQueryJoinBenchmark.java | 4 +-
.../cache/IgniteSqlQueryPutBenchmark.java | 4 +-
.../cache/WaitMapExchangeFinishCallable.java | 95 +
.../IgniteAtomicInvokeRetryBenchmark.java | 214 +
...IgniteAtomicOffHeapInvokeRetryBenchmark.java | 31 +
.../IgniteAtomicOffHeapRetriesBenchmark.java | 31 +
.../failover/IgniteAtomicRetriesBenchmark.java | 89 +
.../IgniteFailoverAbstractBenchmark.java | 320 ++
.../cache/failover/IgniteFailoverNode.java | 60 +
...IgniteTransactionalInvokeRetryBenchmark.java | 212 +
...ransactionalOffHeapInvokeRetryBenchmark.java | 33 +
...ransactionalOffHeapWriteInvokeBenchmark.java | 37 +
...eTransactionalOffHeapWriteReadBenchmark.java | 32 +
...IgniteTransactionalWriteInvokeBenchmark.java | 182 +
.../IgniteTransactionalWriteReadBenchmark.java | 141 +
.../ignite/yardstick/cache/model/Account.java | 42 +
286 files changed, 21555 insertions(+), 8147 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/af804863/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/af804863/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/af804863/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/af804863/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/af804863/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
----------------------------------------------------------------------