Skip to content

Commit 68ca83b

Browse files
committed
fix time series
1 parent 7ead8e4 commit 68ca83b

File tree

5 files changed

+29
-23
lines changed

5 files changed

+29
-23
lines changed

packages/time-series/lib/commands/INFO.ts

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
import { BlobStringReply, Command, NumberReply, SimpleStringReply } from "@redis/client/dist/lib/RESP/types";
1+
import { BlobStringReply, Command, DoubleReply, NumberReply, SimpleStringReply, TypeMapping } from "@redis/client/dist/lib/RESP/types";
22
import { TimeSeriesDuplicatePolicies } from ".";
33
import { TimeSeriesAggregationType } from "./CREATERULE";
4+
import { transformDoubleReply } from '@redis/client/dist/lib/commands/generic-transformers';
45

56
export type InfoRawReply = [
67
'totalSamples',
@@ -26,7 +27,11 @@ export type InfoRawReply = [
2627
'sourceKey',
2728
BlobStringReply | null,
2829
'rules',
29-
Array<[key: BlobStringReply, timeBucket: NumberReply, aggregationType: TimeSeriesAggregationType]>
30+
Array<[key: BlobStringReply, timeBucket: NumberReply, aggregationType: TimeSeriesAggregationType]>,
31+
'ignoreMaxTimeDiff',
32+
NumberReply,
33+
'ignoreMaxValDiff',
34+
DoubleReply,
3035
];
3136

3237
export interface InfoReply {
@@ -49,6 +54,8 @@ export interface InfoReply {
4954
timeBucket: NumberReply;
5055
aggregationType: TimeSeriesAggregationType
5156
}>;
57+
ignoreMaxTimeDiff: NumberReply;
58+
ignoreMaxValDiff: DoubleReply;
5259
}
5360

5461
export default {
@@ -58,7 +65,7 @@ export default {
5865
return ['TS.INFO', key];
5966
},
6067
transformReply: {
61-
2: (reply: InfoRawReply): InfoReply => {
68+
2: (reply: InfoRawReply, _, typeMapping?: TypeMapping): InfoReply => {
6269
return {
6370
totalSamples: reply[1],
6471
memoryUsage: reply[3],
@@ -78,7 +85,9 @@ export default {
7885
key,
7986
timeBucket,
8087
aggregationType
81-
}))
88+
})),
89+
ignoreMaxTimeDiff: reply[25],
90+
ignoreMaxValDiff: transformDoubleReply[2](reply[27] as unknown as BlobStringReply, undefined, typeMapping)
8291
};
8392
},
8493
3: undefined as unknown as () => InfoReply

packages/time-series/lib/commands/INFO_DEBUG.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ describe('TS.INFO_DEBUG', () => {
2525
]);
2626

2727
const infoDebug = await client.ts.infoDebug('key');
28-
assertInfo(infoDebug);
28+
assertInfo(infoDebug as any);
2929
assert.equal(typeof infoDebug.keySelfName, 'string');
3030
assert.ok(Array.isArray(infoDebug.chunks));
3131
for (const chunk of infoDebug.chunks) {

packages/time-series/lib/commands/INFO_DEBUG.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { BlobStringReply, Command, NumberReply, SimpleStringReply } from "@redis/client/dist/lib/RESP/types";
1+
import { BlobStringReply, Command, NumberReply, SimpleStringReply, TypeMapping } from "@redis/client/dist/lib/RESP/types";
22
import INFO, { InfoRawReply, InfoReply } from "./INFO";
33

44
type InfoDebugRawReply = [
@@ -40,17 +40,17 @@ export default {
4040
return args;
4141
},
4242
transformReply: {
43-
2: (rawReply: InfoDebugRawReply): InfoDebugReply => {
44-
const reply = INFO.transformReply[2](rawReply as unknown as InfoRawReply);
45-
(reply as InfoDebugReply).keySelfName = rawReply[25];
46-
(reply as InfoDebugReply).chunks = rawReply[27].map(chunk => ({
47-
startTimestamp: chunk[1],
48-
endTimestamp: chunk[3],
49-
samples: chunk[5],
50-
size: chunk[7],
51-
bytesPerSample: chunk[9]
52-
}));
53-
return reply as InfoDebugReply;
43+
2: (rawReply: InfoDebugRawReply, _, typeMapping?: TypeMapping): InfoDebugReply => {
44+
const reply = INFO.transformReply[2](rawReply as unknown as InfoRawReply, _, typeMapping);
45+
(reply as InfoDebugReply).keySelfName = rawReply[29];
46+
(reply as InfoDebugReply).chunks = rawReply[31].map(chunk => ({
47+
startTimestamp: chunk[1],
48+
endTimestamp: chunk[3],
49+
samples: chunk[5],
50+
size: chunk[7],
51+
bytesPerSample: chunk[9]
52+
}));
53+
return reply as InfoDebugReply;
5454
},
5555
3: undefined as unknown as () => InfoDebugReply
5656
}

packages/time-series/lib/commands/index.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { CommandArguments, DoubleReply, NumberReply, RedisArgument, RedisCommands, TuplesReply, UnwrapReply, Resp2Reply, ArrayReply, BlobStringReply, MapReply, NullReply, TypeMapping, ReplyUnion, RespType } from '@redis/client/dist/lib/RESP/types';
1+
import type { DoubleReply, NumberReply, RedisArgument, RedisCommands, TuplesReply, UnwrapReply, Resp2Reply, ArrayReply, BlobStringReply, MapReply, NullReply, TypeMapping, ReplyUnion, RespType } from '@redis/client/dist/lib/RESP/types';
22
import ADD from './ADD';
33
import ALTER from './ALTER';
44
import CREATE from './CREATE';
@@ -29,8 +29,8 @@ import MREVRANGE from './MREVRANGE';
2929
import QUERYINDEX from './QUERYINDEX';
3030
import RANGE from './RANGE';
3131
import REVRANGE from './REVRANGE';
32-
import { RedisVariadicArgument, pushVariadicArguments } from '@redis/client/dist/lib/commands/generic-transformers';
33-
import { RESP_TYPES } from '@redis/client';
32+
import { RedisVariadicArgument, pushVariadicArguments } from '@redis/client/lib/commands/generic-transformers';
33+
import { RESP_TYPES } from '@redis/client/lib/RESP/decoder';
3434

3535
export default {
3636
ADD,

packages/time-series/lib/index.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
import { RESP_TYPES } from '@redis/client';
2-
import { ArrayReply, BlobStringReply, MapReply, NullReply, TuplesReply, TypeMapping, UnwrapReply } from '@redis/client/dist/lib/RESP/types';
3-
41
export {
52
default,
63
TIME_SERIES_ENCODING, TimeSeriesEncoding,

0 commit comments

Comments
 (0)