@@ -32,8 +32,8 @@ use risingwave_common::types::{
32
32
use rust_decimal:: Decimal as RustDecimal ;
33
33
34
34
macro_rules! handle_data_type {
35
- ( $row: expr, $i: expr, $name: expr, $type : ty) => { {
36
- match $row. take_opt:: <Option <$type >, _>( $i) {
35
+ ( $row: expr, $i: expr, $name: expr, $typ : ty) => { {
36
+ match $row. take_opt:: <Option <$typ >, _>( $i) {
37
37
None => bail!( "no value found at column: {}, index: {}" , $name, $i) ,
38
38
Some ( Ok ( val) ) => Ok ( val. map( |v| ScalarImpl :: from( v) ) ) ,
39
39
Some ( Err ( e) ) => Err ( anyhow:: Error :: new( e. clone( ) )
@@ -42,21 +42,21 @@ macro_rules! handle_data_type {
42
42
"column: {}, index: {}, rust_type: {}" ,
43
43
$name,
44
44
$i,
45
- stringify!( $type ) ,
45
+ stringify!( $typ ) ,
46
46
) ) ) ,
47
47
}
48
48
} } ;
49
- ( $row: expr, $i: expr, $name: expr, $type : ty, $rw_type: ty) => { {
50
- match $row. take_opt:: <Option <$type >, _>( $i) {
49
+ ( $row: expr, $i: expr, $name: expr, $typ : ty, $rw_type: ty) => { {
50
+ match $row. take_opt:: <Option <$typ >, _>( $i) {
51
51
None => bail!( "no value found at column: {}, index: {}" , $name, $i) ,
52
52
Some ( Ok ( val) ) => Ok ( val. map( |v| ScalarImpl :: from( <$rw_type>:: from( v) ) ) ) ,
53
53
Some ( Err ( e) ) => Err ( anyhow:: Error :: new( e. clone( ) )
54
- . context( "failed to deserialize MySQL value into rust value" )
54
+ . context( "failed to deserialize MySQL value into rw value" )
55
55
. context( format!(
56
- "column: {}, index: {}, rust_type : {}" ,
56
+ "column: {}, index: {}, rw_type : {}" ,
57
57
$name,
58
58
$i,
59
- stringify!( $ty ) ,
59
+ stringify!( $rw_type ) ,
60
60
) ) ) ,
61
61
}
62
62
} } ;
0 commit comments