Skip to content

feat(*): initial n-api implementation#5681

Merged
Jolg42 merged 42 commits intomasterfrom
integration/napi
Mar 4, 2021
Merged

feat(*): initial n-api implementation#5681
Jolg42 merged 42 commits intomasterfrom
integration/napi

Conversation

@williamluke4
Copy link
Copy Markdown

@williamluke4 williamluke4 commented Feb 16, 2021 •
edited
Loading

closes #4911
closes #5690

Todo

  • PR added libQueryEngineNapi to the fetch engine
  • PR added the funcionality to the engine-wrapper
  • PR allows libQueryEngine to be picked up by ntf

Testing will be added in a separate PR

@williamluke4 williamluke4 mentioned this pull request Feb 16, 2021
Closed
timsuchanek
timsuchanek reviewed Feb 16, 2021
View reviewed changes
Comment thread src/packages/client/src/utils/generateInFolder.ts Outdated
timsuchanek
timsuchanek reviewed Feb 16, 2021
View reviewed changes
Comment thread src/packages/engine-core/src/NAPIEngine.ts Outdated
timsuchanek
timsuchanek reviewed Feb 16, 2021
View reviewed changes
Comment thread src/packages/fetch-engine/src/download.ts Outdated
williamluke4
williamluke4 commented Feb 17, 2021
View reviewed changes
Comment thread src/packages/engine-core/src/NodeEngine.ts Outdated
@williamluke4 williamluke4 mentioned this pull request Feb 17, 2021
Merged
1 task
@williamluke4 williamluke4 force-pushed the integration/napi branch 10 times, most recently from 1ff40b4 to c44bd66 Compare February 25, 2021 16:13
williamluke4
williamluke4 commented Mar 3, 2021
View reviewed changes
Comment thread src/packages/fetch-engine/src/__tests__/napi.test.ts Outdated
williamluke4
williamluke4 commented Mar 3, 2021
View reviewed changes
Comment thread src/packages/sdk/src/getGenerators.ts
@williamluke4 williamluke4 changed the title chore: wip n-api feat(*): initial n-api implementation Mar 3, 2021
@williamluke4 williamluke4 marked this pull request as ready for review March 3, 2021 13:17
@williamluke4 williamluke4 requested a review from Jolg42 March 3, 2021 13:19
Jolg42
Jolg42 reviewed Mar 3, 2021
View reviewed changes
Comment thread src/packages/client/src/generation/generateClient.ts Outdated
Jolg42
Jolg42 reviewed Mar 3, 2021
View reviewed changes
Comment thread src/packages/client/src/generation/generateClient.ts Outdated
Jolg42
Jolg42 reviewed Mar 3, 2021
View reviewed changes
Comment thread src/packages/client/src/generation/TSClient/TSClient.ts Outdated
Jolg42
Jolg42 reviewed Mar 3, 2021
View reviewed changes
Comment thread src/packages/client/src/runtime/getPrismaClient.ts
Jolg42
Jolg42 reviewed Mar 3, 2021
View reviewed changes
Comment thread src/packages/client/src/runtime/getPrismaClient.ts
Jolg42
Jolg42 reviewed Mar 3, 2021
View reviewed changes
Copy link
Copy Markdown
Contributor

@Jolg42 Jolg42 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Big PR!

Maybe a good idea to wait for Tim's eyes here I think.

Comment thread src/packages/engine-core/src/NAPIEngine.ts Outdated
Comment thread src/packages/engine-core/src/NAPIEngine.ts Outdated
Comment thread src/packages/engine-core/src/NAPIEngine.ts Outdated
Comment thread src/packages/engine-core/src/NAPIEngine.ts
Comment thread src/packages/engine-core/src/NAPIEngine.ts Outdated
Comment thread src/packages/engine-core/src/NAPIEngine.ts Outdated
Comment thread src/packages/sdk/src/logger.ts
Comment thread src/packages/client/src/runtime/getPrismaClient.ts
Comment thread src/packages/engine-core/src/NAPIEngine.ts
@williamluke4
Copy link
Copy Markdown
Author

williamluke4 commented Mar 4, 2021

Big PR!

Maybe a good idea to wait for Tim's eyes here I think.

I disagree with this. This is the start of a sprint and the best way to test this is to have it in the dev build so people can use/test it! What are your main concerns?

@williamluke4 williamluke4 requested a review from Jolg42 March 4, 2021 09:05
@Jolg42
Copy link
Copy Markdown
Contributor

Jolg42 commented Mar 4, 2021

Flaky test by timeout

FAIL src/__tests__/version.test.ts (7.934 s)
  ● version › version with custom binaries

    : Timeout - Async callback was not invoked within the 6000 ms timeout specified by jest.setTimeout.Timeout - Async callback was not invoked within the 6000 ms timeout specified by

Not the first time I see it, so you can probably bump the timeout if you want / or we retry later.

Jolg42
Jolg42 reviewed Mar 4, 2021
View reviewed changes
Comment thread src/packages/engine-core/src/NAPIEngine.ts Outdated
Jolg42
Jolg42 reviewed Mar 4, 2021
View reviewed changes
Comment thread src/packages/engine-core/src/NAPIEngine.ts
Jolg42
Jolg42 approved these changes Mar 4, 2021
View reviewed changes
Copy link
Copy Markdown
Contributor

@Jolg42 Jolg42 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well done ❤️

@timsuchanek if you can check this next week, important code here 😉

@Jolg42 Jolg42 merged commit a94d31b into master Mar 4, 2021
@Jolg42 Jolg42 deleted the integration/napi branch March 4, 2021 10:05
Jolg42 added a commit that referenced this pull request Mar 9, 2021
@Jolg42
Merge branch 'master' into pr/migrate-seed-export
df9f836 
* master: (50 commits)
  test: update jest config
  chore: cov update for gh
  fix(client): logger (#6025)
  feat(migrate,cli): Migrate GA - remove --preview-feature flag (#5992)
  chore(deps): update dependency rollup-plugin-dts to v3 (#6002)
  chore(deps): update devdependencies (non-major)
  chore(deps): update definitelytyped
  fix(cli,migrate): cleanup cli help output (#5991)
  fix(deps): update engines to v2.19.0-6.e2a0535824021eab0bd0154e6f757793f28492b9 (#5988)
  fix(deps): update engines to v2.19.0-5.7c91d2be55eb772e555d819967662dda260cc88f (#5973)
  chore(deps): update dependency sqlite3 to v5.0.2 (#5672)
  fix(migrate): db help cmd output (#5959)
  feat(*): initial n-api implementation (#5681)
  fix(deps): update engines to v2.19.0-3.5cf960635dd97ec158fde55add7659c6745aef09
  fix(deps): update engines to v2.19.0-2.7089e3096f73ed2f57d18b0881f1d95a715c3c2c
  chore(deps): update devdependencies (non-major)
  chore(deps): update studio to v0.357.0 (#5944)
  fix(deps): update engines to v2.19.0-1.6ed5c6d9e3f6a2a1dadbc1cf183436b290c6cbc7 (#5945)
  fix(deps): update engines to v2.18.0-34.da6fafb57b24e0b61ca20960c64e2d41f9e8cff1 (#5942)
  fix: postinstall trigger in yarn workspace (#5550)
  ...

# Conflicts:
#	src/packages/migrate/src/__tests__/DbSeed.test.ts
#	src/packages/migrate/src/utils/seed.ts
timsuchanek
timsuchanek reviewed Mar 12, 2021
View reviewed changes
Comment thread src/packages/client/src/generation/generateClient.ts
: binaryPaths.queryEngine

if (!binaryPaths.queryEngine) {
if (!enginePath) {
Copy link
Copy Markdown
Contributor

@timsuchanek timsuchanek Mar 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe rename to enginePaths

Andrew-Colman pushed a commit to Andrew-Colman/prisma that referenced this pull request Aug 7, 2021
@Jolg42 @timsuchanek @Andrew-Colman
feat(*): initial n-api implementation (prisma#5681)
f3bf826 
Co-authored-by: Joël Galeran <[email protected]>
Co-authored-by: timsuchanek <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers

@timsuchanek timsuchanek timsuchanek left review comments

@Jolg42 Jolg42 Jolg42 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

2.19.0

Development

Successfully merging this pull request may close these issues.

Log streaming interface for n-api Prisma Client Node-API Support

3 participants

@williamluke4 @Jolg42 @timsuchanek