don't panic if you don't have to

Author: ndyakov

redis.go

@@ -557,18 +557,16 @@ func (c *baseClient) process(ctx context.Context, cmd Cmder) error {
 	return lastErr
 }
 
-func (c *baseClient) assertUnstableCommand(cmd Cmder) bool {
+func (c *baseClient) assertUnstableCommand(cmd Cmder) (bool, error) {
 	switch cmd.(type) {
 	case *AggregateCmd, *FTInfoCmd, *FTSpellCheckCmd, *FTSearchCmd, *FTSynDumpCmd:
 		if c.opt.UnstableResp3 {
-			return true
+			return true, nil
 		} else {
-			// TODO: find the best way to remove the panic and return error here
-			// The client should not panic when executing a command, only when initializing.
-			panic("RESP3 responses for this command are disabled because they may still change. Please set the flag UnstableResp3 .  See the [README](https://github.com/redis/go-redis/blob/master/README.md) and the release notes for guidance.")
+			return false, fmt.Errorf("RESP3 responses for this command are disabled because they may still change. Please set the flag UnstableResp3. See the README and the release notes for guidance")
 		}
 	default:
-		return false
+		return false, nil
 	}
 }
 
@@ -594,8 +592,14 @@ func (c *baseClient) _process(ctx context.Context, cmd Cmder, attempt int) (bool
 		}
 		readReplyFunc := cmd.readReply
 		// Apply unstable RESP3 search module.
-		if c.opt.Protocol != 2 && c.assertUnstableCommand(cmd) {
-			readReplyFunc = cmd.readRawReply
+		if c.opt.Protocol != 2 {
+			useRawReply, err := c.assertUnstableCommand(cmd)
+			if err != nil {
+				return err
+			}
+			if useRawReply {
+				readReplyFunc = cmd.readRawReply
+			}
 		}
 		if err := cn.WithReader(c.context(ctx), c.cmdTimeout(cmd), func(rd *proto.Reader) error {
 			// To be sure there are no buffered push notifications, we process them before reading the reply