cae300e8e3
### What?
Improves querying performance of the Local API, reduces copying overhead
### How?
Adds `flattenedFields` property for sanitized collection/global config
which contains fields in database schema structure.
For example, It removes rows / collapsible / unnamed tabs and merges
them to the parent `fields`, ignores UI fields, named tabs are added as
`type: 'tab'`.
This simplifies code in places like Drizzle `transform/traverseFields`.
Also, now we can avoid calling `flattenTopLevelFields` which adds some
overhead and use `collection.flattenedFields` / `field.flattenedFields`.
By refactoring `configToJSONSchema.ts` with `flattenedFields` it also
1. Fixes https://github.com/payloadcms/payload/issues/9467
2. Fixes types for UI fields were generated for `select`
Removes this deep copying for each `where` query constraint
58ac784425/packages/payload/src/database/queryValidation/validateQueryPaths.ts (L69-L73)
which potentially can add overhead if you have a large collection/global
config
UPD:
The overhead is even much more than in the benchmark below if you have
Lexical with blocks.
Benchmark in `relationships/int.spec.ts`:
```ts
const now = Date.now()
for (let i = 0; i < 10; i++) {
const now = Date.now()
for (let i = 0; i < 300; i++) {
const query = await payload.find({
collection: 'chained',
where: {
'relation.relation.name': {
equals: 'third',
},
and: [
{
'relation.relation.name': {
equals: 'third',
},
},
{
'relation.relation.name': {
equals: 'third',
},
},
{
'relation.relation.name': {
equals: 'third',
},
},
{
'relation.relation.name': {
equals: 'third',
},
},
{
'relation.relation.name': {
equals: 'third',
},
},
{
'relation.relation.name': {
equals: 'third',
},
},
{
'relation.relation.name': {
equals: 'third',
},
},
{
'relation.relation.name': {
equals: 'third',
},
},
{
'relation.relation.name': {
equals: 'third',
},
},
],
},
})
}
payload.logger.info(`#${i + 1} ${Date.now() - now}`)
}
payload.logger.info(`Total ${Date.now() - now}`)
```
Before:
```
[02:11:48] INFO: #1 3682
[02:11:50] INFO: #2 2199
[02:11:54] INFO: #3 3483
[02:11:56] INFO: #4 2516
[02:11:59] INFO: #5 2467
[02:12:01] INFO: #6 1987
[02:12:03] INFO: #7 1986
[02:12:05] INFO: #8 2375
[02:12:07] INFO: #9 2040
[02:12:09] INFO: #10 1920
[PASS] Relationships > Querying > Nested Querying > should allow querying two levels deep (24667ms)
[02:12:09] INFO: Total 24657
```
After:
```
[02:12:36] INFO: #1 2113
[02:12:38] INFO: #2 1854
[02:12:40] INFO: #3 1700
[02:12:42] INFO: #4 1797
[02:12:44] INFO: #5 2121
[02:12:46] INFO: #6 1774
[02:12:47] INFO: #7 1670
[02:12:49] INFO: #8 1610
[02:12:50] INFO: #9 1596
[02:12:52] INFO: #10 1576
[PASS] Relationships > Querying > Nested Querying > should allow querying two levels deep (17828ms)
[02:12:52] INFO: Total 17818
```
77 lines
2.0 KiB
TypeScript
77 lines
2.0 KiB
TypeScript
import type { DeleteOne, PayloadRequest } from 'payload'
|
|
|
|
import { eq } from 'drizzle-orm'
|
|
import toSnakeCase from 'to-snake-case'
|
|
|
|
import type { DrizzleAdapter } from './types.js'
|
|
|
|
import { buildFindManyArgs } from './find/buildFindManyArgs.js'
|
|
import buildQuery from './queries/buildQuery.js'
|
|
import { selectDistinct } from './queries/selectDistinct.js'
|
|
import { transform } from './transform/read/index.js'
|
|
|
|
export const deleteOne: DeleteOne = async function deleteOne(
|
|
this: DrizzleAdapter,
|
|
{ collection: collectionSlug, req = {} as PayloadRequest, select, where: whereArg },
|
|
) {
|
|
const db = this.sessions[await req?.transactionID]?.db || this.drizzle
|
|
const collection = this.payload.collections[collectionSlug].config
|
|
|
|
const tableName = this.tableNameMap.get(toSnakeCase(collection.slug))
|
|
|
|
let docToDelete: Record<string, unknown>
|
|
|
|
const { joins, selectFields, where } = buildQuery({
|
|
adapter: this,
|
|
fields: collection.flattenedFields,
|
|
locale: req.locale,
|
|
tableName,
|
|
where: whereArg,
|
|
})
|
|
|
|
const selectDistinctResult = await selectDistinct({
|
|
adapter: this,
|
|
chainedMethods: [{ args: [1], method: 'limit' }],
|
|
db,
|
|
joins,
|
|
selectFields,
|
|
tableName,
|
|
where,
|
|
})
|
|
|
|
if (selectDistinctResult?.[0]?.id) {
|
|
docToDelete = await db.query[tableName].findFirst({
|
|
where: eq(this.tables[tableName].id, selectDistinctResult[0].id),
|
|
})
|
|
} else {
|
|
const findManyArgs = buildFindManyArgs({
|
|
adapter: this,
|
|
depth: 0,
|
|
fields: collection.flattenedFields,
|
|
joinQuery: false,
|
|
select,
|
|
tableName,
|
|
})
|
|
|
|
findManyArgs.where = where
|
|
|
|
docToDelete = await db.query[tableName].findFirst(findManyArgs)
|
|
}
|
|
|
|
const result = transform({
|
|
adapter: this,
|
|
config: this.payload.config,
|
|
data: docToDelete,
|
|
fields: collection.flattenedFields,
|
|
joinQuery: false,
|
|
})
|
|
|
|
await this.deleteWhere({
|
|
db,
|
|
tableName,
|
|
where: eq(this.tables[tableName].id, docToDelete.id),
|
|
})
|
|
|
|
return result
|
|
}
|