Support Probabilistic commands with RESP 2 protocol (redis#3176)

* Support bloom resp 2 * Support Resp2 for BF.Info * simplify BFInfoCmd field assignment using map-based key-to-field references

Author: ofekshenawa

probabilistic.go

@@ -319,37 +319,69 @@ func (cmd *BFInfoCmd) Result() (BFInfo, error) {
 }
 
 func (cmd *BFInfoCmd) readReply(rd *proto.Reader) (err error) {
-n, err := rd.ReadMapLen()
+result := BFInfo{}
+
+// Create a mapping from key names to pointers of struct fields
+respMapping := map[string]*int64{
+"Capacity": &result.Capacity,
+"CAPACITY": &result.Capacity,
+"Size": &result.Size,
+"SIZE": &result.Size,
+"Number of filters": &result.Filters,
+"FILTERS": &result.Filters,
+"Number of items inserted": &result.ItemsInserted,
+"ITEMS": &result.ItemsInserted,
+"Expansion rate": &result.ExpansionRate,
+"EXPANSION": &result.ExpansionRate,
+}
+
+// Helper function to read and assign a value based on the key
+readAndAssignValue := func(key string) error {
+fieldPtr, exists := respMapping[key]
+if !exists {
+return fmt.Errorf("redis: BLOOM.INFO unexpected key %s", key)
+}
+
+// Read the integer and assign to the field via pointer dereferencing
+val, err := rd.ReadInt()
+if err != nil {
+return err
+}
+*fieldPtr = val
+return nil
+}
+
+readType, err := rd.PeekReplyType()
 if err != nil {
 return err
 }
 
-var key string
-var result BFInfo
-for f := 0; f < n; f++ {
-key, err = rd.ReadString()
+if len(cmd.args) > 2 && readType == proto.RespArray {
+n, err := rd.ReadArrayLen()
 if err != nil {
 return err
 }
-
-switch key {
-case "Capacity":
-result.Capacity, err = rd.ReadInt()
-case "Size":
-result.Size, err = rd.ReadInt()
-case "Number of filters":
-result.Filters, err = rd.ReadInt()
-case "Number of items inserted":
-result.ItemsInserted, err = rd.ReadInt()
-case "Expansion rate":
-result.ExpansionRate, err = rd.ReadInt()
-default:
-return fmt.Errorf("redis: BLOOM.INFO unexpected key %s", key)
+if key, ok := cmd.args[2].(string); ok && n == 1 {
+if err := readAndAssignValue(key); err != nil {
+return err
+}
+} else {
+return fmt.Errorf("redis: BLOOM.INFO invalid argument key type")
 }
-
+} else {
+n, err := rd.ReadMapLen()
 if err != nil {
 return err
 }
+for i := 0; i < n; i++ {
+key, err := rd.ReadString()
+if err != nil {
+return err
+}
+if err := readAndAssignValue(key); err != nil {
+return err
+}
+}
 }
 
 cmd.val = result