Skip to content
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.

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

chore: move slt runner into main binary #2401

Merged
merged 21 commits into from
Jan 13, 2024
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
39 changes: 18 additions & 21 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,19 +37,15 @@ jobs:
path: |
target/
!target/**/glaredb
!target/**/slt
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- uses: actions/cache@v3
name: slt cache
name: glaredb cache
with:
path: target/debug/slt
path: target/debug/glaredb
key: ${{ github.run_id }}
- name: build
run: just build

- name: build slt
run: just build-slt

static-analysis:
name: Lint and Format
runs-on: ubuntu-latest-8-cores
Expand Down Expand Up @@ -127,7 +123,6 @@ jobs:
path: |
target/
!target/**/glaredb
!target/**/slt
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}

- name: build python bindings
Expand Down Expand Up @@ -165,7 +160,6 @@ jobs:
path: |
target/
!target/**/glaredb
!target/**/slt
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- name: build node.js bindings
run: just js build-debug
Expand Down Expand Up @@ -198,14 +192,13 @@ jobs:
path: |
target/
!target/**/glaredb
!target/**/slt
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- name: pg protocol test (script)
run: |
PROTOC=`just protoc && just --evaluate PROTOC` ./scripts/protocol-test.sh

- name: pg protocol tests (slt runner)
run: just slt-bin -v 'pgproto/*'
run: just slt-bin-debug 'pgproto/*'

sql-logic-tests:
name: SQL Logic Tests
Expand All @@ -219,25 +212,25 @@ jobs:
uses: actions/checkout@v4
- uses: extractions/setup-just@v1
- uses: actions/cache@v3
name: slt cache
name: glaredb cache
with:
path: target/debug/slt
path: target/debug/glaredb
key: ${{ github.run_id }}
- name: public sql logic tests DEBUG
if: ${{ env.ACTIONS_STEP_DEBUG == 'true' }}
run: |
if [[ "${{ matrix.protocol }}" == "rpc" ]]; then
just rpc-tests
else
just slt-bin -v --protocol=${{ matrix.protocol }} 'sqllogictests/*'
just slt-bin-debug --protocol=${{ matrix.protocol }} 'sqllogictests/*'
fi
- name: public sql logic tests
if: ${{ env.ACTIONS_STEP_DEBUG != 'true' }}
run: |
if [[ "${{ matrix.protocol }}" == "rpc" ]]; then
just rpc-tests
else
just slt-bin -v --protocol=${{ matrix.protocol }} 'sqllogictests/*'
just slt-bin-debug --protocol=${{ matrix.protocol }} 'sqllogictests/*'
fi

process-integration-tests:
Expand Down Expand Up @@ -274,8 +267,12 @@ jobs:
path: |
target/
!target/**/glaredb
!target/**/slt
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- uses: actions/cache@v3
name: glaredb cache
with:
path: target/debug/glaredb
key: ${{ github.run_id }}
- uses: actions/cache@v3
name: py cache
with:
Expand All @@ -297,9 +294,9 @@ jobs:
uses: actions/checkout@v4
- uses: extractions/setup-just@v1
- uses: actions/cache@v3
name: slt cache
name: glaredb cache
with:
path: target/debug/slt
path: target/debug/glaredb
key: ${{ github.run_id }}

- name: GCP authenticate
Expand Down Expand Up @@ -446,9 +443,9 @@ jobs:
uses: actions/checkout@v4
- uses: extractions/setup-just@v1
- uses: actions/cache@v3
name: slt cache
name: glaredb cache
with:
path: target/debug/slt
path: target/debug/glaredb
key: ${{ github.run_id }}
- name: run tests (slt)
run: |
Expand Down Expand Up @@ -477,9 +474,9 @@ jobs:
uses: actions/checkout@v4
- uses: extractions/setup-just@v1
- uses: actions/cache@v3
name: slt cache
name: glaredb cache
with:
path: target/debug/slt
path: target/debug/glaredb
key: ${{ github.run_id }}

- name: snowflake setup (SnowSQL)
Expand Down
88 changes: 37 additions & 51 deletions Cargo.lock

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

17 changes: 10 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,26 @@ codegen-units = 1
strip = true

[workspace.dependencies]
clap = { version = "4.4.16", features = ["derive"] }
datafusion = { version = "32.0", features = ["avro"] }
arrow-flight = { version = "47.0.0", features = ["flight-sql-experimental"] }
datafusion-proto = { version = "32.0" }
reqwest = { version = "0.11.23", default-features = false, features = ["json", "rustls-tls"] }
serde = { version = "1.0", features = ["derive"] }
tokio = { version = "1", features = ["full"] }
tonic = { version = "0.10", features = ["transport", "tls", "tls-roots"] }
anyhow = "1.0.79"
async-trait = "0.1.77"
chrono = "0.4.31"
datafusion = { version = "32.0", features = ["avro"] }
datafusion-proto = { version = "32.0" }
futures = "0.3.30"
object_store = { version = "0.7" }
object_store = "0.7"
prost = "0.12"
prost-build = "0.12"
prost-types = "0.12"
reqwest = { version = "0.11.23", default-features = false, features = ["json", "rustls-tls"] }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0.111"
tempfile = "3.9.0"
thiserror = "1.0"
tokio = { version = "1", features = ["full"] }
tonic = { version = "0.10", features = ["transport", "tls", "tls-roots"] }
tracing = "0.1"
url = "2.5.0"

[workspace.dependencies.deltalake]
Expand Down
8 changes: 4 additions & 4 deletions crates/bench_runner/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ edition = { workspace = true }
logutil = {path = "../logutil"}
glaredb = {path = "../glaredb"}
pgsrv = {path = "../pgsrv"}
anyhow = { workspace = true }
async-trait = { workspace = true }
clap = { workspace = true }
tokio = { workspace = true }
tracing = { workspace = true }
tokio-postgres = "0.7.8"
anyhow = "1.0"
clap = { version = "4.4.16", features = ["derive"] }
async-trait = { workspace = true }
glob = "0.3.1"
regex = "1.8.1"
tracing = "0.1"
2 changes: 1 addition & 1 deletion crates/catalog/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ protogen = { path = "../protogen" }
thiserror.workspace = true
tokio = { workspace = true }
tonic = { workspace = true }
tracing = "0.1"
tracing = { workspace = true }
uuid = { version = "1.6.1", features = ["v4", "fast-rng", "macro-diagnostics"] }

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crates/datafusion_ext/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ async-recursion = "1.0.4"
uuid = { version = "1.6.1", features = ["v4", "fast-rng", "macro-diagnostics"] }
regex = "1.8"
once_cell = "1.19.0"
tracing = "0.1"
tracing = { workspace = true }
thiserror.workspace = true
decimal = { path = "../decimal" }
protogen = { path = "../protogen" }
Expand Down
Loading
Loading