Skip to content

Commit 252360c

Browse files
committed
removed unsusd global err and return err instead of panic
1 parent 6b317c7 commit 252360c

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

conn.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2261,7 +2261,7 @@ func (sr *segmentReader) readPartialFrames(dstBuf *bytes.Buffer, bytesToRead int
22612261
}
22622262
// Expected to receive only non self-contained segments
22632263
if isSelfContained {
2264-
return errUnexpectedSelfContainedSegment
2264+
return errors.New("gocql: segment reader received unexpected self-contained segment")
22652265
}
22662266
if totalLength := dstBuf.Len() + len(frame); totalLength > dstBuf.Cap() {
22672267
return fmt.Errorf("gocql: expected partial frame of length %d, got %d", dstBuf.Cap(), totalLength)
@@ -2272,7 +2272,7 @@ func (sr *segmentReader) readPartialFrames(dstBuf *bytes.Buffer, bytesToRead int
22722272

22732273
if bytesToRead < 0 {
22742274
// This should never happen actually
2275-
panic("gocql: something went wrong while reading partial frames")
2275+
return fmt.Errorf("gocql: driver encountered unexpected state while reading partial frames of the segment, read more bytes than expected: %d; please report this bug to gocql maintainers", bytesToRead)
22762276
}
22772277

22782278
return nil
@@ -2288,6 +2288,4 @@ var (
22882288

22892289
// Deprecated: Never returned by the driver
22902290
ErrQueryArgLength = errors.New("gocql: query argument length mismatch")
2291-
2292-
errUnexpectedSelfContainedSegment = errors.New("gocql: segment reader received unexpected self-contained segment")
22932291
)

0 commit comments

Comments
 (0)