Skip to content

Commit

Permalink
fix: compiler errors under non-default features (#2761)
Browse files Browse the repository at this point in the history
* feat: bump prost and fix pprof feature compiler errors

* feat: fix compiler errors on tokio-console

* chore: fix compiler errors

* ci: add all features check to ci
  • Loading branch information
evenyag authored Nov 16, 2023
1 parent d2cf72e commit 1420353
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 16 deletions.
31 changes: 20 additions & 11 deletions Cargo.lock

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

4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,11 @@ sqlness-test: ## Run sqlness test.

.PHONY: check
check: ## Cargo check all the targets.
cargo check --workspace --all-targets
cargo check --workspace --all-targets --all-features

.PHONY: clippy
clippy: ## Check clippy rules.
cargo clippy --workspace --all-targets -F pyo3_backend -- -D warnings
cargo clippy --workspace --all-targets --all-features -- -D warnings

.PHONY: fmt-check
fmt-check: ## Check code format.
Expand Down
1 change: 0 additions & 1 deletion src/common/telemetry/src/logging.rs
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,6 @@ pub fn init_global_logging(

Registry::default()
.with(tokio_console_layer)
.with(JsonStorageLayer)
.with(stdout_logging_layer)
.with(file_logging_layer)
.with(err_file_logging_layer.with_filter(filter::LevelFilter::ERROR))
Expand Down
1 change: 1 addition & 0 deletions src/file-engine/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ default = []
test = ["common-test-util"]

[dependencies]
api = { workspace = true, optional = true }
async-trait = "0.1"
common-catalog.workspace = true
common-datasource.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion src/file-engine/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ pub(crate) mod query;
pub(crate) mod region;

#[cfg(any(test, feature = "test"))]
pub(crate) mod test_util;
pub mod test_util;

use datatypes::schema::ColumnSchema;
use serde::{Deserialize, Serialize};
Expand Down
2 changes: 1 addition & 1 deletion src/servers/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ parking_lot = "0.12"
pgwire = "0.16"
pin-project = "1.0"
postgres-types = { version = "0.2", features = ["with-chrono-0_4"] }
pprof = { version = "0.11", features = [
pprof = { version = "0.13", features = [
"flamegraph",
"prost-codec",
"protobuf",
Expand Down

0 comments on commit 1420353

Please sign in to comment.