added Index() == -1

Author: asmyasnikov

internal/query/errors.go

@@ -6,9 +6,9 @@ import (
 
 var (
 	ErrNotImplemented          = errors.New("not implemented yet")
-	errWrongNextResultSetIndex = errors.New("wrong result set rowIndex")
+	errWrongNextResultSetIndex = errors.New("wrong result set index")
 	errClosedResult            = errors.New("result closed early")
-	errWrongResultSetIndex     = errors.New("critical violation of the logic - wrong result set rowIndex")
+	errWrongResultSetIndex     = errors.New("critical violation of the logic - wrong result set index")
 	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 rowIndex %d less than last result set rowIndex %d: %w",
+					"next result set rowIndex %d less than last result set index %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 (rowIndex=%d) receive part (rowIndex=%d) for next result set: %w",
+					"result set (index=%d) receive part (index=%d) for next result set: %w",
 					nextResultSetIndex, part.GetResultSetIndex(), io.EOF,
 				))
 			}

internal/query/result_set.go

@@ -87,6 +87,10 @@ func (rs *materializedResultSet) NextRow(ctx context.Context) (query.Row, error)
 }
 
 func (rs *materializedResultSet) Index() int {
+	if rs == nil {
+		return -1
+	}
+
 	return rs.index
 }
 
@@ -154,7 +158,7 @@ func (rs *resultSet) nextRow(ctx context.Context) (*row, error) {
 				close(rs.done)
 
 				return nil, xerrors.WithStackTrace(fmt.Errorf(
-					"received part with result set rowIndex = %d, current result set rowIndex = %d: %w",
+					"received part with result set index = %d, current result set index = %d: %w",
 					rs.index, rs.currentPart.GetResultSetIndex(), errWrongResultSetIndex,
 				))
 			}
@@ -178,5 +182,9 @@ func (rs *resultSet) NextRow(ctx context.Context) (_ query.Row, err error) {
 }
 
 func (rs *resultSet) Index() int {
+	if rs == nil {
+		return -1
+	}
+
 	return int(rs.index)
 }

internal/query/result_set_range_test.go

@@ -681,7 +681,8 @@ 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 rowIndex: %d != %d",
+					"%w: %d != %d",
+					errWrongNextResultSetIndex,
 					resultSetIndex, 0,
 				))
 			}
@@ -771,7 +772,8 @@ 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 rowIndex: %d != %d",
+					"%w: %d != %d",
+					errWrongNextResultSetIndex,
 					resultSetIndex, 0,
 				))
 			}

internal/query/result_test.go

@@ -442,8 +442,10 @@ func TestResultNextResultSet(t *testing.T) {
 			}
 			{
 				t.Log("nextResultSet")
-				_, err := r.nextResultSet(context.Background())
+				rs, err := r.nextResultSet(context.Background())
 				require.ErrorIs(t, err, errClosedResult)
+				require.Nil(t, rs)
+				require.Equal(t, -1, rs.Index())
 			}
 			t.Log("check final error")
 			require.NoError(t, r.Err())