Skip to content

Fix parsing of sampling to match tsp specification #144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix parsing of sampling to match tsp specification #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
160 changes: 80 additions & 80 deletions tsp-typescript-client/fixtures/tsp-client/fetch-generic-xy-0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,26 @@
"seriesId": 3,
"seriesName": "15652",
"xValues": [
[
0,
604229397
],
[
604229398,
1208458795
],
[
1208458796,
1812688193
],
[
1812688194,
2416917590
],
[
2416917591,
3021146988
]
{
"start": 0,
"end": 604229397
},
{
"start": 604229398,
"end": 1208458795
},
{
"start": 1208458796,
"end": 1812688193
},
{
"start": 1812688194,
"end": 2416917590
},
{
"start": 2416917591,
"end": 3021146988
}
],
"yValues": [
3.0,
Expand Down Expand Up @@ -61,26 +61,26 @@
"seriesId": 4,
"seriesName": "15653",
"xValues": [
[
0,
604229397
],
[
604229398,
1208458795
],
[
1208458796,
1812688193
],
[
1812688194,
2416917590
],
[
2416917591,
3021146988
]
{
"start": 0,
"end": 604229397
},
{
"start": 604229398,
"end": 1208458795
},
{
"start": 1208458796,
"end": 1812688193
},
{
"start": 1812688194,
"end": 2416917590
},
{
"start": 2416917591,
"end": 3021146988
}
],
"yValues": [
3.0,
Expand Down Expand Up @@ -116,26 +116,26 @@
"seriesId": 2,
"seriesName": "15646",
"xValues": [
[
0,
604229397
],
[
604229398,
1208458795
],
[
1208458796,
1812688193
],
[
1812688194,
2416917590
],
[
2416917591,
3021146988
]
{
"start": 0,
"end": 604229397
},
{
"start": 604229398,
"end": 1208458795
},
{
"start": 1208458796,
"end": 1812688193
},
{
"start": 1812688194,
"end": 2416917590
},
{
"start": 2416917591,
"end": 3021146988
}
],
"yValues": [
3.0,
Expand Down Expand Up @@ -171,26 +171,26 @@
"seriesId": 1,
"seriesName": "15647",
"xValues": [
[
0,
604229397
],
[
604229398,
1208458795
],
[
1208458796,
1812688193
],
[
1812688194,
2416917590
],
[
2416917591,
3021146988
]
{
"start": 0,
"end": 604229397
},
{
"start": 604229398,
"end": 1208458795
},
{
"start": 1208458796,
"end": 1812688193
},
{
"start": 1812688194,
"end": 2416917590
},
{
"start": 2416917591,
"end": 3021146988
}
],
"yValues": [
3.0,
Expand Down
52 changes: 38 additions & 14 deletions tsp-typescript-client/src/models/sampling.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,25 @@
import { toBigInt } from '../protocol/serialization';
import { createNormalizer, toBigInt } from '../protocol/serialization';

export type StartEndRange = [bigint, bigint];
export const StartEndRange = createNormalizer<StartEndRange>({
start: BigInt,
end: BigInt,
});

/**
* Represents a closed interval {start, end} as an object.
*/
export interface StartEndRange {
/**
* Start time of the range
*/
start: bigint;

/**
* End time of the range
*/
end: bigint;
}

export const StartEndRange = (v: unknown): StartEndRange => {
if (!Array.isArray(v) || v.length !== 2) {
throw new Error('StartEndRange: expected [start,end]');
}
const [s, e] = v;
return [toBigInt(s as any), toBigInt(e as any)];
};

/**
* Represent sampling on a list of timestamps.
Expand All @@ -30,8 +41,21 @@ export type RangeSampling = StartEndRange[];
*/
export type Sampling = TimestampSampling | CategorySampling | RangeSampling;

export const isRangeSampling = (s: Sampling): s is [bigint, bigint][] =>
Array.isArray(s) && Array.isArray(s[0]);
export const isRangeSampling = (s: Sampling): s is StartEndRange[] => {
if (!Array.isArray(s)) {
return false;
}
if (s.length === 0) {
return true;
}
const firstElement = s[0];
return (
typeof firstElement === 'object' &&
firstElement !== null &&
'start' in firstElement &&
'end' in firstElement
);
};

export const isTimestampSampling = (s: Sampling): s is bigint[] =>
Array.isArray(s) && typeof s[0] === 'bigint';
Expand All @@ -57,9 +81,9 @@ export const Sampling = (v: unknown): Sampling => {
return arr.map(toBigInt) as bigint[];
}

// ranges → array of [bigint, bigint]
if (Array.isArray(first) && first.length === 2) {
return (v as unknown[]).map(StartEndRange);
// Range sampling (array of {start, end} objects)
if (typeof first === 'object' && first !== null && 'start' in first && 'end' in first) {
return v.map(StartEndRange);
}

// Category sampling → strings; leave as-is
Expand Down
15 changes: 10 additions & 5 deletions tsp-typescript-client/src/protocol/tsp-client.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { DataType } from '../models/data-type';
import { ConfigurationParameterDescriptor } from '../models/configuration-source';
import { QueryHelper } from '../models/query/query-helper';
import { isAxisDomainCategorical, isAxisDomainRange } from '../models/axis-domain';
import { StartEndRange } from '../models/sampling';

describe('HttpTspClient Deserialization', () => {

Expand Down Expand Up @@ -372,12 +373,16 @@ describe('HttpTspClient Deserialization', () => {
expect(serie.xValues).toHaveLength(5);
expect(serie.yValues).toHaveLength(5);
for (const xValue of serie.xValues) {
if (Array.isArray(xValue) && xValue.length === 2) {
const [start, end] = xValue;
expect(typeof start).toBe('bigint');
expect(typeof end).toBe('bigint');
if (
typeof xValue === 'object' &&
xValue !== null &&
!Array.isArray(xValue)
) {
const rangeObject = xValue as StartEndRange;
expect(typeof rangeObject.start).toBe('bigint');
expect(typeof rangeObject.end).toBe('bigint');
} else {
fail('xValues is not RangeSampling ([start,end] tuple)');
throw new Error('xValue is not a valid StartEndRange object ({start, end})');
}
}

Expand Down