Skip to content

Commit dfdef76

Browse files
committed
fix
1 parent bf3dc0a commit dfdef76

File tree

2 files changed

+43
-36
lines changed

2 files changed

+43
-36
lines changed

src/common/base/src/runtime/time_series/time_series_profile.rs

Lines changed: 43 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ use std::mem::variant_count;
1717
use std::sync::atomic::AtomicUsize;
1818
use std::sync::atomic::Ordering;
1919
use std::sync::Arc;
20-
use std::time::Duration;
2120

2221
use concurrent_queue::ConcurrentQueue;
2322
use log::info;
@@ -146,7 +145,7 @@ impl TimeSeriesProfile {
146145
pub stats: Vec<(usize, usize)>,
147146
}
148147
info!(
149-
target: "databend::log::time_series_stats",
148+
target: "databend::log::time_series",
150149
"{}",
151150
serde_json::to_string(&TimeSeriesStatistics{
152151
query_id: self.query_id.clone(),
@@ -164,39 +163,48 @@ impl TimeSeriesProfile {
164163
}
165164
}
166165

167-
#[test]
168-
fn test_time_series_profile() {
169-
let time_series_profile = TimeSeriesProfile::create(1, "test_query_id".to_string());
170-
time_series_profile.record_point(ProfileStatisticsName::OutputRows, 100);
171-
time_series_profile.record_point(ProfileStatisticsName::OutputRows, 200);
172-
time_series_profile.record_point(ProfileStatisticsName::OutputBytes, 400);
173-
let batch = Vec::from_iter(
174-
time_series_profile.items[TimeSeriesProfileStatisticsName::OutputRows as usize]
175-
.queue
176-
.try_iter(),
177-
);
178-
assert_eq!(batch.len(), 1);
179-
let batch = Vec::from_iter(
180-
time_series_profile.items[TimeSeriesProfileStatisticsName::OutputBytes as usize]
181-
.queue
182-
.try_iter(),
183-
);
184-
assert_eq!(batch.len(), 1);
185-
std::thread::sleep(Duration::from_millis(1100));
186-
time_series_profile.record_point(ProfileStatisticsName::OutputRows, 300);
187-
let batch = Vec::from_iter(
188-
time_series_profile.items[TimeSeriesProfileStatisticsName::OutputRows as usize]
189-
.queue
190-
.try_iter(),
191-
);
192-
assert_eq!(batch.len(), 1);
193-
}
166+
#[cfg(test)]
167+
mod tests {
168+
use std::time::Duration;
169+
170+
use super::*;
171+
#[test]
172+
fn test_time_series_profile() {
173+
let time_series_profile = TimeSeriesProfile::create(1, "test_query_id".to_string());
174+
time_series_profile.record_point(ProfileStatisticsName::OutputRows, 100);
175+
time_series_profile.record_point(ProfileStatisticsName::OutputRows, 200);
176+
time_series_profile.record_point(ProfileStatisticsName::OutputBytes, 400);
177+
let batch = Vec::from_iter(
178+
time_series_profile.items[TimeSeriesProfileStatisticsName::OutputRows as usize]
179+
.queue
180+
.try_iter(),
181+
);
182+
assert_eq!(batch.len(), 1);
183+
assert_eq!(batch[0].1, 100);
184+
let batch = Vec::from_iter(
185+
time_series_profile.items[TimeSeriesProfileStatisticsName::OutputBytes as usize]
186+
.queue
187+
.try_iter(),
188+
);
189+
assert_eq!(batch.len(), 1);
190+
assert_eq!(batch[0].1, 400);
191+
std::thread::sleep(Duration::from_millis(1100));
192+
time_series_profile.record_point(ProfileStatisticsName::OutputRows, 300);
193+
let batch = Vec::from_iter(
194+
time_series_profile.items[TimeSeriesProfileStatisticsName::OutputRows as usize]
195+
.queue
196+
.try_iter(),
197+
);
198+
assert_eq!(batch.len(), 1);
199+
assert_eq!(batch[0].1, 300);
200+
}
194201

195-
#[test]
196-
fn test_time_series_enum() {
197-
let len = variant_count::<TimeSeriesProfileStatisticsName>();
198-
for i in 0..len {
199-
let name = TimeSeriesProfileStatisticsName::from(i);
200-
assert_eq!(name as usize, i);
202+
#[test]
203+
fn test_time_series_enum() {
204+
let len = variant_count::<TimeSeriesProfileStatisticsName>();
205+
for i in 0..len {
206+
let name = TimeSeriesProfileStatisticsName::from(i);
207+
assert_eq!(name as usize, i);
208+
}
201209
}
202210
}

src/query/service/src/pipelines/executor/executor_graph.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ use databend_common_pipeline_core::Pipeline;
4141
use databend_common_pipeline_core::PlanProfile;
4242
use fastrace::prelude::*;
4343
use log::debug;
44-
use log::info;
4544
use log::trace;
4645
use log::warn;
4746
use parking_lot::Condvar;

0 commit comments

Comments
 (0)