ExecuteFetch: error on multiple result sets

go/errors/errors.go

@@ -16,8 +16,6 @@ limitations under the License.
 
 package errors
 
-import "errors"
-
 // Wrapped is used to unwrap an error created by errors.Join() in Go 1.20
 type Wrapped interface {
 	Unwrap() []error
@@ -56,13 +54,3 @@ func UnwrapFirst(err error) error {
 	}
 	return UnwrapAll(err)[0]
 }
-
-// UnwrappedIs returns 'true' if any of the unwrapped error complies with golang's errors.Is(target)
-func UnwrappedIs(err, target error) bool {
-	for _, serr := range UnwrapAll(err) {
-		if errors.Is(serr, target) {
-			return true
-		}
-	}
-	return false
-}

go/errors/errors_test.go

@@ -97,63 +97,3 @@ func TestUnwrap(t *testing.T) {
 		})
 	}
 }
-
-func TestUnwrappedIs(t *testing.T) {
-	var err1 = errors.New("err1")
-
-	tcases := []struct {
-		err    error
-		target error
-		expect bool
-	}{
-		{
-			err:    nil,
-			expect: false,
-		},
-		{
-			err:    nil,
-			target: errors.New("err1"),
-			expect: false,
-		},
-		{
-			err:    errors.New("err1"),
-			target: errors.New("err1"),
-			expect: false,
-		},
-		{
-			err:    errors.New("err1"),
-			target: err1,
-			expect: false,
-		},
-		{
-			err:    err1,
-			target: err1,
-			expect: true,
-		},
-		{
-			err:    errors.Join(err1, errors.New("err2")),
-			target: err1,
-			expect: true,
-		},
-		{
-			err:    errors.Join(errors.New("err2"), err1),
-			target: err1,
-			expect: true,
-		},
-		{
-			err:    errors.Join(errors.New("err2"), errors.Join(errors.New("err3"), err1)),
-			target: err1,
-			expect: true,
-		},
-	}
-	for _, tcase := range tcases {
-		name := "nil"
-		if tcase.err != nil {
-			name = tcase.err.Error()
-		}
-		t.Run(name, func(t *testing.T) {
-			is := UnwrappedIs(tcase.err, tcase.target)
-			assert.Equal(t, tcase.expect, is)
-		})
-	}
-}

go/vt/vttablet/tabletserver/query_executor.go

@@ -18,13 +18,13 @@
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"io"
 	"strings"
 	"sync"
 	"time"
 
-	"vitess.io/vitess/go/errors"
 	"vitess.io/vitess/go/mysql"
 	"vitess.io/vitess/go/mysql/replication"
 	"vitess.io/vitess/go/mysql/sqlerror"
@@ -880,9 +880,9 @@
 	}
 
 	qr, err := qre.execDBConn(conn.Conn, sql, true)
-	if errors.UnwrappedIs(err, mysql.ErrExecuteFetchMultipleResults) {
+	if errors.Is(err, mysql.ErrExecuteFetchMultipleResults) {
 		return nil, vterrors.New(vtrpcpb.Code_UNIMPLEMENTED, "Multi-Resultset not supported in stored procedure")
 	}
 	if err != nil {
 		return nil, rewriteOUTParamError(err)
 	}