fix merge problem

Signed-off-by: Ruihang Xia <[email protected]>
GreptimeTeam · May 6, 2024 · 3623491 · 3623491
1 parent df4239f
commit 3623491
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/src/catalog/src/information_schema/cluster_info.rs b/src/catalog/src/information_schema/cluster_info.rs
@@ -24,7 +24,7 @@ use common_meta::peer::Peer;
 use common_query::physical_plan::TaskContext;
 use common_recordbatch::adapter::RecordBatchStreamAdapter;
 use common_recordbatch::{RecordBatch, SendableRecordBatchStream};
-use common_telemetry::logging::warn;
+use common_telemetry::warn;
 use common_time::timestamp::Timestamp;
 use datafusion::physical_plan::stream::RecordBatchStreamAdapter as DfRecordBatchStreamAdapter;
 use datafusion::physical_plan::streaming::PartitionStream as DfPartitionStream;

diff --git a/src/servers/src/opentsdb.rs b/src/servers/src/opentsdb.rs
@@ -17,10 +17,6 @@ pub mod codec;
 use api::v1::RowInsertRequests;
 use common_grpc::precision::Precision;
 use common_query::prelude::{GREPTIME_TIMESTAMP, GREPTIME_VALUE};
-use common_runtime::Runtime;
-use common_telemetry::{debug, error, warn};
-use futures::StreamExt;
-use tokio::sync::broadcast;
 
 use self::codec::DataPoint;
 use crate::error::Result;