fixes

Author: asmyasnikov

internal/query/errors.go

@@ -6,9 +6,9 @@ import (
 
 var (
 	ErrNotImplemented          = errors.New("not implemented yet")
-	errWrongNextResultSetIndex = errors.New("wrong result set index")
+	errWrongNextResultSetIndex = errors.New("wrong result set rowIndex")
 	errClosedResult            = errors.New("result closed early")
-	errWrongResultSetIndex     = errors.New("critical violation of the logic - wrong result set index")
+	errWrongResultSetIndex     = errors.New("critical violation of the logic - wrong result set rowIndex")
 	errMoreThanOneRow          = errors.New("unexpected more than one row in result set")
 	errMoreThanOneResultSet    = errors.New("unexpected more than one result set")
 	errNoResultSets            = errors.New("no result sets")

internal/query/result.go

@@ -191,7 +191,7 @@ func (r *result) nextResultSet(ctx context.Context) (_ *resultSet, err error) {
 			}
 			if part.GetResultSetIndex() < r.resultSetIndex {
 				return nil, xerrors.WithStackTrace(fmt.Errorf(
-					"next result set index %d less than last result set index %d: %w",
+					"next result set rowIndex %d less than last result set rowIndex %d: %w",
 					part.GetResultSetIndex(), r.resultSetIndex, errWrongNextResultSetIndex,
 				))
 			}
@@ -231,7 +231,7 @@ func (r *result) getNextResultSetPart(
 			r.lastPart = part
 			if part.GetResultSetIndex() > nextResultSetIndex {
 				return nil, xerrors.WithStackTrace(fmt.Errorf(
-					"result set (index=%d) receive part (index=%d) for next result set: %w",
+					"result set (rowIndex=%d) receive part (rowIndex=%d) for next result set: %w",
 					nextResultSetIndex, part.GetResultSetIndex(), io.EOF,
 				))
 			}
@@ -324,7 +324,7 @@ func exactlyOneResultSetFromResult(ctx context.Context, r query.Result) (rs quer
 		return nil, xerrors.WithStackTrace(err)
 	}
 
-	return NewMaterializedResultSet(rs.Columns(), rs.ColumnTypes(), rows), nil
+	return NewMaterializedResultSet(rs.Index(), rs.Columns(), rs.ColumnTypes(), rows), nil
 }
 
 func resultToMaterializedResult(ctx context.Context, r query.Result) (query.Result, error) {
@@ -354,7 +354,7 @@ func resultToMaterializedResult(ctx context.Context, r query.Result) (query.Resu
 			rows = append(rows, row)
 		}
 
-		resultSets = append(resultSets, NewMaterializedResultSet(rs.Columns(), rs.ColumnTypes(), rows))
+		resultSets = append(resultSets, NewMaterializedResultSet(rs.Index(), rs.Columns(), rs.ColumnTypes(), rows))
 	}
 
 	return newMaterializedResult(resultSets), nil

internal/query/result_set.go

@@ -23,10 +23,11 @@ var (
 
 type (
 	materializedResultSet struct {
+		index       int
 		columnNames []string
 		columnTypes []types.Type
 		rows        []query.Row
-		idx         int
+		rowIndex    int
 	}
 	resultSet struct {
 		index       int64
@@ -74,27 +75,29 @@ func (rs *resultSet) Columns() (columnNames []string) {
 }
 
 func (rs *materializedResultSet) NextRow(ctx context.Context) (query.Row, error) {
-	if rs.idx == len(rs.rows) {
+	if rs.rowIndex == len(rs.rows) {
 		return nil, xerrors.WithStackTrace(io.EOF)
 	}
 
 	defer func() {
-		rs.idx++
+		rs.rowIndex++
 	}()
 
-	return rs.rows[rs.idx], nil
+	return rs.rows[rs.rowIndex], nil
 }
 
 func (rs *materializedResultSet) Index() int {
-	return rs.idx
+	return rs.index
 }
 
 func NewMaterializedResultSet(
+	index int,
 	columnNames []string,
 	columnTypes []types.Type,
 	rows []query.Row,
 ) *materializedResultSet {
 	return &materializedResultSet{
+		index:       index,
 		columnNames: columnNames,
 		columnTypes: columnTypes,
 		rows:        rows,
@@ -151,7 +154,7 @@ func (rs *resultSet) nextRow(ctx context.Context) (*row, error) {
 				close(rs.done)
 
 				return nil, xerrors.WithStackTrace(fmt.Errorf(
-					"received part with result set index = %d, current result set index = %d: %w",
+					"received part with result set rowIndex = %d, current result set rowIndex = %d: %w",
 					rs.index, rs.currentPart.GetResultSetIndex(), errWrongResultSetIndex,
 				))
 			}
@@ -175,5 +178,5 @@ func (rs *resultSet) NextRow(ctx context.Context) (_ query.Row, err error) {
 }
 
 func (rs *resultSet) Index() int {
-	return rs.idx
+	return int(rs.index)
 }

internal/query/result_set_range_test.go

@@ -681,7 +681,7 @@ func TestResultSetRange(t *testing.T) {
 			}
 			if resultSetIndex := part.GetResultSetIndex(); resultSetIndex != 0 {
 				return nil, xerrors.WithStackTrace(fmt.Errorf(
-					"critical violation of the logic: wrong result set index: %d != %d",
+					"critical violation of the logic: wrong result set rowIndex: %d != %d",
 					resultSetIndex, 0,
 				))
 			}
@@ -771,7 +771,7 @@ func TestResultSetRange(t *testing.T) {
 			}
 			if resultSetIndex := part.GetResultSetIndex(); resultSetIndex != 0 {
 				return nil, xerrors.WithStackTrace(fmt.Errorf(
-					"critical violation of the logic: wrong result set index: %d != %d",
+					"critical violation of the logic: wrong result set rowIndex: %d != %d",
 					resultSetIndex, 0,
 				))
 			}

internal/query/result_set_test.go

@@ -629,7 +629,7 @@ func TestResultSetNext(t *testing.T) {
 				}
 				if resultSetIndex := part.GetResultSetIndex(); resultSetIndex != 0 {
 					return nil, xerrors.WithStackTrace(fmt.Errorf(
-						"critical violation of the logic: wrong result set index: %d != %d",
+						"critical violation of the logic: wrong result set rowIndex: %d != %d",
 						resultSetIndex, 0,
 					))
 				}
@@ -728,7 +728,7 @@ func TestResultSetNext(t *testing.T) {
 				}
 				if resultSetIndex := part.GetResultSetIndex(); resultSetIndex != 0 {
 					return nil, xerrors.WithStackTrace(fmt.Errorf(
-						"critical violation of the logic: wrong result set index: %d != %d",
+						"critical violation of the logic: wrong result set rowIndex: %d != %d",
 						resultSetIndex, 0,
 					))
 				}

sugar/query_test.go

@@ -140,9 +140,7 @@ func TestUnmarshallResultSet(t *testing.T) {
 		ID  uint64 `sql:"id"`
 		Str string `sql:"myStr"`
 	}
-	v, err := sugar.UnmarshallResultSet[myStruct](internalQuery.NewMaterializedResultSet(
-		nil,
-		nil,
+	v, err := sugar.UnmarshallResultSet[myStruct](internalQuery.NewMaterializedResultSet(-1, nil, nil,
 		[]query.Row{
 			func() query.Row {
 				row, err := internalQuery.NewRow(ctx, []*Ydb.Column{