|
|
|
@ -34,7 +34,7 @@ use thiserror::Error;
|
|
|
|
|
|
|
|
|
|
use crate::data::functions::current_validity;
|
|
|
|
|
use crate::data::json::JsonValue;
|
|
|
|
|
use crate::data::program::{InputProgram, QueryAssertion, RelationOp};
|
|
|
|
|
use crate::data::program::{InputProgram, QueryAssertion, RelationOp, ReturnMutation};
|
|
|
|
|
use crate::data::relation::ColumnDef;
|
|
|
|
|
use crate::data::tuple::{Tuple, TupleT};
|
|
|
|
|
use crate::data::value::{DataValue, ValidityTs, LARGEST_UTF_CHAR};
|
|
|
|
@ -51,9 +51,7 @@ use crate::query::ra::{
|
|
|
|
|
use crate::runtime::callback::{
|
|
|
|
|
CallbackCollector, CallbackDeclaration, CallbackOp, EventCallbackRegistry,
|
|
|
|
|
};
|
|
|
|
|
use crate::runtime::relation::{
|
|
|
|
|
extend_tuple_from_v, AccessLevel, InsufficientAccessLevel, RelationHandle, RelationId,
|
|
|
|
|
};
|
|
|
|
|
use crate::runtime::relation::{extend_tuple_from_v, AccessLevel, InsufficientAccessLevel, RelationHandle, RelationId, InputRelationHandle};
|
|
|
|
|
use crate::runtime::transact::SessionTx;
|
|
|
|
|
use crate::storage::temp::TempStorage;
|
|
|
|
|
use crate::storage::{Storage, StoreTx};
|
|
|
|
@ -1353,7 +1351,7 @@ impl<'s, S: Storage<'s>> Db<S> {
|
|
|
|
|
let mut clean_ups = vec![];
|
|
|
|
|
|
|
|
|
|
// Some checks in case the query specifies mutation
|
|
|
|
|
if let Some((meta, op)) = &input_program.out_opts.store_relation {
|
|
|
|
|
if let Some((meta, op, _)) = &input_program.out_opts.store_relation {
|
|
|
|
|
if *op == RelationOp::Create {
|
|
|
|
|
#[derive(Debug, Error, Diagnostic)]
|
|
|
|
|
#[error("Stored relation {0} conflicts with an existing one")]
|
|
|
|
@ -1475,7 +1473,7 @@ impl<'s, S: Storage<'s>> Db<S> {
|
|
|
|
|
} else {
|
|
|
|
|
Right(sorted_iter)
|
|
|
|
|
};
|
|
|
|
|
if let Some((meta, relation_op)) = &out_opts.store_relation {
|
|
|
|
|
if let Some((meta, relation_op, returning)) = &out_opts.store_relation {
|
|
|
|
|
let to_clear = tx
|
|
|
|
|
.execute_relation(
|
|
|
|
|
self,
|
|
|
|
@ -1487,16 +1485,16 @@ impl<'s, S: Storage<'s>> Db<S> {
|
|
|
|
|
callback_targets,
|
|
|
|
|
callback_collector,
|
|
|
|
|
top_level,
|
|
|
|
|
if *returning == ReturnMutation::Returning {
|
|
|
|
|
&meta.name.name
|
|
|
|
|
} else {
|
|
|
|
|
""
|
|
|
|
|
},
|
|
|
|
|
)
|
|
|
|
|
.wrap_err_with(|| format!("when executing against relation '{}'", meta.name))?;
|
|
|
|
|
clean_ups.extend(to_clear);
|
|
|
|
|
Ok((
|
|
|
|
|
NamedRows::new(
|
|
|
|
|
vec![STATUS_STR.to_string()],
|
|
|
|
|
vec![vec![DataValue::from(OK_STR)]],
|
|
|
|
|
),
|
|
|
|
|
clean_ups,
|
|
|
|
|
))
|
|
|
|
|
let returned_rows = Self::get_returning_rows(callback_collector, meta, returning);
|
|
|
|
|
Ok((returned_rows, clean_ups))
|
|
|
|
|
} else {
|
|
|
|
|
// not sorting outputs
|
|
|
|
|
let rows: Vec<Tuple> = sorted_iter.collect_vec();
|
|
|
|
@ -1530,7 +1528,7 @@ impl<'s, S: Storage<'s>> Db<S> {
|
|
|
|
|
Left(result_store.all_iter().map(|t| t.into_tuple()))
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
if let Some((meta, relation_op)) = &out_opts.store_relation {
|
|
|
|
|
if let Some((meta, relation_op, returning)) = &out_opts.store_relation {
|
|
|
|
|
let to_clear = tx
|
|
|
|
|
.execute_relation(
|
|
|
|
|
self,
|
|
|
|
@ -1542,16 +1540,17 @@ impl<'s, S: Storage<'s>> Db<S> {
|
|
|
|
|
callback_targets,
|
|
|
|
|
callback_collector,
|
|
|
|
|
top_level,
|
|
|
|
|
if *returning == ReturnMutation::Returning {
|
|
|
|
|
&meta.name.name
|
|
|
|
|
} else {
|
|
|
|
|
""
|
|
|
|
|
},
|
|
|
|
|
)
|
|
|
|
|
.wrap_err_with(|| format!("when executing against relation '{}'", meta.name))?;
|
|
|
|
|
clean_ups.extend(to_clear);
|
|
|
|
|
Ok((
|
|
|
|
|
NamedRows::new(
|
|
|
|
|
vec![STATUS_STR.to_string()],
|
|
|
|
|
vec![vec![DataValue::from(OK_STR)]],
|
|
|
|
|
),
|
|
|
|
|
clean_ups,
|
|
|
|
|
))
|
|
|
|
|
let returned_rows = Self::get_returning_rows(callback_collector, meta, returning);
|
|
|
|
|
|
|
|
|
|
Ok((returned_rows, clean_ups))
|
|
|
|
|
} else {
|
|
|
|
|
let rows: Vec<Tuple> = scan.collect_vec();
|
|
|
|
|
|
|
|
|
@ -1568,6 +1567,59 @@ impl<'s, S: Storage<'s>> Db<S> {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn get_returning_rows(callback_collector: &mut CallbackCollector, meta: &InputRelationHandle, returning: &ReturnMutation) -> NamedRows {
|
|
|
|
|
let returned_rows = {
|
|
|
|
|
match returning {
|
|
|
|
|
ReturnMutation::NotReturning => {
|
|
|
|
|
NamedRows::new(
|
|
|
|
|
vec![STATUS_STR.to_string()],
|
|
|
|
|
vec![vec![DataValue::from(OK_STR)]],
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
ReturnMutation::Returning => {
|
|
|
|
|
let target_len = meta.metadata.keys.len() + meta.metadata.non_keys.len();
|
|
|
|
|
let mut returned_rows = Vec::new();
|
|
|
|
|
if let Some(collected) = callback_collector.get(&meta.name.name) {
|
|
|
|
|
for (kind, insertions, deletions) in collected {
|
|
|
|
|
let (pos_key, neg_key) = match kind {
|
|
|
|
|
CallbackOp::Put => { ("inserted", "replaced") }
|
|
|
|
|
CallbackOp::Rm => { ("requested", "deleted") }
|
|
|
|
|
};
|
|
|
|
|
for row in &insertions.rows {
|
|
|
|
|
let mut v = Vec::with_capacity(target_len + 1);
|
|
|
|
|
v.push(DataValue::from(pos_key));
|
|
|
|
|
v.extend_from_slice(&row[..target_len]);
|
|
|
|
|
while v.len() <= target_len {
|
|
|
|
|
v.push(DataValue::Null);
|
|
|
|
|
}
|
|
|
|
|
returned_rows.push(v);
|
|
|
|
|
}
|
|
|
|
|
for row in &deletions.rows {
|
|
|
|
|
let mut v = Vec::with_capacity(target_len + 1);
|
|
|
|
|
v.push(DataValue::from(neg_key));
|
|
|
|
|
v.extend_from_slice(&row[..target_len]);
|
|
|
|
|
while v.len() <= target_len {
|
|
|
|
|
v.push(DataValue::Null);
|
|
|
|
|
}
|
|
|
|
|
returned_rows.push(v);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
let mut header = vec!["_kind".to_string()];
|
|
|
|
|
header.extend(meta.metadata.keys
|
|
|
|
|
.iter()
|
|
|
|
|
.chain(meta.metadata.non_keys.iter())
|
|
|
|
|
.map(|s| s.name.to_string()));
|
|
|
|
|
NamedRows::new(
|
|
|
|
|
header,
|
|
|
|
|
returned_rows,
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
returned_rows
|
|
|
|
|
}
|
|
|
|
|
pub(crate) fn list_running(&self) -> Result<NamedRows> {
|
|
|
|
|
let rows = self
|
|
|
|
|
.running_queries
|
|
|
|
|