move info commands to discussed format

sjpotter · sjpotter · commit e57ca82d2088 · 2024-09-25T18:26:03.000+03:00
we will always return a typemapped resp3 format, even in resp2.
we will not massage the field names to remove the spaces.

+ handles type mapping of double in resp2 for the one case.
diff --git a/packages/bloom/lib/commands/bloom/INFO.ts b/packages/bloom/lib/commands/bloom/INFO.ts
@@ -1,4 +1,5 @@
-import { RedisArgument, Command, UnwrapReply, NullReply, NumberReply, TuplesToMapReply, Resp2Reply, SimpleStringReply } from '@redis/client/dist/lib/RESP/types';
+import { RedisArgument, Command, UnwrapReply, NullReply, NumberReply, TuplesToMapReply, Resp2Reply, SimpleStringReply, TypeMapping } from '@redis/client/dist/lib/RESP/types';
+import { transformInfoV2Reply } from '.';
 
 export type BfInfoReplyMap = TuplesToMapReply<[
   [SimpleStringReply<'Capacity'>, NumberReply],
@@ -23,41 +24,9 @@ export default {
     return ['BF.INFO', key];
   },
   transformReply: {
-    2(reply: UnwrapReply<Resp2Reply<BfInfoReplyMap>>): BfInfoReply {
-      return {
-        capacity: reply[1],
-        size: reply[3],
-        numberOfFilters: reply[5],
-        numberOfInsertedItems: reply[7],
-        expansionRate: reply[9]
-      };
+    2: (reply: UnwrapReply<Resp2Reply<BfInfoReplyMap>>, _, typeMapping?: TypeMapping): BfInfoReplyMap => {
+      return transformInfoV2Reply<BfInfoReplyMap>(reply, typeMapping);
     },
-    3(reply: UnwrapReply<BfInfoReplyMap>): BfInfoReply {
-      if (reply instanceof Map) {
-        return {
-          capacity: reply.get('Capacity') as NumberReply,
-          size: reply.get('Size') as NumberReply,
-          numberOfFilters: reply.get('Number of filters') as NumberReply,
-          numberOfInsertedItems: reply.get('Number of items inserted') as NumberReply,
-          expansionRate: reply.get('Expansion rate') as NullReply | NumberReply
-        }
-      } else if (reply instanceof Array) {
-        return {
-          capacity: reply[1],
-          size: reply[3],
-          numberOfFilters: reply[5],
-          numberOfInsertedItems: reply[7],
-          expansionRate: reply[9]
-        }
-      } else {
-        return {
-          capacity: reply["Capacity"],
-          size: reply["Size"],
-          numberOfFilters: reply["Number of filters"],
-          numberOfInsertedItems: reply["Number of items inserted"],
-          expansionRate: reply["Expansion rate"]
-        };
-      }
-    }
+    3: undefined as unknown as () => BfInfoReplyMap
   }
 } as const satisfies Command;
diff --git a/packages/bloom/lib/commands/bloom/index.ts b/packages/bloom/lib/commands/bloom/index.ts
@@ -1,4 +1,5 @@
-import type { RedisCommands } from '@redis/client/dist/lib/RESP/types';
+import type { RedisCommands, TypeMapping } from '@redis/client/dist/lib/RESP/types';
+
 import ADD from './ADD';
 import CARD from './CARD';
 import EXISTS from './EXISTS';
@@ -9,6 +10,7 @@ import MADD from './MADD';
 import MEXISTS from './MEXISTS';
 import RESERVE from './RESERVE';
 import SCANDUMP from './SCANDUMP';
+import { RESP_TYPES } from '@redis/client';
 
 export default {
   ADD,
@@ -32,3 +34,31 @@ export default {
   SCANDUMP,
   scanDump: SCANDUMP
 } as const satisfies RedisCommands;
+
+export function transformInfoV2Reply<T>(reply: Array<any>, typeMapping?: TypeMapping): T {
+  const mapType = typeMapping ? typeMapping[RESP_TYPES.MAP] : undefined;
+
+  switch (mapType) {
+    case Array: {
+      return reply as unknown as T;
+    }
+    case Map: {
+      const ret = new Map<string, any>();
+
+      for (let i = 0; i < reply.length; i += 2) {
+        ret.set(reply[i].toString(), reply[i + 1]);
+      }
+
+      return ret as unknown as T;
+    }
+    default: {
+      const ret = Object.create(null);
+
+      for (let i = 0; i < reply.length; i += 2) {
+        ret[reply[i].toString()] = reply[i + 1];
+      }
+
+      return ret as unknown as T;
+    }
+  }
+}
diff --git a/packages/bloom/lib/commands/count-min-sketch/INFO.ts b/packages/bloom/lib/commands/count-min-sketch/INFO.ts
@@ -1,4 +1,5 @@
-import { RedisArgument, TuplesToMapReply, NumberReply, UnwrapReply, Resp2Reply, Command, SimpleStringReply } from '@redis/client/dist/lib/RESP/types';
+import { RedisArgument, TuplesToMapReply, NumberReply, UnwrapReply, Resp2Reply, Command, SimpleStringReply, TypeMapping } from '@redis/client/dist/lib/RESP/types';
+import { transformInfoV2Reply } from '../bloom';
 
 export type CmsInfoReplyMap = TuplesToMapReply<[
   [SimpleStringReply<'width'>, NumberReply],
@@ -19,34 +20,9 @@ export default {
     return ['CMS.INFO', key];
   },
   transformReply: {
-    2(reply: UnwrapReply<Resp2Reply<CmsInfoReplyMap>>): CmsInfoReply {
-      return {
-        width: reply[1],
-        depth: reply[3],
-        count: reply[5]
-      };
+    2: (reply: UnwrapReply<Resp2Reply<CmsInfoReplyMap>>, _, typeMapping?: TypeMapping): CmsInfoReply => {
+      return transformInfoV2Reply<CmsInfoReply>(reply, typeMapping);
     },
-    3(reply: UnwrapReply<CmsInfoReplyMap>): CmsInfoReply {
-      if (reply instanceof Map) {
-        return {
-          width: reply.get('width') as NumberReply,
-          depth: reply.get('depth') as NumberReply,
-          count: reply.get('count') as NumberReply,
-        }
-
-      } else if (reply instanceof Array) {
-        return {
-          width: reply[1],
-          depth: reply[3],
-          count: reply[5]
-        }
-      } else {
-        return {
-          width: reply['width'],
-          depth: reply['depth'],
-          count: reply['count']
-        };
-      }
-    }
+    3: undefined as unknown as () => CmsInfoReply
   }
 } as const satisfies Command;
diff --git a/packages/bloom/lib/commands/cuckoo/INFO.ts b/packages/bloom/lib/commands/cuckoo/INFO.ts
@@ -1,4 +1,5 @@
-import { RedisArgument, Command, NumberReply, TuplesToMapReply, UnwrapReply, Resp2Reply, SimpleStringReply } from '@redis/client/dist/lib/RESP/types';
+import { RedisArgument, Command, NumberReply, TuplesToMapReply, UnwrapReply, Resp2Reply, SimpleStringReply, TypeMapping } from '@redis/client/dist/lib/RESP/types';
+import { transformInfoV2Reply } from '../bloom';
 
 export type CfInfoReplyMap = TuplesToMapReply<[
   [SimpleStringReply<'Size'>, NumberReply],
@@ -29,53 +30,9 @@ export default {
     return ['CF.INFO', key];
   },
   transformReply: {
-    2(reply: UnwrapReply<Resp2Reply<CfInfoReplyMap>>): CfInfoReply {
-      return {
-        size: reply[1],
-        numberOfBuckets: reply[3],
-        numberOfFilters: reply[5],
-        numberOfInsertedItems: reply[7],
-        numberOfDeletedItems: reply[9],
-        bucketSize: reply[11],
-        expansionRate: reply[13],
-        maxIteration: reply[15]
-      };
+    2: (reply: UnwrapReply<Resp2Reply<CfInfoReplyMap>>, _, typeMapping?: TypeMapping): CfInfoReply => {
+      return transformInfoV2Reply<CfInfoReply>(reply, typeMapping);
     },
-    3: (reply: UnwrapReply<CfInfoReplyMap>): CfInfoReply => {
-      if (reply instanceof Map) {
-        return {
-          size: reply.get('Size') as NumberReply,
-          numberOfBuckets: reply.get('Number of buckets') as NumberReply,
-          numberOfFilters: reply.get('Number of filters') as NumberReply,
-          numberOfInsertedItems: reply.get('Number of items inserted') as NumberReply,
-          numberOfDeletedItems: reply.get('Number of items deleted') as NumberReply,
-          bucketSize: reply.get('Bucket size') as NumberReply,
-          expansionRate: reply.get('Expansion rate') as NumberReply,
-          maxIteration: reply.get('Max iterations') as NumberReply
-        }
-      } else if (reply instanceof Array) {
-        return {
-          size: reply[1],
-          numberOfBuckets: reply[3],
-          numberOfFilters: reply[5],
-          numberOfInsertedItems: reply[7],
-          numberOfDeletedItems: reply[9],
-          bucketSize: reply[11],
-          expansionRate: reply[13],
-          maxIteration: reply[15]
-        }
-      } else {
-        return {
-          size: reply['Size'],
-          numberOfBuckets: reply['Number of buckets'],
-          numberOfFilters: reply['Number of filters'],
-          numberOfInsertedItems: reply['Number of items inserted'],
-          numberOfDeletedItems: reply['Number of items deleted'],
-          bucketSize: reply['Bucket size'],
-          expansionRate: reply['Expansion rate'],
-          maxIteration: reply['Max iterations']
-        };
-      }
-    }
+    3: undefined as unknown as () => CfInfoReply
   }
 } as const satisfies Command;
diff --git a/packages/bloom/lib/commands/t-digest/INFO.ts b/packages/bloom/lib/commands/t-digest/INFO.ts
@@ -1,4 +1,5 @@
-import { RedisArgument, Command, NumberReply, TuplesToMapReply, UnwrapReply, Resp2Reply, SimpleStringReply } from '@redis/client/dist/lib/RESP/types';
+import { RedisArgument, Command, NumberReply, TuplesToMapReply, UnwrapReply, Resp2Reply, SimpleStringReply, TypeMapping } from '@redis/client/dist/lib/RESP/types';
+import { transformInfoV2Reply } from '../bloom';
 
 export type TdInfoReplyMap = TuplesToMapReply<[
   [SimpleStringReply<'Compression'>, NumberReply],
@@ -31,57 +32,9 @@ export default {
     return ['TDIGEST.INFO', key];
   },
   transformReply: {
-    2(reply: UnwrapReply<Resp2Reply<TdInfoReplyMap>>): TdInfoReply {
-      return {
-        compression: reply[1],
-        capacity: reply[3],
-        mergedNodes: reply[5],
-        unmergedNodes: reply[7],
-        mergedWeight: reply[9],
-        unmergedWeight: reply[11],
-        observations: reply[13],
-        totalCompression: reply[15],
-        memoryUsage: reply[17]
-      };
+    2: (reply: UnwrapReply<Resp2Reply<TdInfoReplyMap>>, _, typeMapping?: TypeMapping): TdInfoReply => {
+      return transformInfoV2Reply<TdInfoReply>(reply, typeMapping);
     },
-    3(reply: UnwrapReply<TdInfoReplyMap>): TdInfoReply {
-      if (reply instanceof Map) {
-        return {
-          compression: reply.get('Compression') as NumberReply,
-          capacity: reply.get('Capacity') as NumberReply,
-          mergedNodes: reply.get('Merged nodes') as NumberReply,
-          unmergedNodes: reply.get('Unmerged nodes') as NumberReply,
-          mergedWeight: reply.get('Merged weight') as NumberReply,
-          unmergedWeight: reply.get('Unmerged weight') as NumberReply,
-          observations: reply.get('Observations') as NumberReply,
-          totalCompression: reply.get('Total compressions') as NumberReply,
-          memoryUsage: reply.get('Memory usage') as NumberReply
-        };
-      } else if (reply instanceof Array) {
-        return {
-          compression: reply[1],
-          capacity: reply[3],
-          mergedNodes: reply[5],
-          unmergedNodes: reply[7],
-          mergedWeight: reply[9],
-          unmergedWeight: reply[11],
-          observations: reply[13],
-          totalCompression: reply[15],
-          memoryUsage: reply[17]
-        };
-      } else {
-        return {
-          compression: reply['Compression'],
-          capacity: reply['Capacity'],
-          mergedNodes: reply['Merged nodes'],
-          unmergedNodes: reply['Unmerged nodes'],
-          mergedWeight: reply['Merged weight'],
-          unmergedWeight: reply['Unmerged weight'],
-          observations: reply['Observations'],
-          totalCompression: reply['Total compressions'],
-          memoryUsage: reply['Memory usage']
-        };
-      }
-    }
+    3: undefined as unknown as () => TdInfoReply
   }
 } as const satisfies Command;
diff --git a/packages/bloom/lib/commands/top-k/INFO.ts b/packages/bloom/lib/commands/top-k/INFO.ts
@@ -1,5 +1,6 @@
 import { transformDoubleReply } from '@redis/client/dist/lib/commands/generic-transformers';
 import { RedisArgument, TuplesToMapReply, NumberReply, DoubleReply, UnwrapReply, Resp2Reply, Command, SimpleStringReply, TypeMapping } from '@redis/client/dist/lib/RESP/types';
+import { transformInfoV2Reply } from '../bloom';
 
 export type TopKInfoReplyMap = TuplesToMapReply<[
   [SimpleStringReply<'k'>, NumberReply],
@@ -8,51 +9,18 @@ export type TopKInfoReplyMap = TuplesToMapReply<[
   [SimpleStringReply<'decay'>, DoubleReply]
 ]>;
 
-export type TkInfoReply = {
-  k: NumberReply;
-  width: NumberReply;
-  depth: NumberReply;
-  decay: DoubleReply;
-}
- 
 export default {
   FIRST_KEY_INDEX: 1,
   IS_READ_ONLY: true,
   transformArguments(key: RedisArgument) {
     return ['TOPK.INFO', key];
   },
   transformReply: {
-    2: (reply: UnwrapReply<Resp2Reply<TopKInfoReplyMap>>, preserve?: any, typeMapping?: TypeMapping): TkInfoReply => {
-      return {
-        k: reply[1],
-        width: reply[3],
-        depth: reply[5],
-        decay: transformDoubleReply[2](reply[7], preserve, typeMapping)
-      };
+    2: (reply: UnwrapReply<Resp2Reply<TopKInfoReplyMap>>, preserve?: any, typeMapping?: TypeMapping): TopKInfoReplyMap => {
+      reply[7] = transformDoubleReply[2](reply[7], preserve, typeMapping) as any;
+
+      return transformInfoV2Reply<TopKInfoReplyMap>(reply, typeMapping);
     },
-    3: (reply: UnwrapReply<TopKInfoReplyMap>): TkInfoReply => {
-      if (reply instanceof Map) {
-        return {
-          k: reply.get('k') as NumberReply,
-          width: reply.get('width') as NumberReply,
-          depth: reply.get('depth') as NumberReply,
-          decay: reply.get('decay') as DoubleReply
-        };
-      } else if (reply instanceof Array) {
-        return {
-          k: reply[1],
-          width: reply[3],
-          depth: reply[5],
-          decay: reply[7]
-        };
-      } else {
-        return {
-          k: reply['k'],
-          width: reply['width'],
-          depth: reply['depth'],
-          decay: reply['decay']
-        };
-      }
-    }
+    3: undefined as unknown as () => TopKInfoReplyMap
   }
 } as const satisfies Command
