This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch IGNITE-19676
in repository https://gitbox.apache.org/repos/asf/ignite.git
commit e80c60a5201f37ec8cc5d99449ad9a0a28502d98
Merge: d79ad50c3ae e7c9fe7eb1e
Author: nizhikov <nizhi...@apache.org>
AuthorDate: Thu Jun 15 11:33:01 2023 +0300
Merge branch 'master' into IGNITE-19676
docs/_docs/SQL/JDBC/jdbc-client-driver.adoc | 10 -
docs/_docs/SQL/JDBC/jdbc-driver.adoc | 6 -
docs/_docs/SQL/ODBC/connection-string-dsn.adoc | 6 -
.../_docs/perf-and-troubleshooting/sql-tuning.adoc | 17 +-
.../query/calcite/CalciteQueryProcessor.java | 40 +-
.../internal/processors/query/calcite/Query.java | 32 +-
.../processors/query/calcite/QueryRegistry.java | 11 +-
.../query/calcite/QueryRegistryImpl.java | 27 +-
.../processors/query/calcite/RootQuery.java | 67 ++-
.../query/calcite/exec/ExchangeService.java | 5 +
.../query/calcite/exec/ExchangeServiceImpl.java | 16 +-
.../query/calcite/exec/ExecutionServiceImpl.java | 33 +-
.../query/calcite/exec/rel/RootNode.java | 62 ++-
.../calcite/util/ConvertingClosableIterator.java | 10 +-
.../processors/query/calcite/CancelTest.java | 6 +-
.../exec/rel/TimeCalculationExecutionTest.java | 170 ++++++
.../KillQueryCommandDdlIntegrationTest.java | 2 +-
.../integration/RunningQueriesIntegrationTest.java | 25 +-
.../integration/SqlDiagnosticIntegrationTest.java | 106 +++-
...citeCommunicationMessageSerializationTest.java} | 28 +-
.../ignite/testsuites/ExecutionTestSuite.java | 2 +
.../ignite/testsuites/IgniteCalciteTestSuite.java | 2 +
.../thin/JdbcThinPartitionAwarenessSelfTest.java | 2 +-
...ThinPartitionAwarenessTransactionsSelfTest.java | 2 +-
.../internal/commandline/ArgumentParser.java | 169 +++++-
.../ignite/internal/binary/BinaryObjectImpl.java | 5 +-
.../GridNioClientConnectionMultiplexer.java | 7 +-
.../internal/management/api/HelpCommand.java | 19 +
.../internal/management/api/LocalCommand.java | 16 +-
.../internal/managers/IgniteMBeansManager.java | 8 +-
.../processors/bulkload/BulkLoadProcessor.java | 4 +-
.../snapshot/SnapshotRestoreProcess.java | 27 +-
.../cache/query/GridCacheQueryRequest.java | 6 +-
.../processors/query/GridQueryIndexing.java | 10 +-
.../processors/query/GridQueryProcessor.java | 4 +-
.../internal/processors/query/NoOpQueryEngine.java | 12 -
.../internal/processors/query/QueryEngine.java | 8 -
.../query/{ => running}/GridRunningQueryInfo.java | 13 +-
.../query/running/HeavyQueriesTracker.java} | 108 +++-
.../query/{ => running}/QueryHistory.java | 2 +-
.../query/{ => running}/QueryHistoryKey.java | 2 +-
.../{ => running}/QueryHistoryMetricsValue.java | 2 +-
.../query/{ => running}/QueryHistoryTracker.java | 2 +-
.../query/{ => running}/QueryRunningFuture.java | 2 +-
.../query/{ => running}/RunningQueryManager.java | 28 +-
.../processors/query/running}/SqlQueryMXBean.java | 2 +-
.../query/running}/SqlQueryMXBeanImpl.java | 23 +-
.../spi/systemview/view/SqlQueryHistoryView.java | 2 +-
.../ignite/spi/systemview/view/SqlQueryView.java | 2 +-
.../main/resources/META-INF/classnames.properties | 3 +-
...tractCommunicationMessageSerializationTest.java | 601 +++++++++++++++++++++
...iteIoCommunicationMessageSerializationTest.java | 91 ++++
.../processors/query/DummyQueryIndexing.java | 7 +-
.../ignite/testsuites/IgniteCacheTestSuite10.java | 2 +
modules/indexing/pom.xml | 7 +
.../query/h2/H2QueryFetchSizeInterceptor.java | 92 ----
.../internal/processors/query/h2/H2QueryInfo.java | 22 +-
.../processors/query/h2/H2ResultSetIterator.java | 13 +-
.../processors/query/h2/IgniteH2Indexing.java | 43 +-
.../processors/query/h2/RegisteredQueryCursor.java | 5 +-
.../query/h2/twostep/MapQueryResult.java | 10 +-
.../query/h2/twostep/msg/GridH2QueryRequest.java | 3 +-
.../metric/SqlStatisticsUserQueriesFastTest.java | 2 +-
.../metric/SqlStatisticsUserQueriesLongTest.java | 2 +-
.../internal/metric/UserQueriesTestBase.java | 4 +-
.../cache/CacheSqlQueryValueCopySelfTest.java | 2 +-
.../IgniteSqlSkipReducerOnUpdateDmlSelfTest.java | 1 +
.../query/KillQueryErrorOnCancelTest.java | 1 +
.../query/KillQueryOnClientDisconnectTest.java | 1 +
.../internal/processors/query/KillQueryTest.java | 1 +
.../processors/query/LongRunningQueryTest.java | 22 +-
.../processors/query/RunningQueriesTest.java | 1 +
.../processors/query/SqlQueryHistorySelfTest.java | 1 +
.../systemview/SystemViewSecurityTest.java | 2 +-
.../H2CommunicationMessageSerializationTest.java} | 24 +-
.../IgniteBinaryCacheQueryTestSuite3.java | 2 +
76 files changed, 1645 insertions(+), 490 deletions(-)
diff --cc
modules/core/src/main/java/org/apache/ignite/internal/management/api/HelpCommand.java
index c1a5b51042f,c1a5b51042f..fe2ff7e8ccc
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/api/HelpCommand.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/api/HelpCommand.java
@@@ -16,6 -16,6 +16,7 @@@
*/
package org.apache.ignite.internal.management.api;
++<<<<<<<<
HEAD:modules/core/src/main/java/org/apache/ignite/internal/management/api/HelpCommand.java
/**
* Marker interface only for backward compatibility with {@code ./control.sh}.
@@@ -25,4 -25,4 +26,22 @@@ public interface HelpCommand extends Co
@Override public default Class<NoArg> argClass() {
return NoArg.class;
}
++========
++
++import java.util.function.Consumer;
++import org.apache.ignite.internal.client.GridClient;
++import org.apache.ignite.internal.dto.IgniteDataTransferObject;
++
++/**
++ * Command that must be executed directly using {@link GridClient} instance.
++ */
++public interface LocalCommand<A extends IgniteDataTransferObject, R> extends
Command<A, R> {
++ /**
++ * @param cli Grid client instance.
++ * @param arg Command argument.
++ * @param printer Results printer.
++ * @return Command result.
++ */
++ public R execute(GridClient cli, A arg, Consumer<String> printer) throws
Exception;
++>>>>>>>>
master:modules/core/src/main/java/org/apache/ignite/internal/management/api/LocalCommand.java
}
diff --cc
modules/core/src/main/java/org/apache/ignite/internal/management/api/LocalCommand.java
index 044423e7792,fc32e932479..2f60d073ed8
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/api/LocalCommand.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/api/LocalCommand.java
@@@ -23,15 -22,14 +23,11 @@@ import org.apache.ignite.internal.clien
import org.apache.ignite.internal.dto.IgniteDataTransferObject;
/**
-- * Command that must be executed directly using {@link GridClient} instance.
++ * Marker interface only for backward compatibility with {@code ./control.sh}.
*/
--public interface LocalCommand<A extends IgniteDataTransferObject, R> extends
Command<A, R> {
-- /**
-- * @param cli Grid client instance.
-- * @param arg Command argument.
-- * @param printer Results printer.
-- * @return Command result.
- * @throws GridClientException In case of error.
-- */
- public R execute(GridClient cli, A arg, Consumer<String> printer) throws
GridClientException;
- public R execute(GridClient cli, A arg, Consumer<String> printer) throws
Exception;
++public interface HelpCommand extends Command<NoArg, Void> {
++ /** {@inheritDoc} */
++ @Override public default Class<NoArg> argClass() {
++ return NoArg.class;
++ }
}
