fix(doris): preserve aggregate-state bytes in query results
This commit is contained in:
1 parent
4bcab01489
commit
c75ce783df
17 files changed
+1066
-42
No files matched your search
@@ -9,6 +9,7 @@ use crate::data_grid_sql::{
|
||||
is_grid_insert_omitted_column, is_non_identity_generated_column, supports_relational_copy_predicates,
|
||||
DataGridCopyInsertStatementOptions, DataGridCopyUpdateStatementOptions, DataGridTableMeta,
|
||||
};
|
||||
use dbx_types::types::is_opaque_aggregate_state_type;
|
||||
use serde_json::Value;
|
||||
use std::collections::{hash_map::Entry, HashMap, HashSet};
|
||||
use std::io::Write;
|
||||
@@ -61,6 +62,7 @@ pub(super) fn write_sql_inserts(
|
||||
output: &mut dyn Write,
|
||||
) -> Result<WriteMetadata, DataGridExtractError> {
|
||||
ensure_sql_builder_budget(context)?;
|
||||
reject_selected_opaque_aggregate_states(context)?;
|
||||
let data = sql_selected_data(context, false)?;
|
||||
let statement = build_data_grid_copy_insert_statement(DataGridCopyInsertStatementOptions {
|
||||
database_type: context.request.database_type,
|
||||
@@ -90,6 +92,7 @@ pub(super) fn write_sql_updates(
|
||||
output: &mut dyn Write,
|
||||
) -> Result<WriteMetadata, DataGridExtractError> {
|
||||
ensure_sql_builder_budget(context)?;
|
||||
reject_selected_opaque_aggregate_states(context)?;
|
||||
let table_meta = context.request.table_meta.as_ref().ok_or_else(|| {
|
||||
DataGridExtractError::new(
|
||||
DataGridExtractErrorCode::MissingTableMetadata,
|
||||
@@ -133,6 +136,16 @@ pub(super) fn write_sql_updates(
|
||||
Ok(sql_metadata(data.omitted_columns))
|
||||
}
|
||||
|
||||
fn reject_selected_opaque_aggregate_states(context: &ExtractContext<'_>) -> Result<(), DataGridExtractError> {
|
||||
if context.selected_column_info.iter().flatten().any(|info| is_opaque_aggregate_state_type(&info.data_type)) {
|
||||
return Err(DataGridExtractError::new(
|
||||
DataGridExtractErrorCode::NoWritableColumns,
|
||||
"Doris aggregate-state columns are opaque and cannot be copied as automatic SQL; use an explicit Doris state function instead.",
|
||||
));
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn ensure_sql_builder_budget(context: &ExtractContext<'_>) -> Result<(), DataGridExtractError> {
|
||||
let value_bytes = context
|
||||
.request
|
||||
|
||||
@@ -1363,6 +1363,39 @@ fn sql_updates_require_table_primary_key_and_writable_columns() {
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn sql_copy_reports_selected_opaque_aggregate_states_before_generic_builder_errors() {
|
||||
let opaque_column = DataGridColumnInfo {
|
||||
name: "v2".to_string(),
|
||||
data_type: "agg_state<sum(int)>".to_string(),
|
||||
is_nullable: true,
|
||||
is_primary_key: false,
|
||||
column_default: None,
|
||||
extra: None,
|
||||
};
|
||||
for extractor in [DataGridExtractorId::SqlInserts, DataGridExtractorId::SqlUpdates] {
|
||||
let mut request = request(extractor);
|
||||
request.columns = vec![column("v2", 0)];
|
||||
request.selected_column_indexes = vec![0];
|
||||
request.rows = vec![vec![json!("0x00ff")]];
|
||||
request.table_meta = Some(DataGridTableMeta {
|
||||
catalog: None,
|
||||
database: None,
|
||||
schema: None,
|
||||
table_name: "states".to_string(),
|
||||
primary_keys: Vec::new(),
|
||||
columns: Some(vec![opaque_column.clone()]),
|
||||
});
|
||||
|
||||
let error = extract_data_grid_selection(request).expect_err("opaque SQL copy must fail explicitly");
|
||||
assert_eq!(error.code, DataGridExtractErrorCode::NoWritableColumns);
|
||||
assert_eq!(
|
||||
error.message,
|
||||
"Doris aggregate-state columns are opaque and cannot be copied as automatic SQL; use an explicit Doris state function instead."
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn rejects_requests_that_exceed_the_column_budget() {
|
||||
let mut request = request(DataGridExtractorId::Csv);
|
||||
|
||||
Reference in new issue
Block a user