Merge remote-tracking branch 'remotes/origin/master' into ignite-3478 # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/RowStore.java # modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3155f6bc Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3155f6bc Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3155f6bc Branch: refs/heads/ignite-5937 Commit: 3155f6bc8884f61d786dc4ef24c4925fd10fc8c5 Parents: 7bd6275 93be8ea Author: sboikov <[email protected]> Authored: Wed Oct 25 12:39:23 2017 +0300 Committer: sboikov <[email protected]> Committed: Wed Oct 25 12:39:23 2017 +0300 ---------------------------------------------------------------------- RELEASE_NOTES.txt | 98 +++ assembly/dependencies-fabric-lgpl.xml | 4 + assembly/dependencies-fabric.xml | 4 + assembly/dependencies-sqlline.xml | 15 +- examples/config/example-data-regions.xml | 106 +++ examples/config/example-memory-policies.xml | 108 --- .../example-persistent-store.xml | 14 +- examples/config/redis/example-redis.xml | 74 ++ examples/redis/redis-example.py | 16 +- .../examples/datagrid/DataRegionsExample.java | 113 +++ .../datagrid/MemoryPoliciesExample.java | 114 --- .../persistentstore/PersistentStoreExample.java | 2 +- .../examples/ScalarCreditRiskExample.scala | 4 +- .../ignite/examples/CacheExamplesSelfTest.java | 6 +- .../benchmarks/jmh/tree/BPlusTreeBenchmark.java | 8 +- .../internal/jdbc2/JdbcMetadataSelfTest.java | 12 + .../jdbc/thin/JdbcThinMetadataSelfTest.java | 14 + modules/compatibility/pom.xml | 13 + .../DummyPersistenceCompatibilityTest.java | 8 +- .../junits/IgniteCompatibilityAbstractTest.java | 6 +- .../junits/IgniteCompatibilityNodeRunner.java | 2 +- .../org/apache/ignite/DataRegionMetrics.java | 130 +++ .../apache/ignite/DataRegionMetricsAdapter.java | 106 +++ .../org/apache/ignite/DataStorageMetrics.java | 114 +++ .../ignite/DataStorageMetricsAdapter.java | 101 +++ .../src/main/java/org/apache/ignite/Ignite.java | 48 +- .../apache/ignite/IgniteSystemProperties.java | 4 +- .../java/org/apache/ignite/MemoryMetrics.java | 11 +- .../org/apache/ignite/PersistenceMetrics.java | 4 +- .../configuration/CacheConfiguration.java | 36 +- .../configuration/DataPageEvictionMode.java | 8 +- .../configuration/DataRegionConfiguration.java | 406 +++++++++ .../configuration/DataStorageConfiguration.java | 882 +++++++++++++++++++ .../configuration/IgniteConfiguration.java | 46 +- .../configuration/MemoryConfiguration.java | 9 +- .../MemoryPolicyConfiguration.java | 32 +- .../PersistentStoreConfiguration.java | 4 +- .../org/apache/ignite/igfs/IgfsMetrics.java | 4 +- .../apache/ignite/internal/IgniteKernal.java | 77 +- .../ignite/internal/IgniteNodeAttributes.java | 4 + .../org/apache/ignite/internal/IgnitionEx.java | 132 ++- .../ignite/internal/MarshallerContextImpl.java | 3 +- .../jdbc/thin/JdbcThinDatabaseMetadata.java | 89 +- .../internal/jdbc2/JdbcDatabaseMetadata.java | 104 ++- .../discovery/GridDiscoveryManager.java | 31 +- .../pagemem/impl/PageMemoryNoStoreImpl.java | 32 +- .../cache/CacheAffinitySharedManager.java | 10 +- .../processors/cache/CacheGroupContext.java | 29 +- .../processors/cache/CacheGroupData.java | 17 +- .../processors/cache/CacheGroupDescriptor.java | 19 +- .../processors/cache/ClusterCachesInfo.java | 13 +- .../cache/DynamicCacheChangeRequest.java | 18 + .../processors/cache/GridCacheAdapter.java | 20 +- .../cache/GridCacheAffinityManager.java | 2 +- .../processors/cache/GridCacheContext.java | 8 +- .../processors/cache/GridCacheMapEntry.java | 10 +- .../processors/cache/GridCacheProcessor.java | 153 +++- .../processors/cache/GridCacheUtils.java | 55 ++ .../cache/IgniteCacheOffheapManagerImpl.java | 6 +- .../cache/binary/BinaryMetadataFileStore.java | 7 +- .../binary/CacheObjectBinaryProcessorImpl.java | 10 +- .../GridDistributedTxRemoteAdapter.java | 5 +- .../distributed/dht/GridDhtLocalPartition.java | 2 +- .../dht/atomic/GridDhtAtomicCache.java | 3 +- .../distributed/near/GridNearGetRequest.java | 2 +- .../distributed/near/GridNearLockRequest.java | 2 +- .../cache/distributed/near/GridNearTxLocal.java | 2 +- .../near/GridNearTxPrepareRequest.java | 2 +- .../local/atomic/GridLocalAtomicCache.java | 2 +- .../cache/persistence/CacheDataRowAdapter.java | 5 +- .../cache/persistence/DataRegion.java | 84 ++ .../persistence/DataRegionMetricsImpl.java | 304 +++++++ .../DataRegionMetricsMXBeanImpl.java | 136 +++ .../persistence/DataRegionMetricsSnapshot.java | 121 +++ .../persistence/DataStorageMetricsImpl.java | 297 +++++++ .../persistence/DataStorageMetricsSnapshot.java | 144 +++ .../GridCacheDatabaseSharedManager.java | 166 ++-- .../persistence/GridCacheOffheapManager.java | 22 +- .../IgniteCacheDatabaseSharedManager.java | 550 +++++------- .../cache/persistence/MemoryMetricsImpl.java | 286 ------ .../persistence/MemoryMetricsMXBeanImpl.java | 131 --- .../persistence/MemoryMetricsSnapshot.java | 112 --- .../cache/persistence/MemoryPolicy.java | 84 -- .../persistence/PersistenceMetricsImpl.java | 297 ------- .../persistence/PersistenceMetricsSnapshot.java | 144 --- .../processors/cache/persistence/RowStore.java | 34 +- .../evict/FairFifoPageEvictionTracker.java | 6 +- .../evict/PageAbstractEvictionTracker.java | 6 +- .../evict/Random2LruPageEvictionTracker.java | 8 +- .../evict/RandomLruPageEvictionTracker.java | 8 +- .../persistence/file/AsyncFileIOFactory.java | 28 +- .../cache/persistence/file/FilePageStore.java | 6 +- .../persistence/file/FilePageStoreManager.java | 74 +- .../cache/persistence/file/FilePageStoreV2.java | 4 +- .../file/FileVersionCheckingFactory.java | 6 +- .../filename/PdsConsistentIdProcessor.java | 11 +- .../persistence/freelist/FreeListImpl.java | 12 +- .../cache/persistence/freelist/PagesList.java | 7 +- .../persistence/pagemem/PageMemoryImpl.java | 56 +- .../snapshot/IgniteCacheSnapshotManager.java | 3 + .../wal/FileWriteAheadLogManager.java | 77 +- .../wal/reader/IgniteWalIteratorFactory.java | 12 +- .../wal/reader/StandaloneGridKernalContext.java | 11 +- .../wal/serializer/RecordV2Serializer.java | 3 +- .../cache/ratemetrics/HitRateMetrics.java | 2 +- .../transactions/IgniteTxLocalAdapter.java | 2 +- .../processors/cache/tree/CacheDataTree.java | 4 +- .../cache/tree/PendingEntriesTree.java | 2 +- .../cluster/GridClusterStateProcessor.java | 3 +- .../processors/igfs/IgfsDataManager.java | 4 +- .../platform/cluster/PlatformClusterGroup.java | 90 ++ .../utils/PlatformConfigurationUtils.java | 200 ++++- .../processors/query/GridQueryProcessor.java | 9 +- .../ignite/internal/util/IgniteUtils.java | 62 +- .../visor/cache/VisorCacheConfiguration.java | 17 +- .../visor/cache/VisorMemoryMetrics.java | 6 +- .../node/VisorDataRegionConfiguration.java | 225 +++++ .../node/VisorDataStorageConfiguration.java | 453 ++++++++++ .../visor/node/VisorGridConfiguration.java | 29 +- .../visor/node/VisorMemoryConfiguration.java | 26 +- .../node/VisorMemoryPolicyConfiguration.java | 10 +- .../visor/node/VisorNodeDataCollectorJob.java | 6 +- .../node/VisorNodeDataCollectorJobResult.java | 4 +- .../node/VisorNodeDataCollectorTaskResult.java | 4 +- .../visor/node/VisorPersistenceMetrics.java | 8 +- .../node/VisorPersistentStoreConfiguration.java | 22 +- .../ignite/mxbean/DataRegionMetricsMXBean.java | 143 +++ .../ignite/mxbean/DataStorageMetricsMXBean.java | 121 +++ .../ignite/mxbean/MemoryMetricsMXBean.java | 2 + .../ignite/mxbean/PersistenceMetricsMXBean.java | 2 + .../spi/discovery/IgniteDiscoveryThread.java | 23 + .../ignite/spi/discovery/tcp/ServerImpl.java | 48 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 18 + .../resources/META-INF/classnames.properties | 6 +- .../core/src/test/config/examples.properties | 2 +- .../ignite/cache/LargeEntryUpdateTest.java | 6 +- .../internal/ClusterNodeMetricsSelfTest.java | 8 +- .../IgniteSlowClientDetectionSelfTest.java | 6 +- .../internal/TestRecordingCommunicationSpi.java | 12 + .../pagemem/impl/PageMemoryNoLoadSelfTest.java | 8 +- .../cache/CacheClientStoreSelfTest.java | 4 +- .../cache/CacheConfigurationLeakTest.java | 15 +- .../cache/CacheDataRegionConfigurationTest.java | 172 ++++ .../CacheMemoryPolicyConfigurationTest.java | 172 ---- .../cache/CacheRebalancingSelfTest.java | 41 +- .../cache/CacheStopAndDestroySelfTest.java | 10 +- ...StorageConfigurationConsistencySelfTest.java | 79 ++ ...dMemoryConfigurationConsistencySelfTest.java | 79 -- .../IgniteClusterActivateDeactivateTest.java | 32 +- ...erActivateDeactivateTestWithPersistence.java | 30 +- ...niteTopologyValidatorGridSplitCacheTest.java | 358 ++++++-- .../cache/MemoryPolicyConfigValidationTest.java | 24 +- ...AffinityCoordinatorDynamicStartStopTest.java | 15 +- .../distributed/Cache64kPartitionsTest.java | 14 +- .../CacheLateAffinityAssignmentTest.java | 9 +- .../cache/distributed/CacheStartOnJoinTest.java | 9 +- .../IgniteCacheTopologySplitAbstractTest.java | 266 ++++++ .../paged/PageEvictionAbstractTest.java | 25 +- .../PageEvictionMultinodeMixedRegionsTest.java | 59 ++ .../expiry/IgniteCacheLargeValueExpireTest.java | 6 +- .../IgniteDataStorageMetricsSelfTest.java | 237 +++++ ...tePdsBinaryMetadataOnClusterRestartTest.java | 10 +- .../IgnitePdsCacheRebalancingAbstractTest.java | 25 +- .../IgnitePdsClientNearCachePutGetTest.java | 6 +- .../IgnitePdsContinuousRestartTest.java | 28 +- .../persistence/IgnitePdsDynamicCacheTest.java | 28 +- .../IgnitePdsExchangeDuringCheckpointTest.java | 41 +- ...MarshallerMappingRestoreOnNodeStartTest.java | 6 +- .../IgnitePdsMultiNodePutGetRestartTest.java | 24 +- .../persistence/IgnitePdsPageSizesTest.java | 29 +- ...gnitePdsRecoveryAfterFileCorruptionTest.java | 39 +- .../IgnitePdsRemoveDuringRebalancingTest.java | 35 +- ...gnitePdsSingleNodePutGetPersistenceTest.java | 6 +- .../IgnitePersistenceMetricsSelfTest.java | 225 ----- ...nitePersistenceSequentialCheckpointTest.java | 6 +- .../IgnitePersistentStoreCacheGroupsTest.java | 16 +- ...IgnitePersistentStoreDataStructuresTest.java | 23 +- .../MemoryPolicyInitializationTest.java | 22 +- .../db/IgnitePdsCacheRestoreTest.java | 45 +- .../db/IgnitePdsMultiNodePutGetRestartTest.java | 23 +- ...PdsPageEvictionDuringPartitionClearTest.java | 29 +- .../db/IgnitePdsPageEvictionTest.java | 30 +- ...tePdsRebalancingOnNotStableTopologyTest.java | 28 +- .../db/IgnitePdsTransactionsHangTest.java | 26 +- .../db/IgnitePdsWholeClusterRestartTest.java | 28 +- ...faultPageSizeBackwardsCompatibilityTest.java | 21 +- .../db/file/IgnitePdsCacheIntegrationTest.java | 29 +- ...ckpointSimulationWithRealCpDisabledTest.java | 25 +- .../db/file/IgnitePdsEvictionTest.java | 25 +- .../file/IgnitePdsNoActualWalHistoryTest.java | 22 +- .../file/IgnitePdsThreadInterruptionTest.java | 51 +- .../IgniteUidAsConsistentIdMigrationTest.java | 28 +- .../persistence/db/wal/IgnitePdsWalTlbTest.java | 30 +- .../db/wal/IgniteWalFlushFailoverTest.java | 29 +- .../wal/IgniteWalHistoryReservationsTest.java | 26 +- .../db/wal/IgniteWalRecoveryPPCTest.java | 321 +++++++ .../IgniteWalRecoverySeveralRestartsTest.java | 29 +- .../db/wal/IgniteWalRecoveryTest.java | 33 +- .../db/wal/IgniteWalSerializerVersionTest.java | 8 +- .../db/wal/WalRecoveryTxLogicalRecordsTest.java | 18 +- .../db/wal/reader/IgniteWalReaderTest.java | 50 +- .../db/wal/reader/MockWalIteratorFactory.java | 14 +- .../pagemem/BPlusTreePageMemoryImplTest.java | 6 +- .../BPlusTreeReuseListPageMemoryImplTest.java | 6 +- .../MetadataStoragePageMemoryImplTest.java | 6 +- .../pagemem/PageMemoryImplNoLoadTest.java | 6 +- .../persistence/pagemem/PageMemoryImplTest.java | 6 +- .../pagemem/PagesWriteThrottleSandboxTest.java | 40 +- .../pagemem/PagesWriteThrottleSmokeTest.java | 42 +- .../AbstractNodeJoinTemplate.java | 8 +- .../IgniteChangeGlobalStateAbstractTest.java | 31 +- .../IgniteChangeGlobalStateServiceTest.java | 2 + .../IgniteStandByClusterTest.java | 12 +- .../extended/GridActivateExtensionTest.java | 34 +- ...gniteAbstractStandByClientReconnectTest.java | 9 +- ...niteCacheContinuousQueryBackupQueueTest.java | 6 +- .../cache/transactions/TxDeadlockCauseTest.java | 15 +- .../TxPessimisticDeadlockDetectionTest.java | 21 +- .../processors/database/BPlusTreeSelfTest.java | 8 +- .../database/DataRegionMetricsSelfTest.java | 348 ++++++++ .../database/FreeListImplSelfTest.java | 16 +- .../database/IgniteDbAbstractTest.java | 10 +- .../database/IgniteDbDynamicCacheSelfTest.java | 18 +- .../IgniteDbMemoryLeakAbstractTest.java | 14 +- .../database/MemoryMetricsSelfTest.java | 348 -------- .../database/MetadataStorageSelfTest.java | 8 +- .../database/SwapPathConstructionSelfTest.java | 28 +- .../processors/igfs/IgfsIgniteMock.java | 25 +- .../processors/igfs/IgfsSizeSelfTest.java | 12 +- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 110 +++ .../ignite/testframework/junits/IgniteMock.java | 25 +- .../junits/multijvm/IgniteProcessProxy.java | 25 +- .../ignite/testsuites/IgniteBasicTestSuite.java | 4 +- .../IgniteCacheEvictionSelfTestSuite.java | 3 + .../ignite/testsuites/IgniteCacheTestSuite.java | 4 +- .../testsuites/IgniteCacheTestSuite2.java | 4 +- .../ignite/testsuites/IgnitePdsTestSuite2.java | 4 +- .../query/h2/database/H2TreeIndex.java | 2 +- .../query/h2/ddl/DdlStatementsProcessor.java | 2 +- .../query/h2/sql/GridSqlCreateTable.java | 17 + .../query/h2/sql/GridSqlQueryParser.java | 10 + ...leNodeWithIndexingPutGetPersistenceTest.java | 6 +- ...stributedPartitionQueryAbstractSelfTest.java | 8 +- .../IgniteCacheQueryNodeRestartSelfTest2.java | 8 +- .../cache/index/DynamicColumnsAbstractTest.java | 16 +- .../index/DynamicIndexAbstractSelfTest.java | 16 +- .../cache/index/H2DynamicTableSelfTest.java | 40 +- .../cache/index/LongIndexNameTest.java | 4 +- ...eDbSingleNodeWithIndexingWalRestoreTest.java | 11 +- ...oreQueryWithMultipleClassesPerCacheTest.java | 8 +- .../IgnitePersistentStoreSchemaLoadTest.java | 13 +- .../query/IgniteSqlNotNullConstraintTest.java | 4 +- .../h2/database/InlineIndexHelperTest.java | 20 +- .../IgnitePdsWithIndexingCoreTestSuite.java | 3 + .../Apache.Ignite.Core.Tests.csproj | 13 +- .../ApiParity/CacheConfigurationParityTest.cs | 86 ++ .../ClientConnectorConfigurationParityTest.cs | 39 + .../DataRegionConfigurationParityTest.cs | 39 + .../DataStorageConfigurationParityTest.cs | 53 ++ .../ApiParity/IgniteConfigurationParityTest.cs | 98 +++ .../ApiParity/ParityTest.cs | 135 +++ .../QueryEntityConfigurationParityTest.cs | 49 ++ .../BasicSerializableObjectsTest.cs | 3 +- .../Cache/Affinity/AffinityAttributeTest.cs | 135 +++ .../Cache/Affinity/AffinityFieldTest.cs | 35 +- .../Cache/CacheConfigurationTest.cs | 18 +- .../Cache/DataRegionMetricsTest.cs | 153 ++++ .../Cache/DataStorageMetricsTest.cs | 107 +++ .../Cache/MemoryMetricsTest.cs | 1 + .../Cache/PersistenceTest.cs | 235 +++++ .../Cache/PersistentStoreTest.cs | 189 ---- .../Cache/PersistentStoreTestObsolete.cs | 190 ++++ .../Config/full-config.xml | 21 + .../Config/spring-test.xml | 18 +- .../Apache.Ignite.Core.Tests/DeploymentTest.cs | 33 +- .../IgniteConfigurationSerializerTest.cs | 148 +++- .../IgniteConfigurationTest.cs | 232 +++-- .../IgniteManagerTest.cs | 10 +- .../Apache.Ignite.Core.Tests/TestUtils.cs | 49 +- .../Apache.Ignite.Core.csproj | 12 + .../Affinity/AffinityKeyMappedAttribute.cs | 26 +- .../Cache/Configuration/CacheConfiguration.cs | 65 +- .../Configuration/CacheKeyConfiguration.cs | 84 ++ .../Cache/Configuration/DataPageEvictionMode.cs | 3 + .../Cache/Configuration/MemoryConfiguration.cs | 5 + .../Configuration/MemoryPolicyConfiguration.cs | 3 + .../Cache/Configuration/QueryEntity.cs | 34 +- .../Apache.Ignite.Core/Cache/IMemoryMetrics.cs | 4 + .../Configuration/CheckpointWriteOrder.cs | 37 + .../Configuration/DataPageEvictionMode.cs | 59 ++ .../Configuration/DataRegionConfiguration.cs | 213 +++++ .../Configuration/DataStorageConfiguration.cs | 466 ++++++++++ .../Apache.Ignite.Core/Configuration/WalMode.cs | 45 + .../Apache.Ignite.Core/IDataRegionMetrics.cs | 55 ++ .../Apache.Ignite.Core/IDataStorageMetrics.cs | 87 ++ .../dotnet/Apache.Ignite.Core/IIgnite.cs | 33 + .../Apache.Ignite.Core/IgniteConfiguration.cs | 58 +- .../IgniteConfigurationSection.xsd | 299 ++++++- .../Impl/Binary/BinaryFullTypeDescriptor.cs | 19 +- .../Impl/Binary/BinaryReaderExtensions.cs | 27 + .../Binary/BinarySurrogateTypeDescriptor.cs | 8 +- .../Impl/Binary/BinaryUtils.cs | 2 + .../Impl/Binary/BinaryWriterExtensions.cs | 29 + .../Impl/Binary/IBinaryRawWriteAware.cs | 42 + .../Impl/Binary/IBinaryTypeDescriptor.cs | 6 +- .../Impl/Binary/Marshaller.cs | 23 +- .../Impl/Binary/ReflectionUtils.cs | 27 + .../Impl/Binary/Structure/BinaryStructure.cs | 147 ++-- .../Binary/Structure/BinaryStructureTracker.cs | 16 +- .../Impl/Cache/MemoryMetrics.cs | 2 + .../Impl/Cluster/ClusterGroupImpl.cs | 53 ++ .../Common/IgniteConfigurationXmlSerializer.cs | 11 +- .../Impl/DataRegionMetrics.cs | 61 ++ .../Impl/DataStorageMetrics.cs | 87 ++ .../dotnet/Apache.Ignite.Core/Impl/Ignite.cs | 22 + .../PersistentStore/PersistentStoreMetrics.cs | 2 + .../PersistentStore/CheckpointWriteOrder.cs | 3 + .../PersistentStore/IPersistentStoreMetrics.cs | 2 + .../PersistentStoreConfiguration.cs | 4 + .../PersistentStore/WalMode.cs | 3 + .../http/jetty/GridJettyObjectMapper.java | 3 + .../org/apache/ignite/IgniteSpringBean.java | 27 +- modules/sqlline/bin/ignitesql.bat | 112 --- modules/sqlline/bin/ignitesql.sh | 54 -- modules/sqlline/bin/sqlline.bat | 112 +++ modules/sqlline/bin/sqlline.sh | 54 ++ modules/sqlline/licenses/apache-2.0.txt | 202 +++++ modules/sqlline/pom.xml | 27 +- .../top/VisorActivationCommandSpec.scala | 13 +- modules/web-console/backend/app/mongo.js | 56 ++ .../ignite_modules/migrations/README.txt | 4 + modules/web-console/backend/index.js | 4 +- modules/web-console/frontend/.eslintrc | 2 +- modules/web-console/frontend/app/app.js | 3 + .../app/components/list-editable/component.js | 36 + .../list-editable-cols/cols.directive.js | 79 ++ .../list-editable-cols/cols.style.scss | 51 ++ .../list-editable-cols/cols.template.pug | 29 + .../components/list-editable-cols/index.js | 28 + .../list-editable-cols/row.directive.js | 40 + .../app/components/list-editable/controller.js | 79 ++ .../app/components/list-editable/index.js | 27 + .../app/components/list-editable/style.scss | 132 +++ .../app/components/list-editable/template.pug | 49 ++ .../page-configure-basic/controller.js | 10 +- .../helpers/jade/form/form-field-dropdown.pug | 2 +- .../generator/AbstractTransformer.js | 5 + .../generator/ConfigurationGenerator.js | 113 ++- .../generator/defaults/Cluster.service.js | 40 + .../states/configuration/caches/memory.pug | 16 +- .../configuration/clusters/data-storage.pug | 255 ++++++ .../states/configuration/clusters/memory.pug | 4 +- .../configuration/clusters/persistence.pug | 4 +- .../app/primitives/form-field/index.scss | 15 + .../frontend/app/primitives/ui-grid/index.scss | 4 + .../frontend/app/services/Clusters.js | 6 + .../frontend/app/services/Version.service.js | 6 +- .../frontend/controllers/clusters-controller.js | 69 +- modules/web-console/frontend/package.json | 2 +- .../frontend/public/images/icons/index.js | 2 + .../frontend/public/images/icons/info.svg | 3 + .../frontend/public/images/icons/sort.svg | 1 + modules/web-console/frontend/tsconfig.json | 12 + .../views/configuration/clusters.tpl.pug | 8 +- .../agent/db/dialect/OracleMetadataDialect.java | 13 +- .../ignite/console/agent/rest/RestExecutor.java | 4 +- .../yardstick/IgniteBenchmarkArguments.java | 8 +- .../org/apache/ignite/yardstick/IgniteNode.java | 15 +- 368 files changed, 14185 insertions(+), 4976 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3155f6bc/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3155f6bc/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3155f6bc/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index b287ae4,ba42a95..a2b246c --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@@ -114,8 -119,7 +119,8 @@@ import org.apache.ignite.internal.proce import org.apache.ignite.internal.processors.cache.IgniteCacheProxy; import org.apache.ignite.internal.processors.cache.IgniteInternalCache; import org.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl; +import org.apache.ignite.internal.processors.cache.mvcc.CacheCoordinatorsProcessor; - import org.apache.ignite.internal.processors.cache.persistence.MemoryPolicy; + import org.apache.ignite.internal.processors.cache.persistence.DataRegion; import org.apache.ignite.internal.processors.cache.persistence.filename.PdsConsistentIdProcessor; import org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessor; import org.apache.ignite.internal.processors.closure.GridClosureProcessor; http://git-wip-us.apache.org/repos/asf/ignite/blob/3155f6bc/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3155f6bc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3155f6bc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3155f6bc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3155f6bc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3155f6bc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3155f6bc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3155f6bc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java index 3bcd44f,e46e4d2..5c03769 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java @@@ -46,10 -46,9 +46,10 @@@ import org.apache.ignite.internal.proce import org.apache.ignite.internal.processors.cache.extras.GridCacheMvccEntryExtras; import org.apache.ignite.internal.processors.cache.extras.GridCacheObsoleteEntryExtras; import org.apache.ignite.internal.processors.cache.extras.GridCacheTtlEntryExtras; +import org.apache.ignite.internal.processors.cache.mvcc.MvccCoordinatorVersion; import org.apache.ignite.internal.processors.cache.persistence.CacheDataRow; import org.apache.ignite.internal.processors.cache.persistence.CacheDataRowAdapter; - import org.apache.ignite.internal.processors.cache.persistence.MemoryPolicy; + import org.apache.ignite.internal.processors.cache.persistence.DataRegion; import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryListener; import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx; import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry; @@@ -2592,9 -2543,8 +2592,9 @@@ public abstract class GridCacheMapEntr boolean update; - boolean walEnabled = !cctx.isNear() && cctx.shared().wal() != null; + boolean walEnabled = !cctx.isNear() && cctx.group().persistenceEnabled(); + // TODO IGNITE-3478: move checks in special initialValue method. if (cctx.shared().database().persistenceEnabled()) { unswap(false); http://git-wip-us.apache.org/repos/asf/ignite/blob/3155f6bc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3155f6bc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java index 8748094,7944c50..1280e75 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java @@@ -1938,8 -1435,10 +1938,8 @@@ public class IgniteCacheOffheapManagerI if (row != null) { row.key(key); - grp.memoryPolicy().evictionTracker().touchPage(row.link()); + grp.dataRegion().evictionTracker().touchPage(row.link()); } - - return row; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/3155f6bc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3155f6bc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3155f6bc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java index ab927d6,dcb167d..0ef4352 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java @@@ -46,10 -45,9 +46,10 @@@ import org.apache.ignite.plugin.extensi import org.apache.ignite.plugin.extensions.communication.MessageReader; import org.apache.ignite.plugin.extensions.communication.MessageWriter; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** - * Get request. Responsible for obtaining entry from primary node. 'Near' means 'Primary' here, not 'Near Cache'. + * Get request. Responsible for obtaining entry from primary node. 'Near' means 'Initiating node' here, not 'Near Cache'. */ public class GridNearGetRequest extends GridCacheIdMessage implements GridCacheDeployable, GridCacheVersionable { http://git-wip-us.apache.org/repos/asf/ignite/blob/3155f6bc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3155f6bc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3155f6bc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3155f6bc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/CacheDataRowAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3155f6bc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3155f6bc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/RowStore.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/RowStore.java index 41d2c4b,2051021..667ac66 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/RowStore.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/RowStore.java @@@ -78,15 -86,17 +86,17 @@@ public class RowStore * @throws IgniteCheckedException If failed. */ public void addRow(CacheDataRow row) throws IgniteCheckedException { - ctx.database().checkpointReadLock(); + if (!persistenceEnabled) + freeList.insertDataRow(row); + else { + ctx.database().checkpointReadLock(); - try { - freeList.insertDataRow(row); - } - finally { - ctx.database().checkpointReadUnlock(); - } + try { + freeList.insertDataRow(row); + - assert row.link() != 0L; - } - finally { - ctx.database().checkpointReadUnlock(); ++ assert row.link() != 0L; ++ }finally { ++ ctx.database().checkpointReadUnlock();} } } http://git-wip-us.apache.org/repos/asf/ignite/blob/3155f6bc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/FreeListImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3155f6bc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneGridKernalContext.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3155f6bc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3155f6bc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheDataTree.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3155f6bc/modules/core/src/test/java/org/apache/ignite/internal/TestRecordingCommunicationSpi.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3155f6bc/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3155f6bc/modules/core/src/test/java/org/apache/ignite/internal/processors/database/FreeListImplSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3155f6bc/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java ---------------------------------------------------------------------- diff --cc modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java index 13ba165,ba96b6c..99daa8a --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java @@@ -20,9 -20,8 +20,9 @@@ package org.apache.ignite.yardstick import com.beust.jcommander.Parameter; import org.apache.ignite.IgniteDataStreamer; import org.apache.ignite.cache.CacheWriteSynchronizationMode; +import org.apache.ignite.configuration.CacheConfiguration; - import org.apache.ignite.configuration.MemoryConfiguration; - import org.apache.ignite.configuration.PersistentStoreConfiguration; + import org.apache.ignite.configuration.DataStorageConfiguration; + import org.apache.ignite.configuration.DataStorageConfiguration; import org.apache.ignite.internal.util.tostring.GridToStringBuilder; import org.apache.ignite.internal.util.tostring.GridToStringInclude; import org.apache.ignite.transactions.TransactionConcurrency; @@@ -253,19 -252,8 +253,19 @@@ public class IgniteBenchmarkArguments @Parameter(names = {"-stbs", "--streamerBufSize"}, description = "Data streamer buffer size") private int streamerBufSize = IgniteDataStreamer.DFLT_PER_NODE_BUFFER_SIZE; + /** */ + @Parameter(names = {"-mvcc", "--mvcc"}, description = "Enable MVCC for cache") + private boolean mvcc; + + /** + * @return {@code True} if need enable cache mvcc (see {@link CacheConfiguration#isMvccEnabled()}). + */ + public boolean mvccEnabled() { + return mvcc; + } + /** - * @return {@code True} if need set {@link PersistentStoreConfiguration}. + * @return {@code True} if need set {@link DataStorageConfiguration}. */ public boolean persistentStoreEnabled() { return persistentStoreEnabled; http://git-wip-us.apache.org/repos/asf/ignite/blob/3155f6bc/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java ----------------------------------------------------------------------
