fix ci

GreptimeTeam · Jun 6, 2024 · 333ce0f · 333ce0f
1 parent 21cfdf3
commit 333ce0f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/datanode/src/error.rs b/src/datanode/src/error.rs
@@ -75,7 +75,7 @@ pub enum Error {
  DecodeLogicalPlan {
  #[snafu(implicit)]
  location: Location,
- source: substrait::error::Error,
+ source: common_query::error::Error,
  },
 
  #[snafu(display("Incorrect internal state: {}", state))]

diff --git a/src/datanode/src/region_server.rs b/src/datanode/src/region_server.rs
@@ -56,14 +56,13 @@ use store_api::metric_engine_consts::{
 use store_api::region_engine::{RegionEngineRef, RegionRole, SetReadonlyResponse};
 use store_api::region_request::{AffectedRows, RegionCloseRequest, RegionRequest};
 use store_api::storage::RegionId;
-use substrait::{DFLogicalSubstraitConvertor, SubstraitPlan};
 use tonic::{Request, Response, Result as TonicResult};
 
 use crate::error::{
  self, BuildRegionRequestsSnafu, DataFusionSnafu, DecodeLogicalPlanSnafu,
  ExecuteLogicalPlanSnafu, FindLogicalRegionsSnafu, HandleRegionRequestSnafu,
- RegionEngineNotFoundSnafu, RegionNotFoundSnafu, RegionNotReadySnafu, Result,
- StopRegionEngineSnafu, UnexpectedSnafu, UnsupportedOutputSnafu,
+ NewPlanDecoderSnafu, RegionEngineNotFoundSnafu, RegionNotFoundSnafu, RegionNotReadySnafu,
+ Result, StopRegionEngineSnafu, UnexpectedSnafu, UnsupportedOutputSnafu,
 };
 use crate::event_listener::RegionServerEventListenerRef;
 
@@ -164,15 +163,16 @@ impl RegionServer {
  .as_ref()
  .map(|h| Arc::new(h.into()))
  .unwrap_or_else(|| Arc::new(QueryContextBuilder::default().build()));
- let state = self
+
+ let decoder = self
  .inner
  .query_engine
  .engine_context(query_ctx)
- .state()
- .clone();
+ .new_plan_decoder()
+ .context(NewPlanDecoderSnafu)?;
 
- let plan = DFLogicalSubstraitConvertor
- .decode(Bytes::from(request.plan), catalog_list, state)
+ let plan = decoder
+ .decode(Bytes::from(request.plan), catalog_list, false)
  .await
  .context(DecodeLogicalPlanSnafu)?;