This is an automated email from the ASF dual-hosted git repository.
linxinyuan pushed a commit to branch xinyuan-stage-by-stage
in repository https://gitbox.apache.org/repos/asf/texera.git
The following commit(s) were added to refs/heads/xinyuan-stage-by-stage by this
push:
new 151aa938ed update
151aa938ed is described below
commit 151aa938ed694dd06edd209e38ef199728b92d9d
Author: Xinyuan Lin <[email protected]>
AuthorDate: Tue Jan 6 20:16:40 2026 -0800
update
---
.../apache/texera/workflow/WorkflowCompiler.scala | 2 +-
.../amber/core/workflow/WorkflowContext.scala | 3 ++-
.../amber/core/workflow/WorkflowSettings.scala | 2 +-
.../left-panel/settings/settings.component.ts | 26 ++++++++++------------
4 files changed, 16 insertions(+), 17 deletions(-)
diff --git
a/amber/src/main/scala/org/apache/texera/workflow/WorkflowCompiler.scala
b/amber/src/main/scala/org/apache/texera/workflow/WorkflowCompiler.scala
index 50d07a9819..4e53bc170d 100644
--- a/amber/src/main/scala/org/apache/texera/workflow/WorkflowCompiler.scala
+++ b/amber/src/main/scala/org/apache/texera/workflow/WorkflowCompiler.scala
@@ -152,7 +152,7 @@ class WorkflowCompiler(
expandLogicalPlan(logicalPlan, logicalPlanPojo.opsToViewResult, None)
context.workflowSettings =
- WorkflowSettings(context.workflowSettings.dataTransferBatchSize,
outputPortsNeedingStorage)
+ WorkflowSettings(context.workflowSettings.dataTransferBatchSize,
outputPortsNeedingStorage, context.workflowSettings.batchProcessing)
Workflow(context, logicalPlan, physicalPlan)
}
diff --git
a/common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/WorkflowContext.scala
b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/WorkflowContext.scala
index ee7659d0ca..04ce26d7cb 100644
---
a/common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/WorkflowContext.scala
+++
b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/WorkflowContext.scala
@@ -30,7 +30,8 @@ object WorkflowContext {
val DEFAULT_EXECUTION_ID: ExecutionIdentity = ExecutionIdentity(1L)
val DEFAULT_WORKFLOW_ID: WorkflowIdentity = WorkflowIdentity(1L)
val DEFAULT_WORKFLOW_SETTINGS: WorkflowSettings = WorkflowSettings(
- dataTransferBatchSize = 400 // TODO: make this configurable
+ dataTransferBatchSize = 400,
+ batchProcessing = false
)
}
class WorkflowContext(
diff --git
a/common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/WorkflowSettings.scala
b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/WorkflowSettings.scala
index 3b1ab8ae8b..17885c5db1 100644
---
a/common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/WorkflowSettings.scala
+++
b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/WorkflowSettings.scala
@@ -22,5 +22,5 @@ package org.apache.texera.amber.core.workflow
case class WorkflowSettings(
dataTransferBatchSize: Int,
outputPortsNeedingStorage: Set[GlobalPortIdentity] = Set.empty,
- batchProcessing: Boolean = false
+ batchProcessing: Boolean
)
diff --git
a/frontend/src/app/workspace/component/left-panel/settings/settings.component.ts
b/frontend/src/app/workspace/component/left-panel/settings/settings.component.ts
index dfd4b845a9..953c18ce97 100644
---
a/frontend/src/app/workspace/component/left-panel/settings/settings.component.ts
+++
b/frontend/src/app/workspace/component/left-panel/settings/settings.component.ts
@@ -46,20 +46,20 @@ export class SettingsComponent implements OnInit {
) {}
ngOnInit(): void {
- this.currentDataTransferBatchSize =
-
this.workflowActionService.getWorkflowContent().settings.dataTransferBatchSize
||
- this.config.env.defaultDataTransferBatchSize;
-
this.settingsForm = this.fb.group({
- dataTransferBatchSize: [this.currentDataTransferBatchSize,
[Validators.required, Validators.min(1)]],
+ dataTransferBatchSize:
[this.workflowActionService.getWorkflowContent().settings.dataTransferBatchSize,
[Validators.required, Validators.min(1)]],
batchProcessing:
[this.workflowActionService.getWorkflowContent().settings.batchProcessing],
});
- this.settingsForm.valueChanges.pipe(untilDestroyed(this)).subscribe(value
=> {
- if (this.settingsForm.valid) {
- this.confirmUpdateDataTransferBatchSize(value.dataTransferBatchSize);
- }
- });
+ this.settingsForm
+ .get('dataTransferBatchSize')!
+ .valueChanges
+ .pipe(untilDestroyed(this))
+ .subscribe((batchSize: number) => {
+ if (this.settingsForm.get('dataTransferBatchSize')!.valid) {
+ this.confirmUpdateDataTransferBatchSize(batchSize);
+ }
+ });
this.settingsForm
.get('batchProcessing')!
@@ -73,11 +73,9 @@ export class SettingsComponent implements OnInit {
.workflowChanged()
.pipe(untilDestroyed(this))
.subscribe(() => {
- this.currentDataTransferBatchSize =
-
this.workflowActionService.getWorkflowContent().settings.dataTransferBatchSize
||
- this.config.env.defaultDataTransferBatchSize;
this.settingsForm.patchValue(
- { dataTransferBatchSize: this.currentDataTransferBatchSize },
+ { dataTransferBatchSize:
this.workflowActionService.getWorkflowContent().settings.dataTransferBatchSize,
+ batchProcessing:
this.workflowActionService.getWorkflowContent().settings.batchProcessing},
{ emitEvent: false }
);
});