Merge branch 'ignite-2.0' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-5024
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/df7da50f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/df7da50f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/df7da50f Branch: refs/heads/ignite-5024 Commit: df7da50fb641bcde607bc3f3be591ea1704fb757 Parents: 14c52e2 8a1ded1 Author: Alexey Goncharuk <[email protected]> Authored: Mon Apr 24 11:03:00 2017 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Mon Apr 24 11:03:00 2017 +0300 ---------------------------------------------------------------------- .../src/main/java/org/apache/ignite/Ignite.java | 1 - .../java/org/apache/ignite/IgniteCache.java | 11 - .../java/org/apache/ignite/IgniteCompute.java | 14 + .../store/jdbc/CacheAbstractJdbcStore.java | 29 +- .../configuration/DataPageEvictionMode.java | 10 +- .../configuration/ExecutorConfiguration.java | 115 +++++ .../configuration/IgniteConfiguration.java | 30 ++ .../org/apache/ignite/events/CacheEvent.java | 3 - .../java/org/apache/ignite/events/Event.java | 1 - .../org/apache/ignite/events/EventType.java | 109 ----- .../apache/ignite/events/SwapSpaceEvent.java | 105 ---- .../ignite/internal/ExecutorAwareMessage.java | 31 ++ .../ignite/internal/GridJobExecuteRequest.java | 32 +- .../ignite/internal/GridKernalContext.java | 8 + .../ignite/internal/GridKernalContextImpl.java | 12 + .../ignite/internal/GridTaskSessionImpl.java | 15 +- .../ignite/internal/IgniteComputeImpl.java | 71 ++- .../apache/ignite/internal/IgniteKernal.java | 3 + .../org/apache/ignite/internal/IgnitionEx.java | 66 +++ .../managers/communication/GridIoManager.java | 23 +- .../managers/communication/GridIoMessage.java | 13 + .../managers/indexing/GridIndexingManager.java | 44 -- .../processors/cache/CacheMetricsImpl.java | 21 - .../processors/cache/GridCacheAdapter.java | 6 - .../processors/cache/GridCacheAtomicFuture.java | 5 - .../processors/cache/GridCacheContext.java | 23 - .../GridCacheEntryInfoCollectSwapListener.java | 70 --- .../processors/cache/GridCacheMvccManager.java | 10 +- .../processors/cache/GridCacheProcessor.java | 12 + .../processors/cache/GridCacheProxyImpl.java | 12 - .../processors/cache/GridCacheSwapListener.java | 33 -- .../cache/GridCacheTryPutFailedException.java | 28 -- .../processors/cache/IgniteCacheProxy.java | 6 - .../processors/cache/IgniteInternalCache.java | 11 - .../IgniteCacheDatabaseSharedManager.java | 4 +- .../CacheDataStructuresManager.java | 34 ++ .../cache/distributed/dht/GridDhtGetFuture.java | 37 +- .../dht/GridPartitionedSingleGetFuture.java | 3 - .../GridDhtAtomicAbstractUpdateFuture.java | 9 +- .../dht/atomic/GridDhtAtomicCache.java | 54 +-- .../atomic/GridDhtAtomicSingleUpdateFuture.java | 3 - .../dht/atomic/GridDhtAtomicUpdateFuture.java | 3 - .../GridNearAtomicAbstractUpdateFuture.java | 79 ++- .../GridNearAtomicSingleUpdateFuture.java | 134 ++---- .../dht/atomic/GridNearAtomicUpdateFuture.java | 159 +++---- .../dht/preloader/GridDhtPreloader.java | 18 +- .../distributed/near/GridNearAtomicCache.java | 5 - .../distributed/near/GridNearCacheEntry.java | 4 +- .../cache/local/GridLocalLockFuture.java | 3 - .../cache/query/GridCacheQueryManager.java | 59 --- .../cache/store/CacheOsStoreManager.java | 3 + .../store/GridCacheStoreManagerAdapter.java | 11 +- .../closure/GridClosureProcessor.java | 154 +++--- .../datastructures/DataStructuresProcessor.java | 3 +- .../GridCacheAtomicReferenceImpl.java | 108 ++++- .../GridCacheAtomicStampedImpl.java | 70 ++- .../GridCacheCountDownLatchImpl.java | 2 +- .../datastructures/GridCacheLockImpl.java | 17 +- .../datastructures/GridCacheSemaphoreImpl.java | 240 +++++----- .../processors/job/GridJobProcessor.java | 23 +- .../internal/processors/job/GridJobWorker.java | 15 +- .../platform/PlatformContextImpl.java | 11 - .../platform/cache/PlatformCache.java | 33 +- .../platform/cluster/PlatformClusterGroup.java | 17 + .../utils/PlatformConfigurationUtils.java | 176 ++++++- .../internal/processors/pool/PoolProcessor.java | 25 + .../processors/query/GridQueryIndexing.java | 19 - .../processors/query/GridQueryProcessor.java | 234 ++++----- .../session/GridTaskSessionProcessor.java | 10 +- .../processors/task/GridTaskProcessor.java | 69 ++- .../processors/task/GridTaskWorker.java | 3 +- .../visor/cache/VisorCachePartitionsTask.java | 2 +- .../visor/node/VisorNodeDataCollectorTask.java | 4 +- .../node/VisorNodeDataCollectorTaskResult.java | 4 +- .../apache/ignite/spi/indexing/IndexingSpi.java | 19 - .../spi/indexing/noop/NoopIndexingSpi.java | 10 - .../resources/META-INF/classnames.properties | 1 - .../CacheJdbcPojoStoreAbstractSelfTest.java | 19 +- ...BinaryMarshallerStoreKeepBinarySelfTest.java | 28 ++ ...lerStoreKeepBinaryWithSqlEscapeSelfTest.java | 28 ++ .../store/jdbc/CacheJdbcPojoStoreTest.java | 4 +- .../internal/GridCacheRecreateLockTest.java | 78 --- .../internal/TestRecordingCommunicationSpi.java | 29 +- ...CacheExchangeMessageDuplicatedStateTest.java | 8 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 45 -- .../IgniteCacheConfigVariationsFullApiTest.java | 45 -- .../IgniteCacheStoreValueAbstractTest.java | 4 - .../cache/IgniteOnePhaseCommitInvokeTest.java | 10 +- .../IgniteTxExceptionAbstractSelfTest.java | 10 - ...CacheAtomicReferenceApiSelfAbstractTest.java | 4 +- ...IgniteDataStructuresNoClassOnServerTest.java | 30 ++ .../CacheLateAffinityAssignmentTest.java | 31 +- .../CacheNoValueClassOnServerNodeTest.java | 112 +---- ...tractDistributedByteArrayValuesSelfTest.java | 43 -- ...heClientMultiNodeUpdateTopologyLockTest.java | 193 ++++++++ .../IgniteCacheReadFromBackupTest.java | 15 +- .../IgniteNoClassOnServerAbstractTest.java | 135 ++++++ .../IgniteTxCachePrimarySyncTest.java | 17 +- .../dht/IgniteCacheTxRecoveryRollbackTest.java | 17 +- .../atomic/IgniteCacheAtomicProtocolTest.java | 58 +-- ...tomicClientOnlyMultiNodeFullApiSelfTest.java | 51 +- ...achePartitionedMultiNodeFullApiSelfTest.java | 59 --- .../GridCachePartitionedTxSalvageSelfTest.java | 2 +- ...idCacheReplicatedUnswapAdvancedSelfTest.java | 151 ------ .../cache/query/IndexingSpiQuerySelfTest.java | 22 - .../cache/query/IndexingSpiQueryTxSelfTest.java | 10 - ...puteCustomExecutorConfigurationSelfTest.java | 85 ++++ .../IgniteComputeCustomExecutorSelfTest.java | 245 ++++++++++ .../loadtests/cache/GridCacheSwapLoadTest.java | 320 ------------- .../ignite/testframework/GridTestNode.java | 7 + .../junits/GridTestKernalContext.java | 5 +- .../junits/common/GridCommonAbstractTest.java | 76 ++- .../multijvm/IgniteCacheProcessProxy.java | 5 - ...ObjectsCacheDataStructuresSelfTestSuite.java | 7 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 4 + .../testsuites/IgniteCacheTestSuite3.java | 2 - .../testsuites/IgniteComputeGridTestSuite.java | 7 +- modules/extdata/p2p/pom.xml | 6 + .../p2p/NoValueClassOnServerAbstractClient.java | 90 ++++ .../CacheNoValueClassOnServerTestClient.java | 79 ++- ...DataStructuresNoClassOnServerTestClient.java | 181 +++++++ .../query/h2/opt/GridH2SpatialIndex.java | 32 +- .../cache/hibernate/HibernateCacheProxy.java | 5 - .../cache/hibernate/HibernateCacheProxy.java | 5 - .../processors/query/h2/IgniteH2Indexing.java | 80 +--- .../query/h2/database/H2PkHashIndex.java | 6 +- .../query/h2/database/H2TreeIndex.java | 6 +- .../query/h2/database/InlineIndexHelper.java | 14 - .../query/h2/opt/GridH2AbstractKeyValueRow.java | 89 +--- .../query/h2/opt/GridH2IndexBase.java | 7 +- .../query/h2/opt/GridH2KeyValueRowOffheap.java | 70 --- .../query/h2/opt/GridH2MetaTable.java | 8 +- .../query/h2/opt/GridH2PrimaryScanIndex.java | 7 +- .../processors/query/h2/opt/GridH2Row.java | 2 +- .../query/h2/opt/GridH2RowDescriptor.java | 11 - .../query/h2/opt/GridH2ScanIndex.java | 4 +- .../processors/query/h2/opt/GridH2Table.java | 94 +--- .../query/h2/opt/GridH2TreeIndex.java | 7 +- .../processors/query/h2/sql/DmlAstUtils.java | 3 - .../processors/query/h2/sql/GridSqlAlias.java | 20 +- .../query/h2/sql/GridSqlQueryParser.java | 4 + .../processors/query/h2/sql/GridSqlTable.java | 46 ++ .../query/h2/twostep/GridMergeIndex.java | 1 + .../query/h2/twostep/GridMergeIndexSorted.java | 6 +- .../h2/twostep/GridMergeIndexUnsorted.java | 6 +- .../query/h2/twostep/GridMergeTable.java | 12 +- .../h2/twostep/GridReduceQueryExecutor.java | 29 -- .../query/h2/twostep/GridThreadLocalTable.java | 14 +- ...ryDuplicateIndexObjectsAbstractSelfTest.java | 159 ------- .../cache/GridCacheOffHeapSelfTest.java | 476 ------------------- .../IgniteCacheQueryMultiThreadedSelfTest.java | 25 - ...ateIndexObjectPartitionedAtomicSelfTest.java | 38 -- ...xObjectPartitionedTransactionalSelfTest.java | 41 -- .../cache/index/AbstractSchemaSelfTest.java | 44 +- .../DynamicIndexAbstractConcurrentSelfTest.java | 122 +++++ .../cache/index/SchemaExchangeSelfTest.java | 57 ++- .../query/IgniteQueryDedicatedPoolTest.java | 10 - .../query/IgniteSqlSplitterSelfTest.java | 34 +- .../h2/database/InlineIndexHelperTest.java | 8 - .../query/h2/sql/GridQueryParsingTest.java | 29 +- .../IgniteBinaryCacheQueryTestSuite.java | 5 - .../stream/kafka/connect/IgniteSourceTask.java | 4 - .../ExpiryCacheHolderTest.cs | 10 + .../Apache.Ignite.Core.Tests.csproj | 1 + .../Cache/Affinity/AffinityFunctionTest.cs | 2 +- .../Cache/CacheAbstractTest.cs | 58 --- .../Cache/CacheConfigurationTest.cs | 21 +- .../Cache/CacheTestAsyncWrapper.cs | 22 +- .../Cache/PartitionLossTest.cs | 260 ++++++++++ .../IgniteConfigurationSerializerTest.cs | 57 ++- .../IgniteConfigurationTest.cs | 56 +++ .../Apache.Ignite.Core.Tests/TestUtils.cs | 5 +- .../Apache.Ignite.Core.csproj | 4 + .../Cache/Configuration/CacheConfiguration.cs | 35 ++ .../Cache/Configuration/DataPageEvictionMode.cs | 59 +++ .../Cache/Configuration/MemoryConfiguration.cs | 151 ++++++ .../Configuration/MemoryPolicyConfiguration.cs | 119 +++++ .../Cache/Configuration/PartitionLossPolicy.cs | 68 +++ .../dotnet/Apache.Ignite.Core/Cache/ICache.cs | 21 +- .../dotnet/Apache.Ignite.Core/IIgnite.cs | 12 + .../Apache.Ignite.Core/IgniteConfiguration.cs | 21 + .../IgniteConfigurationSection.xsd | 107 +++++ .../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs | 56 ++- .../Apache.Ignite.Core/Impl/Cache/CacheOp.cs | 6 +- .../Impl/Cluster/ClusterGroupImpl.cs | 27 ++ .../Impl/Common/DelegateConverter.cs | 1 + .../dotnet/Apache.Ignite.Core/Impl/Ignite.cs | 16 +- .../Apache.Ignite.Core/Impl/IgniteUtils.cs | 10 +- .../Apache.Ignite.Core/Impl/NativeMethods.cs | 6 + .../Impl/Unmanaged/UnmanagedUtils.cs | 8 +- modules/spring-data/pom.xml | 2 +- .../support/IgniteRepositoryFactoryBean.java | 7 + modules/web-console/backend/index.js | 5 +- parent/pom.xml | 6 +- 194 files changed, 4311 insertions(+), 3819 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/df7da50f/modules/core/src/main/java/org/apache/ignite/configuration/DataPageEvictionMode.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/configuration/DataPageEvictionMode.java index 661e03e,0d1b5b9..2c64d45 --- a/modules/core/src/main/java/org/apache/ignite/configuration/DataPageEvictionMode.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/DataPageEvictionMode.java @@@ -31,12 -31,12 +31,12 @@@ public enum DataPageEvictionMode * <ul> * <li>Once a memory region defined by a memory policy is configured, an off-heap array is allocated to track * last usage timestamp for every individual data page. The size of the array is calculated this way - size = - * ({@link MemoryPolicyConfiguration#getSize()} / {@link MemoryConfiguration#pageSize})</li> + * ({@link MemoryPolicyConfiguration#getMaxSize()} / {@link MemoryConfiguration#pageSize})</li> * <li>When a data page is accessed, its timestamp gets updated in the tracking array. The page index in the - * tracking array is calculated this way - index = (pageAddress / {@link MemoryPolicyConfiguration#getSize()}</li> + * tracking array is calculated this way - index = (pageAddress / {@link MemoryPolicyConfiguration#getMaxSize()}</li> * <li>When it's required to evict some pages, the algorithm randomly chooses 5 indexes from the tracking array and * evicts a page with the latest timestamp. If some of the indexes point to non-data pages (index or system pages) - * then the algorithm peaks another ones.</li> + * then the algorithm picks other pages.</li> * </ul> */ RANDOM_LRU, http://git-wip-us.apache.org/repos/asf/ignite/blob/df7da50f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/IgniteCacheDatabaseSharedManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/df7da50f/modules/extdata/p2p/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/df7da50f/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/database/InlineIndexHelperTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/df7da50f/modules/spring-data/pom.xml ----------------------------------------------------------------------
