diff --git a/common/base/src/base/runtime.rs b/common/base/src/base/runtime.rs index 5da21f6b330dc..5eb12bbbe4973 100644 --- a/common/base/src/base/runtime.rs +++ b/common/base/src/base/runtime.rs @@ -79,7 +79,7 @@ impl Runtime { fn create(tracker: Arc, builder: &mut tokio::runtime::Builder) -> Result { let runtime = builder .build() - .map_err(|tokio_error| ErrorCode::TokioError(format!("{}", tokio_error)))?; + .map_err(|tokio_error| ErrorCode::TokioError(tokio_error.to_string()))?; let (send_stop, recv_stop) = oneshot::channel(); diff --git a/common/datablocks/src/data_block_debug.rs b/common/datablocks/src/data_block_debug.rs index c35cb10025f41..35df1e8ae3f91 100644 --- a/common/datablocks/src/data_block_debug.rs +++ b/common/datablocks/src/data_block_debug.rs @@ -96,7 +96,7 @@ fn create_table(results: &[DataBlock]) -> Result { let mut cells = Vec::new(); for col in 0..batch.num_columns() { let column = batch.column(col); - let str = format!("{}", column.get_checked(row)?); + let str = column.get_checked(row)?.to_string(); cells.push(Cell::new(&str)); } table.add_row(cells); diff --git a/common/datavalues/src/data_value.rs b/common/datavalues/src/data_value.rs index 51074ddb01d7b..ad1eda8b20cf0 100644 --- a/common/datavalues/src/data_value.rs +++ b/common/datavalues/src/data_value.rs @@ -128,7 +128,7 @@ impl DataValue { DataTypeImpl::Array(ArrayType::create(inner_type)) } DataValue::Struct(x) => { - let names = (0..x.len()).map(|i| format!("{}", i)).collect::>(); + let names = (0..x.len()).map(|i| i.to_string()).collect::>(); let types = x.iter().map(|v| v.data_type()).collect::>(); DataTypeImpl::Struct(StructType::create(names, types)) } @@ -154,7 +154,7 @@ impl DataValue { DataTypeImpl::Array(ArrayType::create(inner_type)) } DataValue::Struct(x) => { - let names = (0..x.len()).map(|i| format!("{}", i)).collect::>(); + let names = (0..x.len()).map(|i| i.to_string()).collect::>(); let types = x.iter().map(|v| v.data_type()).collect::>(); DataTypeImpl::Struct(StructType::create(names, types)) } @@ -408,7 +408,7 @@ impl fmt::Display for DataValue { f, "[{}]", v.iter() - .map(|v| format!("{}", v)) + .map(|v| v.to_string()) .collect::>() .join(", ") ) @@ -440,6 +440,6 @@ pub fn format_datavalue_sql(value: &DataValue) -> String { match value { DataValue::String(_) | DataValue::Variant(_) => format!("'{}'", value), DataValue::Float64(value) => format!("'{:?}'", value), - _ => format!("{}", value), + _ => value.to_string(), } } diff --git a/common/datavalues/src/types/serializations/number.rs b/common/datavalues/src/types/serializations/number.rs index 15f37053bc672..965a7d63ea957 100644 --- a/common/datavalues/src/types/serializations/number.rs +++ b/common/datavalues/src/types/serializations/number.rs @@ -60,7 +60,7 @@ where T: PrimitiveType _format: &FormatSettings, ) -> Result> { let column: &PrimitiveColumn = Series::check_get(column)?; - let result: Vec = column.iter().map(|x| format!("{}", x)).collect(); + let result: Vec = column.iter().map(|x| x.to_string()).collect(); Ok(result) } diff --git a/common/datavalues/src/types/type_interval.rs b/common/datavalues/src/types/type_interval.rs index 7e8dae2e90740..1be7aa121404a 100644 --- a/common/datavalues/src/types/type_interval.rs +++ b/common/datavalues/src/types/type_interval.rs @@ -119,7 +119,7 @@ impl DataType for IntervalType { fn custom_arrow_meta(&self) -> Option> { let mut mp = BTreeMap::new(); mp.insert(ARROW_EXTENSION_NAME.to_string(), "Interval".to_string()); - mp.insert(ARROW_EXTENSION_META.to_string(), format!("{}", self.kind)); + mp.insert(ARROW_EXTENSION_META.to_string(), self.kind.to_string()); Some(mp) } diff --git a/common/datavalues/src/types/type_timestamp.rs b/common/datavalues/src/types/type_timestamp.rs index 65b28edb31db6..9065430e438f3 100644 --- a/common/datavalues/src/types/type_timestamp.rs +++ b/common/datavalues/src/types/type_timestamp.rs @@ -138,10 +138,7 @@ impl DataType for TimestampType { fn custom_arrow_meta(&self) -> Option> { let mut mp = BTreeMap::new(); mp.insert(ARROW_EXTENSION_NAME.to_string(), "Timestamp".to_string()); - mp.insert( - ARROW_EXTENSION_META.to_string(), - format!("{}", self.precision), - ); + mp.insert(ARROW_EXTENSION_META.to_string(), self.precision.to_string()); Some(mp) } diff --git a/common/exception/src/exception.rs b/common/exception/src/exception.rs index 4477713546692..d82b044464c65 100644 --- a/common/exception/src/exception.rs +++ b/common/exception/src/exception.rs @@ -138,7 +138,7 @@ impl ErrorCode { pub fn from_std_error(error: T) -> Self { ErrorCode { code: 1002, - display_text: format!("{}", error), + display_text: error.to_string(), cause: None, backtrace: Some(ErrorCodeBacktrace::Origin(Arc::new(Backtrace::capture()))), } @@ -171,7 +171,7 @@ impl ErrorCode { /// /// assert_eq!( /// "Code: 1067, displayText = 123, cause: an error occurred when formatting an argument.", -/// format!("{}", y.unwrap_err()) +/// y.unwrap_err().to_string() /// ); /// ``` pub trait ToErrorCode diff --git a/common/exception/src/exception_into.rs b/common/exception/src/exception_into.rs index 7e2805c5d7ddb..da2ee5f5d3277 100644 --- a/common/exception/src/exception_into.rs +++ b/common/exception/src/exception_into.rs @@ -114,7 +114,7 @@ impl From for ErrorCode { impl From for ErrorCode { fn from(error: sqlparser::parser::ParserError) -> Self { - ErrorCode::SyntaxException(format!("{}", error)) + ErrorCode::SyntaxException(error.to_string()) } } diff --git a/common/exception/tests/it/exception.rs b/common/exception/tests/it/exception.rs index 2b611a14ea4a7..3eda90615c1f7 100644 --- a/common/exception/tests/it/exception.rs +++ b/common/exception/tests/it/exception.rs @@ -22,20 +22,20 @@ fn test_format_with_error_codes() { use common_exception::exception::*; assert_eq!( - format!("{}", ErrorCode::Ok("test message 1")), + ErrorCode::Ok("test message 1").to_string(), "Code: 0, displayText = test message 1." ); assert_eq!( - format!("{}", ErrorCode::Ok("test message 2")), + ErrorCode::Ok("test message 2").to_string(), "Code: 0, displayText = test message 2." ); assert_eq!( - format!("{}", ErrorCode::UnknownException("test message 1")), + ErrorCode::UnknownException("test message 1").to_string(), "Code: 1067, displayText = test message 1." ); assert_eq!( - format!("{}", ErrorCode::UnknownException("test message 2")), + ErrorCode::UnknownException("test message 2").to_string(), "Code: 1067, displayText = test message 2." ); } @@ -62,7 +62,7 @@ fn test_derive_from_std_error() { assert_eq!( "Code: 1067, displayText = 123, cause: an error occurred when formatting an argument.", - format!("{}", rst1.as_ref().unwrap_err()) + rst1.as_ref().unwrap_err().to_string() ); let rst2: common_exception::exception::Result<()> = @@ -70,7 +70,7 @@ fn test_derive_from_std_error() { assert_eq!( "Code: 0, displayText = wrapper, cause: Code: 1067, displayText = 123, cause: an error occurred when formatting an argument..", - format!("{}", rst2.as_ref().unwrap_err()) + rst2.as_ref().unwrap_err().to_string() ); } @@ -86,7 +86,7 @@ fn test_derive_from_display() { assert_eq!( "Code: 1067, displayText = 123, cause: 3.", - format!("{}", rst1.as_ref().unwrap_err()) + rst1.as_ref().unwrap_err().to_string() ); } @@ -98,7 +98,7 @@ fn test_from_and_to_serialized_error() { let ec2: ErrorCode = se.into(); assert_eq!(ec.code(), ec2.code()); assert_eq!(ec.message(), ec2.message()); - assert_eq!(format!("{}", ec), format!("{}", ec2)); + assert_eq!(ec.to_string(), ec2.to_string()); assert_eq!(ec.backtrace_str(), ec2.backtrace_str()); } diff --git a/common/exception/tests/it/prelude.rs b/common/exception/tests/it/prelude.rs index 4c1adabbddb60..422210107aabc 100644 --- a/common/exception/tests/it/prelude.rs +++ b/common/exception/tests/it/prelude.rs @@ -21,7 +21,7 @@ fn test_prelude() -> anyhow::Result<()> { assert_eq!( "Code: 1067, displayText = 123, cause: an error occurred when formatting an argument.", - format!("{}", y.unwrap_err()) + y.unwrap_err().to_string() ); Ok(()) } diff --git a/common/meta/api/src/schema_api_test_suite.rs b/common/meta/api/src/schema_api_test_suite.rs index 6eb6dc655ed82..82211eece35ad 100644 --- a/common/meta/api/src/schema_api_test_suite.rs +++ b/common/meta/api/src/schema_api_test_suite.rs @@ -1584,7 +1584,7 @@ impl SchemaApiTestSuite { assert_eq!("Unknown database 'nonexistent'", err.message()); assert_eq!( "Code: 1003, displayText = Unknown database 'nonexistent'.", - format!("{}", err) + err.to_string() ); } diff --git a/common/meta/raft-store/src/log/raft_log.rs b/common/meta/raft-store/src/log/raft_log.rs index bf5cf732c2244..ca1d317b698ef 100644 --- a/common/meta/raft-store/src/log/raft_log.rs +++ b/common/meta/raft-store/src/log/raft_log.rs @@ -134,7 +134,7 @@ impl RaftLog { } /// Insert a single log. - #[tracing::instrument(level = "debug", skip(self, log), fields(log_id=format!("{}",log.log_id).as_str()))] + #[tracing::instrument(level = "debug", skip(self, log), fields(log_id=log.log_id.to_string().as_str()))] pub async fn insert( &self, log: &Entry, diff --git a/common/meta/sled-store/src/sled_tree.rs b/common/meta/sled-store/src/sled_tree.rs index 597b58982dc74..caf0a39f4a1aa 100644 --- a/common/meta/sled-store/src/sled_tree.rs +++ b/common/meta/sled-store/src/sled_tree.rs @@ -74,7 +74,7 @@ impl SledTree { tracing::debug!("SledTree opened tree: {}", tree_name); let rl = SledTree { - name: format!("{}", tree_name), + name: tree_name.to_string(), sync, tree: t, }; diff --git a/common/meta/types/src/meta_storage_errors.rs b/common/meta/types/src/meta_storage_errors.rs index e732fa4cd4283..ef70dd8c97d6b 100644 --- a/common/meta/types/src/meta_storage_errors.rs +++ b/common/meta/types/src/meta_storage_errors.rs @@ -57,7 +57,7 @@ pub enum MetaStorageError { /// Output message for end users, with sensitive info stripped. pub trait AppErrorMessage: Display { fn message(&self) -> String { - format!("{}", self) + self.to_string() } } diff --git a/common/meta/types/tests/it/match_seq.rs b/common/meta/types/tests/it/match_seq.rs index 0855c6678f9d2..55280ebce1973 100644 --- a/common/meta/types/tests/it/match_seq.rs +++ b/common/meta/types/tests/it/match_seq.rs @@ -95,9 +95,9 @@ fn test_match_seq_from_opt_u64() -> Result<(), ()> { #[test] fn test_match_seq_display() -> Result<(), ()> { - assert_eq!("is any value", format!("{}", MatchSeq::Any)); - assert_eq!("== 3", format!("{}", MatchSeq::Exact(3))); - assert_eq!(">= 3", format!("{}", MatchSeq::GE(3))); + assert_eq!("is any value", MatchSeq::Any.to_string()); + assert_eq!("== 3", MatchSeq::Exact(3).to_string()); + assert_eq!(">= 3", MatchSeq::GE(3).to_string()); Ok(()) } diff --git a/common/planners/src/plan_expression_monotonicity.rs b/common/planners/src/plan_expression_monotonicity.rs index 043d57a47768f..99adf2343dbf3 100644 --- a/common/planners/src/plan_expression_monotonicity.rs +++ b/common/planners/src/plan_expression_monotonicity.rs @@ -248,7 +248,7 @@ impl ExpressionVisitor for ExpressionMonotonicityVisitor { column_name, data_type, } => { - let name = column_name.clone().unwrap_or(format!("{}", value)); + let name = column_name.clone().unwrap_or_else(|| value.to_string()); let data_field = DataField::new(&name, data_type.clone()); let col = data_type.create_constant_column(value, 1)?; let data_column_field = ColumnWithField::new(col, data_field); diff --git a/metasrv/tests/it/tests/service.rs b/metasrv/tests/it/tests/service.rs index 20395784e8be5..970fef934eb6b 100644 --- a/metasrv/tests/it/tests/service.rs +++ b/metasrv/tests/it/tests/service.rs @@ -104,7 +104,7 @@ impl MetaSrvTestContext { config.raft_config.id = id; - config.raft_config.config_id = format!("{}", config_id); + config.raft_config.config_id = config_id.to_string(); // By default, create a meta node instead of open an existent one. config.raft_config.single = true; diff --git a/query/src/interpreters/interpreter_explain.rs b/query/src/interpreters/interpreter_explain.rs index 54e7a94510252..7b69ccd3a33f4 100644 --- a/query/src/interpreters/interpreter_explain.rs +++ b/query/src/interpreters/interpreter_explain.rs @@ -72,7 +72,8 @@ impl ExplainInterpreter { &self.explain.input, )?; let formatted_plan = Series::from_data( - format!("{}", plan.display_graphviz()) + plan.display_graphviz() + .to_string() .lines() .map(|s| s.as_bytes()) .collect::>(), diff --git a/query/src/interpreters/interpreter_query_log.rs b/query/src/interpreters/interpreter_query_log.rs index 3ad5397e92293..26adb8fe8b7dc 100644 --- a/query/src/interpreters/interpreter_query_log.rs +++ b/query/src/interpreters/interpreter_query_log.rs @@ -228,7 +228,7 @@ impl InterpreterQueryLog { let user = self.ctx.get_current_user()?; let sql_user = user.name; let sql_user_quota = format!("{:?}", user.quota); - let sql_user_privileges = format!("{}", user.grants); + let sql_user_privileges = user.grants.to_string(); // Query. let query_id = self.ctx.get_id(); @@ -338,7 +338,7 @@ impl InterpreterQueryLog { let user = self.ctx.get_current_user()?; let sql_user = user.name; let sql_user_quota = format!("{:?}", user.quota); - let sql_user_privileges = format!("{}", user.grants); + let sql_user_privileges = user.grants.to_string(); // Query. let query_id = self.ctx.get_id(); diff --git a/query/src/interpreters/interpreter_table_describe.rs b/query/src/interpreters/interpreter_table_describe.rs index b57d736d22432..c0d6d0a962b2f 100644 --- a/query/src/interpreters/interpreter_table_describe.rs +++ b/query/src/interpreters/interpreter_table_describe.rs @@ -94,7 +94,7 @@ impl Interpreter for DescribeTableInterpreter { None => { let value = field.data_type().default_value(); - default_exprs.push(format!("{}", value)); + default_exprs.push(value.to_string()); } } extras.push("".to_string()); diff --git a/query/src/servers/mysql/writers/init_result_writer.rs b/query/src/servers/mysql/writers/init_result_writer.rs index 509145080ba52..783764489f6ad 100644 --- a/query/src/servers/mysql/writers/init_result_writer.rs +++ b/query/src/servers/mysql/writers/init_result_writer.rs @@ -44,7 +44,7 @@ impl<'a, W: std::io::Write> DFInitResultWriter<'a, W> { fn err(error: &ErrorCode, writer: InitWriter<'a, W>) -> Result<()> { tracing::error!("OnInit Error: {:?}", error); - writer.error(ErrorKind::ER_UNKNOWN_ERROR, format!("{}", error).as_bytes())?; + writer.error(ErrorKind::ER_UNKNOWN_ERROR, error.to_string().as_bytes())?; Ok(()) } } diff --git a/query/src/servers/mysql/writers/query_result_writer.rs b/query/src/servers/mysql/writers/query_result_writer.rs index ba2f8ff74c054..ae1e8c6628077 100644 --- a/query/src/servers/mysql/writers/query_result_writer.rs +++ b/query/src/servers/mysql/writers/query_result_writer.rs @@ -206,11 +206,11 @@ impl<'a, W: std::io::Write> DFQueryResultWriter<'a, W> { fn err(error: &ErrorCode, writer: QueryResultWriter<'a, W>) -> Result<()> { if error.code() != ABORT_QUERY && error.code() != ABORT_SESSION { tracing::error!("OnQuery Error: {:?}", error); - writer.error(ErrorKind::ER_UNKNOWN_ERROR, format!("{}", error).as_bytes())?; + writer.error(ErrorKind::ER_UNKNOWN_ERROR, error.to_string().as_bytes())?; } else { writer.error( ErrorKind::ER_ABORTING_CONNECTION, - format!("{}", error).as_bytes(), + error.to_string().as_bytes(), )?; } diff --git a/query/src/sql/parsers/parser_view.rs b/query/src/sql/parsers/parser_view.rs index 24057bc258f59..b27bd085b679c 100644 --- a/query/src/sql/parsers/parser_view.rs +++ b/query/src/sql/parsers/parser_view.rs @@ -38,7 +38,7 @@ impl<'a> DfParser<'a> { if self.consume_token("AS") { let native_query = self.parser.parse_query()?; let query = DfQueryStatement::try_from(native_query.clone())?; - let subquery = format!("{}", native_query); + let subquery = native_query.to_string(); let create = DfCreateView { if_not_exists, name, @@ -68,7 +68,7 @@ impl<'a> DfParser<'a> { if self.consume_token("AS") { let native_query = self.parser.parse_query()?; let query = DfQueryStatement::try_from(native_query.clone())?; - let subquery = format!("{}", native_query); + let subquery = native_query.to_string(); let alter = DfAlterView { name, subquery, diff --git a/query/src/sql/statements/statement_show_databases.rs b/query/src/sql/statements/statement_show_databases.rs index 5e245d46d92b5..ccd5a5f001764 100644 --- a/query/src/sql/statements/statement_show_databases.rs +++ b/query/src/sql/statements/statement_show_databases.rs @@ -45,10 +45,10 @@ impl AnalyzableStatement for DfShowDatabases { match &self.kind { DfShowKind::All => {} DfShowKind::Like(v) => { - kind = PlanShowKind::Like(format!("{v}")); + kind = PlanShowKind::Like(v.to_string()); } DfShowKind::Where(v) => { - kind = PlanShowKind::Where(format!("{v}")); + kind = PlanShowKind::Where(v.to_string()); } } diff --git a/query/src/sql/statements/statement_show_functions.rs b/query/src/sql/statements/statement_show_functions.rs index f4527e67f4049..b06f21a7035b5 100644 --- a/query/src/sql/statements/statement_show_functions.rs +++ b/query/src/sql/statements/statement_show_functions.rs @@ -45,10 +45,10 @@ impl AnalyzableStatement for DfShowFunctions { match &self.kind { DfShowKind::All => {} DfShowKind::Like(v) => { - kind = PlanShowKind::Like(format!("{}", v)); + kind = PlanShowKind::Like(v.to_string()); } DfShowKind::Where(v) => { - kind = PlanShowKind::Where(format!("{}", v)); + kind = PlanShowKind::Where(v.to_string()); } } diff --git a/query/src/sql/statements/statement_show_tab_stat.rs b/query/src/sql/statements/statement_show_tab_stat.rs index 57964d037a214..5eeb4552e5426 100644 --- a/query/src/sql/statements/statement_show_tab_stat.rs +++ b/query/src/sql/statements/statement_show_tab_stat.rs @@ -47,10 +47,10 @@ impl AnalyzableStatement for DfShowTabStat { match &self.kind { DfShowKind::All => {} DfShowKind::Like(v) => { - kind = PlanShowKind::Like(format!("{}", v)); + kind = PlanShowKind::Like(v.to_string()); } DfShowKind::Where(v) => { - kind = PlanShowKind::Where(format!("{}", v)); + kind = PlanShowKind::Where(v.to_string()); } } diff --git a/query/src/sql/statements/statement_show_tables.rs b/query/src/sql/statements/statement_show_tables.rs index 185a5e36c0dfe..1db9d4b8cd82b 100644 --- a/query/src/sql/statements/statement_show_tables.rs +++ b/query/src/sql/statements/statement_show_tables.rs @@ -53,10 +53,10 @@ impl AnalyzableStatement for DfShowTables { match &self.kind { DfShowKind::All => {} DfShowKind::Like(v) => { - kind = PlanShowKind::Like(format!("{}", v)); + kind = PlanShowKind::Like(v.to_string()); } DfShowKind::Where(v) => { - kind = PlanShowKind::Where(format!("{}", v)); + kind = PlanShowKind::Where(v.to_string()); } } diff --git a/query/src/storages/system/tracing_table.rs b/query/src/storages/system/tracing_table.rs index f02bc52ca3688..495884558434a 100644 --- a/query/src/storages/system/tracing_table.rs +++ b/query/src/storages/system/tracing_table.rs @@ -84,7 +84,7 @@ impl TracingTable { .filter_map(|dir_entry| match dir_entry { Ok(entry) if entry.path().is_dir() => None, Ok(entry) => Some(Ok(entry.path().display().to_string())), - Err(cause) => Some(Err(ErrorCode::UnknownException(format!("{}", cause)))), + Err(cause) => Some(Err(ErrorCode::UnknownException(cause.to_string()))), }) .collect::>>() } diff --git a/query/tests/it/interpreters/interpreter_setting.rs b/query/tests/it/interpreters/interpreter_setting.rs index 92c6866df6ce1..66f09f5c66ba1 100644 --- a/query/tests/it/interpreters/interpreter_setting.rs +++ b/query/tests/it/interpreters/interpreter_setting.rs @@ -41,7 +41,7 @@ async fn test_setting_interpreter_error() -> Result<()> { let executor = InterpreterFactory::get(ctx.clone(), plan)?; if let Err(e) = executor.execute(None).await { let expect = "Code: 1020, displayText = Unknown variable: \"xx\"."; - assert_eq!(expect, format!("{}", e)); + assert_eq!(expect, e.to_string()); } Ok(()) diff --git a/query/tests/it/interpreters/interpreter_use_database.rs b/query/tests/it/interpreters/interpreter_use_database.rs index 745af396b3729..f5907634d09f5 100644 --- a/query/tests/it/interpreters/interpreter_use_database.rs +++ b/query/tests/it/interpreters/interpreter_use_database.rs @@ -42,7 +42,7 @@ async fn test_use_database_interpreter_error() -> Result<()> { if let Err(e) = interpreter.execute(None).await { let expect = "Code: 1003, displayText = Cannot USE 'xx', because the 'xx' doesn't exist."; - assert_eq!(expect, format!("{}", e)); + assert_eq!(expect, e.to_string()); } Ok(()) diff --git a/query/tests/it/pipelines/new/processors/port_test.rs b/query/tests/it/pipelines/new/processors/port_test.rs index 53bac83c9944b..9ff767dd5cdd5 100644 --- a/query/tests/it/pipelines/new/processors/port_test.rs +++ b/query/tests/it/pipelines/new/processors/port_test.rs @@ -33,7 +33,7 @@ async fn test_input_and_output_port() -> Result<()> { input.set_need_data(); while !input.has_data() {} let data = input.pull_data().unwrap(); - assert_eq!(data.unwrap_err().message(), format!("{}", index)); + assert_eq!(data.unwrap_err().message(), index.to_string()); } } } @@ -43,7 +43,7 @@ async fn test_input_and_output_port() -> Result<()> { barrier.wait(); for index in 0..100 { while !output.can_push() {} - output.push_data(Err(ErrorCode::Ok(format!("{}", index)))); + output.push_data(Err(ErrorCode::Ok(index.to_string()))); } } } diff --git a/query/tests/it/pipelines/processors/pipeline_walker.rs b/query/tests/it/pipelines/processors/pipeline_walker.rs index 19d3ccb83720d..09e3603da97a1 100644 --- a/query/tests/it/pipelines/processors/pipeline_walker.rs +++ b/query/tests/it/pipelines/processors/pipeline_walker.rs @@ -38,7 +38,7 @@ async fn test_pipeline_walker() -> Result<()> { let mut actual: Vec = vec![]; pipeline.walk_preorder(|pipe| { let processor = pipe.processor_by_index(0).clone(); - actual.push(processor.name().to_string() + " x " + &*format!("{}", pipe.nums())); + actual.push(processor.name().to_string() + " x " + &*pipe.nums().to_string()); Result::Ok(true) })?; @@ -61,7 +61,7 @@ async fn test_pipeline_walker() -> Result<()> { let mut actual: Vec = vec![]; pipeline.walk_postorder(|pipe| { let processor = pipe.processor_by_index(0).clone(); - actual.push(processor.name().to_string() + " x " + &*format!("{}", pipe.nums())); + actual.push(processor.name().to_string() + " x " + &*pipe.nums().to_string()); Result::Ok(true) })?; diff --git a/query/tests/it/pipelines/transforms/transform_expression.rs b/query/tests/it/pipelines/transforms/transform_expression.rs index debb8acce6865..96498944db2fa 100644 --- a/query/tests/it/pipelines/transforms/transform_expression.rs +++ b/query/tests/it/pipelines/transforms/transform_expression.rs @@ -89,7 +89,7 @@ async fn test_transform_expression_error() -> Result<()> { col("number"), add(col("number"), lit(1u8)), ]); - let actual = format!("{}", result.err().unwrap()); + let actual = result.err().unwrap().to_string(); let expect = "Code: 1006, displayText = Unable to get field named \"xnumber\". Valid fields: [\"number\"]."; assert_eq!(expect, actual); diff --git a/query/tests/it/sql/expr_parser.rs b/query/tests/it/sql/expr_parser.rs index 3cf170af1fe8d..81140833c6968 100644 --- a/query/tests/it/sql/expr_parser.rs +++ b/query/tests/it/sql/expr_parser.rs @@ -64,7 +64,7 @@ fn test_expr_parser() -> Result<()> { assert_eq!(t.expect, v.column_name(), "{}", t.name); } Err(e) => { - assert_eq!(t.error, format!("{}", e), "{}", t.name); + assert_eq!(t.error, e.to_string(), "{}", t.name); } } } diff --git a/query/tests/it/sql/plan_parser.rs b/query/tests/it/sql/plan_parser.rs index 963aff2140295..c9b59c5fca3f6 100644 --- a/query/tests/it/sql/plan_parser.rs +++ b/query/tests/it/sql/plan_parser.rs @@ -300,7 +300,7 @@ async fn test_plan_parser() -> Result<()> { assert_eq!(t.expect, format!("{:?}", v), "{}", t.name); } Err(e) => { - assert_eq!(t.error, format!("{}", e), "{}", t.name); + assert_eq!(t.error, e.to_string(), "{}", t.name); } } }