Skip to content

feat(key-aux): respond with aux key info in key requests #863

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
georgeh0 merged 1 commit into from
Aug 13, 2025
Merged

feat(key-aux): respond with aux key info in key requests #863

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/service/flows.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ pub struct GetKeysParam {
#[derive(Serialize)]
pub struct GetKeysResponse {
key_type: schema::EnrichedValueType,
keys: Vec<value::KeyValue>,
keys: Vec<(value::KeyValue, serde_json::Value)>,
}

pub async fn get_keys(
Expand Down Expand Up @@ -110,7 +110,7 @@ pub async fn get_keys(
});
let mut keys = Vec::new();
while let Some(rows) = rows_stream.next().await {
keys.extend(rows?.into_iter().map(|row| row.key));
keys.extend(rows?.into_iter().map(|row| (row.key, row.key_aux_info)));
}
Ok(Json(GetKeysResponse {
key_type: key_type.clone(),
Expand All @@ -122,7 +122,7 @@ pub async fn get_keys(
pub struct SourceRowKeyParams {
field: String,
key: Vec<String>,
key_aux: Option<serde_json::Value>,
key_aux: Option<String>,
}

#[derive(Serialize)]
Expand Down Expand Up @@ -165,7 +165,11 @@ impl<'a> SourceRowKeyContextHolder<'a> {
.key_field()
.ok_or_else(|| api_error!("field {} does not have a key", source_row_key.field))?;
let key = value::KeyValue::from_strs(source_row_key.key, &key_field.value_type.typ)?;
let key_aux_info = source_row_key.key_aux.unwrap_or_default();
let key_aux_info = source_row_key
.key_aux
.map(|s| serde_json::from_str(&s))
.transpose()?
.unwrap_or_default();
Ok(Self {
plan,
import_op_idx,
Expand Down
Loading