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

fix: bug about logging nothing #1250

Merged
merged 3 commits into from
Oct 9, 2023
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
46 changes: 21 additions & 25 deletions Cargo.lock

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

1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ hash_ext = { path = "components/hash_ext" }
hex = "0.4.3"
lz4_flex = { version = "0.11", default-features = false, features = ["frame"] }
lazy_static = "1.4.0"
log = "0.4"
logger = { path = "components/logger" }
lru = "0.7.6"
id_allocator = { path = "components/id_allocator" }
Expand Down
2 changes: 1 addition & 1 deletion analytic_engine/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ generic_error = { workspace = true }
hex = { workspace = true }
id_allocator = { workspace = true }
lazy_static = { workspace = true }
log = { workspace = true }
logger = { workspace = true }
lru = { workspace = true }
macros = { workspace = true }
message_queue = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion analytic_engine/src/compaction/picker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ use std::{
};

use common_types::time::Timestamp;
use log::{debug, info};
use logger::{debug, info};
use macros::define_result;
use snafu::Snafu;
use time_ext::TimeUnit;
Expand Down
2 changes: 1 addition & 1 deletion analytic_engine/src/compaction/scheduler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ use std::{
use async_trait::async_trait;
use common_types::request_id::RequestId;
use futures::{stream::FuturesUnordered, StreamExt};
use log::{debug, error, info, warn};
use logger::{debug, error, info, warn};
use macros::define_result;
use runtime::{JoinHandle, Runtime};
use serde::{Deserialize, Serialize};
Expand Down
2 changes: 1 addition & 1 deletion analytic_engine/src/engine.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ use std::sync::Arc;

use async_trait::async_trait;
use generic_error::BoxError;
use log::{error, info};
use logger::{error, info};
use snafu::{OptionExt, ResultExt};
use table_engine::{
engine::{
Expand Down
2 changes: 1 addition & 1 deletion analytic_engine/src/instance/alter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
use std::collections::HashMap;

use generic_error::BoxError;
use log::info;
use logger::info;
use snafu::{ensure, ResultExt};
use table_engine::table::AlterSchemaRequest;
use wal::{kv_encoder::LogBatchEncoder, manager::WriteContext};
Expand Down
2 changes: 1 addition & 1 deletion analytic_engine/src/instance/close.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

//! Close table logic of instance

use log::{info, warn};
use logger::{info, warn};
use snafu::ResultExt;
use table_engine::engine::CloseTableRequest;

Expand Down
2 changes: 1 addition & 1 deletion analytic_engine/src/instance/create.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
//! Create table logic of instance

use generic_error::BoxError;
use log::info;
use logger::info;
use snafu::{ensure, OptionExt, ResultExt};
use table_engine::{
engine::{CreateTableParams, CreateTableRequest},
Expand Down
2 changes: 1 addition & 1 deletion analytic_engine/src/instance/drop.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

//! Drop table logic of instance

use log::{info, warn};
use logger::{info, warn};
use snafu::ResultExt;
use table_engine::engine::DropTableRequest;

Expand Down
2 changes: 1 addition & 1 deletion analytic_engine/src/instance/flush_compaction.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ use futures::{
stream, SinkExt, TryStreamExt,
};
use generic_error::{BoxError, GenericError};
use log::{debug, error, info};
use logger::{debug, error, info};
use macros::define_result;
use runtime::{Runtime, RuntimeRef};
use snafu::{Backtrace, ResultExt, Snafu};
Expand Down
2 changes: 1 addition & 1 deletion analytic_engine/src/instance/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ use std::sync::Arc;

use common_types::{projected_schema::ProjectedSchema, table::TableId};
use generic_error::{BoxError, GenericError};
use log::{error, info};
use logger::{error, info};
use macros::define_result;
use mem_collector::MemUsageCollector;
use runtime::Runtime;
Expand Down
2 changes: 1 addition & 1 deletion analytic_engine/src/instance/open.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ use std::{
};

use common_types::table::ShardId;
use log::{error, info};
use logger::{error, info};
use object_store::ObjectStoreRef;
use snafu::ResultExt;
use table_engine::{engine::TableDef, table::TableId};
Expand Down
2 changes: 1 addition & 1 deletion analytic_engine/src/instance/read.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ use common_types::{
};
use futures::stream::Stream;
use generic_error::BoxError;
use log::debug;
use logger::debug;
use macros::define_result;
use snafu::{ResultExt, Snafu};
use table_engine::{
Expand Down
2 changes: 1 addition & 1 deletion analytic_engine/src/instance/serial_executor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ use std::{
};

use futures::Future;
use log::{error, warn};
use logger::{error, warn};
use runtime::Runtime;
use table_engine::table::TableId;
use time_ext::InstantExt;
Expand Down
2 changes: 1 addition & 1 deletion analytic_engine/src/instance/wal_replayer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ use async_trait::async_trait;
use common_types::{schema::IndexInWriterSchema, table::ShardId};
use generic_error::BoxError;
use lazy_static::lazy_static;
use log::{debug, error, info, trace};
use logger::{debug, error, info, trace};
use prometheus::{exponential_buckets, register_histogram, Histogram};
use snafu::ResultExt;
use table_engine::table::TableId;
Expand Down
2 changes: 1 addition & 1 deletion analytic_engine/src/instance/write.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ use common_types::{
row::{RowGroup, RowGroupSlicer},
schema::{IndexInWriterSchema, Schema},
};
use log::{debug, error, info, trace, warn};
use logger::{debug, error, info, trace, warn};
use macros::define_result;
use smallvec::SmallVec;
use snafu::{ensure, Backtrace, ResultExt, Snafu};
Expand Down
2 changes: 1 addition & 1 deletion analytic_engine/src/manifest/details.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ use async_trait::async_trait;
use ceresdbproto::manifest as manifest_pb;
use generic_error::{BoxError, GenericError, GenericResult};
use lazy_static::lazy_static;
use log::{debug, info, warn};
use logger::{debug, info, warn};
use macros::define_result;
use object_store::{ObjectStoreRef, Path};
use parquet::data_type::AsBytes;
Expand Down
2 changes: 1 addition & 1 deletion analytic_engine/src/manifest/meta_snapshot.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

//! Meta data of manifest.

use log::debug;
use logger::debug;
use macros::define_result;
use snafu::{ensure, Backtrace, Snafu};

Expand Down
2 changes: 1 addition & 1 deletion analytic_engine/src/memtable/columnar/iter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ use common_types::{
SequenceNumber,
};
use generic_error::BoxError;
use log::trace;
use logger::trace;
use parquet::data_type::AsBytes;
use skiplist::{ArenaSlice, BytewiseComparator, IterRef, Skiplist};
use snafu::{OptionExt, ResultExt};
Expand Down
2 changes: 1 addition & 1 deletion analytic_engine/src/memtable/columnar/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ use common_types::{
time::TimeRange, SequenceNumber,
};
use generic_error::BoxError;
use log::debug;
use logger::debug;
use skiplist::{BytewiseComparator, Skiplist};
use snafu::{ensure, OptionExt, ResultExt};

Expand Down
Loading
Loading