IGNITE-23489 Add rest endpoint to retrieve active transactions and running queries #5080
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nevdmitry
force-pushed
the
IGNITE-23489
branch
from
1a2be0c to
4e3ad71
Compare
modules/rest-api/src/main/java/org/apache/ignite/internal/rest/api/sql/SqlQueryApi.java
Outdated
Show resolved
Hide resolved
...s/rest-api/src/main/java/org/apache/ignite/internal/rest/api/transaction/TransactionApi.java
Outdated
Show resolved
Hide resolved
...t/src/integrationTest/java/org/apache/ignite/internal/rest/sql/ItSqlQueryControllerTest.java
Outdated
Show resolved
Hide resolved
added 5 commits
January 21, 2025 14:45
modules/rest-api/src/main/java/org/apache/ignite/internal/rest/api/sql/SqlQueryApi.java
Outdated
Show resolved
Hide resolved
xtern
reviewed
Jan 22, 2025
modules/rest/src/main/java/org/apache/ignite/internal/rest/sql/SqlQueryController.java
Outdated
Show resolved
Hide resolved
...s/rest-api/src/main/java/org/apache/ignite/internal/rest/api/transaction/TransactionApi.java
Outdated
Show resolved
Hide resolved
...t/src/integrationTest/java/org/apache/ignite/internal/rest/sql/ItSqlQueryControllerTest.java
Outdated
Show resolved
Hide resolved
| assertThat(queryInfo.schema(), is("PUBLIC")); | ||
| assertThat(queryInfo.type(), is("QUERY")); | ||
|
|
||
| rs.close(); |
There was a problem hiding this comment.
does it make sense to close rs in try-with-resources? or in finally section? looks like the assertion error can lead other tests to fail with due to unclosed cursor.
xtern
reviewed
Jan 22, 2025
|
|
||
| IgniteSql igniteSql = CLUSTER.aliveNode().sql(); | ||
| // run query with results pageSize=1 | ||
| ResultSet<SqlRow> rs = CLUSTER.aliveNode().sql() |
There was a problem hiding this comment.
Up to you, but I suggest to extract these common lines into a separate method
private static ResultSet<SqlRow> runQuery(String sql) {
IgniteSql igniteSql = CLUSTER.aliveNode().sql();
Statement stmt = igniteSql.statementBuilder().query(sql).pageSize(1).build();
return CLUSTER.aliveNode().sql().execute(null, stmt);
}
| HttpClient client; | ||
|
|
||
| @Test | ||
| void shouldReturnAllTransactions() { |
There was a problem hiding this comment.
I suggest to rework this test a bit
Transaction roTx = node(0).transactions().begin(new TransactionOptions().readOnly(true));
Transaction rwTx = node(0).transactions().begin(new TransactionOptions().readOnly(false));
Map<UUID, TransactionInfo> transactions = getTransactions(client);
{
TransactionInfo transactionInfo = transactions.get(((InternalTransaction) roTx).id());
assertThat(transactionInfo, notNullValue());
assertThat(transactionInfo.type(), is("READ_ONLY"));
assertThat(transactionInfo.state(), nullValue());
assertThat(transactionInfo.priority(), is("NORMAL"));
roTx.rollback();
}
{
TransactionInfo transactionInfo = transactions.get(((InternalTransaction) rwTx).id());
assertThat(transactionInfo, notNullValue());
assertThat(transactionInfo.type(), is("READ_WRITE"));
assertThat(transactionInfo.state(), is("PENDING"));
assertThat(transactionInfo.priority(), is("NORMAL"));
rwTx.rollback();
}
| void shouldReturnTransactionById() { | ||
| Transaction tx = node(0).transactions().begin(); | ||
|
|
||
| sql(tx, "SELECT 1"); |
| @Override | ||
| public CompletableFuture<Void> cancelQuery(UUID queryId) { | ||
| return killHandlerRegistry.handler(CancellableOperationType.QUERY).cancelAsync(queryId.toString()) | ||
| .thenCompose(result -> handleOperationResult(queryId, result)); |
There was a problem hiding this comment.
why not thenApply as in method query(UUID queryId)?
| /** | ||
| * Thrown when sql query cancel failed. | ||
| */ | ||
| public class SqlQueryCancelException extends IgniteInternalException { |
There was a problem hiding this comment.
I probably don't understand how this works, but when does this exception occur?
|
|
||
| @Override | ||
| public CompletableFuture<Void> cancelTransaction(UUID transactionId) { | ||
| // Waiting https://issues.apache.org/jira/browse/IGNITE-23488 |
There was a problem hiding this comment.
Firstly, I think comment should start from "TODO",
Secondly, I think it's worth creating a separate JIRA issue that will be blocked by IGNITE-23488, and the link should be to that issue.
| /** | ||
| * Returns operation kill handler for specified operation type. | ||
| * | ||
| * @param type operation type. |
There was a problem hiding this comment.
Suggested change
| * @param type operation type. | |
| * @param type Operation type. |
Also remove @SuppressWarnings("InterfaceMayBeAnnotatedFunctional") class annotation
| * Returns operation kill handler for specified operation type. | ||
| * | ||
| * @param type operation type. | ||
| * @return operation kill handler for specified operation type. |
There was a problem hiding this comment.
Suggested change
| * @return operation kill handler for specified operation type. | |
| * @return Operation kill handler for specified operation type. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Introduce new rest endpoints
GET /management/v1/transactions/
GET /management/v1/transactions/{tx_id}
DELETE /management/v1/transactions/{tx_id}
GET /management/v1/sql/queries/
GET /management/v1/sql/queries/{query_id}
DELETE /management/v1/sql/queries/{query_id}