Skip to content

Commit

Permalink
chore(planner): remove z3 (#15663)
Browse files Browse the repository at this point in the history
* chore: remove z3

* chore: improve can filter null
  • Loading branch information
Dousir9 authored May 29, 2024
1 parent e9aee73 commit 67f360b
Show file tree
Hide file tree
Showing 29 changed files with 149 additions and 9,976 deletions.
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,5 @@ benchmark/clickbench/results
# direnv test files
.envrc

# z3
**/.z3-trace

# lychee
.lycheecache
31 changes: 0 additions & 31 deletions Cargo.lock

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

3 changes: 0 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ members = [
"src/query/async_functions",
"src/query/codegen",
"src/query/config",
"src/query/constraint",
"src/query/catalog",
"src/query/sharing",
"src/query/sharing_endpoint",
Expand Down Expand Up @@ -306,6 +305,4 @@ arrow-format = { git = "https://github.com/Xuanwo/arrow-format", rev = "be633a0"
icelake = { git = "https://github.com/icelake-io/icelake", rev = "be8b2c2" }
ethnum = { git = "https://github.com/ariesdevil/ethnum-rs", rev = "4cb05f1" }
async-backtrace = { git = "https://github.com/zhang2014/async-backtrace.git", rev = "dea4553" }
z3 = { git = "https://github.com/prove-rs/z3.rs", rev = "247d308" }
z3-sys = { git = "https://github.com/prove-rs/z3.rs", rev = "247d308" }
# proj = { git = "https://github.com/ariesdevil/proj", rev = "51e1c60" }
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ clean:
rm -f ./nohup.out ./tests/suites/0_stateless/*.stdout-e
rm -rf ./_meta*/ ./_logs*/ ./src/query/service_logs*/ ./src/meta/service/_logs*/ ./stateless_test_data/
rm -rf ./src/common/base/_logs*/ ./src/meta/raft-store/_logs*/ ./src/meta/sled-store/_logs*/
find . \( -type f -name '.z3-trace' -o -type d -name '.databend' \) | xargs rm -rf
rm -rf ./.databend ./query/service/.databend ./meta/service/.databend

genproto:
python -m grpc_tools.protoc -Isrc/common/cloud_control/proto/ --python_out=tests/cloud_control_server/ --grpc_python_out=tests/cloud_control_server/ src/common/cloud_control/proto/task.proto
Expand Down
7 changes: 0 additions & 7 deletions docker/build-tool/musl/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,6 @@ RUN ln -s ${MUSL_TARGET}-gcc /usr/local/bin/musl-gcc

RUN rustup target add ${MUSL_RUST_TARGET}

# needed by z3
RUN ln -s ${MUSL_TARGET}-g++ /usr/local/bin/musl-g++
RUN ln -s ${MUSL_TARGET}-ar /usr/local/bin/musl-ar

# HACK: something wrong with python detection in cmake for z3
RUN ln -s python3.9 /usr/bin/python3.10

# HACK: to link with libstdc++ statically
# ref: https://github.com/rust-lang/rust/issues/36710#issuecomment-364623950
COPY linker.sh /usr/local/bin/linker
Expand Down
3 changes: 1 addition & 2 deletions src/binaries/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,14 @@ publish = { workspace = true }
edition = { workspace = true }

[features]
default = ["simd", "jemalloc", "z3-prove"]
default = ["simd", "jemalloc"]
memory-profiling = [
"databend-meta/memory-profiling",
"databend-query/memory-profiling",
"databend-common-base/memory-profiling",
]
python-udf = ["databend-query/python-udf"]
simd = ["databend-meta/simd", "databend-query/simd"]
z3-prove = ["databend-query/z3-prove"]
jemalloc = ["databend-common-base/jemalloc"]
io-uring = [
"databend-meta/io-uring",
Expand Down
25 changes: 0 additions & 25 deletions src/query/constraint/Cargo.toml

This file was deleted.

143 changes: 0 additions & 143 deletions src/query/constraint/benches/bench.rs

This file was deleted.

Loading

0 comments on commit 67f360b

Please sign in to comment.