This is an automated email from the ASF dual-hosted git repository. anovikov pushed a commit to branch ignite-17594 in repository https://gitbox.apache.org/repos/asf/ignite.git
commit 8d4b862b946b2adc08e926b1d259da702310c6e8 Merge: 491b1d6cfa7 6c8cb76ad32 Author: Andrey Novikov <[email protected]> AuthorDate: Fri Sep 2 17:44:12 2022 +0700 Merge branch 'master' of https://gitbox.apache.org/repos/asf/ignite into ignite-17594 Conflicts: modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java docs/_docs/SQL/sql-calcite.adoc | 2 - docs/_docs/tools/control-script.adoc | 21 +- modules/calcite/pom.xml | 4 +- .../query/calcite/CalciteQueryProcessor.java | 37 +- .../query/calcite/exec/ExecutionServiceImpl.java | 8 +- .../query/calcite/exec/ddl/DdlCommandHandler.java | 48 +- .../calcite/exec/ddl/NativeCommandHandler.java | 5 +- .../query/calcite/exec/ddl/SchemaManager.java | 85 -- .../query/calcite/prepare/QueryPlanCacheImpl.java | 148 +-- .../query/calcite/schema/CacheIndexImpl.java | 5 + .../calcite/schema/CacheTableDescriptorImpl.java | 8 + .../query/calcite/schema/CacheTableImpl.java | 5 +- .../query/calcite/schema/SchemaHolderImpl.java | 143 ++- .../schema/SystemViewTableDescriptorImpl.java | 4 +- .../query/calcite/schema/TableDescriptor.java | 8 + .../processors/query/calcite/QueryChecker.java | 7 +- .../query/calcite/UnstableTopologyTest.java | 63 +- .../CalciteBasicSecondaryIndexIntegrationTest.java | 37 +- .../integration/IndexRebuildIntegrationTest.java | 24 +- .../integration/RunningQueriesIntegrationTest.java | 16 +- .../ServerStatisticsIntegrationTest.java | 2 +- .../StatisticsCommandDdlIntegrationTest.java | 23 +- .../integration/TableDdlIntegrationTest.java | 46 + .../query/calcite/planner/AbstractPlannerTest.java | 5 + .../ignite/jdbc/thin/JdbcThinMetadataSelfTest.java | 959 +++++++------- .../SystemViewRowAttributeWalkerGenerator.java | 29 +- .../CompoundIndexCompatibilityTest.java | 167 +++ .../IgnitePKIndexesMigrationToUnwrapPkTest.java | 130 +- .../IndexAbstractCompatibilityTest.java | 20 +- .../IgniteCompatibilityBasicTestSuite.java | 6 +- .../cache/CacheIndexesForceRebuild.java | 4 +- .../util/GridCommandHandlerBrokenIndexTest.java | 3 +- .../apache/ignite/util/SystemViewCommandTest.java | 53 +- .../ignite/internal/MarshallerContextImpl.java | 32 +- .../internal/cache/query/index/IndexProcessor.java | 50 +- .../query/index/sorted/QueryIndexDefinition.java | 27 +- .../query/index/sorted/QueryIndexRowHandler.java | 18 +- .../index/sorted/QueryIndexRowHandlerFactory.java | 2 +- .../query/index/sorted/SortedIndexDefinition.java | 10 +- .../query/index/sorted/inline/InlineIndexImpl.java | 183 ++- .../sorted}/maintenance/RebuildIndexAction.java | 208 +-- .../maintenance/RebuildIndexWorkflowCallback.java | 25 +- .../internal/managers/IgniteMBeansManager.java | 2 +- .../managers/systemview/GridSystemViewManager.java | 17 +- .../managers/systemview/SqlViewExporterSpi.java | 22 +- .../walker/PagesTimestampHistogramViewWalker.java} | 25 +- .../systemview/walker/SqlIndexViewWalker.java | 2 +- .../systemview/walker/SqlSchemaViewWalker.java | 2 +- .../walker/SqlTableColumnViewWalker.java | 2 +- .../systemview/walker/SqlTableViewWalker.java | 2 +- .../systemview/walker/SqlViewColumnViewWalker.java | 6 +- .../systemview/walker/SqlViewViewWalker.java | 2 +- .../processors/cache/GridCacheProcessor.java | 2 +- .../processors/cache/IgniteCacheProxyImpl.java | 2 +- .../cache/binary/BinaryMetadataTransport.java | 113 +- .../cache/persistence/DataRegionMetricsImpl.java | 73 ++ .../cache/persistence/DataStorageMetricsImpl.java | 22 +- .../GridCacheDatabaseSharedManager.java | 18 +- .../cache/persistence/GridCacheOffheapManager.java | 45 +- .../IgniteCacheDatabaseSharedManager.java | 17 + .../cache/persistence/checkpoint/Checkpointer.java | 7 +- .../persistence/file/FilePageStoreManager.java | 2 +- .../cache/persistence/pagemem/PageHeader.java | 19 +- .../cache/persistence/pagemem/PageMemoryImpl.java | 59 +- .../snapshot/IgniteSnapshotManager.java | 5 +- .../cache/persistence/tree/BPlusTree.java | 1 + .../processors/marshaller/ClientRequestFuture.java | 29 +- .../marshaller/GridMarshallerMappingProcessor.java | 7 +- .../internal/processors/marshaller/MappedName.java | 19 + .../marshaller/MarshallerMappingItem.java | 3 +- .../marshaller/MarshallerMappingTransport.java | 27 +- .../internal/processors/metric/AbstractMetric.java | 2 +- .../metric/ConfigurableHistogramMetric.java} | 31 +- .../processors/metric/GridMetricManager.java | 27 +- .../metric}/SqlViewMetricExporterSpi.java | 2 +- .../metric/impl/HistogramMetricImpl.java | 9 +- .../processors/metric/impl/MetricUtils.java | 22 + .../metric/impl/PeriodicHistogramMetricImpl.java | 327 +++++ .../processors/odbc/jdbc/JdbcMetadataInfo.java | 6 +- .../client/service/ClientServiceInvokeRequest.java | 2 +- .../internal/processors/pool/PoolProcessor.java | 2 + .../processors/query/GridQueryIndexing.java | 175 +-- .../processors/query/GridQueryProcessor.java | 193 ++- .../processors/query/GridQuerySchemaManager.java | 47 - .../processors/query/GridQueryTypeDescriptor.java | 7 + .../query/QuerySysIndexDescriptorImpl.java | 13 +- .../processors/query/QueryTypeDescriptorImpl.java | 10 +- .../internal/processors/query/QueryUtils.java | 3 + .../query/schema/AbstractSchemaChangeListener.java | 10 +- .../query/schema/SchemaChangeListener.java | 11 +- .../query/schema/SchemaIndexCacheVisitorImpl.java | 12 +- .../management/AbstractIndexDescriptorFactory.java | 63 + .../query/schema/management/IndexDescriptor.java | 144 +++ .../schema/management/IndexDescriptorFactory.java} | 41 +- .../query/schema/management/SchemaDescriptor.java} | 39 +- .../query/schema/management/SchemaManager.java | 1357 ++++++++++++++++++++ .../management/SortedIndexDescriptorFactory.java | 181 +++ .../query/schema/management/TableDescriptor.java | 113 ++ .../stat/IgniteStatisticsConfigurationManager.java | 30 +- .../query/stat/IgniteStatisticsHelper.java | 16 +- .../query/stat/IgniteStatisticsManagerImpl.java | 23 +- .../ignite/internal/sql/SqlCommandProcessor.java | 47 +- .../view/PagesTimestampHistogramView.java | 75 ++ .../spi/systemview/view/sql}/SqlIndexView.java | 36 +- .../spi/systemview/view/sql}/SqlSchemaView.java | 12 +- .../systemview/view/sql}/SqlTableColumnView.java | 55 +- .../spi/systemview/view/sql}/SqlTableView.java | 36 +- .../systemview/view/sql}/SqlViewColumnView.java | 30 +- .../spi/systemview/view/sql}/SqlViewView.java | 17 +- .../internal/metric/MetricsConfigurationTest.java | 45 + .../metric/PeriodicHistogramMetricImplTest.java | 359 ++++++ .../ignite/internal/metric/SystemViewSelfTest.java | 209 ++- .../IgniteClientCacheInitializationFailTest.java | 23 - ...teMarshallerCacheClientRequestsMappingTest.java | 332 +++++ .../IgniteDataStorageMetricsSelfTest.java | 54 +- .../persistence/pagemem/PageMemoryImplTest.java | 1 + .../snapshot/IgniteClusterSnapshotSelfTest.java | 36 +- .../processors/query/DummyQueryIndexing.java | 108 +- .../ignite/internal/util/GridTestClockTimer.java | 31 +- .../testframework/junits/GridAbstractTest.java | 30 +- .../ignite/testsuites/IgniteBasicTestSuite2.java | 6 +- ...mandHandlerClusterByClassTest_cache_help.output | 2 +- ...dlerClusterByClassWithSSLTest_cache_help.output | 2 +- modules/ducktests/tests/docker/Dockerfile | 2 +- .../ducktests/tests/ignitetest/utils/version.py | 13 +- .../apache/ignite/tests/p2p/compute/Result.java} | 32 +- .../apache/ignite/tests/p2p/compute/ResultV0.java} | 31 +- .../apache/ignite/tests/p2p/compute/ResultV1.java} | 31 +- .../apache/ignite/tests/p2p/compute/ResultV2.java} | 31 +- .../apache/ignite/tests/p2p/compute/ResultV3.java} | 31 +- .../processors/query/h2/CommandProcessor.java | 119 +- .../processors/query/h2/ConnectionManager.java | 43 +- .../processors/query/h2/H2IndexFactory.java | 115 ++ .../processors/query/h2/H2SchemaManager.java | 417 ++++++ .../processors/query/h2/H2TableDescriptor.java | 302 +---- .../processors/query/h2/H2TableEngine.java | 4 +- .../internal/processors/query/h2/H2Utils.java | 227 +--- .../processors/query/h2/IgniteH2Indexing.java | 457 +------ .../internal/processors/query/h2/QueryParser.java | 2 +- .../processors/query/h2/SchemaManager.java | 1098 ---------------- .../processors/query/h2/database/H2TreeIndex.java | 24 +- .../processors/query/h2/opt/GridH2IndexBase.java | 16 +- .../processors/query/h2/opt/GridH2ProxyIndex.java | 7 +- .../processors/query/h2/opt/GridH2Table.java | 330 +---- .../h2/sys/view}/FiltrableSystemViewLocal.java | 3 +- .../query/h2/sys/view}/SystemViewLocal.java | 4 +- .../ignite/cache/query/IndexQueryFailoverTest.java | 2 +- .../cache/index/AbstractRebuildIndexTest.java | 105 +- .../DynamicColumnsAbstractConcurrentSelfTest.java | 38 +- .../index/DynamicEnableIndexingAbstractTest.java | 25 +- .../DynamicIndexAbstractConcurrentSelfTest.java | 103 +- .../cache/index/H2DynamicTableSelfTest.java | 13 +- .../processors/cache/index/IgniteH2IndexingEx.java | 113 -- .../cache/index/IndexCorruptionRebuildTest.java | 46 +- .../cache/index/ResumeCreateIndexTest.java | 1 - .../cache/metric/SqlViewExporterSpiTest.java | 87 +- .../processors/query/SqlSystemViewsSelfTest.java | 65 +- .../SqlTwoCachesInGroupWithSameEntryTest.java | 7 +- .../query/h2/sql/GridQueryParsingTest.java | 7 +- .../query/stat/ManagerStatisticsTypesTest.java | 7 +- .../query/stat/SqlStatisticsCommandTests.java | 13 +- .../query/stat/StatisticsAbstractTest.java | 21 +- .../query/stat/StatisticsConfigurationTest.java | 3 +- .../internal/systemview/JmxExporterSpiTest.java | 6 +- .../Client/ClientConnectionTest.cs | 32 + parent/pom.xml | 2 +- 166 files changed, 6742 insertions(+), 4989 deletions(-) diff --cc modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java index 2fa615cea3b,a208ea0f3de..2463cba9677 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java @@@ -32,12 -29,8 +29,9 @@@ import java.util.Iterator import java.util.LinkedHashMap; import java.util.List; import java.util.Map; - import java.util.Objects; - import java.util.Set; import java.util.UUID; import java.util.concurrent.TimeUnit; +import java.util.function.Consumer; - import java.util.stream.Stream; import javax.cache.CacheException; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteDataStreamer; @@@ -102,10 -84,7 +85,9 @@@ import org.apache.ignite.internal.proce import org.apache.ignite.internal.processors.query.GridQueryFieldMetadata; import org.apache.ignite.internal.processors.query.GridQueryFieldsResult; import org.apache.ignite.internal.processors.query.GridQueryFieldsResultAdapter; +import org.apache.ignite.internal.processors.query.GridQueryFinishedInfo; import org.apache.ignite.internal.processors.query.GridQueryIndexing; - import org.apache.ignite.internal.processors.query.GridQueryProperty; +import org.apache.ignite.internal.processors.query.GridQueryStartedInfo; import org.apache.ignite.internal.processors.query.GridQueryTypeDescriptor; import org.apache.ignite.internal.processors.query.IgniteSQLException; import org.apache.ignite.internal.processors.query.QueryField;
