You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vk...@apache.org on 2016/04/12 02:09:05 UTC
[43/43] ignite git commit: Merge branches 'ignite-2949' and 'master'
of https://git-wip-us.apache.org/repos/asf/ignite into ignite-2949
Merge branches 'ignite-2949' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-2949
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/650fa795
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/650fa795
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/650fa795
Branch: refs/heads/ignite-2949
Commit: 650fa795c062cab6adb057c870ead62efa7058a0
Parents: acb7aed 222f9c1
Author: Valentin Kulichenko <va...@gmail.com>
Authored: Mon Apr 11 17:03:40 2016 -0700
Committer: Valentin Kulichenko <va...@gmail.com>
Committed: Mon Apr 11 17:03:40 2016 -0700
----------------------------------------------------------------------
.../ClientAbstractMultiNodeSelfTest.java | 8 +-
.../ignite/cache/CacheInterceptorEntry.java | 39 +
.../ignite/cache/affinity/AffinityFunction.java | 2 +
.../cache/query/CacheQueryEntryEvent.java | 12 +-
.../store/jdbc/CacheAbstractJdbcStore.java | 4 +
.../configuration/IgniteConfiguration.java | 50 +
.../apache/ignite/internal/IgniteKernal.java | 2 +
.../ignite/internal/IgniteNodeAttributes.java | 3 +
.../ignite/internal/MarshallerContextImpl.java | 7 +-
.../internal/binary/BinaryObjectImpl.java | 52 +-
.../binary/BinaryObjectOffheapImpl.java | 40 +-
.../internal/binary/BinaryReaderExImpl.java | 62 +-
.../ignite/internal/binary/BinaryTypeImpl.java | 8 +
.../ignite/internal/binary/BinaryUtils.java | 4 +-
.../internal/binary/GridBinaryMarshaller.java | 4 +-
.../binary/builder/BinaryBuilderReader.java | 11 +-
.../communication/GridIoMessageFactory.java | 4 +-
.../discovery/GridDiscoveryManager.java | 70 +-
.../affinity/GridAffinityAssignment.java | 64 +-
.../affinity/GridAffinityAssignmentCache.java | 312 +-
.../affinity/GridAffinityProcessor.java | 8 +-
.../processors/affinity/GridAffinityUtils.java | 3 +-
.../cache/CacheAffinityChangeMessage.java | 160 ++
.../cache/CacheAffinitySharedManager.java | 1795 ++++++++++++
.../processors/cache/CacheLazyEntry.java | 47 +-
.../cache/DynamicCacheChangeRequest.java | 17 +
.../cache/DynamicCacheDescriptor.java | 49 +
.../processors/cache/GridCacheAdapter.java | 285 +-
.../cache/GridCacheAffinityManager.java | 136 +-
.../cache/GridCacheClearAllRunnable.java | 1 -
.../processors/cache/GridCacheContext.java | 2 +-
.../processors/cache/GridCacheEntryEx.java | 10 +-
.../cache/GridCacheEvictionManager.java | 18 +-
.../processors/cache/GridCacheIoManager.java | 29 +-
.../processors/cache/GridCacheMapEntry.java | 92 +-
.../cache/GridCacheMvccCandidate.java | 16 +-
.../GridCachePartitionExchangeManager.java | 167 +-
.../processors/cache/GridCachePreloader.java | 18 +-
.../cache/GridCachePreloaderAdapter.java | 12 +-
.../processors/cache/GridCacheProcessor.java | 216 +-
.../processors/cache/GridCacheProxyImpl.java | 17 +-
.../cache/GridCacheSharedContext.java | 18 +-
.../processors/cache/GridCacheUtils.java | 122 -
.../processors/cache/IgniteInternalCache.java | 9 +-
.../cache/affinity/GridCacheAffinityImpl.java | 2 +-
.../CacheDataStructuresManager.java | 4 +-
.../distributed/GridCacheCommittedTxInfo.java | 1 +
.../GridDistributedCacheAdapter.java | 2 +-
.../GridDistributedLockResponse.java | 8 -
.../GridDistributedTxFinishRequest.java | 2 +
.../GridDistributedTxRemoteAdapter.java | 9 +-
.../dht/CacheDistributedGetFutureAdapter.java | 3 -
.../dht/GridClientPartitionTopology.java | 10 +-
.../dht/GridDhtAffinityAssignmentResponse.java | 198 +-
.../dht/GridDhtAssignmentFetchFuture.java | 80 +-
.../distributed/dht/GridDhtCacheAdapter.java | 56 +-
.../cache/distributed/dht/GridDhtGetFuture.java | 2 +
.../distributed/dht/GridDhtGetSingleFuture.java | 2 +
.../distributed/dht/GridDhtLockFuture.java | 7 -
.../dht/GridDhtPartitionTopology.java | 10 +-
.../dht/GridDhtPartitionTopologyImpl.java | 328 ++-
.../dht/GridDhtTransactionalCacheAdapter.java | 9 +-
.../distributed/dht/GridDhtTxFinishFuture.java | 29 +-
.../cache/distributed/dht/GridDhtTxLocal.java | 210 +-
.../distributed/dht/GridDhtTxLocalAdapter.java | 4 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 17 +-
.../cache/distributed/dht/GridDhtTxRemote.java | 9 +-
.../dht/GridPartitionedGetFuture.java | 13 +-
.../dht/GridPartitionedSingleGetFuture.java | 13 +-
.../dht/atomic/GridDhtAtomicCache.java | 60 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 2 +-
.../dht/colocated/GridDhtColocatedCache.java | 11 +-
.../colocated/GridDhtColocatedLockFuture.java | 17 +-
.../dht/preloader/GridDhtPartitionDemander.java | 19 +-
.../dht/preloader/GridDhtPartitionMap2.java | 4 +-
.../dht/preloader/GridDhtPartitionSupplier.java | 29 +-
.../GridDhtPartitionsExchangeFuture.java | 1549 +++++-----
.../dht/preloader/GridDhtPreloader.java | 103 +-
.../distributed/near/GridNearAtomicCache.java | 4 +-
.../distributed/near/GridNearCacheAdapter.java | 2 +-
.../distributed/near/GridNearCacheEntry.java | 118 +-
.../distributed/near/GridNearGetFuture.java | 36 +-
.../distributed/near/GridNearLockFuture.java | 10 +-
...arOptimisticSerializableTxPrepareFuture.java | 5 +-
.../near/GridNearOptimisticTxPrepareFuture.java | 34 +-
...ridNearOptimisticTxPrepareFutureAdapter.java | 16 +-
.../near/GridNearTransactionalCache.java | 7 +-
.../near/GridNearTxFinishFuture.java | 123 +-
.../near/GridNearTxFinishRequest.java | 46 +-
.../cache/distributed/near/GridNearTxLocal.java | 50 +-
.../near/GridNearTxPrepareFutureAdapter.java | 2 +-
.../distributed/near/GridNearTxRemote.java | 24 +-
.../processors/cache/dr/GridCacheDrManager.java | 4 +-
.../cache/dr/GridOsCacheDrManager.java | 2 +-
.../cache/local/GridLocalCacheEntry.java | 27 -
.../cache/local/GridLocalLockFuture.java | 15 -
.../local/atomic/GridLocalAtomicCache.java | 17 +-
.../cache/query/GridCacheQueryManager.java | 15 -
.../continuous/CacheContinuousQueryHandler.java | 90 +-
.../cache/transactions/IgniteInternalTx.java | 30 +-
.../cache/transactions/IgniteTxAdapter.java | 86 +-
.../cache/transactions/IgniteTxEntry.java | 8 +-
.../cache/transactions/IgniteTxHandler.java | 33 +-
.../IgniteTxImplicitSingleStateImpl.java | 7 +-
.../transactions/IgniteTxLocalAdapter.java | 133 +-
.../cache/transactions/IgniteTxLocalEx.java | 13 +-
.../cache/transactions/IgniteTxManager.java | 93 +-
.../IgniteTxRemoteStateAdapter.java | 7 +-
.../cache/transactions/IgniteTxState.java | 5 +-
.../cache/transactions/IgniteTxStateImpl.java | 28 +-
.../cache/version/GridCacheVersion.java | 14 +-
.../cache/version/GridCacheVersionEx.java | 9 +
.../cache/version/GridCacheVersionManager.java | 21 +-
.../continuous/GridContinuousProcessor.java | 14 +-
.../datastructures/DataStructuresProcessor.java | 4 +-
.../processors/odbc/OdbcMessageParser.java | 2 +-
.../platform/PlatformContextImpl.java | 1 +
.../utils/PlatformConfigurationUtils.java | 78 +
.../service/GridServiceProcessor.java | 66 +-
.../processors/service/GridServiceProxy.java | 5 +-
.../ignite/internal/util/IgniteUtils.java | 16 +
.../internal/util/future/GridFutureAdapter.java | 3 +-
.../apache/ignite/marshaller/Marshaller.java | 6 +-
.../ignite/spi/discovery/tcp/ClientImpl.java | 2 +-
.../ignite/spi/discovery/tcp/ServerImpl.java | 171 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 24 +-
.../GridCacheAffinityBackupsSelfTest.java | 2 +-
.../affinity/AffinityClientNodeSelfTest.java | 4 +-
.../affinity/AffinityHistoryCleanupTest.java | 414 +++
.../fair/FairAffinityFunctionNodesSelfTest.java | 2 +
.../CacheJdbcPojoStoreAbstractSelfTest.java | 28 +-
...eJdbcStoreAbstractMultithreadedSelfTest.java | 25 +-
.../ignite/cache/store/jdbc/model/Person.java | 25 +
.../ignite/internal/GridAffinitySelfTest.java | 5 +-
.../GridTaskFailoverAffinityRunTest.java | 6 +-
.../IgniteClientReconnectAbstractTest.java | 15 +-
.../IgniteClientReconnectAtomicsTest.java | 8 +-
.../IgniteClientReconnectCollectionsTest.java | 4 +-
.../IgniteClientReconnectComputeTest.java | 6 +-
.../IgniteClientReconnectFailoverTest.java | 2 +
.../IgniteClientReconnectServicesTest.java | 4 +-
.../IgniteClientReconnectStreamerTest.java | 2 +-
.../internal/TestRecordingCommunicationSpi.java | 65 +-
.../BinaryObjectOffHeapUnswapTemporaryTest.java | 362 +++
.../cache/CacheAffinityCallSelfTest.java | 45 +-
...erceptorPartitionCounterLocalSanityTest.java | 687 +++++
...torPartitionCounterRandomOperationsTest.java | 1054 +++++++
.../processors/cache/CacheNamesSelfTest.java | 16 +-
...cheNearUpdateTopologyChangeAbstractTest.java | 2 +
.../cache/CacheReadThroughRestartSelfTest.java | 2 +
.../EntryVersionConsistencyReadThroughTest.java | 265 ++
.../GridCacheAbstractRemoveFailureTest.java | 10 +-
.../cache/GridCacheDeploymentSelfTest.java | 2 +
.../cache/GridCacheEntryVersionSelfTest.java | 2 +-
...ridCacheStoreManagerDeserializationTest.java | 40 +-
...acheTcpClientDiscoveryMultiThreadedTest.java | 2 +-
.../processors/cache/GridCacheTestEntryEx.java | 5 +-
.../GridCacheVersionTopologyChangeTest.java | 246 ++
.../IgniteCacheEntryProcessorNodeJoinTest.java | 147 +-
.../cache/IgniteCacheIncrementTxTest.java | 299 ++
.../IgniteCacheInterceptorSelfTestSuite.java | 2 +
.../cache/IgniteCacheNearLockValueSelfTest.java | 2 +-
.../IgniteCacheP2pUnmarshallingErrorTest.java | 1 -
...CacheP2pUnmarshallingRebalanceErrorTest.java | 36 +-
.../IgniteCacheP2pUnmarshallingTxErrorTest.java | 2 +
...ReadThroughEvictionOffheapTiredSelfTest.java | 30 +
.../IgniteCacheReadThroughEvictionSelfTest.java | 359 +++
.../IgniteClientAffinityAssignmentSelfTest.java | 2 +-
...niteDynamicCacheStartStopConcurrentTest.java | 6 +-
.../cache/IgniteTxReentryAbstractSelfTest.java | 2 +-
.../MarshallerCacheJobRunNodeRestartTest.java | 307 ++
.../GridCacheBinaryObjectsAbstractSelfTest.java | 181 +-
...eAbstractDataStructuresFailoverSelfTest.java | 12 +-
.../CacheGetInsideLockChangingTopologyTest.java | 6 +
...eLateAffinityAssignmentFairAffinityTest.java | 32 +
...ffinityAssignmentNodeJoinValidationTest.java | 134 +
.../CacheLateAffinityAssignmentTest.java | 2688 ++++++++++++++++++
.../GridCacheAbstractJobExecutionTest.java | 6 +-
.../GridCacheTransformEventSelfTest.java | 2 +-
...niteCacheClientNodeChangingTopologyTest.java | 28 +-
...teCacheClientNodePartitionsExchangeTest.java | 85 +-
.../IgniteCacheClientReconnectTest.java | 2 +
.../distributed/IgniteCacheGetRestartTest.java | 4 +
.../IgniteCacheNearRestartRollbackSelfTest.java | 28 +-
.../distributed/IgniteCachePrimarySyncTest.java | 45 +-
.../IgniteCacheReadFromBackupTest.java | 12 +-
.../IgniteCacheSingleGetMessageTest.java | 8 +-
.../IgniteTxCachePrimarySyncTest.java | 1114 ++++++++
...teSynchronizationModesMultithreadedTest.java | 422 +++
.../GridCacheDhtPreloadMessageCountTest.java | 6 +-
...idCachePartitionedPreloadEventsSelfTest.java | 11 +
...ridCachePartitionedUnloadEventsSelfTest.java | 2 +
.../dht/GridCacheTxNodeFailureSelfTest.java | 10 +-
.../IgniteCachePutRetryAbstractSelfTest.java | 4 +-
...imaryWriteOrderMultiNodeFullApiSelfTest.java | 35 +
.../near/GridCacheNearJobExecutionSelfTest.java | 2 -
.../near/GridCacheNearMultiNodeSelfTest.java | 4 +-
.../near/GridCacheNearReadersSelfTest.java | 2 +
.../near/GridCacheNearTxForceKeyTest.java | 6 +-
...LateAffDisabledMultiNodeFullApiSelfTest.java | 34 +
...achePartitionedMultiNodeCounterSelfTest.java | 43 +-
...achePartitionedMultiNodeFullApiSelfTest.java | 2 +
...idCacheRendezvousAffinityClientSelfTest.java | 2 +
.../GridCacheRebalancingSyncSelfTest.java | 83 +-
.../GridCacheReplicatedJobExecutionTest.java | 2 -
...acheContinuousQueryExecuteInPrimaryTest.java | 306 ++
...ContinuousQueryFailoverAbstractSelfTest.java | 36 +-
...BehindStorePartitionedMultiNodeSelfTest.java | 11 +-
...GridServiceProxyClientReconnectSelfTest.java | 124 +
.../GridServiceProxyNodeStopSelfTest.java | 2 +-
.../loadtests/hashmap/GridCacheTestContext.java | 2 +
.../tcp/TcpClientDiscoverySpiSelfTest.java | 8 +-
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 39 +-
.../TcpDiscoverySpiFailureTimeoutSelfTest.java | 23 +-
.../spi/discovery/tcp/TestTcpDiscoverySpi.java | 5 +-
.../testframework/junits/GridAbstractTest.java | 3 +-
.../junits/common/GridCommonAbstractTest.java | 116 +-
.../IgniteBinaryObjectsTestSuite.java | 8 +-
.../IgniteCacheFullApiSelfTestSuite.java | 6 +
.../ignite/testsuites/IgniteCacheTestSuite.java | 2 +
.../testsuites/IgniteCacheTestSuite2.java | 4 +
.../testsuites/IgniteCacheTestSuite3.java | 2 +
.../testsuites/IgniteCacheTestSuite4.java | 9 +
.../testsuites/IgniteCacheTestSuite5.java | 11 +-
.../testsuites/IgniteKernalSelfTestSuite.java | 2 +
.../processors/hadoop/HadoopContext.java | 3 +-
.../hadoop/jobtracker/HadoopJobTracker.java | 8 +-
.../child/HadoopChildProcessRunner.java | 2 +-
.../HadoopIgfs20FileSystemAbstractSelfTest.java | 2 +
.../IgniteHadoopFileSystemAbstractSelfTest.java | 2 +
.../testsuites/IgniteHadoopTestSuite.java | 4 +-
.../h2/twostep/GridReduceQueryExecutor.java | 4 +-
.../cache/IgniteClientReconnectQueriesTest.java | 4 +-
.../IgniteCacheQueryNodeRestartSelfTest2.java | 3 +
.../IgniteCacheQuerySelfTestSuite3.java | 2 +
.../Apache.Ignite.Core.Tests.NuGet.csproj | 18 +
.../Apache.Ignite.Core.Tests.NuGet.sln | 6 +
.../Apache.Ignite.Core.Tests.csproj | 59 +-
.../Binary/BinaryBuilderSelfTest.cs | 8 +-
.../Cache/Query/CacheLinqTest.cs | 14 +-
.../Continuous/ContinuousQueryAbstractTest.cs | 25 +-
.../Config/Apache.Ignite.exe.config.test2 | 2 +-
.../Config/Cache/Store/cache-store-session.xml | 3 +-
.../Config/Compute/compute-grid1.xml | 3 +-
.../Config/Compute/compute-grid2.xml | 3 +-
.../Config/Compute/compute-grid3.xml | 5 +-
.../Config/Compute/compute-standalone.xml | 4 +-
.../Config/Dynamic/dynamic-client.xml | 3 +-
.../Config/Dynamic/dynamic-data-no-cfg.xml | 3 +-
.../Config/Dynamic/dynamic-data.xml | 3 +-
.../Config/Lifecycle/lifecycle-beans.xml | 3 +-
.../Config/Lifecycle/lifecycle-no-beans.xml | 3 +-
.../Config/cache-binarizables.xml | 3 +-
.../Config/cache-local-node.xml | 3 +-
.../Config/cache-query-continuous.xml | 3 +-
.../Config/cache-query.xml | 3 +-
.../Config/ignite-dotnet-cfg.xml | 2 +-
.../Config/marshaller-default.xml | 3 +-
.../Config/marshaller-explicit.xml | 3 +-
.../Config/marshaller-invalid.xml | 3 +-
.../native-client-test-cache-affinity.xml | 3 +-
.../native-client-test-cache-parallel-store.xml | 3 +-
.../Config/native-client-test-cache-store.xml | 3 +-
.../Config/native-client-test-cache.xml | 3 +-
.../Config/reconnect-test.xml | 43 +
.../Config/start-test-grid1.xml | 3 +-
.../Config/start-test-grid2.xml | 3 +-
.../Config/start-test-grid3.xml | 3 +-
.../Apache.Ignite.Core.Tests/ExceptionsTest.cs | 5 +
.../IgniteConfigurationSerializerTest.cs | 48 +-
.../IgniteConfigurationTest.cs | 36 +-
.../Apache.Ignite.Core.Tests/ReconnectTest.cs | 5 +-
.../Apache.Ignite.Core.Tests/TestUtils.cs | 5 +-
.../dotnet/Apache.Ignite.Core.Tests/app.config | 4 +-
.../Apache.Ignite.Core.csproj | 9 +-
.../Configuration/AtomicConfiguration.cs | 58 +
.../Apache.Ignite.Core/IgniteConfiguration.cs | 114 +-
.../IgniteConfigurationSection.xsd | 24 +
.../Impl/Cluster/ClusterNodeImpl.cs | 2 +-
.../Common/IgniteConfigurationXmlSerializer.cs | 67 +-
.../Impl/Common/ObjectStringConverter.cs | 104 +
.../Apache.Ignite.Core/Impl/IgniteManager.cs | 6 +-
.../Transactions/ITransaction.cs | 3 +-
.../Transactions/TransactionConfiguration.cs | 76 +
.../Apache.Ignite.Linq.csproj | 2 +-
.../dotnet/Apache.Ignite.Linq/CompiledQuery.cs | 6 +-
.../Impl/CacheFieldsQueryExecutor.cs | 6 +-
.../NuGet/LINQPad/QueryExample.linq | 6 +-
.../Compute/ClosureExample.cs | 8 +-
.../Compute/TaskExample.cs | 11 +-
.../Datagrid/ContinuousQueryExample.cs | 8 +-
.../Datagrid/DataStreamerExample.cs | 12 +-
.../Datagrid/LinqExample.cs | 8 +-
.../Datagrid/PutGetExample.cs | 11 +-
.../Datagrid/QueryExample.cs | 13 +-
.../Datagrid/StoreExample.cs | 13 +-
.../Datagrid/TransactionExample.cs | 14 +-
.../Events/EventsExample.cs | 12 +-
.../Messaging/MessagingExample.cs | 9 +-
.../Misc/LifecycleExample.cs | 1 -
.../Services/ServicesExample.cs | 9 +-
.../dotnet/examples/Config/examples-config.xml | 2 +-
.../commands/cache/VisorCacheCommand.scala | 12 +-
303 files changed, 16345 insertions(+), 3351 deletions(-)
----------------------------------------------------------------------