fix: check for error after calling Next()

Author: olavloite

spannerlib/api/rows.go

@@ -139,7 +139,9 @@ func (rows *rows) Metadata() (*spannerpb.ResultSetMetadata, error) {
 
 func (rows *rows) ResultSetStats(ctx context.Context) (*spannerpb.ResultSetStats, error) {
 	if rows.stats == nil {
-		rows.readStats(ctx)
+		if err := rows.readStats(ctx); err != nil {
+			return nil, err
+		}
 	}
 	return rows.stats, nil
 }
@@ -165,10 +167,15 @@ func (rows *rows) Next(ctx context.Context) (*structpb.ListValue, error) {
 		return nil, spanner.ToSpannerError(status.Error(codes.FailedPrecondition, "cannot read more data after returning stats"))
 	}
 	ok := rows.backend.Next()
+	if !ok && rows.backend.Err() != nil {
+		return nil, rows.backend.Err()
+	}
 	if !ok {
 		rows.done = true
 		// No more rows. Read stats and return nil.
-		rows.readStats(ctx)
+		if err := rows.readStats(ctx); err != nil {
+			return nil, err
+		}
 		// nil indicates no more rows.
 		return nil, nil
 	}
@@ -192,12 +199,20 @@ func (rows *rows) Next(ctx context.Context) (*structpb.ListValue, error) {
 	return rows.values, nil
 }
 
-func (rows *rows) readStats(ctx context.Context) {
+func (rows *rows) readStats(ctx context.Context) error {
 	rows.stats = &spannerpb.ResultSetStats{}
 	if !rows.backend.NextResultSet() {
-		return
+		return status.Error(codes.Internal, "stats results not found")
 	}
 	if rows.backend.Next() {
-		_ = rows.backend.Scan(&rows.stats)
+		if err := rows.backend.Scan(&rows.stats); err != nil {
+			return err
+		}
+	} else {
+		if err := rows.backend.Err(); err != nil {
+			return err
+		}
+		return status.Error(codes.Internal, "stats row not found")
 	}
+	return nil
 }

spannerlib/api/transaction_test.go

@@ -56,7 +56,7 @@ func TestBeginAndCommit(t *testing.T) {
 		t.Fatalf("ResultSetStats returned unexpected error: %v", err)
 	}
 	if g, w := stats.GetRowCountExact(), int64(testutil.UpdateBarSetFooRowCount); g != w {
-		t.Fatalf("row count mismatch\n Got: %v\nWant: %v", g, w)
+		t.Fatalf("row count mismatch for rows %d:%d:%d\n Got: %v\nWant: %v", poolId, connId, rowsId, g, w)
 	}
 	if err := CloseRows(ctx, poolId, connId, rowsId); err != nil {
 		t.Fatalf("CloseRows returned unexpected error: %v", err)
@@ -125,7 +125,7 @@ func TestBeginAndRollback(t *testing.T) {
 		t.Fatalf("ResultSetStats returned unexpected error: %v", err)
 	}
 	if g, w := stats.GetRowCountExact(), int64(testutil.UpdateBarSetFooRowCount); g != w {
-		t.Fatalf("row count mismatch\n Got: %v\nWant: %v", g, w)
+		t.Fatalf("row count mismatch for rows %d:%d:%d\n Got: %v\nWant: %v", poolId, connId, rowsId, g, w)
 	}
 	if err := CloseRows(ctx, poolId, connId, rowsId); err != nil {
 		t.Fatalf("CloseRows returned unexpected error: %v", err)

spannerlib/shared/build-java-darwin-aarch64.sh

@@ -1,2 +1,3 @@
 go build -o spannerlib.so -buildmode=c-shared shared_lib.go
+mkdir -p ../wrappers/spannerlib-java/src/main/resources/darwin-aarch64
 cp spannerlib.so ../wrappers/spannerlib-java/src/main/resources/darwin-aarch64/libspanner.dylib