fix(quaint/DA): handle JSON parsing engines side so that we can correctly handle `i64`s by Druue · Pull Request #4883 · prisma/prisma-engines

Druue · 2024-05-23T13:52:21Z

unexclude common_types test for pg, neon, and PS

(D1 not relevant as it doesn't support JSON)

related prisma/prisma#23926

unexclude common_types test for pg, neon, and PS

codspeed-hq · 2024-05-23T13:56:17Z

CodSpeed Performance Report

Merging #4883 will not alter performance

_{Comparing fix/23926 (c177bfd) with main (b4fe3e6)}

Summary

✅ 11 untouched benchmarks

github-actions · 2024-05-23T13:57:08Z

WASM Query Engine file Size

Engine	This PR	Base branch	Diff
Postgres	2.153MiB	2.153MiB	387.000B
Postgres (gzip)	846.090KiB	846.061KiB	30.000B
Mysql	2.120MiB	2.119MiB	386.000B
Mysql (gzip)	831.839KiB	831.749KiB	93.000B
Sqlite	2.015MiB	2.015MiB	183.000B
Sqlite (gzip)	793.165KiB	793.081KiB	86.000B

SevInf · 2024-05-23T14:06:21Z

I think we can also get rid of this block in driver-adapters crate

github-actions · 2024-05-23T14:07:29Z

✅ WASM query-engine performance won't change substantially (0.987x)

Full benchmark report

DATABASE_URL="postgresql://postgres:postgres@localhost:5432/bench?schema=imdb_bench&sslmode=disable" \
node --experimental-wasm-modules query-engine/driver-adapters/executor/dist/bench.mjs
"
"
"
"
"
"
"
"
"
"
"
"
"
"
"
"
"
"
"
"
"
"
"
"
"
"
"
"
"
"
"
"
"
"
"
"
cpu: AMD EPYC 7763 64-Core Processor
runtime: node v18.20.2 (x64-linux)

benchmark                   time (avg)             (min … max)       p75       p99      p999
-------------------------------------------------------------- -----------------------------
• movies.findMany() (all - ~50K)
-------------------------------------------------------------- -----------------------------
Web Assembly: Baseline     373 ms/iter       (370 ms … 387 ms)    373 ms    387 ms    387 ms
Web Assembly: Latest       461 ms/iter       (456 ms … 466 ms)    465 ms    466 ms    466 ms
Web Assembly: Current      453 ms/iter       (448 ms … 458 ms)    457 ms    458 ms    458 ms
Node API: Current          203 ms/iter       (194 ms … 213 ms)    210 ms    213 ms    213 ms

summary for movies.findMany() (all - ~50K)
  Web Assembly: Current
   2.23x slower than Node API: Current
   1.21x slower than Web Assembly: Baseline
   1.02x faster than Web Assembly: Latest

• movies.findMany({ take: 2000 })
-------------------------------------------------------------- -----------------------------
Web Assembly: Baseline  14'866 µs/iter (14'420 µs … 19'416 µs) 14'724 µs 19'416 µs 19'416 µs
Web Assembly: Latest    18'471 µs/iter (17'988 µs … 21'629 µs) 18'605 µs 21'629 µs 21'629 µs
Web Assembly: Current   18'264 µs/iter (18'121 µs … 18'661 µs) 18'291 µs 18'661 µs 18'661 µs
Node API: Current        8'045 µs/iter   (7'853 µs … 8'531 µs)  8'123 µs  8'531 µs  8'531 µs

summary for movies.findMany({ take: 2000 })
  Web Assembly: Current
   2.27x slower than Node API: Current
   1.23x slower than Web Assembly: Baseline
   1.01x faster than Web Assembly: Latest

• movies.findMany({ where: {...}, take: 2000 })
-------------------------------------------------------------- -----------------------------
Web Assembly: Baseline   2'291 µs/iter   (2'204 µs … 3'321 µs)  2'283 µs  3'049 µs  3'321 µs
Web Assembly: Latest     2'881 µs/iter   (2'780 µs … 3'680 µs)  2'867 µs  3'521 µs  3'680 µs
Web Assembly: Current    2'841 µs/iter   (2'752 µs … 3'287 µs)  2'837 µs  3'201 µs  3'287 µs
Node API: Current        1'433 µs/iter   (1'329 µs … 1'828 µs)  1'434 µs  1'682 µs  1'828 µs

summary for movies.findMany({ where: {...}, take: 2000 })
  Web Assembly: Current
   1.98x slower than Node API: Current
   1.24x slower than Web Assembly: Baseline
   1.01x faster than Web Assembly: Latest

• movies.findMany({ include: { cast: true } take: 2000 }) (m2m)
-------------------------------------------------------------- -----------------------------
Web Assembly: Baseline     574 ms/iter       (568 ms … 589 ms)    581 ms    589 ms    589 ms
Web Assembly: Latest       789 ms/iter       (784 ms … 798 ms)    793 ms    798 ms    798 ms
Web Assembly: Current      776 ms/iter       (772 ms … 786 ms)    778 ms    786 ms    786 ms
Node API: Current          482 ms/iter       (479 ms … 489 ms)    483 ms    489 ms    489 ms

summary for movies.findMany({ include: { cast: true } take: 2000 }) (m2m)
  Web Assembly: Current
   1.61x slower than Node API: Current
   1.35x slower than Web Assembly: Baseline
   1.02x faster than Web Assembly: Latest

• movies.findMany({ where: {...}, include: { cast: true } take: 2000 }) (m2m)
-------------------------------------------------------------- -----------------------------
Web Assembly: Baseline  79'233 µs/iter (78'856 µs … 79'569 µs) 79'427 µs 79'569 µs 79'569 µs
Web Assembly: Latest       111 ms/iter       (110 ms … 111 ms)    111 ms    111 ms    111 ms
Web Assembly: Current      109 ms/iter       (109 ms … 110 ms)    109 ms    110 ms    110 ms
Node API: Current       65'109 µs/iter (62'956 µs … 66'500 µs) 66'400 µs 66'500 µs 66'500 µs

summary for movies.findMany({ where: {...}, include: { cast: true } take: 2000 }) (m2m)
  Web Assembly: Current
   1.68x slower than Node API: Current
   1.38x slower than Web Assembly: Baseline
   1.01x faster than Web Assembly: Latest

• movies.findMany({ take: 2000, include: { cast: { include: { person: true } } } })
-------------------------------------------------------------- -----------------------------
Web Assembly: Baseline   1'023 ms/iter   (1'009 ms … 1'045 ms)  1'038 ms  1'045 ms  1'045 ms
Web Assembly: Latest     1'326 ms/iter   (1'318 ms … 1'348 ms)  1'337 ms  1'348 ms  1'348 ms
Web Assembly: Current    1'304 ms/iter   (1'292 ms … 1'319 ms)  1'313 ms  1'319 ms  1'319 ms
Node API: Current          910 ms/iter       (873 ms … 937 ms)    935 ms    937 ms    937 ms

summary for movies.findMany({ take: 2000, include: { cast: { include: { person: true } } } })
  Web Assembly: Current
   1.43x slower than Node API: Current
   1.28x slower than Web Assembly: Baseline
   1.02x faster than Web Assembly: Latest

• movie.findMany({ where: { ... }, take: 2000, include: { cast: { include: { person: true } } } })
-------------------------------------------------------------- -----------------------------
Web Assembly: Baseline     145 ms/iter       (144 ms … 146 ms)    145 ms    146 ms    146 ms
Web Assembly: Latest       190 ms/iter       (189 ms … 193 ms)    193 ms    193 ms    193 ms
Web Assembly: Current      186 ms/iter       (185 ms … 187 ms)    187 ms    187 ms    187 ms
Node API: Current          113 ms/iter       (110 ms … 115 ms)    114 ms    115 ms    115 ms

summary for movie.findMany({ where: { ... }, take: 2000, include: { cast: { include: { person: true } } } })
  Web Assembly: Current
   1.65x slower than Node API: Current
   1.29x slower than Web Assembly: Baseline
   1.02x faster than Web Assembly: Latest

• movie.findMany({ where: { reviews: { author: { ... } }, take: 100 }) (to-many -> to-one)
-------------------------------------------------------------- -----------------------------
Web Assembly: Baseline   1'058 µs/iter     (998 µs … 1'755 µs)  1'049 µs  1'610 µs  1'755 µs
Web Assembly: Latest     1'391 µs/iter   (1'323 µs … 2'190 µs)  1'382 µs  2'018 µs  2'190 µs
Web Assembly: Current    1'378 µs/iter   (1'298 µs … 2'328 µs)  1'368 µs  2'260 µs  2'328 µs
Node API: Current          768 µs/iter     (708 µs … 1'356 µs)    787 µs    867 µs  1'356 µs

summary for movie.findMany({ where: { reviews: { author: { ... } }, take: 100 }) (to-many -> to-one)
  Web Assembly: Current
   1.79x slower than Node API: Current
   1.3x slower than Web Assembly: Baseline
   1.01x faster than Web Assembly: Latest

• movie.findMany({ where: { cast: { person: { ... } }, take: 100 }) (m2m -> to-one)
-------------------------------------------------------------- -----------------------------
Web Assembly: Baseline   1'023 µs/iter     (980 µs … 1'704 µs)  1'026 µs  1'423 µs  1'704 µs
Web Assembly: Latest     1'370 µs/iter   (1'305 µs … 2'192 µs)  1'371 µs  2'094 µs  2'192 µs
Web Assembly: Current    1'378 µs/iter   (1'304 µs … 2'184 µs)  1'368 µs  2'074 µs  2'184 µs
Node API: Current          786 µs/iter     (718 µs … 1'298 µs)    801 µs    895 µs  1'298 µs

summary for movie.findMany({ where: { cast: { person: { ... } }, take: 100 }) (m2m -> to-one)
  Web Assembly: Current
   1.75x slower than Node API: Current
   1.35x slower than Web Assembly: Baseline
   1.01x slower than Web Assembly: Latest

After changes in 374fc28

remove special handling for "$__prisma_null"

75a4df4

query-engine/driver-adapters/src/conversion/js_to_quaint.rs

@SevInf

… <-> DA contract. To be re-enabled and re-evaluated in a follow-up PR per convo with @SevInf

Co-authored-by: Serhii Tatarintsev <tatarintsev@prisma.io>

SevInf · 2024-05-24T12:48:38Z

.github/workflows/wasm-benchmarks.yml


      - name: Run benchmarks
        id: bench
+        if: false


Note for posteriority: temprarily disabled, as we can't run benchmarks against older version of WASM engine without using driver adapters too: https://github.com/prisma/team-orm/issues/1152

…an correctly handle `i64`s (#4883)" This reverts commit f742678. Temporary reverting the change. It is interdependent with prisma/prisma#24269 and neither PR works correctly without the other. The plan was to let engines CI to temporarily go red and fix it immediately by merging client PR. However, engine release pipeline is broken for unrelated reason and this is not possible. Just to limit amount of broken things in progress, we are reverting original PR. It is expected we restore it with no changes once release pipeline is fixed.

…an correctly handle `i64`s (#4883)" (#4886) This reverts commit f742678. Temporary reverting the change. It is interdependent with prisma/prisma#24269 and neither PR works correctly without the other. The plan was to let engines CI to temporarily go red and fix it immediately by merging client PR. However, engine release pipeline is broken for unrelated reason and this is not possible. Just to limit amount of broken things in progress, we are reverting original PR. It is expected we restore it with no changes once release pipeline is fixed.

@SevInf

…ctly handle `i64`s (#4883) * One half of the fix for: prisma/prisma#23926 * Unexcludes pg, neon, and PS for the through_relations::common_types test * Instead of receiving pre-handled JSON by DAs, we now expect strings and will perform JSON parsing in Quaint. * Removed special handling for "$__prisma_null" due to the aforementioned * Temporarily disable wasm-benchmarks due to breaking change in engines <-> DA contract. To be re-enabled and re-evaluated in a follow-up PR per convo with @SevInf --------- Co-authored-by: Serhii Tatarintsev <tatarintsev@prisma.io>

@SevInf

* One half of the fix for: prisma/prisma#23926 * Unexcludes pg, neon, and PS for the through_relations::common_types test * Instead of receiving pre-handled JSON by DAs, we now expect strings and will perform JSON parsing in Quaint. * Removed special handling for "$__prisma_null" due to the aforementioned * Temporarily disable wasm-benchmarks due to breaking change in engines <-> DA contract. To be re-enabled and re-evaluated in a follow-up PR per convo with @SevInf --------- Co-authored-by: Sophie <29753584+Druue@users.noreply.github.com>

fix prisma/prisma#23926

374fc28

unexclude common_types test for pg, neon, and PS

Druue requested a review from a team as a code owner May 23, 2024 13:52

Druue requested review from Weakky and removed request for a team May 23, 2024 13:52

Druue mentioned this pull request May 23, 2024

fix(pg / neon/ PS): Do not parse JSON - send it directly to engines prisma/prisma#24269

Merged

Druue changed the title ~~tech(quaint/DA): handle JSON parsing engines side so that we can correctly handle i64s~~ fix(quaint/DA): handle JSON parsing engines side so that we can correctly handle i64s May 23, 2024

Druue added this to the 5.15.0 milestone May 23, 2024

DRIVER_ADAPTERS_BRANCH=fix/bigint-conversion use prisma/prisma branch

1ea54b7

Druue requested a review from SevInf May 23, 2024 14:32

Sophie Atkins added 3 commits May 23, 2024 17:15

parse json in quaint

1994310

DRIVER_ADAPTERS_BRANCH=fix/bigint-conversion

75a4df4

remove special handling for "$__prisma_null"

DRIVER_ADAPTERS_BRANCH=fix/bigint-conversion

774b0f5

75a4df4

SevInf reviewed May 23, 2024

View reviewed changes

query-engine/driver-adapters/src/conversion/js_to_quaint.rs Outdated Show resolved Hide resolved

SevInf reviewed May 23, 2024

View reviewed changes

query-engine/driver-adapters/src/conversion/js_to_quaint.rs Outdated Show resolved Hide resolved

Sophie Atkins and others added 4 commits May 24, 2024 11:15

Temporarily disable wasm-benchmarks due to breaking change in engines…

91c59b0

… <-> DA contract. To be re-enabled and re-evaluated in a follow-up PR per convo with @SevInf

Update query-engine/driver-adapters/src/conversion/js_to_quaint.rs

d19a30f

Co-authored-by: Serhii Tatarintsev <tatarintsev@prisma.io>

remove JsonNull comment

1a2121e

DRIVER_ADAPTERS_BRANCH=fix/bigint-conversion use prisma/prisma branch

c177bfd

SevInf reviewed May 24, 2024

View reviewed changes

SevInf approved these changes May 24, 2024

View reviewed changes

Druue merged commit f742678 into main May 24, 2024

Druue deleted the fix/23926 branch May 24, 2024 13:06

SevInf mentioned this pull request May 28, 2024

Restore #4883 #4891

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(quaint/DA): handle JSON parsing engines side so that we can correctly handle `i64`s#4883

fix(quaint/DA): handle JSON parsing engines side so that we can correctly handle `i64`s#4883
Druue merged 9 commits intomainfrom
fix/23926

Druue commented May 23, 2024

Uh oh!

codspeed-hq bot commented May 23, 2024 •

edited

Loading

Uh oh!

github-actions bot commented May 23, 2024 •

edited

Loading

Uh oh!

SevInf commented May 23, 2024

Uh oh!

github-actions bot commented May 23, 2024

Uh oh!

Uh oh!

Uh oh!

SevInf May 24, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

Druue commented May 23, 2024

Uh oh!

codspeed-hq bot commented May 23, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

CodSpeed Performance Report

Merging #4883 will not alter performance

Summary

Uh oh!

github-actions bot commented May 23, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

WASM Query Engine file Size

Uh oh!

SevInf commented May 23, 2024

Uh oh!

github-actions bot commented May 23, 2024

✅ WASM query-engine performance won't change substantially (0.987x)

Uh oh!

Uh oh!

Uh oh!

SevInf May 24, 2024

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

codspeed-hq bot commented May 23, 2024 •

edited

Loading

github-actions bot commented May 23, 2024 •

edited

Loading