You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by gv...@apache.org on 2020/03/10 11:12:38 UTC
[ignite] branch ignite-12248 updated (98f3950 -> d678c1d)
This is an automated email from the ASF dual-hosted git repository.
gvvinblade pushed a change to branch ignite-12248
in repository https://gitbox.apache.org/repos/asf/ignite.git.
from 98f3950 IGNITE-12708: Calcite integration. Expressions factory base implementation. This closes #7489
add f88c237 IGNITE-12626: update RELEASE_NOTES for 2.8 (#7367)
add bb16c6b IGNITE-12616 Do not ask for keystore/truststore password twice in control.sh execution - Fixes #7351.
add 1ea7984 IGNITE-12680 Cleanup unneeded usages of SystemPropertiesRule - Fixes #7426.
add 27ed424 IGNITE-10698 Introduced @MXBeanParameter annotation which replaces @MXBeanParametersNames and @MXBeanParametersDescriptions annotations.
add d45458b IGNITE-12628 Add tests for jmx metrics return types - Fixes #7369.
add 049266a IGNITE-12627 Control utility does not show corrupted indexes - Fixes #7368.
add 38563e2 IGNITE-12472: upgrade checkstyle version up to 8.21 (#7174)
add cd79e84 IGNITE-12703: Remove G.grid method mention from javadoc. (#7452)
add 5f36006 IGNITE-12686 Deprecate obsolete configuration properties in CacheConfiguration and TransactionConfiguration (#7438)
add 6eaa1dd IGNITE-12697 More detailed YARN log when checking container - Fixes #7437.
add f52350c IGNITE-12684 Use dedicated pool for indexes rebuilding. - Fixes #7432.
add bf394a7 IGNITE-12683 Increase a timeout and set a scale factor for keys count in BPlusTreeSelfTest. (#7451)
add 8534e5a IGN-12687: fix sql wildcard to java regex translation (#7439)
add 7c7bd17 IGNITE-7276 .NET: Add EnableStatistics APIs
add 2c428d5 IGNITE-12682 IgniteMessageFactoryImpl.registerCustom() method is removed as potentially dangerous
add 5da4dee .NET: Fix build script - exclude optional jars, fix folder handling
add 90951c6 IGNITE-12711 Fixed tests memory usage. - Fixes #7469.
add 06a2b3b IGNITE-8617 Add node discovery using AWS application ELB - Fixes #7247.
add ac893ab IGNITE-12433 checking column names for duplicates on create table statement (#7404)
add 0afd1f6 IGNITE-12656 Cleanup GridCacheProcessor from functionality not related to it.
add 8a3c456 IGNITE-12723: getMXBean for tests introduced. (#7479)
add a585d36 IGNITE-12725: Excessive backups performance suggestion. (#7482)
add e4f9be5 IGNITE-12717 SQL: index creation refactoring (#7474)
add eef1bd5 IGNITE-12729 LT.warn() doesn't ignore exception anymore
add bd5529e IGNITE-12735 Possible NPE during export of communication metrics is fixed
add e94df82 IGNITE-12748 Export scheduling is moved to onContextInitialized in PushMetricsExporterAdapter
add 51ef799 IGNITE-12549 Fix query mapping on REPLICATED cache during rebalance (#7277)
add fd3b922 IGNITE-12733: TransmissionHandler can now notify user listeners when it ends (#7486)
add b0e923e IGNITE-12732 Fix for KILL QUERY command hanging. (#7498)
add 6d97f62 IGNITE-12705 SYNC caches are rebalanced in the first place.
add ba95fd1 IGNITE-12750: Fix SQL index build thread pool creation. This closes #7502.
new 88327c7 Merge branch 'ignite-master' into ignite-12248
new d678c1d fix after merge
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
RELEASE_NOTES.txt | 396 +++++++++++++
modules/aws/pom.xml | 6 +
.../tcp/ipfinder/elb/TcpDiscoveryAlbIpFinder.java | 218 +++++++
.../tcp/ipfinder/elb/TcpDiscoveryElbIpFinder.java | 34 +-
.../elb/TcpDiscoveryAlbIpFinderSelfTest.java | 81 +++
.../ignite/testsuites/IgniteElbTestSuite.java | 4 +-
.../query/calcite/exec/ExecutionServiceImpl.java | 24 +-
.../query/calcite/exec/QueryCancelGroup.java | 92 ---
.../calcite/metadata/PartitionServiceImpl.java | 1 -
.../query/calcite/prepare/PlanningContext.java | 30 +-
.../calcite/serialize/ReceiverPhysicalRel.java | 1 -
.../ignite/jdbc/JdbcErrorsAbstractSelfTest.java | 9 +
.../ignite/jdbc/JdbcThinMetadataSqlMatchTest.java | 21 +-
.../JdbcThinConnectionMultipleAddressesTest.java | 24 +-
.../org/apache/ignite/IgniteSystemProperties.java | 9 -
.../src/main/java/org/apache/ignite/Ignition.java | 2 -
.../ignite/configuration/CacheConfiguration.java | 23 +-
.../ignite/configuration/IgniteConfiguration.java | 36 +-
.../configuration/TransactionConfiguration.java | 15 +-
.../apache/ignite/internal/GridKernalContext.java | 7 +
.../ignite/internal/GridKernalContextImpl.java | 12 +
.../org/apache/ignite/internal/IgniteKernal.java | 5 +-
.../org/apache/ignite/internal/IgnitionEx.java | 27 +-
.../ignite/internal/TransactionsMXBeanImpl.java | 10 +-
.../impl/connection/GridClientConnection.java | 1 -
.../internal/client/thin/TcpClientCache.java | 1 -
.../ignite/internal/cluster/IgniteClusterImpl.java | 14 +-
.../internal/commandline/CommandHandler.java | 16 +-
.../commandline/ConnectionAndSslParameters.java | 18 +
.../managers/communication/GridIoManager.java | 38 +-
.../communication/IgniteMessageFactoryImpl.java | 26 -
.../communication/TransmissionHandler.java | 41 +-
.../internal/mxbean/IgniteStandardMXBean.java | 93 ++-
.../processors/affinity/LocalAffinityFunction.java | 78 +++
.../cache/CacheAffinitySharedManager.java | 2 +-
.../processors/cache/ClusterCachesInfo.java | 10 +-
.../cache/GridCachePartitionExchangeManager.java | 79 ++-
.../processors/cache/GridCachePreloader.java | 2 +-
.../processors/cache/GridCacheProcessor.java | 652 ++++-----------------
.../processors/cache/GridCacheSharedContext.java | 10 +-
.../internal/processors/cache/GridCacheUtils.java | 7 +-
.../processors/cache/IgniteCacheProxyImpl.java | 5 +-
.../cache/ValidationOnNodeJoinUtils.java | 5 +-
.../internal/processors/cache/WalStateManager.java | 17 +-
.../dht/topology/GridDhtLocalPartition.java | 2 +-
.../PartitionDefferedDeleteQueueCleanupTask.java | 107 ++++
.../GridCacheDatabaseSharedManager.java | 116 ++--
.../pagelocktracker/PageLockTrackerManager.java | 1 -
.../cache/persistence/metastorage/MetaStorage.java | 11 +-
.../wal/reader/StandaloneGridKernalContext.java | 5 +
.../processors/cache/query/CacheQuery.java | 2 +-
.../cache/query/GridCacheQueryAdapter.java | 27 +-
.../cache/transactions/IgniteTxManager.java | 184 ++++++
.../metric/PushMetricsExporterAdapter.java | 34 +-
.../internal/processors/odbc/SqlListenerUtils.java | 21 +-
.../processors/platform/cache/PlatformCache.java | 8 +
.../platform/cluster/PlatformClusterGroup.java | 19 +
.../processors/query/ColumnInformation.java | 1 -
.../internal/processors/query/GridQueryCancel.java | 58 +-
.../processors/query/GridQueryIndexing.java | 2 +-
.../processors/query/GridQueryProcessor.java | 58 +-
.../processors/query/TableInformation.java | 1 -
.../query/messages/GridQueryKillResponse.java | 1 -
.../schema/SchemaIndexCachePartitionWorker.java | 270 +++++++++
.../query/schema/SchemaIndexCacheVisitor.java | 5 +-
.../query/schema/SchemaIndexCacheVisitorImpl.java | 340 ++---------
.../ignite/internal/util/GridLogThrottle.java | 4 +-
.../ignite/internal/util/GridStringBuilder.java | 1 -
.../ignite/internal/util/IgniteCollectors.java | 55 ++
.../apache/ignite/internal/util/IgniteUtils.java | 2 +-
.../internal/util/future/GridCompoundFuture.java | 8 +-
.../ignite/internal/util/nio/GridNioServer.java | 1 -
.../ignite/mxbean/BaselineAutoAdjustMXBean.java | 12 +-
.../ignite/mxbean/ClientProcessorMXBean.java | 10 +-
.../apache/ignite/mxbean/ClusterMetricsMXBean.java | 19 +-
.../ignite/mxbean/DataRegionMetricsMXBean.java | 21 +-
.../apache/ignite/mxbean/DataStorageMXBean.java | 6 +-
.../ignite/mxbean/DataStorageMetricsMXBean.java | 21 +-
.../org/apache/ignite/mxbean/EncryptionMXBean.java | 6 +-
.../org/apache/ignite/mxbean/IgniteMXBean.java | 107 ++--
.../org/apache/ignite/mxbean/IgnitionMXBean.java | 72 +--
...etersDescriptions.java => MXBeanParameter.java} | 16 +-
.../mxbean/MXBeanParametersDescriptions.java | 3 +
.../ignite/mxbean/MXBeanParametersNames.java | 3 +
.../apache/ignite/mxbean/MemoryMetricsMXBean.java | 21 +-
.../org/apache/ignite/mxbean/MetricsMxBean.java | 20 +-
.../ignite/mxbean/PersistenceMetricsMXBean.java | 21 +-
.../ignite/mxbean/TransactionMetricsMxBean.java | 6 +-
.../apache/ignite/mxbean/TransactionsMXBean.java | 95 ++-
.../apache/ignite/mxbean/WorkersControlMXBean.java | 30 +-
.../tcp/TcpCommunicationMetricsListener.java | 1 -
.../ignite/spi/discovery/tcp/ServerImpl.java | 1 -
.../spi/discovery/tcp/TcpDiscoverySpiMBean.java | 18 +-
.../ignite/spi/metric/MetricExporterSpi.java | 2 +-
.../ignite/thread/IgniteThreadPoolExecutor.java | 9 +
.../affinity/local/LocalAffinityFunctionTest.java | 5 +-
.../org/apache/ignite/client/FunctionalTest.java | 10 +-
.../org/apache/ignite/client/ReliabilityTest.java | 11 +-
.../failure/FailureHandlingConfigurationTest.java | 15 +-
.../ClusterBaselineNodesMetricsSelfTest.java | 22 +-
.../ignite/internal/GridJobStealingSelfTest.java | 14 +
.../org/apache/ignite/internal/GridMBeansTest.java | 34 +-
.../apache/ignite/internal/GridMbeansMiscTest.java | 117 ++++
.../ignite/internal/TransactionMetricsTest.java | 26 +-
.../internal/TransactionsMXBeanImplTest.java | 20 +-
...ientPartitionAwarenessUnstableTopologyTest.java | 11 +-
.../internal/encryption/EncryptionMXBeanTest.java | 14 +-
.../GridManagerLocalMessageListenerSelfTest.java | 30 +-
.../checkpoint/GridCheckpointTaskSelfTest.java | 8 +
.../GridCommunicationSendMessageSelfTest.java | 31 +-
.../GridIoManagerFileTransmissionSelfTest.java | 32 +-
.../IgniteMessageFactoryImplTest.java | 1 -
.../MessageDirectTypeIdConflictTest.java | 95 +--
.../ignite/internal/metric/JmxExporterSpiTest.java | 25 +-
.../internal/metric/MetricsConfigurationTest.java | 21 +-
.../internal/mxbean/IgniteStandardMXBeanTest.java | 585 ++++++++++++++++++
.../ignite/internal/mxbean/package-info.java} | 15 +-
.../processors/cache/CacheGroupMetricsTest.java | 18 +-
.../processors/cache/CacheMetricsManageTest.java | 20 +-
.../GridCacheConditionalDeploymentSelfTest.java | 32 +-
...CacheLongRunningTransactionDiagnosticsTest.java | 12 +-
.../cache/GridCacheProcessorActiveTxTest.java | 42 +-
.../GridTransactionsSystemUserTimeMetricsTest.java | 18 +-
.../cache/IgniteClusterActivateDeactivateTest.java | 1 -
.../IgniteStartCacheInTransactionSelfTest.java | 2 +-
.../SetTxTimeoutOnPartitionMapExchangeTest.java | 19 +-
.../distributed/PartitionsExchangeAwareTest.java | 1 -
.../rebalancing/GridCacheRebalanceOrderTest.java | 177 ++++++
.../cache/eviction/EvictionAbstractTest.java | 18 +
.../PageLockTrackerMXBeanImplTest.java | 28 +-
...nsactionIntegrityWithSystemWorkerDeathTest.java | 26 +-
.../cluster/BaselineAutoAdjustMXBeanTest.java | 24 +-
.../processors/database/BPlusTreeSelfTest.java | 7 +-
.../processors/odbc/SqlListenerUtilsTest.java | 108 ++++
.../query/ScanQueriesTopologyMappingTest.java | 275 +++++++++
.../GridCommandHandlerSslWithSecurityTest.java | 111 ++++
.../ignite/plugin/PluginConfigurationTest.java | 92 +--
.../GridAbstractCommunicationSelfTest.java | 19 +-
.../communication/GridCacheMessageSelfTest.java | 49 +-
...pCommunicationSpiConcurrentConnectSelfTest.java | 21 +-
...idTcpCommunicationSpiMultithreadedSelfTest.java | 18 +-
...GridTcpCommunicationSpiRecoveryAckSelfTest.java | 21 +-
.../GridTcpCommunicationSpiRecoverySelfTest.java | 21 +-
...TcpCommunicationRecoveryAckClosureSelfTest.java | 21 +-
.../tcp/TcpCommunicationStatisticsTest.java | 52 +-
.../discovery/tcp/TcpDiscoverySpiMBeanTest.java | 23 +-
.../ignite/testframework/GridSpiTestContext.java | 34 +-
.../testframework/junits/GridAbstractTest.java | 42 +-
.../junits/GridTestKernalContext.java | 1 +
.../junits/IgniteConfigVariationsAbstractTest.java | 9 +
.../junits/common/GridCommonAbstractTest.java | 152 ++++-
.../ignite/testsuites/IgniteBasicTestSuite.java | 9 +-
.../ignite/testsuites/IgniteCacheTestSuite4.java | 2 +
.../ignite/testsuites/IgniteCacheTestSuite8.java | 2 +
.../ignite/testsuites/SecurityTestSuite.java | 4 +-
.../util/GridCommandHandlerAbstractTest.java | 6 -
.../apache/ignite/util/GridLogThrottleTest.java | 62 +-
.../query/h2/opt/GridH2SpatialIndex.java | 4 +-
.../ignite/internal/mxbean/SqlQueryMXBean.java | 18 +-
.../cache/query/RegisteredQueryCursor.java | 10 +
.../processors/query/h2/IgniteH2Indexing.java | 89 +--
.../query/h2/database/H2PkHashIndex.java | 15 +-
.../query/h2/database/H2TreeClientIndex.java | 73 ++-
.../processors/query/h2/database/H2TreeIndex.java | 178 +++---
.../query/h2/database/H2TreeIndexBase.java | 25 +-
.../processors/query/h2/opt/GridH2IndexBase.java | 34 +-
.../query/h2/sql/GridSqlQueryParser.java | 6 +-
.../query/h2/twostep/GridReduceQueryExecutor.java | 4 +-
.../visor/verify/ValidateIndexesClosure.java | 2 +
.../CacheGroupMetricsWithIndexBuildFailTest.java | 19 +-
.../cache/CacheGroupMetricsWithIndexTest.java | 9 +-
.../processors/cache/IgniteCacheGroupsSqlTest.java | 17 +
.../cache/IgniteCacheSqlQueryErrorSelfTest.java | 9 +
.../cache/index/AbstractIndexingCommonTest.java | 54 +-
.../cache/index/H2DynamicTableSelfTest.java | 2 +-
.../persistence/RebuildIndexLogMessageTest.java | 1 -
.../db/LongDestroyDurableBackgroundTaskTest.java | 2 +-
.../query/IgniteQueryDedicatedPoolTest.java | 6 -
.../query/KillQueryErrorOnCancelTest.java | 173 ++++++
.../processors/query/KillQueryFromClientTest.java | 1 -
.../query/KillQueryOnClientDisconnectTest.java | 1 -
.../internal/processors/query/KillQueryTest.java | 100 +++-
.../query/h2/GridIndexRebuildSelfTest.java | 174 +++++-
.../GridIndexRebuildWithMvccEnabledSelfTest.java | 5 +-
.../IgniteBinaryCacheQueryTestSuite.java | 2 +
...teCacheWithIndexingAndPersistenceTestSuite.java | 4 +-
.../util/GridCommandHandlerBrokenIndexTest.java | 245 ++++++++
.../ignite/ml/selection/paramgrid/ParamGrid.java | 1 -
.../ignite/ml/util/genetic/GeneticAlgorithm.java | 1 -
.../apache/ignite/ml/util/genetic/Population.java | 1 -
.../opencensus/OpenCensusMetricExporterSpi.java | 2 +
.../ExpiryCacheHolderTest.cs | 5 +
.../Cache/CacheMetricsTest.cs | 88 +++
.../Cache/CacheTestAsyncWrapper.cs | 6 +
.../dotnet/Apache.Ignite.Core/Cache/ICache.cs | 9 +
.../Apache.Ignite.Core/Cluster/IClusterGroup.cs | 8 +
.../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs | 6 +
.../Apache.Ignite.Core/Impl/Cache/CacheOp.cs | 3 +-
.../Impl/Cluster/ClusterGroupImpl.cs | 27 +
.../dotnet/Apache.Ignite.Core/Impl/Ignite.cs | 6 +
modules/platforms/dotnet/build.ps1 | 13 +-
.../org/apache/ignite/yarn/ApplicationMaster.java | 25 +-
.../ZookeeperDiscoveryClientDisconnectTest.java | 14 +-
.../zk/internal/ZookeeperDiscoveryMiscTest.java | 28 +-
parent/pom.xml | 2 +-
205 files changed, 5734 insertions(+), 2600 deletions(-)
create mode 100644 modules/aws/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/elb/TcpDiscoveryAlbIpFinder.java
create mode 100644 modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/elb/TcpDiscoveryAlbIpFinderSelfTest.java
delete mode 100644 modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/QueryCancelGroup.java
create mode 100644 modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/LocalAffinityFunction.java
create mode 100644 modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/PartitionDefferedDeleteQueueCleanupTask.java
create mode 100644 modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/SchemaIndexCachePartitionWorker.java
create mode 100644 modules/core/src/main/java/org/apache/ignite/internal/util/IgniteCollectors.java
copy modules/core/src/main/java/org/apache/ignite/mxbean/{MXBeanParametersDescriptions.java => MXBeanParameter.java} (81%)
create mode 100644 modules/core/src/test/java/org/apache/ignite/internal/GridMbeansMiscTest.java
create mode 100644 modules/core/src/test/java/org/apache/ignite/internal/mxbean/IgniteStandardMXBeanTest.java
copy modules/{aws/src/test/java/org/apache/ignite/testsuites/IgniteElbTestSuite.java => core/src/test/java/org/apache/ignite/internal/mxbean/package-info.java} (70%)
create mode 100644 modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalanceOrderTest.java
create mode 100644 modules/core/src/test/java/org/apache/ignite/internal/processors/odbc/SqlListenerUtilsTest.java
create mode 100644 modules/core/src/test/java/org/apache/ignite/internal/processors/query/ScanQueriesTopologyMappingTest.java
create mode 100644 modules/core/src/test/java/org/apache/ignite/internal/processors/security/GridCommandHandlerSslWithSecurityTest.java
create mode 100644 modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/KillQueryErrorOnCancelTest.java
create mode 100644 modules/indexing/src/test/java/org/apache/ignite/util/GridCommandHandlerBrokenIndexTest.java
[ignite] 01/02: Merge branch 'ignite-master' into ignite-12248
Posted by gv...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gvvinblade pushed a commit to branch ignite-12248
in repository https://gitbox.apache.org/repos/asf/ignite.git
commit 88327c743e3737951c68be30b007908ecc082b00
Merge: 98f3950 ba95fd1
Author: Igor Seliverstov <gv...@gmail.com>
AuthorDate: Tue Mar 10 13:39:08 2020 +0300
Merge branch 'ignite-master' into ignite-12248
RELEASE_NOTES.txt | 396 +++++++++++++
modules/aws/pom.xml | 6 +
.../tcp/ipfinder/elb/TcpDiscoveryAlbIpFinder.java | 218 +++++++
.../tcp/ipfinder/elb/TcpDiscoveryElbIpFinder.java | 34 +-
.../elb/TcpDiscoveryAlbIpFinderSelfTest.java | 81 +++
.../ignite/testsuites/IgniteElbTestSuite.java | 4 +-
.../ignite/jdbc/JdbcErrorsAbstractSelfTest.java | 9 +
.../ignite/jdbc/JdbcThinMetadataSqlMatchTest.java | 21 +-
.../JdbcThinConnectionMultipleAddressesTest.java | 24 +-
.../org/apache/ignite/IgniteSystemProperties.java | 9 -
.../src/main/java/org/apache/ignite/Ignition.java | 2 -
.../ignite/configuration/CacheConfiguration.java | 23 +-
.../ignite/configuration/IgniteConfiguration.java | 36 +-
.../configuration/TransactionConfiguration.java | 15 +-
.../apache/ignite/internal/GridKernalContext.java | 7 +
.../ignite/internal/GridKernalContextImpl.java | 12 +
.../org/apache/ignite/internal/IgniteKernal.java | 5 +-
.../org/apache/ignite/internal/IgnitionEx.java | 27 +-
.../ignite/internal/TransactionsMXBeanImpl.java | 10 +-
.../impl/connection/GridClientConnection.java | 1 -
.../internal/client/thin/TcpClientCache.java | 1 -
.../ignite/internal/cluster/IgniteClusterImpl.java | 14 +-
.../internal/commandline/CommandHandler.java | 16 +-
.../commandline/ConnectionAndSslParameters.java | 18 +
.../managers/communication/GridIoManager.java | 38 +-
.../communication/IgniteMessageFactoryImpl.java | 26 -
.../communication/TransmissionHandler.java | 41 +-
.../internal/mxbean/IgniteStandardMXBean.java | 93 ++-
.../processors/affinity/LocalAffinityFunction.java | 78 +++
.../cache/CacheAffinitySharedManager.java | 2 +-
.../processors/cache/ClusterCachesInfo.java | 10 +-
.../cache/GridCachePartitionExchangeManager.java | 79 ++-
.../processors/cache/GridCachePreloader.java | 2 +-
.../processors/cache/GridCacheProcessor.java | 652 ++++-----------------
.../processors/cache/GridCacheSharedContext.java | 10 +-
.../internal/processors/cache/GridCacheUtils.java | 7 +-
.../processors/cache/IgniteCacheProxyImpl.java | 5 +-
.../cache/ValidationOnNodeJoinUtils.java | 5 +-
.../internal/processors/cache/WalStateManager.java | 17 +-
.../dht/topology/GridDhtLocalPartition.java | 2 +-
.../PartitionDefferedDeleteQueueCleanupTask.java | 107 ++++
.../GridCacheDatabaseSharedManager.java | 116 ++--
.../pagelocktracker/PageLockTrackerManager.java | 1 -
.../cache/persistence/metastorage/MetaStorage.java | 11 +-
.../wal/reader/StandaloneGridKernalContext.java | 5 +
.../processors/cache/query/CacheQuery.java | 2 +-
.../cache/query/GridCacheQueryAdapter.java | 27 +-
.../cache/transactions/IgniteTxManager.java | 184 ++++++
.../metric/PushMetricsExporterAdapter.java | 34 +-
.../internal/processors/odbc/SqlListenerUtils.java | 21 +-
.../processors/platform/cache/PlatformCache.java | 8 +
.../platform/cluster/PlatformClusterGroup.java | 19 +
.../processors/query/ColumnInformation.java | 1 -
.../internal/processors/query/GridQueryCancel.java | 58 +-
.../processors/query/GridQueryIndexing.java | 2 +-
.../processors/query/GridQueryProcessor.java | 58 +-
.../processors/query/TableInformation.java | 1 -
.../query/messages/GridQueryKillResponse.java | 1 -
.../schema/SchemaIndexCachePartitionWorker.java | 270 +++++++++
.../query/schema/SchemaIndexCacheVisitor.java | 5 +-
.../query/schema/SchemaIndexCacheVisitorImpl.java | 340 ++---------
.../ignite/internal/util/GridLogThrottle.java | 4 +-
.../ignite/internal/util/GridStringBuilder.java | 1 -
.../ignite/internal/util/IgniteCollectors.java | 55 ++
.../apache/ignite/internal/util/IgniteUtils.java | 2 +-
.../internal/util/future/GridCompoundFuture.java | 8 +-
.../ignite/internal/util/nio/GridNioServer.java | 1 -
.../ignite/mxbean/BaselineAutoAdjustMXBean.java | 12 +-
.../ignite/mxbean/ClientProcessorMXBean.java | 10 +-
.../apache/ignite/mxbean/ClusterMetricsMXBean.java | 19 +-
.../ignite/mxbean/DataRegionMetricsMXBean.java | 21 +-
.../apache/ignite/mxbean/DataStorageMXBean.java | 6 +-
.../ignite/mxbean/DataStorageMetricsMXBean.java | 21 +-
.../org/apache/ignite/mxbean/EncryptionMXBean.java | 6 +-
.../org/apache/ignite/mxbean/IgniteMXBean.java | 107 ++--
.../org/apache/ignite/mxbean/IgnitionMXBean.java | 72 +--
...etersDescriptions.java => MXBeanParameter.java} | 16 +-
.../mxbean/MXBeanParametersDescriptions.java | 3 +
.../ignite/mxbean/MXBeanParametersNames.java | 3 +
.../apache/ignite/mxbean/MemoryMetricsMXBean.java | 21 +-
.../org/apache/ignite/mxbean/MetricsMxBean.java | 20 +-
.../ignite/mxbean/PersistenceMetricsMXBean.java | 21 +-
.../ignite/mxbean/TransactionMetricsMxBean.java | 6 +-
.../apache/ignite/mxbean/TransactionsMXBean.java | 95 ++-
.../apache/ignite/mxbean/WorkersControlMXBean.java | 30 +-
.../tcp/TcpCommunicationMetricsListener.java | 1 -
.../ignite/spi/discovery/tcp/ServerImpl.java | 1 -
.../spi/discovery/tcp/TcpDiscoverySpiMBean.java | 18 +-
.../ignite/spi/metric/MetricExporterSpi.java | 2 +-
.../ignite/thread/IgniteThreadPoolExecutor.java | 9 +
.../affinity/local/LocalAffinityFunctionTest.java | 5 +-
.../org/apache/ignite/client/FunctionalTest.java | 10 +-
.../org/apache/ignite/client/ReliabilityTest.java | 11 +-
.../failure/FailureHandlingConfigurationTest.java | 15 +-
.../ClusterBaselineNodesMetricsSelfTest.java | 22 +-
.../ignite/internal/GridJobStealingSelfTest.java | 14 +
.../org/apache/ignite/internal/GridMBeansTest.java | 34 +-
.../apache/ignite/internal/GridMbeansMiscTest.java | 117 ++++
.../ignite/internal/TransactionMetricsTest.java | 26 +-
.../internal/TransactionsMXBeanImplTest.java | 20 +-
...ientPartitionAwarenessUnstableTopologyTest.java | 11 +-
.../internal/encryption/EncryptionMXBeanTest.java | 14 +-
.../GridManagerLocalMessageListenerSelfTest.java | 30 +-
.../checkpoint/GridCheckpointTaskSelfTest.java | 8 +
.../GridCommunicationSendMessageSelfTest.java | 31 +-
.../GridIoManagerFileTransmissionSelfTest.java | 32 +-
.../IgniteMessageFactoryImplTest.java | 1 -
.../MessageDirectTypeIdConflictTest.java | 95 +--
.../ignite/internal/metric/JmxExporterSpiTest.java | 25 +-
.../internal/metric/MetricsConfigurationTest.java | 21 +-
.../internal/mxbean/IgniteStandardMXBeanTest.java | 585 ++++++++++++++++++
.../ignite/internal/mxbean/package-info.java} | 15 +-
.../processors/cache/CacheGroupMetricsTest.java | 18 +-
.../processors/cache/CacheMetricsManageTest.java | 20 +-
.../GridCacheConditionalDeploymentSelfTest.java | 32 +-
...CacheLongRunningTransactionDiagnosticsTest.java | 12 +-
.../cache/GridCacheProcessorActiveTxTest.java | 42 +-
.../GridTransactionsSystemUserTimeMetricsTest.java | 18 +-
.../cache/IgniteClusterActivateDeactivateTest.java | 1 -
.../IgniteStartCacheInTransactionSelfTest.java | 2 +-
.../SetTxTimeoutOnPartitionMapExchangeTest.java | 19 +-
.../distributed/PartitionsExchangeAwareTest.java | 1 -
.../rebalancing/GridCacheRebalanceOrderTest.java | 177 ++++++
.../cache/eviction/EvictionAbstractTest.java | 18 +
.../PageLockTrackerMXBeanImplTest.java | 28 +-
...nsactionIntegrityWithSystemWorkerDeathTest.java | 26 +-
.../cluster/BaselineAutoAdjustMXBeanTest.java | 24 +-
.../processors/database/BPlusTreeSelfTest.java | 7 +-
.../processors/odbc/SqlListenerUtilsTest.java | 108 ++++
.../query/ScanQueriesTopologyMappingTest.java | 275 +++++++++
.../GridCommandHandlerSslWithSecurityTest.java | 111 ++++
.../ignite/plugin/PluginConfigurationTest.java | 92 +--
.../GridAbstractCommunicationSelfTest.java | 19 +-
.../communication/GridCacheMessageSelfTest.java | 49 +-
...pCommunicationSpiConcurrentConnectSelfTest.java | 21 +-
...idTcpCommunicationSpiMultithreadedSelfTest.java | 18 +-
...GridTcpCommunicationSpiRecoveryAckSelfTest.java | 21 +-
.../GridTcpCommunicationSpiRecoverySelfTest.java | 21 +-
...TcpCommunicationRecoveryAckClosureSelfTest.java | 21 +-
.../tcp/TcpCommunicationStatisticsTest.java | 52 +-
.../discovery/tcp/TcpDiscoverySpiMBeanTest.java | 23 +-
.../ignite/testframework/GridSpiTestContext.java | 34 +-
.../testframework/junits/GridAbstractTest.java | 42 +-
.../junits/GridTestKernalContext.java | 1 +
.../junits/IgniteConfigVariationsAbstractTest.java | 9 +
.../junits/common/GridCommonAbstractTest.java | 152 ++++-
.../ignite/testsuites/IgniteBasicTestSuite.java | 9 +-
.../ignite/testsuites/IgniteCacheTestSuite4.java | 2 +
.../ignite/testsuites/IgniteCacheTestSuite8.java | 2 +
.../ignite/testsuites/SecurityTestSuite.java | 4 +-
.../util/GridCommandHandlerAbstractTest.java | 6 -
.../apache/ignite/util/GridLogThrottleTest.java | 62 +-
.../query/h2/opt/GridH2SpatialIndex.java | 4 +-
.../ignite/internal/mxbean/SqlQueryMXBean.java | 18 +-
.../cache/query/RegisteredQueryCursor.java | 10 +
.../processors/query/h2/IgniteH2Indexing.java | 89 +--
.../query/h2/database/H2PkHashIndex.java | 15 +-
.../query/h2/database/H2TreeClientIndex.java | 73 ++-
.../processors/query/h2/database/H2TreeIndex.java | 178 +++---
.../query/h2/database/H2TreeIndexBase.java | 25 +-
.../processors/query/h2/opt/GridH2IndexBase.java | 34 +-
.../query/h2/sql/GridSqlQueryParser.java | 6 +-
.../query/h2/twostep/GridReduceQueryExecutor.java | 4 +-
.../visor/verify/ValidateIndexesClosure.java | 2 +
.../CacheGroupMetricsWithIndexBuildFailTest.java | 19 +-
.../cache/CacheGroupMetricsWithIndexTest.java | 9 +-
.../processors/cache/IgniteCacheGroupsSqlTest.java | 17 +
.../cache/IgniteCacheSqlQueryErrorSelfTest.java | 9 +
.../cache/index/AbstractIndexingCommonTest.java | 54 +-
.../cache/index/H2DynamicTableSelfTest.java | 2 +-
.../persistence/RebuildIndexLogMessageTest.java | 1 -
.../db/LongDestroyDurableBackgroundTaskTest.java | 2 +-
.../query/IgniteQueryDedicatedPoolTest.java | 6 -
.../query/KillQueryErrorOnCancelTest.java | 173 ++++++
.../processors/query/KillQueryFromClientTest.java | 1 -
.../query/KillQueryOnClientDisconnectTest.java | 1 -
.../internal/processors/query/KillQueryTest.java | 100 +++-
.../query/h2/GridIndexRebuildSelfTest.java | 174 +++++-
.../GridIndexRebuildWithMvccEnabledSelfTest.java | 5 +-
.../IgniteBinaryCacheQueryTestSuite.java | 2 +
...teCacheWithIndexingAndPersistenceTestSuite.java | 4 +-
.../util/GridCommandHandlerBrokenIndexTest.java | 245 ++++++++
.../ignite/ml/selection/paramgrid/ParamGrid.java | 1 -
.../ignite/ml/util/genetic/GeneticAlgorithm.java | 1 -
.../apache/ignite/ml/util/genetic/Population.java | 1 -
.../opencensus/OpenCensusMetricExporterSpi.java | 2 +
.../ExpiryCacheHolderTest.cs | 5 +
.../Cache/CacheMetricsTest.cs | 88 +++
.../Cache/CacheTestAsyncWrapper.cs | 6 +
.../dotnet/Apache.Ignite.Core/Cache/ICache.cs | 9 +
.../Apache.Ignite.Core/Cluster/IClusterGroup.cs | 8 +
.../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs | 6 +
.../Apache.Ignite.Core/Impl/Cache/CacheOp.cs | 3 +-
.../Impl/Cluster/ClusterGroupImpl.cs | 27 +
.../dotnet/Apache.Ignite.Core/Impl/Ignite.cs | 6 +
modules/platforms/dotnet/build.ps1 | 13 +-
.../org/apache/ignite/yarn/ApplicationMaster.java | 25 +-
.../ZookeeperDiscoveryClientDisconnectTest.java | 14 +-
.../zk/internal/ZookeeperDiscoveryMiscTest.java | 28 +-
parent/pom.xml | 2 +-
200 files changed, 5715 insertions(+), 2471 deletions(-)
[ignite] 02/02: fix after merge
Posted by gv...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gvvinblade pushed a commit to branch ignite-12248
in repository https://gitbox.apache.org/repos/asf/ignite.git
commit d678c1d3d51b78ca7ed21521e357c123d7f51be5
Author: Igor Seliverstov <gv...@gmail.com>
AuthorDate: Tue Mar 10 14:10:51 2020 +0300
fix after merge
---
.../query/calcite/exec/ExecutionServiceImpl.java | 24 +++---
.../query/calcite/exec/QueryCancelGroup.java | 92 ----------------------
.../calcite/metadata/PartitionServiceImpl.java | 1 -
.../query/calcite/prepare/PlanningContext.java | 30 +++----
.../calcite/serialize/ReceiverPhysicalRel.java | 1 -
5 files changed, 19 insertions(+), 129 deletions(-)
diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/ExecutionServiceImpl.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/ExecutionServiceImpl.java
index 353bda9..3c2f4eb 100644
--- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/ExecutionServiceImpl.java
+++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/ExecutionServiceImpl.java
@@ -435,7 +435,6 @@ public class ExecutionServiceImpl extends AbstractService implements ExecutionSe
.query(query)
.parameters(params)
.topologyVersion(topologyVersion())
- .cancelGroup(cancelGroup(qryCtx))
.logger(log)
.build();
}
@@ -675,22 +674,19 @@ public class ExecutionServiceImpl extends AbstractService implements ExecutionSe
running.put(queryId, info);
- if (pctx.cancelGroup() == null || pctx.cancelGroup().add(info))
- return;
-
- running.remove(queryId);
+ GridQueryCancel queryCancel = pctx.queryCancel();
- throw new IgniteSQLException(QueryCancelledException.ERR_MSG, IgniteQueryErrorCode.QUERY_CANCELED);
- }
-
- /** */
- private QueryCancelGroup cancelGroup(@Nullable QueryContext qryCtx) {
- GridQueryCancel cancel;
+ if (queryCancel == null)
+ return;
- if (qryCtx == null || (cancel = qryCtx.unwrap(GridQueryCancel.class)) == null)
- return null;
+ try {
+ queryCancel.add(info);
+ }
+ catch (QueryCancelledException e) {
+ running.remove(queryId);
- return new QueryCancelGroup(cancel, failureProcessor());
+ throw new IgniteSQLException(e.getMessage(), IgniteQueryErrorCode.QUERY_CANCELED);
+ }
}
/** */
diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/QueryCancelGroup.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/QueryCancelGroup.java
deleted file mode 100644
index 6e2573a..0000000
--- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/QueryCancelGroup.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.query.calcite.exec;
-
-import java.util.HashSet;
-import java.util.Set;
-import org.apache.ignite.cache.query.QueryCancelledException;
-import org.apache.ignite.failure.FailureContext;
-import org.apache.ignite.failure.FailureType;
-import org.apache.ignite.internal.processors.cache.query.IgniteQueryErrorCode;
-import org.apache.ignite.internal.processors.failure.FailureProcessor;
-import org.apache.ignite.internal.processors.query.GridQueryCancel;
-import org.apache.ignite.internal.processors.query.IgniteSQLException;
-import org.apache.ignite.internal.processors.query.QueryCancellable;
-
-/** */
-public final class QueryCancelGroup implements QueryCancellable {
- /** */
- private final FailureProcessor failureProcessor;
-
- /** */
- private final Set<QueryCancellable> queries;
-
- /** */
- private boolean cancelled;
-
- /** */
- public QueryCancelGroup(GridQueryCancel cancel, FailureProcessor failureProcessor) {
- this.failureProcessor = failureProcessor;
-
- queries = new HashSet<>();
-
- register(cancel);
- }
-
- /**
- * Adds a cancellable to the group.
- *
- * @param query Query cancellable object.
- * @return {@code false} if query was cancelled before this call.
- */
- public synchronized boolean add(QueryCancellable query) {
- if (cancelled)
- return false;
-
- boolean res = queries.add(query);
-
- assert res;
-
- return true;
- }
-
- /** {@inheritDoc} */
- @Override public synchronized void doCancel() {
- cancelled = true;
-
- try {
- for (QueryCancellable query : queries)
- query.doCancel();
- }
- catch (Exception e) {
- failureProcessor.process(new FailureContext(FailureType.CRITICAL_ERROR, e));
-
- throw e;
- }
- }
-
- /** */
- private void register(GridQueryCancel cancel) {
- try {
- cancel.set(this);
- }
- catch (QueryCancelledException e) {
- throw new IgniteSQLException(QueryCancelledException.ERR_MSG, IgniteQueryErrorCode.QUERY_CANCELED);
- }
- }
-}
diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/PartitionServiceImpl.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/PartitionServiceImpl.java
index 2b8e35d..4c01d8d 100644
--- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/PartitionServiceImpl.java
+++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/PartitionServiceImpl.java
@@ -24,7 +24,6 @@ import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
import org.apache.ignite.internal.processors.query.calcite.util.AbstractService;
import org.apache.ignite.internal.util.typedef.internal.CU;
-
/**
*
*/
diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/PlanningContext.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/PlanningContext.java
index 0824040..937e6cc 100644
--- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/PlanningContext.java
+++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/PlanningContext.java
@@ -35,11 +35,10 @@ import org.apache.calcite.tools.FrameworkConfig;
import org.apache.calcite.tools.Frameworks;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.query.GridQueryCancel;
import org.apache.ignite.internal.processors.query.calcite.CalciteQueryProcessor;
-import org.apache.ignite.internal.processors.query.calcite.exec.QueryCancelGroup;
import org.apache.ignite.internal.processors.query.calcite.type.IgniteTypeFactory;
import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
/**
* Planning context.
@@ -79,7 +78,7 @@ public final class PlanningContext implements Context {
private final AffinityTopologyVersion topologyVersion;
/** */
- private final QueryCancelGroup cancelGroup;
+ private final GridQueryCancel queryCancel;
/** */
private final IgniteLogger logger;
@@ -100,18 +99,19 @@ public final class PlanningContext implements Context {
* Private constructor, used by a builder.
*/
private PlanningContext(FrameworkConfig config, Context parentContext, UUID localNodeId, UUID originatingNodeId,
- String query, Object[] parameters, AffinityTopologyVersion topologyVersion, IgniteLogger logger, QueryCancelGroup cancelGroup) {
+ String query, Object[] parameters, AffinityTopologyVersion topologyVersion, IgniteLogger logger) {
this.localNodeId = localNodeId;
this.originatingNodeId = originatingNodeId;
this.query = query;
this.parameters = parameters;
this.topologyVersion = topologyVersion;
this.logger = logger;
- this.cancelGroup = cancelGroup;
this.parentContext = Contexts.chain(parentContext, config.getContext());
// link frameworkConfig#context() to this.
this.config = Frameworks.newConfigBuilder(config).context(this).build();
+
+ queryCancel = unwrap(GridQueryCancel.class);
}
/**
@@ -157,10 +157,10 @@ public final class PlanningContext implements Context {
}
/**
- * @return Query cancel group.
+ * @return Query cancel.
*/
- public QueryCancelGroup cancelGroup() {
- return cancelGroup;
+ public GridQueryCancel queryCancel() {
+ return queryCancel;
}
/**
@@ -319,9 +319,6 @@ public final class PlanningContext implements Context {
/** */
private IgniteLogger logger;
- /** */
- private QueryCancelGroup cancelGroup;
-
/**
* @param localNodeId Local node ID.
* @return Builder for chaining.
@@ -395,22 +392,13 @@ public final class PlanningContext implements Context {
}
/**
- * @param cancelGroup Query cancel group.
- * @return Builder for chaining.
- */
- public Builder cancelGroup(@Nullable QueryCancelGroup cancelGroup) {
- this.cancelGroup = cancelGroup;
- return this;
- }
-
- /**
* Builds planner context.
*
* @return Planner context.
*/
public PlanningContext build() {
return new PlanningContext(frameworkConfig, parentContext, localNodeId, originatingNodeId, query,
- parameters, topologyVersion, logger, cancelGroup);
+ parameters, topologyVersion, logger);
}
}
}
diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/serialize/ReceiverPhysicalRel.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/serialize/ReceiverPhysicalRel.java
index 113ef3c..ffe0ba3 100644
--- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/serialize/ReceiverPhysicalRel.java
+++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/serialize/ReceiverPhysicalRel.java
@@ -31,7 +31,6 @@ import org.apache.calcite.rel.RelFieldCollation;
import org.apache.ignite.internal.processors.query.calcite.exec.exp.type.DataType;
import org.apache.ignite.internal.processors.query.calcite.rel.IgniteReceiver;
-
/**
* Describes {@link IgniteReceiver}.
*/