@oneuptime/common 11.6.0 → 11.6.1

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.
Files changed (38) hide show
  1. package/Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel.ts +41 -24
  2. package/Models/AnalyticsModels/MetricBaselineHourly.ts +2 -0
  3. package/Models/AnalyticsModels/MetricItemAggMV1m.ts +5 -2
  4. package/Models/AnalyticsModels/MetricItemAggMV1mByContainer.ts +5 -2
  5. package/Models/AnalyticsModels/MetricItemAggMV1mByHostV2.ts +5 -2
  6. package/Models/AnalyticsModels/MetricItemAggMV1mByK8sCluster.ts +5 -2
  7. package/Models/AnalyticsModels/MetricItemAggMV1mByService.ts +5 -2
  8. package/Server/Services/AnalyticsDatabaseService.ts +13 -1
  9. package/Server/Utils/AnalyticsDatabase/StatementGenerator.ts +41 -4
  10. package/Tests/Models/AnalyticsModels/AnalyticsBaseModel.test.ts +122 -0
  11. package/Tests/Server/Utils/AnalyticsDatabase/ClusterAwareSchema.test.ts +164 -3
  12. package/Tests/Server/Utils/AnalyticsDatabase/StatementGenerator.test.ts +99 -0
  13. package/Tests/Types/HashCode.test.ts +41 -0
  14. package/Tests/Types/Log/LogQueryParser.test.ts +186 -0
  15. package/Tests/Utils/Dashboard/VariableInterpolation.test.ts +197 -0
  16. package/Tests/Utils/ValueFormatter.test.ts +305 -0
  17. package/Types/AnalyticsDatabase/TableColumn.ts +23 -0
  18. package/build/dist/Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel.js +25 -20
  19. package/build/dist/Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel.js.map +1 -1
  20. package/build/dist/Models/AnalyticsModels/MetricBaselineHourly.js +2 -0
  21. package/build/dist/Models/AnalyticsModels/MetricBaselineHourly.js.map +1 -1
  22. package/build/dist/Models/AnalyticsModels/MetricItemAggMV1m.js +5 -2
  23. package/build/dist/Models/AnalyticsModels/MetricItemAggMV1m.js.map +1 -1
  24. package/build/dist/Models/AnalyticsModels/MetricItemAggMV1mByContainer.js +5 -2
  25. package/build/dist/Models/AnalyticsModels/MetricItemAggMV1mByContainer.js.map +1 -1
  26. package/build/dist/Models/AnalyticsModels/MetricItemAggMV1mByHostV2.js +5 -2
  27. package/build/dist/Models/AnalyticsModels/MetricItemAggMV1mByHostV2.js.map +1 -1
  28. package/build/dist/Models/AnalyticsModels/MetricItemAggMV1mByK8sCluster.js +5 -2
  29. package/build/dist/Models/AnalyticsModels/MetricItemAggMV1mByK8sCluster.js.map +1 -1
  30. package/build/dist/Models/AnalyticsModels/MetricItemAggMV1mByService.js +5 -2
  31. package/build/dist/Models/AnalyticsModels/MetricItemAggMV1mByService.js.map +1 -1
  32. package/build/dist/Server/Services/AnalyticsDatabaseService.js +9 -1
  33. package/build/dist/Server/Services/AnalyticsDatabaseService.js.map +1 -1
  34. package/build/dist/Server/Utils/AnalyticsDatabase/StatementGenerator.js +29 -4
  35. package/build/dist/Server/Utils/AnalyticsDatabase/StatementGenerator.js.map +1 -1
  36. package/build/dist/Types/AnalyticsDatabase/TableColumn.js +7 -0
  37. package/build/dist/Types/AnalyticsDatabase/TableColumn.js.map +1 -1
  38. package/package.json +1 -1
@@ -0,0 +1,305 @@
1
+ import ValueFormatter from "../../Utils/ValueFormatter";
2
+
3
+ describe("ValueFormatter", () => {
4
+ describe("formatValue - bytes", () => {
5
+ test("scales bytes up to the right unit", () => {
6
+ expect(ValueFormatter.formatValue(1048576, "bytes")).toBe("1.05 MB");
7
+ expect(ValueFormatter.formatValue(1e6, "bytes")).toBe("1 MB");
8
+ expect(ValueFormatter.formatValue(1e9, "bytes")).toBe("1 GB");
9
+ expect(ValueFormatter.formatValue(1e12, "bytes")).toBe("1 TB");
10
+ expect(ValueFormatter.formatValue(1e15, "bytes")).toBe("1 PB");
11
+ });
12
+
13
+ test("keeps small byte values in B", () => {
14
+ expect(ValueFormatter.formatValue(512, "bytes")).toBe("512 B");
15
+ expect(ValueFormatter.formatValue(1, "bytes")).toBe("1 B");
16
+ });
17
+
18
+ test("recognizes UCUM byte aliases", () => {
19
+ expect(ValueFormatter.formatValue(2000, "By")).toBe("2 KB");
20
+ expect(ValueFormatter.formatValue(2000, "b")).toBe("2 KB");
21
+ expect(ValueFormatter.formatValue(2000, "byte")).toBe("2 KB");
22
+ });
23
+
24
+ test("renders 0 bytes with the natural byte unit", () => {
25
+ expect(ValueFormatter.formatValue(0, "bytes")).toBe("0 B");
26
+ });
27
+
28
+ test("handles negative byte values", () => {
29
+ expect(ValueFormatter.formatValue(-2000, "bytes")).toBe("-2 KB");
30
+ });
31
+ });
32
+
33
+ describe("formatValue - seconds", () => {
34
+ test("scales seconds into larger units", () => {
35
+ expect(ValueFormatter.formatValue(60, "seconds")).toBe("1 min");
36
+ expect(ValueFormatter.formatValue(3600, "seconds")).toBe("1 hours");
37
+ expect(ValueFormatter.formatValue(86400, "seconds")).toBe("1 days");
38
+ });
39
+
40
+ test("scales sub-second values down", () => {
41
+ expect(ValueFormatter.formatValue(0.5, "seconds")).toBe("500 ms");
42
+ expect(ValueFormatter.formatValue(0.0005, "seconds")).toBe("500 µs");
43
+ });
44
+
45
+ test("renders 0 seconds with the natural second unit, not ns", () => {
46
+ expect(ValueFormatter.formatValue(0, "seconds")).toBe("0 sec");
47
+ });
48
+
49
+ test("recognizes second aliases", () => {
50
+ expect(ValueFormatter.formatValue(120, "s")).toBe("2 min");
51
+ expect(ValueFormatter.formatValue(120, "sec")).toBe("2 min");
52
+ });
53
+ });
54
+
55
+ describe("formatValue - milliseconds", () => {
56
+ test("scales milliseconds into seconds and beyond", () => {
57
+ expect(ValueFormatter.formatValue(1000, "ms")).toBe("1 sec");
58
+ expect(ValueFormatter.formatValue(60000, "ms")).toBe("1 min");
59
+ });
60
+
61
+ test("keeps small ms values", () => {
62
+ expect(ValueFormatter.formatValue(5, "ms")).toBe("5 ms");
63
+ });
64
+
65
+ test("renders 0 ms with the natural ms unit", () => {
66
+ expect(ValueFormatter.formatValue(0, "ms")).toBe("0 ms");
67
+ });
68
+ });
69
+
70
+ describe("formatValue - percent", () => {
71
+ test("renders percent inline with two decimals", () => {
72
+ expect(ValueFormatter.formatValue(42, "%")).toBe("42.00%");
73
+ expect(ValueFormatter.formatValue(100, "%")).toBe("100.00%");
74
+ expect(ValueFormatter.formatValue(2.04, "%")).toBe("2.04%");
75
+ });
76
+
77
+ test("treats spelled-out percent variants the same", () => {
78
+ expect(ValueFormatter.formatValue(50, "percent")).toBe("50.00%");
79
+ expect(ValueFormatter.formatValue(50, "percentage")).toBe("50.00%");
80
+ expect(ValueFormatter.formatValue(50, "pct")).toBe("50.00%");
81
+ });
82
+
83
+ test("non-finite percent falls back to 0.00", () => {
84
+ expect(ValueFormatter.formatValue(Infinity, "%")).toBe("0.00%");
85
+ expect(ValueFormatter.formatValue(NaN, "%")).toBe("0.00%");
86
+ });
87
+ });
88
+
89
+ describe("formatValue - dimensionless and fraction metrics", () => {
90
+ test("dimensionless unit '1' renders a bare number", () => {
91
+ expect(ValueFormatter.formatValue(1234, "1")).toBe("1.23K");
92
+ expect(ValueFormatter.formatValue(5, "1")).toBe("5");
93
+ });
94
+
95
+ test("empty unit renders a bare number", () => {
96
+ expect(ValueFormatter.formatValue(5, "")).toBe("5");
97
+ });
98
+
99
+ test("fraction metric with unit '1' renders as a percentage", () => {
100
+ expect(
101
+ ValueFormatter.formatValue(0.25, "1", {
102
+ metricName: "system.cpu.utilization",
103
+ }),
104
+ ).toBe("25.00%");
105
+ expect(
106
+ ValueFormatter.formatValue(0.5, "1", {
107
+ metricName: "db.client.connection.usage_ratio",
108
+ }),
109
+ ).toBe("50.00%");
110
+ });
111
+
112
+ test("non-fraction metric with unit '1' stays a bare number", () => {
113
+ expect(
114
+ ValueFormatter.formatValue(0.25, "1", {
115
+ metricName: "http.server.request.count",
116
+ }),
117
+ ).toBe("0.25");
118
+ });
119
+ });
120
+
121
+ describe("formatValue - annotation-only units", () => {
122
+ test("renders bare number for UCUM annotation units", () => {
123
+ expect(ValueFormatter.formatValue(42, "{thread}")).toBe("42");
124
+ expect(ValueFormatter.formatValue(1500, "{packets}")).toBe("1.5K");
125
+ });
126
+ });
127
+
128
+ describe("formatValue - compound rate units", () => {
129
+ test("scales the numerator and keeps a compact denominator", () => {
130
+ expect(ValueFormatter.formatValue(1500000, "By/s")).toBe("1.5 MB/s");
131
+ expect(ValueFormatter.formatValue(2000, "bytes/s")).toBe("2 KB/s");
132
+ });
133
+
134
+ test("falls back to readable form for unknown numerator", () => {
135
+ expect(ValueFormatter.formatValue(5, "requests/s")).toBe(
136
+ "5 requests per Second",
137
+ );
138
+ });
139
+ });
140
+
141
+ describe("formatValue - unknown units", () => {
142
+ test("formats number and appends a readable unit name", () => {
143
+ expect(ValueFormatter.formatValue(10, "hz")).toBe("10 Hertz");
144
+ expect(ValueFormatter.formatValue(5, "v")).toBe("5 Volts");
145
+ });
146
+
147
+ test("keeps the original unit when unrecognized", () => {
148
+ expect(ValueFormatter.formatValue(5, "widgets")).toBe("5 widgets");
149
+ });
150
+ });
151
+
152
+ describe("formatValue - large number abbreviation", () => {
153
+ test("abbreviates thousands, millions, billions", () => {
154
+ expect(ValueFormatter.formatValue(5000, "widgets")).toBe("5K widgets");
155
+ expect(ValueFormatter.formatValue(1500000, "widgets")).toBe(
156
+ "1.5M widgets",
157
+ );
158
+ expect(ValueFormatter.formatValue(2000000000, "widgets")).toBe(
159
+ "2B widgets",
160
+ );
161
+ });
162
+
163
+ test("trims trailing zeros but keeps distinguishing decimals", () => {
164
+ expect(ValueFormatter.formatValue(119250000000, "widgets")).toBe(
165
+ "119.25B widgets",
166
+ );
167
+ });
168
+ });
169
+
170
+ describe("formatValue - small number precision", () => {
171
+ test("keeps two significant digits below 1", () => {
172
+ expect(ValueFormatter.formatValue(0.004, "widgets")).toBe(
173
+ "0.004 widgets",
174
+ );
175
+ expect(ValueFormatter.formatValue(0.006, "widgets")).toBe(
176
+ "0.006 widgets",
177
+ );
178
+ });
179
+
180
+ test("expands very small numbers out of exponential notation", () => {
181
+ const result: string = ValueFormatter.formatValue(0.00000012, "widgets");
182
+ // Should not fall back to exponential notation like "1.2e-7".
183
+ expect(result).not.toMatch(/e[+-]/i);
184
+ expect(result).toContain("0.00000012");
185
+ });
186
+ });
187
+
188
+ describe("isPercentUnit", () => {
189
+ test("returns true for percent variants", () => {
190
+ expect(ValueFormatter.isPercentUnit("%")).toBe(true);
191
+ expect(ValueFormatter.isPercentUnit("percent")).toBe(true);
192
+ expect(ValueFormatter.isPercentUnit("PERCENTAGE")).toBe(true);
193
+ expect(ValueFormatter.isPercentUnit(" pct ")).toBe(true);
194
+ });
195
+
196
+ test("returns false otherwise", () => {
197
+ expect(ValueFormatter.isPercentUnit("bytes")).toBe(false);
198
+ expect(ValueFormatter.isPercentUnit(undefined)).toBe(false);
199
+ expect(ValueFormatter.isPercentUnit("")).toBe(false);
200
+ });
201
+ });
202
+
203
+ describe("isFractionMetric", () => {
204
+ test("matches utilization/ratio/fraction/percent suffixes", () => {
205
+ expect(ValueFormatter.isFractionMetric("system.cpu.utilization")).toBe(
206
+ true,
207
+ );
208
+ expect(ValueFormatter.isFractionMetric("some_ratio")).toBe(true);
209
+ expect(ValueFormatter.isFractionMetric("mem.fraction")).toBe(true);
210
+ expect(ValueFormatter.isFractionMetric("disk_percentage")).toBe(true);
211
+ });
212
+
213
+ test("does not match unrelated names", () => {
214
+ expect(ValueFormatter.isFractionMetric("request.count")).toBe(false);
215
+ expect(ValueFormatter.isFractionMetric(undefined)).toBe(false);
216
+ expect(ValueFormatter.isFractionMetric("")).toBe(false);
217
+ });
218
+ });
219
+
220
+ describe("isHigherWorseMetric", () => {
221
+ test("returns false for higher-is-better metrics", () => {
222
+ expect(
223
+ ValueFormatter.isHigherWorseMetric("oneuptime.monitor.online"),
224
+ ).toBe(false);
225
+ expect(ValueFormatter.isHigherWorseMetric("service.uptime")).toBe(false);
226
+ expect(ValueFormatter.isHigherWorseMetric("availability_percent")).toBe(
227
+ false,
228
+ );
229
+ });
230
+
231
+ test("returns true for higher-is-worse metrics", () => {
232
+ expect(ValueFormatter.isHigherWorseMetric("http.error.count")).toBe(true);
233
+ expect(ValueFormatter.isHigherWorseMetric("incident.count")).toBe(true);
234
+ expect(ValueFormatter.isHigherWorseMetric("request.latency")).toBe(true);
235
+ expect(ValueFormatter.isHigherWorseMetric("cpu.utilization")).toBe(true);
236
+ expect(ValueFormatter.isHigherWorseMetric("pod.restart")).toBe(true);
237
+ });
238
+
239
+ test("returns false for neutral counters and undefined", () => {
240
+ expect(ValueFormatter.isHigherWorseMetric("network.bytes")).toBe(false);
241
+ expect(ValueFormatter.isHigherWorseMetric(undefined)).toBe(false);
242
+ });
243
+
244
+ test("higher-is-better token wins over higher-is-worse token", () => {
245
+ // Contains both "uptime" (better) and would otherwise be neutral.
246
+ expect(ValueFormatter.isHigherWorseMetric("system.uptime.seconds")).toBe(
247
+ false,
248
+ );
249
+ });
250
+ });
251
+
252
+ describe("isScalableUnit", () => {
253
+ test("true for known scalable units", () => {
254
+ expect(ValueFormatter.isScalableUnit("bytes")).toBe(true);
255
+ expect(ValueFormatter.isScalableUnit("ms")).toBe(true);
256
+ expect(ValueFormatter.isScalableUnit("By")).toBe(true);
257
+ });
258
+
259
+ test("false for empty or unknown units", () => {
260
+ expect(ValueFormatter.isScalableUnit("")).toBe(false);
261
+ expect(ValueFormatter.isScalableUnit(" ")).toBe(false);
262
+ expect(ValueFormatter.isScalableUnit("%")).toBe(false);
263
+ expect(ValueFormatter.isScalableUnit("widgets")).toBe(false);
264
+ });
265
+ });
266
+
267
+ describe("getReadableUnit", () => {
268
+ test("maps UCUM codes to readable names", () => {
269
+ expect(ValueFormatter.getReadableUnit("By")).toBe("Bytes");
270
+ expect(ValueFormatter.getReadableUnit("s")).toBe("Seconds");
271
+ expect(ValueFormatter.getReadableUnit("ms")).toBe("Milliseconds");
272
+ });
273
+
274
+ test("dimensionless returns empty string", () => {
275
+ expect(ValueFormatter.getReadableUnit("1")).toBe("");
276
+ expect(ValueFormatter.getReadableUnit("")).toBe("");
277
+ });
278
+
279
+ test("fraction metric with '1' returns Percent", () => {
280
+ expect(
281
+ ValueFormatter.getReadableUnit("1", {
282
+ metricName: "cpu.utilization",
283
+ }),
284
+ ).toBe("Percent");
285
+ });
286
+
287
+ test("percent variants return Percent", () => {
288
+ expect(ValueFormatter.getReadableUnit("%")).toBe("Percent");
289
+ expect(ValueFormatter.getReadableUnit("pct")).toBe("Percent");
290
+ });
291
+
292
+ test("annotation-only unit is capitalized", () => {
293
+ expect(ValueFormatter.getReadableUnit("{thread}")).toBe("Thread");
294
+ expect(ValueFormatter.getReadableUnit("{packets}")).toBe("Packets");
295
+ });
296
+
297
+ test("compound rate unit reads as 'X per Y' with singular denominator", () => {
298
+ expect(ValueFormatter.getReadableUnit("By/s")).toBe("Bytes per Second");
299
+ });
300
+
301
+ test("unknown unit is returned unchanged", () => {
302
+ expect(ValueFormatter.getReadableUnit("widgets")).toBe("widgets");
303
+ });
304
+ });
305
+ });
@@ -213,6 +213,27 @@ export default class AnalyticsTableColumn {
213
213
  this._aggregateFunctionDefinition = v;
214
214
  }
215
215
 
216
+ /*
217
+ * Optional ClickHouse SimpleAggregateFunction wrapper for scalar columns.
218
+ *
219
+ * Unlike AggregateFunction, a SimpleAggregateFunction keeps the scalar's
220
+ * ordinary wire/query type (for example DateTime) while teaching
221
+ * AggregatingMergeTree how to combine values during background merges.
222
+ * `max` on a DateTime retention column is the canonical use: reads and TTLs
223
+ * still see a DateTime, but rows sharing the sort key retain the latest
224
+ * expiry instead of an arbitrary one.
225
+ *
226
+ * The underlying type comes from `type`; this field contains only the
227
+ * function name, e.g. "max".
228
+ */
229
+ private _simpleAggregateFunction: string | undefined;
230
+ public get simpleAggregateFunction(): string | undefined {
231
+ return this._simpleAggregateFunction;
232
+ }
233
+ public set simpleAggregateFunction(v: string | undefined) {
234
+ this._simpleAggregateFunction = v;
235
+ }
236
+
216
237
  public constructor(data: {
217
238
  key: string;
218
239
  title: string;
@@ -232,6 +253,7 @@ export default class AnalyticsTableColumn {
232
253
  isLowCardinality?: boolean | undefined;
233
254
  mapKeysColumn?: string | undefined;
234
255
  aggregateFunctionDefinition?: string | undefined;
256
+ simpleAggregateFunction?: string | undefined;
235
257
  }) {
236
258
  this.accessControl = data.accessControl;
237
259
  this.key = data.key;
@@ -250,5 +272,6 @@ export default class AnalyticsTableColumn {
250
272
  this.isLowCardinality = data.isLowCardinality || false;
251
273
  this.mapKeysColumn = data.mapKeysColumn;
252
274
  this.aggregateFunctionDefinition = data.aggregateFunctionDefinition;
275
+ this.simpleAggregateFunction = data.simpleAggregateFunction;
253
276
  }
254
277
  }
@@ -41,26 +41,31 @@ export default class AnalyticsBaseModel extends CommonModel {
41
41
  if (data.tableEngine) {
42
42
  this.tableEngine = data.tableEngine;
43
43
  }
44
- columns.push(new AnalyticsTableColumn({
45
- key: "_id",
46
- title: "ID",
47
- description: "ID of this object",
48
- required: true,
49
- type: TableColumnType.ObjectID,
50
- /*
51
- * Ids are UUIDv7 (time-ordered — see ObjectID.generateTimeOrdered),
52
- * so consecutive rows share their 48-bit timestamp prefix and ZSTD
53
- * compresses them well; random v4 ids were incompressible.
54
- */
55
- codec: { codec: "ZSTD", level: 1 },
56
- }));
57
- columns.push(new AnalyticsTableColumn({
58
- key: "createdAt",
59
- title: "Created",
60
- description: "Date and Time when the object was created.",
61
- required: true,
62
- type: TableColumnType.Date,
63
- }));
44
+ if (data.includeBaseColumns !== false) {
45
+ columns.push(new AnalyticsTableColumn({
46
+ key: "_id",
47
+ title: "ID",
48
+ description: "ID of this object",
49
+ required: true,
50
+ type: TableColumnType.ObjectID,
51
+ /*
52
+ * Ids are UUIDv7 (time-ordered see ObjectID.generateTimeOrdered),
53
+ * so consecutive rows share their 48-bit timestamp prefix and ZSTD
54
+ * compresses them well; random v4 ids were incompressible.
55
+ */
56
+ codec: { codec: "ZSTD", level: 1 },
57
+ }));
58
+ columns.push(new AnalyticsTableColumn({
59
+ key: "createdAt",
60
+ title: "Created",
61
+ description: "Date and Time when the object was created.",
62
+ required: true,
63
+ type: TableColumnType.Date,
64
+ }));
65
+ }
66
+ if (data.includeBaseColumns === false && !data.defaultSortColumn) {
67
+ throw new BadDataException("defaultSortColumn is required when includeBaseColumns is false because createdAt is not part of the table schema");
68
+ }
64
69
  if (!data.primaryKeys || data.primaryKeys.length === 0) {
65
70
  throw new BadDataException("Primary keys are required");
66
71
  }
@@ -1 +1 @@
1
- {"version":3,"file":"AnalyticsBaseModel.js","sourceRoot":"","sources":["../../../../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel.ts"],"names":[],"mappings":"AAEA,OAAO,oBAAoB,MAAM,uDAAuD,CAAC;AACzF,OAAO,oBAAoB,MAAM,8CAA8C,CAAC;AAChF,OAAO,eAAe,MAAM,kDAAkD,CAAC;AAS/E,OAAO,eAAe,MAAM,6CAA6C,CAAC;AAI1E,OAAO,gBAAgB,MAAM,2CAA2C,CAAC;AAMzE,OAAO,IAAI,MAAM,qBAAqB,CAAC;AACvC,OAAO,WAAW,MAAM,eAAe,CAAC;AAIxC,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,WAAW;IACzD,YAAmB,IA4DlB;QACC,KAAK,CAAC;YACJ,YAAY,EAAE,IAAI,CAAC,YAAY;SAChC,CAAC,CAAC;QA+IG,iBAAY,GAAyB,oBAAoB,CAAC,SAAS,CAAC;QAgBpE,iBAAY,GAAkB,EAAE,CAAC;QAQjC,kBAAa,GAAW,EAAE,CAAC;QAQ3B,iBAAY,GAAuB,SAAS,CAAC;QAQ7C,mBAAc,GAAuB,SAAS,CAAC;QAQ/C,cAAS,GAAkB,EAAE,CAAC;QAQtC;;;;;;;WAOG;QACK,uBAAkB,GAAW,WAAW,CAAC;QAQzC,kBAAa,GAAW,EAAE,CAAC;QAQ3B,gBAAW,GAAW,EAAE,CAAC;QAoBzB,uCAAkC,GAAY,KAAK,CAAC;QAQpD,eAAU,GAAW,EAAE,CAAC;QAgBxB,yBAAoB,GAAY,KAAK,CAAC;QAQtC,sBAAiB,GAAW,EAAE,CAAC;QAQ/B,0BAAqB,GAAY,KAAK,CAAC;QAQvC,iBAAY,GAAsB,EAAE,CAAC;QAQrC,uBAAkB,GAA4B,EAAE,CAAC;QAQjD,eAAU,GAAY,KAAK,CAAC;QAQ5B,mBAAc,GAAW,EAAE,CAAC;QAzTlC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QAEhC,MAAM,OAAO,GAAgC,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC;QAEpE,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACrB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACtC,CAAC;QAED,OAAO,CAAC,IAAI,CACV,IAAI,oBAAoB,CAAC;YACvB,GAAG,EAAE,KAAK;YACV,KAAK,EAAE,IAAI;YACX,WAAW,EAAE,mBAAmB;YAChC,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,eAAe,CAAC,QAAQ;YAC9B;;;;eAIG;YACH,KAAK,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE;SACnC,CAAC,CACH,CAAC;QAEF,OAAO,CAAC,IAAI,CACV,IAAI,oBAAoB,CAAC;YACvB,GAAG,EAAE,WAAW;YAChB,KAAK,EAAE,SAAS;YAChB,WAAW,EAAE,4CAA4C;YACzD,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,eAAe,CAAC,IAAI;SAC3B,CAAC,CACH,CAAC;QAEF,IAAI,CAAC,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvD,MAAM,IAAI,gBAAgB,CAAC,2BAA2B,CAAC,CAAC;QAC1D,CAAC;QAED,mDAAmD;QAEnD,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,UAAkB,EAAE,EAAE;YAC9C,MAAM,MAAM,GAAqC,OAAO,CAAC,IAAI,CAC3D,CAAC,MAA4B,EAAE,EAAE;gBAC/B,OAAO,MAAM,CAAC,GAAG,KAAK,UAAU,CAAC;YACnC,CAAC,CACF,CAAC;YAEF,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,MAAM,IAAI,gBAAgB,CACxB,cAAc,GAAG,UAAU,GAAG,8BAA8B,CAC7D,CAAC;YACJ,CAAC;YAED,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;gBACrB,MAAM,IAAI,gBAAgB,CACxB,cAAc;oBACZ,UAAU;oBACV,kDAAkD,CACrD,CAAC;YACJ,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,gDAAgD;QAEhD,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAe,EAAE,EAAE;YACxC,MAAM,MAAM,GAAqC,OAAO,CAAC,IAAI,CAC3D,CAAC,MAA4B,EAAE,EAAE;gBAC/B,OAAO,MAAM,CAAC,GAAG,KAAK,OAAO,CAAC;YAChC,CAAC,CACF,CAAC;YAEF,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,MAAM,IAAI,gBAAgB,CACxB,WAAW,GAAG,OAAO,GAAG,8BAA8B,CACvD,CAAC;YACJ,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACpC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC9B,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC;QAC5B,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;QACtC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QAClC,IAAI,CAAC,yBAAyB,GAAG,IAAI,CAAC,yBAAyB,CAAC;QAChE,IAAI,CAAC,iCAAiC;YACpC,IAAI,CAAC,iCAAiC,IAAI,KAAK,CAAC;QAClD,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC;QACxC,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CAAC;QAC9C,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACpC,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,mBAAmB,IAAI,KAAK,CAAC;QAC7D,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,IAAI,EAAE,CAAC;QACpD,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,oBAAoB,IAAI,KAAK,CAAC;QAC/D,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC,sBAAsB,CAAC;QAC1D,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;QACtC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACpC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC;QACxC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,IAAI,EAAE,CAAC;QAC1C,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,iBAAiB,IAAI,EAAE,CAAC;QACtD,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,IAAI,KAAK,CAAC;QACzC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,IAAI,EAAE,CAAC;QAE9C;;;;;;WAMG;QACH,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC3B,MAAM,MAAM,GAAqC,OAAO,CAAC,IAAI,CAC3D,CAAC,MAA4B,EAAE,EAAE;gBAC/B,OAAO,MAAM,CAAC,GAAG,KAAK,IAAI,CAAC,iBAAiB,CAAC;YAC/C,CAAC,CACF,CAAC;YACF,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,MAAM,IAAI,gBAAgB,CACxB,oBAAoB;oBAClB,IAAI,CAAC,iBAAiB;oBACtB,8BAA8B,CACjC,CAAC;YACJ,CAAC;YACD,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,iBAAiB,CAAC;QAClD,CAAC;IACH,CAAC;IAGD,IAAW,gBAAgB;QACzB,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;IACD,IAAW,gBAAgB,CAAC,CAA+B;QACzD,IAAI,CAAC,iBAAiB,GAAG,CAAC,CAAC;IAC7B,CAAC;IAGD,IAAW,aAAa;QACtB,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IACD,IAAW,aAAa,CAAC,CAAiC;QACxD,IAAI,CAAC,cAAc,GAAG,CAAC,CAAC;IAC1B,CAAC;IAGD,IAAW,WAAW;QACpB,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IACD,IAAW,WAAW,CAAC,CAAuB;QAC5C,IAAI,CAAC,YAAY,GAAG,CAAC,CAAC;IACxB,CAAC;IAGD,IAAW,sBAAsB;QAC/B,OAAO,IAAI,CAAC,uBAAuB,CAAC;IACtC,CAAC;IACD,IAAW,sBAAsB,CAAC,CAAqC;QACrE,IAAI,CAAC,uBAAuB,GAAG,CAAC,CAAC;IACnC,CAAC;IAGD,IAAW,WAAW;QACpB,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IACD,IAAW,WAAW,CAAC,CAAgB;QACrC,IAAI,CAAC,YAAY,GAAG,CAAC,CAAC;IACxB,CAAC;IAGD,IAAW,YAAY;QACrB,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IACD,IAAW,YAAY,CAAC,CAAS;QAC/B,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC;IACzB,CAAC;IAGD,IAAW,WAAW;QACpB,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IACD,IAAW,WAAW,CAAC,CAAqB;QAC1C,IAAI,CAAC,YAAY,GAAG,CAAC,CAAC;IACxB,CAAC;IAGD,IAAW,aAAa;QACtB,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IACD,IAAW,aAAa,CAAC,CAAqB;QAC5C,IAAI,CAAC,cAAc,GAAG,CAAC,CAAC;IAC1B,CAAC;IAGD,IAAW,QAAQ;QACjB,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IACD,IAAW,QAAQ,CAAC,CAAgB;QAClC,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC;IACrB,CAAC;IAWD,IAAW,iBAAiB;QAC1B,OAAO,IAAI,CAAC,kBAAkB,CAAC;IACjC,CAAC;IACD,IAAW,iBAAiB,CAAC,CAAS;QACpC,IAAI,CAAC,kBAAkB,GAAG,CAAC,CAAC;IAC9B,CAAC;IAGD,IAAW,YAAY;QACrB,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IACD,IAAW,YAAY,CAAC,CAAS;QAC/B,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC;IACzB,CAAC;IAGD,IAAW,UAAU;QACnB,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IACD,IAAW,UAAU,CAAC,CAAS;QAC7B,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC;IACvB,CAAC;IAGD,IAAW,yBAAyB;QAGlC,OAAO,IAAI,CAAC,0BAA0B,CAAC;IACzC,CAAC;IACD,IAAW,yBAAyB,CAClC,CAAwC;QAExC,IAAI,CAAC,0BAA0B,GAAG,CAAC,CAAC;IACtC,CAAC;IAGD,IAAW,iCAAiC;QAC1C,OAAO,IAAI,CAAC,kCAAkC,CAAC;IACjD,CAAC;IACD,IAAW,iCAAiC,CAAC,CAAU;QACrD,IAAI,CAAC,kCAAkC,GAAG,CAAC,CAAC;IAC9C,CAAC;IAGD,IAAW,SAAS;QAClB,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IACD,IAAW,SAAS,CAAC,CAAS;QAC5B,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC;IACtB,CAAC;IAGD,IAAW,WAAW;QACpB,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IACD,IAAW,WAAW,CAAC,CAAoB;QACzC,IAAI,CAAC,YAAY,GAAG,CAAC,CAAC;IACxB,CAAC;IAGD,IAAW,mBAAmB;QAC5B,OAAO,IAAI,CAAC,oBAAoB,CAAC;IACnC,CAAC;IACD,IAAW,mBAAmB,CAAC,CAAU;QACvC,IAAI,CAAC,oBAAoB,GAAG,CAAC,CAAC;IAChC,CAAC;IAGD,IAAW,gBAAgB;QACzB,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;IACD,IAAW,gBAAgB,CAAC,CAAS;QACnC,IAAI,CAAC,iBAAiB,GAAG,CAAC,CAAC;IAC7B,CAAC;IAGD,IAAW,oBAAoB;QAC7B,OAAO,IAAI,CAAC,qBAAqB,CAAC;IACpC,CAAC;IACD,IAAW,oBAAoB,CAAC,CAAU;QACxC,IAAI,CAAC,qBAAqB,GAAG,CAAC,CAAC;IACjC,CAAC;IAGD,IAAW,WAAW;QACpB,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IACD,IAAW,WAAW,CAAC,CAAoB;QACzC,IAAI,CAAC,YAAY,GAAG,CAAC,CAAC;IACxB,CAAC;IAGD,IAAW,iBAAiB;QAC1B,OAAO,IAAI,CAAC,kBAAkB,CAAC;IACjC,CAAC;IACD,IAAW,iBAAiB,CAAC,CAA0B;QACrD,IAAI,CAAC,kBAAkB,GAAG,CAAC,CAAC;IAC9B,CAAC;IAGD,IAAW,SAAS;QAClB,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IACD,IAAW,SAAS,CAAC,CAAU;QAC7B,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC;IACtB,CAAC;IAGD,IAAW,aAAa;QACtB,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IACD,IAAW,aAAa,CAAC,CAAS;QAChC,IAAI,CAAC,cAAc,GAAG,CAAC,CAAC;IAC1B,CAAC;IAEM,eAAe;QACpB,MAAM,MAAM,GAAqC,IAAI,CAAC,YAAY,CAAC,IAAI,CACrE,CAAC,MAA4B,EAAE,EAAE;YAC/B,OAAO,MAAM,CAAC,UAAU,CAAC;QAC3B,CAAC,CACF,CAAC;QAEF,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAEM,oBAAoB;QACzB,MAAM,MAAM,GAAgC,IAAI,CAAC,eAAe,EAAE,CAAC;QAEnE,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,GAAG,CAAoB,CAAC;IAC5D,CAAC;IAEM,kBAAkB;QACvB,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,MAA4B,EAAE,EAAE;YAC/D,OAAO,MAAM,CAAC,QAAQ,CAAC;QACzB,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,oBAAoB,CAAC,UAAkB;QAC5C,MAAM,MAAM,GAAgC,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;QAE5E,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,KAAK,CAAC;QACf,CAAC;QAED,OAAO,MAAM,CAAC,oBAAoB,CAAC;IACrC,CAAC;IAEM,wBAAwB,CAAC,UAAkB;QAChD,MAAM,MAAM,GAAgC,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;QAE5E,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,gBAAgB,CAAC,SAAS,GAAG,UAAU,GAAG,YAAY,CAAC,CAAC;QACpE,CAAC;QAED,OAAO,MAAM,CAAC,YAAY,CAAC;IAC7B,CAAC;IAEM,6BAA6B,CAClC,UAAkB;QAElB,MAAM,MAAM,GAAgC,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;QAE5E,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,MAAM,CAAC,oBAAoB,IAAI,IAAI,CAAC;IAC7C,CAAC;IAED,IAAW,EAAE;QACX,OAAO,IAAI,CAAC,cAAc,CAAC,KAAK,CAAyB,CAAC;IAC5D,CAAC;IACD,IAAW,EAAE,CAAC,CAAuB;QACnC,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAChC,CAAC;IAED,IAAW,GAAG;QACZ,OAAO,IAAI,CAAC,cAAc,CAAC,KAAK,CAAyB,CAAC;IAC5D,CAAC;IACD,IAAW,GAAG,CAAC,CAAuB;QACpC,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAChC,CAAC;IAED,IAAW,SAAS;QAClB,OAAO,IAAI,CAAC,cAAc,CAAC,WAAW,CAAqB,CAAC;IAC9D,CAAC;IAED,IAAW,SAAS,CAAC,CAAmB;QACtC,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;IACtC,CAAC;IAEM,uBAAuB;QAC5B;;;;WAIG;QACH,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACrB,OAAO,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QACzD,CAAC;QACD,OAAO,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACjD,CAAC;IAEM,yBAAyB,CAC9B,UAAkB;QAElB,MAAM,WAAW,GACf,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,MAA4B,EAAE,EAAE;YACtD,OAAO,MAAM,CAAC,GAAG,KAAK,UAAU,CAAC;QACnC,CAAC,CAAC,CAAC;QAEL,IAAI,CAAC,WAAW,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,CAAC;YAC/C,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,WAAW,CAAC,aAAa,CAAC;IACnC,CAAC;IAEM,mCAAmC;QACxC,MAAM,UAAU,GAAoC,EAAE,CAAC;QAEvD,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACvC,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;gBACzB,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,aAAa,CAAC;YAChD,CAAC;QACH,CAAC;QAED,OAAO,UAAU,CAAC;IACpB,CAAC;IAEM,kBAAkB;;QACvB,OAAO,CAAA,MAAA,IAAI,CAAC,aAAa,0CAAE,IAAI,KAAI,EAAE,CAAC;IACxC,CAAC;IAEM,oBAAoB;;QACzB,OAAO,CAAA,MAAA,IAAI,CAAC,aAAa,0CAAE,MAAM,KAAI,EAAE,CAAC;IAC1C,CAAC;IAEM,oBAAoB;;QACzB,OAAO,CAAA,MAAA,IAAI,CAAC,aAAa,0CAAE,MAAM,KAAI,EAAE,CAAC;IAC1C,CAAC;IAEM,oBAAoB;;QACzB,OAAO,CAAA,MAAA,IAAI,CAAC,aAAa,0CAAE,MAAM,KAAI,EAAE,CAAC;IAC1C,CAAC;IAEM,kBAAkB;;QACvB,OAAO,CAAA,MAAA,IAAI,CAAC,yBAAyB,0CAAE,IAAI,KAAI,IAAI,CAAC;IACtD,CAAC;IAEM,oBAAoB;;QACzB,OAAO,CAAA,MAAA,IAAI,CAAC,yBAAyB,0CAAE,MAAM,KAAI,IAAI,CAAC;IACxD,CAAC;IAEM,oBAAoB;;QACzB,OAAO,CAAA,MAAA,IAAI,CAAC,yBAAyB,0CAAE,MAAM,KAAI,IAAI,CAAC;IACxD,CAAC;IAEM,oBAAoB;;QACzB,OAAO,CAAA,MAAA,IAAI,CAAC,yBAAyB,0CAAE,MAAM,KAAI,IAAI,CAAC;IACxD,CAAC;IAEM,cAAc,CAAC,WAAmB;QACvC,mDAAmD;QACnD,OAAO,KAAK,CAAC;IACf,CAAC;IAEM,SAAS,CAAC,UAAkB;QACjC,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,MAA4B,EAAE,EAAE;YAC7D,OAAO,MAAM,CAAC,GAAG,KAAK,UAAU,CAAC;QACnC,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,YAAY,CAAC,WAAmB;QACrC,iDAAiD;QACjD,OAAO,KAAK,CAAC;IACf,CAAC;IAEM,oBAAoB,CACzB,sBAAsE,EACtE,UAAmB;;QAEnB,IAAI,eAAe,GAAsB,CAAA,MAAA,IAAI,CAAC,aAAa,0CAAE,MAAM,KAAI,EAAE,CAAC;QAE1E,IAAI,UAAU,EAAE,CAAC;YACf,MAAM,mBAAmB,GACvB,IAAI,CAAC,yBAAyB,CAAC,UAAU,CAAC,CAAC;YAC7C,IAAI,mBAAmB,EAAE,CAAC;gBACxB,eAAe,GAAG,mBAAmB,CAAC,MAAM,CAAC;YAC/C,CAAC;QACH,CAAC;QAED,OAAO,eAAe,CAAC,cAAc,CACnC,sBAAsB,EACtB,eAAe,CAChB,CAAC;IACJ,CAAC;IAEM,kBAAkB,CACvB,sBAAsE,EACtE,UAAmB;;QAEnB,IAAI,eAAe,GAAsB,CAAA,MAAA,IAAI,CAAC,aAAa,0CAAE,IAAI,KAAI,EAAE,CAAC;QAExE,IAAI,UAAU,EAAE,CAAC;YACf,MAAM,mBAAmB,GACvB,IAAI,CAAC,yBAAyB,CAAC,UAAU,CAAC,CAAC;YAC7C,IAAI,mBAAmB,EAAE,CAAC;gBACxB,eAAe,GAAG,mBAAmB,CAAC,IAAI,CAAC;YAC7C,CAAC;QACH,CAAC;QAED,OAAO,eAAe,CAAC,cAAc,CACnC,sBAAsB,EACtB,eAAe,CAChB,CAAC;IACJ,CAAC;IAEM,oBAAoB,CACzB,sBAAsE;;QAEtE,MAAM,eAAe,GAAsB,CAAA,MAAA,IAAI,CAAC,aAAa,0CAAE,MAAM,KAAI,EAAE,CAAC;QAC5E,OAAO,eAAe,CAAC,cAAc,CACnC,sBAAsB,EACtB,eAAe,CAChB,CAAC;IACJ,CAAC;IAEM,oBAAoB,CACzB,sBAAsE,EACtE,UAAmB;;QAEnB,IAAI,eAAe,GAAsB,CAAA,MAAA,IAAI,CAAC,aAAa,0CAAE,MAAM,KAAI,EAAE,CAAC;QAE1E,IAAI,UAAU,EAAE,CAAC;YACf,MAAM,mBAAmB,GACvB,IAAI,CAAC,yBAAyB,CAAC,UAAU,CAAC,CAAC;YAC7C,IAAI,mBAAmB,EAAE,CAAC;gBACxB,eAAe,GAAG,mBAAmB,CAAC,MAAM,CAAC;YAC/C,CAAC;QACH,CAAC;QAED,OAAO,eAAe,CAAC,cAAc,CACnC,sBAAsB,EACtB,eAAe,CAChB,CAAC;IACJ,CAAC;CACF"}
1
+ {"version":3,"file":"AnalyticsBaseModel.js","sourceRoot":"","sources":["../../../../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel.ts"],"names":[],"mappings":"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"}
@@ -209,6 +209,8 @@ GROUP BY projectId, name, primaryEntityId, day, hourOfWeek`,
209
209
  shardingKey: "cityHash64(projectId, name, primaryEntityId)",
210
210
  tableSettings: "ttl_only_drop_parts = 1, non_replicated_deduplication_window = 10000",
211
211
  ttlExpression: "day + INTERVAL 90 DAY",
212
+ includeBaseColumns: false,
213
+ defaultSortColumn: "day",
212
214
  });
213
215
  }
214
216
  }
@@ -1 +1 @@
1
- {"version":3,"file":"MetricBaselineHourly.js","sourceRoot":"","sources":["../../../../Models/AnalyticsModels/MetricBaselineHourly.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"MetricBaselineHourly.js","sourceRoot":"","sources":["../../../../Models/AnalyticsModels/MetricBaselineHourly.ts"],"names":[],"mappings":"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"}
@@ -93,9 +93,10 @@ export default class MetricItemAggMV1m extends AnalyticsBaseModel {
93
93
  const retentionDateColumn = new AnalyticsTableColumn({
94
94
  key: "retentionDate",
95
95
  title: "Retention Date",
96
- description: "Date after which this row is eligible for TTL deletion. Computed by the MV as max(retentionDate) per bucket inherits from the source MetricItemV3 rows.",
96
+ description: "Latest date after which this aggregate bucket is eligible for TTL deletion. Stored as SimpleAggregateFunction(max, DateTime) so partial rows keep the maximum expiry when AggregatingMergeTree merges them.",
97
97
  required: true,
98
98
  type: TableColumnType.Date,
99
+ simpleAggregateFunction: "max",
99
100
  });
100
101
  super({
101
102
  tableName: AnalyticsTableName.MetricItemAggMV1m,
@@ -138,7 +139,7 @@ SELECT
138
139
  countState(toFloat64(coalesce(value, sum, 0))) AS valueCountState,
139
140
  minState(toFloat64(coalesce(value, sum, 0))) AS valueMinState,
140
141
  maxState(toFloat64(coalesce(value, sum, 0))) AS valueMaxState,
141
- max(retentionDate) AS retentionDate
142
+ maxSimpleState(retentionDate) AS retentionDate
142
143
  FROM MetricItemV3
143
144
  GROUP BY projectId, name, primaryEntityId, bucketTime`,
144
145
  },
@@ -153,6 +154,8 @@ GROUP BY projectId, name, primaryEntityId, bucketTime`,
153
154
  shardingKey: "cityHash64(projectId, name, primaryEntityId)",
154
155
  tableSettings: "ttl_only_drop_parts = 1, non_replicated_deduplication_window = 10000",
155
156
  ttlExpression: "retentionDate DELETE",
157
+ includeBaseColumns: false,
158
+ defaultSortColumn: "bucketTime",
156
159
  });
157
160
  }
158
161
  }
@@ -1 +1 @@
1
- {"version":3,"file":"MetricItemAggMV1m.js","sourceRoot":"","sources":["../../../../Models/AnalyticsModels/MetricItemAggMV1m.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"MetricItemAggMV1m.js","sourceRoot":"","sources":["../../../../Models/AnalyticsModels/MetricItemAggMV1m.ts"],"names":[],"mappings":"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"}
@@ -93,9 +93,10 @@ export default class MetricItemAggMV1mByContainer extends AnalyticsBaseModel {
93
93
  const retentionDateColumn = new AnalyticsTableColumn({
94
94
  key: "retentionDate",
95
95
  title: "Retention Date",
96
- description: "Date after which this row is eligible for TTL deletion. Computed by the MV as max(retentionDate) per bucket inherits from the source MetricItemV3 rows.",
96
+ description: "Latest date after which this aggregate bucket is eligible for TTL deletion. Stored as SimpleAggregateFunction(max, DateTime) so partial rows keep the maximum expiry when AggregatingMergeTree merges them.",
97
97
  required: true,
98
98
  type: TableColumnType.Date,
99
+ simpleAggregateFunction: "max",
99
100
  });
100
101
  super({
101
102
  tableName: AnalyticsTableName.MetricItemAggMV1mByContainer,
@@ -140,7 +141,7 @@ SELECT
140
141
  countState(toFloat64(coalesce(value, sum, 0))) AS valueCountState,
141
142
  minState(toFloat64(coalesce(value, sum, 0))) AS valueMinState,
142
143
  maxState(toFloat64(coalesce(value, sum, 0))) AS valueMaxState,
143
- max(retentionDate) AS retentionDate
144
+ maxSimpleState(retentionDate) AS retentionDate
144
145
  FROM MetricItemV3
145
146
  WHERE containerEntityKey != ''
146
147
  GROUP BY projectId, name, containerEntityKey, bucketTime`,
@@ -153,6 +154,8 @@ GROUP BY projectId, name, containerEntityKey, bucketTime`,
153
154
  shardingKey: "cityHash64(projectId, name, containerEntityKey)",
154
155
  tableSettings: "ttl_only_drop_parts = 1, non_replicated_deduplication_window = 10000",
155
156
  ttlExpression: "retentionDate DELETE",
157
+ includeBaseColumns: false,
158
+ defaultSortColumn: "bucketTime",
156
159
  });
157
160
  }
158
161
  }
@@ -1 +1 @@
1
- {"version":3,"file":"MetricItemAggMV1mByContainer.js","sourceRoot":"","sources":["../../../../Models/AnalyticsModels/MetricItemAggMV1mByContainer.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,MAAM,yCAAyC,CAAC;AACzE,OAAO,oBAAoB,MAAM,oDAAoD,CAAC;AACtF,OAAO,kBAAkB,MAAM,kDAAkD,CAAC;AAClF,OAAO,oBAAoB,MAAM,2CAA2C,CAAC;AAC7E,OAAO,eAAe,MAAM,+CAA+C,CAAC;AAE5E;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,MAAM,CAAC,OAAO,OAAO,4BAA6B,SAAQ,kBAAkB;IAC1E;QACE,MAAM,eAAe,GAAyB,IAAI,oBAAoB,CAAC;YACrE,GAAG,EAAE,WAAW;YAChB,KAAK,EAAE,YAAY;YACnB,WAAW,EAAE,0DAA0D;YACvE,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,eAAe,CAAC,IAAI;YAC1B,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;QAEH,MAAM,UAAU,GAAyB,IAAI,oBAAoB,CAAC;YAChE,GAAG,EAAE,MAAM;YACX,KAAK,EAAE,aAAa;YACpB,WAAW,EAAE,4CAA4C;YACzD,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,eAAe,CAAC,IAAI;SAC3B,CAAC,CAAC;QAEH,MAAM,wBAAwB,GAC5B,IAAI,oBAAoB,CAAC;YACvB,GAAG,EAAE,oBAAoB;YACzB,KAAK,EAAE,sBAAsB;YAC7B,WAAW,EACT,6PAA6P;YAC/P,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,eAAe,CAAC,IAAI;SAC3B,CAAC,CAAC;QAEL,MAAM,gBAAgB,GAAyB,IAAI,oBAAoB,CAAC;YACtE,GAAG,EAAE,YAAY;YACjB,KAAK,EAAE,aAAa;YACpB,WAAW,EACT,gGAAgG;YAClG,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,eAAe,CAAC,IAAI;SAC3B,CAAC,CAAC;QAEH,MAAM,mBAAmB,GAAyB,IAAI,oBAAoB,CAAC;YACzE,GAAG,EAAE,eAAe;YACpB,KAAK,EAAE,aAAa;YACpB,WAAW,EACT,uFAAuF;YACzF,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,eAAe,CAAC,iBAAiB;YACvC,2BAA2B,EAAE,cAAc;SAC5C,CAAC,CAAC;QAEH,MAAM,qBAAqB,GACzB,IAAI,oBAAoB,CAAC;YACvB,GAAG,EAAE,iBAAiB;YACtB,KAAK,EAAE,eAAe;YACtB,WAAW,EACT,+FAA+F;YACjG,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,eAAe,CAAC,iBAAiB;YACvC,2BAA2B,EAAE,gBAAgB;SAC9C,CAAC,CAAC;QAEL,MAAM,mBAAmB,GAAyB,IAAI,oBAAoB,CAAC;YACzE,GAAG,EAAE,eAAe;YACpB,KAAK,EAAE,aAAa;YACpB,WAAW,EACT,0EAA0E;YAC5E,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,eAAe,CAAC,iBAAiB;YACvC,2BAA2B,EAAE,cAAc;SAC5C,CAAC,CAAC;QAEH,MAAM,mBAAmB,GAAyB,IAAI,oBAAoB,CAAC;YACzE,GAAG,EAAE,eAAe;YACpB,KAAK,EAAE,aAAa;YACpB,WAAW,EACT,0EAA0E;YAC5E,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,eAAe,CAAC,iBAAiB;YACvC,2BAA2B,EAAE,cAAc;SAC5C,CAAC,CAAC;QAEH,MAAM,mBAAmB,GAAyB,IAAI,oBAAoB,CAAC;YACzE,GAAG,EAAE,eAAe;YACpB,KAAK,EAAE,gBAAgB;YACvB,WAAW,EACT,2JAA2J;YAC7J,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,eAAe,CAAC,IAAI;SAC3B,CAAC,CAAC;QAEH,KAAK,CAAC;YACJ,SAAS,EAAE,kBAAkB,CAAC,4BAA4B;YAC1D,WAAW,EAAE,oBAAoB,CAAC,oBAAoB;YACtD,YAAY,EAAE,qDAAqD;YACnE,UAAU,EAAE,sDAAsD;YAClE,YAAY,EAAE;gBACZ,eAAe;gBACf,UAAU;gBACV,wBAAwB;gBACxB,gBAAgB;gBAChB,mBAAmB;gBACnB,qBAAqB;gBACrB,mBAAmB;gBACnB,mBAAmB;gBACnB,mBAAmB;aACpB;YACD,WAAW,EAAE,EAAE;YACf;;;;;;;;;;eAUG;YACH,iBAAiB,EAAE;gBACjB;oBACE,IAAI,EAAE,iCAAiC;oBACvC,KAAK,EAAE;;;;;;;;;;;;;;;yDAewC;iBAChD;aACF;YACD,QAAQ,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,oBAAoB,EAAE,YAAY,CAAC;YACnE,WAAW,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,oBAAoB,EAAE,YAAY,CAAC;YACtE,YAAY,EAAE,sBAAsB;YACpC,uEAAuE;YACvE,WAAW,EAAE,iDAAiD;YAC9D,aAAa,EACX,sEAAsE;YACxE,aAAa,EAAE,sBAAsB;SACtC,CAAC,CAAC;IACL,CAAC;CACF"}
1
+ {"version":3,"file":"MetricItemAggMV1mByContainer.js","sourceRoot":"","sources":["../../../../Models/AnalyticsModels/MetricItemAggMV1mByContainer.ts"],"names":[],"mappings":"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"}
@@ -97,9 +97,10 @@ export default class MetricItemAggMV1mByHostV2 extends AnalyticsBaseModel {
97
97
  const retentionDateColumn = new AnalyticsTableColumn({
98
98
  key: "retentionDate",
99
99
  title: "Retention Date",
100
- description: "Date after which this row is eligible for TTL deletion. Computed by the MV as max(retentionDate) per bucket inherits from the source MetricItemV3 rows.",
100
+ description: "Latest date after which this aggregate bucket is eligible for TTL deletion. Stored as SimpleAggregateFunction(max, DateTime) so partial rows keep the maximum expiry when AggregatingMergeTree merges them.",
101
101
  required: true,
102
102
  type: TableColumnType.Date,
103
+ simpleAggregateFunction: "max",
103
104
  });
104
105
  super({
105
106
  tableName: AnalyticsTableName.MetricItemAggMV1mByHostV2,
@@ -144,7 +145,7 @@ SELECT
144
145
  countState(toFloat64(coalesce(value, sum, 0))) AS valueCountState,
145
146
  minState(toFloat64(coalesce(value, sum, 0))) AS valueMinState,
146
147
  maxState(toFloat64(coalesce(value, sum, 0))) AS valueMaxState,
147
- max(retentionDate) AS retentionDate
148
+ maxSimpleState(retentionDate) AS retentionDate
148
149
  FROM MetricItemV3
149
150
  WHERE hostEntityKey != ''
150
151
  GROUP BY projectId, name, hostEntityKey, bucketTime`,
@@ -157,6 +158,8 @@ GROUP BY projectId, name, hostEntityKey, bucketTime`,
157
158
  shardingKey: "cityHash64(projectId, name, hostEntityKey)",
158
159
  tableSettings: "ttl_only_drop_parts = 1, non_replicated_deduplication_window = 10000",
159
160
  ttlExpression: "retentionDate DELETE",
161
+ includeBaseColumns: false,
162
+ defaultSortColumn: "bucketTime",
160
163
  });
161
164
  }
162
165
  }
@@ -1 +1 @@
1
- {"version":3,"file":"MetricItemAggMV1mByHostV2.js","sourceRoot":"","sources":["../../../../Models/AnalyticsModels/MetricItemAggMV1mByHostV2.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"MetricItemAggMV1mByHostV2.js","sourceRoot":"","sources":["../../../../Models/AnalyticsModels/MetricItemAggMV1mByHostV2.ts"],"names":[],"mappings":"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"}