Merge branch 'master' into execute-data-query-over-query

CHANGELOG.md

@@ -1,4 +1,7 @@
-* Added `table/options.UseQueryServiceExecute()` option for redirect `table.Session.Execute` call to `query.Execute`
+* Added `table/options.WithQueryService()` option for redirect `/Ydb.Table.V1.TableService/ExecuteDataQuery` call to `/Ydb.Query.V1.QueryService/ExecuteQuery`
+
+## v3.65.2
+* Fixed data race using `log.WithNames`
 
 ## v3.65.1
 * Updated dependency `ydb-go-genproto`

internal/query/errors.go

@@ -7,6 +7,7 @@ import (
 var (
 	ErrNotImplemented          = errors.New("not implemented yet")
 	errWrongNextResultSetIndex = errors.New("wrong result set index")
+	errNilResult               = errors.New("nil result")
 	errClosedResult            = errors.New("result closed early")
 	errClosedClient            = errors.New("query client closed early")
 	errWrongResultSetIndex     = errors.New("critical violation of the logic - wrong result set index")

internal/query/execute_query.go

@@ -39,6 +39,9 @@ func queryFromText(
 }
 
 func ReadAll(ctx context.Context, r *result) (resultSets []*Ydb.ResultSet, stats *Ydb_TableStats.QueryStats, _ error) {
+	if r == nil {
+		return nil, nil, xerrors.WithStackTrace(errNilResult)
+	}
 	for {
 		resultSet, err := r.nextResultSet(ctx)
 		if err != nil {