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.

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

Jump to bottom

fix: re-enable SingleDistinctToGroupBy #594

Merged
merged 2 commits into from
Feb 1, 2023
Merged

fix: re-enable SingleDistinctToGroupBy #594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fef111b
Re-enable SingleDistinctToGroupBy
jiacai2050 Jan 30, 2023
16b9761
fix lock file
jiacai2050 Feb 1, 2023
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
5 changes: 2 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,9 @@ jobs:
- name: Check Lock File
run: |
diff ${LOCK_FILE} ${LOCK_FILE}.bak
- name: Run Sqlness
working-directory: integration_tests
- name: Run black-box tests
run: |
make run
make test-black
env:
RUST_BACKTRACE: "1"
- name: Report Disk Usage
Expand Down
166 changes: 88 additions & 78 deletions Cargo.lock
View file
Open in desktop

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

9 changes: 6 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ build-arm64:
test:
cd $(DIR); cargo test --workspace -- --test-threads=4

test-black:
cd $(DIR)/integration_tests; make run

# grcov needs build first, then run test
build-ut:
echo $(CARGO_INCREMENTAL)
Expand All @@ -38,14 +41,14 @@ test-ut:
echo $(RUSTFLAGS)
echo $(RUSTDOCFLAGS)
#cd $(DIR); cargo test --workspace -- -Z unstable-options --format json | tee results.json; \
#cat results.json | cargo2junit > ${WORKSPACE}/testresult/TEST-all.xml
#cat results.json | cargo2junit > ${WORKSPACE}/testresult/TEST-all.xml
cargo test --workspace

fmt:
cd $(DIR); cargo fmt -- --check

check-cargo-toml:
cd $(DIR); cargo sort --workspace --check
cd $(DIR); cargo sort --workspace --check

check-license:
cd $(DIR); sh scripts/check-license.sh
Expand All @@ -69,7 +72,7 @@ mem-test:
export RUSTFLAGS=-Zsanitizer=memory RUSTDOCFLAGS=-Zsanitizer=memory
cd $(DIR); cargo test -Zbuild-std --target x86_64-unknown-linux-gnu --workspace

# test with miri.
# test with miri.
# only list packages will be tested.
miri:
cd $(DIR); cargo miri test --package arena
Expand Down
2 changes: 1 addition & 1 deletion integration_tests/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ workspace = true
anyhow = "1.0.58"
async-trait = "0.1"
ceresdb-client-rs = { git = "https://github.com/CeresDB/ceresdb-client-rs.git", rev = "a9d9190f4f7b55171ea2ad142fb41dc9909c19c5" }
sqlness = "0.1.1"
sqlness = "0.2"
tokio = { workspace = true }
Loading