Skip to content

Commit

Permalink
fix: re-enable SingleDistinctToGroupBy (#594)
Browse files Browse the repository at this point in the history
* Re-enable SingleDistinctToGroupBy

* fix lock file
  • Loading branch information
jiacai2050 committed Feb 1, 2023
1 parent 7d6c0d9 commit 1ab3b20
Show file tree
Hide file tree
Showing 7 changed files with 148 additions and 87 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/ci.yml
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

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

9 changes: 6 additions & 3 deletions Makefile
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
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

0 comments on commit 1ab3b20

Please sign in to comment.