You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by pt...@apache.org on 2022/05/26 10:36:14 UTC
[ignite-3] branch ignite-14972 updated: wip
This is an automated email from the ASF dual-hosted git repository.
ptupitsyn pushed a commit to branch ignite-14972
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/ignite-14972 by this push:
new 3696e834e wip
3696e834e is described below
commit 3696e834eadad168656e42c6a5a9ec0c0eaa8330
Author: Pavel Tupitsyn <pt...@apache.org>
AuthorDate: Thu May 26 13:36:09 2022 +0300
wip
---
.../handler/requests/sql/ClientSqlExecuteRequest.java | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/modules/client-handler/src/main/java/org/apache/ignite/client/handler/requests/sql/ClientSqlExecuteRequest.java b/modules/client-handler/src/main/java/org/apache/ignite/client/handler/requests/sql/ClientSqlExecuteRequest.java
index 97ada014d..2034a6cea 100644
--- a/modules/client-handler/src/main/java/org/apache/ignite/client/handler/requests/sql/ClientSqlExecuteRequest.java
+++ b/modules/client-handler/src/main/java/org/apache/ignite/client/handler/requests/sql/ClientSqlExecuteRequest.java
@@ -17,8 +17,11 @@
package org.apache.ignite.client.handler.requests.sql;
+import static org.apache.ignite.client.handler.requests.table.ClientTableCommon.readTx;
+
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
+import org.apache.ignite.client.handler.ClientResourceRegistry;
import org.apache.ignite.internal.client.proto.ClientMessagePacker;
import org.apache.ignite.internal.client.proto.ClientMessageUnpacker;
import org.apache.ignite.sql.IgniteSql;
@@ -39,8 +42,14 @@ public class ClientSqlExecuteRequest {
* @param sql SQL API.
* @return Future.
*/
- public static CompletableFuture<Void> process(ClientMessageUnpacker in, ClientMessagePacker out, IgniteSql sql) {
+ public static CompletableFuture<Void> process(
+ ClientMessageUnpacker in,
+ ClientMessagePacker out,
+ IgniteSql sql,
+ ClientResourceRegistry resources) {
// TODO: read TX.
+ var tx = readTx(in, resources);
+
// TODO: "brief mode" which only includes query text and args? - separate ticket.
SessionBuilder sessionBuilder = sql.sessionBuilder()
.defaultPageSize(in.unpackInt())
@@ -74,7 +83,7 @@ public class ClientSqlExecuteRequest {
Statement statement = statementBuilder.build();
- return session.executeAsync(null, statement).thenAccept(asyncResultSet -> {
+ return session.executeAsync(tx, statement).thenAccept(asyncResultSet -> {
// TODO: Put result set to resources and return id (or null when single page).
// TODO: Pack first page, close if ended.
out.packLong(0);