fix(mysql): improve large-value table previews

This commit is contained in:
zipg authored and GitHub committed 2026-08-15 12:58:28 +08:00
1 parent 2d4b6f85fc
commit 1aec3ae000
10 files changed
+291 -49

No files matched your search

@@ -40,16 +40,32 @@ fn normalized_data_type_base(data_type: &str) -> String {
data_type.trim().split(['(', '[']).next().unwrap_or_default().trim().to_ascii_lowercase()
}
fn large_value_preview_kind(database_type: Option<DatabaseType>, data_type: &str) -> Option<LargeValuePreviewKind> {
fn declared_data_type_length(data_type: &str) -> Option<usize> {
let parameters = data_type.split_once('(')?.1;
let digits = parameters.trim_start().chars().take_while(char::is_ascii_digit).collect::<String>();
(!digits.is_empty()).then(|| digits.parse::<usize>().ok()).flatten()
}
fn large_value_preview_kind(
database_type: Option<DatabaseType>,
data_type: &str,
preview_size: usize,
) -> Option<LargeValuePreviewKind> {
let normalized = data_type.trim().to_ascii_lowercase();
let base = normalized_data_type_base(data_type);
match database_type {
Some(DatabaseType::Mysql) => {
if matches!(base.as_str(), "binary" | "varbinary" | "tinyblob" | "blob" | "mediumblob" | "longblob") {
if matches!(base.as_str(), "blob" | "mediumblob" | "longblob")
|| (base == "varbinary"
&& declared_data_type_length(data_type).is_some_and(|length| length > preview_size))
{
Some(LargeValuePreviewKind::Binary)
} else if base == "json" {
Some(LargeValuePreviewKind::TextCast)
} else if matches!(base.as_str(), "char" | "varchar" | "tinytext" | "text" | "mediumtext" | "longtext") {
} else if matches!(base.as_str(), "text" | "mediumtext" | "longtext")
|| (base == "varchar"
&& declared_data_type_length(data_type).is_some_and(|length| length > preview_size))
{
Some(LargeValuePreviewKind::Text)
} else {
None
@@ -101,7 +117,7 @@ fn build_large_value_preview_columns(options: &TableDataSelectSqlOptions) -> Opt
quote_table_identifier(database_type, column)
};
let kind = (!protected.contains(&column.to_ascii_lowercase()))
.then(|| large_value_preview_kind(database_type, data_type))
.then(|| large_value_preview_kind(database_type, data_type, preview_size))
.flatten();
let Some(kind) = kind else {
projections.push(quoted);
@@ -131,7 +147,11 @@ fn build_large_value_preview_columns(options: &TableDataSelectSqlOptions) -> Opt
Some(DatabaseType::Postgres) => (format!("left({quoted}, {prefix_size}) AS {quoted}"), "T"),
_ => return None,
};
let marker = format!("'{marker_kind}:{preview_size}' AS {marker_alias}");
let marker = if database_type == Some(DatabaseType::Mysql) {
format!("CONCAT('{marker_kind}:{preview_size}:', OCTET_LENGTH({quoted})) AS {marker_alias}")
} else {
format!("'{marker_kind}:{preview_size}' AS {marker_alias}")
};
projections.push(preview);
projections.push(marker);
marker_count += 1;
+39 -3
View File
@@ -705,14 +705,50 @@ fn builds_mysql_table_data_large_value_previews_without_truncating_keys() {
});
assert!(sql.starts_with("SELECT `id`, LEFT(`payload`, 4097) AS `payload`"));
assert!(sql.contains("'T:4096' AS `__DBX_LARGE_VALUE_BYTES_T_1`"));
assert!(sql.contains("CONCAT('T:4096:', OCTET_LENGTH(`payload`)) AS `__DBX_LARGE_VALUE_BYTES_T_1`"));
assert!(sql.contains("LEFT(`raw_value`, 4097) AS `raw_value`"));
assert!(sql.contains("'B:4096' AS `__DBX_LARGE_VALUE_BYTES_B_2`"));
assert!(sql.contains("CONCAT('B:4096:', OCTET_LENGTH(`raw_value`)) AS `__DBX_LARGE_VALUE_BYTES_B_2`"));
assert!(sql.contains("LEFT(`metadata`, 4097) AS `metadata`"));
assert!(sql.contains("'T:4096' AS `__DBX_LARGE_VALUE_BYTES_J_3`"));
assert!(sql.contains("CONCAT('T:4096:', OCTET_LENGTH(`metadata`)) AS `__DBX_LARGE_VALUE_BYTES_J_3`"));
assert!(!sql.contains("__DBX_LARGE_VALUE_BYTES_0"));
}
#[test]
fn previews_mysql_bounded_string_columns_only_above_the_active_budget() {
let sql = build_table_data_select_sql(TableDataSelectSqlOptions {
database_type: Some(DatabaseType::Mysql),
table_name: "t_0001".to_string(),
primary_keys: vec!["id".to_string()],
columns: vec![
"id".to_string(),
"image_mime".to_string(),
"image_data".to_string(),
"image_url".to_string(),
"large_note".to_string(),
"large_binary".to_string(),
],
column_types: vec![
"int".to_string(),
"varchar(64)".to_string(),
"longblob".to_string(),
"varchar(512)".to_string(),
"varchar(10000)".to_string(),
"varbinary(10000)".to_string(),
],
large_value_preview_size: Some(419),
limit: Some(10_000),
..Default::default()
});
assert!(sql.starts_with("SELECT `id`, `image_mime`, LEFT(`image_data`, 420) AS `image_data`"));
assert!(sql.contains("CONCAT('B:419:', OCTET_LENGTH(`image_data`)) AS `__DBX_LARGE_VALUE_BYTES_B_2`, LEFT(`image_url`, 420) AS `image_url`"));
assert!(sql.contains("CONCAT('T:419:', OCTET_LENGTH(`image_url`)) AS `__DBX_LARGE_VALUE_BYTES_T_3`"));
assert!(sql.contains("LEFT(`large_note`, 420) AS `large_note`"));
assert!(sql.contains("CONCAT('T:419:', OCTET_LENGTH(`large_note`)) AS `__DBX_LARGE_VALUE_BYTES_T_4`"));
assert!(sql.contains("LEFT(`large_binary`, 420) AS `large_binary`"));
assert!(!sql.contains("LEFT(`image_mime`"));
}
#[test]
fn builds_postgres_table_data_large_value_previews() {
let sql = build_table_data_select_sql(TableDataSelectSqlOptions {