Remove unused code, add comments, java doc

Author: ekuvardin

core/src/main/java/tech/ydb/core/OperationResult.java

@@ -0,0 +1,53 @@
+package tech.ydb.core;
+
+import tech.ydb.core.operation.Operation;
+
+import javax.annotation.Nonnull;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
+
+public class OperationResult<T> implements Result<T>{
+
+    Operation<Result<T>> operation;
+    Result<T> result;
+
+    public OperationResult(Operation<Result<T>> resultOperation) {
+        this.operation = resultOperation;
+        this.result = operation.getValue();
+    }
+
+    public Operation<Result<T>> getOperation() {
+        return operation;
+    }
+
+    @Nonnull
+    @Override
+    public Status getStatus() {
+        return result.getStatus();
+    }
+
+    @Nonnull
+    @Override
+    public T getValue() throws UnexpectedResultException {
+        return result.getValue();
+    }
+
+    @Nonnull
+    @Override
+    public <U> Result<U> map(@Nonnull Function<T, U> mapper) {
+        return result.map(mapper);
+    }
+
+    @Nonnull
+    @Override
+    public <U> CompletableFuture<Result<U>> mapResultFuture(@Nonnull Function<T, CompletableFuture<Result<U>>> mapper) {
+        return result.mapResultFuture(mapper);
+    }
+
+    @Nonnull
+    @Override
+    public CompletableFuture<Status> mapStatusFuture(@Nonnull Function<T, CompletableFuture<Status>> mapper) {
+        return result.mapStatusFuture(mapper);
+    }
+}

query/src/main/java/tech/ydb/query/QuerySession.java

@@ -6,7 +6,10 @@
 
 import tech.ydb.common.transaction.TxMode;
 import tech.ydb.core.Result;
-import tech.ydb.proto.OperationProtos;
+import tech.ydb.core.Status;
+import tech.ydb.core.operation.Operation;
+import tech.ydb.proto.query.YdbQuery;
+import tech.ydb.proto.scripting.ScriptingProtos;
 import tech.ydb.query.settings.BeginTransactionSettings;
 import tech.ydb.query.settings.ExecuteQuerySettings;
 import tech.ydb.query.settings.ExecuteScriptSettings;
@@ -71,6 +74,17 @@ public interface QuerySession extends AutoCloseable {
      */
     QueryStream createQuery(String query, TxMode tx, Params params, ExecuteQuerySettings settings);
 
+
+    /**
+     * Execute yql script
+     * @param query text of query
+     * @param params query parameters
+     * @param settings additional settings of query execution
+     * @return future with result of the script execution
+     */
+    CompletableFuture<Result<ScriptingProtos.ExecuteYqlResult>> executeScriptYql(String query, Params params, ExecuteScriptSettings settings);
+
+
     /**
      * Create {@link QueryStream} for executing query with specified {@link TxMode}. The query can contain DML, DDL and
      * DCL statements. Supported mix of different statement types depends on the chosen transaction type.
@@ -80,19 +94,18 @@ public interface QuerySession extends AutoCloseable {
      * @param settings additional settings of query execution
      * @return a ready to execute instance of {@link QueryStream}
      */
-    CompletableFuture<Result<OperationProtos.Operation>> executeScript(String query, Params params, ExecuteScriptSettings settings);
+    CompletableFuture<Operation<Status>> executeScript(String query, Params params, ExecuteScriptSettings settings);
 
     /**
-     * Create {@link QueryStream} for executing query with specified {@link TxMode}. The query can contain DML, DDL and
-     * DCL statements. Supported mix of different statement types depends on the chosen transaction type.
+     * Fetch result from script which has already passed to YDB
+     * Before use wait for CompletableFuture with operation
      *
      * @param query text of query
-     * @param tx transaction mode
      * @param params query parameters
      * @param settings additional settings of query execution
      * @return a ready to execute instance of {@link QueryStream}
      */
-    QueryStream fetchScriptResults(String query, TxMode tx, Params params, FetchScriptSettings settings);
+    CompletableFuture<Result<YdbQuery.FetchScriptResultsResponse>> fetchScriptResults(String query, Params params, FetchScriptSettings settings);
 
     @Override
     void close();
@@ -134,25 +147,23 @@ default CompletableFuture<Result<QueryTransaction>> beginTransaction(TxMode txMo
     }
 
     /**
-     * Create {@link QueryStream} for executing query with specified {@link TxMode}. The query can contain DML, DDL and
-     * DCL statements. Supported mix of different statement types depends on the chosen transaction type.
+     * Execute Yql script with different type of operation
      *
      * @param query text of query
-     * @return a ready to execute instance of {@link QueryStream}
+     * @return a future join on it to wait for script finished
      */
-    default CompletableFuture<Result<OperationProtos.Operation>> executeScript(String query) {
-        return executeScript(query, Params.empty(), ExecuteScriptSettings.newBuilder().build());
+    default CompletableFuture<Result<ScriptingProtos.ExecuteYqlResult>> executeScriptYql(String query) {
+        return executeScriptYql(query, Params.empty(), ExecuteScriptSettings.newBuilder().build());
     }
 
     /**
-     * Create {@link QueryStream} for executing query with specified {@link TxMode}. The query can contain DML, DDL and
-     * DCL statements. Supported mix of different statement types depends on the chosen transaction type.
+     * Execute Yql script with different type of operation
+     * Take a not join on a future is not granted that script is executed instead join guarantee that script pass to YDB
      *
      * @param query text of query
-     * @param tx transaction mode
-     * @return a ready to execute instance of {@link QueryStream}
+     * @return future join on it to wait for script pass to YDB but not get result
      */
-    default QueryStream fetchScriptResults(String query, TxMode tx) {
-        return fetchScriptResults(query, tx, Params.empty(), FetchScriptSettings.newBuilder().build());
+    default CompletableFuture<Operation<Status>> executeScript(String query) {
+        return executeScript(query, Params.empty(), ExecuteScriptSettings.newBuilder().build());
     }
 }

query/src/main/java/tech/ydb/query/impl/QueryServiceRpc.java

@@ -5,13 +5,17 @@
 import io.grpc.Context;
 
 import tech.ydb.core.Result;
+import tech.ydb.core.Status;
 import tech.ydb.core.grpc.GrpcReadStream;
 import tech.ydb.core.grpc.GrpcRequestSettings;
 import tech.ydb.core.grpc.GrpcTransport;
+import tech.ydb.core.operation.Operation;
+import tech.ydb.core.operation.OperationBinder;
 import tech.ydb.core.operation.StatusExtractor;
-import tech.ydb.proto.OperationProtos;
 import tech.ydb.proto.query.YdbQuery;
 import tech.ydb.proto.query.v1.QueryServiceGrpc;
+import tech.ydb.proto.scripting.ScriptingProtos;
+import tech.ydb.proto.scripting.v1.ScriptingServiceGrpc;
 
 /**
  *
@@ -106,11 +110,46 @@ public GrpcReadStream<YdbQuery.ExecuteQueryResponsePart> executeQuery(
         return transport.readStreamCall(QueryServiceGrpc.getExecuteQueryMethod(), settings, request);
     }
 
-    public CompletableFuture<Result<OperationProtos.Operation>> executeScript(
+    /**
+     * Run execute script using Yql
+     *
+     * @param request request for execute script
+     * @param settings grpc settings
+     * @return future with result of execution
+     */
+    public CompletableFuture<Operation<Result<ScriptingProtos.ExecuteYqlResult>>> executeScriptYql(
+            ScriptingProtos.ExecuteYqlRequest request, GrpcRequestSettings settings) {
+
+        return transport.unaryCall(ScriptingServiceGrpc.getExecuteYqlMethod(), settings, request)
+                .thenApply(OperationBinder.bindAsync(
+                        transport, ScriptingProtos.ExecuteYqlResponse::getOperation, ScriptingProtos.ExecuteYqlResult.class)
+                );
+    }
+
+    /**
+     * Execute script using query
+     *
+     * @param request request for execute script
+     * @param settings grpc settings
+     * @return future with result of execution
+     */
+    public CompletableFuture<Operation<Status>> executeScript(
             YdbQuery.ExecuteScriptRequest request, GrpcRequestSettings settings) {
-        return transport.unaryCall(QueryServiceGrpc.getExecuteScriptMethod(), settings, request);
+
+        return transport.unaryCall(QueryServiceGrpc.getExecuteScriptMethod(), settings, request)
+                .thenApply(
+                        OperationBinder.bindAsync(transport,
+                                op -> op
+                        ));
     }
 
+    /**
+     * Fetch script using query
+     *
+     * @param request for execute script
+     * @param settings grpc settings
+     * @return future with result of execution
+     */
     public CompletableFuture<Result<YdbQuery.FetchScriptResultsResponse>> fetchScriptResults(
             YdbQuery.FetchScriptResultsRequest request, GrpcRequestSettings settings) {
         return transport

query/src/main/java/tech/ydb/query/impl/SessionImpl.java

@@ -9,6 +9,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 
+import com.google.common.base.Strings;
 import com.google.protobuf.Duration;
 import com.google.protobuf.TextFormat;
 import org.slf4j.Logger;
@@ -17,17 +18,20 @@
 import tech.ydb.common.transaction.TxMode;
 import tech.ydb.common.transaction.impl.YdbTransactionImpl;
 import tech.ydb.core.Issue;
+import tech.ydb.core.OperationResult;
 import tech.ydb.core.Result;
 import tech.ydb.core.Status;
 import tech.ydb.core.StatusCode;
 import tech.ydb.core.grpc.GrpcReadStream;
 import tech.ydb.core.grpc.GrpcRequestSettings;
+import tech.ydb.core.operation.Operation;
 import tech.ydb.core.operation.StatusExtractor;
 import tech.ydb.core.settings.BaseRequestSettings;
 import tech.ydb.core.utils.URITools;
 import tech.ydb.core.utils.UpdatableOptional;
-import tech.ydb.proto.OperationProtos;
 import tech.ydb.proto.query.YdbQuery;
+import tech.ydb.proto.scripting.ScriptingProtos;
+import tech.ydb.proto.table.YdbTable;
 import tech.ydb.query.QuerySession;
 import tech.ydb.query.QueryStream;
 import tech.ydb.query.QueryTransaction;
@@ -186,6 +190,19 @@ private static YdbQuery.ExecMode mapExecMode(QueryExecMode mode) {
         }
     }
 
+    private static YdbTable.QueryStatsCollection.Mode mapStatsCollectionMode(QueryStatsMode mode) {
+        switch (mode) {
+            case NONE: return YdbTable.QueryStatsCollection.Mode.STATS_COLLECTION_NONE;
+            case BASIC: return YdbTable.QueryStatsCollection.Mode.STATS_COLLECTION_BASIC;
+            case FULL: return YdbTable.QueryStatsCollection.Mode.STATS_COLLECTION_FULL;
+            case PROFILE: return YdbTable.QueryStatsCollection.Mode.STATS_COLLECTION_PROFILE;
+
+            case UNSPECIFIED:
+            default:
+                return YdbTable.QueryStatsCollection.Mode.STATS_COLLECTION_UNSPECIFIED;
+        }
+    }
+
     private static YdbQuery.StatsMode mapStatsMode(QueryStatsMode mode) {
         switch (mode) {
             case NONE: return YdbQuery.StatsMode.STATS_MODE_NONE;
@@ -249,7 +266,20 @@ void handleTxMeta(String txID) {
     }
 
     @Override
-    public CompletableFuture<Result<OperationProtos.Operation>> executeScript(String query, Params params, ExecuteScriptSettings settings) {
+    public CompletableFuture<Result<ScriptingProtos.ExecuteYqlResult>> executeScriptYql(String query, Params params, ExecuteScriptSettings settings) {
+        ScriptingProtos.ExecuteYqlRequest.Builder requestBuilder =  ScriptingProtos.ExecuteYqlRequest.newBuilder()
+                .setScript(query)
+                .setCollectStats(mapStatsCollectionMode(settings.getStatsMode()));
+
+        requestBuilder.putAllParameters(params.toPb());
+
+        GrpcRequestSettings.Builder options = makeOptions(settings);
+
+        return rpc.executeScriptYql(requestBuilder.build(), options.build()).thenApply(OperationResult::new);
+    }
+
+    @Override
+    public CompletableFuture<Operation<Status>> executeScript(String query, Params params, ExecuteScriptSettings settings) {
         YdbQuery.ExecuteScriptRequest.Builder request = YdbQuery.ExecuteScriptRequest.newBuilder()
                 .setExecMode(mapExecMode(settings.getExecMode()))
                 .setStatsMode(mapStatsMode(settings.getStatsMode()))
@@ -276,45 +306,25 @@ public CompletableFuture<Result<OperationProtos.Operation>> executeScript(String
     }
 
     @Override
-    public QueryStream fetchScriptResults(String query, TxMode tx, Params params, FetchScriptSettings settings) {
-        YdbQuery.FetchScriptResultsRequest.Builder request = YdbQuery.FetchScriptResultsRequest.newBuilder()
-                .setOperationId(settings.getOperationId())
-                .setFetchToken(settings.getFetchToken())
-                .setRowsLimit(10)
-                .setResultSetIndex(0L);
+    public CompletableFuture<Result<YdbQuery.FetchScriptResultsResponse>> fetchScriptResults(String query, Params params, FetchScriptSettings settings) {
+        YdbQuery.FetchScriptResultsRequest.Builder requestBuilder = YdbQuery.FetchScriptResultsRequest.newBuilder();
+
+        if(!Strings.isNullOrEmpty(settings.getFetchToken())) {
+            requestBuilder.setFetchToken(settings.getFetchToken());
+        }
+
+        if(settings.getRowsLimit() > 0) {
+            requestBuilder.setRowsLimit(settings.getRowsLimit());
+        }
+
+        requestBuilder.setOperationId(settings.getOperationId());
+
+        if(settings.getSetResultSetIndex() >= 0) {
+            requestBuilder.setResultSetIndex(settings.getSetResultSetIndex());
+        }
 
         GrpcRequestSettings.Builder options = makeOptions(settings);
-        CompletableFuture<Result<YdbQuery.FetchScriptResultsResponse>> response
-                = rpc.fetchScriptResults(request.build(), options.build());
-
-        return null;
-      /*  response.thenApply(result -> result.getValue() )
-
-        Result<YdbQuery.FetchScriptResultsResponse> resp = response.get();
-        YdbQuery.FetchScriptResultsResponse rs = resp.getValue();
-
-        rs.getResultSet();
-        rs.get*/
-        /*
-        rs := response.GetResultSet()
-		columns := rs.GetColumns()
-		columnNames := make([]string, len(columns))
-		columnTypes := make([]types.Type, len(columns))
-		for i := range columns {
-			columnNames[i] = columns[i].GetName()
-			columnTypes[i] = types.TypeFromYDB(columns[i].GetType())
-		}
-		rows := make([]query.Row, len(rs.GetRows()))
-		for i, r := range rs.GetRows() {
-			rows[i] = NewRow(columns, r)
-		}
-
-		return &options.FetchScriptResult{
-			ResultSetIndex: response.GetResultSetIndex(),
-			ResultSet:      MaterializedResultSet(int(response.GetResultSetIndex()), columnNames, columnTypes, rows),
-			NextToken:      response.GetNextFetchToken(),
-		}, nil
-         */
+        return rpc.fetchScriptResults(requestBuilder.build(), options.build());
     }
 
     public CompletableFuture<Result<YdbQuery.DeleteSessionResponse>> delete(DeleteSessionSettings settings) {

query/src/main/java/tech/ydb/query/settings/ExecuteScriptSettings.java

@@ -1,12 +1,11 @@
 package tech.ydb.query.settings;
 
-import tech.ydb.core.grpc.GrpcFlowControl;
 import tech.ydb.core.settings.BaseRequestSettings;
 
 import java.time.Duration;
 
 /**
-
+ * Script settings to pass to execute script
  */
 public class ExecuteScriptSettings extends BaseRequestSettings {
     private final QueryExecMode execMode;
@@ -51,7 +50,7 @@ public static class Builder extends BaseBuilder<Builder> {
         private QueryExecMode execMode = QueryExecMode.EXECUTE;
         private QueryStatsMode statsMode = QueryStatsMode.NONE;
         private String resourcePool = null;
-        private Duration ttl =null;
+        private Duration ttl = null;
 
         public Builder withExecMode(QueryExecMode mode) {
             this.execMode = mode;