Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
# 1
check:
name: Rust project check
runs-on: ubuntu-latest
runs-on: [self-hosted, Linux, X64]
steps:
- uses: actions/checkout@v2
- name: Install latest nightly
Expand Down Expand Up @@ -41,7 +41,7 @@ jobs:
# 2
fmt:
name: Rust fmt
runs-on: ubuntu-latest
runs-on: [self-hosted, Linux, X64]
steps:
- uses: actions/checkout@v2
- name: Install latest nightly
Expand All @@ -59,7 +59,7 @@ jobs:
# 3
e2e:
name: Rust e2e sqllogictest
runs-on: ubuntu-latest
runs-on: [self-hosted, Linux, X64]
steps:
- uses: actions/checkout@v2
- name: Install latest nightly
Expand All @@ -80,7 +80,7 @@ jobs:
# 4
wasm-tests:
name: Wasm cargo tests
runs-on: ubuntu-latest
runs-on: [self-hosted, Linux, X64]
steps:
- uses: actions/checkout@v2

Expand All @@ -106,7 +106,7 @@ jobs:
# 5
wasm-examples:
name: Wasm examples (nodejs)
runs-on: ubuntu-latest
runs-on: [self-hosted, Linux, X64]
steps:
- uses: actions/checkout@v2

Expand Down Expand Up @@ -135,7 +135,7 @@ jobs:
# 6
native-examples:
name: Native examples
runs-on: ubuntu-latest
runs-on: [self-hosted, Linux, X64]
steps:
- uses: actions/checkout@v2

Expand All @@ -150,7 +150,7 @@ jobs:
# 7
python-tests:
name: Python bindings tests
runs-on: ubuntu-latest
runs-on: [self-hosted, Linux, X64]
steps:
- uses: actions/checkout@v2

Expand Down
131 changes: 5 additions & 126 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 7 additions & 17 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@ lmdb = ["dep:lmdb", "dep:lmdb-sys"]
pprof = ["pprof/criterion", "pprof/flamegraph"]
python = ["parser", "dep:pyo3"]
shell = ["parser", "dep:comfy-table", "dep:rustyline"]
wasm = [
"dep:js-sys",
"dep:wasm-bindgen",
"parser",
]

[[bench]]
name = "query_bench"
Expand All @@ -45,17 +50,10 @@ harness = false
required-features = ["pprof"]

[dependencies]
ahash = { version = "0.8" }
bumpalo = { version = "3", default-features = false, features = ["collections"] }
byteorder = { version = "1" }
fixedbitset = { version = "0.4" }
itertools = { version = "0.12" }
ordered-float = { version = "4" }
paste = { version = "1" }
recursive = { version = "0.1" }
kite_sql_serde_macros = { version = "0.2.1", path = "kite_sql_serde_macros" }
siphasher = { version = "1" }
ulid = { version = "1" }

# Optional dependencies for features
comfy-table = { version = "7", default-features = false, optional = true }
Expand Down Expand Up @@ -84,16 +82,8 @@ rocksdb = { version = "0.23", optional = true, default-features = false, feature
rustyline = { version = "14", default-features = false, optional = true }

[target.'cfg(target_arch = "wasm32")'.dependencies]
wasm-bindgen = { version = "0.2.106" }
web-sys = { version = "0.3.83", features = [
"Storage",
"Window",
] }
base64 = { version = "0.21" }
getrandom = { version = "0.2", features = ["js"] }
getrandom_03 = { package = "getrandom", version = "0.3", features = ["wasm_js"] }
js-sys = { version = "0.3.83" }
once_cell = { version = "1" }
wasm-bindgen = { version = "0.2.106", optional = true }
js-sys = { version = "0.3.83", optional = true }

[target.'cfg(target_arch = "wasm32")'.dev-dependencies]
wasm-bindgen-test = "0.3.56"
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ build:

## Build the WebAssembly package (artifact goes to ./pkg).
wasm-build:
$(WASM_PACK) build --release --target nodejs
$(WASM_PACK) build --release --target nodejs -- --features wasm

## Execute wasm-bindgen tests under Node.js (wasm32 target).
test-wasm:
$(WASM_PACK) test --node -- --package kite_sql --lib
$(WASM_PACK) test --node -- --features wasm --package kite_sql --lib

## Run the sqllogictest harness against the configured .slt suite.
test-slt:
Expand Down
Loading
Loading