@dxos/index-core 0.8.4-main.abd8ff62ef → 0.8.4-main.bc2380dfbc
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.
- package/LICENSE +102 -5
- package/README.md +1 -1
- package/dist/lib/neutral/index.mjs +30 -25
- package/dist/lib/neutral/index.mjs.map +3 -3
- package/dist/lib/neutral/meta.json +1 -1
- package/dist/types/src/index-engine.d.ts +2 -2
- package/dist/types/src/indexes/interface.d.ts +5 -0
- package/dist/types/src/indexes/interface.d.ts.map +1 -1
- package/dist/types/src/indexes/object-meta-index.d.ts +5 -3
- package/dist/types/src/indexes/object-meta-index.d.ts.map +1 -1
- package/dist/types/src/indexes/reverse-ref-index.d.ts +2 -2
- package/dist/types/tsconfig.tsbuildinfo +1 -1
- package/package.json +12 -12
- package/src/index-engine.test.ts +13 -4
- package/src/index-engine.ts +2 -2
- package/src/indexes/fts-index.test.ts +22 -0
- package/src/indexes/interface.ts +5 -0
- package/src/indexes/object-meta-index.test.ts +59 -10
- package/src/indexes/object-meta-index.ts +30 -21
- package/src/indexes/reverse-ref-index.test.ts +22 -15
- package/src/indexes/reverse-ref-index.ts +11 -11
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dxos/index-core",
|
|
3
|
-
"version": "0.8.4-main.
|
|
3
|
+
"version": "0.8.4-main.bc2380dfbc",
|
|
4
4
|
"description": "Indexing core.",
|
|
5
5
|
"homepage": "https://dxos.org",
|
|
6
6
|
"bugs": "https://github.com/dxos/dxos/issues",
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
"type": "git",
|
|
9
9
|
"url": "https://github.com/dxos/dxos"
|
|
10
10
|
},
|
|
11
|
-
"license": "
|
|
11
|
+
"license": "FSL-1.1-Apache-2.0",
|
|
12
12
|
"author": "info@dxos.org",
|
|
13
13
|
"sideEffects": false,
|
|
14
14
|
"type": "module",
|
|
@@ -29,16 +29,16 @@
|
|
|
29
29
|
"@effect/platform": "0.94.4",
|
|
30
30
|
"@effect/sql": "0.49.0",
|
|
31
31
|
"effect": "3.20.0",
|
|
32
|
-
"@dxos/async": "0.8.4-main.
|
|
33
|
-
"@dxos/
|
|
34
|
-
"@dxos/
|
|
35
|
-
"@dxos/echo
|
|
36
|
-
"@dxos/
|
|
37
|
-
"@dxos/echo": "0.8.4-main.
|
|
38
|
-
"@dxos/
|
|
39
|
-
"@dxos/
|
|
40
|
-
"@dxos/
|
|
41
|
-
"@dxos/log": "0.8.4-main.
|
|
32
|
+
"@dxos/async": "0.8.4-main.bc2380dfbc",
|
|
33
|
+
"@dxos/debug": "0.8.4-main.bc2380dfbc",
|
|
34
|
+
"@dxos/context": "0.8.4-main.bc2380dfbc",
|
|
35
|
+
"@dxos/echo": "0.8.4-main.bc2380dfbc",
|
|
36
|
+
"@dxos/keys": "0.8.4-main.bc2380dfbc",
|
|
37
|
+
"@dxos/echo-protocol": "0.8.4-main.bc2380dfbc",
|
|
38
|
+
"@dxos/invariant": "0.8.4-main.bc2380dfbc",
|
|
39
|
+
"@dxos/effect": "0.8.4-main.bc2380dfbc",
|
|
40
|
+
"@dxos/sql-sqlite": "0.8.4-main.bc2380dfbc",
|
|
41
|
+
"@dxos/log": "0.8.4-main.bc2380dfbc"
|
|
42
42
|
},
|
|
43
43
|
"devDependencies": {
|
|
44
44
|
"@effect/sql-sqlite-node": "0.50.1"
|
package/src/index-engine.test.ts
CHANGED
|
@@ -119,6 +119,7 @@ describe('IndexEngine', () => {
|
|
|
119
119
|
spaceId,
|
|
120
120
|
documentId: 'doc-1',
|
|
121
121
|
queueId: null,
|
|
122
|
+
queueNamespace: null,
|
|
122
123
|
recordId: null,
|
|
123
124
|
updatedAt: Date.now(),
|
|
124
125
|
data: {
|
|
@@ -136,7 +137,7 @@ describe('IndexEngine', () => {
|
|
|
136
137
|
expect(updated).toBe(2);
|
|
137
138
|
|
|
138
139
|
// Verify using the SAME index instance.
|
|
139
|
-
const results1 = yield* metaIndex.query({ spaceId: spaceId.toString(),
|
|
140
|
+
const results1 = yield* metaIndex.query({ spaceId: spaceId.toString(), typeDXN: TYPE_DEFAULT });
|
|
140
141
|
expect(results1).toHaveLength(1);
|
|
141
142
|
expect(results1[0].objectId).toBe(obj1.data.id);
|
|
142
143
|
expect(results1[0].version).toBeGreaterThan(0);
|
|
@@ -156,6 +157,7 @@ describe('IndexEngine', () => {
|
|
|
156
157
|
spaceId,
|
|
157
158
|
documentId: obj1.documentId,
|
|
158
159
|
queueId: null,
|
|
160
|
+
queueNamespace: null,
|
|
159
161
|
recordId: null,
|
|
160
162
|
updatedAt: Date.now(),
|
|
161
163
|
data: { id: obj1.data.id, [ATTR_TYPE]: obj1.data[ATTR_TYPE], title: 'Hello World' },
|
|
@@ -167,7 +169,7 @@ describe('IndexEngine', () => {
|
|
|
167
169
|
expect(updated2).toBe(2);
|
|
168
170
|
|
|
169
171
|
// Verify update.
|
|
170
|
-
const results2 = yield* metaIndex.query({ spaceId: spaceId.toString(),
|
|
172
|
+
const results2 = yield* metaIndex.query({ spaceId: spaceId.toString(), typeDXN: TYPE_DEFAULT });
|
|
171
173
|
expect(results2).toHaveLength(1);
|
|
172
174
|
expect(results2[0].objectId).toBe(obj1Updated.data.id);
|
|
173
175
|
expect(results2[0].version).toBeGreaterThan(results1[0].version);
|
|
@@ -195,6 +197,7 @@ describe('IndexEngine', () => {
|
|
|
195
197
|
{
|
|
196
198
|
spaceId,
|
|
197
199
|
queueId: null,
|
|
200
|
+
queueNamespace: null,
|
|
198
201
|
documentId: 'd1',
|
|
199
202
|
recordId: null,
|
|
200
203
|
updatedAt: Date.now(),
|
|
@@ -207,6 +210,7 @@ describe('IndexEngine', () => {
|
|
|
207
210
|
{
|
|
208
211
|
spaceId,
|
|
209
212
|
queueId: null,
|
|
213
|
+
queueNamespace: null,
|
|
210
214
|
documentId: 'd2',
|
|
211
215
|
recordId: null,
|
|
212
216
|
updatedAt: Date.now(),
|
|
@@ -219,6 +223,7 @@ describe('IndexEngine', () => {
|
|
|
219
223
|
{
|
|
220
224
|
spaceId,
|
|
221
225
|
queueId: null,
|
|
226
|
+
queueNamespace: null,
|
|
222
227
|
documentId: 'd3',
|
|
223
228
|
recordId: null,
|
|
224
229
|
updatedAt: Date.now(),
|
|
@@ -234,10 +239,10 @@ describe('IndexEngine', () => {
|
|
|
234
239
|
|
|
235
240
|
yield* engine.update(Context.default(), dataSource, { spaceId: null });
|
|
236
241
|
|
|
237
|
-
const resultsA = yield* metaIndex.query({ spaceId: spaceId.toString(),
|
|
242
|
+
const resultsA = yield* metaIndex.query({ spaceId: spaceId.toString(), typeDXN: TYPE_A });
|
|
238
243
|
expect(resultsA).toHaveLength(2);
|
|
239
244
|
|
|
240
|
-
const resultsB = yield* metaIndex.query({ spaceId: spaceId.toString(),
|
|
245
|
+
const resultsB = yield* metaIndex.query({ spaceId: spaceId.toString(), typeDXN: TYPE_B });
|
|
241
246
|
expect(resultsB).toHaveLength(1);
|
|
242
247
|
|
|
243
248
|
const ftsResults = yield* ftsIndex.query({
|
|
@@ -269,6 +274,7 @@ describe('IndexEngine', () => {
|
|
|
269
274
|
{
|
|
270
275
|
spaceId,
|
|
271
276
|
queueId: null,
|
|
277
|
+
queueNamespace: null,
|
|
272
278
|
documentId: 'doc-done-test',
|
|
273
279
|
recordId: null,
|
|
274
280
|
updatedAt: Date.now(),
|
|
@@ -305,6 +311,7 @@ describe('IndexEngine', () => {
|
|
|
305
311
|
spaceId: spaceId1,
|
|
306
312
|
documentId: 'doc-result-1',
|
|
307
313
|
queueId: null,
|
|
314
|
+
queueNamespace: null,
|
|
308
315
|
recordId: null,
|
|
309
316
|
updatedAt: Date.now(),
|
|
310
317
|
data: { id: id1, [ATTR_TYPE]: TYPE_A, title: 'Doc in space1' },
|
|
@@ -313,6 +320,7 @@ describe('IndexEngine', () => {
|
|
|
313
320
|
spaceId: spaceId2,
|
|
314
321
|
documentId: 'doc-result-2',
|
|
315
322
|
queueId: null,
|
|
323
|
+
queueNamespace: null,
|
|
316
324
|
recordId: null,
|
|
317
325
|
updatedAt: Date.now(),
|
|
318
326
|
data: { id: id2, [ATTR_TYPE]: TYPE_B, title: 'Doc in space2' },
|
|
@@ -355,6 +363,7 @@ describe('IndexEngine', () => {
|
|
|
355
363
|
spaceId,
|
|
356
364
|
documentId: 'doc-deleted',
|
|
357
365
|
queueId: null,
|
|
366
|
+
queueNamespace: null,
|
|
358
367
|
recordId: null,
|
|
359
368
|
updatedAt: Date.now(),
|
|
360
369
|
data: {
|
package/src/index-engine.ts
CHANGED
|
@@ -164,7 +164,7 @@ export class IndexEngine {
|
|
|
164
164
|
}
|
|
165
165
|
|
|
166
166
|
queryType(
|
|
167
|
-
query: Pick<ObjectMeta, 'spaceId' | '
|
|
167
|
+
query: Pick<ObjectMeta, 'spaceId' | 'typeDXN'>,
|
|
168
168
|
): Effect.Effect<readonly ObjectMeta[], SqlError.SqlError, SqlClient.SqlClient> {
|
|
169
169
|
return this.#objectMetaIndex.query(query);
|
|
170
170
|
}
|
|
@@ -181,7 +181,7 @@ export class IndexEngine {
|
|
|
181
181
|
|
|
182
182
|
queryTypes(query: {
|
|
183
183
|
spaceIds: readonly SpaceId[];
|
|
184
|
-
typeDxns: readonly ObjectMeta['
|
|
184
|
+
typeDxns: readonly ObjectMeta['typeDXN'][];
|
|
185
185
|
inverted?: boolean;
|
|
186
186
|
includeAllQueues?: boolean;
|
|
187
187
|
queueIds?: readonly string[] | null;
|
|
@@ -55,6 +55,7 @@ describe('FtsIndex', () => {
|
|
|
55
55
|
{
|
|
56
56
|
spaceId,
|
|
57
57
|
queueId: null,
|
|
58
|
+
queueNamespace: null,
|
|
58
59
|
documentId: 'doc-1',
|
|
59
60
|
recordId: null,
|
|
60
61
|
updatedAt: Date.now(),
|
|
@@ -100,6 +101,7 @@ describe('FtsIndex', () => {
|
|
|
100
101
|
const obj1: IndexerObject = {
|
|
101
102
|
spaceId,
|
|
102
103
|
queueId: null,
|
|
104
|
+
queueNamespace: null,
|
|
103
105
|
documentId: 'doc-1',
|
|
104
106
|
recordId: null,
|
|
105
107
|
updatedAt: Date.now(),
|
|
@@ -120,6 +122,7 @@ describe('FtsIndex', () => {
|
|
|
120
122
|
const obj2: IndexerObject = {
|
|
121
123
|
spaceId,
|
|
122
124
|
queueId: null,
|
|
125
|
+
queueNamespace: null,
|
|
123
126
|
documentId: 'doc-1',
|
|
124
127
|
recordId: null,
|
|
125
128
|
updatedAt: Date.now(),
|
|
@@ -158,6 +161,7 @@ describe('FtsIndex', () => {
|
|
|
158
161
|
{
|
|
159
162
|
spaceId,
|
|
160
163
|
queueId: null,
|
|
164
|
+
queueNamespace: null,
|
|
161
165
|
documentId: 'doc-100',
|
|
162
166
|
recordId: null,
|
|
163
167
|
updatedAt: Date.now(),
|
|
@@ -170,6 +174,7 @@ describe('FtsIndex', () => {
|
|
|
170
174
|
{
|
|
171
175
|
spaceId,
|
|
172
176
|
queueId: null,
|
|
177
|
+
queueNamespace: null,
|
|
173
178
|
documentId: 'doc-200',
|
|
174
179
|
recordId: null,
|
|
175
180
|
updatedAt: Date.now(),
|
|
@@ -182,6 +187,7 @@ describe('FtsIndex', () => {
|
|
|
182
187
|
{
|
|
183
188
|
spaceId,
|
|
184
189
|
queueId: null,
|
|
190
|
+
queueNamespace: null,
|
|
185
191
|
documentId: 'doc-1000',
|
|
186
192
|
recordId: null,
|
|
187
193
|
updatedAt: Date.now(),
|
|
@@ -231,6 +237,7 @@ describe('FtsIndex', () => {
|
|
|
231
237
|
const obj1: IndexerObject = {
|
|
232
238
|
spaceId: space1,
|
|
233
239
|
queueId: null,
|
|
240
|
+
queueNamespace: null,
|
|
234
241
|
documentId: 'doc-s1',
|
|
235
242
|
recordId: null,
|
|
236
243
|
updatedAt: Date.now(),
|
|
@@ -244,6 +251,7 @@ describe('FtsIndex', () => {
|
|
|
244
251
|
const obj2: IndexerObject = {
|
|
245
252
|
spaceId: space2,
|
|
246
253
|
queueId: null,
|
|
254
|
+
queueNamespace: null,
|
|
247
255
|
documentId: 'doc-s2',
|
|
248
256
|
recordId: null,
|
|
249
257
|
updatedAt: Date.now(),
|
|
@@ -303,6 +311,7 @@ describe('FtsIndex', () => {
|
|
|
303
311
|
{
|
|
304
312
|
spaceId,
|
|
305
313
|
queueId: null,
|
|
314
|
+
queueNamespace: null,
|
|
306
315
|
documentId: 'doc-1',
|
|
307
316
|
recordId: null,
|
|
308
317
|
updatedAt: Date.now(),
|
|
@@ -316,6 +325,7 @@ describe('FtsIndex', () => {
|
|
|
316
325
|
{
|
|
317
326
|
spaceId,
|
|
318
327
|
queueId: null,
|
|
328
|
+
queueNamespace: null,
|
|
319
329
|
documentId: 'doc-2',
|
|
320
330
|
recordId: null,
|
|
321
331
|
updatedAt: Date.now(),
|
|
@@ -386,6 +396,7 @@ describe('FtsIndex', () => {
|
|
|
386
396
|
const spaceObj: IndexerObject = {
|
|
387
397
|
spaceId,
|
|
388
398
|
queueId: null,
|
|
399
|
+
queueNamespace: null,
|
|
389
400
|
documentId: 'doc-space',
|
|
390
401
|
recordId: null,
|
|
391
402
|
updatedAt: Date.now(),
|
|
@@ -399,6 +410,7 @@ describe('FtsIndex', () => {
|
|
|
399
410
|
const queue1Obj: IndexerObject = {
|
|
400
411
|
spaceId,
|
|
401
412
|
queueId: queue1,
|
|
413
|
+
queueNamespace: 'data',
|
|
402
414
|
documentId: null,
|
|
403
415
|
recordId: null,
|
|
404
416
|
updatedAt: Date.now(),
|
|
@@ -412,6 +424,7 @@ describe('FtsIndex', () => {
|
|
|
412
424
|
const queue2Obj: IndexerObject = {
|
|
413
425
|
spaceId,
|
|
414
426
|
queueId: queue2,
|
|
427
|
+
queueNamespace: 'data',
|
|
415
428
|
documentId: null,
|
|
416
429
|
recordId: null,
|
|
417
430
|
updatedAt: Date.now(),
|
|
@@ -461,6 +474,7 @@ describe('FtsIndex', () => {
|
|
|
461
474
|
const spaceObj: IndexerObject = {
|
|
462
475
|
spaceId,
|
|
463
476
|
queueId: null,
|
|
477
|
+
queueNamespace: null,
|
|
464
478
|
documentId: 'doc-space',
|
|
465
479
|
recordId: null,
|
|
466
480
|
updatedAt: Date.now(),
|
|
@@ -474,6 +488,7 @@ describe('FtsIndex', () => {
|
|
|
474
488
|
const queueObj: IndexerObject = {
|
|
475
489
|
spaceId,
|
|
476
490
|
queueId,
|
|
491
|
+
queueNamespace: 'data',
|
|
477
492
|
documentId: null,
|
|
478
493
|
recordId: null,
|
|
479
494
|
updatedAt: Date.now(),
|
|
@@ -524,6 +539,7 @@ describe('FtsIndex', () => {
|
|
|
524
539
|
const space1Obj: IndexerObject = {
|
|
525
540
|
spaceId: space1,
|
|
526
541
|
queueId: null,
|
|
542
|
+
queueNamespace: null,
|
|
527
543
|
documentId: 'doc-s1',
|
|
528
544
|
recordId: null,
|
|
529
545
|
updatedAt: Date.now(),
|
|
@@ -537,6 +553,7 @@ describe('FtsIndex', () => {
|
|
|
537
553
|
const space2Obj: IndexerObject = {
|
|
538
554
|
spaceId: space2,
|
|
539
555
|
queueId: null,
|
|
556
|
+
queueNamespace: null,
|
|
540
557
|
documentId: 'doc-s2',
|
|
541
558
|
recordId: null,
|
|
542
559
|
updatedAt: Date.now(),
|
|
@@ -550,6 +567,7 @@ describe('FtsIndex', () => {
|
|
|
550
567
|
const queueObj: IndexerObject = {
|
|
551
568
|
spaceId: space2,
|
|
552
569
|
queueId: queueInSpace2,
|
|
570
|
+
queueNamespace: 'data',
|
|
553
571
|
documentId: null,
|
|
554
572
|
recordId: null,
|
|
555
573
|
updatedAt: Date.now(),
|
|
@@ -594,6 +612,7 @@ describe('FtsIndex', () => {
|
|
|
594
612
|
{
|
|
595
613
|
spaceId,
|
|
596
614
|
queueId: ObjectId.random(),
|
|
615
|
+
queueNamespace: 'data',
|
|
597
616
|
documentId: null,
|
|
598
617
|
recordId: null,
|
|
599
618
|
updatedAt: Date.now(),
|
|
@@ -602,6 +621,7 @@ describe('FtsIndex', () => {
|
|
|
602
621
|
{
|
|
603
622
|
spaceId,
|
|
604
623
|
queueId: ObjectId.random(),
|
|
624
|
+
queueNamespace: 'data',
|
|
605
625
|
documentId: null,
|
|
606
626
|
recordId: null,
|
|
607
627
|
updatedAt: Date.now(),
|
|
@@ -635,6 +655,7 @@ describe('FtsIndex', () => {
|
|
|
635
655
|
const object: IndexerObject = {
|
|
636
656
|
spaceId,
|
|
637
657
|
queueId: ObjectId.random(),
|
|
658
|
+
queueNamespace: 'data',
|
|
638
659
|
documentId: null,
|
|
639
660
|
recordId: null,
|
|
640
661
|
updatedAt: Date.now(),
|
|
@@ -668,6 +689,7 @@ describe('FtsIndex', () => {
|
|
|
668
689
|
const objects: IndexerObject[] = Array.from({ length: count }, (_, i) => ({
|
|
669
690
|
spaceId,
|
|
670
691
|
queueId: ObjectId.random(),
|
|
692
|
+
queueNamespace: 'data',
|
|
671
693
|
documentId: null,
|
|
672
694
|
recordId: null,
|
|
673
695
|
updatedAt: Date.now(),
|
package/src/indexes/interface.ts
CHANGED
|
@@ -19,6 +19,11 @@ export interface IndexerObject {
|
|
|
19
19
|
* If null, `documentId` must be set.
|
|
20
20
|
*/
|
|
21
21
|
queueId: ObjectId | null;
|
|
22
|
+
/**
|
|
23
|
+
* Queue subspace namespace (e.g. 'data', 'trace') the object lives in.
|
|
24
|
+
* Set together with `queueId`; null for non-queue objects.
|
|
25
|
+
*/
|
|
26
|
+
queueNamespace: string | null;
|
|
22
27
|
/**
|
|
23
28
|
* Document id if object is from the automerge document.
|
|
24
29
|
* If null, `queueId` must be set.
|
|
@@ -41,6 +41,7 @@ describe('ObjectMetaIndex', () => {
|
|
|
41
41
|
const item: IndexerObject = {
|
|
42
42
|
spaceId,
|
|
43
43
|
queueId: ObjectId.random(),
|
|
44
|
+
queueNamespace: 'data',
|
|
44
45
|
documentId: null,
|
|
45
46
|
recordId: null,
|
|
46
47
|
updatedAt: Date.now(),
|
|
@@ -53,12 +54,12 @@ describe('ObjectMetaIndex', () => {
|
|
|
53
54
|
|
|
54
55
|
yield* index.update([item]);
|
|
55
56
|
|
|
56
|
-
const results = yield* index.query({ spaceId,
|
|
57
|
+
const results = yield* index.query({ spaceId, typeDXN: TYPE_PERSON_VERSIONLESS });
|
|
57
58
|
expect(results.map((_) => _.objectId)).toEqual([objectId]);
|
|
58
59
|
|
|
59
60
|
const otherTypeResults = yield* index.query({
|
|
60
61
|
spaceId,
|
|
61
|
-
|
|
62
|
+
typeDXN: DXN.parse('dxn:type:com.example.type.other').toString(),
|
|
62
63
|
});
|
|
63
64
|
expect(otherTypeResults).toEqual([]);
|
|
64
65
|
}).pipe(Effect.provide(TestLayer)),
|
|
@@ -76,6 +77,7 @@ describe('ObjectMetaIndex', () => {
|
|
|
76
77
|
const match: IndexerObject = {
|
|
77
78
|
spaceId,
|
|
78
79
|
queueId: ObjectId.random(),
|
|
80
|
+
queueNamespace: 'data',
|
|
79
81
|
documentId: null,
|
|
80
82
|
recordId: null,
|
|
81
83
|
updatedAt: Date.now(),
|
|
@@ -90,6 +92,7 @@ describe('ObjectMetaIndex', () => {
|
|
|
90
92
|
const falsePositive: IndexerObject = {
|
|
91
93
|
spaceId,
|
|
92
94
|
queueId: ObjectId.random(),
|
|
95
|
+
queueNamespace: 'data',
|
|
93
96
|
documentId: null,
|
|
94
97
|
recordId: null,
|
|
95
98
|
updatedAt: Date.now(),
|
|
@@ -102,7 +105,7 @@ describe('ObjectMetaIndex', () => {
|
|
|
102
105
|
|
|
103
106
|
yield* index.update([match, falsePositive]);
|
|
104
107
|
|
|
105
|
-
const queryResults = yield* index.query({ spaceId,
|
|
108
|
+
const queryResults = yield* index.query({ spaceId, typeDXN: TYPE_WITH_UNDERSCORE_VERSIONLESS });
|
|
106
109
|
expect(queryResults.map((_) => _.objectId)).toEqual([objectIdMatch]);
|
|
107
110
|
|
|
108
111
|
const queryTypesResults = yield* index.queryTypes({
|
|
@@ -126,6 +129,7 @@ describe('ObjectMetaIndex', () => {
|
|
|
126
129
|
const item1: IndexerObject = {
|
|
127
130
|
spaceId,
|
|
128
131
|
queueId: ObjectId.random(),
|
|
132
|
+
queueNamespace: 'data',
|
|
129
133
|
documentId: null,
|
|
130
134
|
recordId: null,
|
|
131
135
|
updatedAt: Date.now(),
|
|
@@ -139,6 +143,7 @@ describe('ObjectMetaIndex', () => {
|
|
|
139
143
|
const item2: IndexerObject = {
|
|
140
144
|
spaceId,
|
|
141
145
|
queueId: null,
|
|
146
|
+
queueNamespace: null,
|
|
142
147
|
documentId: 'doc-123',
|
|
143
148
|
recordId: null,
|
|
144
149
|
updatedAt: Date.now(),
|
|
@@ -155,12 +160,12 @@ describe('ObjectMetaIndex', () => {
|
|
|
155
160
|
yield* index.update([item1, item2]);
|
|
156
161
|
|
|
157
162
|
// Verify Query.
|
|
158
|
-
const results = yield* index.query({ spaceId,
|
|
163
|
+
const results = yield* index.query({ spaceId, typeDXN: TYPE_PERSON });
|
|
159
164
|
expect(results.length).toBe(1);
|
|
160
165
|
expect(results[0].objectId).toBe(objectId1);
|
|
161
166
|
expect(results[0].version).toBe(1);
|
|
162
167
|
|
|
163
|
-
const relationResults = yield* index.query({ spaceId,
|
|
168
|
+
const relationResults = yield* index.query({ spaceId, typeDXN: TYPE_RELATION });
|
|
164
169
|
expect(relationResults.length).toBe(1);
|
|
165
170
|
expect(relationResults[0].objectId).toBe(objectId2);
|
|
166
171
|
expect(relationResults[0].entityKind).toBe('relation');
|
|
@@ -179,7 +184,7 @@ describe('ObjectMetaIndex', () => {
|
|
|
179
184
|
|
|
180
185
|
yield* index.update([item1Update]);
|
|
181
186
|
|
|
182
|
-
const updatedResults = yield* index.query({ spaceId,
|
|
187
|
+
const updatedResults = yield* index.query({ spaceId, typeDXN: TYPE_PERSON });
|
|
183
188
|
// Depending on implementation, query might filter deleted or not.
|
|
184
189
|
// Current implementation is SELECT * without deleted filter for queryType
|
|
185
190
|
expect(updatedResults.length).toBe(1);
|
|
@@ -197,12 +202,12 @@ describe('ObjectMetaIndex', () => {
|
|
|
197
202
|
|
|
198
203
|
yield* index.update([item2Update]);
|
|
199
204
|
|
|
200
|
-
const newTypeResults = yield* index.query({ spaceId,
|
|
205
|
+
const newTypeResults = yield* index.query({ spaceId, typeDXN: TYPE_RELATION_UPDATED });
|
|
201
206
|
expect(newTypeResults.length).toBe(1);
|
|
202
207
|
expect(newTypeResults[0].version).toBe(4);
|
|
203
208
|
expect(newTypeResults[0].objectId).toBe(objectId2);
|
|
204
209
|
|
|
205
|
-
const oldTypeResults = yield* index.query({ spaceId,
|
|
210
|
+
const oldTypeResults = yield* index.query({ spaceId, typeDXN: TYPE_RELATION });
|
|
206
211
|
expect(oldTypeResults.length).toBe(0);
|
|
207
212
|
}).pipe(Effect.provide(TestLayer)),
|
|
208
213
|
);
|
|
@@ -220,6 +225,7 @@ describe('ObjectMetaIndex', () => {
|
|
|
220
225
|
const item1: IndexerObject = {
|
|
221
226
|
spaceId,
|
|
222
227
|
queueId: ObjectId.random(),
|
|
228
|
+
queueNamespace: 'data',
|
|
223
229
|
documentId: null,
|
|
224
230
|
recordId: null,
|
|
225
231
|
updatedAt: Date.now(),
|
|
@@ -233,6 +239,7 @@ describe('ObjectMetaIndex', () => {
|
|
|
233
239
|
const item2: IndexerObject = {
|
|
234
240
|
spaceId,
|
|
235
241
|
queueId: ObjectId.random(),
|
|
242
|
+
queueNamespace: 'data',
|
|
236
243
|
documentId: null,
|
|
237
244
|
recordId: null,
|
|
238
245
|
updatedAt: Date.now(),
|
|
@@ -246,6 +253,7 @@ describe('ObjectMetaIndex', () => {
|
|
|
246
253
|
const relation: IndexerObject = {
|
|
247
254
|
spaceId,
|
|
248
255
|
queueId: ObjectId.random(),
|
|
256
|
+
queueNamespace: 'data',
|
|
249
257
|
documentId: null,
|
|
250
258
|
recordId: null,
|
|
251
259
|
updatedAt: Date.now(),
|
|
@@ -341,6 +349,7 @@ describe('ObjectMetaIndex', () => {
|
|
|
341
349
|
const item: IndexerObject = {
|
|
342
350
|
spaceId,
|
|
343
351
|
queueId,
|
|
352
|
+
queueNamespace: 'data',
|
|
344
353
|
documentId: null,
|
|
345
354
|
recordId: null,
|
|
346
355
|
updatedAt: insertTimestamp,
|
|
@@ -353,7 +362,7 @@ describe('ObjectMetaIndex', () => {
|
|
|
353
362
|
|
|
354
363
|
yield* index.update([item]);
|
|
355
364
|
|
|
356
|
-
const results = yield* index.query({ spaceId,
|
|
365
|
+
const results = yield* index.query({ spaceId, typeDXN: TYPE_PERSON });
|
|
357
366
|
expect(results.length).toBe(1);
|
|
358
367
|
expect(results[0].createdAt).toBe(insertTimestamp);
|
|
359
368
|
expect(results[0].updatedAt).toBe(insertTimestamp);
|
|
@@ -361,7 +370,7 @@ describe('ObjectMetaIndex', () => {
|
|
|
361
370
|
const updateTimestamp = 1700001000000;
|
|
362
371
|
yield* index.update([{ ...item, updatedAt: updateTimestamp, data: { ...item.data, [ATTR_DELETED]: true } }]);
|
|
363
372
|
|
|
364
|
-
const updated = yield* index.query({ spaceId,
|
|
373
|
+
const updated = yield* index.query({ spaceId, typeDXN: TYPE_PERSON });
|
|
365
374
|
expect(updated[0].createdAt).toBe(insertTimestamp);
|
|
366
375
|
expect(updated[0].updatedAt).toBe(updateTimestamp);
|
|
367
376
|
}).pipe(Effect.provide(TestLayer)),
|
|
@@ -386,6 +395,7 @@ describe('ObjectMetaIndex', () => {
|
|
|
386
395
|
{
|
|
387
396
|
spaceId,
|
|
388
397
|
queueId: queueId1,
|
|
398
|
+
queueNamespace: 'data',
|
|
389
399
|
documentId: null,
|
|
390
400
|
recordId: null,
|
|
391
401
|
updatedAt: earlyTimestamp,
|
|
@@ -397,6 +407,7 @@ describe('ObjectMetaIndex', () => {
|
|
|
397
407
|
{
|
|
398
408
|
spaceId,
|
|
399
409
|
queueId: queueId2,
|
|
410
|
+
queueNamespace: 'data',
|
|
400
411
|
documentId: null,
|
|
401
412
|
recordId: null,
|
|
402
413
|
updatedAt: lateTimestamp,
|
|
@@ -425,4 +436,42 @@ describe('ObjectMetaIndex', () => {
|
|
|
425
436
|
expect(beforeMid.map((_) => _.objectId)).toEqual([objectId1]);
|
|
426
437
|
}).pipe(Effect.provide(TestLayer)),
|
|
427
438
|
);
|
|
439
|
+
|
|
440
|
+
it.effect('should round-trip queueNamespace and persist it through updates', () =>
|
|
441
|
+
Effect.gen(function* () {
|
|
442
|
+
const index = new ObjectMetaIndex();
|
|
443
|
+
yield* index.migrate();
|
|
444
|
+
|
|
445
|
+
const spaceId = SpaceId.random();
|
|
446
|
+
const traceQueueId = ObjectId.random();
|
|
447
|
+
const traceObjectId = ObjectId.random();
|
|
448
|
+
|
|
449
|
+
// Initial insert with 'trace' namespace.
|
|
450
|
+
const traceItem: IndexerObject = {
|
|
451
|
+
spaceId,
|
|
452
|
+
queueId: traceQueueId,
|
|
453
|
+
queueNamespace: 'trace',
|
|
454
|
+
documentId: null,
|
|
455
|
+
recordId: null,
|
|
456
|
+
updatedAt: Date.now(),
|
|
457
|
+
data: {
|
|
458
|
+
id: traceObjectId,
|
|
459
|
+
[ATTR_TYPE]: TYPE_PERSON,
|
|
460
|
+
[ATTR_DELETED]: false,
|
|
461
|
+
},
|
|
462
|
+
};
|
|
463
|
+
yield* index.update([traceItem]);
|
|
464
|
+
|
|
465
|
+
const initial = yield* index.queryAll({ spaceIds: [spaceId], includeAllQueues: true });
|
|
466
|
+
expect(initial).toHaveLength(1);
|
|
467
|
+
expect(initial[0].queueNamespace).toBe('trace');
|
|
468
|
+
|
|
469
|
+
// Re-index the same object: the UPDATE branch must preserve the namespace.
|
|
470
|
+
yield* index.update([{ ...traceItem, updatedAt: Date.now() + 1 }]);
|
|
471
|
+
|
|
472
|
+
const afterUpdate = yield* index.queryAll({ spaceIds: [spaceId], includeAllQueues: true });
|
|
473
|
+
expect(afterUpdate).toHaveLength(1);
|
|
474
|
+
expect(afterUpdate[0].queueNamespace).toBe('trace');
|
|
475
|
+
}).pipe(Effect.provide(TestLayer)),
|
|
476
|
+
);
|
|
428
477
|
});
|