@rocicorp/zero 0.17.2025030701 → 0.17.2025031200
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/out/advanced.js +1 -1
- package/out/chunk-2Y24MEEQ.js +45 -0
- package/out/chunk-2Y24MEEQ.js.map +7 -0
- package/out/{chunk-6XQK3UTJ.js → chunk-6CQ6CUML.js} +4 -5
- package/out/chunk-6CQ6CUML.js.map +7 -0
- package/out/{chunk-YKI43S5O.js → chunk-VNV6U5BQ.js} +612 -249
- package/out/chunk-VNV6U5BQ.js.map +7 -0
- package/out/otel/src/log-options.d.ts +4 -0
- package/out/otel/src/log-options.d.ts.map +1 -1
- package/out/otel/src/log-options.js +6 -0
- package/out/otel/src/log-options.js.map +1 -1
- package/out/otel/src/maybe-time.js +1 -1
- package/out/react.js +3 -3
- package/out/react.js.map +2 -2
- package/out/shared/src/asserts.d.ts.map +1 -1
- package/out/shared/src/asserts.js +1 -2
- package/out/shared/src/asserts.js.map +1 -1
- package/out/shared/src/objects.d.ts +4 -0
- package/out/shared/src/objects.d.ts.map +1 -0
- package/out/shared/src/objects.js +25 -0
- package/out/shared/src/objects.js.map +1 -0
- package/out/solid.js +6 -4
- package/out/solid.js.map +2 -2
- package/out/z2s/src/compiler.d.ts.map +1 -1
- package/out/z2s/src/compiler.js +1 -1
- package/out/z2s/src/compiler.js.map +1 -1
- package/out/zero-cache/src/auth/load-permissions.d.ts.map +1 -1
- package/out/zero-cache/src/auth/load-permissions.js +0 -1
- package/out/zero-cache/src/auth/load-permissions.js.map +1 -1
- package/out/zero-cache/src/auth/write-authorizer.d.ts.map +1 -1
- package/out/zero-cache/src/auth/write-authorizer.js +1 -0
- package/out/zero-cache/src/auth/write-authorizer.js.map +1 -1
- package/out/zero-cache/src/config/zero-config.d.ts +4 -0
- package/out/zero-cache/src/config/zero-config.d.ts.map +1 -1
- package/out/zero-cache/src/db/lite-tables.d.ts +5 -1
- package/out/zero-cache/src/db/lite-tables.d.ts.map +1 -1
- package/out/zero-cache/src/db/lite-tables.js +8 -1
- package/out/zero-cache/src/db/lite-tables.js.map +1 -1
- package/out/zero-cache/src/db/specs.d.ts +5 -5
- package/out/zero-cache/src/scripts/deploy-permissions.js +2 -1
- package/out/zero-cache/src/scripts/deploy-permissions.js.map +1 -1
- package/out/zero-cache/src/server/multi/config.d.ts +4 -0
- package/out/zero-cache/src/server/multi/config.d.ts.map +1 -1
- package/out/zero-cache/src/server/syncer.d.ts.map +1 -1
- package/out/zero-cache/src/server/syncer.js +1 -1
- package/out/zero-cache/src/server/syncer.js.map +1 -1
- package/out/zero-cache/src/services/change-source/pg/schema/ddl.d.ts +10 -10
- package/out/zero-cache/src/services/change-source/pg/schema/published.d.ts +4 -4
- package/out/zero-cache/src/services/change-source/pg/schema/shard.d.ts +1 -1
- package/out/zero-cache/src/services/change-source/protocol/current/data.d.ts +8 -8
- package/out/zero-cache/src/services/change-source/protocol/current/downstream.d.ts +12 -12
- package/out/zero-cache/src/services/change-streamer/change-streamer.d.ts +4 -4
- package/out/zero-cache/src/services/dispatcher/connect-params.d.ts +1 -1
- package/out/zero-cache/src/services/dispatcher/connect-params.d.ts.map +1 -1
- package/out/zero-cache/src/services/dispatcher/connect-params.js +1 -1
- package/out/zero-cache/src/services/dispatcher/connect-params.js.map +1 -1
- package/out/zero-cache/src/services/mutagen/mutagen.d.ts +3 -3
- package/out/zero-cache/src/services/mutagen/mutagen.d.ts.map +1 -1
- package/out/zero-cache/src/services/mutagen/mutagen.js +7 -3
- package/out/zero-cache/src/services/mutagen/mutagen.js.map +1 -1
- package/out/zero-cache/src/services/view-syncer/client-handler.d.ts +1 -1
- package/out/zero-cache/src/services/view-syncer/client-handler.d.ts.map +1 -1
- package/out/zero-cache/src/services/view-syncer/client-handler.js +4 -2
- package/out/zero-cache/src/services/view-syncer/client-handler.js.map +1 -1
- package/out/zero-cache/src/services/view-syncer/client-schema.d.ts +5 -0
- package/out/zero-cache/src/services/view-syncer/client-schema.d.ts.map +1 -0
- package/out/zero-cache/src/services/view-syncer/client-schema.js +74 -0
- package/out/zero-cache/src/services/view-syncer/client-schema.js.map +1 -0
- package/out/zero-cache/src/services/view-syncer/cvr-store.d.ts +6 -2
- package/out/zero-cache/src/services/view-syncer/cvr-store.d.ts.map +1 -1
- package/out/zero-cache/src/services/view-syncer/cvr-store.js +38 -15
- package/out/zero-cache/src/services/view-syncer/cvr-store.js.map +1 -1
- package/out/zero-cache/src/services/view-syncer/cvr.d.ts +6 -2
- package/out/zero-cache/src/services/view-syncer/cvr.d.ts.map +1 -1
- package/out/zero-cache/src/services/view-syncer/cvr.js +36 -15
- package/out/zero-cache/src/services/view-syncer/cvr.js.map +1 -1
- package/out/zero-cache/src/services/view-syncer/pipeline-driver.d.ts +5 -4
- package/out/zero-cache/src/services/view-syncer/pipeline-driver.d.ts.map +1 -1
- package/out/zero-cache/src/services/view-syncer/pipeline-driver.js +22 -16
- package/out/zero-cache/src/services/view-syncer/pipeline-driver.js.map +1 -1
- package/out/zero-cache/src/services/view-syncer/schema/cvr.d.ts +2 -0
- package/out/zero-cache/src/services/view-syncer/schema/cvr.d.ts.map +1 -1
- package/out/zero-cache/src/services/view-syncer/schema/cvr.js +2 -1
- package/out/zero-cache/src/services/view-syncer/schema/cvr.js.map +1 -1
- package/out/zero-cache/src/services/view-syncer/schema/init.d.ts.map +1 -1
- package/out/zero-cache/src/services/view-syncer/schema/init.js +6 -0
- package/out/zero-cache/src/services/view-syncer/schema/init.js.map +1 -1
- package/out/zero-cache/src/services/view-syncer/schema/types.d.ts +2 -2
- package/out/zero-cache/src/services/view-syncer/schema/types.d.ts.map +1 -1
- package/out/zero-cache/src/services/view-syncer/schema/types.js +4 -3
- package/out/zero-cache/src/services/view-syncer/schema/types.js.map +1 -1
- package/out/zero-cache/src/services/view-syncer/snapshotter.d.ts.map +1 -1
- package/out/zero-cache/src/services/view-syncer/snapshotter.js +4 -1
- package/out/zero-cache/src/services/view-syncer/snapshotter.js.map +1 -1
- package/out/zero-cache/src/services/view-syncer/view-syncer.d.ts +2 -2
- package/out/zero-cache/src/services/view-syncer/view-syncer.d.ts.map +1 -1
- package/out/zero-cache/src/services/view-syncer/view-syncer.js +27 -15
- package/out/zero-cache/src/services/view-syncer/view-syncer.js.map +1 -1
- package/out/zero-client/src/client/context.d.ts +10 -4
- package/out/zero-client/src/client/context.d.ts.map +1 -1
- package/out/zero-client/src/client/options.d.ts +8 -0
- package/out/zero-client/src/client/options.d.ts.map +1 -1
- package/out/zero-client/src/client/query-manager.d.ts +2 -1
- package/out/zero-client/src/client/query-manager.d.ts.map +1 -1
- package/out/zero-client/src/client/zero.d.ts +3 -2
- package/out/zero-client/src/client/zero.d.ts.map +1 -1
- package/out/zero-client/src/mod.d.ts +2 -2
- package/out/zero-client/src/mod.d.ts.map +1 -1
- package/out/zero-protocol/src/client-schema.d.ts +27 -0
- package/out/zero-protocol/src/client-schema.d.ts.map +1 -0
- package/out/zero-protocol/src/client-schema.js +28 -0
- package/out/zero-protocol/src/client-schema.js.map +1 -0
- package/out/zero-protocol/src/connect.d.ts +14 -0
- package/out/zero-protocol/src/connect.d.ts.map +1 -1
- package/out/zero-protocol/src/connect.js +2 -0
- package/out/zero-protocol/src/connect.js.map +1 -1
- package/out/zero-protocol/src/protocol-version.d.ts +1 -1
- package/out/zero-protocol/src/protocol-version.d.ts.map +1 -1
- package/out/zero-protocol/src/protocol-version.js +2 -1
- package/out/zero-protocol/src/protocol-version.js.map +1 -1
- package/out/zero-protocol/src/push.d.ts +2 -2
- package/out/zero-protocol/src/push.d.ts.map +1 -1
- package/out/zero-protocol/src/push.js +4 -1
- package/out/zero-protocol/src/push.js.map +1 -1
- package/out/zero-protocol/src/up.d.ts +8 -1
- package/out/zero-protocol/src/up.d.ts.map +1 -1
- package/out/zero-react/src/use-query.d.ts +4 -3
- package/out/zero-react/src/use-query.d.ts.map +1 -1
- package/out/zero-schema/src/builder/schema-builder.d.ts +7 -13
- package/out/zero-schema/src/builder/schema-builder.d.ts.map +1 -1
- package/out/zero-schema/src/builder/schema-builder.js +22 -13
- package/out/zero-schema/src/builder/schema-builder.js.map +1 -1
- package/out/zero-schema/src/schema-config.d.ts +2 -4
- package/out/zero-schema/src/schema-config.d.ts.map +1 -1
- package/out/zero-schema/src/schema-config.js +1 -2
- package/out/zero-schema/src/schema-config.js.map +1 -1
- package/out/zero-schema/src/table-schema.d.ts +2 -2
- package/out/zero-schema/src/table-schema.d.ts.map +1 -1
- package/out/zero-solid/src/use-query.d.ts +2 -2
- package/out/zero-solid/src/use-query.d.ts.map +1 -1
- package/out/zero.js +6 -3
- package/out/zql/src/builder/builder.d.ts +3 -2
- package/out/zql/src/builder/builder.d.ts.map +1 -1
- package/out/zql/src/builder/builder.js +48 -27
- package/out/zql/src/builder/builder.js.map +1 -1
- package/out/zql/src/ivm/exists.d.ts.map +1 -1
- package/out/zql/src/ivm/exists.js +2 -6
- package/out/zql/src/ivm/exists.js.map +1 -1
- package/out/zql/src/ivm/fan-in.d.ts +1 -0
- package/out/zql/src/ivm/fan-in.d.ts.map +1 -1
- package/out/zql/src/ivm/fan-in.js +100 -4
- package/out/zql/src/ivm/fan-in.js.map +1 -1
- package/out/zql/src/ivm/fan-out.d.ts +2 -1
- package/out/zql/src/ivm/fan-out.d.ts.map +1 -1
- package/out/zql/src/ivm/fan-out.js +6 -12
- package/out/zql/src/ivm/fan-out.js.map +1 -1
- package/out/zql/src/ivm/join.d.ts.map +1 -1
- package/out/zql/src/ivm/join.js +134 -55
- package/out/zql/src/ivm/join.js.map +1 -1
- package/out/zql/src/ivm/memory-source.d.ts +17 -3
- package/out/zql/src/ivm/memory-source.d.ts.map +1 -1
- package/out/zql/src/ivm/memory-source.js +108 -56
- package/out/zql/src/ivm/memory-source.js.map +1 -1
- package/out/zql/src/ivm/source.d.ts +4 -1
- package/out/zql/src/ivm/source.d.ts.map +1 -1
- package/out/zql/src/ivm/take.d.ts.map +1 -1
- package/out/zql/src/ivm/take.js +9 -31
- package/out/zql/src/ivm/take.js.map +1 -1
- package/out/zql/src/ivm/view-apply-change.js +2 -2
- package/out/zql/src/ivm/view-apply-change.js.map +1 -1
- package/out/zql/src/query/query-impl.d.ts +4 -2
- package/out/zql/src/query/query-impl.d.ts.map +1 -1
- package/out/zql/src/query/query-impl.js +6 -4
- package/out/zql/src/query/query-impl.js.map +1 -1
- package/out/zql/src/query/query-internal.d.ts +3 -2
- package/out/zql/src/query/query-internal.d.ts.map +1 -1
- package/out/zql/src/query/query.d.ts +2 -2
- package/out/zql/src/query/query.d.ts.map +1 -1
- package/out/zql/src/query/query.js +1 -1
- package/out/zql/src/query/query.js.map +1 -1
- package/out/zql/src/query/ttl.d.ts +18 -0
- package/out/zql/src/query/ttl.d.ts.map +1 -0
- package/out/zql/src/query/ttl.js +33 -0
- package/out/zql/src/query/ttl.js.map +1 -0
- package/out/zqlite/src/db.js +1 -1
- package/out/zqlite/src/db.js.map +1 -1
- package/out/zqlite/src/table-source.d.ts +1 -1
- package/out/zqlite/src/table-source.d.ts.map +1 -1
- package/out/zqlite/src/table-source.js +10 -53
- package/out/zqlite/src/table-source.js.map +1 -1
- package/package.json +1 -1
- package/out/chunk-6XQK3UTJ.js.map +0 -7
- package/out/chunk-HARIWJ2J.js +0 -8
- package/out/chunk-HARIWJ2J.js.map +0 -7
- package/out/chunk-YKI43S5O.js.map +0 -7
package/out/zql/src/ivm/join.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { assert, unreachable } from "../../../shared/src/asserts.js";
|
|
2
|
-
import { valuesEqual } from "./data.js";
|
|
2
|
+
import { compareValues, valuesEqual } from "./data.js";
|
|
3
3
|
import { throwOutput, } from "./operator.js";
|
|
4
4
|
import { take } from "./stream.js";
|
|
5
5
|
/**
|
|
@@ -21,6 +21,7 @@ export class Join {
|
|
|
21
21
|
#relationshipName;
|
|
22
22
|
#schema;
|
|
23
23
|
#output = throwOutput;
|
|
24
|
+
#inprogressChildChange;
|
|
24
25
|
constructor({ parent, child, storage, parentKey, childKey, relationshipName, hidden, system, }) {
|
|
25
26
|
assert(parent !== child, 'Parent and child must be different operators');
|
|
26
27
|
assert(parentKey.length === childKey.length, 'The parentKey and childKey keys must have same length');
|
|
@@ -92,27 +93,13 @@ export class Join {
|
|
|
92
93
|
});
|
|
93
94
|
break;
|
|
94
95
|
case 'edit': {
|
|
95
|
-
//
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
this.#
|
|
101
|
-
|
|
102
|
-
oldNode: this.#processParentNode(change.oldNode.row, change.oldNode.relationships, 'cleanup'),
|
|
103
|
-
node: this.#processParentNode(change.node.row, change.node.relationships, 'fetch'),
|
|
104
|
-
});
|
|
105
|
-
}
|
|
106
|
-
else {
|
|
107
|
-
this.#pushParent({
|
|
108
|
-
type: 'remove',
|
|
109
|
-
node: change.oldNode,
|
|
110
|
-
});
|
|
111
|
-
this.#pushParent({
|
|
112
|
-
type: 'add',
|
|
113
|
-
node: change.node,
|
|
114
|
-
});
|
|
115
|
-
}
|
|
96
|
+
// Assert the edit could not change the relationship.
|
|
97
|
+
assert(rowEqualsForCompoundKey(change.oldNode.row, change.node.row, this.#parentKey), `Parent edit must not change relationship.`);
|
|
98
|
+
this.#output.push({
|
|
99
|
+
type: 'edit',
|
|
100
|
+
oldNode: this.#processParentNode(change.oldNode.row, change.oldNode.relationships, 'cleanup'),
|
|
101
|
+
node: this.#processParentNode(change.node.row, change.node.relationships, 'fetch'),
|
|
102
|
+
});
|
|
116
103
|
break;
|
|
117
104
|
}
|
|
118
105
|
default:
|
|
@@ -121,19 +108,29 @@ export class Join {
|
|
|
121
108
|
}
|
|
122
109
|
#pushChild(change) {
|
|
123
110
|
const pushChildChange = (childRow, change) => {
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
111
|
+
this.#inprogressChildChange = {
|
|
112
|
+
change,
|
|
113
|
+
position: undefined,
|
|
114
|
+
};
|
|
115
|
+
try {
|
|
116
|
+
const parentNodes = this.#parent.fetch({
|
|
117
|
+
constraint: Object.fromEntries(this.#parentKey.map((key, i) => [key, childRow[this.#childKey[i]]])),
|
|
118
|
+
});
|
|
119
|
+
for (const parentNode of parentNodes) {
|
|
120
|
+
this.#inprogressChildChange.position = parentNode.row;
|
|
121
|
+
const childChange = {
|
|
122
|
+
type: 'child',
|
|
123
|
+
node: this.#processParentNode(parentNode.row, parentNode.relationships, 'fetch'),
|
|
124
|
+
child: {
|
|
125
|
+
relationshipName: this.#relationshipName,
|
|
126
|
+
change,
|
|
127
|
+
},
|
|
128
|
+
};
|
|
129
|
+
this.#output.push(childChange);
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
finally {
|
|
133
|
+
this.#inprogressChildChange = undefined;
|
|
137
134
|
}
|
|
138
135
|
};
|
|
139
136
|
switch (change.type) {
|
|
@@ -147,30 +144,97 @@ export class Join {
|
|
|
147
144
|
case 'edit': {
|
|
148
145
|
const childRow = change.node.row;
|
|
149
146
|
const oldChildRow = change.oldNode.row;
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
pushChildChange(childRow, change);
|
|
154
|
-
}
|
|
155
|
-
else {
|
|
156
|
-
// The child row was edited in a way that changes the relationship. We
|
|
157
|
-
// therefore treat this as a remove from the old row followed by an
|
|
158
|
-
// add to the new row.
|
|
159
|
-
pushChildChange(oldChildRow, {
|
|
160
|
-
type: 'remove',
|
|
161
|
-
node: change.oldNode,
|
|
162
|
-
});
|
|
163
|
-
pushChildChange(childRow, {
|
|
164
|
-
type: 'add',
|
|
165
|
-
node: change.node,
|
|
166
|
-
});
|
|
167
|
-
}
|
|
147
|
+
// Assert the edit could not change the relationship.
|
|
148
|
+
assert(rowEqualsForCompoundKey(oldChildRow, childRow, this.#childKey), 'Child edit must not change relationship.');
|
|
149
|
+
pushChildChange(childRow, change);
|
|
168
150
|
break;
|
|
169
151
|
}
|
|
170
152
|
default:
|
|
171
153
|
unreachable(change);
|
|
172
154
|
}
|
|
173
155
|
}
|
|
156
|
+
*#generateChildStreamWithOverlay(stream, overlay) {
|
|
157
|
+
let applied = false;
|
|
158
|
+
let editOldApplied = false;
|
|
159
|
+
let editNewApplied = false;
|
|
160
|
+
for (const child of stream) {
|
|
161
|
+
let yieldChild = true;
|
|
162
|
+
if (!applied) {
|
|
163
|
+
switch (overlay.type) {
|
|
164
|
+
case 'add': {
|
|
165
|
+
if (this.#child
|
|
166
|
+
.getSchema()
|
|
167
|
+
.compareRows(overlay.node.row, child.row) === 0) {
|
|
168
|
+
applied = true;
|
|
169
|
+
yieldChild = false;
|
|
170
|
+
}
|
|
171
|
+
break;
|
|
172
|
+
}
|
|
173
|
+
case 'remove': {
|
|
174
|
+
if (this.#child.getSchema().compareRows(overlay.node.row, child.row) <
|
|
175
|
+
0) {
|
|
176
|
+
applied = true;
|
|
177
|
+
yield overlay.node;
|
|
178
|
+
}
|
|
179
|
+
break;
|
|
180
|
+
}
|
|
181
|
+
case 'edit': {
|
|
182
|
+
if (this.#child
|
|
183
|
+
.getSchema()
|
|
184
|
+
.compareRows(overlay.oldNode.row, child.row) < 0) {
|
|
185
|
+
editOldApplied = true;
|
|
186
|
+
if (editNewApplied) {
|
|
187
|
+
applied = true;
|
|
188
|
+
}
|
|
189
|
+
yield overlay.oldNode;
|
|
190
|
+
}
|
|
191
|
+
if (this.#child
|
|
192
|
+
.getSchema()
|
|
193
|
+
.compareRows(overlay.node.row, child.row) === 0) {
|
|
194
|
+
editNewApplied = true;
|
|
195
|
+
if (editOldApplied) {
|
|
196
|
+
applied = true;
|
|
197
|
+
}
|
|
198
|
+
yieldChild = false;
|
|
199
|
+
}
|
|
200
|
+
break;
|
|
201
|
+
}
|
|
202
|
+
case 'child': {
|
|
203
|
+
if (this.#child
|
|
204
|
+
.getSchema()
|
|
205
|
+
.compareRows(overlay.node.row, child.row) === 0) {
|
|
206
|
+
applied = true;
|
|
207
|
+
yield {
|
|
208
|
+
row: child.row,
|
|
209
|
+
relationships: {
|
|
210
|
+
...child.relationships,
|
|
211
|
+
[overlay.child.relationshipName]: () => this.#generateChildStreamWithOverlay(child.relationships[overlay.child.relationshipName](), overlay.child.change),
|
|
212
|
+
},
|
|
213
|
+
};
|
|
214
|
+
yieldChild = false;
|
|
215
|
+
}
|
|
216
|
+
break;
|
|
217
|
+
}
|
|
218
|
+
}
|
|
219
|
+
}
|
|
220
|
+
if (yieldChild) {
|
|
221
|
+
yield child;
|
|
222
|
+
}
|
|
223
|
+
}
|
|
224
|
+
if (!applied) {
|
|
225
|
+
if (overlay.type === 'remove') {
|
|
226
|
+
applied = true;
|
|
227
|
+
yield overlay.node;
|
|
228
|
+
}
|
|
229
|
+
else if (overlay.type === 'edit') {
|
|
230
|
+
assert(editNewApplied);
|
|
231
|
+
editOldApplied = true;
|
|
232
|
+
applied = true;
|
|
233
|
+
yield overlay.oldNode;
|
|
234
|
+
}
|
|
235
|
+
}
|
|
236
|
+
assert(applied);
|
|
237
|
+
}
|
|
174
238
|
#processParentNode(parentNodeRow, parentNodeRelations, mode) {
|
|
175
239
|
let method = mode;
|
|
176
240
|
let storageUpdated = false;
|
|
@@ -192,12 +256,19 @@ export class Join {
|
|
|
192
256
|
this.#storage.set(makeStorageKey(this.#parentKey, this.#parent.getSchema().primaryKey, parentNodeRow), true);
|
|
193
257
|
}
|
|
194
258
|
}
|
|
195
|
-
|
|
259
|
+
const stream = this.#child[method]({
|
|
196
260
|
constraint: Object.fromEntries(this.#childKey.map((key, i) => [
|
|
197
261
|
key,
|
|
198
262
|
parentNodeRow[this.#parentKey[i]],
|
|
199
263
|
])),
|
|
200
264
|
});
|
|
265
|
+
if (this.#inprogressChildChange &&
|
|
266
|
+
this.#isJoinMatch(parentNodeRow, this.#inprogressChildChange.change.node.row) &&
|
|
267
|
+
this.#inprogressChildChange.position &&
|
|
268
|
+
this.#schema.compareRows(parentNodeRow, this.#inprogressChildChange.position) > 0) {
|
|
269
|
+
return this.#generateChildStreamWithOverlay(stream, this.#inprogressChildChange.change);
|
|
270
|
+
}
|
|
271
|
+
return stream;
|
|
201
272
|
};
|
|
202
273
|
return {
|
|
203
274
|
row: parentNodeRow,
|
|
@@ -207,6 +278,14 @@ export class Join {
|
|
|
207
278
|
},
|
|
208
279
|
};
|
|
209
280
|
}
|
|
281
|
+
#isJoinMatch(parent, child) {
|
|
282
|
+
for (let i = 0; i < this.#parentKey.length; i++) {
|
|
283
|
+
if (!valuesEqual(parent[this.#parentKey[i]], child[this.#childKey[i]])) {
|
|
284
|
+
return false;
|
|
285
|
+
}
|
|
286
|
+
}
|
|
287
|
+
return true;
|
|
288
|
+
}
|
|
210
289
|
}
|
|
211
290
|
/** Exported for testing. */
|
|
212
291
|
export function makeStorageKeyForValues(values) {
|
|
@@ -230,7 +309,7 @@ export function makeStorageKey(key, primaryKey, row) {
|
|
|
230
309
|
}
|
|
231
310
|
function rowEqualsForCompoundKey(a, b, key) {
|
|
232
311
|
for (let i = 0; i < key.length; i++) {
|
|
233
|
-
if (
|
|
312
|
+
if (compareValues(a[key[i]], b[key[i]]) !== 0) {
|
|
234
313
|
return false;
|
|
235
314
|
}
|
|
236
315
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"join.js","sourceRoot":"","sources":["../../../../../zql/src/ivm/join.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"join.js","sourceRoot":"","sources":["../../../../../zql/src/ivm/join.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,9 +3,10 @@ import type { Condition, Ordering } from '../../../zero-protocol/src/ast.ts';
|
|
|
3
3
|
import type { Row } from '../../../zero-protocol/src/data.ts';
|
|
4
4
|
import type { PrimaryKey } from '../../../zero-protocol/src/primary-key.ts';
|
|
5
5
|
import type { SchemaValue } from '../../../zero-schema/src/table-schema.ts';
|
|
6
|
+
import { type NoSubqueryCondition } from '../builder/filter.ts';
|
|
6
7
|
import { type Constraint } from './constraint.ts';
|
|
7
8
|
import { type Comparator, type Node } from './data.ts';
|
|
8
|
-
import { type Start } from './operator.ts';
|
|
9
|
+
import { type Input, type Output, type Start } from './operator.ts';
|
|
9
10
|
import type { Source, SourceChange, SourceInput } from './source.ts';
|
|
10
11
|
import type { Stream } from './stream.ts';
|
|
11
12
|
export type Overlay = {
|
|
@@ -16,6 +17,17 @@ export type Overlays = {
|
|
|
16
17
|
add: Row | undefined;
|
|
17
18
|
remove: Row | undefined;
|
|
18
19
|
};
|
|
20
|
+
export type Connection = {
|
|
21
|
+
input: Input;
|
|
22
|
+
output: Output | undefined;
|
|
23
|
+
sort: Ordering;
|
|
24
|
+
splitEditKeys: Set<string> | undefined;
|
|
25
|
+
compareRows: Comparator;
|
|
26
|
+
filters: {
|
|
27
|
+
condition: NoSubqueryCondition;
|
|
28
|
+
predicate: (row: Row) => boolean;
|
|
29
|
+
} | undefined;
|
|
30
|
+
};
|
|
19
31
|
/**
|
|
20
32
|
* A `MemorySource` is a source that provides data to the pipeline from an
|
|
21
33
|
* in-memory data source.
|
|
@@ -32,11 +44,12 @@ export declare class MemorySource implements Source {
|
|
|
32
44
|
primaryKey: readonly [string, ...string[]];
|
|
33
45
|
};
|
|
34
46
|
fork(): MemorySource;
|
|
35
|
-
connect(sort: Ordering, filters?: Condition | undefined): SourceInput;
|
|
47
|
+
connect(sort: Ordering, filters?: Condition | undefined, splitEditKeys?: Set<string> | undefined): SourceInput;
|
|
36
48
|
getIndexKeys(): string[];
|
|
37
49
|
push(change: SourceChange): void;
|
|
38
50
|
genPush(change: SourceChange): Generator<undefined, void, unknown>;
|
|
39
51
|
}
|
|
52
|
+
export declare function genPush(change: SourceChange, exists: (row: Row) => boolean, connections: Iterable<[number, Connection]>, setOverlay: (o: Overlay | undefined) => void, setSplitEditOverlay: (o: Overlay | undefined) => void): Generator<undefined, void, unknown>;
|
|
40
53
|
export declare function generateWithStart(nodes: Iterable<Node>, start: Start | undefined, compare: (r1: Row, r2: Row) => number): Stream<Node>;
|
|
41
54
|
/**
|
|
42
55
|
* Takes an iterator and overlay.
|
|
@@ -50,7 +63,7 @@ export declare function generateWithStart(nodes: Iterable<Node>, start: Start |
|
|
|
50
63
|
* @param overlay - the overlay values to splice in
|
|
51
64
|
* @param compare - the comparator to use to find the position for the overlay
|
|
52
65
|
*/
|
|
53
|
-
export declare function generateWithOverlay(startAt: Row | undefined, rows: Iterable<Row>, constraint: Constraint | undefined, overlay: Overlay | undefined, compare: Comparator, filterPredicate?: (row: Row) => boolean | undefined): Generator<{
|
|
66
|
+
export declare function generateWithOverlay(startAt: Row | undefined, rows: Iterable<Row>, constraint: Constraint | undefined, overlay: Overlay | undefined, splitEditOverlay: Overlay | undefined, connectionIndex: number, compare: Comparator, filterPredicate?: (row: Row) => boolean | undefined): Generator<{
|
|
54
67
|
row: Readonly<Record<string, import("../../../shared/src/json.ts").ReadonlyJSONValue | undefined>>;
|
|
55
68
|
relationships: {};
|
|
56
69
|
}, void, unknown>;
|
|
@@ -62,4 +75,5 @@ export declare function generateWithOverlayInner(rowIterator: Iterable<Row>, ove
|
|
|
62
75
|
row: Readonly<Record<string, import("../../../shared/src/json.ts").ReadonlyJSONValue | undefined>>;
|
|
63
76
|
relationships: {};
|
|
64
77
|
}, void, unknown>;
|
|
78
|
+
export declare function stringify(change: SourceChange): string;
|
|
65
79
|
//# sourceMappingURL=memory-source.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memory-source.d.ts","sourceRoot":"","sources":["../../../../../zql/src/ivm/memory-source.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,QAAQ,EAAC,MAAM,kCAAkC,CAAC;AAE1D,OAAO,KAAK,EACV,SAAS,EACT,QAAQ,EAET,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAC,GAAG,EAAQ,MAAM,oCAAoC,CAAC;AACnE,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,2CAA2C,CAAC;AAC1E,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,0CAA0C,CAAC;
|
|
1
|
+
{"version":3,"file":"memory-source.d.ts","sourceRoot":"","sources":["../../../../../zql/src/ivm/memory-source.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import { hasOwn } from "../../../shared/src/has-own.js";
|
|
|
4
4
|
import { assertOrderingIncludesPK } from "../builder/builder.js";
|
|
5
5
|
import { createPredicate, transformFilters, } from "../builder/filter.js";
|
|
6
6
|
import { constraintMatchesPrimaryKey, constraintMatchesRow, } from "./constraint.js";
|
|
7
|
-
import { compareValues, makeComparator, } from "./data.js";
|
|
7
|
+
import { compareValues, valuesEqual, makeComparator, } from "./data.js";
|
|
8
8
|
import { filterPush } from "./filter-push.js";
|
|
9
9
|
import {} from "./operator.js";
|
|
10
10
|
/**
|
|
@@ -22,6 +22,7 @@ export class MemorySource {
|
|
|
22
22
|
#indexes = new Map();
|
|
23
23
|
#connections = [];
|
|
24
24
|
#overlay;
|
|
25
|
+
#splitEditOverlay;
|
|
25
26
|
constructor(tableName, columns, primaryKey, primaryIndexData) {
|
|
26
27
|
this.#tableName = tableName;
|
|
27
28
|
this.#columns = columns;
|
|
@@ -59,7 +60,7 @@ export class MemorySource {
|
|
|
59
60
|
compareRows: connection.compareRows,
|
|
60
61
|
};
|
|
61
62
|
}
|
|
62
|
-
connect(sort, filters) {
|
|
63
|
+
connect(sort, filters, splitEditKeys) {
|
|
63
64
|
const transformedFilters = transformFilters(filters);
|
|
64
65
|
const input = {
|
|
65
66
|
getSchema: () => schema,
|
|
@@ -77,6 +78,7 @@ export class MemorySource {
|
|
|
77
78
|
input,
|
|
78
79
|
output: undefined,
|
|
79
80
|
sort,
|
|
81
|
+
splitEditKeys,
|
|
80
82
|
compareRows: makeComparator(sort),
|
|
81
83
|
filters: transformedFilters.filters
|
|
82
84
|
? {
|
|
@@ -143,10 +145,9 @@ export class MemorySource {
|
|
|
143
145
|
return [...this.#indexes.keys()];
|
|
144
146
|
}
|
|
145
147
|
*#fetch(req, from) {
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
const conn = this.#connections[callingConnectionNum];
|
|
148
|
+
const callingConnectionIndex = this.#connections.indexOf(from);
|
|
149
|
+
assert(callingConnectionIndex !== -1, 'Output not found');
|
|
150
|
+
const conn = this.#connections[callingConnectionIndex];
|
|
150
151
|
const { sort: requestedSort } = conn;
|
|
151
152
|
// If there is a constraint, we need an index sorted by it first.
|
|
152
153
|
const indexSort = [];
|
|
@@ -166,14 +167,6 @@ export class MemorySource {
|
|
|
166
167
|
const index = this.#getOrCreateIndex(indexSort, from);
|
|
167
168
|
const { data, comparator: compare } = index;
|
|
168
169
|
const comparator = (r1, r2) => compare(r1, r2) * (req.reverse ? -1 : 1);
|
|
169
|
-
// When we receive a push, we send it to each output one at a time. Once the
|
|
170
|
-
// push is sent to an output, it should keep being sent until all datastores
|
|
171
|
-
// have received it and the change has been made to the datastore.
|
|
172
|
-
if (this.#overlay) {
|
|
173
|
-
if (callingConnectionNum <= this.#overlay.outputIndex) {
|
|
174
|
-
overlay = this.#overlay;
|
|
175
|
-
}
|
|
176
|
-
}
|
|
177
170
|
const startAt = req.start?.row;
|
|
178
171
|
// If there is a constraint, we want to start our scan at the first row that
|
|
179
172
|
// matches the constraint. But because the next OrderPart can be `desc`,
|
|
@@ -205,7 +198,7 @@ export class MemorySource {
|
|
|
205
198
|
else {
|
|
206
199
|
scanStart = startAt;
|
|
207
200
|
}
|
|
208
|
-
const withOverlay = generateWithOverlay(startAt, generateRows(data, scanStart, req.reverse), req.constraint, overlay, comparator, conn.filters?.predicate);
|
|
201
|
+
const withOverlay = generateWithOverlay(startAt, generateRows(data, scanStart, req.reverse), req.constraint, this.#overlay, this.#splitEditOverlay, callingConnectionIndex, comparator, conn.filters?.predicate);
|
|
209
202
|
const withConstraint = generateWithConstraint(generateWithStart(withOverlay, req.start, comparator), req.constraint);
|
|
210
203
|
yield* conn.filters
|
|
211
204
|
? generateWithFilter(withConstraint, conn.filters.predicate)
|
|
@@ -222,46 +215,12 @@ export class MemorySource {
|
|
|
222
215
|
*genPush(change) {
|
|
223
216
|
const primaryIndex = this.#getPrimaryIndex();
|
|
224
217
|
const { data } = primaryIndex;
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
assert(data.has(change.row), () => `Row not found ${JSON.stringify(change)}`);
|
|
231
|
-
break;
|
|
232
|
-
case 'edit':
|
|
233
|
-
assert(data.has(change.oldRow), () => `Row not found ${JSON.stringify(change)}`);
|
|
234
|
-
break;
|
|
235
|
-
default:
|
|
236
|
-
unreachable(change);
|
|
237
|
-
}
|
|
238
|
-
const outputChange = change.type === 'edit'
|
|
239
|
-
? {
|
|
240
|
-
type: change.type,
|
|
241
|
-
oldNode: {
|
|
242
|
-
row: change.oldRow,
|
|
243
|
-
relationships: {},
|
|
244
|
-
},
|
|
245
|
-
node: {
|
|
246
|
-
row: change.row,
|
|
247
|
-
relationships: {},
|
|
248
|
-
},
|
|
249
|
-
}
|
|
250
|
-
: {
|
|
251
|
-
type: change.type,
|
|
252
|
-
node: {
|
|
253
|
-
row: change.row,
|
|
254
|
-
relationships: {},
|
|
255
|
-
},
|
|
256
|
-
};
|
|
257
|
-
for (const [outputIndex, { output, filters },] of this.#connections.entries()) {
|
|
258
|
-
if (output) {
|
|
259
|
-
this.#overlay = { outputIndex, change };
|
|
260
|
-
filterPush(outputChange, output, filters?.predicate);
|
|
261
|
-
yield;
|
|
262
|
-
}
|
|
218
|
+
const exists = (row) => data.has(row);
|
|
219
|
+
const setOverlay = (o) => (this.#overlay = o);
|
|
220
|
+
const setSplitEditOverlay = (o) => (this.#splitEditOverlay = o);
|
|
221
|
+
for (const x of genPush(change, exists, this.#connections.entries(), setOverlay, setSplitEditOverlay)) {
|
|
222
|
+
yield x;
|
|
263
223
|
}
|
|
264
|
-
this.#overlay = undefined;
|
|
265
224
|
for (const { data } of this.#indexes.values()) {
|
|
266
225
|
switch (change.type) {
|
|
267
226
|
case 'add': {
|
|
@@ -308,6 +267,89 @@ function* generateWithFilter(it, filter) {
|
|
|
308
267
|
}
|
|
309
268
|
}
|
|
310
269
|
}
|
|
270
|
+
export function* genPush(change, exists, connections, setOverlay, setSplitEditOverlay) {
|
|
271
|
+
switch (change.type) {
|
|
272
|
+
case 'add':
|
|
273
|
+
assert(!exists(change.row), () => `Row already exists ${stringify(change)}`);
|
|
274
|
+
break;
|
|
275
|
+
case 'remove':
|
|
276
|
+
assert(exists(change.row), () => `Row not found ${stringify(change)}`);
|
|
277
|
+
break;
|
|
278
|
+
case 'edit':
|
|
279
|
+
assert(exists(change.oldRow), () => `Row not found ${stringify(change)}`);
|
|
280
|
+
break;
|
|
281
|
+
default:
|
|
282
|
+
unreachable(change);
|
|
283
|
+
}
|
|
284
|
+
for (const [outputIndex, { output, splitEditKeys, filters }] of connections) {
|
|
285
|
+
if (output) {
|
|
286
|
+
let splitEdit = false;
|
|
287
|
+
if (change.type === 'edit' && splitEditKeys) {
|
|
288
|
+
for (const key of splitEditKeys) {
|
|
289
|
+
if (!valuesEqual(change.row[key], change.oldRow[key])) {
|
|
290
|
+
splitEdit = true;
|
|
291
|
+
break;
|
|
292
|
+
}
|
|
293
|
+
}
|
|
294
|
+
}
|
|
295
|
+
if (splitEdit) {
|
|
296
|
+
assert(change.type === 'edit');
|
|
297
|
+
setSplitEditOverlay({
|
|
298
|
+
outputIndex,
|
|
299
|
+
change: {
|
|
300
|
+
type: 'remove',
|
|
301
|
+
row: change.oldRow,
|
|
302
|
+
},
|
|
303
|
+
});
|
|
304
|
+
const outputRemove = {
|
|
305
|
+
type: 'remove',
|
|
306
|
+
node: {
|
|
307
|
+
row: change.oldRow,
|
|
308
|
+
relationships: {},
|
|
309
|
+
},
|
|
310
|
+
};
|
|
311
|
+
filterPush(outputRemove, output, filters?.predicate);
|
|
312
|
+
yield;
|
|
313
|
+
setSplitEditOverlay(undefined);
|
|
314
|
+
setOverlay({ outputIndex, change });
|
|
315
|
+
const outputAdd = {
|
|
316
|
+
type: 'add',
|
|
317
|
+
node: {
|
|
318
|
+
row: change.row,
|
|
319
|
+
relationships: {},
|
|
320
|
+
},
|
|
321
|
+
};
|
|
322
|
+
filterPush(outputAdd, output, filters?.predicate);
|
|
323
|
+
yield;
|
|
324
|
+
}
|
|
325
|
+
else {
|
|
326
|
+
setOverlay({ outputIndex, change });
|
|
327
|
+
const outputChange = change.type === 'edit'
|
|
328
|
+
? {
|
|
329
|
+
type: change.type,
|
|
330
|
+
oldNode: {
|
|
331
|
+
row: change.oldRow,
|
|
332
|
+
relationships: {},
|
|
333
|
+
},
|
|
334
|
+
node: {
|
|
335
|
+
row: change.row,
|
|
336
|
+
relationships: {},
|
|
337
|
+
},
|
|
338
|
+
}
|
|
339
|
+
: {
|
|
340
|
+
type: change.type,
|
|
341
|
+
node: {
|
|
342
|
+
row: change.row,
|
|
343
|
+
relationships: {},
|
|
344
|
+
},
|
|
345
|
+
};
|
|
346
|
+
filterPush(outputChange, output, filters?.predicate);
|
|
347
|
+
yield;
|
|
348
|
+
}
|
|
349
|
+
}
|
|
350
|
+
}
|
|
351
|
+
setOverlay(undefined);
|
|
352
|
+
}
|
|
311
353
|
export function* generateWithStart(nodes, start, compare) {
|
|
312
354
|
if (!start) {
|
|
313
355
|
yield* nodes;
|
|
@@ -344,8 +386,15 @@ export function* generateWithStart(nodes, start, compare) {
|
|
|
344
386
|
* @param overlay - the overlay values to splice in
|
|
345
387
|
* @param compare - the comparator to use to find the position for the overlay
|
|
346
388
|
*/
|
|
347
|
-
export function* generateWithOverlay(startAt, rows, constraint, overlay, compare, filterPredicate) {
|
|
348
|
-
|
|
389
|
+
export function* generateWithOverlay(startAt, rows, constraint, overlay, splitEditOverlay, connectionIndex, compare, filterPredicate) {
|
|
390
|
+
let overlayToApply = undefined;
|
|
391
|
+
if (splitEditOverlay && splitEditOverlay.outputIndex === connectionIndex) {
|
|
392
|
+
overlayToApply = splitEditOverlay;
|
|
393
|
+
}
|
|
394
|
+
else if (overlay && connectionIndex <= overlay.outputIndex) {
|
|
395
|
+
overlayToApply = overlay;
|
|
396
|
+
}
|
|
397
|
+
const overlays = computeOverlays(startAt, constraint, overlayToApply, compare, filterPredicate);
|
|
349
398
|
yield* generateWithOverlayInner(rows, overlays, compare);
|
|
350
399
|
}
|
|
351
400
|
function computeOverlays(startAt, constraint, overlay, compare, filterPredicate) {
|
|
@@ -469,4 +518,7 @@ function compareBounds(a, b) {
|
|
|
469
518
|
function* generateRows(data, scanStart, reverse) {
|
|
470
519
|
yield* data[reverse ? 'valuesFromReversed' : 'valuesFrom'](scanStart);
|
|
471
520
|
}
|
|
521
|
+
export function stringify(change) {
|
|
522
|
+
return JSON.stringify(change, (_, v) => typeof v === 'bigint' ? v.toString() : v);
|
|
523
|
+
}
|
|
472
524
|
//# sourceMappingURL=memory-source.js.map
|