fix FT.SEARCH RETURN [] (#2421)

* ref #2419 - fix FT.SEARCH RETURN [] * fix transformReply * fix PROFILE SEARCH as well * fix PROFILE SEARCH preserve * move preserve login to `pushSearchOptions` * attach preserve only if true * fix RETURN: [] test
redis · Feb 24, 2023 · 26e057e · 26e057e
1 parent 0f28dad
commit 26e057e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/packages/search/lib/commands/PROFILE_SEARCH.ts b/packages/search/lib/commands/PROFILE_SEARCH.ts
@@ -9,7 +9,7 @@ export function transformArguments(
     query: string,
     options?: ProfileOptions & SearchOptions
 ): RedisCommandArguments {
-    const args = ['FT.PROFILE', index, 'SEARCH'];
+    let args: RedisCommandArguments = ['FT.PROFILE', index, 'SEARCH'];
 
     if (options?.LIMITED) {
         args.push('LIMITED');
@@ -21,9 +21,9 @@ export function transformArguments(
 
 type ProfileSearchRawReply = ProfileRawReply<SearchRawReply>;
 
-export function transformReply(reply: ProfileSearchRawReply): ProfileReply {
+export function transformReply(reply: ProfileSearchRawReply, withoutDocuments: boolean): ProfileReply {
     return {
-        results: transformSearchReply(reply[0]),
+        results: transformSearchReply(reply[0], withoutDocuments),
         profile: transformProfile(reply[1])
     };
 }
diff --git a/packages/search/lib/commands/SEARCH.spec.ts b/packages/search/lib/commands/SEARCH.spec.ts
@@ -267,18 +267,22 @@ describe('SEARCH', () => {
                 client.ft.create('index', {
                     field: SchemaFieldTypes.NUMERIC
                 }),
-                client.hSet('1', 'field', '1')
+                client.hSet('1', 'field', '1'),
+                client.hSet('2', 'field', '2')
             ]);
 
             assert.deepEqual(
                 await client.ft.search('index', '*', {
                     RETURN: []
                 }),
                 {
-                    total: 1,
+                    total: 2,
                     documents: [{
                         id: '1',
                         value: Object.create(null)
+                    }, {
+                        id: '2',
+                        value: Object.create(null)
                     }]
                 }
             );

diff --git a/packages/search/lib/commands/SEARCH.ts b/packages/search/lib/commands/SEARCH.ts
@@ -70,13 +70,13 @@ export function transformArguments(
 
 export type SearchRawReply = Array<any>;
 
-export function transformReply(reply: SearchRawReply): SearchReply {
+export function transformReply(reply: SearchRawReply, withoutDocuments: boolean): SearchReply {
     const documents = [];
     let i = 1;
     while (i < reply.length) {
         documents.push({
             id: reply[i++],
-            value: documentValue(reply[i++])
+            value: withoutDocuments ? Object.create(null) : documentValue(reply[i++])
         });
     }
 
@@ -88,7 +88,6 @@ export function transformReply(reply: SearchRawReply): SearchReply {
 
 function documentValue(tuples: any) {
     const message = Object.create(null);
-    if (tuples === undefined) return message;
 
     let i = 0;
     while (i < tuples.length) {

diff --git a/packages/search/lib/commands/index.ts b/packages/search/lib/commands/index.ts
@@ -506,6 +506,10 @@ export function pushSearchOptions(
         args.push('DIALECT', options.DIALECT.toString());
     }
 
+    if (options?.RETURN?.length === 0) {
+        args.preserve = true;
+    }
+
     return args;
 }