@cubejs-backend/base-driver 0.33.2 → 0.33.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,4 +1,6 @@
1
1
  export type QueryDef = unknown;
2
+ export type QueueId = string | number | bigint;
3
+ export type ProcessingId = string | number;
2
4
  export type QueryKey = (string | [string, any[]]) & {
3
5
  persistent?: true;
4
6
  };
@@ -6,19 +8,19 @@ export interface QueryKeyHash extends String {
6
8
  __type: 'QueryKeyHash';
7
9
  }
8
10
  export type GetActiveAndToProcessResponse = [active: string[], toProcess: string[]];
9
- export type AddToQueueResponse = [added: number, _b: any, _c: any, queueSize: number, addedToQueueTime: number];
11
+ export type AddToQueueResponse = [added: number, queueId: QueueId | null, queueSize: number, addedToQueueTime: number];
10
12
  export type QueryStageStateResponse = [active: string[], toProcess: string[]] | [active: string[], toProcess: string[], defs: Record<string, QueryDef>];
11
13
  export type RetrieveForProcessingSuccess = [
12
- added: any /** todo(ovr): Remove, useless */,
13
- removed: any /** todo(ovr): Remove, useless */,
14
+ added: unknown,
15
+ queueId: QueueId | null,
14
16
  active: QueryKeyHash[],
15
17
  pending: number,
16
18
  def: QueryDef,
17
19
  lockAquired: true
18
20
  ];
19
21
  export type RetrieveForProcessingFail = [
20
- added: any /** todo(ovr): Remove, useless */,
21
- removed: any /** todo(ovr): Remove, useless */,
22
+ added: unknown,
23
+ queueId: QueueId | null,
22
24
  active: QueryKeyHash[],
23
25
  pending: number,
24
26
  def: null,
@@ -43,10 +45,9 @@ export interface QueueDriverOptions {
43
45
  getQueueEventsBus?: any;
44
46
  processUid?: string;
45
47
  }
46
- export type ProcessingId = string | number;
47
48
  export interface QueueDriverConnectionInterface {
48
49
  redisHash(queryKey: QueryKey): QueryKeyHash;
49
- getResultBlocking(queryKey: QueryKey): Promise<unknown>;
50
+ getResultBlocking(queryKey: QueryKeyHash, queueId: QueueId): Promise<unknown>;
50
51
  getResult(queryKey: QueryKey): Promise<any>;
51
52
  /**
52
53
  * Adds specified by the queryKey query to the queue, returns tuple
@@ -71,10 +72,10 @@ export interface QueueDriverConnectionInterface {
71
72
  getNextProcessingId(): Promise<ProcessingId>;
72
73
  retrieveForProcessing(hash: QueryKeyHash, processingId: ProcessingId): Promise<RetrieveForProcessingResponse>;
73
74
  freeProcessingLock(hash: QueryKeyHash, processingId: ProcessingId, activated: unknown): Promise<void>;
74
- optimisticQueryUpdate(hash: QueryKeyHash, toUpdate: unknown, processingId: ProcessingId): Promise<boolean>;
75
+ optimisticQueryUpdate(hash: QueryKeyHash, toUpdate: unknown, processingId: ProcessingId, queueId: QueueId | null): Promise<boolean>;
75
76
  cancelQuery(queryKey: QueryKey): Promise<QueryDef | null>;
76
77
  getQueryAndRemove(hash: QueryKeyHash): Promise<[QueryDef]>;
77
- setResultAndRemoveQuery(hash: QueryKeyHash, executionResult: any, processingId: ProcessingId): Promise<unknown>;
78
+ setResultAndRemoveQuery(hash: QueryKeyHash, executionResult: any, processingId: ProcessingId, queueId: QueueId | null): Promise<unknown>;
78
79
  release(): void;
79
80
  getQueriesToCancel(): Promise<string[]>;
80
81
  getActiveAndToProcess(): Promise<GetActiveAndToProcessResponse>;
@@ -1 +1 @@
1
- {"version":3,"file":"queue-driver.interface.d.ts","sourceRoot":"","sources":["../../src/queue-driver.interface.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"queue-driver.interface.d.ts","sourceRoot":"","sources":["../../src/queue-driver.interface.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "name": "@cubejs-backend/base-driver",
3
3
  "description": "Cube.js Base Driver",
4
4
  "author": "Cube Dev, Inc.",
5
- "version": "0.33.2",
5
+ "version": "0.33.7",
6
6
  "repository": {
7
7
  "type": "git",
8
8
  "url": "https://github.com/cube-js/cube.git",
@@ -62,5 +62,5 @@
62
62
  "publishConfig": {
63
63
  "access": "public"
64
64
  },
65
- "gitHead": "aa97a57e1512174bacd4b9a867d4c2e6eb0b8605"
65
+ "gitHead": "fc368b21e8a0f1fef2632d4cf2404c6e67bcb184"
66
66
  }