Skip to content

feat(plugins): Use wazero instead of wasmtime #3042

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kyleconroy merged 8 commits into from
Jan 2, 2024
Merged

feat(plugins): Use wazero instead of wasmtime #3042

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5e3d938
feat(plugins): Use wazero instead of wasmtime
kyleconroy Dec 5, 2023
2878527
Remove wasm build tags
kyleconroy Dec 5, 2023
7517d03
Update internal/ext/wasm/wasm.go
kyleconroy Dec 6, 2023
89f4d8b
Update internal/ext/wasm/wasm.go
kyleconroy Dec 6, 2023
0914cad
Fix build
kyleconroy Dec 6, 2023
245563d
Suggestions for PR #3042 (#3082)
anuraaga Jan 2, 2024
e3cc250
Merge branch 'main' into kyle/wazero
kyleconroy Jan 2, 2024
18fbb55
Handle error from instantiate
kyleconroy Jan 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove wasm build tags
  • Loading branch information
@kyleconroy
kyleconroy committed Dec 5, 2023
commit 2878527f82036821c020f5f6c7238c483d3b463d
1 change: 0 additions & 1 deletion internal/endtoend/case_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ type Exec struct {
Contexts []string `json:"contexts"`
Process string `json:"process"`
OS []string `json:"os"`
WASM bool `json:"wasm"`
Env map[string]string `json:"env"`
}

Expand Down
5 changes: 0 additions & 5 deletions internal/endtoend/endtoend_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import (

"github.com/sqlc-dev/sqlc/internal/cmd"
"github.com/sqlc-dev/sqlc/internal/config"
"github.com/sqlc-dev/sqlc/internal/ext/wasm"
"github.com/sqlc-dev/sqlc/internal/opts"
)

Expand Down Expand Up @@ -177,10 +176,6 @@ func TestReplay(t *testing.T) {
}
}

if args.WASM && !wasm.Enabled() {
t.Skipf("wasm support not enabled")
}

if len(args.OS) > 0 {
if !slices.Contains(args.OS, runtime.GOOS) {
t.Skipf("unsupported os: %s", runtime.GOOS)
Expand Down
3 changes: 0 additions & 3 deletions internal/endtoend/testdata/wasm_plugin_sqlc_gen_greeter/exec.json
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions internal/endtoend/testdata/wasm_plugin_sqlc_gen_test/exec.json
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions internal/ext/wasm/nowasm.go
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions internal/ext/wasm/wasm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
//go:build !nowasm && cgo && ((linux && amd64) || (linux && arm64) || (darwin && amd64) || (darwin && arm64) || (windows && amd64))

// The above build constraint is based of the cgo directives in this file:
// https://github.com/bytecodealliance/wasmtime-go/blob/main/ffi.go
package wasm

import (
Expand Down Expand Up @@ -33,13 +29,6 @@ import (
"github.com/sqlc-dev/sqlc/internal/plugin"
)

func Enabled() bool {
return true
}

// This version must be updated whenever the wasmtime-go dependency is updated
const wasmtimeVersion = `v14.0.0`

func cacheDir() (string, error) {
cache := os.Getenv("SQLCCACHE")
if cache != "" {
Expand Down