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/10 13:53:45 UTC
[49/50] [abbrv] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-1.5' into ignite-1758-debug
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1758-debug
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d008063e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d008063e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d008063e
Branch: refs/heads/ignite-1758-debug
Commit: d008063e31ad2383b558961044f2bb8d12856e55
Parents: 43c1530 37cafb6
Author: sboikov <sb...@gridgain.com>
Authored: Tue Nov 10 15:50:28 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Nov 10 15:50:28 2015 +0300
----------------------------------------------------------------------
.../java8/messaging/MessagingExample.java | 7 +-
.../rest/AbstractRestProcessorSelfTest.java | 5 +-
.../JettyRestProcessorAbstractSelfTest.java | 142 +-
.../src/main/java/org/apache/ignite/Ignite.java | 12 +-
.../java/org/apache/ignite/IgniteCache.java | 1 +
.../eviction/random/RandomEvictionPolicy.java | 4 +
.../configuration/CacheConfiguration.java | 54 +-
.../configuration/ConnectorConfiguration.java | 61 +-
.../configuration/IgniteConfiguration.java | 32 +-
.../apache/ignite/internal/IgniteKernal.java | 54 +-
.../org/apache/ignite/internal/IgnitionEx.java | 3 +
.../managers/communication/GridIoMessage.java | 4 +-
.../communication/GridIoMessageFactory.java | 10 +-
.../discovery/GridDiscoveryManager.java | 5 +-
.../affinity/GridAffinityAssignmentCache.java | 13 +
.../processors/cache/GridCacheAdapter.java | 22 +-
.../cache/GridCacheAffinityManager.java | 28 +-
.../processors/cache/GridCacheContext.java | 29 +-
.../processors/cache/GridCacheEntryEx.java | 4 +-
.../processors/cache/GridCacheIoManager.java | 19 +-
.../processors/cache/GridCacheMapEntry.java | 91 +-
.../processors/cache/GridCacheMvccManager.java | 145 +-
.../GridCachePartitionExchangeManager.java | 188 ++-
.../processors/cache/GridCachePreloader.java | 60 +-
.../cache/GridCachePreloaderAdapter.java | 45 +-
.../processors/cache/GridCacheProcessor.java | 74 +-
.../processors/cache/IgniteCacheProxy.java | 6 +
.../distributed/GridDistributedCacheEntry.java | 2 +-
.../distributed/GridDistributedTxMapping.java | 8 +-
.../GridDistributedTxRemoteAdapter.java | 5 +-
.../distributed/dht/GridDhtCacheEntry.java | 11 +-
.../distributed/dht/GridDhtLocalPartition.java | 71 +-
.../distributed/dht/GridDhtLockFuture.java | 7 +-
.../dht/GridDhtPartitionsReservation.java | 2 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 13 +-
.../distributed/dht/GridDhtTxLocalAdapter.java | 43 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 78 +-
.../cache/distributed/dht/GridDhtTxRemote.java | 45 +-
.../dht/atomic/GridDhtAtomicCache.java | 1 -
.../dht/colocated/GridDhtColocatedCache.java | 7 +-
.../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 | 2 +
.../dht/preloader/GridDhtPreloader.java | 299 +++-
.../near/GridNearOptimisticTxPrepareFuture.java | 11 +-
.../near/GridNearTransactionalCache.java | 7 +-
.../near/GridNearTxFinishFuture.java | 157 +-
.../cache/distributed/near/GridNearTxLocal.java | 21 +-
.../cache/transactions/IgniteInternalTx.java | 3 +-
.../cache/transactions/IgniteTxAdapter.java | 251 ++--
.../cache/transactions/IgniteTxHandler.java | 37 +-
.../transactions/IgniteTxLocalAdapter.java | 26 +-
.../cache/transactions/IgniteTxManager.java | 171 ++-
.../datastructures/DataStructuresProcessor.java | 3 +
.../GridCacheAtomicReferenceImpl.java | 2 +-
.../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 +-
.../ignite/internal/visor/cache/VisorCache.java | 5 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +-
.../java/org/jsr166/ConcurrentHashMap8.java | 2 +-
.../java/org/jsr166/ConcurrentLinkedDeque8.java | 2 +-
.../org/jsr166/ConcurrentLinkedHashMap.java | 195 ++-
.../GridCacheAffinityBackupsSelfTest.java | 8 +
.../store/GridCacheBalancingStoreSelfTest.java | 181 ++-
.../GridTaskFailoverAffinityRunTest.java | 3 +
.../processors/cache/CacheNamesSelfTest.java | 69 +
.../cache/GridCacheAbstractFullApiSelfTest.java | 4 +-
.../GridCacheAbstractRemoveFailureTest.java | 4 +-
.../GridCacheMissingCommitVersionSelfTest.java | 40 +-
.../processors/cache/GridCacheTestEntryEx.java | 3 +-
.../IgniteCacheP2pUnmarshallingErrorTest.java | 2 +-
.../cache/IgniteCacheTxNearPeekModesTest.java | 7 +-
.../cache/IgniteCacheTxPeekModesTest.java | 5 +
...CacheAtomicReferenceApiSelfAbstractTest.java | 20 +-
.../CacheGetFutureHangsSelfTest.java | 3 +-
...niteCacheClientNodeChangingTopologyTest.java | 6 +-
.../dht/GridCacheTxNodeFailureSelfTest.java | 21 +-
.../IgniteCacheCrossCacheTxFailoverTest.java | 4 +-
.../IgniteCachePutRetryAbstractSelfTest.java | 4 +-
...ledFairAffinityMultiNodeFullApiSelfTest.java | 5 -
...omicNearEnabledMultiNodeFullApiSelfTest.java | 5 -
...icOffHeapTieredMultiNodeFullApiSelfTest.java | 5 -
.../near/GridCacheNearTxExceptionSelfTest.java | 15 +
...achePartitionedMultiNodeFullApiSelfTest.java | 2 +-
.../GridCacheRebalancingAsyncSelfTest.java | 68 +
.../GridCacheRebalancingSyncSelfTest.java | 506 +++++++
...eRebalancingUnmarshallingFailedSelfTest.java | 147 ++
.../GridCacheReplicatedPreloadSelfTest.java | 22 +-
.../continuous/GridEventConsumeSelfTest.java | 2 +-
.../GridServiceProcessorStopSelfTest.java | 103 ++
...dBoundedConcurrentLinkedHashMapSelfTest.java | 2 +-
.../GridConcurrentLinkedHashMapSelfTest.java | 62 +-
...gniteClientReconnectMassiveShutdownTest.java | 15 +-
.../tcp/TcpDiscoveryMultiThreadedTest.java | 148 +-
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 17 -
.../spi/discovery/tcp/TestTcpDiscoverySpi.java | 46 +
.../ignite/testframework/GridTestUtils.java | 4 +-
.../testframework/junits/GridAbstractTest.java | 3 +-
.../ignite/testframework/junits/IgniteMock.java | 5 +
.../junits/common/GridCommonAbstractTest.java | 25 +-
.../junits/multijvm/IgniteProcessProxy.java | 7 +-
.../ignite/testsuites/IgniteCacheTestSuite.java | 2 +
.../testsuites/IgniteCacheTestSuite3.java | 4 +
.../testsuites/IgniteKernalSelfTestSuite.java | 2 +
...rrentLinkedHashMapMultiThreadedSelfTest.java | 104 +-
.../processors/query/h2/IgniteH2Indexing.java | 2 +-
.../cache/SqlFieldsQuerySelfTest.java | 2 -
.../tcp/GridOrderedMessageCancelSelfTest.java | 18 +-
.../ignite/logger/log4j2/Log4J2Logger.java~ | 542 -------
.../ignite/logger/log4j2/Log4j2FileAware.java~ | 33 -
.../ignite/logger/log4j2/Log4jFileAware.java~ | 13 -
modules/rest-http/pom.xml | 17 +
.../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 | 71 +-
.../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 +
.../yardstick/config/ignite-store-config.xml | 31 +-
modules/yardstick/pom.xml | 3 +-
.../yardstick/IgniteAbstractBenchmark.java | 2 +-
.../yardstick/IgniteBenchmarkArguments.java | 66 +-
.../cache/IgniteCacheAbstractBenchmark.java | 8 +-
.../yardstick/cache/IgniteGetBenchmark.java | 4 +-
.../cache/IgniteJdbcSqlQueryBenchmark.java | 4 +-
.../yardstick/cache/IgnitePutAllBenchmark.java | 4 +-
.../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 ++
177 files changed, 8889 insertions(+), 4071 deletions(-)
----------------------------------------------------------------------