Skip to content

Commit 2337644

Browse files
committed
refactor: per review
1 parent b4b4bc6 commit 2337644

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

src/datatypes/src/schema/column_schema.rs

+1
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,7 @@ impl ColumnSchema {
292292
}
293293

294294
/// Creates an impure default value for this column, only if it have a impure default constraint.
295+
/// Otherwise, returns `Ok(None)`.
295296
pub fn create_impure_default(&self) -> Result<Option<Value>> {
296297
match &self.default_constraint {
297298
Some(c) => c.create_impure_default(&self.data_type),

src/flow/src/adapter/util.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -164,10 +164,7 @@ pub fn table_info_value_to_relation_desc(
164164
.map(|c| c.default_constraint().cloned())
165165
.collect_vec();
166166

167-
Ok(TableDesc {
168-
relation_desc,
169-
default_values,
170-
})
167+
Ok(TableDesc::new(relation_desc, default_values))
171168
}
172169

173170
pub fn from_proto_to_data_type(

src/operator/src/req_convert/insert/fill_impure_default.rs

+9-7
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,17 @@ impl ImpureDefaultFiller {
5353
for column in impure_column_list {
5454
let default_value = column
5555
.create_impure_default()
56-
.context(ConvertColumnDefaultConstraintSnafu {
56+
.with_context(|_| ConvertColumnDefaultConstraintSnafu {
5757
column_name: column.name.clone(),
5858
})?
59-
.expect("impure default value");
60-
let grpc_default_value = api::helper::to_proto_value(default_value.clone());
61-
let def = column_schemas_to_defs(vec![column], &pk_names)?
62-
.into_iter()
63-
.next()
64-
.expect("column def have one element");
59+
.with_context(|| UnexpectedSnafu {
60+
violated: format!(
61+
"Expect default value to be impure, found {:?}",
62+
column.default_constraint()
63+
),
64+
})?;
65+
let grpc_default_value = api::helper::to_proto_value(default_value);
66+
let def = column_schemas_to_defs(vec![column], &pk_names)?.swap_remove(0);
6567
let grpc_column_schema = api::v1::ColumnSchema {
6668
column_name: def.name,
6769
datatype: def.data_type,

0 commit comments

Comments
 (0)