Skip to content

Commit aee7271

Browse files
htemelskihtemelski
committed
[CAE-563] Renamed constant, added dialect option to exlpaincli
1 parent 1332910 commit aee7271

15 files changed

+115
-94
lines changed

‎packages/search/lib/commands/AGGREGATE.spec.ts‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ import { strict as assert } from 'node:assert';
22
import testUtils, { GLOBAL } from '../test-utils';
33
import AGGREGATE from './AGGREGATE';
44
import { parseArgs } from '@redis/client/lib/commands/generic-transformers';
5-
import { DefaultDialect } from '../dialect/default';
5+
import { DEFAULT_DIALECT } from '../dialect/default';
66

77
describe('AGGREGATE', () => {
88
describe('transformArguments', () => {
99
it('without options', () => {
1010
assert.deepEqual(
1111
parseArgs(AGGREGATE, 'index', '*'),
12-
['FT.AGGREGATE', 'index', '*', 'DIALECT', DefaultDialect]
12+
['FT.AGGREGATE', 'index', '*', 'DIALECT', DEFAULT_DIALECT]
1313
);
1414
});
1515

@@ -18,14 +18,14 @@ describe('AGGREGATE', () => {
1818
parseArgs(AGGREGATE, 'index', '*', {
1919
VERBATIM: true
2020
}),
21-
['FT.AGGREGATE', 'index', '*', 'VERBATIM', 'DIALECT', DefaultDialect]
21+
['FT.AGGREGATE', 'index', '*', 'VERBATIM', 'DIALECT', DEFAULT_DIALECT]
2222
);
2323
});
2424

2525
it('with ADDSCORES', () => {
2626
assert.deepEqual(
2727
parseArgs(AGGREGATE, 'index', '*', { ADDSCORES: true }),
28-
['FT.AGGREGATE', 'index', '*', 'ADDSCORES', 'DIALECT', DefaultDialect]
28+
['FT.AGGREGATE', 'index', '*', 'ADDSCORES', 'DIALECT', DEFAULT_DIALECT]
2929
);
3030
});
3131

@@ -37,7 +37,7 @@ describe('AGGREGATE', () => {
3737
parseArgs(AGGREGATE, 'index', '*', {
3838
LOAD: '@property'
3939
}),
40-
['FT.AGGREGATE', 'index', '*', 'LOAD', '1', '@property', 'DIALECT', DefaultDialect]
40+
['FT.AGGREGATE', 'index', '*', 'LOAD', '1', '@property', 'DIALECT', DEFAULT_DIALECT]
4141
);
4242
});
4343

@@ -48,7 +48,7 @@ describe('AGGREGATE', () => {
4848
identifier: '@property'
4949
}
5050
}),
51-
['FT.AGGREGATE', 'index', '*', 'LOAD', '1', '@property', 'DIALECT', DefaultDialect]
51+
['FT.AGGREGATE', 'index', '*', 'LOAD', '1', '@property', 'DIALECT', DEFAULT_DIALECT]
5252
);
5353
});
5454
});
@@ -61,7 +61,7 @@ describe('AGGREGATE', () => {
6161
AS: 'alias'
6262
}
6363
}),
64-
['FT.AGGREGATE', 'index', '*', 'LOAD', '3', '@property', 'AS', 'alias', 'DIALECT', DefaultDialect]
64+
['FT.AGGREGATE', 'index', '*', 'LOAD', '3', '@property', 'AS', 'alias', 'DIALECT', DEFAULT_DIALECT]
6565
);
6666
});
6767
});
@@ -71,7 +71,7 @@ describe('AGGREGATE', () => {
7171
parseArgs(AGGREGATE, 'index', '*', {
7272
LOAD: ['@1', '@2']
7373
}),
74-
['FT.AGGREGATE', 'index', '*', 'LOAD', '2', '@1', '@2', 'DIALECT', DefaultDialect]
74+
['FT.AGGREGATE', 'index', '*', 'LOAD', '2', '@1', '@2', 'DIALECT', DEFAULT_DIALECT]
7575
);
7676
});
7777
});
@@ -90,7 +90,7 @@ describe('AGGREGATE', () => {
9090
}
9191
}]
9292
}),
93-
['FT.AGGREGATE', 'index', '*', 'GROUPBY', '0', 'REDUCE', 'COUNT', '0', 'DIALECT', DefaultDialect]
93+
['FT.AGGREGATE', 'index', '*', 'GROUPBY', '0', 'REDUCE', 'COUNT', '0', 'DIALECT', DEFAULT_DIALECT]
9494
);
9595
});
9696

@@ -105,7 +105,7 @@ describe('AGGREGATE', () => {
105105
}
106106
}]
107107
}),
108-
['FT.AGGREGATE', 'index', '*', 'GROUPBY', '0', 'REDUCE', 'COUNT', '0', 'AS', 'count', 'DIALECT', DefaultDialect]
108+
['FT.AGGREGATE', 'index', '*', 'GROUPBY', '0', 'REDUCE', 'COUNT', '0', 'AS', 'count', 'DIALECT', DEFAULT_DIALECT]
109109
);
110110
});
111111
});
@@ -122,7 +122,7 @@ describe('AGGREGATE', () => {
122122
}
123123
}]
124124
}),
125-
['FT.AGGREGATE', 'index', '*', 'GROUPBY', '1', '@property', 'REDUCE', 'COUNT', '0', 'DIALECT', DefaultDialect]
125+
['FT.AGGREGATE', 'index', '*', 'GROUPBY', '1', '@property', 'REDUCE', 'COUNT', '0', 'DIALECT', DEFAULT_DIALECT]
126126
);
127127
});
128128

@@ -137,7 +137,7 @@ describe('AGGREGATE', () => {
137137
}
138138
}]
139139
}),
140-
['FT.AGGREGATE', 'index', '*', 'GROUPBY', '2', '@1', '@2', 'REDUCE', 'COUNT', '0', 'DIALECT', DefaultDialect]
140+
['FT.AGGREGATE', 'index', '*', 'GROUPBY', '2', '@1', '@2', 'REDUCE', 'COUNT', '0', 'DIALECT', DEFAULT_DIALECT]
141141
);
142142
});
143143
});
@@ -154,7 +154,7 @@ describe('AGGREGATE', () => {
154154
}
155155
}]
156156
}),
157-
['FT.AGGREGATE', 'index', '*', 'GROUPBY', '0', 'REDUCE', 'COUNT_DISTINCT', '1', '@property', 'DIALECT', DefaultDialect]
157+
['FT.AGGREGATE', 'index', '*', 'GROUPBY', '0', 'REDUCE', 'COUNT_DISTINCT', '1', '@property', 'DIALECT', DEFAULT_DIALECT]
158158
);
159159
});
160160

@@ -169,7 +169,7 @@ describe('AGGREGATE', () => {
169169
}
170170
}]
171171
}),
172-
['FT.AGGREGATE', 'index', '*', 'GROUPBY', '0', 'REDUCE', 'COUNT_DISTINCTISH', '1', '@property', 'DIALECT', DefaultDialect]
172+
['FT.AGGREGATE', 'index', '*', 'GROUPBY', '0', 'REDUCE', 'COUNT_DISTINCTISH', '1', '@property', 'DIALECT', DEFAULT_DIALECT]
173173
);
174174
});
175175

@@ -184,7 +184,7 @@ describe('AGGREGATE', () => {
184184
}
185185
}]
186186
}),
187-
['FT.AGGREGATE', 'index', '*', 'GROUPBY', '0', 'REDUCE', 'SUM', '1', '@property', 'DIALECT', DefaultDialect]
187+
['FT.AGGREGATE', 'index', '*', 'GROUPBY', '0', 'REDUCE', 'SUM', '1', '@property', 'DIALECT', DEFAULT_DIALECT]
188188
);
189189
});
190190

@@ -199,7 +199,7 @@ describe('AGGREGATE', () => {
199199
}
200200
}]
201201
}),
202-
['FT.AGGREGATE', 'index', '*', 'GROUPBY', '0', 'REDUCE', 'MIN', '1', '@property', 'DIALECT', DefaultDialect]
202+
['FT.AGGREGATE', 'index', '*', 'GROUPBY', '0', 'REDUCE', 'MIN', '1', '@property', 'DIALECT', DEFAULT_DIALECT]
203203
);
204204
});
205205

@@ -214,7 +214,7 @@ describe('AGGREGATE', () => {
214214
}
215215
}]
216216
}),
217-
['FT.AGGREGATE', 'index', '*', 'GROUPBY', '0', 'REDUCE', 'MAX', '1', '@property', 'DIALECT', DefaultDialect]
217+
['FT.AGGREGATE', 'index', '*', 'GROUPBY', '0', 'REDUCE', 'MAX', '1', '@property', 'DIALECT', DEFAULT_DIALECT]
218218
);
219219
});
220220

@@ -229,7 +229,7 @@ describe('AGGREGATE', () => {
229229
}
230230
}]
231231
}),
232-
['FT.AGGREGATE', 'index', '*', 'GROUPBY', '0', 'REDUCE', 'AVG', '1', '@property', 'DIALECT', DefaultDialect]
232+
['FT.AGGREGATE', 'index', '*', 'GROUPBY', '0', 'REDUCE', 'AVG', '1', '@property', 'DIALECT', DEFAULT_DIALECT]
233233
);
234234
});
235235
it('STDDEV', () => {
@@ -243,7 +243,7 @@ describe('AGGREGATE', () => {
243243
}
244244
}]
245245
}),
246-
['FT.AGGREGATE', 'index', '*', 'GROUPBY', '0', 'REDUCE', 'STDDEV', '1', '@property', 'DIALECT', DefaultDialect]
246+
['FT.AGGREGATE', 'index', '*', 'GROUPBY', '0', 'REDUCE', 'STDDEV', '1', '@property', 'DIALECT', DEFAULT_DIALECT]
247247
);
248248
});
249249

@@ -259,7 +259,7 @@ describe('AGGREGATE', () => {
259259
}
260260
}]
261261
}),
262-
['FT.AGGREGATE', 'index', '*', 'GROUPBY', '0', 'REDUCE', 'QUANTILE', '2', '@property', '0.5', 'DIALECT', DefaultDialect]
262+
['FT.AGGREGATE', 'index', '*', 'GROUPBY', '0', 'REDUCE', 'QUANTILE', '2', '@property', '0.5', 'DIALECT', DEFAULT_DIALECT]
263263
);
264264
});
265265

@@ -274,7 +274,7 @@ describe('AGGREGATE', () => {
274274
}
275275
}]
276276
}),
277-
['FT.AGGREGATE', 'index', '*', 'GROUPBY', '0', 'REDUCE', 'TOLIST', '1', '@property', 'DIALECT', DefaultDialect]
277+
['FT.AGGREGATE', 'index', '*', 'GROUPBY', '0', 'REDUCE', 'TOLIST', '1', '@property', 'DIALECT', DEFAULT_DIALECT]
278278
);
279279
});
280280

@@ -290,7 +290,7 @@ describe('AGGREGATE', () => {
290290
}
291291
}]
292292
}),
293-
['FT.AGGREGATE', 'index', '*', 'GROUPBY', '0', 'REDUCE', 'FIRST_VALUE', '1', '@property', 'DIALECT', DefaultDialect]
293+
['FT.AGGREGATE', 'index', '*', 'GROUPBY', '0', 'REDUCE', 'FIRST_VALUE', '1', '@property', 'DIALECT', DEFAULT_DIALECT]
294294
);
295295
});
296296

@@ -308,7 +308,7 @@ describe('AGGREGATE', () => {
308308
}
309309
}]
310310
}),
311-
['FT.AGGREGATE', 'index', '*', 'GROUPBY', '0', 'REDUCE', 'FIRST_VALUE', '3', '@property', 'BY', '@by', 'DIALECT', DefaultDialect]
311+
['FT.AGGREGATE', 'index', '*', 'GROUPBY', '0', 'REDUCE', 'FIRST_VALUE', '3', '@property', 'BY', '@by', 'DIALECT', DEFAULT_DIALECT]
312312
);
313313
});
314314

@@ -327,7 +327,7 @@ describe('AGGREGATE', () => {
327327
}
328328
}]
329329
}),
330-
['FT.AGGREGATE', 'index', '*', 'GROUPBY', '0', 'REDUCE', 'FIRST_VALUE', '3', '@property', 'BY', '@by', 'DIALECT', DefaultDialect]
330+
['FT.AGGREGATE', 'index', '*', 'GROUPBY', '0', 'REDUCE', 'FIRST_VALUE', '3', '@property', 'BY', '@by', 'DIALECT', DEFAULT_DIALECT]
331331
);
332332
});
333333
});
@@ -347,7 +347,7 @@ describe('AGGREGATE', () => {
347347
}
348348
}]
349349
}),
350-
['FT.AGGREGATE', 'index', '*', 'GROUPBY', '0', 'REDUCE', 'FIRST_VALUE', '4', '@property', 'BY', '@by', 'ASC', 'DIALECT', DefaultDialect]
350+
['FT.AGGREGATE', 'index', '*', 'GROUPBY', '0', 'REDUCE', 'FIRST_VALUE', '4', '@property', 'BY', '@by', 'ASC', 'DIALECT', DEFAULT_DIALECT]
351351
);
352352
});
353353
});
@@ -365,7 +365,7 @@ describe('AGGREGATE', () => {
365365
}
366366
}]
367367
}),
368-
['FT.AGGREGATE', 'index', '*', 'GROUPBY', '0', 'REDUCE', 'RANDOM_SAMPLE', '2', '@property', '1', 'DIALECT', DefaultDialect]
368+
['FT.AGGREGATE', 'index', '*', 'GROUPBY', '0', 'REDUCE', 'RANDOM_SAMPLE', '2', '@property', '1', 'DIALECT', DEFAULT_DIALECT]
369369
);
370370
});
371371
});
@@ -379,7 +379,7 @@ describe('AGGREGATE', () => {
379379
BY: '@by'
380380
}]
381381
}),
382-
['FT.AGGREGATE', 'index', '*', 'SORTBY', '1', '@by', 'DIALECT', DefaultDialect]
382+
['FT.AGGREGATE', 'index', '*', 'SORTBY', '1', '@by', 'DIALECT', DEFAULT_DIALECT]
383383
);
384384
});
385385

@@ -391,7 +391,7 @@ describe('AGGREGATE', () => {
391391
BY: ['@1', '@2']
392392
}]
393393
}),
394-
['FT.AGGREGATE', 'index', '*', 'SORTBY', '2', '@1', '@2', 'DIALECT', DefaultDialect]
394+
['FT.AGGREGATE', 'index', '*', 'SORTBY', '2', '@1', '@2', 'DIALECT', DEFAULT_DIALECT]
395395
);
396396
});
397397

@@ -404,7 +404,7 @@ describe('AGGREGATE', () => {
404404
MAX: 1
405405
}]
406406
}),
407-
['FT.AGGREGATE', 'index', '*', 'SORTBY', '3', '@by', 'MAX', '1', 'DIALECT', DefaultDialect]
407+
['FT.AGGREGATE', 'index', '*', 'SORTBY', '3', '@by', 'MAX', '1', 'DIALECT', DEFAULT_DIALECT]
408408
);
409409
});
410410
});
@@ -418,7 +418,7 @@ describe('AGGREGATE', () => {
418418
AS: 'as'
419419
}]
420420
}),
421-
['FT.AGGREGATE', 'index', '*', 'APPLY', '@field + 1', 'AS', 'as', 'DIALECT', DefaultDialect]
421+
['FT.AGGREGATE', 'index', '*', 'APPLY', '@field + 1', 'AS', 'as', 'DIALECT', DEFAULT_DIALECT]
422422
);
423423
});
424424

@@ -431,7 +431,7 @@ describe('AGGREGATE', () => {
431431
size: 1
432432
}]
433433
}),
434-
['FT.AGGREGATE', 'index', '*', 'LIMIT', '0', '1', 'DIALECT', DefaultDialect]
434+
['FT.AGGREGATE', 'index', '*', 'LIMIT', '0', '1', 'DIALECT', DEFAULT_DIALECT]
435435
);
436436
});
437437

@@ -443,7 +443,7 @@ describe('AGGREGATE', () => {
443443
expression: '@field != ""'
444444
}]
445445
}),
446-
['FT.AGGREGATE', 'index', '*', 'FILTER', '@field != ""', 'DIALECT', DefaultDialect]
446+
['FT.AGGREGATE', 'index', '*', 'FILTER', '@field != ""', 'DIALECT', DEFAULT_DIALECT]
447447
);
448448
});
449449
});
@@ -455,7 +455,7 @@ describe('AGGREGATE', () => {
455455
param: 'value'
456456
}
457457
}),
458-
['FT.AGGREGATE', 'index', '*', 'PARAMS', '2', 'param', 'value', 'DIALECT', DefaultDialect]
458+
['FT.AGGREGATE', 'index', '*', 'PARAMS', '2', 'param', 'value', 'DIALECT', DEFAULT_DIALECT]
459459
);
460460
});
461461

@@ -471,7 +471,7 @@ describe('AGGREGATE', () => {
471471
it('with TIMEOUT', () => {
472472
assert.deepEqual(
473473
parseArgs(AGGREGATE, 'index', '*', { TIMEOUT: 10 }),
474-
['FT.AGGREGATE', 'index', '*', 'TIMEOUT', '10', 'DIALECT', DefaultDialect]
474+
['FT.AGGREGATE', 'index', '*', 'TIMEOUT', '10', 'DIALECT', DEFAULT_DIALECT]
475475
);
476476
});
477477
});

‎packages/search/lib/commands/AGGREGATE.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { ArrayReply, BlobStringReply, Command, MapReply, NumberReply, RedisArgum
33
import { RediSearchProperty } from './CREATE';
44
import { FtSearchParams, parseParamsArgument } from './SEARCH';
55
import { transformTuplesReply } from '@redis/client/dist/lib/commands/generic-transformers';
6-
import { DefaultDialect } from '../dialect/default';
6+
import { DEFAULT_DIALECT } from '../dialect/default';
77

88
type LoadField = RediSearchProperty | {
99
identifier: RediSearchProperty;
@@ -253,7 +253,7 @@ export function parseAggregateOptions(parser: CommandParser , options?: FtAggreg
253253
if (options?.DIALECT) {
254254
parser.push('DIALECT', options.DIALECT.toString());
255255
} else {
256-
parser.push('DIALECT', DefaultDialect);
256+
parser.push('DIALECT', DEFAULT_DIALECT);
257257
}
258258
}
259259

‎packages/search/lib/commands/AGGREGATE_WITHCURSOR.spec.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ import { strict as assert } from 'node:assert';
22
import testUtils, { GLOBAL } from '../test-utils';
33
import AGGREGATE_WITHCURSOR from './AGGREGATE_WITHCURSOR';
44
import { parseArgs } from '@redis/client/lib/commands/generic-transformers';
5-
import { DefaultDialect } from '../dialect/default';
5+
import { DEFAULT_DIALECT } from '../dialect/default';
66

77
describe('AGGREGATE WITHCURSOR', () => {
88
describe('transformArguments', () => {
99
it('without options', () => {
1010
assert.deepEqual(
1111
parseArgs(AGGREGATE_WITHCURSOR, 'index', '*'),
12-
['FT.AGGREGATE', 'index', '*', 'DIALECT', DefaultDialect, 'WITHCURSOR']
12+
['FT.AGGREGATE', 'index', '*', 'DIALECT', DEFAULT_DIALECT, 'WITHCURSOR']
1313
);
1414
});
1515

@@ -18,7 +18,7 @@ describe('AGGREGATE WITHCURSOR', () => {
1818
parseArgs(AGGREGATE_WITHCURSOR, 'index', '*', {
1919
COUNT: 1
2020
}),
21-
['FT.AGGREGATE', 'index', '*', 'DIALECT', DefaultDialect, 'WITHCURSOR', 'COUNT', '1']
21+
['FT.AGGREGATE', 'index', '*', 'DIALECT', DEFAULT_DIALECT, 'WITHCURSOR', 'COUNT', '1']
2222
);
2323
});
2424

@@ -27,7 +27,7 @@ describe('AGGREGATE WITHCURSOR', () => {
2727
parseArgs(AGGREGATE_WITHCURSOR, 'index', '*', {
2828
MAXIDLE: 1
2929
}),
30-
['FT.AGGREGATE', 'index', '*', 'DIALECT', DefaultDialect, 'WITHCURSOR', 'MAXIDLE', '1']
30+
['FT.AGGREGATE', 'index', '*', 'DIALECT', DEFAULT_DIALECT, 'WITHCURSOR', 'MAXIDLE', '1']
3131
);
3232
});
3333
});

‎packages/search/lib/commands/EXPLAIN.spec.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ import EXPLAIN from './EXPLAIN';
33
import { parseArgs } from '@redis/client/lib/commands/generic-transformers';
44
import testUtils, { GLOBAL } from '../test-utils';
55
import { SCHEMA_FIELD_TYPE } from './CREATE';
6-
import { DefaultDialect } from '../dialect/default';
6+
import { DEFAULT_DIALECT } from '../dialect/default';
77

88
describe('EXPLAIN', () => {
99
describe('transformArguments', () => {
1010
it('simple', () => {
1111
assert.deepEqual(
1212
parseArgs(EXPLAIN, 'index', '*'),
13-
['FT.EXPLAIN', 'index', '*', 'DIALECT', DefaultDialect]
13+
['FT.EXPLAIN', 'index', '*', 'DIALECT', DEFAULT_DIALECT]
1414
);
1515
});
1616

@@ -21,7 +21,7 @@ describe('EXPLAIN', () => {
2121
param: 'value'
2222
}
2323
}),
24-
['FT.EXPLAIN', 'index', '*', 'PARAMS', '2', 'param', 'value', 'DIALECT', DefaultDialect]
24+
['FT.EXPLAIN', 'index', '*', 'PARAMS', '2', 'param', 'value', 'DIALECT', DEFAULT_DIALECT]
2525
);
2626
});
2727

0 commit comments

Comments
 (0)