Skip to content

feat(flow-control): do flow control during evaluation too #710

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
merged 1 commit into from
Jul 8, 2025
Merged

feat(flow-control): do flow control during evaluation too #710

Show file tree
Hide file tree
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
4 changes: 4 additions & 0 deletions src/execution/dumper.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,10 @@ impl<'a> Dumper<'a> {
key: value::KeyValue,
file_path: PathBuf,
) -> Result<()> {
let _permit = import_op
.concurrency_controller
.acquire(concur_control::BYTES_UNKNOWN_YET)
.await?;
let mut collected_values_buffer = Vec::new();
let (exports, error) = match self
.evaluate_source_entry(import_op_idx, import_op, &key, &mut collected_values_buffer)
Expand Down
5 changes: 5 additions & 0 deletions src/execution/evaluator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,11 @@ pub async fn evaluate_source_entry(
source_value: value::FieldValues,
memory: &EvaluationMemory,
) -> Result<EvaluateSourceEntryOutput> {
let _permit = src_eval_ctx
.import_op
.concurrency_controller
.acquire_bytes_with_reservation(|| source_value.estimated_byte_size())
.await?;
let root_schema = &src_eval_ctx.schema.schema;
let root_scope_value = ScopeValueBuilder::new(root_schema.fields.len());
let root_scope_entry = ScopeEntry::new(
Expand Down
9 changes: 0 additions & 9 deletions src/execution/source_indexer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,15 +163,6 @@ impl SourceIndexingContext {

{
let _processing_permit = processing_sem.acquire().await?;
let _concur_permit = match &source_data.value {
interface::SourceValue::Existence(value) => {
import_op
.concurrency_controller
.acquire_bytes_with_reservation(|| value.estimated_byte_size())
.await?
}
interface::SourceValue::NonExistence => None,
};
let result = row_indexer::update_source_row(
&SourceRowEvaluationContext {
plan: &plan,
Expand Down