From c26d3e3acd94ebbfeb1c2f14f7549b545cf015b3 Mon Sep 17 00:00:00 2001 From: Ryan Zhang Date: Tue, 9 Sep 2025 16:44:11 -0700 Subject: [PATCH 001/136] restoring files modified and created to support the jupyter notebook to workflow migration tool --- core/gui/src/app/app.module.ts | 7 +- .../notebook-migration.component.html | 187 ++++++++++++++++++ .../notebook-migration.component.scss | 130 ++++++++++++ .../notebook-migration.component.ts | 128 ++++++++++++ .../user-workflow/user-workflow.component.ts | 2 + .../type/jupyter-notebook.interface.ts | 39 ++++ .../jupyter-notebook-panel.component.html | 61 ++++++ .../jupyter-notebook-panel.component.scss | 79 ++++++++ .../jupyter-notebook-panel.component.ts | 85 ++++++++ .../component/menu/menu.component.html | 12 ++ .../component/menu/menu.component.ts | 182 ++++++++++++++++- .../mini-map/mini-map.component.html | 10 + .../mini-map/mini-map.component.scss | 7 + .../mini-map/mini-map.component.ts | 11 +- .../workflow-editor.component.ts | 6 +- .../component/workspace.component.html | 6 +- .../component/workspace.component.scss | 9 + .../component/workspace.component.ts | 2 + .../jupyter-panel/jupyter-panel.service.ts | 187 ++++++++++++++++++ core/gui/src/assets/migration_tool/mapping.ts | 32 +++ 20 files changed, 1175 insertions(+), 7 deletions(-) create mode 100644 core/gui/src/app/dashboard/component/user/user-workflow/notebook-migration-tool/notebook-migration.component.html create mode 100644 core/gui/src/app/dashboard/component/user/user-workflow/notebook-migration-tool/notebook-migration.component.scss create mode 100644 core/gui/src/app/dashboard/component/user/user-workflow/notebook-migration-tool/notebook-migration.component.ts create mode 100644 core/gui/src/app/dashboard/type/jupyter-notebook.interface.ts create mode 100644 core/gui/src/app/workspace/component/jupyter-notebook-panel/jupyter-notebook-panel.component.html create mode 100644 core/gui/src/app/workspace/component/jupyter-notebook-panel/jupyter-notebook-panel.component.scss create mode 100644 core/gui/src/app/workspace/component/jupyter-notebook-panel/jupyter-notebook-panel.component.ts create mode 100644 core/gui/src/app/workspace/service/jupyter-panel/jupyter-panel.service.ts create mode 100644 core/gui/src/assets/migration_tool/mapping.ts diff --git a/core/gui/src/app/app.module.ts b/core/gui/src/app/app.module.ts index 13759e6e55a..f47cd7aeafa 100644 --- a/core/gui/src/app/app.module.ts +++ b/core/gui/src/app/app.module.ts @@ -17,7 +17,7 @@ * under the License. */ -import { DatePipe, registerLocaleData } from "@angular/common"; +import { DatePipe, registerLocaleData, CommonModule } from "@angular/common"; import { HTTP_INTERCEPTORS, HttpClientModule } from "@angular/common/http"; import en from "@angular/common/locales/en"; import { NgModule, APP_INITIALIZER } from "@angular/core"; @@ -172,6 +172,8 @@ import { AdminSettingsComponent } from "./dashboard/component/admin/settings/adm import { catchError, of } from "rxjs"; import { FormlyRepeatDndComponent } from "./common/formly/repeat-dnd/repeat-dnd.component"; import { NzInputNumberModule } from "ng-zorro-antd/input-number"; +import { JupyterUploadSuccessComponent } from "./dashboard/component/user/user-workflow/notebook-migration-tool/notebook-migration.component"; +import { JupyterNotebookPanelComponent } from "./workspace/component/jupyter-notebook-panel/jupyter-notebook-panel.component"; registerLocaleData(en); @@ -199,6 +201,7 @@ registerLocaleData(en); UserAvatarComponent, LocalLoginComponent, UserWorkflowComponent, + JupyterUploadSuccessComponent, UserQuotaComponent, RowModalComponent, OperatorLabelComponent, @@ -264,9 +267,11 @@ registerLocaleData(en); HubSearchResultComponent, ComputingUnitSelectionComponent, AdminSettingsComponent, + JupyterNotebookPanelComponent, ], imports: [ BrowserModule, + CommonModule, AppRoutingModule, HttpClientModule, JwtModule.forRoot({ diff --git a/core/gui/src/app/dashboard/component/user/user-workflow/notebook-migration-tool/notebook-migration.component.html b/core/gui/src/app/dashboard/component/user/user-workflow/notebook-migration-tool/notebook-migration.component.html new file mode 100644 index 00000000000..41603ab8e75 --- /dev/null +++ b/core/gui/src/app/dashboard/component/user/user-workflow/notebook-migration-tool/notebook-migration.component.html @@ -0,0 +1,187 @@ + + + +
+ +
+

Upload Successful

+

Your Jupyter Notebook has been successfully uploaded!

+

Notebook Preview:

+ +
+
+ + +
+ 
{{ cell.source.join("") }}
+
+ + +
+ 
{{ cell.source.join("") }}
+ +
+

Output:

+ 
{{ getOutputText(output) }}
+
+
+ + +
+ 
{{ cell.source.join("") }}
+
+ +
+
+
+ + +
+

Select Datasets for Workflow

+

Add CSV files that will be used as input datasets for the workflow execution:

+
+ +
    +
  • {{ dataset.name }}
    • +
+
+ + +
+
+ + +
+

Notebook to Workflow Equivalence Check

+
+
+

Original Notebook

+
+
+ + +
+ 
{{ cell.source.join("") }}
+
+ + +
+ 
{{ cell.source.join("") }}
+ +
+

Output:

+ 
{{ getOutputText(output) }}
+
+
+ + +
+ 
{{ cell.source.join("") }}
+
+ +
+
+
+
+

Generated Texera Workflow

+
+ + {{workflowJsonContent}} +
+
+
+
+ +
+
+ +
+

Notebook to Workflow Equivalence Check

+
+
+

Original Notebook Output

+
+ + output goes here +
+
+
+

Generated Texera Workflow Output

+
+ + output goes here +
+
+
+
+ + +
+
diff --git a/core/gui/src/app/dashboard/component/user/user-workflow/notebook-migration-tool/notebook-migration.component.scss b/core/gui/src/app/dashboard/component/user/user-workflow/notebook-migration-tool/notebook-migration.component.scss new file mode 100644 index 00000000000..91fafb47e9c --- /dev/null +++ b/core/gui/src/app/dashboard/component/user/user-workflow/notebook-migration-tool/notebook-migration.component.scss @@ -0,0 +1,130 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +.modal-content { + display: flex; + justify-content: space-between; + padding: 20px; + overflow-y: auto; // Ensure content is scrollable + background-color: white; +} + +.left-column { + flex: 0 0 60%; + padding: 20px; + border-right: 1px solid #ddd; + overflow-y: auto; // Ensure notebook preview is scrollable + max-height: 100%; // Ensure content fits within modal height +} + +.right-column { + flex: 0 0 35%; + padding: 20px; + overflow-y: auto; // Ensure dataset input section is scrollable +} + +.equivalence-check { + display: flex; + justify-content: center; + flex-direction: row; +} + +.notebook-workflow-side-by-side { + display: flex; /* Use flexbox for the container */ + flex-direction: row; /* Arrange children in a row */ + gap: 20px; /* Optional: Adds space between the columns */ +} + +.left-half { + flex: 1; /* Adjusts to take available space */ + max-width: 50%; /* Ensures it doesn't exceed half of the container */ +} + +.right-half { + flex: 1; /* Adjusts to take available space */ + max-width: 50%; /* Ensures it doesn't exceed half of the container */ +} + +.notebook-preview { + margin-top: 10px; + margin-bottom: 10px; + border: 2px solid #000000; + padding: 10px; + height: 60vh; // Adjust max height for better visibility + overflow-y: auto; + background-color: #f7f7f7; +} + +.workflow-preview { + margin-top: 10px; + margin-bottom: 10px; + border: 2px solid #000000; + padding: 10px; + height: 60vh; + overflow-y: auto; + background-color: #f7f7f7; +} + +// Styling for Jupyter Notebook Cells +.notebook-cell { + margin-bottom: 20px; + border-radius: 5px; + padding: 15px; + background-color: white; + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); + position: relative; + border: 1px solid #e0e0e0; +} + +// Markdown Cell Styles +.jupyter-markdown-cell { + padding: 10px; + background-color: #fbfbfb; + font-family: "Georgia", "Times", "serif"; + border-left: 4px solid #f1f1f1; +} + +// Code Cell Styles +.jupyter-code-cell { + background-color: #f7f7f7; + padding: 10px; + border-radius: 4px; + font-family: "Courier New", Courier, monospace; + border: 1px solid #ddd; + position: relative; +} + +// Output Area Styles +.output { + margin-top: 10px; + padding: 10px; + background-color: #f9f9f9; + border-radius: 4px; + border: 1px solid #e8e8e8; + font-family: "Courier New", Courier, monospace; + white-space: pre-wrap; +} + +// Raw Cell Styles +.jupyter-raw-cell { + padding: 10px; + background-color: #f1f1f1; + border: 1px dashed #ddd; + font-family: "Courier New", Courier, monospace; +} diff --git a/core/gui/src/app/dashboard/component/user/user-workflow/notebook-migration-tool/notebook-migration.component.ts b/core/gui/src/app/dashboard/component/user/user-workflow/notebook-migration-tool/notebook-migration.component.ts new file mode 100644 index 00000000000..a4fe47c4e46 --- /dev/null +++ b/core/gui/src/app/dashboard/component/user/user-workflow/notebook-migration-tool/notebook-migration.component.ts @@ -0,0 +1,128 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { Component, Input } from "@angular/core"; +import { HttpClient } from "@angular/common/http"; +import { NzModalService } from "ng-zorro-antd/modal"; +import { JupyterNotebook, JupyterOutput } from "../../../../type/jupyter-notebook.interface"; + +@Component({ + selector: "texera-jupyter-upload-success", + templateUrl: "./notebook-migration.component.html", + styleUrls: ["./notebook-migration.component.scss"], +}) +export class JupyterUploadSuccessComponent { + @Input() notebookContent!: JupyterNotebook; + datasets: File[] = []; + popupStage: number = 0; // flag to manage content display + workflowGeneratingInProgress: boolean = false; + workflowJsonContent: any; // variable to store the JSON content + + constructor( + private http: HttpClient, + private modalService: NzModalService + ) {} + + getOutputText(output: JupyterOutput): string { + if (output.output_type === "stream") { + return output.text ? output.text.join("") : ""; + } else if (output.output_type === "execute_result" || output.output_type === "display_data") { + return output.data ? output.data["text/plain"] || "" : ""; + } else if (output.output_type === "error") { + return output.traceback ? output.traceback.join("\n") : ""; + } + return ""; + } + + onFileChange(event: any): void { + const files: FileList = event.target.files; + for (let i = 0; i < files.length; i++) { + this.datasets.push(files[i]); + } + } + + convertToWorkflow(): void { + this.workflowGeneratingInProgress = true; + + // Simulate workflow generation using mock data instead of an HTTP request + setTimeout(() => { + const mockData = { + operators: [ + { id: "1", type: "OperatorA", properties: {} }, + { id: "2", type: "OperatorB", properties: {} }, + ], + links: [{ source: "1", target: "2" }], + commentBoxes: [], + groups: [], + operatorPositions: { + "1": { x: 100, y: 200 }, + "2": { x: 300, y: 400 }, + }, + }; + + // Process the mock data + this.workflowJsonContent = mockData; // Assign mock data as workflow content + this.workflowGeneratingInProgress = false; + }, 2000); // Simulate a delay of 2 seconds for processing + } + + /** + * Process the selected datasets (CSV files) + */ + private processDatasets(): void { + if (this.datasets.length > 0) { + this.datasets.forEach(file => { + this.handleFileUploads(file); + }); + } + } + + /** + * Function to handle file uploads and process them (CSV dataset) + */ + private handleFileUploads(file: Blob): void { + const reader = new FileReader(); + reader.readAsText(file); + reader.onload = () => { + try { + const result = reader.result; + if (typeof result !== "string") { + throw new Error("Incorrect format: file is not a string"); + } + const datasetContent = result; // Here we get the dataset content as CSV + + // Handle the dataset content as needed (e.g., send it to backend or use in workflow) + console.log("Uploaded dataset content:", datasetContent); + + // Update the workflow with dataset processing if needed + this.workflowJsonContent = { ...this.workflowJsonContent, datasetContent }; // Append dataset content + + // Optional: Proceed to the next step or close the modal, etc. + } catch (error) { + console.error("Error processing the file: ", error); + } + }; + } + + compareOutput(): void { + console.log("Generating output to compare"); + this.popupStage = 2; + // TODO: Implement the comparison logic here + } +} diff --git a/core/gui/src/app/dashboard/component/user/user-workflow/user-workflow.component.ts b/core/gui/src/app/dashboard/component/user/user-workflow/user-workflow.component.ts index 4903e70bcb4..4cb50008863 100644 --- a/core/gui/src/app/dashboard/component/user/user-workflow/user-workflow.component.ts +++ b/core/gui/src/app/dashboard/component/user/user-workflow/user-workflow.component.ts @@ -45,6 +45,7 @@ import { DashboardWorkflow } from "../../../type/dashboard-workflow.interface"; import { DownloadService } from "../../../service/user/download/download.service"; import { DASHBOARD_USER_WORKSPACE } from "../../../../app-routing.constant"; import { GuiConfigService } from "../../../../common/service/gui-config.service"; +import { JupyterUploadSuccessComponent } from "./notebook-migration-tool/notebook-migration.component"; /** * Saved-workflow-section component contains information and functionality @@ -55,6 +56,7 @@ import { GuiConfigService } from "../../../../common/service/gui-config.service" * - allows easy searching for workflows by name or other parameters using Fuse.js * - sorting options * - creation of a new workflow + * - AI generation of new workflow from jupyter notebook * * Steps to add new search parameter: * 1. Add a newly formatted dropdown menu in the html and css files, and a backend call to retrieve any necessary data diff --git a/core/gui/src/app/dashboard/type/jupyter-notebook.interface.ts b/core/gui/src/app/dashboard/type/jupyter-notebook.interface.ts new file mode 100644 index 00000000000..b57fd0f9dd4 --- /dev/null +++ b/core/gui/src/app/dashboard/type/jupyter-notebook.interface.ts @@ -0,0 +1,39 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +export interface JupyterNotebook { + cells: JupyterCell[]; + metadata: any; + nbformat: number; + nbformat_minor: number; +} + +export interface JupyterCell { + cell_type: string; + source: string[]; + metadata: any; + outputs?: JupyterOutput[]; +} + +export interface JupyterOutput { + output_type: string; + text?: string[]; + data?: { [key: string]: any }; + traceback?: string[]; +} diff --git a/core/gui/src/app/workspace/component/jupyter-notebook-panel/jupyter-notebook-panel.component.html b/core/gui/src/app/workspace/component/jupyter-notebook-panel/jupyter-notebook-panel.component.html new file mode 100644 index 00000000000..ae5d0f1cbfc --- /dev/null +++ b/core/gui/src/app/workspace/component/jupyter-notebook-panel/jupyter-notebook-panel.component.html @@ -0,0 +1,61 @@ + + +
+
+ Jupyter Notebook +
+ + + + +
+
+ +
+ +
+
diff --git a/core/gui/src/app/workspace/component/jupyter-notebook-panel/jupyter-notebook-panel.component.scss b/core/gui/src/app/workspace/component/jupyter-notebook-panel/jupyter-notebook-panel.component.scss new file mode 100644 index 00000000000..960b77a063e --- /dev/null +++ b/core/gui/src/app/workspace/component/jupyter-notebook-panel/jupyter-notebook-panel.component.scss @@ -0,0 +1,79 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +.draggable-panel { + position: absolute; + top: 200px; + left: 200px; + width: 400px; + height: 400px; + background-color: #fff; + box-shadow: 0 1px 5px rgba(0, 0, 0, 0.3); + border: 1px solid #ccc; + border-radius: 5px; + z-index: 1000; + resize: both; + overflow: auto; +} + +.panel-header { + display: flex; + justify-content: space-between; + align-items: center; + background-color: #007bff; + color: white; + padding: 10px; + font-weight: bold; + text-align: center; + cursor: move; +} + +.panel-buttons { + display: flex; + align-items: center; + gap: 8px; +} + +.minimize-button, +.close-button { + background: none; + border: none; + color: white; + font-size: 16px; + cursor: pointer; +} + +.minimize-button:hover { + color: royalblue; +} + +.close-button:hover { + color: royalblue; +} + +.iframe-container { + width: 100%; + height: calc(100% - 40px); /* Adjust height for the header */ +} + +.iframe-container iframe { + width: 100%; + height: 100%; + border: none; +} diff --git a/core/gui/src/app/workspace/component/jupyter-notebook-panel/jupyter-notebook-panel.component.ts b/core/gui/src/app/workspace/component/jupyter-notebook-panel/jupyter-notebook-panel.component.ts new file mode 100644 index 00000000000..bb99585b4f2 --- /dev/null +++ b/core/gui/src/app/workspace/component/jupyter-notebook-panel/jupyter-notebook-panel.component.ts @@ -0,0 +1,85 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { Component, ElementRef, OnDestroy, OnInit, ViewChild, AfterViewInit } from "@angular/core"; +import { JupyterPanelService } from "../../service/jupyter-panel/jupyter-panel.service"; +import { Subject } from "rxjs"; +import { takeUntil } from "rxjs/operators"; + +@Component({ + selector: "texera-jupyter-notebook-panel", + templateUrl: "./jupyter-notebook-panel.component.html", + styleUrls: ["./jupyter-notebook-panel.component.scss"], +}) +export class JupyterNotebookPanelComponent implements OnInit, AfterViewInit, OnDestroy { + @ViewChild("iframeRef", { static: false }) iframeRef!: ElementRef; // Use static: false + + isVisible: boolean = false; // Initialize to false, meaning the panel is hidden by default + notebookUrl: string = ""; // Store the notebook URL dynamically + private destroy$ = new Subject(); + + constructor(private jupyterPanelService: JupyterPanelService) {} + + ngOnInit(): void { + // Subscribe to the visibility state of the panel + this.jupyterPanelService.jupyterNotebookPanelVisible$ + .pipe(takeUntil(this.destroy$)) + .subscribe((visible: boolean) => { + this.isVisible = visible; + + if (this.isVisible) { + // The iframe only exists once the panel is visible (because of *ngIf) + this.notebookUrl = "http://localhost:8888/notebooks/work/example.ipynb?token=mytoken"; + this.checkIframeRef(); + } + }); + } + + ngAfterViewInit(): void { + // Ensure iframe is handled after it's available in the DOM + this.checkIframeRef(); + } + + checkIframeRef(): void { + setTimeout(() => { + if (this.isVisible && this.iframeRef?.nativeElement) { + console.log("Iframe reference found:", this.iframeRef.nativeElement); + this.jupyterPanelService.setIframeRef(this.iframeRef.nativeElement); + } else { + console.error("Iframe reference not found yet."); + } + }, 0); // Small timeout to ensure DOM is updated + } + + ngOnDestroy(): void { + this.destroy$.next(); + this.destroy$.complete(); // Cleanup subscriptions to avoid memory leaks + } + + // Close the panel by invoking the service method + closePanel(): void { + this.jupyterPanelService.closeJupyterNotebookPanel(); + } + + // Minimize the jupyter notebook by invoking the service method + minimizePanel(): void { + this.isVisible = false; + this.jupyterPanelService.minimizeJupyterNotebookPanel(); + } +} diff --git a/core/gui/src/app/workspace/component/menu/menu.component.html b/core/gui/src/app/workspace/component/menu/menu.component.html index e212169321f..2ea3dfe2c3a 100644 --- a/core/gui/src/app/workspace/component/menu/menu.component.html +++ b/core/gui/src/app/workspace/component/menu/menu.component.html @@ -156,6 +156,18 @@ nz-icon nzType="download"> + + + diff --git a/core/gui/src/app/workspace/component/menu/menu.component.ts b/core/gui/src/app/workspace/component/menu/menu.component.ts index f2dec0bfc01..26936a2d88e 100644 --- a/core/gui/src/app/workspace/component/menu/menu.component.ts +++ b/core/gui/src/app/workspace/component/menu/menu.component.ts @@ -18,7 +18,7 @@ */ import { DatePipe, Location } from "@angular/common"; -import { Component, ElementRef, Input, OnDestroy, OnInit, ViewChild } from "@angular/core"; +import { Component, ElementRef, Input, OnDestroy, OnInit, ViewChild, Output, EventEmitter } from "@angular/core"; import { UserService } from "../../../common/service/user/user.service"; import { DEFAULT_WORKFLOW_NAME, @@ -54,6 +54,8 @@ import { ComputingUnitStatusService } from "../../service/computing-unit-status/ import { ComputingUnitState } from "../../types/computing-unit-connection.interface"; import { ComputingUnitSelectionComponent } from "../power-button/computing-unit-selection.component"; import { GuiConfigService } from "../../../common/service/gui-config.service"; +import { JupyterPanelService } from "../../service/jupyter-panel/jupyter-panel.service"; +import mapping from "../../../../assets/migration_tool/mapping"; /** * MenuComponent is the top level menu bar that shows @@ -95,6 +97,8 @@ export class MenuComponent implements OnInit, OnDestroy { @Input() public currentExecutionName: string = ""; // reset executionName @Input() public particularVersionDate: string = ""; // placeholder for the metadata information of a particular workflow version @ViewChild("workflowNameInput") workflowNameInput: ElementRef | undefined; + // Emit an event to parent component (workspace) when AI generation starts or stops + @Output() public setWaitingForOpenAi = new EventEmitter(); // variable bound with HTML to decide if the running spinner should show public runButtonText = "Run"; @@ -135,7 +139,8 @@ export class MenuComponent implements OnInit, OnDestroy { private reportGenerationService: ReportGenerationService, private panelService: PanelService, private computingUnitStatusService: ComputingUnitStatusService, - protected config: GuiConfigService + protected config: GuiConfigService, + private jupyterPanelService: JupyterPanelService ) { workflowWebsocketService .subscribeToEvent("ExecutionDurationUpdateEvent") @@ -497,6 +502,179 @@ export class MenuComponent implements OnInit, OnDestroy { this.workflowActionService.deleteOperatorsAndLinks(allOperatorIDs); } + public onClickImportNotebook = (file: NzUploadFile): boolean => { + const reader = new FileReader(); + + // Check if the file is a Jupyter notebook based on its extension + const fileExtension = file.name.split(".").pop()?.toLowerCase(); + if (fileExtension !== "ipynb") { + this.notificationService.error("Please upload a valid Jupyter Notebook (.ipynb) file."); + return false; + } + + this.setWaitingForOpenAi.emit(true); // start loading + + // Read the notebook file as text + reader.readAsText(file as any); + reader.onload = async () => { + try { + const result = reader.result; + if (typeof result !== "string") { + throw new Error("File content is not a valid string."); + } + + // Parse the content of the .ipynb file (it's in JSON format) + const notebookContent = JSON.parse(result); + + // Validate the notebook structure + if (!notebookContent || !Array.isArray(notebookContent.cells)) { + throw new Error("Invalid notebook structure."); + } + + // Print content of notebook (JSON) + console.log(`Notebook JSON: ${JSON.stringify(notebookContent)}`); + + // Send Notebook JSON to pod to open in jupyterlab + await this.sendNotebookToPod(notebookContent); + + // Get workflow and mapping from OpenAI + console.log("Getting data from OpenAI..."); + await this.sendToAIGenerateWorkflow() + .then(result => { + if (result) { + const { workflowContent, mappingContent } = result; + console.log("Workflow:", workflowContent); + console.log("Mapping:", mappingContent); + + const fileExtensionIndex = file.name.lastIndexOf("."); + var workflowName: string; + if (fileExtensionIndex === -1) { + workflowName = file.name; + } else { + workflowName = file.name.substring(0, fileExtensionIndex); + } + if (workflowName.trim() === "") { + workflowName = DEFAULT_WORKFLOW_NAME; + } + + // Create a valid Workflow object with required fields + const workflow: Workflow = { + content: workflowContent, + name: workflowName, + isPublished: 0, + description: undefined, + wid: undefined, + creationTime: undefined, + lastModifiedTime: undefined, + readonly: false, + }; + + this.workflowPersistService + .persistWorkflow(workflow) + .pipe(untilDestroyed(this)) + .subscribe((updatedWorkflow: Workflow) => { + const mappingID = "mapping_wid_" + updatedWorkflow.wid; + + mapping[mappingID] = { + cell_to_operator: { ...mappingContent["cell_to_operator"] }, + operator_to_cell: { ...mappingContent["operator_to_cell"] }, + }; + + this.workflowActionService.reloadWorkflow(updatedWorkflow, true); + this.openJupyterNotebookPanel(); + this.notificationService.success("Successfully generated workflow and mapping from notebook."); + }); + } else { + console.error("Result is undefined"); + } + }) + .catch(error => { + console.error("Error while fetching data from OpenAI:", error); + }) + .finally(() => { + this.setWaitingForOpenAi.emit(false); // stop loading + }); + } catch (error) { + this.notificationService.error("Failed to import the notebook."); + console.error(error); + } + }; + + return false; // Prevent automatic upload handling + }; + + private openJupyterNotebookPanel(): void { + // Assuming you have a service that handles the state of various panels + this.jupyterPanelService.openPanel("JupyterNotebookPanel"); + } + + private async sendToAIGenerateWorkflow() { + const apiUrl = "http://localhost:5000/get_openai_response"; // Flask API URL + + try { + // Send POST request to the Flask server + const response = await fetch(apiUrl, { + method: "POST", + headers: { + "Content-Type": "application/json", + }, + body: JSON.stringify({}), + }); + + // Check if the response is OK (status code 200) + if (!response.ok) { + throw new Error("Network response was not ok"); + } + + // Parse JSON response from the server + const data = await response.json(); + console.log("Data received from OpenAI:", data); // { "workflow": {...}, "mapping": {...} } + + // Extract individual objects + const workflowContent = data.workflow; + const mappingContent = data.mapping; + + return { workflowContent, mappingContent }; + } catch (error) { + console.error("Error while querying OpenAI:", error); + } + } + + private async sendNotebookToPod(notebookContent: JSON) { + const apiUrl = "http://localhost:5000/set_notebook"; // Flask API URL + + const requestBody = { + notebookName: "example.ipynb", // TODO: make this into the link used by jupyter-notebook-panel.component.html: e.g) "http://localhost:8888/notebooks/work/example.ipynb?token=mytoken" + notebookData: notebookContent, + }; + + try { + const response = await fetch(apiUrl, { + method: "POST", + headers: { + "Content-Type": "application/json", + }, + body: JSON.stringify(requestBody), + }); + + // Ensure the response status is 200 (OK) before proceeding + if (!response.ok) { + const errorData = await response.json().catch(() => ({ error: "Unknown error occurred" })); + throw new Error(`Server Error ${response.status}: ${errorData.error || "Failed to execute notebook"}`); + } + + const data = await response.json(); // {message: 'Notebook saved successfully', notebookPath: '/home/jovyan/work/example.ipynb'} + console.log("Notebook successfully sent to pod:", data); + this.notificationService.success("Notebook opened successfully in JupyterLab."); + this.openJupyterNotebookPanel(); // Open panel after successful upload + } catch (error) { + console.error("Error sending notebook to pod:", error); + // @ts-ignore + this.notificationService.error("Error sending notebook to JupyterLab: " + error.message); + } + } + + public onClickImportWorkflow = (file: NzUploadFile): boolean => { const reader = new FileReader(); reader.readAsText(file as any); diff --git a/core/gui/src/app/workspace/component/workflow-editor/mini-map/mini-map.component.html b/core/gui/src/app/workspace/component/workflow-editor/mini-map/mini-map.component.html index adbf9f6ab5c..bd1b5de377c 100644 --- a/core/gui/src/app/workspace/component/workflow-editor/mini-map/mini-map.component.html +++ b/core/gui/src/app/workspace/component/workflow-editor/mini-map/mini-map.component.html @@ -53,6 +53,16 @@ nz-icon nzType="zoom-in"> +
diff --git a/core/gui/src/app/workspace/component/workflow-editor/mini-map/mini-map.component.scss b/core/gui/src/app/workspace/component/workflow-editor/mini-map/mini-map.component.scss index c4d9667dc86..293dae89316 100644 --- a/core/gui/src/app/workspace/component/workflow-editor/mini-map/mini-map.component.scss +++ b/core/gui/src/app/workspace/component/workflow-editor/mini-map/mini-map.component.scss @@ -45,6 +45,13 @@ z-index: 4; } +#minimap-expand-jupyter-button { + position: absolute; + bottom: 0; + right: 120px; + z-index: 4; +} + #mini-map-container { position: relative; overflow: hidden; diff --git a/core/gui/src/app/workspace/component/workflow-editor/mini-map/mini-map.component.ts b/core/gui/src/app/workspace/component/workflow-editor/mini-map/mini-map.component.ts index 3013e73c9a6..7d9c43029e7 100644 --- a/core/gui/src/app/workspace/component/workflow-editor/mini-map/mini-map.component.ts +++ b/core/gui/src/app/workspace/component/workflow-editor/mini-map/mini-map.component.ts @@ -25,6 +25,7 @@ import * as joint from "jointjs"; import { JointGraphWrapper } from "../../../service/workflow-graph/model/joint-graph-wrapper"; import { PanelService } from "../../../service/panel/panel.service"; import { CdkDrag } from "@angular/cdk/drag-drop"; +import { JupyterPanelService } from "../../../service/jupyter-panel/jupyter-panel.service"; @UntilDestroy() @Component({ @@ -42,7 +43,8 @@ export class MiniMapComponent implements AfterViewInit, OnDestroy { constructor( private workflowActionService: WorkflowActionService, - private panelService: PanelService + private panelService: PanelService, + private jupyterPanelService: JupyterPanelService ) {} ngAfterViewInit() { @@ -141,6 +143,13 @@ export class MiniMapComponent implements AfterViewInit, OnDestroy { ); } + /** + * This method will expand and redisplay the jupyter notebook. + */ + public onClickExpandJupyterNotebookPanel(): void { + this.jupyterPanelService.openJupyterNotebookPanel(); + } + public triggerCenter(): void { this.workflowActionService.getTexeraGraph().triggerCenterEvent(); if (this.navigatorDrag) this.navigatorDrag.reset(); diff --git a/core/gui/src/app/workspace/component/workflow-editor/workflow-editor.component.ts b/core/gui/src/app/workspace/component/workflow-editor/workflow-editor.component.ts index 089ea9eead3..6402d85150b 100644 --- a/core/gui/src/app/workspace/component/workflow-editor/workflow-editor.component.ts +++ b/core/gui/src/app/workspace/component/workflow-editor/workflow-editor.component.ts @@ -41,6 +41,7 @@ import * as _ from "lodash"; import * as joint from "jointjs"; import { isDefined } from "../../../common/util/predicate"; import { GuiConfigService } from "../../../common/service/gui-config.service"; +import { JupyterPanelService } from "../../service/jupyter-panel/jupyter-panel.service"; // jointjs interactive options for enabling and disabling interactivity // https://resources.jointjs.com/docs/jointjs/v3.2/joint.html#dia.Paper.prototype.options.interactive @@ -109,7 +110,8 @@ export class WorkflowEditorComponent implements AfterViewInit, OnDestroy { private router: Router, public nzContextMenu: NzContextMenuService, private elementRef: ElementRef, - private config: GuiConfigService + private config: GuiConfigService, + private jupyterPanelService: JupyterPanelService ) { this.wrapper = this.workflowActionService.getJointGraphWrapper(); } @@ -496,12 +498,14 @@ export class WorkflowEditorComponent implements AfterViewInit, OnDestroy { const elementID = event[0].model.id.toString(); const highlightedOperatorIDs = this.wrapper.getCurrentHighlightedOperatorIDs(); const highlightedCommentBoxIDs = this.wrapper.getCurrentHighlightedCommentBoxIDs(); + this.jupyterPanelService.onWorkflowComponentClick(elementID); // Highlight corresponding Jupyter notebook cell if (event[1].shiftKey) { // if in multiselect toggle highlights on click if (highlightedOperatorIDs.includes(elementID)) { this.workflowActionService.unhighlightOperators(elementID); } else if (this.workflowActionService.getTexeraGraph().hasOperator(elementID)) { this.workflowActionService.highlightOperators(event[1].shiftKey, elementID); + this.jupyterPanelService.onWorkflowComponentClick(elementID); // Highlight corresponding Jupyter notebook cell } if (highlightedCommentBoxIDs.includes(elementID)) { this.wrapper.unhighlightCommentBoxes(elementID); diff --git a/core/gui/src/app/workspace/component/workspace.component.html b/core/gui/src/app/workspace/component/workspace.component.html index 2e662831a33..cd0b8f9bc10 100644 --- a/core/gui/src/app/workspace/component/workspace.component.html +++ b/core/gui/src/app/workspace/component/workspace.component.html @@ -19,7 +19,7 @@ @@ -29,8 +29,10 @@ + [pid]="pid" + (setWaitingForOpenAi)="isWaitingForOpenAi = $event"> + diff --git a/core/gui/src/app/workspace/component/workspace.component.scss b/core/gui/src/app/workspace/component/workspace.component.scss index a1eae3421e0..1fdf891273a 100644 --- a/core/gui/src/app/workspace/component/workspace.component.scss +++ b/core/gui/src/app/workspace/component/workspace.component.scss @@ -31,6 +31,15 @@ texera-menu { background-color: white; } +texera-jupyter-notebook-panel { + position: absolute; + top: 0; + left: 0; + z-index: 1; + width: 100%; + background-color: white; +} + texera-mini-map { position: absolute; bottom: 0; diff --git a/core/gui/src/app/workspace/component/workspace.component.ts b/core/gui/src/app/workspace/component/workspace.component.ts index bf66fe0c046..2d035743e1b 100644 --- a/core/gui/src/app/workspace/component/workspace.component.ts +++ b/core/gui/src/app/workspace/component/workspace.component.ts @@ -60,6 +60,8 @@ export class WorkspaceComponent implements AfterViewInit, OnInit, OnDestroy { public pid?: number = undefined; public writeAccess: boolean = false; public isLoading: boolean = false; + // variable for track whether we are waiting for AI to finish generating (whether a loading icon should show) + public isWaitingForOpenAi = false; @ViewChild("codeEditor", { read: ViewContainerRef }) codeEditorViewRef!: ViewContainerRef; /** diff --git a/core/gui/src/app/workspace/service/jupyter-panel/jupyter-panel.service.ts b/core/gui/src/app/workspace/service/jupyter-panel/jupyter-panel.service.ts new file mode 100644 index 00000000000..c24d7127559 --- /dev/null +++ b/core/gui/src/app/workspace/service/jupyter-panel/jupyter-panel.service.ts @@ -0,0 +1,187 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { Injectable } from "@angular/core"; +import { BehaviorSubject } from "rxjs"; +import { WorkflowActionService } from "../workflow-graph/model/workflow-action.service"; +import mapping from "../../../../assets/migration_tool/mapping"; +import { OperatorLink } from "../../types/workflow-common.interface"; + +@Injectable({ + providedIn: "root", +}) +export class JupyterPanelService { + private jupyterNotebookPanelVisible = new BehaviorSubject(false); + public jupyterNotebookPanelVisible$ = this.jupyterNotebookPanelVisible.asObservable(); + + private iframeRef: HTMLIFrameElement | null = null; // Store reference to iframe element + private cellContent: string[] = []; // Store the content of the cells + private highlightedCell: number | null = null; // Track the highlighted cell + + // Precomputed dictionary for cell to highlight mapping + private cellToHighlightMapping: Record = {}; + + constructor(private workflowActionService: WorkflowActionService) { + this.workflowActionService.workflowChanged().subscribe(() => { + console.log("Workflow graph updated, recomputing highlight mapping..."); + this.precomputeHighlightMapping(); + }); + window.addEventListener("message", this.handleNotebookMessage); + } + + // Precompute the dictionary for O(1) highlighting + private precomputeHighlightMapping(): void { + const wid = this.workflowActionService.getWorkflow().wid; + + if (wid === undefined) { + console.warn("Workflow ID is undefined. Cannot compute highlight mapping."); + return; + } + const mappingKey = "mapping_wid_" + wid; + + if (!(mappingKey in mapping)) { + console.warn(`Mapping key '${mappingKey}' not found. Cannot compute highlight mapping.`); + return; + } + const cellToOperator = mapping[mappingKey].cell_to_operator; + + const allLinks: OperatorLink[] = this.workflowActionService.getTexeraGraph().getAllLinks(); + if (allLinks.length === 0) { + console.warn("No links found in the graph during precompute."); + return; + } + + for (const cellUUID in cellToOperator) { + const components = cellToOperator[cellUUID] || []; + const componentSet = new Set(components); + const edges: string[] = []; + + allLinks.forEach(link => { + const sourceOperatorID = link.source.operatorID; + const targetOperatorID = link.target.operatorID; + + if ( + componentSet.has(sourceOperatorID) && + componentSet.has(targetOperatorID) && + sourceOperatorID !== targetOperatorID + ) { + edges.push(link.linkID); + } + }); + + this.cellToHighlightMapping[cellUUID] = { components, edges }; + } + } + + // Set the iframe reference (from the component's ViewChild) + setIframeRef(iframe: HTMLIFrameElement) { + this.iframeRef = iframe; + this.iframeRef.onload = () => console.log("Iframe loaded successfully."); + } + + // Open the Jupyter Notebook panel + openPanel(panelName: string): void { + if (panelName === "JupyterNotebookPanel") { + this.jupyterNotebookPanelVisible.next(true); + } + } + + // Close the Jupyter Notebook panel + closeJupyterNotebookPanel(): void { + this.jupyterNotebookPanelVisible.next(false); + const wid = this.workflowActionService.getWorkflow().wid; + if (wid != undefined && "mapping_wid_" + wid in mapping) { + delete mapping["mapping_wid_" + wid]; + } + } + + // Minimize the Jupyter Notebook panel + public minimizeJupyterNotebookPanel(): void { + this.jupyterNotebookPanelVisible.next(false); + } + + // Expand the Jupyter Notebook panel + public openJupyterNotebookPanel(): void { + this.jupyterNotebookPanelVisible.next(true); + } + + // Handle messages from the Jupyter notebook iframe + private handleNotebookMessage = (event: MessageEvent) => { + const allowedOrigins = ["http://localhost:4200", "http://localhost:8888"]; + if (!allowedOrigins.includes(event.origin)) { + console.log("Invalid origin:", event.origin); + return; + } + + const { action, cellIndex, cellContent, cellUUID } = event.data; + + if (action === "cellClicked") { + this.highlightedCell = cellIndex; + this.cellContent[cellIndex] = cellContent || `Cell ${cellIndex + 1}`; + this.highlightFromCell(cellUUID); + } + }; + + // Highlight operators and edges based on the clicked cell + private highlightFromCell(cellUUID: string): void { + const highlightData = this.cellToHighlightMapping[cellUUID] || { components: [], edges: [] }; + + // Unhighlight all operators and links + this.workflowActionService.unhighlightOperators( + ...this.workflowActionService + .getTexeraGraph() + .getAllOperators() + .map(op => op.operatorID) + ); + this.workflowActionService.unhighlightLinks( + ...this.workflowActionService + .getTexeraGraph() + .getAllLinks() + .map(link => link.linkID) + ); + + // Highlight components and edges + if (highlightData.components.length > 0) { + this.workflowActionService.highlightOperators(true, ...highlightData.components); + } + if (highlightData.edges.length > 0) { + this.workflowActionService.highlightLinks(true, ...highlightData.edges); + } + + console.log(`Highlighted components: ${highlightData.components}, edges: ${highlightData.edges}`); + } + + // Handle when a Texera component is clicked to trigger the corresponding notebook cell + onWorkflowComponentClick(cellUUID: string): void { + if (this.iframeRef && this.iframeRef.contentWindow) { + const wid = this.workflowActionService.getWorkflow().wid; + const operatorArray = mapping[wid != undefined ? "mapping_wid_" + wid : "default"]["operator_to_cell"][cellUUID]; + if (operatorArray) { + this.iframeRef.contentWindow.postMessage( + { action: "triggerCellClick", operators: operatorArray }, + "http://localhost:8888" + ); + } else { + console.error(`No operators found for cellUUID: ${cellUUID}`); + } + } else { + console.error("Iframe reference is null."); + } + } +} diff --git a/core/gui/src/assets/migration_tool/mapping.ts b/core/gui/src/assets/migration_tool/mapping.ts new file mode 100644 index 00000000000..e600e813fba --- /dev/null +++ b/core/gui/src/assets/migration_tool/mapping.ts @@ -0,0 +1,32 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +interface MappingContent { + cell_to_operator: { [key: string]: any }; + operator_to_cell: { [key: string]: any }; +} + +const mapping: { [key: string]: MappingContent } = { + default: { + cell_to_operator: {}, + operator_to_cell: {}, + }, +}; + +export default mapping; From 48c852eca40820e08b5eceafa3ee68b6c2567481 Mon Sep 17 00:00:00 2001 From: Ryan Zhang Date: Tue, 9 Sep 2025 17:20:31 -0700 Subject: [PATCH 002/136] changed ports used to 8889 instead of 8888 for OpenAI API --- .../jupyter-notebook-panel.component.html | 2 +- .../jupyter-notebook-panel.component.ts | 2 +- .../workspace/service/jupyter-panel/jupyter-panel.service.ts | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/gui/src/app/workspace/component/jupyter-notebook-panel/jupyter-notebook-panel.component.html b/core/gui/src/app/workspace/component/jupyter-notebook-panel/jupyter-notebook-panel.component.html index ae5d0f1cbfc..b1b9a217c5f 100644 --- a/core/gui/src/app/workspace/component/jupyter-notebook-panel/jupyter-notebook-panel.component.html +++ b/core/gui/src/app/workspace/component/jupyter-notebook-panel/jupyter-notebook-panel.component.html @@ -53,7 +53,7 @@ diff --git a/core/gui/src/app/workspace/component/jupyter-notebook-panel/jupyter-notebook-panel.component.ts b/core/gui/src/app/workspace/component/jupyter-notebook-panel/jupyter-notebook-panel.component.ts index bb99585b4f2..f316a833820 100644 --- a/core/gui/src/app/workspace/component/jupyter-notebook-panel/jupyter-notebook-panel.component.ts +++ b/core/gui/src/app/workspace/component/jupyter-notebook-panel/jupyter-notebook-panel.component.ts @@ -45,7 +45,7 @@ export class JupyterNotebookPanelComponent implements OnInit, AfterViewInit, OnD if (this.isVisible) { // The iframe only exists once the panel is visible (because of *ngIf) - this.notebookUrl = "http://localhost:8888/notebooks/work/example.ipynb?token=mytoken"; + this.notebookUrl = "http://localhost:8889/notebooks/work/example.ipynb?token=mytoken"; this.checkIframeRef(); } }); diff --git a/core/gui/src/app/workspace/service/jupyter-panel/jupyter-panel.service.ts b/core/gui/src/app/workspace/service/jupyter-panel/jupyter-panel.service.ts index c24d7127559..18e00af963c 100644 --- a/core/gui/src/app/workspace/service/jupyter-panel/jupyter-panel.service.ts +++ b/core/gui/src/app/workspace/service/jupyter-panel/jupyter-panel.service.ts @@ -123,7 +123,7 @@ export class JupyterPanelService { // Handle messages from the Jupyter notebook iframe private handleNotebookMessage = (event: MessageEvent) => { - const allowedOrigins = ["http://localhost:4200", "http://localhost:8888"]; + const allowedOrigins = ["http://localhost:4200", "http://localhost:8889"]; if (!allowedOrigins.includes(event.origin)) { console.log("Invalid origin:", event.origin); return; @@ -175,7 +175,7 @@ export class JupyterPanelService { if (operatorArray) { this.iframeRef.contentWindow.postMessage( { action: "triggerCellClick", operators: operatorArray }, - "http://localhost:8888" + "http://localhost:8889" ); } else { console.error(`No operators found for cellUUID: ${cellUUID}`); From 0d3bf4ce7452883d25c6ba8fedb7d9d253efe951 Mon Sep 17 00:00:00 2001 From: Yicong Huang <17627829+Yicong-Huang@users.noreply.github.com> Date: Fri, 3 Oct 2025 23:27:28 -0400 Subject: [PATCH 003/136] chore: add bug report template (#3812) --- .github/ISSUE_TEMPLATE/bug-template.yaml | 75 ++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/bug-template.yaml diff --git a/.github/ISSUE_TEMPLATE/bug-template.yaml b/.github/ISSUE_TEMPLATE/bug-template.yaml new file mode 100644 index 00000000000..67b98861510 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug-template.yaml @@ -0,0 +1,75 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +name: Bug Report +description: File a bug report. +labels: ["triage"] +type: "Bug" +body: + - type: markdown + attributes: + value: | + Thanks for taking the time to fill out this bug report! + - type: textarea + id: what-happened + attributes: + label: What happened? + description: Also tell us, what did you expect to happen? + placeholder: Tell us what you see! + value: "A bug happened!" + validations: + required: true + - type: textarea + id: reproduce + attributes: + label: How to reproduce? + description: Please include steps for a repro. + validations: + required: true + - type: dropdown + id: version + attributes: + label: Version + description: What version of Texera are you running? + options: + - 1.0.0 (Default) + default: 0 + validations: + required: true + - type: dropdown + id: browsers + attributes: + label: What browsers are you seeing the problem on? + multiple: true + options: + - Chrome + - Safari + - Firefox + - Microsoft Edge + - type: textarea + id: logs + attributes: + label: Relevant log output + description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks. + render: shell + - type: checkboxes + id: terms + attributes: + label: Code of Conduct + description: By submitting this issue, you agree to follow [Apache Code of Conduct](https://www.apache.org/foundation/policies/conduct). + options: + - label: I agree to follow Apache Code of Conduct + required: true From 1ec8022a1e83c7f5460900851031777715763820 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Oct 2025 21:37:02 -0700 Subject: [PATCH 004/136] chore(deps): bump @babel/helpers from 7.25.7 to 7.28.4 in /core/gui (#3795) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [@babel/helpers](https://github.com/babel/babel/tree/HEAD/packages/babel-helpers) from 7.25.7 to 7.28.4.
Release notes

Sourced from @​babel/helpers's releases.

v7.28.4 (2025-09-05)

Thanks @​gwillen and @​mrginglymus for your first PRs!

:house: Internal

Committers: 5

v7.28.3 (2025-08-14)

:eyeglasses: Spec Compliance

  • babel-helper-create-class-features-plugin, babel-plugin-proposal-decorators, babel-plugin-transform-class-static-block, babel-preset-env

:bug: Bug Fix

:nail_care: Polish

  • babel-plugin-transform-regenerator, babel-plugin-transform-runtime

:memo: Documentation

:house: Internal

:microscope: Output optimization

  • babel-plugin-proposal-destructuring-private, babel-plugin-proposal-do-expressions

Committers: 5

... (truncated)

Changelog

Sourced from @​babel/helpers's changelog.

v7.28.4 (2025-09-05)

:house: Internal

v7.28.3 (2025-08-14)

:eyeglasses: Spec Compliance

  • babel-helper-create-class-features-plugin, babel-plugin-proposal-decorators, babel-plugin-transform-class-static-block, babel-preset-env

:bug: Bug Fix

:nail_care: Polish

  • babel-plugin-transform-regenerator, babel-plugin-transform-runtime

:memo: Documentation

:house: Internal

:microscope: Output optimization

  • babel-plugin-proposal-destructuring-private, babel-plugin-proposal-do-expressions

v7.28.2 (2025-07-24)

:bug: Bug Fix

  • babel-types
  • babel-helpers, babel-plugin-transform-async-generator-functions, babel-plugin-transform-regenerator, babel-preset-env, babel-runtime-corejs3

v7.28.1 (2025-07-12)

:bug: Bug Fix

  • babel-plugin-transform-async-generator-functions, babel-plugin-transform-regenerator

:memo: Documentation

... (truncated)

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=@babel/helpers&package-manager=npm_and_yarn&previous-version=7.25.7&new-version=7.28.4)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/apache/texera/network/alerts).
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Xinyuan Lin Co-authored-by: Chris <143021053+kunwp1@users.noreply.github.com> --- core/gui/yarn.lock | 69 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 63 insertions(+), 6 deletions(-) diff --git a/core/gui/yarn.lock b/core/gui/yarn.lock index fc89615df4d..75498044bf1 100644 --- a/core/gui/yarn.lock +++ b/core/gui/yarn.lock @@ -711,6 +711,17 @@ __metadata: languageName: node linkType: hard +"@babel/code-frame@npm:^7.27.1": + version: 7.27.1 + resolution: "@babel/code-frame@npm:7.27.1" + dependencies: + "@babel/helper-validator-identifier": "npm:^7.27.1" + js-tokens: "npm:^4.0.0" + picocolors: "npm:^1.1.1" + checksum: 10c0/5dd9a18baa5fce4741ba729acc3a3272c49c25cb8736c4b18e113099520e7ef7b545a4096a26d600e4416157e63e87d66db46aa3fbf0a5f2286da2705c12da00 + languageName: node + linkType: hard + "@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.22.9, @babel/compat-data@npm:^7.25.7, @babel/compat-data@npm:^7.25.8": version: 7.25.8 resolution: "@babel/compat-data@npm:7.25.8" @@ -1048,6 +1059,13 @@ __metadata: languageName: node linkType: hard +"@babel/helper-string-parser@npm:^7.27.1": + version: 7.27.1 + resolution: "@babel/helper-string-parser@npm:7.27.1" + checksum: 10c0/8bda3448e07b5583727c103560bcf9c4c24b3c1051a4c516d4050ef69df37bb9a4734a585fe12725b8c2763de0a265aa1e909b485a4e3270b7cfd3e4dbe4b602 + languageName: node + linkType: hard + "@babel/helper-validator-identifier@npm:^7.25.7": version: 7.25.7 resolution: "@babel/helper-validator-identifier@npm:7.25.7" @@ -1055,6 +1073,13 @@ __metadata: languageName: node linkType: hard +"@babel/helper-validator-identifier@npm:^7.27.1": + version: 7.27.1 + resolution: "@babel/helper-validator-identifier@npm:7.27.1" + checksum: 10c0/c558f11c4871d526498e49d07a84752d1800bf72ac0d3dad100309a2eaba24efbf56ea59af5137ff15e3a00280ebe588560534b0e894a4750f8b1411d8f78b84 + languageName: node + linkType: hard + "@babel/helper-validator-option@npm:^7.22.5, @babel/helper-validator-option@npm:^7.25.7": version: 7.25.7 resolution: "@babel/helper-validator-option@npm:7.25.7" @@ -1074,12 +1099,12 @@ __metadata: linkType: hard "@babel/helpers@npm:^7.22.6, @babel/helpers@npm:^7.23.2, @babel/helpers@npm:^7.25.7": - version: 7.25.7 - resolution: "@babel/helpers@npm:7.25.7" + version: 7.28.4 + resolution: "@babel/helpers@npm:7.28.4" dependencies: - "@babel/template": "npm:^7.25.7" - "@babel/types": "npm:^7.25.7" - checksum: 10c0/3b3ae9e373bd785414195ef8f59976a69d5a6ebe0ef2165fdcc5165e5c3ee09e0fcee94bb457df2ddb8c0532e4146d0a9b7a96b3497399a4bff4ffe196b30228 + "@babel/template": "npm:^7.27.2" + "@babel/types": "npm:^7.28.4" + checksum: 10c0/aaa5fb8098926dfed5f223adf2c5e4c7fbba4b911b73dfec2d7d3083f8ba694d201a206db673da2d9b3ae8c01793e795767654558c450c8c14b4c2175b4fcb44 languageName: node linkType: hard @@ -1106,6 +1131,17 @@ __metadata: languageName: node linkType: hard +"@babel/parser@npm:^7.27.2": + version: 7.28.4 + resolution: "@babel/parser@npm:7.28.4" + dependencies: + "@babel/types": "npm:^7.28.4" + bin: + parser: ./bin/babel-parser.js + checksum: 10c0/58b239a5b1477ac7ed7e29d86d675cc81075ca055424eba6485872626db2dc556ce63c45043e5a679cd925e999471dba8a3ed4864e7ab1dbf64306ab72c52707 + languageName: node + linkType: hard + "@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:^7.25.7": version: 7.25.7 resolution: "@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:7.25.7" @@ -2333,6 +2369,17 @@ __metadata: languageName: node linkType: hard +"@babel/template@npm:^7.27.2": + version: 7.27.2 + resolution: "@babel/template@npm:7.27.2" + dependencies: + "@babel/code-frame": "npm:^7.27.1" + "@babel/parser": "npm:^7.27.2" + "@babel/types": "npm:^7.27.1" + checksum: 10c0/ed9e9022651e463cc5f2cc21942f0e74544f1754d231add6348ff1b472985a3b3502041c0be62dc99ed2d12cfae0c51394bf827452b98a2f8769c03b87aadc81 + languageName: node + linkType: hard + "@babel/traverse@npm:^7.10.3, @babel/traverse@npm:^7.16.0, @babel/traverse@npm:^7.22.8, @babel/traverse@npm:^7.23.2, @babel/traverse@npm:^7.25.7": version: 7.25.7 resolution: "@babel/traverse@npm:7.25.7" @@ -2359,6 +2406,16 @@ __metadata: languageName: node linkType: hard +"@babel/types@npm:^7.27.1, @babel/types@npm:^7.28.4": + version: 7.28.4 + resolution: "@babel/types@npm:7.28.4" + dependencies: + "@babel/helper-string-parser": "npm:^7.27.1" + "@babel/helper-validator-identifier": "npm:^7.27.1" + checksum: 10c0/ac6f909d6191319e08c80efbfac7bd9a25f80cc83b43cd6d82e7233f7a6b9d6e7b90236f3af7400a3f83b576895bcab9188a22b584eb0f224e80e6d4e95f4517 + languageName: node + linkType: hard + "@braintree/sanitize-url@npm:^6.0.0": version: 6.0.4 resolution: "@braintree/sanitize-url@npm:6.0.4" @@ -15280,7 +15337,7 @@ __metadata: languageName: node linkType: hard -"picocolors@npm:^1.0.0, picocolors@npm:^1.0.1, picocolors@npm:^1.1.0": +"picocolors@npm:^1.0.0, picocolors@npm:^1.0.1, picocolors@npm:^1.1.0, picocolors@npm:^1.1.1": version: 1.1.1 resolution: "picocolors@npm:1.1.1" checksum: 10c0/e2e3e8170ab9d7c7421969adaa7e1b31434f789afb9b3f115f6b96d91945041ac3ceb02e9ec6fe6510ff036bcc0bf91e69a1772edc0b707e12b19c0f2d6bcf58 From 24ba25d3ceb1b3b2169a5204d0215703e4ebbf81 Mon Sep 17 00:00:00 2001 From: Xuan Gu <162244362+xuang7@users.noreply.github.com> Date: Fri, 3 Oct 2025 22:04:28 -0700 Subject: [PATCH 005/136] fix: conditionally show upload panels based on upload activity (#3818) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ### **Purpose** This PR fixes #3804 that the upload status panel behaved unexpectedly: when there were no queued/active uploads, the UI still rendered empty panels, which was confusing. This PR hides empty panels and restores the clear empty state. ### **Changes** - Introduce a flag ` hasAnyActivity = queuedCount > 0 || activeCount > 0 || pendingChangesCount > 0 ` - Conditionally render status panels: - Pending only when queuedCount > 0 - Uploading only when activeCount > 0 - Finished only when hasAnyActivity - Restore the empty state: when no activity, render `` outside the collapse so “No pending changes” is visible - Add a bottom divider beneath the staged list to improve visual separation (the previous `[nzBorder]` was removed to avoid overlapping with the vertical divider) ### **Demonstration** **Datasets page:** main **Finished panel:** | Collapsed | Expanded (delete) | Expanded (adds) | |---|---|---| | collapsed | delete | expand | **Uploading files:** https://github.com/user-attachments/assets/413f9480-330e-456a-8a0a-7f87511fbf13 **Remove files:** https://github.com/user-attachments/assets/04fc0dc0-4f59-4e18-bb1d-72b0132ac943 Co-authored-by: Xinyuan Lin --- .../dataset-detail.component.html | 46 +++++++++++-------- .../dataset-detail.component.ts | 4 ++ ...dataset-staged-objects-list.component.html | 3 +- ...dataset-staged-objects-list.component.scss | 4 ++ 4 files changed, 37 insertions(+), 20 deletions(-) diff --git a/core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/dataset-detail.component.html b/core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/dataset-detail.component.html index d2b01ac115a..7d8909b15a0 100644 --- a/core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/dataset-detail.component.html +++ b/core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/dataset-detail.component.html @@ -281,12 +281,9 @@
Choose a Version:
nzGhost class="upload-status-panels"> -
+ *ngIf="queuedCount > 0" + [nzHeader]="'Pending: ' + queuedCount + ' file(s)'"> +
@@ -294,15 +291,15 @@
Choose a Version:
- + + -
+ *ngIf="activeCount > 0" + [nzHeader]="'Uploading: ' + activeCount + ' file(s)'"> +
@@ -346,20 +343,31 @@
Choose a Version:
- + + + *ngIf="hasAnyActivity" + [nzHeader]="'Finished: ' + pendingChangesCount + ' file(s)'"> + (stagedObjectsChanged)="onStagedObjectsUpdated($event)"> + + + + +
diff --git a/core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/dataset-detail.component.ts b/core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/dataset-detail.component.ts index f2559babf60..206efc22e96 100644 --- a/core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/dataset-detail.component.ts +++ b/core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/dataset-detail.component.ts @@ -536,6 +536,10 @@ export class DatasetDetailComponent implements OnInit { return this.activeUploads; } + get hasAnyActivity(): boolean { + return this.pendingChangesCount > 0 || this.activeCount > 0 || this.queuedCount > 0; + } + // Hide a task row after 5s private scheduleHide(idx: number) { if (idx === -1) { diff --git a/core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-staged-objects-list/user-dataset-staged-objects-list.component.html b/core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-staged-objects-list/user-dataset-staged-objects-list.component.html index a1820dcecf1..01d21074ea9 100644 --- a/core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-staged-objects-list/user-dataset-staged-objects-list.component.html +++ b/core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-staged-objects-list/user-dataset-staged-objects-list.component.html @@ -20,7 +20,8 @@
+ *ngIf="datasetStagedObjects.length > 0" + class="custom-border-list"> {{ obj.diffType }} diff --git a/core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-staged-objects-list/user-dataset-staged-objects-list.component.scss b/core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-staged-objects-list/user-dataset-staged-objects-list.component.scss index 165ea73b31d..493f1abaa32 100644 --- a/core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-staged-objects-list/user-dataset-staged-objects-list.component.scss +++ b/core/gui/src/app/dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-staged-objects-list/user-dataset-staged-objects-list.component.scss @@ -24,6 +24,10 @@ overflow-x: auto; /* Prevents horizontal scrolling */ } +.custom-border-list { + border-bottom: 1px solid #f0f0f0; +} + .truncate-file-path { display: inline-block; max-width: 250px; /* Adjust width as needed */ From f7482d25ef647d1fbeb2ddf0dd1ce3710b015de0 Mon Sep 17 00:00:00 2001 From: Jiadong Bai <43344272+bobbai00@users.noreply.github.com> Date: Fri, 3 Oct 2025 22:39:08 -0700 Subject: [PATCH 006/136] fix(image): exec format error in pylsp Docker container (#3811) --- deployment/pylsp/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/deployment/pylsp/Dockerfile b/deployment/pylsp/Dockerfile index c2044369c6f..f02762b2dfb 100644 --- a/deployment/pylsp/Dockerfile +++ b/deployment/pylsp/Dockerfile @@ -25,6 +25,7 @@ WORKDIR /usr/src/app RUN pip install python-lsp-server[all]==1.5.0 python-lsp-server[websockets] pylint==2.15.10 RUN apt update RUN apt install -y htop +RUN apt update && apt install -y --no-install-recommends bash htop # Copy the bash script into the container COPY run_pylsp.sh /usr/src/app/run_pylsp.sh @@ -33,7 +34,7 @@ COPY run_pylsp.sh /usr/src/app/run_pylsp.sh RUN chmod +x /usr/src/app/run_pylsp.sh # Set the entrypoint to the script -ENTRYPOINT ["/usr/src/app/run_pylsp.sh"] +ENTRYPOINT ["/usr/bin/env", "bash", "/usr/src/app/run_pylsp.sh"] # Run pylsp on container startup # ENTRYPOINT ["pylsp", "--ws", "--port", "3000", "--verbose", "--check-parent-process"] From 625a9afa36c094318dc532dd8f4f9354117af18b Mon Sep 17 00:00:00 2001 From: colinthebomb1 Date: Sun, 5 Oct 2025 17:47:53 -0700 Subject: [PATCH 007/136] fix(gui): keep words complete in the workspace' comment boxes (#3597) ### Purpose This PR fixes an issue with text wrapping in workflow comments, where words would be broken up between sentences reducing readability closes #3595 ### Changes - Editited css in `nz-modal-comment-box.component.scss` to fix wrapping ### Before: Screenshot (229) ### After: Screenshot (230) Co-authored-by: Xinyuan Lin --- .../comment-box-modal/nz-modal-comment-box.component.scss | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/gui/src/app/workspace/component/workflow-editor/comment-box-modal/nz-modal-comment-box.component.scss b/core/gui/src/app/workspace/component/workflow-editor/comment-box-modal/nz-modal-comment-box.component.scss index de481da276e..24799304093 100644 --- a/core/gui/src/app/workspace/component/workflow-editor/comment-box-modal/nz-modal-comment-box.component.scss +++ b/core/gui/src/app/workspace/component/workflow-editor/comment-box-modal/nz-modal-comment-box.component.scss @@ -24,8 +24,11 @@ width: 100%; p { - word-break: break-all; + word-wrap: break-word; + overflow-wrap: break-word; + word-break: normal; white-space: normal; + hyphens: auto; } } From 1c812a5e2d72a42a8b6698d286f41f618095a331 Mon Sep 17 00:00:00 2001 From: Chris <143021053+kunwp1@users.noreply.github.com> Date: Mon, 6 Oct 2025 10:31:36 -0700 Subject: [PATCH 008/136] chore: Improve Bug Issue Template (#3826) This PR improves the template for creating GitHub issues of type "Bug", based on the feedback provided in [this comment](https://github.com/apache/texera/pull/3812#issuecomment-3369000235) 1. Added a Pre-release Version option to the version selection field. 2. Added an optional Commit Hash field for developers to specify the exact commit associated with the issue. --- .github/ISSUE_TEMPLATE/bug-template.yaml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug-template.yaml b/.github/ISSUE_TEMPLATE/bug-template.yaml index 67b98861510..db48166c58f 100644 --- a/.github/ISSUE_TEMPLATE/bug-template.yaml +++ b/.github/ISSUE_TEMPLATE/bug-template.yaml @@ -45,10 +45,19 @@ body: label: Version description: What version of Texera are you running? options: - - 1.0.0 (Default) + - 1.1.0-incubating (Pre-release/Master) + - 1.0.0 default: 0 validations: required: true + - type: input + id: commit-hash + attributes: + label: Commit Hash (Optional) + description: If you know the specific commit that has the issue, please provide the commit hash here. + placeholder: e.g., a1b2c3d4e5f6g7h8i9j0k1l2m3n4o5p6q7r8s9t0 + validations: + required: false - type: dropdown id: browsers attributes: From 20a38d54d71860520cc4dad64d207ffa10f7244d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Oct 2025 19:22:41 +0000 Subject: [PATCH 009/136] chore(deps): bump transformers from 4.44.2 to 4.53.0 in /core/amber (#3635) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [transformers](https://github.com/huggingface/transformers) from 4.44.2 to 4.53.0.
Release notes

Sourced from transformers's releases.

Release v4.53.0

Gemma3n

Gemma 3n models are designed for efficient execution on low-resource devices. They are capable of multimodal input, handling text, image, video, and audio input, and generating text outputs, with open weights for pre-trained and instruction-tuned variants. These models were trained with data in over 140 spoken languages.

Gemma 3n models use selective parameter activation technology to reduce resource requirements. This technique allows the models to operate at an effective size of 2B and 4B parameters, which is lower than the total number of parameters they contain. For more information on Gemma 3n's efficient parameter management technology, see the Gemma 3n page.

image

from transformers import pipeline
import torch

pipe = pipeline(
"image-text-to-text",
torch_dtype=torch.bfloat16,
model="google/gemma-3n-e4b",
device="cuda",
)
output = pipe(
"https://huggingface.co/datasets/huggingface/documentation-images/resolve/main/bee.jpg",
text="<image_soft_token> in this image, there is"
)


print(output)

Dia

image

Dia is an opensource text-to-speech (TTS) model (1.6B parameters) developed by Nari Labs. It can generate highly realistic dialogue from transcript including nonverbal communications such as laughter and coughing. Furthermore, emotion and tone control is also possible via audio conditioning (voice cloning).

Model Architecture: Dia is an encoder-decoder transformer based on the original transformer architecture. However, some more modern features such as rotational positional embeddings (RoPE) are also included. For its text portion (encoder), a byte tokenizer is utilized while for the audio portion (decoder), a pretrained codec model DAC is used - DAC encodes speech into discrete codebook tokens and decodes them back into audio.

Kyutai Speech-to-Text

Kyutai STT is a speech-to-text model architecture based on the Mimi codec, which encodes audio into discrete tokens in a streaming fashion, and a Moshi-like autoregressive decoder. Kyutai’s lab has released two model checkpoints:

... (truncated)

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=transformers&package-manager=pip&previous-version=4.44.2&new-version=4.53.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) You can trigger a rebase of this PR by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/apache/texera/network/alerts).
> **Note** > Automatic rebases have been disabled on this pull request as it has been open for over 30 days. Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Xinyuan Lin --- core/amber/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/amber/requirements.txt b/core/amber/requirements.txt index a1fc2c9c2da..00856f88628 100644 --- a/core/amber/requirements.txt +++ b/core/amber/requirements.txt @@ -42,7 +42,7 @@ python-lsp-server[websockets]==1.12.0 bidict==0.22.0 cached_property==1.5.2 psutil==5.9.0 -transformers==4.44.2 +transformers==4.53.0 tzlocal==2.1 pyiceberg==0.8.1 readerwriterlock==1.0.9 From 62dd9d4667ee18f01cd3e7f9f4da34b3477be1f5 Mon Sep 17 00:00:00 2001 From: Jiadong Bai <43344272+bobbai00@users.noreply.github.com> Date: Tue, 7 Oct 2025 15:09:06 -0700 Subject: [PATCH 010/136] fix(deployment): deduplicate SQL files under `deployment` by using symlinks (#3824) --- .github/workflows/github-action-build.yml | 7 +- .../files/iceberg_postgres_catalog.sql | 1 + .../k8s/texera-helmchart/files/texera_ddl.sql | 471 +----------------- .../texera-helmchart/files/texera_lakefs.sql | 1 + .../postgresql-init-script-config.yaml | 20 +- 5 files changed, 26 insertions(+), 474 deletions(-) create mode 120000 deployment/k8s/texera-helmchart/files/iceberg_postgres_catalog.sql mode change 100644 => 120000 deployment/k8s/texera-helmchart/files/texera_ddl.sql create mode 120000 deployment/k8s/texera-helmchart/files/texera_lakefs.sql diff --git a/.github/workflows/github-action-build.yml b/.github/workflows/github-action-build.yml index 14df23456a4..e9f0148cd83 100644 --- a/.github/workflows/github-action-build.yml +++ b/.github/workflows/github-action-build.yml @@ -108,8 +108,11 @@ jobs: extraSbtFiles: '["core/*.sbt", "core/project/**.{scala,sbt}", "core/project/build.properties" ]' - name: Lint with scalafmt run: cd core && sbt scalafmtCheckAll - - name: Create Database - run: psql -h localhost -U postgres -f deployment/k8s/texera-helmchart/files/texera_ddl.sql + - name: Create Databases + run: | + psql -h localhost -U postgres -f core/scripts/sql/texera_ddl.sql + psql -h localhost -U postgres -f core/scripts/sql/iceberg_postgres_catalog.sql + psql -h localhost -U postgres -f core/scripts/sql/texera_lakefs.sql env: PGPASSWORD: postgres - name: Compile with sbt diff --git a/deployment/k8s/texera-helmchart/files/iceberg_postgres_catalog.sql b/deployment/k8s/texera-helmchart/files/iceberg_postgres_catalog.sql new file mode 120000 index 00000000000..684406cdac8 --- /dev/null +++ b/deployment/k8s/texera-helmchart/files/iceberg_postgres_catalog.sql @@ -0,0 +1 @@ +../../../../core/scripts/sql/iceberg_postgres_catalog.sql \ No newline at end of file diff --git a/deployment/k8s/texera-helmchart/files/texera_ddl.sql b/deployment/k8s/texera-helmchart/files/texera_ddl.sql deleted file mode 100644 index 67c5f573ecb..00000000000 --- a/deployment/k8s/texera-helmchart/files/texera_ddl.sql +++ /dev/null @@ -1,470 +0,0 @@ --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at --- --- http://www.apache.org/licenses/LICENSE-2.0 --- --- Unless required by applicable law or agreed to in writing, --- software distributed under the License is distributed on an --- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY --- KIND, either express or implied. See the License for the --- specific language governing permissions and limitations --- under the License. - --- CREATE LakeFS db -DROP DATABASE IF EXISTS texera_lakefs; -CREATE DATABASE texera_lakefs; - --- CREATE iceberg catalog db - -\c postgres - -DO $$ -BEGIN - IF NOT EXISTS ( - SELECT FROM pg_catalog.pg_roles WHERE rolname = 'texera' - ) THEN -CREATE ROLE texera LOGIN PASSWORD 'password'; -END IF; -END -$$; - --- Drop and recreate the database -DROP DATABASE IF EXISTS texera_iceberg_catalog; -CREATE DATABASE texera_iceberg_catalog; - --- Grant and change ownership -GRANT ALL PRIVILEGES ON DATABASE texera_iceberg_catalog TO texera; -ALTER DATABASE texera_iceberg_catalog OWNER TO texera; - --- Reconnect to the new database -\c texera_iceberg_catalog - --- Grant schema access -GRANT ALL ON SCHEMA public TO texera; - - --- CREATE texera_db - --- ============================================ --- 1. Drop and recreate the database (psql only) --- Remove if you already created texera_db --- ============================================ -\c postgres -DROP DATABASE IF EXISTS texera_db; -CREATE DATABASE texera_db; - --- ============================================ --- 2. Connect to the new database (psql only) --- ============================================ -\c texera_db - -CREATE SCHEMA IF NOT EXISTS texera_db; -SET search_path TO texera_db, public; - --- ============================================ --- 3. Drop all tables if they exist --- (CASCADE handles FK dependencies) --- ============================================ -DROP TABLE IF EXISTS operator_executions CASCADE; -DROP TABLE IF EXISTS operator_port_executions CASCADE; -DROP TABLE IF EXISTS workflow_user_access CASCADE; -DROP TABLE IF EXISTS workflow_of_user CASCADE; -DROP TABLE IF EXISTS user_config CASCADE; -DROP TABLE IF EXISTS "user" CASCADE; -DROP TABLE IF EXISTS user_last_active_time CASCADE; -DROP TABLE IF EXISTS workflow CASCADE; -DROP TABLE IF EXISTS workflow_version CASCADE; -DROP TABLE IF EXISTS project CASCADE; -DROP TABLE IF EXISTS workflow_of_project CASCADE; -DROP TABLE IF EXISTS workflow_executions CASCADE; -DROP TABLE IF EXISTS dataset CASCADE; -DROP TABLE IF EXISTS dataset_user_access CASCADE; -DROP TABLE IF EXISTS dataset_version CASCADE; -DROP TABLE IF EXISTS public_project CASCADE; -DROP TABLE IF EXISTS project_user_access CASCADE; -DROP TABLE IF EXISTS workflow_user_likes CASCADE; -DROP TABLE IF EXISTS workflow_user_clones CASCADE; -DROP TABLE IF EXISTS workflow_view_count CASCADE; -DROP TABLE IF EXISTS user_action CASCADE; -DROP TABLE IF EXISTS dataset_user_likes CASCADE; -DROP TABLE IF EXISTS dataset_view_count CASCADE; -DROP TABLE IF EXISTS site_settings CASCADE; -DROP TABLE IF EXISTS computing_unit_user_access CASCADE; - --- ============================================ --- 4. Create PostgreSQL enum types --- to mimic MySQL ENUM fields --- ============================================ -DROP TYPE IF EXISTS user_role_enum CASCADE; -DROP TYPE IF EXISTS privilege_enum CASCADE; -DROP TYPE IF EXISTS action_enum CASCADE; - -CREATE TYPE user_role_enum AS ENUM ('INACTIVE', 'RESTRICTED', 'REGULAR', 'ADMIN'); -CREATE TYPE action_enum AS ENUM ('like', 'unlike', 'view', 'clone'); -CREATE TYPE privilege_enum AS ENUM ('NONE', 'READ', 'WRITE'); -CREATE TYPE workflow_computing_unit_type_enum AS ENUM ('local', 'kubernetes'); - --- ============================================ --- 5. Create tables --- ============================================ - --- "user" table -CREATE TABLE IF NOT EXISTS "user" -( - uid SERIAL PRIMARY KEY, - name VARCHAR(256) NOT NULL, - email VARCHAR(256) UNIQUE, - password VARCHAR(256), - google_id VARCHAR(256) UNIQUE, - google_avatar VARCHAR(100), - role user_role_enum NOT NULL DEFAULT 'INACTIVE', - comment TEXT, - account_creation_time TIMESTAMPTZ NOT NULL DEFAULT now(), - -- check that either password or google_id is not null - CONSTRAINT ck_nulltest CHECK ((password IS NOT NULL) OR (google_id IS NOT NULL)) - ); - --- user_config -CREATE TABLE IF NOT EXISTS user_config -( - uid INT NOT NULL, - key VARCHAR(256) NOT NULL, - value TEXT NOT NULL, - PRIMARY KEY (uid, key), - FOREIGN KEY (uid) REFERENCES "user"(uid) ON DELETE CASCADE - ); - --- workflow -CREATE TABLE IF NOT EXISTS workflow -( - wid SERIAL PRIMARY KEY, - name VARCHAR(128) NOT NULL, - description VARCHAR(500), - content TEXT NOT NULL, - creation_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, - last_modified_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, - is_public BOOLEAN NOT NULL DEFAULT false - ); - --- workflow_of_user -CREATE TABLE IF NOT EXISTS workflow_of_user -( - uid INT NOT NULL, - wid INT NOT NULL, - PRIMARY KEY (uid, wid), - FOREIGN KEY (uid) REFERENCES "user"(uid) ON DELETE CASCADE, - FOREIGN KEY (wid) REFERENCES workflow(wid) ON DELETE CASCADE - ); - --- workflow_user_access -CREATE TABLE IF NOT EXISTS workflow_user_access -( - uid INT NOT NULL, - wid INT NOT NULL, - privilege privilege_enum NOT NULL DEFAULT 'NONE', - PRIMARY KEY (uid, wid), - FOREIGN KEY (uid) REFERENCES "user"(uid) ON DELETE CASCADE, - FOREIGN KEY (wid) REFERENCES workflow(wid) ON DELETE CASCADE - ); - --- workflow_version -CREATE TABLE IF NOT EXISTS workflow_version -( - vid SERIAL PRIMARY KEY, - wid INT NOT NULL, - content TEXT NOT NULL, - creation_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, - FOREIGN KEY (wid) REFERENCES workflow(wid) ON DELETE CASCADE - ); - --- project -CREATE TABLE IF NOT EXISTS project -( - pid SERIAL PRIMARY KEY, - name VARCHAR(128) NOT NULL, - description VARCHAR(10000), - owner_id INT NOT NULL, - creation_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, - color VARCHAR(6), - UNIQUE (owner_id, name), - FOREIGN KEY (owner_id) REFERENCES "user"(uid) ON DELETE CASCADE - ); - --- workflow_of_project -CREATE TABLE IF NOT EXISTS workflow_of_project -( - wid INT NOT NULL, - pid INT NOT NULL, - PRIMARY KEY (wid, pid), - FOREIGN KEY (wid) REFERENCES workflow(wid) ON DELETE CASCADE, - FOREIGN KEY (pid) REFERENCES project(pid) ON DELETE CASCADE - ); - --- project_user_access -CREATE TABLE IF NOT EXISTS project_user_access -( - uid INT NOT NULL, - pid INT NOT NULL, - privilege privilege_enum NOT NULL DEFAULT 'NONE', - PRIMARY KEY (uid, pid), - FOREIGN KEY (uid) REFERENCES "user"(uid) ON DELETE CASCADE, - FOREIGN KEY (pid) REFERENCES project(pid) ON DELETE CASCADE - ); - --- workflow_computing_unit table -CREATE TABLE IF NOT EXISTS workflow_computing_unit -( - uid INT NOT NULL, - name VARCHAR(128) NOT NULL, - cuid SERIAL PRIMARY KEY, - creation_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, - terminate_time TIMESTAMP DEFAULT NULL, - type workflow_computing_unit_type_enum, - uri TEXT NOT NULL DEFAULT '', - resource TEXT DEFAULT '', - FOREIGN KEY (uid) REFERENCES "user"(uid) ON DELETE CASCADE - ); - --- workflow_executions -CREATE TABLE IF NOT EXISTS workflow_executions -( - eid SERIAL PRIMARY KEY, - vid INT NOT NULL, - uid INT NOT NULL, - cuid INT, - status SMALLINT NOT NULL DEFAULT 1, - result TEXT, - starting_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, - last_update_time TIMESTAMP, - bookmarked BOOLEAN DEFAULT FALSE, - name VARCHAR(128) NOT NULL DEFAULT 'Untitled Execution', - environment_version VARCHAR(128) NOT NULL, - log_location TEXT, - runtime_stats_uri TEXT, - runtime_stats_size INT DEFAULT 0, - FOREIGN KEY (vid) REFERENCES workflow_version(vid) ON DELETE CASCADE, - FOREIGN KEY (uid) REFERENCES "user"(uid) ON DELETE CASCADE, - FOREIGN KEY (cuid) REFERENCES workflow_computing_unit(cuid) ON DELETE CASCADE - ); - --- public_project -CREATE TABLE IF NOT EXISTS public_project -( - pid INT PRIMARY KEY, - uid INT, - FOREIGN KEY (pid) REFERENCES project(pid) ON DELETE CASCADE - -- Note: MySQL schema doesn't define a foreign key for uid - ); - --- dataset -CREATE TABLE IF NOT EXISTS dataset -( - did SERIAL PRIMARY KEY, - owner_uid INT NOT NULL, - name VARCHAR(128) NOT NULL, - repository_name VARCHAR(128), - is_public BOOLEAN NOT NULL DEFAULT TRUE, - is_downloadable BOOLEAN NOT NULL DEFAULT TRUE, - description VARCHAR(512) NOT NULL, - creation_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, - FOREIGN KEY (owner_uid) REFERENCES "user"(uid) ON DELETE CASCADE - ); - --- dataset_user_access -CREATE TABLE IF NOT EXISTS dataset_user_access -( - did INT NOT NULL, - uid INT NOT NULL, - privilege privilege_enum NOT NULL DEFAULT 'NONE', - PRIMARY KEY (did, uid), - FOREIGN KEY (did) REFERENCES dataset(did) ON DELETE CASCADE, - FOREIGN KEY (uid) REFERENCES "user"(uid) ON DELETE CASCADE - ); - --- dataset_version -CREATE TABLE IF NOT EXISTS dataset_version -( - dvid SERIAL PRIMARY KEY, - did INT NOT NULL, - creator_uid INT NOT NULL, - name VARCHAR(128) NOT NULL, - version_hash VARCHAR(64) NOT NULL, - creation_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, - FOREIGN KEY (did) REFERENCES dataset(did) ON DELETE CASCADE - ); - --- operator_executions (modified to match MySQL: no separate primary key; added console_messages_uri) -CREATE TABLE IF NOT EXISTS operator_executions -( - workflow_execution_id INT NOT NULL, - operator_id VARCHAR(100) NOT NULL, - console_messages_uri TEXT, - console_messages_size INT DEFAULT 0, - PRIMARY KEY (workflow_execution_id, operator_id), - FOREIGN KEY (workflow_execution_id) REFERENCES workflow_executions(eid) ON DELETE CASCADE - ); - --- operator_port_executions -CREATE TABLE operator_port_executions -( - workflow_execution_id INT NOT NULL, - global_port_id VARCHAR(200) NOT NULL, - result_uri TEXT, - result_size INT DEFAULT 0, - PRIMARY KEY (workflow_execution_id, global_port_id), - FOREIGN KEY (workflow_execution_id) REFERENCES workflow_executions(eid) ON DELETE CASCADE -); - --- workflow_user_likes -CREATE TABLE IF NOT EXISTS workflow_user_likes -( - uid INT NOT NULL, - wid INT NOT NULL, - PRIMARY KEY (uid, wid), - FOREIGN KEY (uid) REFERENCES "user"(uid) ON DELETE CASCADE, - FOREIGN KEY (wid) REFERENCES workflow(wid) ON DELETE CASCADE - ); - --- workflow_user_clones -CREATE TABLE IF NOT EXISTS workflow_user_clones -( - uid INT NOT NULL, - wid INT NOT NULL, - PRIMARY KEY (uid, wid), - FOREIGN KEY (uid) REFERENCES "user"(uid) ON DELETE CASCADE, - FOREIGN KEY (wid) REFERENCES workflow(wid) ON DELETE CASCADE - ); - --- workflow_view_count -CREATE TABLE IF NOT EXISTS workflow_view_count -( - wid INT NOT NULL PRIMARY KEY, - view_count INT NOT NULL DEFAULT 0, - FOREIGN KEY (wid) REFERENCES workflow(wid) ON DELETE CASCADE - ); - --- user_action table -CREATE TABLE IF NOT EXISTS user_action ( - user_action_id BIGSERIAL PRIMARY KEY, - uid INTEGER, - ip VARCHAR(15), - action_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - resource_type VARCHAR(15) NOT NULL, - resource_id INTEGER NOT NULL, - action texera_db.action_enum NOT NULL, - FOREIGN KEY (uid) REFERENCES "user"(uid) ON DELETE SET NULL -); - - --- dataset_user_likes table -CREATE TABLE IF NOT EXISTS dataset_user_likes -( - uid INTEGER NOT NULL, - did INTEGER NOT NULL, - PRIMARY KEY (uid, did), - FOREIGN KEY (uid) REFERENCES "user"(uid) ON DELETE CASCADE, - FOREIGN KEY (did) REFERENCES dataset(did) ON DELETE CASCADE - ); - --- dataset_view_count table -CREATE TABLE IF NOT EXISTS dataset_view_count -( - did INTEGER NOT NULL, - view_count INTEGER NOT NULL DEFAULT 0, - PRIMARY KEY (did), - FOREIGN KEY (did) REFERENCES dataset(did) ON DELETE CASCADE - ); - --- site_settings table -CREATE TABLE IF NOT EXISTS site_settings -( - key VARCHAR(255) PRIMARY KEY, - value TEXT NOT NULL, - updated_by VARCHAR(50), - updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP - ); - --- user_last_active_time table -CREATE TABLE IF NOT EXISTS user_last_active_time -( - uid INT NOT NULL - PRIMARY KEY - REFERENCES "user"(uid), - last_active_time TIMESTAMPTZ -); - --- computing_unit_user_access table -CREATE TABLE IF NOT EXISTS computing_unit_user_access -( - cuid INT NOT NULL, - uid INT NOT NULL, - privilege privilege_enum NOT NULL DEFAULT 'NONE', - PRIMARY KEY (cuid, uid), - FOREIGN KEY (cuid) REFERENCES workflow_computing_unit(cuid) ON DELETE CASCADE, - FOREIGN KEY (uid) REFERENCES "user"(uid) ON DELETE CASCADE -); - --- START Fulltext search index creation (DO NOT EDIT THIS LINE) -CREATE EXTENSION IF NOT EXISTS pgroonga; - -DO $$ -DECLARE -r RECORD; - stem_filter TEXT := ''; - plugin_status TEXT; -BEGIN - -- Drop all GIN and PGroonga indexes -FOR r IN -SELECT indexname FROM pg_indexes -WHERE (indexdef ILIKE '%USING gin%' OR indexdef ILIKE '%USING pgroonga%') - AND tablename IN ('workflow', 'user', 'project', 'dataset', 'dataset_version') - LOOP - EXECUTE format('DROP INDEX IF EXISTS %I;', r.indexname); -END LOOP; - - -- Check if TokenFilterStem plugin is registered -WITH plugin_registration AS ( - SELECT pgroonga_command('plugin_register token_filters/stem') AS result -) -SELECT - CASE - WHEN result::jsonb @> '[true]' THEN 'Plugin registered successfully' - ELSE 'Plugin registration failed' - END INTO plugin_status -FROM plugin_registration; - --- Set the stem_filter based on plugin status -IF plugin_status = 'Plugin registered successfully' THEN - stem_filter := ', plugins=''token_filters/stem'', token_filters=''TokenFilterStem'''; - RAISE NOTICE 'Using TokenMecab + TokenFilterStem'; -ELSE - RAISE NOTICE 'Using TokenMecab only'; -END IF; - - -- Create PGroonga indexes dynamically with correct TokenFilterStem usage -FOR r IN -SELECT tablename, - CASE - WHEN tablename = 'workflow' THEN - '(COALESCE(name, '''') || '' '' || COALESCE(description, '''') || '' '' || COALESCE(content, ''''))' - WHEN tablename IN ('project', 'dataset') THEN - '(COALESCE(name, '''') || '' '' || COALESCE(description, ''''))' - ELSE - 'COALESCE(name, '''')' - END AS index_column -FROM (VALUES ('workflow'), ('user'), ('project'), ('dataset'), ('dataset_version')) AS t(tablename) - LOOP - -- Create PGroonga index with proper TokenFilterStem usage - EXECUTE format( - 'CREATE INDEX idx_%s_pgroonga ON %I USING pgroonga (%s) WITH (tokenizer = ''TokenMecab''%s);', - r.tablename, r.tablename, r.index_column, stem_filter - ); -END LOOP; -END $$; - --- END Fulltext search index creation (DO NOT EDIT THIS LINE) diff --git a/deployment/k8s/texera-helmchart/files/texera_ddl.sql b/deployment/k8s/texera-helmchart/files/texera_ddl.sql new file mode 120000 index 00000000000..955a6bcd269 --- /dev/null +++ b/deployment/k8s/texera-helmchart/files/texera_ddl.sql @@ -0,0 +1 @@ +../../../../core/scripts/sql/texera_ddl.sql \ No newline at end of file diff --git a/deployment/k8s/texera-helmchart/files/texera_lakefs.sql b/deployment/k8s/texera-helmchart/files/texera_lakefs.sql new file mode 120000 index 00000000000..42010984c83 --- /dev/null +++ b/deployment/k8s/texera-helmchart/files/texera_lakefs.sql @@ -0,0 +1 @@ +../../../../core/scripts/sql/texera_lakefs.sql \ No newline at end of file diff --git a/deployment/k8s/texera-helmchart/templates/postgresql-init-script-config.yaml b/deployment/k8s/texera-helmchart/templates/postgresql-init-script-config.yaml index 74620d2722b..104b9e19277 100644 --- a/deployment/k8s/texera-helmchart/templates/postgresql-init-script-config.yaml +++ b/deployment/k8s/texera-helmchart/templates/postgresql-init-script-config.yaml @@ -27,8 +27,24 @@ data: #!/bin/bash echo "Running Texera schema initialization..." export PGPASSWORD=$POSTGRES_PASSWORD - cat <<'EOF' > /tmp/init.sql + + # Execute SQL files in order + echo "Initializing LakeFS database..." + cat <<'EOF' > /tmp/texera_lakefs.sql +{{ .Files.Get "files/texera_lakefs.sql" | indent 6 }} + EOF + psql -U postgres -f /tmp/texera_lakefs.sql + + echo "Initializing Iceberg catalog database..." + cat <<'EOF' > /tmp/iceberg_postgres_catalog.sql +{{ .Files.Get "files/iceberg_postgres_catalog.sql" | indent 6 }} + EOF + psql -U postgres -f /tmp/iceberg_postgres_catalog.sql + + echo "Initializing Texera database..." + cat <<'EOF' > /tmp/texera_ddl.sql {{ .Files.Get "files/texera_ddl.sql" | indent 6 }} EOF - psql -U postgres -f /tmp/init.sql + psql -U postgres -f /tmp/texera_ddl.sql + echo "Schema initialization complete." \ No newline at end of file From 257fbe04c5fad2f6aedc5fd4e488be1a5642915c Mon Sep 17 00:00:00 2001 From: Yicong Huang <17627829+Yicong-Huang@users.noreply.github.com> Date: Tue, 7 Oct 2025 18:20:14 -0400 Subject: [PATCH 011/136] chore(ci): automatically assign an author of a PR (#3835) When a PR is created or updated, automatically set the author as the assignee. Signed-off-by: Yicong Huang <17627829+Yicong-Huang@users.noreply.github.com> --- .../workflows/{pr-labeler.yml => pr-automation.yml} | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) rename .github/workflows/{pr-labeler.yml => pr-automation.yml} (79%) diff --git a/.github/workflows/pr-labeler.yml b/.github/workflows/pr-automation.yml similarity index 79% rename from .github/workflows/pr-labeler.yml rename to .github/workflows/pr-automation.yml index d074cc9b5ae..e53f0134e07 100644 --- a/.github/workflows/pr-labeler.yml +++ b/.github/workflows/pr-automation.yml @@ -14,18 +14,21 @@ # See the License for the specific language governing permissions and # limitations under the License. -name: "Pull Request Labeler" +name: "Pull Request Automation" on: - pull_request_target jobs: - labeler: + pull_request_automation: permissions: contents: read pull-requests: write runs-on: ubuntu-latest steps: - - uses: actions/labeler@v6 + - name: Assign author to PR + uses: technote-space/assign-author@v1 + - name: Assign labels + uses: actions/labeler@v6 with: - sync-labels: true + sync-labels: true From 83076ac5010b10269f77485e935a4a69d0fe4577 Mon Sep 17 00:00:00 2001 From: Xiaozhen Liu Date: Tue, 7 Oct 2025 16:26:22 -0700 Subject: [PATCH 012/136] feat(amber): enable user system by default (#3782) ## Purpose This PR sets user system to be enabled by default in the configuration. Currently, this flag is by default set to be disabled (a.k.a. the non-user mode). As no one is using the non-user mode and we are requiring all the developers to enable the user system, we have decided to abandon the non-user mode. ## Challenge & Design The major blocker of setting the flag to be enabled by default is two e2e test suites that rely on the non-user mode. These two test suites execute a workflow in the Amber engine in each of their test cases. Enabling the user mode would require texera_db in the test environment, as in the user-system mode, the execution of a workflow requires an `eid` (and subsequently a `vid`, `wid`, and `uid`) in `texera_db`. We could use `MockTexeraDB`, which is currently used by many unit tests. `MockTexeraDB` creates an embedded postgres instance per test suite, and the embedded db is destroyed at the end of each such test suite. However, a complexity of the two e2e test cases is they both access a singleton resource `WorkflowExecutionsResource`, which caches the DSL context from `SqlServer` (i.e., it only gets evaluated once per JVM): ``` final private lazy val context = SqlServer .getInstance() .createDSLContext() ``` In fact, most of the singleton resources in our current codebase cache the `DSLContext` / Dao, as the `DSLContext` never gets updated during the real Texera environment (i.e., the real`texera_db`'s address never changes). In the test environment, however, when working with `MockTexeraDB`, that assumption does not hold, as each instance of `MockTexeraDB` has a different address, and gets destroyed before other test suite runs. Since all the test suites are executed in the same JVM during CI run, using `MockTexeraDB` would cause the 2nd of the two e2e test cases to fail because it still uses the DSL context from the 1st test suite's `MockTexeraDB`. The diagrams below show what happens when using the embedded `MockTexeraDB` to run two e2e test suites that both need to access the same singleton resource during their execution. The 1st test suite creates an embedded DB (`DB1`) and lets the singleton `SqlServer` object set its `DSLContext` to point to `DB1`. When the test cases first access `WorkflowExecutionsResource` (`WER`), WER grabs the `DSLContext` from `SqlServer` and caches it. `WER` then queries `DB1` for all the test cases of test suite 1. When test suite 1 finishes, `DB1` gets destroyed. ![DB and CI - 1](https://github.com/user-attachments/assets/0e405744-d2e4-4543-8c51-13abd88a6845) Later, In the same JVM, when test suite 2 starts, it also creates its own embedded DB (`DB2`) and lets `SqlServer` point to `DB2`. However, as the `DSLContext` in `WER` is cached, it does not get updated when the test cases access `WER`, so `WER` still points to `DB1`, which is already destroyed, and causes failures. ![DB and CI - 2](https://github.com/user-attachments/assets/af364b16-93c5-463e-8a24-952347584b2e) To solve this problem, we could either: 1. Avoid caching DSLContext/Dao in the codebase, or 2. Let the two e2e test cases use the same real, external database (same as production environment) instead of `MockTexeraDB`. **We choose the 2nd design, as these two are e2e tests which should emulate production behavior with a real database.** To avoid polluting the developer's local `texera_db`, we use a separate test database with the same schema. ## Changes - Sets `user-sys` to be enabled by default. - Introduces a `texera_db_for_test_cases` specifically for test cases and CIs. `texera_ddl.sql` is updated to allow creating the database with a name other than `texera_db` (and still defaults to `texera_db`), and CIs will automatically create `texera_db_for_test_cases` with the same schema as `texera_db`. - Updates `DataProcessingSpec` and `PauseSpec` to use `texera_db_for_test_cases`. The two test suites now populate and cleanup this database during their run. - `MockTexeraDB` is updated to incorporate the changes to the DDL script. - `SqlServer` is also updated with a `clearInstance` logic so that other unit tests that use `MockTexeraDB` can clear their instance in `SqlServer` properly so that they do not interfere with the two e2e tests. ## Next Step Remove the `user-sys`'s`enabled` flag and its `if-else` handling logic completely. --------- Co-authored-by: Xinyuan Lin --- .github/workflows/github-action-build.yml | 4 + .../amber/engine/e2e/DataProcessingSpec.scala | 51 ++++++----- .../uci/ics/amber/engine/e2e/PauseSpec.scala | 19 +++- .../uci/ics/amber/engine/e2e/TestUtils.scala | 89 +++++++++++++++++++ core/config/src/main/resources/storage.conf | 6 ++ .../src/main/resources/user-system.conf | 2 +- .../uci/ics/amber/config/StorageConfig.scala | 1 + .../edu/uci/ics/texera/dao/SqlServer.scala | 4 + .../edu/uci/ics/texera/dao/MockTexeraDB.scala | 8 +- core/scripts/sql/texera_ddl.sql | 17 +++- 10 files changed, 169 insertions(+), 32 deletions(-) diff --git a/.github/workflows/github-action-build.yml b/.github/workflows/github-action-build.yml index e9f0148cd83..ad8b3cc391b 100644 --- a/.github/workflows/github-action-build.yml +++ b/.github/workflows/github-action-build.yml @@ -115,6 +115,10 @@ jobs: psql -h localhost -U postgres -f core/scripts/sql/texera_lakefs.sql env: PGPASSWORD: postgres + - name: Create texera_db_for_test_cases + run: psql -h localhost -U postgres -v DB_NAME=texera_db_for_test_cases -f core/scripts/sql/texera_ddl.sql + env: + PGPASSWORD: postgres - name: Compile with sbt run: cd core && sbt clean package - name: Run backend tests diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/DataProcessingSpec.scala b/core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/DataProcessingSpec.scala index 2cf6e53febd..4d3a6ad9d7f 100644 --- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/DataProcessingSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/DataProcessingSpec.scala @@ -22,23 +22,27 @@ package edu.uci.ics.amber.engine.e2e import akka.actor.{ActorSystem, Props} import akka.testkit.{ImplicitSender, TestKit} import akka.util.Timeout -import ch.vorburger.mariadb4j.DB import com.twitter.util.{Await, Duration, Promise} import edu.uci.ics.amber.clustering.SingleNodeListener +import edu.uci.ics.amber.core.storage.DocumentFactory import edu.uci.ics.amber.core.storage.model.VirtualDocument -import edu.uci.ics.amber.core.storage.result.ExecutionResourcesMapping -import edu.uci.ics.amber.core.storage.{DocumentFactory, VFSURIFactory} import edu.uci.ics.amber.core.tuple.{AttributeType, Tuple} -import edu.uci.ics.amber.core.virtualidentity.{OperatorIdentity, PhysicalOpIdentity} -import edu.uci.ics.amber.core.workflow.{GlobalPortIdentity, PortIdentity, WorkflowContext} +import edu.uci.ics.amber.core.virtualidentity.OperatorIdentity +import edu.uci.ics.amber.core.workflow.{PortIdentity, WorkflowContext} import edu.uci.ics.amber.engine.architecture.controller._ import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.EmptyRequest import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState.COMPLETED import edu.uci.ics.amber.engine.common.AmberRuntime import edu.uci.ics.amber.engine.common.client.AmberClient -import edu.uci.ics.amber.engine.e2e.TestUtils.buildWorkflow +import edu.uci.ics.amber.engine.e2e.TestUtils.{ + buildWorkflow, + cleanupWorkflowExecutionData, + initiateTexeraDBForTestCases, + setUpWorkflowExecutionData +} import edu.uci.ics.amber.operator.TestOperators import edu.uci.ics.amber.operator.aggregate.AggregationFunction +import edu.uci.ics.texera.web.resource.dashboard.user.workflow.WorkflowExecutionsResource.getResultUriByLogicalPortId import edu.uci.ics.texera.workflow.LogicalLink import org.scalatest.flatspec.AnyFlatSpecLike import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach} @@ -54,14 +58,22 @@ class DataProcessingSpec implicit val timeout: Timeout = Timeout(5.seconds) - var inMemoryMySQLInstance: Option[DB] = None val workflowContext: WorkflowContext = new WorkflowContext() + override protected def beforeEach(): Unit = { + setUpWorkflowExecutionData() + } + + override protected def afterEach(): Unit = { + cleanupWorkflowExecutionData() + } + override def beforeAll(): Unit = { system.actorOf(Props[SingleNodeListener](), "cluster-info") // These test cases access postgres in CI, but occasionally the jdbc driver cannot be found during CI run. // Explicitly load the JDBC driver to avoid flaky CI failures. Class.forName("org.postgresql.Driver") + initiateTexeraDBForTestCases() } override def afterAll(): Unit = { @@ -88,30 +100,21 @@ class DataProcessingSpec if (evt.state == COMPLETED) { results = workflow.logicalPlan.getTerminalOperatorIds .filter(terminalOpId => { - val uri = VFSURIFactory.createResultURI( - workflowContext.workflowId, + val uri = getResultUriByLogicalPortId( workflowContext.executionId, - GlobalPortIdentity( - PhysicalOpIdentity(logicalOpId = terminalOpId, layerName = "main"), - PortIdentity() - ) + terminalOpId, + PortIdentity() ) - // expecting the first output port only. - ExecutionResourcesMapping - .getResourceURIs(workflowContext.executionId) - .contains(uri) + uri.nonEmpty }) .map(terminalOpId => { //TODO: remove the delay after fixing the issue of reporting "completed" status too early. Thread.sleep(1000) - val uri = VFSURIFactory.createResultURI( - workflowContext.workflowId, + val uri = getResultUriByLogicalPortId( workflowContext.executionId, - GlobalPortIdentity( - PhysicalOpIdentity(logicalOpId = terminalOpId, layerName = "main"), - PortIdentity() - ) - ) + terminalOpId, + PortIdentity() + ).get terminalOpId -> DocumentFactory .openDocument(uri) ._1 diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/PauseSpec.scala b/core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/PauseSpec.scala index bd4164798de..db28c9f4597 100644 --- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/PauseSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/PauseSpec.scala @@ -31,10 +31,15 @@ import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.EmptyRequest import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState.COMPLETED import edu.uci.ics.amber.engine.common.AmberRuntime import edu.uci.ics.amber.engine.common.client.AmberClient +import edu.uci.ics.amber.engine.e2e.TestUtils.{ + cleanupWorkflowExecutionData, + initiateTexeraDBForTestCases, + setUpWorkflowExecutionData +} import edu.uci.ics.amber.operator.{LogicalOp, TestOperators} import edu.uci.ics.texera.workflow.LogicalLink -import org.scalatest.BeforeAndAfterAll import org.scalatest.flatspec.AnyFlatSpecLike +import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach} import scala.concurrent.duration._ @@ -42,17 +47,27 @@ class PauseSpec extends TestKit(ActorSystem("PauseSpec", AmberRuntime.akkaConfig)) with ImplicitSender with AnyFlatSpecLike - with BeforeAndAfterAll { + with BeforeAndAfterAll + with BeforeAndAfterEach { implicit val timeout: Timeout = Timeout(5.seconds) val logger = Logger("PauseSpecLogger") + override protected def beforeEach(): Unit = { + setUpWorkflowExecutionData() + } + + override protected def afterEach(): Unit = { + cleanupWorkflowExecutionData() + } + override def beforeAll(): Unit = { system.actorOf(Props[SingleNodeListener](), "cluster-info") // These test cases access postgres in CI, but occasionally the jdbc driver cannot be found during CI run. // Explicitly load the JDBC driver to avoid flaky CI failures. Class.forName("org.postgresql.Driver") + initiateTexeraDBForTestCases() } override def afterAll(): Unit = { diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/TestUtils.scala b/core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/TestUtils.scala index b20c74cb282..c80ece82e2c 100644 --- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/TestUtils.scala +++ b/core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/TestUtils.scala @@ -19,9 +19,24 @@ package edu.uci.ics.amber.engine.e2e +import edu.uci.ics.amber.config.StorageConfig import edu.uci.ics.amber.core.workflow.WorkflowContext import edu.uci.ics.amber.engine.architecture.controller.Workflow import edu.uci.ics.amber.operator.LogicalOp +import edu.uci.ics.texera.dao.SqlServer +import edu.uci.ics.texera.dao.jooq.generated.enums.UserRoleEnum +import edu.uci.ics.texera.dao.jooq.generated.tables.daos.{ + UserDao, + WorkflowDao, + WorkflowExecutionsDao, + WorkflowVersionDao +} +import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.{ + User, + WorkflowExecutions, + WorkflowVersion, + Workflow => WorkflowPojo +} import edu.uci.ics.texera.web.model.websocket.request.LogicalPlanPojo import edu.uci.ics.texera.workflow.{LogicalLink, WorkflowCompiler} @@ -40,4 +55,78 @@ object TestUtils { ) } + /** + * If a test case accesses the user system through singleton resources that cache the DSLContext (e.g., executes a + * workflow, which accesses WorkflowExecutionsResource), we use a separate texera_db specifically for such test cases. + * Note such test cases need to clean up the database at the end of running each test case. + */ + def initiateTexeraDBForTestCases(): Unit = { + SqlServer.initConnection( + StorageConfig.jdbcUrlForTestCases, + StorageConfig.jdbcUsername, + StorageConfig.jdbcPassword + ) + } + + val testUser: User = { + val user = new User + user.setUid(Integer.valueOf(1)) + user.setName("test_user") + user.setRole(UserRoleEnum.ADMIN) + user.setPassword("123") + user.setEmail("test_user@test.com") + user + } + + val testWorkflowEntry: WorkflowPojo = { + val workflow = new WorkflowPojo + workflow.setName("test workflow") + workflow.setWid(Integer.valueOf(1)) + workflow.setContent("test workflow content") + workflow.setDescription("test description") + workflow + } + + val testWorkflowVersionEntry: WorkflowVersion = { + val workflowVersion = new WorkflowVersion + workflowVersion.setWid(Integer.valueOf(1)) + workflowVersion.setVid(Integer.valueOf(1)) + workflowVersion.setContent("test version content") + workflowVersion + } + + val testWorkflowExecutionEntry: WorkflowExecutions = { + val workflowExecution = new WorkflowExecutions + workflowExecution.setEid(Integer.valueOf(1)) + workflowExecution.setVid(Integer.valueOf(1)) + workflowExecution.setUid(Integer.valueOf(1)) + workflowExecution.setStatus(3.toByte) + workflowExecution.setEnvironmentVersion("test engine") + workflowExecution + } + + def setUpWorkflowExecutionData(): Unit = { + val dslConfig = SqlServer.getInstance().context.configuration() + val userDao = new UserDao(dslConfig) + val workflowDao = new WorkflowDao(dslConfig) + val workflowExecutionsDao = new WorkflowExecutionsDao(dslConfig) + val workflowVersionDao = new WorkflowVersionDao(dslConfig) + userDao.insert(testUser) + workflowDao.insert(testWorkflowEntry) + workflowVersionDao.insert(testWorkflowVersionEntry) + workflowExecutionsDao.insert(testWorkflowExecutionEntry) + } + + def cleanupWorkflowExecutionData(): Unit = { + val dslConfig = SqlServer.getInstance().context.configuration() + val userDao = new UserDao(dslConfig) + val workflowDao = new WorkflowDao(dslConfig) + val workflowExecutionsDao = new WorkflowExecutionsDao(dslConfig) + val workflowVersionDao = new WorkflowVersionDao(dslConfig) + workflowExecutionsDao.deleteById(1) + workflowVersionDao.deleteById(1) + workflowDao.deleteById(1) + userDao.deleteById(1) + } + } diff --git a/core/config/src/main/resources/storage.conf b/core/config/src/main/resources/storage.conf index 7aba655b461..85a62b77a3b 100644 --- a/core/config/src/main/resources/storage.conf +++ b/core/config/src/main/resources/storage.conf @@ -125,6 +125,12 @@ storage { url = "jdbc:postgresql://localhost:5432/texera_db?currentSchema=texera_db,public" url = ${?STORAGE_JDBC_URL} + # Some e2e test cases require the user system. To make sure running those test cases can pass the CI, and that + # running them locally do not contaminate developers' own texera_db, we use another database with a different + # name for running these test cases. + url-for-test-cases = "jdbc:postgresql://localhost:5432/texera_db_for_test_cases?currentSchema=texera_db,public" + url-for-test-cases = ${?STORAGE_JDBC_URL_FOR_TEST_CASES} + username = "postgres" username = ${?STORAGE_JDBC_USERNAME} diff --git a/core/config/src/main/resources/user-system.conf b/core/config/src/main/resources/user-system.conf index aa7d65a3332..72f5e23d234 100644 --- a/core/config/src/main/resources/user-system.conf +++ b/core/config/src/main/resources/user-system.conf @@ -17,7 +17,7 @@ # See PR https://github.com/Texera/texera/pull/3326 for configuration guidelines. user-sys { - enabled = false + enabled = true enabled = ${?USER_SYS_ENABLED} admin-username = "texera" diff --git a/core/config/src/main/scala/edu/uci/ics/amber/config/StorageConfig.scala b/core/config/src/main/scala/edu/uci/ics/amber/config/StorageConfig.scala index fd369fbb5b6..92a8e15d3f4 100644 --- a/core/config/src/main/scala/edu/uci/ics/amber/config/StorageConfig.scala +++ b/core/config/src/main/scala/edu/uci/ics/amber/config/StorageConfig.scala @@ -34,6 +34,7 @@ object StorageConfig { // JDBC specifics val jdbcUrl: String = conf.getString("storage.jdbc.url") + val jdbcUrlForTestCases: String = conf.getString("storage.jdbc.url-for-test-cases") val jdbcUsername: String = conf.getString("storage.jdbc.username") val jdbcPassword: String = conf.getString("storage.jdbc.password") diff --git a/core/dao/src/main/scala/edu/uci/ics/texera/dao/SqlServer.scala b/core/dao/src/main/scala/edu/uci/ics/texera/dao/SqlServer.scala index 18eb92b9f34..dd30bc0bda1 100644 --- a/core/dao/src/main/scala/edu/uci/ics/texera/dao/SqlServer.scala +++ b/core/dao/src/main/scala/edu/uci/ics/texera/dao/SqlServer.scala @@ -62,6 +62,10 @@ object SqlServer { instance.get } + def clearInstance(): Unit = { + instance = None + } + /** * A utility function for create a transaction block using given sql context * @param dsl the sql context diff --git a/core/dao/src/test/scala/edu/uci/ics/texera/dao/MockTexeraDB.scala b/core/dao/src/test/scala/edu/uci/ics/texera/dao/MockTexeraDB.scala index 1bb49518163..cc291f94927 100644 --- a/core/dao/src/test/scala/edu/uci/ics/texera/dao/MockTexeraDB.scala +++ b/core/dao/src/test/scala/edu/uci/ics/texera/dao/MockTexeraDB.scala @@ -67,6 +67,7 @@ trait MockTexeraDB { value.close() dbInstance = None dslContext = None + SqlServer.clearInstance() case None => // do nothing } @@ -92,12 +93,15 @@ trait MockTexeraDB { } finally { source.close() } - val parts: Array[String] = content.split("(?m)^\\\\c texera_db") + val parts: Array[String] = content.split("(?m)^CREATE DATABASE :\"DB_NAME\";") def removeCCommands(sql: String): String = sql.linesIterator .filterNot(_.trim.startsWith("\\c")) .mkString("\n") - executeScriptInJDBC(embedded.getPostgresDatabase.getConnection, removeCCommands(parts(0))) + val createDBStatement = + """DROP DATABASE IF EXISTS texera_db; + |CREATE DATABASE texera_db;""".stripMargin + executeScriptInJDBC(embedded.getPostgresDatabase.getConnection, createDBStatement) val texeraDB = embedded.getDatabase(username, database) var tablesAndIndexCreation = removeCCommands(parts(1)) diff --git a/core/scripts/sql/texera_ddl.sql b/core/scripts/sql/texera_ddl.sql index b9cac6f5457..7b0f9b9063d 100644 --- a/core/scripts/sql/texera_ddl.sql +++ b/core/scripts/sql/texera_ddl.sql @@ -15,18 +15,29 @@ -- specific language governing permissions and limitations -- under the License. +-- ============================================ +-- 0. Specify the database name +-- (defaults to texera_db) +-- Override the name with: +-- psql -v DB_NAME= ... +-- ============================================ +\if :{?DB_NAME} +\else + \set DB_NAME 'texera_db' +\endif + -- ============================================ -- 1. Drop and recreate the database (psql only) -- Remove if you already created texera_db -- ============================================ \c postgres -DROP DATABASE IF EXISTS texera_db; -CREATE DATABASE texera_db; +DROP DATABASE IF EXISTS :"DB_NAME"; +CREATE DATABASE :"DB_NAME"; -- ============================================ -- 2. Connect to the new database (psql only) -- ============================================ -\c texera_db +\c :"DB_NAME" CREATE SCHEMA IF NOT EXISTS texera_db; SET search_path TO texera_db, public; From fa1470205a06ae7adbf70fc61a52fe10cf61cd42 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Oct 2025 16:41:48 -0700 Subject: [PATCH 013/136] chore(deps): bump prismjs from 1.29.0 to 1.30.0 in /core/gui (#3796) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [prismjs](https://github.com/PrismJS/prism) from 1.29.0 to 1.30.0.
Release notes

Sourced from prismjs's releases.

v1.30.0

What's Changed

New Contributors

Full Changelog: https://github.com/PrismJS/prism/compare/v1.29.0...v1.30.0

Changelog

Sourced from prismjs's changelog.

Prism Changelog

Commits
Maintainer changes

This version was pushed to npm by dmitrysharabin, a new releaser for prismjs since your current version.


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=prismjs&package-manager=npm_and_yarn&previous-version=1.29.0&new-version=1.30.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/apache/texera/network/alerts).
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Xinyuan Lin Co-authored-by: yunyad <114192306+yunyad@users.noreply.github.com> --- core/gui/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/gui/yarn.lock b/core/gui/yarn.lock index 75498044bf1..43ae178efaa 100644 --- a/core/gui/yarn.lock +++ b/core/gui/yarn.lock @@ -15956,9 +15956,9 @@ __metadata: linkType: hard "prismjs@npm:^1.28.0": - version: 1.29.0 - resolution: "prismjs@npm:1.29.0" - checksum: 10c0/d906c4c4d01b446db549b4f57f72d5d7e6ccaca04ecc670fb85cea4d4b1acc1283e945a9cbc3d81819084a699b382f970e02f9d1378e14af9808d366d9ed7ec6 + version: 1.30.0 + resolution: "prismjs@npm:1.30.0" + checksum: 10c0/f56205bfd58ef71ccfcbcb691fd0eb84adc96c6ff21b0b69fc6fdcf02be42d6ef972ba4aed60466310de3d67733f6a746f89f2fb79c00bf217406d465b3e8f23 languageName: node linkType: hard From 5650e9538d675c77b4c9c40d34b747955ec68d78 Mon Sep 17 00:00:00 2001 From: ali risheh Date: Tue, 7 Oct 2025 20:17:17 -0700 Subject: [PATCH 014/136] fix(access-control-service): fix formatting of `AccessControlResource` (#3838) --- .../resource/AccessControlResource.scala | 39 ++++++++++--------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/core/access-control-service/src/main/scala/edu/uci/ics/texera/service/resource/AccessControlResource.scala b/core/access-control-service/src/main/scala/edu/uci/ics/texera/service/resource/AccessControlResource.scala index 8bca493850e..2ff2355ca87 100644 --- a/core/access-control-service/src/main/scala/edu/uci/ics/texera/service/resource/AccessControlResource.scala +++ b/core/access-control-service/src/main/scala/edu/uci/ics/texera/service/resource/AccessControlResource.scala @@ -38,11 +38,11 @@ object AccessControlResource extends LazyLogging { /** * Authorize the request based on the path and headers. - * @param uriInfo URI sent by Envoy or API Gateway - * @param headers HTTP headers sent by Envoy or API Gateway which include - * headers sent by the client (browser) - * @return HTTP Response with appropriate status code and headers - */ + * @param uriInfo URI sent by Envoy or API Gateway + * @param headers HTTP headers sent by Envoy or API Gateway which include + * headers sent by the client (browser) + * @return HTTP Response with appropriate status code and headers + */ def authorize(uriInfo: UriInfo, headers: HttpHeaders): Response = { val path = uriInfo.getPath logger.info(s"Authorizing request for path: $path") @@ -64,7 +64,9 @@ object AccessControlResource extends LazyLogging { .mapValues(values => values.asScala.headOption.getOrElse("")) .toMap - logger.info(s"Request URI: ${uriInfo.getRequestUri} and headers: ${headers.getRequestHeaders.asScala} and queryParams: $queryParams") + logger.info( + s"Request URI: ${uriInfo.getRequestUri} and headers: ${headers.getRequestHeaders.asScala} and queryParams: $queryParams" + ) val token = queryParams.getOrElse( "access-token", @@ -76,12 +78,13 @@ object AccessControlResource extends LazyLogging { .replace("Bearer ", "") ) val cuid = queryParams.getOrElse("cuid", "") - val cuidInt = try { - cuid.toInt - } catch { - case _: NumberFormatException => - return Response.status(Response.Status.FORBIDDEN).build() - } + val cuidInt = + try { + cuid.toInt + } catch { + case _: NumberFormatException => + return Response.status(Response.Status.FORBIDDEN).build() + } var cuAccess: PrivilegeEnum = PrivilegeEnum.NONE var userSession: Optional[SessionUser] = Optional.empty() @@ -115,18 +118,18 @@ class AccessControlResource extends LazyLogging { @GET @Path("/{path:.*}") def authorizeGet( - @Context uriInfo: UriInfo, - @Context headers: HttpHeaders - ): Response = { + @Context uriInfo: UriInfo, + @Context headers: HttpHeaders + ): Response = { AccessControlResource.authorize(uriInfo, headers) } @POST @Path("/{path:.*}") def authorizePost( - @Context uriInfo: UriInfo, - @Context headers: HttpHeaders - ): Response = { + @Context uriInfo: UriInfo, + @Context headers: HttpHeaders + ): Response = { AccessControlResource.authorize(uriInfo, headers) } } From 8d676fde4a1313d0c64e1026f681532dd97baa5b Mon Sep 17 00:00:00 2001 From: Yicong Huang <17627829+Yicong-Huang@users.noreply.github.com> Date: Tue, 7 Oct 2025 23:37:03 -0400 Subject: [PATCH 015/136] chore(ci): revert automatically assign an author of a PR (#3839) Reverts apache/texera#3835. The added action `technote-space/assign-author@v1` is not approved by apache. --- .../workflows/{pr-automation.yml => pr-labeler.yml} | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) rename .github/workflows/{pr-automation.yml => pr-labeler.yml} (79%) diff --git a/.github/workflows/pr-automation.yml b/.github/workflows/pr-labeler.yml similarity index 79% rename from .github/workflows/pr-automation.yml rename to .github/workflows/pr-labeler.yml index e53f0134e07..d074cc9b5ae 100644 --- a/.github/workflows/pr-automation.yml +++ b/.github/workflows/pr-labeler.yml @@ -14,21 +14,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -name: "Pull Request Automation" +name: "Pull Request Labeler" on: - pull_request_target jobs: - pull_request_automation: + labeler: permissions: contents: read pull-requests: write runs-on: ubuntu-latest steps: - - name: Assign author to PR - uses: technote-space/assign-author@v1 - - name: Assign labels - uses: actions/labeler@v6 + - uses: actions/labeler@v6 with: - sync-labels: true + sync-labels: true From e6c9d7db328d05303c7050deb8213f79018ddb5a Mon Sep 17 00:00:00 2001 From: ali risheh Date: Tue, 7 Oct 2025 21:05:29 -0700 Subject: [PATCH 016/136] fix(access-control-service): fix service file formats (#3840) ## Update This PR fixes formatting issues that introduce redundant file changes in the core [PR](https://github.com/apache/texera/pull/3598). --- .../texera/service/AccessControlService.scala | 6 ++- .../texera/AccessControlResourceSpec.scala | 40 +++++++++++++------ 2 files changed, 32 insertions(+), 14 deletions(-) diff --git a/core/access-control-service/src/main/scala/edu/uci/ics/texera/service/AccessControlService.scala b/core/access-control-service/src/main/scala/edu/uci/ics/texera/service/AccessControlService.scala index 02278fd97a6..f56f29e812f 100644 --- a/core/access-control-service/src/main/scala/edu/uci/ics/texera/service/AccessControlService.scala +++ b/core/access-control-service/src/main/scala/edu/uci/ics/texera/service/AccessControlService.scala @@ -30,7 +30,6 @@ import io.dropwizard.auth.AuthDynamicFeature import org.eclipse.jetty.server.session.SessionHandler import org.jooq.impl.DSL - class AccessControlService extends Application[AccessControlServiceConfiguration] with LazyLogging { override def initialize(bootstrap: Bootstrap[AccessControlServiceConfiguration]): Unit = { // Register Scala module to Dropwizard default object mapper @@ -43,7 +42,10 @@ class AccessControlService extends Application[AccessControlServiceConfiguration ) } - override def run(configuration: AccessControlServiceConfiguration, environment: Environment): Unit = { + override def run( + configuration: AccessControlServiceConfiguration, + environment: Environment + ): Unit = { // Serve backend at /api environment.jersey.setUrlPattern("/api/*") diff --git a/core/access-control-service/src/test/scala/edu/uci/ics/texera/AccessControlResourceSpec.scala b/core/access-control-service/src/test/scala/edu/uci/ics/texera/AccessControlResourceSpec.scala index 349ec334aac..3aa71b48aa4 100644 --- a/core/access-control-service/src/test/scala/edu/uci/ics/texera/AccessControlResourceSpec.scala +++ b/core/access-control-service/src/test/scala/edu/uci/ics/texera/AccessControlResourceSpec.scala @@ -20,9 +20,21 @@ package edu.uci.ics.texera import edu.uci.ics.texera.auth.JwtAuth import edu.uci.ics.texera.auth.util.HeaderField import edu.uci.ics.texera.dao.MockTexeraDB -import edu.uci.ics.texera.dao.jooq.generated.enums.{PrivilegeEnum, UserRoleEnum, WorkflowComputingUnitTypeEnum} -import edu.uci.ics.texera.dao.jooq.generated.tables.daos.{ComputingUnitUserAccessDao, UserDao, WorkflowComputingUnitDao} -import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.{ComputingUnitUserAccess, User, WorkflowComputingUnit} +import edu.uci.ics.texera.dao.jooq.generated.enums.{ + PrivilegeEnum, + UserRoleEnum, + WorkflowComputingUnitTypeEnum +} +import edu.uci.ics.texera.dao.jooq.generated.tables.daos.{ + ComputingUnitUserAccessDao, + UserDao, + WorkflowComputingUnitDao +} +import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.{ + ComputingUnitUserAccess, + User, + WorkflowComputingUnit +} import edu.uci.ics.texera.service.resource.AccessControlResource import jakarta.ws.rs.core.{HttpHeaders, MultivaluedHashMap, Response, UriInfo} import org.mockito.Mockito._ @@ -33,11 +45,12 @@ import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach} import java.net.URI import java.util -class AccessControlResourceSpec extends AnyFlatSpec - with Matchers - with BeforeAndAfterAll - with BeforeAndAfterEach - with MockTexeraDB { +class AccessControlResourceSpec + extends AnyFlatSpec + with Matchers + with BeforeAndAfterAll + with BeforeAndAfterEach + with MockTexeraDB { private val testURI: String = "http://localhost:8080/" private val testPath: String = "/api/executions/1/stats/1" @@ -129,7 +142,8 @@ class AccessControlResourceSpec extends AnyFlatSpec when(mockUriInfo.getRequestUri).thenReturn(new URI(testURI)) when(mockUriInfo.getPath).thenReturn(testPath) when(mockHttpHeaders.getRequestHeaders).thenReturn(requestHeaders) - when(mockHttpHeaders.getRequestHeader("Authorization")).thenReturn(util.Arrays.asList("Bearer dummy-token")) + when(mockHttpHeaders.getRequestHeader("Authorization")) + .thenReturn(util.Arrays.asList("Bearer dummy-token")) val accessControlResource = new AccessControlResource() val response = accessControlResource.authorizeGet(mockUriInfo, mockHttpHeaders) @@ -174,7 +188,8 @@ class AccessControlResourceSpec extends AnyFlatSpec when(mockUriInfo.getRequestUri).thenReturn(new URI(testURI)) when(mockUriInfo.getPath).thenReturn(testPath) when(mockHttpHeaders.getRequestHeaders).thenReturn(requestHeaders) - when(mockHttpHeaders.getRequestHeader("Authorization")).thenReturn(util.Arrays.asList("Bearer " + token)) + when(mockHttpHeaders.getRequestHeader("Authorization")) + .thenReturn(util.Arrays.asList("Bearer " + token)) // Instantiate the resource and call the method under test val accessControlResource = new AccessControlResource() @@ -202,7 +217,8 @@ class AccessControlResourceSpec extends AnyFlatSpec when(mockUriInfo.getRequestUri).thenReturn(new URI(testURI)) when(mockUriInfo.getPath).thenReturn(testPath) when(mockHttpHeaders.getRequestHeaders).thenReturn(requestHeaders) - when(mockHttpHeaders.getRequestHeader("Authorization")).thenReturn(util.Arrays.asList("Bearer " + token)) + when(mockHttpHeaders.getRequestHeader("Authorization")) + .thenReturn(util.Arrays.asList("Bearer " + token)) // Instantiate the resource and call the method under test val accessControlResource = new AccessControlResource() @@ -217,4 +233,4 @@ class AccessControlResourceSpec extends AnyFlatSpec response.getHeaderString(HeaderField.UserName) shouldBe testUser1.getName response.getHeaderString(HeaderField.UserEmail) shouldBe testUser1.getEmail } -} \ No newline at end of file +} From 8b28c196f6ecf96858bd4e3ebd660cb6c8ccc2ff Mon Sep 17 00:00:00 2001 From: ali risheh Date: Tue, 7 Oct 2025 21:26:44 -0700 Subject: [PATCH 017/136] feat(access-control-service): add `access-control-service` to authorize the requests to `/wsapi` and `Computing Unit` endpoints (#3598) ## Access Control Service This service is currently used only by envoy as authorization service. It act as a third party service to authorize any request sent to the computing unit to get socket connection through `/wsapi`. It parses the `user-token` from URL parameters and then check user access to the computing unit by checking the database and add the corresponding information to the following headers: - x-user-cu-access - x-user-id - x-user-name - x-user-email If the service can not parse the token or fail for any reason, the access to computing unit is denied by envoy. If the authorization succeed, the user is directly connected to computing unit using `Upgrade` on the first `HTTP` handshake request so the latency will not change. ## The new connection flow 489656839-e09b06ee-3915-4c18-9584-e880bc06011d 1. A user initiates an `HTTP` request to connect to a specific Computing Unit. 2. The request is first routed through the **Gateway** to **Envoy**. 3. Envoy pauses the request and sends a query to the **Access Control Service** to get an authorization decision. 4. The Access Control Service verifies the user's token and checks a PostgreSQL database to see if the user has the necessary permissions for the target Computing Unit. 5. **If authorized**, the service injects specific HTTP headers (`x-user-cu-access`, `x-user-id`, `x-user-name`) into the request and sends an approval back to Envoy. 6. Envoy then forwards the approved request to the Computing Unit. 7. The connection is then upgraded to a WebSocket, establishing a secure, interactive session. If authorization fails at any point, Envoy immediately denies the connection request, and the user is prevented from accessing the Computing Unit. This new process provides **enhanced security**, a **centralized authorization logic**, and is designed to have **no performance impact** on the established WebSocket connection since the check is performed only on the initial handshake. ## Summary of file changes | Component/Flow | File | Description | | :--- | :--- | :--- | | **Database Access Logic** | `core/auth/src/main/scala/edu/uci/ics/texera/auth/util/ComputingUnitAccess.scala` | Implements the logic to query the PostgreSQL database and determine a user's access privilege (`READ`, `WRITE`, `NONE`) for a given Computing Unit. | | | `core/auth/src/main/scala/edu/uci/ics/texera/auth/util/HeaderField.scala` | Defines constants for the custom HTTP headers (`x-user-cu-access`, `x-user-id`, etc.) that are injected by the Access Control Service. | | **WebSocket Connection Handling** | `core/amber/src/main/scala/edu/uci/ics/texera/web/ServletAwareConfigurator.scala` | Modified to read the new authorization headers during the WebSocket handshake. If headers are present, it creates the `User` object from them; otherwise, it falls back to the old method of parsing the JWT from URL parameters for single-node mode. | | | `core/amber/src/main/scala/edu/uci/ics/texera/web/SessionState.scala` | Updated to store the user's access privilege level for the current computing unit within the session. | | | `core/amber/src/main/scala/edu/uci/ics/texera/web/resource/WorkflowWebsocketResource.scala` | Enforces the access control by checking if the user has `WRITE` privilege before allowing a `WorkflowExecuteRequest`. | | **Deployment & Routing** | `deployment/access-control-service.dockerfile` | New Dockerfile for building and containerizing the Access Control Service. | | | `deployment/k8s/texera-helmchart/templates/access-control-service-deployment.yaml` | New Kubernetes manifest to deploy the Access Control Service. | | | `deployment/k8s/texera-helmchart/templates/access-control-service-service.yaml` | New Kubernetes service manifest to expose the Access Control Service within the cluster. | | | `deployment/k8s/texera-helmchart/templates/envoy-config.yaml` | **Key change:** Configures Envoy to use the new service as an external authorization filter (`ext_authz`). It intercepts relevant requests, forwards them for an authorization check, and then passes the injected headers to the upstream service (AmberMaster). | | | `deployment/k8s/texera-helmchart/values.yaml` | Adds the configuration parameters for the new Access Control Service to the Helm chart. | | **Frontend UI** | `core/gui/src/app/workspace/component/menu/menu.component.ts` & `.html`| The frontend is updated to disable the "Run" button if the connected user does not have `WRITE` access to the selected Computing Unit, providing immediate visual feedback. | | **Build & Configuration** | `core/build.sbt` | The root SBT build file is updated to include the new `AccessControlService` module. | | | `core/config/src/main/scala/edu/uci/ics/amber/util/PathUtils.scala` | Adds a path helper for the new service's directory structure. | --------- Co-authored-by: Ali Risheh --- .../texera/web/ServletAwareConfigurator.scala | 90 ++++++++++++++----- .../edu/uci/ics/texera/web/SessionState.scala | 7 ++ .../resource/WorkflowWebsocketResource.scala | 16 +++- core/build.sbt | 1 + .../share-access/share-access.component.html | 4 +- .../component/menu/menu.component.html | 2 +- .../component/menu/menu.component.ts | 17 +++- deployment/access-control-service.dockerfile | 54 +++++++++++ .../access-control-service-deployment.yaml | 60 +++++++++++++ .../access-control-service-service.yaml | 30 +++++++ .../templates/envoy-config.yaml | 38 ++++++++ .../templates/envoy-deployment.yaml | 2 +- deployment/k8s/texera-helmchart/values.yaml | 8 ++ 13 files changed, 299 insertions(+), 30 deletions(-) create mode 100644 deployment/access-control-service.dockerfile create mode 100644 deployment/k8s/texera-helmchart/templates/access-control-service-deployment.yaml create mode 100644 deployment/k8s/texera-helmchart/templates/access-control-service-service.yaml diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/ServletAwareConfigurator.scala b/core/amber/src/main/scala/edu/uci/ics/texera/web/ServletAwareConfigurator.scala index 0df84812aa5..034698939fe 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/web/ServletAwareConfigurator.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/web/ServletAwareConfigurator.scala @@ -21,6 +21,9 @@ package edu.uci.ics.texera.web import com.typesafe.scalalogging.LazyLogging import edu.uci.ics.texera.auth.JwtAuth.jwtConsumer +import edu.uci.ics.texera.auth.util.HeaderField +import edu.uci.ics.texera.config.KubernetesConfig +import edu.uci.ics.texera.dao.jooq.generated.enums.PrivilegeEnum import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.User import org.apache.http.client.utils.URLEncodedUtils @@ -29,6 +32,7 @@ import java.nio.charset.Charset import javax.websocket.HandshakeResponse import javax.websocket.server.{HandshakeRequest, ServerEndpointConfig} import scala.jdk.CollectionConverters.ListHasAsScala +import scala.jdk.CollectionConverters._ /** * This configurator extracts HTTPSession and associates it to ServerEndpointConfig, @@ -46,30 +50,70 @@ class ServletAwareConfigurator extends ServerEndpointConfig.Configurator with La response: HandshakeResponse ): Unit = { try { - val params = - URLEncodedUtils.parse(new URI("?" + request.getQueryString), Charset.defaultCharset()) - params.asScala - .map(pair => pair.getName -> pair.getValue) - .toMap - .get("access-token") - .map(token => { - val claims = jwtConsumer.process(token).getJwtClaims - config.getUserProperties.put( - classOf[User].getName, - new User( - claims.getClaimValue("userId").asInstanceOf[Long].toInt, - claims.getSubject, - String.valueOf(claims.getClaimValue("email").asInstanceOf[String]), - null, - null, - null, - null, - null, - null - ) - ) - }) + val headers = request.getHeaders.asScala.view.mapValues(_.asScala.headOption).toMap + if ( + headers.contains(HeaderField.UserComputingUnitAccess) && + headers.contains(HeaderField.UserId) && + headers.contains(HeaderField.UserName) && + headers.contains(HeaderField.UserEmail) + ) { + // KUBERNETES MODE: Construct the User object from trusted headers + // coming from envoy and generated by access control service. + + val userId = headers.get(HeaderField.UserId).flatten.map(_.toInt).get + val userName = headers.get(HeaderField.UserName).flatten.get + val userEmail = headers.get(HeaderField.UserEmail).flatten.get + val cuAccess = headers.get(HeaderField.UserComputingUnitAccess).flatten.getOrElse("") + config.getUserProperties.put(HeaderField.UserComputingUnitAccess, cuAccess) + logger.info( + s"User ID: $userId, User Name: $userName, User Email: $userEmail with CU Access: $cuAccess" + ) + config.getUserProperties.put( + classOf[User].getName, + new User( + userId, + userName, + userEmail, + null, + null, + null, + null, + null, + null + ) + ) + logger.debug(s"User created from headers: ID=$userId, Name=$userName") + } else { + // SINGLE NODE MODE: Construct the User object from JWT in query parameters. + val params = + URLEncodedUtils.parse(new URI("?" + request.getQueryString), Charset.defaultCharset()) + config.getUserProperties.put( + HeaderField.UserComputingUnitAccess, + PrivilegeEnum.WRITE.name() + ) + params.asScala + .map(pair => pair.getName -> pair.getValue) + .toMap + .get("access-token") + .map(token => { + val claims = jwtConsumer.process(token).getJwtClaims + config.getUserProperties.put( + classOf[User].getName, + new User( + claims.getClaimValue("userId").asInstanceOf[Long].toInt, + claims.getSubject, + String.valueOf(claims.getClaimValue("email").asInstanceOf[String]), + null, + null, + null, + null, + null, + null + ) + ) + }) + } } catch { case e: Exception => logger.error("Failed to retrieve the User during websocket handshake", e) diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/SessionState.scala b/core/amber/src/main/scala/edu/uci/ics/texera/web/SessionState.scala index 3d296349a67..642b5bbad8f 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/web/SessionState.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/web/SessionState.scala @@ -20,6 +20,7 @@ package edu.uci.ics.texera.web import edu.uci.ics.amber.util.JSONUtils.objectMapper +import edu.uci.ics.texera.dao.jooq.generated.enums.PrivilegeEnum import edu.uci.ics.texera.web.model.websocket.event.TexeraWebSocketEvent import edu.uci.ics.texera.web.service.WorkflowService import io.reactivex.rxjava3.disposables.Disposable @@ -53,6 +54,7 @@ class SessionState(session: Session) { private var currentWorkflowState: Option[WorkflowService] = None private var workflowSubscription = Disposable.empty() private var executionSubscription = Disposable.empty() + private var userComputingUnitAccess: PrivilegeEnum = PrivilegeEnum.NONE def send(msg: TexeraWebSocketEvent): Unit = { session.getAsyncRemote.sendText(objectMapper.writeValueAsString(msg)) @@ -80,4 +82,9 @@ class SessionState(session: Session) { ) } + + def setUserComputingUnitAccess(cuAccess: PrivilegeEnum): Unit = { + this.userComputingUnitAccess = cuAccess + } + def getUserComputingUnitAccess: PrivilegeEnum = this.userComputingUnitAccess } diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/WorkflowWebsocketResource.scala b/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/WorkflowWebsocketResource.scala index 1cf90241e92..01b31545808 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/WorkflowWebsocketResource.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/WorkflowWebsocketResource.scala @@ -27,6 +27,8 @@ import edu.uci.ics.amber.error.ErrorUtils.getStackTraceWithAllCauses import edu.uci.ics.amber.core.virtualidentity.WorkflowIdentity import edu.uci.ics.amber.core.workflowruntimestate.FatalErrorType.COMPILATION_ERROR import edu.uci.ics.amber.core.workflowruntimestate.WorkflowFatalError +import edu.uci.ics.texera.auth.util.HeaderField +import edu.uci.ics.texera.dao.jooq.generated.enums.PrivilegeEnum import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.User import edu.uci.ics.texera.web.model.websocket.event.{WorkflowErrorEvent, WorkflowStateEvent} import edu.uci.ics.texera.web.model.websocket.request._ @@ -51,13 +53,22 @@ class WorkflowWebsocketResource extends LazyLogging { SessionState.setState(session.getId, sessionState) val wid = session.getRequestParameterMap.get("wid").get(0).toLong val cuid = session.getRequestParameterMap.get("cuid").get(0).toInt + val cuAccessEnum: PrivilegeEnum = PrivilegeEnum.valueOf( + session.getUserProperties + .get(HeaderField.UserComputingUnitAccess) + .asInstanceOf[String] + ) + + sessionState.setUserComputingUnitAccess(cuAccessEnum) + logger.info( + s"Websocket connection opened for workflow $wid with computing unit $cuid and access $cuAccessEnum" + ) // hack to refresh frontend run button state sessionState.send(WorkflowStateEvent("Uninitialized")) val workflowState = WorkflowService.getOrCreate(WorkflowIdentity(wid), cuid) sessionState.subscribe(workflowState) sessionState.send(ClusterStatusUpdateEvent(ClusterListener.numWorkerNodesInCluster)) - logger.info("connection open") } @OnClose @@ -94,6 +105,9 @@ class WorkflowWebsocketResource extends LazyLogging { sessionState.send(modifyLogicResponse) } case workflowExecuteRequest: WorkflowExecuteRequest => + if (sessionState.getUserComputingUnitAccess != PrivilegeEnum.WRITE) { + throw new IllegalStateException("User does not have write access to the computing unit") + } workflowStateOpt match { case Some(workflow) => sessionState.send(WorkflowStateEvent("Initializing")) diff --git a/core/build.sbt b/core/build.sbt index 3e2e150ac9e..11982fa6e80 100644 --- a/core/build.sbt +++ b/core/build.sbt @@ -99,6 +99,7 @@ lazy val CoreProject = (project in file(".")) DAO, Config, ConfigService, + AccessControlService, Auth, WorkflowCore, ComputingUnitManagingService, diff --git a/core/gui/src/app/dashboard/component/user/share-access/share-access.component.html b/core/gui/src/app/dashboard/component/user/share-access/share-access.component.html index 64c7eb9d477..f181ef839d5 100644 --- a/core/gui/src/app/dashboard/component/user/share-access/share-access.component.html +++ b/core/gui/src/app/dashboard/component/user/share-access/share-access.component.html @@ -115,9 +115,7 @@
-
+
Access Level: - - - - - - - - Destination - - - - - - - - - - -
- - - -
-
{{dataset.dataset.did?.toString()}}
+ *ngIf="hasPartialNonDownloadable && blockingDatasetLabels.length > 0"> + +
+ +
+
+ + + + Export Type + + + + + + + + + + + + + + + Filename + + + + + + + + + + Destination + + + + + + + + + +
+
+
+ + + +
+
{{dataset.dataset.did?.toString()}}
- {{ dataset.dataset.name }} + {{ dataset.dataset.name }} - -
- - - + +
+ + + + +
-
- + + +
+ +
+
diff --git a/core/gui/src/app/workspace/component/result-exportation/result-exportation.component.ts b/core/gui/src/app/workspace/component/result-exportation/result-exportation.component.ts index c053b1545f4..4783bd93f23 100644 --- a/core/gui/src/app/workspace/component/result-exportation/result-exportation.component.ts +++ b/core/gui/src/app/workspace/component/result-exportation/result-exportation.component.ts @@ -19,7 +19,10 @@ import { UntilDestroy, untilDestroyed } from "@ngneat/until-destroy"; import { Component, inject, Input, OnInit } from "@angular/core"; -import { WorkflowResultExportService } from "../../service/workflow-result-export/workflow-result-export.service"; +import { + WorkflowResultExportService, + WorkflowResultDownloadability, +} from "../../service/workflow-result-export/workflow-result-export.service"; import { DashboardDataset } from "../../../dashboard/type/dashboard-dataset.interface"; import { DatasetService } from "../../../dashboard/service/user/dataset/dataset.service"; import { NZ_MODAL_DATA, NzModalRef, NzModalService } from "ng-zorro-antd/modal"; @@ -52,10 +55,65 @@ export class ResultExportationComponent implements OnInit { containsBinaryData: boolean = false; inputDatasetName = ""; selectedComputingUnit: DashboardWorkflowComputingUnit | null = null; + downloadability?: WorkflowResultDownloadability; userAccessibleDatasets: DashboardDataset[] = []; filteredUserAccessibleDatasets: DashboardDataset[] = []; + /** + * Gets the operator IDs to check for restrictions based on the source trigger. + * Menu: all operators, Context menu: highlighted operators only + */ + private getOperatorIdsToCheck(): readonly string[] { + if (this.sourceTriggered === "menu") { + return this.workflowActionService + .getTexeraGraph() + .getAllOperators() + .map(op => op.operatorID); + } else { + return this.workflowActionService.getJointGraphWrapper().getCurrentHighlightedOperatorIDs(); + } + } + + /** + * Computed property: operator IDs that can be exported + */ + get exportableOperatorIds(): string[] { + if (!this.downloadability) return []; + return this.downloadability.getExportableOperatorIds(this.getOperatorIdsToCheck()); + } + + /** + * Computed property: operator IDs that are blocked from export + */ + get blockedOperatorIds(): string[] { + if (!this.downloadability) return []; + return this.downloadability.getBlockedOperatorIds(this.getOperatorIdsToCheck()); + } + + /** + * Computed property: whether all selected operators are blocked + */ + get isExportRestricted(): boolean { + const operatorIds = this.getOperatorIdsToCheck(); + return this.exportableOperatorIds.length === 0 && operatorIds.length > 0; + } + + /** + * Computed property: whether some (but not all) operators are blocked + */ + get hasPartialNonDownloadable(): boolean { + return this.exportableOperatorIds.length > 0 && this.blockedOperatorIds.length > 0; + } + + /** + * Computed property: dataset labels that are blocking export + */ + get blockingDatasetLabels(): string[] { + if (!this.downloadability) return []; + return this.downloadability.getBlockingDatasets(this.getOperatorIdsToCheck()); + } + constructor( public workflowResultExportService: WorkflowResultExportService, private modalRef: NzModalRef, @@ -74,7 +132,14 @@ export class ResultExportationComponent implements OnInit { this.userAccessibleDatasets = datasets.filter(dataset => dataset.accessPrivilege === "WRITE"); this.filteredUserAccessibleDatasets = [...this.userAccessibleDatasets]; }); - this.updateOutputType(); + + this.workflowResultExportService + .computeRestrictionAnalysis() + .pipe(untilDestroyed(this)) + .subscribe(downloadability => { + this.downloadability = downloadability; + this.updateOutputType(); + }); this.computingUnitStatusService .getSelectedComputingUnit() @@ -85,19 +150,12 @@ export class ResultExportationComponent implements OnInit { } updateOutputType(): void { - // Determine if the caller of this component is menu or context menu - // if its menu then we need to export all operators else we need to export only highlighted operators - - let operatorIds: readonly string[]; - if (this.sourceTriggered === "menu") { - operatorIds = this.workflowActionService - .getTexeraGraph() - .getAllOperators() - .map(op => op.operatorID); - } else { - operatorIds = this.workflowActionService.getJointGraphWrapper().getCurrentHighlightedOperatorIDs(); + if (!this.downloadability) { + return; } + const operatorIds = this.getOperatorIdsToCheck(); + if (operatorIds.length === 0) { // No operators highlighted this.isTableOutput = false; @@ -106,13 +164,19 @@ export class ResultExportationComponent implements OnInit { return; } - // Assume they're all table or visualization - // until we find an operator that isn't + if (this.isExportRestricted) { + this.isTableOutput = false; + this.isVisualizationOutput = false; + this.containsBinaryData = false; + return; + } + + // Assume they're all table or visualization until we find an operator that isn't let allTable = true; let allVisualization = true; let anyBinaryData = false; - for (const operatorId of operatorIds) { + for (const operatorId of this.exportableOperatorIds) { const outputTypes = this.workflowResultService.determineOutputTypes(operatorId); if (!outputTypes.hasAnyResult) { continue; @@ -181,4 +245,14 @@ export class ResultExportationComponent implements OnInit { } }); } + + /** + * Getter that returns a comma-separated string of blocking dataset labels. + * Used in the template to display which datasets are preventing export. + * + * @returns String like "Dataset1 (user1@example.com), Dataset2 (user2@example.com)" + */ + get blockingDatasetSummary(): string { + return this.blockingDatasetLabels.join(", "); + } } diff --git a/core/gui/src/app/workspace/service/workflow-result-export/workflow-result-export.service.spec.ts b/core/gui/src/app/workspace/service/workflow-result-export/workflow-result-export.service.spec.ts index 7e45c34de2a..7dea1f097eb 100644 --- a/core/gui/src/app/workspace/service/workflow-result-export/workflow-result-export.service.spec.ts +++ b/core/gui/src/app/workspace/service/workflow-result-export/workflow-result-export.service.spec.ts @@ -35,6 +35,7 @@ import { PaginatedResultEvent } from "../../types/workflow-websocket.interface"; import { ExecutionState } from "../../types/execute-workflow.interface"; import * as JSZip from "jszip"; import { DownloadService } from "src/app/dashboard/service/user/download/download.service"; +import { DatasetService } from "../../../dashboard/service/user/dataset/dataset.service"; import { commonTestProviders } from "../../../common/testing/test-utils"; describe("WorkflowResultExportService", () => { @@ -45,6 +46,7 @@ describe("WorkflowResultExportService", () => { let executeWorkflowServiceSpy: jasmine.SpyObj; let workflowResultServiceSpy: jasmine.SpyObj; let downloadServiceSpy: jasmine.SpyObj; + let datasetServiceSpy: jasmine.SpyObj; let jointGraphWrapperSpy: jasmine.SpyObj; let texeraGraphSpy: jasmine.SpyObj; @@ -60,8 +62,24 @@ describe("WorkflowResultExportService", () => { jointGraphWrapperSpy.getJointOperatorHighlightStream.and.returnValue(of()); jointGraphWrapperSpy.getJointOperatorUnhighlightStream.and.returnValue(of()); - texeraGraphSpy = jasmine.createSpyObj("TexeraGraph", ["getAllOperators"]); + texeraGraphSpy = jasmine.createSpyObj("TexeraGraph", [ + "getAllOperators", + "getOperatorAddStream", + "getOperatorDeleteStream", + "getOperatorPropertyChangeStream", + "getLinkAddStream", + "getLinkDeleteStream", + "getDisabledOperatorsChangedStream", + "getAllLinks", + ]); texeraGraphSpy.getAllOperators.and.returnValue([]); + texeraGraphSpy.getOperatorAddStream.and.returnValue(of()); + texeraGraphSpy.getOperatorDeleteStream.and.returnValue(of()); + texeraGraphSpy.getOperatorPropertyChangeStream.and.returnValue(of()); + texeraGraphSpy.getLinkAddStream.and.returnValue(of()); + texeraGraphSpy.getLinkDeleteStream.and.returnValue(of()); + texeraGraphSpy.getDisabledOperatorsChangedStream.and.returnValue(of()); + texeraGraphSpy.getAllLinks.and.returnValue([]); const wsSpy = jasmine.createSpyObj("WorkflowWebsocketService", ["subscribeToEvent", "send"]); wsSpy.subscribeToEvent.and.returnValue(of()); // Return an empty observable @@ -87,6 +105,9 @@ describe("WorkflowResultExportService", () => { const downloadSpy = jasmine.createSpyObj("DownloadService", ["downloadOperatorsResult"]); downloadSpy.downloadOperatorsResult.and.returnValue(of(new Blob())); + const datasetSpy = jasmine.createSpyObj("DatasetService", ["retrieveAccessibleDatasets"]); + datasetSpy.retrieveAccessibleDatasets.and.returnValue(of([])); + TestBed.configureTestingModule({ imports: [HttpClientTestingModule], providers: [ @@ -97,6 +118,7 @@ describe("WorkflowResultExportService", () => { { provide: ExecuteWorkflowService, useValue: ewSpy }, { provide: WorkflowResultService, useValue: wrSpy }, { provide: DownloadService, useValue: downloadSpy }, + { provide: DatasetService, useValue: datasetSpy }, ...commonTestProviders, ], }); @@ -109,6 +131,7 @@ describe("WorkflowResultExportService", () => { executeWorkflowServiceSpy = TestBed.inject(ExecuteWorkflowService) as jasmine.SpyObj; workflowResultServiceSpy = TestBed.inject(WorkflowResultService) as jasmine.SpyObj; downloadServiceSpy = TestBed.inject(DownloadService) as jasmine.SpyObj; + datasetServiceSpy = TestBed.inject(DatasetService) as jasmine.SpyObj; }); it("should be created", () => { diff --git a/core/gui/src/app/workspace/service/workflow-result-export/workflow-result-export.service.ts b/core/gui/src/app/workspace/service/workflow-result-export/workflow-result-export.service.ts index d2a4b5ae4f2..1abad167ec5 100644 --- a/core/gui/src/app/workspace/service/workflow-result-export/workflow-result-export.service.ts +++ b/core/gui/src/app/workspace/service/workflow-result-export/workflow-result-export.service.ts @@ -26,7 +26,7 @@ import { PaginatedResultEvent, ResultExportResponse } from "../../types/workflow import { NotificationService } from "../../../common/service/notification/notification.service"; import { ExecuteWorkflowService } from "../execute-workflow/execute-workflow.service"; import { ExecutionState, isNotInExecution } from "../../types/execute-workflow.interface"; -import { filter } from "rxjs/operators"; +import { catchError, filter, map, take, tap } from "rxjs/operators"; import { OperatorResultService, WorkflowResultService } from "../workflow-result/workflow-result.service"; import { DownloadService } from "../../../dashboard/service/user/download/download.service"; import { HttpResponse } from "@angular/common/http"; @@ -34,6 +34,64 @@ import { ExportWorkflowJsonResponse } from "../../../dashboard/service/user/down import { DashboardWorkflowComputingUnit } from "../../types/workflow-computing-unit"; import { GuiConfigService } from "../../../common/service/gui-config.service"; +/** + * Result of workflow result downloadability analysis. + * Contains information about which operators are restricted from exporting + * due to non-downloadable dataset dependencies. + */ +export class WorkflowResultDownloadability { + /** + * Map of operator IDs to sets of blocking dataset labels. + * Key: Operator ID + * Value: Set of human-readable dataset labels (e.g., "dataset_name (owner@email.com)") + * that are blocking this operator from being exported + * + * An operator appears in this map if it directly uses or depends on (through data flow) + * one or more datasets that the current user is not allowed to download. + */ + restrictedOperatorMap: Map>; + + constructor(restrictedOperatorMap: Map>) { + this.restrictedOperatorMap = restrictedOperatorMap; + } + + /** + * Filters operator IDs to return only those that are not restricted by dataset access controls. + * + * @param operatorIds Array of operator IDs to filter + * @returns Array of operator IDs that can be exported + */ + getExportableOperatorIds(operatorIds: readonly string[]): string[] { + return operatorIds.filter(operatorId => !this.restrictedOperatorMap.has(operatorId)); + } + + /** + * Filters operator IDs to return only those that are restricted by dataset access controls. + * + * @param operatorIds Array of operator IDs to filter + * @returns Array of operator IDs that are blocked from export + */ + getBlockedOperatorIds(operatorIds: readonly string[]): string[] { + return operatorIds.filter(operatorId => this.restrictedOperatorMap.has(operatorId)); + } + + /** + * Gets the list of dataset labels that are blocking export for the given operators. + * Used to display user-friendly error messages about which datasets are causing restrictions. + * + * @param operatorIds Array of operator IDs to check + * @returns Array of dataset labels (e.g., "Dataset1 (user@example.com)") + */ + getBlockingDatasets(operatorIds: readonly string[]): string[] { + const labels = new Set(); + operatorIds.forEach(operatorId => { + const datasets = this.restrictedOperatorMap.get(operatorId); + datasets?.forEach(label => labels.add(label)); + }); + return Array.from(labels); + } +} + @Injectable({ providedIn: "root", }) @@ -60,36 +118,78 @@ export class WorkflowResultExportService { this.workflowActionService.getJointGraphWrapper().getJointOperatorHighlightStream(), this.workflowActionService.getJointGraphWrapper().getJointOperatorUnhighlightStream() ).subscribe(() => { - // check if there are any results to export on highlighted operators (either paginated or snapshot) - this.hasResultToExportOnHighlightedOperators = - isNotInExecution(this.executeWorkflowService.getExecutionState().state) && - this.workflowActionService - .getJointGraphWrapper() - .getCurrentHighlightedOperatorIDs() - .filter( - operatorId => - this.workflowResultService.hasAnyResult(operatorId) || - this.workflowResultService.getResultService(operatorId)?.getCurrentResultSnapshot() !== undefined - ).length > 0; - - // check if there are any results to export on all operators (either paginated or snapshot) - let staticHasResultToExportOnAllOperators = - isNotInExecution(this.executeWorkflowService.getExecutionState().state) && - this.workflowActionService - .getTexeraGraph() - .getAllOperators() - .map(operator => operator.operatorID) - .filter( - operatorId => - this.workflowResultService.hasAnyResult(operatorId) || - this.workflowResultService.getResultService(operatorId)?.getCurrentResultSnapshot() !== undefined - ).length > 0; - - // Notify subscribers of changes - this.hasResultToExportOnAllOperators.next(staticHasResultToExportOnAllOperators); + this.updateExportAvailabilityFlags(); }); } + /** + * Computes restriction analysis by calling the backend API. + * + * The backend analyzes the workflow to identify operators that are restricted from export + * due to non-downloadable dataset dependencies. The restriction propagates through the + * workflow graph via data flow. + * + * @returns Observable that emits the restriction analysis result + */ + public computeRestrictionAnalysis(): Observable { + const workflowId = this.workflowActionService.getWorkflow().wid; + if (!workflowId) { + return of(new WorkflowResultDownloadability(new Map>())); + } + + return this.downloadService.getWorkflowResultDownloadability(workflowId).pipe( + map(backendResponse => { + // Convert backend format to Map> + const restrictedOperatorMap = new Map>(); + Object.entries(backendResponse).forEach(([operatorId, datasetLabels]) => { + restrictedOperatorMap.set(operatorId, new Set(datasetLabels)); + }); + return new WorkflowResultDownloadability(restrictedOperatorMap); + }), + catchError(() => { + return of(new WorkflowResultDownloadability(new Map>())); + }) + ); + } + + /** + * Updates UI flags that control export button visibility and availability. + * + * Checks execution state and result availability to determine: + * - hasResultToExportOnHighlightedOperators: for context menu export button + * - hasResultToExportOnAllOperators: for top menu export button + * + * Export is only available when execution is idle and operators have results. + */ + private updateExportAvailabilityFlags(): void { + const executionIdle = isNotInExecution(this.executeWorkflowService.getExecutionState().state); + + const highlightedOperators = this.workflowActionService.getJointGraphWrapper().getCurrentHighlightedOperatorIDs(); + + const highlightedHasResult = highlightedOperators.some( + operatorId => + this.workflowResultService.hasAnyResult(operatorId) || + this.workflowResultService.getResultService(operatorId)?.getCurrentResultSnapshot() !== undefined + ); + + this.hasResultToExportOnHighlightedOperators = executionIdle && highlightedHasResult; + + const allOperatorIds = this.workflowActionService + .getTexeraGraph() + .getAllOperators() + .map(operator => operator.operatorID); + + const hasAnyResult = + executionIdle && + allOperatorIds.some( + operatorId => + this.workflowResultService.hasAnyResult(operatorId) || + this.workflowResultService.getResultService(operatorId)?.getCurrentResultSnapshot() !== undefined + ); + + this.hasResultToExportOnAllOperators.next(hasAnyResult); + } + /** * export the workflow execution result according the export type */ @@ -106,6 +206,51 @@ export class WorkflowResultExportService { destination: "dataset" | "local" = "dataset", // default to dataset unit: DashboardWorkflowComputingUnit | null // computing unit for cluster setting ): void { + this.computeRestrictionAnalysis() + .pipe(take(1)) + .subscribe(restrictionResult => + this.performExport( + exportType, + workflowName, + datasetIds, + rowIndex, + columnIndex, + filename, + exportAll, + destination, + unit, + restrictionResult + ) + ); + } + + /** + * Performs the actual export operation with restriction validation. + * + * This method handles the core export logic: + * 1. Validates configuration and computing unit availability + * 2. Determines operator scope (all vs highlighted) + * 3. Applies restriction filtering with user feedback + * 4. Makes the export API call + * 5. Handles response and shows appropriate notifications + * + * Shows error messages if all operators are blocked, warning messages if some are blocked. + * + * @param downloadability Downloadability analysis result containing restriction information + */ + private performExport( + exportType: string, + workflowName: string, + datasetIds: number[], + rowIndex: number, + columnIndex: number, + filename: string, + exportAll: boolean, + destination: "dataset" | "local", + unit: DashboardWorkflowComputingUnit | null, + downloadability: WorkflowResultDownloadability + ): void { + // Validates configuration and computing unit availability if (!this.config.env.exportExecutionResultEnabled) { return; } @@ -120,7 +265,7 @@ export class WorkflowResultExportService { return; } - // gather operator IDs + // Determines operator scope const operatorIds = exportAll ? this.workflowActionService .getTexeraGraph() @@ -128,17 +273,35 @@ export class WorkflowResultExportService { .map(operator => operator.operatorID) : [...this.workflowActionService.getJointGraphWrapper().getCurrentHighlightedOperatorIDs()]; - const operatorArray = operatorIds.map(operatorId => { - return { - id: operatorId, - outputType: this.workflowResultService.determineOutputExtension(operatorId, exportType), - }; - }); - if (operatorIds.length === 0) { return; } + // Applies restriction filtering with user feedback + const exportableOperatorIds = downloadability.getExportableOperatorIds(operatorIds); + + if (exportableOperatorIds.length === 0) { + const datasets = downloadability.getBlockingDatasets(operatorIds); + const suffix = datasets.length > 0 ? `: ${datasets.join(", ")}` : ""; + this.notificationService.error( + `Cannot export result: selection depends on dataset(s) that are not downloadable${suffix}` + ); + return; + } + + if (exportableOperatorIds.length < operatorIds.length) { + const datasets = downloadability.getBlockingDatasets(operatorIds); + const suffix = datasets.length > 0 ? ` (${datasets.join(", ")})` : ""; + this.notificationService.warning( + `Some operators were skipped because their results depend on dataset(s) that are not downloadable${suffix}` + ); + } + + const operatorArray = exportableOperatorIds.map(operatorId => ({ + id: operatorId, + outputType: this.workflowResultService.determineOutputExtension(operatorId, exportType), + })); + // show loading this.notificationService.loading("Exporting..."); diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/FileResolver.scala b/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/FileResolver.scala index 6bf138b4c0a..cea7a891739 100644 --- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/FileResolver.scala +++ b/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/FileResolver.scala @@ -75,6 +75,31 @@ object FileResolver { filePath.toUri } + /** + * Parses a dataset file path and extracts its components. + * Expected format: /ownerEmail/datasetName/versionName/fileRelativePath + * + * @param fileName The file path to parse + * @return Some((ownerEmail, datasetName, versionName, fileRelativePath)) if valid, None otherwise + */ + private def parseDatasetFilePath( + fileName: String + ): Option[(String, String, String, Array[String])] = { + val filePath = Paths.get(fileName) + val pathSegments = (0 until filePath.getNameCount).map(filePath.getName(_).toString).toArray + + if (pathSegments.length < 4) { + return None + } + + val ownerEmail = pathSegments(0) + val datasetName = pathSegments(1) + val versionName = pathSegments(2) + val fileRelativePathSegments = pathSegments.drop(3) + + Some((ownerEmail, datasetName, versionName, fileRelativePathSegments)) + } + /** * Attempts to resolve a given fileName to a URI. * @@ -88,14 +113,13 @@ object FileResolver { * @throws FileNotFoundException if the dataset file does not exist or cannot be created */ private def datasetResolveFunc(fileName: String): URI = { - val filePath = Paths.get(fileName) - val pathSegments = (0 until filePath.getNameCount).map(filePath.getName(_).toString).toArray + val (ownerEmail, datasetName, versionName, fileRelativePathSegments) = + parseDatasetFilePath(fileName).getOrElse( + throw new FileNotFoundException(s"Dataset file $fileName not found.") + ) - // extract info from the user-given fileName - val ownerEmail = pathSegments(0) - val datasetName = pathSegments(1) - val versionName = pathSegments(2) - val fileRelativePath = Paths.get(pathSegments.drop(3).head, pathSegments.drop(3).tail: _*) + val fileRelativePath = + Paths.get(fileRelativePathSegments.head, fileRelativePathSegments.tail: _*) // fetch the dataset and version from DB to get dataset ID and version hash val (dataset, datasetVersion) = @@ -168,4 +192,20 @@ object FileResolver { case _: Exception => false // Invalid URI format } } + + /** + * Parses a dataset file path to extract owner email and dataset name. + * Expected format: /ownerEmail/datasetName/versionName/fileRelativePath + * + * @param path The file path from operator properties + * @return Some((ownerEmail, datasetName)) if path is valid, None otherwise + */ + def parseDatasetOwnerAndName(path: String): Option[(String, String)] = { + if (path == null) { + return None + } + parseDatasetFilePath(path).map { + case (ownerEmail, datasetName, _, _) => (ownerEmail, datasetName) + } + } } From 13171990db1b6959f99fead4cac26f443c52817b Mon Sep 17 00:00:00 2001 From: Madison Lin <117314738+madisonmlin@users.noreply.github.com> Date: Fri, 10 Oct 2025 19:22:40 -0700 Subject: [PATCH 024/136] feat: switch workflow result downloads to use browser native downloads (#3728) ### Purpose ### This pull request partially addresses issue #3404 by switching workflow result downloads to use the browser's native download functionality. Using the browser to handle downloads enables the browser's built-in download UI, including a progress bar when downloading larger files. ### Changes ### Previously, we used Angular's `HttpClient` to request the result file from the backend as a `Blob` and download the `Blob` to the local filesystem. Now, we use a standard HTML form submission to request the result file, allowing the browser to handle the download. The backend logic for generating the file stream remains the same. Headers such as `Authorization` (used for Bearer tokens) cannot be added to standard form submissions. To work around this, we pass the JWT token directly as a form parameter and manually check for validity of the token in the backend. We also manually verify that the user role is valid. #### Summary of Changes #### - Changed frontend logic for local workflow result downloads to use a standard form submission instead of `HttpClient` to request the download, allowing the browser to handle the download - Added endpoint to receive form request and authenticate the request via the JWT token before triggering download ### Demonstration ### https://github.com/user-attachments/assets/a2d5278e-5ebf-441f-99bf-ff93d1667271 --------- Signed-off-by: Xinyuan Lin Co-authored-by: Chris <143021053+kunwp1@users.noreply.github.com> Co-authored-by: ali risheh Co-authored-by: ali Co-authored-by: Xinyuan Lin --- core/access-control-service/build.sbt | 3 +- .../resource/AccessControlResource.scala | 99 +++++++++++-- .../texera/AccessControlResourceSpec.scala | 2 +- .../request/result/ResultExportRequest.scala | 11 +- .../workflow/WorkflowExecutionsResource.scala | 139 ++++++------------ .../web/service/ResultExportService.scala | 84 +++++++++-- .../service/user/download/download.service.ts | 113 +++++++++----- .../workflow-result-export.service.ts | 47 +++--- .../templates/envoy-config.yaml | 4 + deployment/k8s/texera-helmchart/values.yaml | 3 +- 10 files changed, 324 insertions(+), 181 deletions(-) diff --git a/core/access-control-service/build.sbt b/core/access-control-service/build.sbt index 052dad4c13d..abdba346452 100644 --- a/core/access-control-service/build.sbt +++ b/core/access-control-service/build.sbt @@ -76,6 +76,5 @@ libraryDependencies ++= Seq( libraryDependencies ++= Seq( "io.dropwizard" % "dropwizard-core" % dropwizardVersion, "io.dropwizard" % "dropwizard-auth" % dropwizardVersion, // Dropwizard Authentication module - "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.15.2", - "org.playframework" %% "play-json" % "3.1.0-M1", + "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.15.2" ) \ No newline at end of file diff --git a/core/access-control-service/src/main/scala/edu/uci/ics/texera/service/resource/AccessControlResource.scala b/core/access-control-service/src/main/scala/edu/uci/ics/texera/service/resource/AccessControlResource.scala index 2ff2355ca87..50492f23326 100644 --- a/core/access-control-service/src/main/scala/edu/uci/ics/texera/service/resource/AccessControlResource.scala +++ b/core/access-control-service/src/main/scala/edu/uci/ics/texera/service/resource/AccessControlResource.scala @@ -17,6 +17,7 @@ package edu.uci.ics.texera.service.resource +import com.fasterxml.jackson.databind.ObjectMapper import com.typesafe.scalalogging.LazyLogging import edu.uci.ics.texera.auth.JwtParser.parseToken import edu.uci.ics.texera.auth.SessionUser @@ -24,13 +25,19 @@ import edu.uci.ics.texera.auth.util.{ComputingUnitAccess, HeaderField} import edu.uci.ics.texera.dao.jooq.generated.enums.PrivilegeEnum import jakarta.ws.rs.core._ import jakarta.ws.rs.{GET, POST, Path, Produces} +import com.fasterxml.jackson.module.scala.DefaultScalaModule +import java.io.StringReader +import java.net.URLDecoder +import java.nio.charset.StandardCharsets import java.util.Optional import scala.jdk.CollectionConverters.{CollectionHasAsScala, MapHasAsScala} import scala.util.matching.Regex object AccessControlResource extends LazyLogging { + private val mapper: ObjectMapper = new ObjectMapper().registerModule(DefaultScalaModule) + // Regex for the paths that require authorization private val wsapiWorkflowWebsocket: Regex = """.*/wsapi/workflow-websocket.*""".r private val apiExecutionsStats: Regex = """.*/api/executions/[0-9]+/stats/[0-9]+.*""".r @@ -43,20 +50,28 @@ object AccessControlResource extends LazyLogging { * headers sent by the client (browser) * @return HTTP Response with appropriate status code and headers */ - def authorize(uriInfo: UriInfo, headers: HttpHeaders): Response = { + def authorize( + uriInfo: UriInfo, + headers: HttpHeaders, + bodyOpt: Option[String] = None + ): Response = { val path = uriInfo.getPath logger.info(s"Authorizing request for path: $path") path match { case wsapiWorkflowWebsocket() | apiExecutionsStats() | apiExecutionsResultExport() => - checkComputingUnitAccess(uriInfo, headers) + checkComputingUnitAccess(uriInfo, headers, bodyOpt) case _ => logger.warn(s"No authorization logic for path: $path. Denying access.") Response.status(Response.Status.FORBIDDEN).build() } } - private def checkComputingUnitAccess(uriInfo: UriInfo, headers: HttpHeaders): Response = { + private def checkComputingUnitAccess( + uriInfo: UriInfo, + headers: HttpHeaders, + bodyOpt: Option[String] + ): Response = { val queryParams: Map[String, String] = uriInfo .getQueryParameters() .asScala @@ -68,15 +83,17 @@ object AccessControlResource extends LazyLogging { s"Request URI: ${uriInfo.getRequestUri} and headers: ${headers.getRequestHeaders.asScala} and queryParams: $queryParams" ) - val token = queryParams.getOrElse( - "access-token", - headers - .getRequestHeader("Authorization") - .asScala - .headOption - .getOrElse("") - .replace("Bearer ", "") - ) + val token: String = { + val qToken = queryParams.get("access-token").filter(_.nonEmpty) + val hToken = Option(headers.getRequestHeader("Authorization")) + .flatMap(_.asScala.headOption) + .map(_.replaceFirst("(?i)^Bearer\\s+", "")) // case-insensitive "Bearer " + .map(_.trim) + .filter(_.nonEmpty) + val bToken = bodyOpt.flatMap(extractTokenFromBody) + qToken.orElse(hToken).orElse(bToken).getOrElse("") + } + logger.info(s"token extracted from request $token") val cuid = queryParams.getOrElse("cuid", "") val cuidInt = try { @@ -99,6 +116,7 @@ object AccessControlResource extends LazyLogging { return Response.status(Response.Status.FORBIDDEN).build() } catch { case e: Exception => + logger.error(s"Failed parsing token $e") return Response.status(Response.Status.FORBIDDEN).build() } @@ -110,6 +128,57 @@ object AccessControlResource extends LazyLogging { .header(HeaderField.UserEmail, userSession.get().getEmail) .build() } + + // Extracts a top-level "token" field from a JSON body + private def extractTokenFromBody(body: String): Option[String] = { + // 1) Try JSON + val jsonToken: Option[String] = + try { + val node = mapper.readTree(body) + if (node != null && node.has("token")) + Option(node.get("token").asText()).map(_.trim).filter(_.nonEmpty) + else None + } catch { + case _: Exception => None + } + + // 2) Try application/x-www-form-urlencoded + def extractTokenFromUrlEncoded(s: String): Option[String] = { + // fast path: must contain '=' or '&' + if (!s.contains("=")) return None + val pairs = s.split("&").iterator + var found: Option[String] = None + while (pairs.hasNext && found.isEmpty) { + val p = pairs.next() + val idx = p.indexOf('=') + val key = if (idx >= 0) p.substring(0, idx) else p + if (key == "token") { + val raw = if (idx >= 0) p.substring(idx + 1) else "" + val decoded = URLDecoder.decode(raw, StandardCharsets.UTF_8.name()) + val v = decoded.trim + if (v.nonEmpty) found = Some(v) + } + } + found + } + + // 3) Try multipart/form-data (best-effort; parses raw body text) + def extractTokenFromMultipart(s: String): Option[String] = { + // Look for the part with name="token" and capture its content until the next boundary + val partWithBoundary = "(?s)name\\s*=\\s*\"token\"[^\\r\\n]*\\r?\\n\\r?\\n(.*?)\\r?\\n--".r + val partToEnd = "(?s)name\\s*=\\s*\"token\"[^\\r\\n]*\\r?\\n\\r?\\n(.*)".r + + partWithBoundary + .findFirstMatchIn(s) + .map(_.group(1).trim) + .filter(_.nonEmpty) + .orElse(partToEnd.findFirstMatchIn(s).map(_.group(1).trim).filter(_.nonEmpty)) + } + + jsonToken + .orElse(extractTokenFromUrlEncoded(body)) + .orElse(extractTokenFromMultipart(body)) + } } @Produces(Array(MediaType.APPLICATION_JSON)) @Path("/auth") @@ -128,8 +197,10 @@ class AccessControlResource extends LazyLogging { @Path("/{path:.*}") def authorizePost( @Context uriInfo: UriInfo, - @Context headers: HttpHeaders + @Context headers: HttpHeaders, + body: String ): Response = { - AccessControlResource.authorize(uriInfo, headers) + logger.info("Request body: " + body) + AccessControlResource.authorize(uriInfo, headers, Option(body).map(_.trim).filter(_.nonEmpty)) } } diff --git a/core/access-control-service/src/test/scala/edu/uci/ics/texera/AccessControlResourceSpec.scala b/core/access-control-service/src/test/scala/edu/uci/ics/texera/AccessControlResourceSpec.scala index 3aa71b48aa4..cc4d8f8652d 100644 --- a/core/access-control-service/src/test/scala/edu/uci/ics/texera/AccessControlResourceSpec.scala +++ b/core/access-control-service/src/test/scala/edu/uci/ics/texera/AccessControlResourceSpec.scala @@ -165,7 +165,7 @@ class AccessControlResourceSpec when(mockHttpHeaders.getRequestHeader("Authorization")).thenReturn(new util.ArrayList[String]()) val accessControlResource = new AccessControlResource() - val response = accessControlResource.authorizePost(mockUriInfo, mockHttpHeaders) + val response = accessControlResource.authorizePost(mockUriInfo, mockHttpHeaders, null) response.getStatus shouldBe Response.Status.FORBIDDEN.getStatusCode } diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/http/request/result/ResultExportRequest.scala b/core/amber/src/main/scala/edu/uci/ics/texera/web/model/http/request/result/ResultExportRequest.scala index 8190cbe7e10..156135711ea 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/http/request/result/ResultExportRequest.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/web/model/http/request/result/ResultExportRequest.scala @@ -19,11 +19,17 @@ package edu.uci.ics.texera.web.model.http.request.result +import play.api.libs.json._ + case class OperatorExportInfo( id: String, outputType: String ) +object OperatorExportInfo { + implicit val fmt: OFormat[OperatorExportInfo] = Json.format[OperatorExportInfo] +} + case class ResultExportRequest( exportType: String, // e.g. "csv", "google_sheet", "arrow", "data" workflowId: Int, @@ -33,7 +39,10 @@ case class ResultExportRequest( rowIndex: Int, // used by "data" export columnIndex: Int, // used by "data" export filename: String, // optional filename override - destination: String, // "dataset" or "local" // TODO: remove it once the lifecycle of result and compute are unbundled computingUnitId: Int // the id of the computing unit ) + +object ResultExportRequest { + implicit val fmt: OFormat[ResultExportRequest] = Json.format[ResultExportRequest] +} diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/workflow/WorkflowExecutionsResource.scala b/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/workflow/WorkflowExecutionsResource.scala index 7192f7f3fd6..8c71c467992 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/workflow/WorkflowExecutionsResource.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/workflow/WorkflowExecutionsResource.scala @@ -38,6 +38,13 @@ import edu.uci.ics.texera.dao.SqlServer import edu.uci.ics.texera.dao.SqlServer.withTransaction import edu.uci.ics.texera.dao.jooq.generated.Tables._ import edu.uci.ics.texera.dao.jooq.generated.tables.daos.WorkflowExecutionsDao +import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.WorkflowExecutions +import edu.uci.ics.texera.auth.{JwtParser, SessionUser} + +import scala.jdk.CollectionConverters._ +import edu.uci.ics.texera.config.UserSystemConfig +import edu.uci.ics.texera.dao.SqlServer.withTransaction +import edu.uci.ics.texera.dao.jooq.generated.enums.UserRoleEnum import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.{User => UserPojo, WorkflowExecutions} import edu.uci.ics.texera.web.model.http.request.result.ResultExportRequest import edu.uci.ics.texera.web.resource.dashboard.user.workflow.WorkflowExecutionsResource._ @@ -52,7 +59,7 @@ import javax.annotation.security.RolesAllowed import javax.ws.rs._ import javax.ws.rs.core.{MediaType, Response} import scala.collection.mutable -import scala.jdk.CollectionConverters._ +import play.api.libs.json.Json object WorkflowExecutionsResource { final private lazy val context = SqlServer @@ -823,106 +830,50 @@ class WorkflowExecutionsResource { } @POST - @Path("/result/export") + @Path("/result/export/dataset") @RolesAllowed(Array("REGULAR", "ADMIN")) - def exportResult( - request: ResultExportRequest, - @Auth user: SessionUser - ): Response = { - - if (request.operators.size <= 0) - Response - .status(Response.Status.BAD_REQUEST) - .`type`(MediaType.APPLICATION_JSON) - .entity(Map("error" -> "No operator selected").asJava) - .build() - - // Get ALL non-downloadable in workflow - val datasetRestrictions = getNonDownloadableOperatorMap(request.workflowId, user.user) - // Filter to only user's selection - val restrictedOperators = request.operators.filter(op => datasetRestrictions.contains(op.id)) - // Check if any selected operator is restricted - if (restrictedOperators.nonEmpty) { - val restrictedDatasets = restrictedOperators.flatMap { op => - datasetRestrictions(op.id).map { - case (ownerEmail, datasetName) => - Map( - "operatorId" -> op.id, - "ownerEmail" -> ownerEmail, - "datasetName" -> datasetName - ).asJava - } - } + def exportResultToDataset(request: ResultExportRequest, @Auth user: SessionUser): Response = { + try { + val resultExportService = + new ResultExportService(WorkflowIdentity(request.workflowId), request.computingUnitId) + resultExportService.exportToDataset(user.user, request) - return Response - .status(Response.Status.FORBIDDEN) - .`type`(MediaType.APPLICATION_JSON) - .entity( - Map( - "error" -> "Export blocked due to dataset restrictions", - "restrictedDatasets" -> restrictedDatasets.asJava - ).asJava - ) - .build() + } catch { + case ex: Exception => + Response + .status(Response.Status.INTERNAL_SERVER_ERROR) + .`type`(MediaType.APPLICATION_JSON) + .entity(Map("error" -> ex.getMessage).asJava) + .build() } + } - try { - request.destination match { - case "local" => - // CASE A: multiple operators => produce ZIP - if (request.operators.size > 1) { - val resultExportService = - new ResultExportService(WorkflowIdentity(request.workflowId), request.computingUnitId) - val (zipStream, zipFileNameOpt) = - resultExportService.exportOperatorsAsZip(request) - - if (zipStream == null) { - throw new RuntimeException("Zip stream is null") - } + @POST + @Path("/result/export/local") + @Consumes(Array(MediaType.APPLICATION_FORM_URLENCODED)) + def exportResultToLocal( + @FormParam("request") requestJson: String, + @FormParam("token") token: String + ): Response = { - val finalFileName = zipFileNameOpt.getOrElse("operators.zip") - return Response - .ok(zipStream, "application/zip") - .header("Content-Disposition", "attachment; filename=\"" + finalFileName + "\"") - .build() - } + try { + val userOpt = JwtParser.parseToken(token) + if (userOpt.isPresent) { + val user = userOpt.get() + val role = user.getUser.getRole + val RolesAllowed = Set(UserRoleEnum.REGULAR, UserRoleEnum.ADMIN) + if (!RolesAllowed.contains(role)) { + throw new RuntimeException("User role is not allowed to perform this download") + } + } else { + throw new RuntimeException("Invalid or expired token") + } - // CASE B: exactly one operator => single file - if (request.operators.size != 1) { - return Response - .status(Response.Status.BAD_REQUEST) - .`type`(MediaType.APPLICATION_JSON) - .entity(Map("error" -> "Local download does not support no operator.").asJava) - .build() - } - val singleOp = request.operators.head - - val resultExportService = - new ResultExportService(WorkflowIdentity(request.workflowId), request.computingUnitId) - val (streamingOutput, fileNameOpt) = - resultExportService.exportOperatorResultAsStream(request, singleOp) - - if (streamingOutput == null) { - return Response - .status(Response.Status.INTERNAL_SERVER_ERROR) - .`type`(MediaType.APPLICATION_JSON) - .entity(Map("error" -> "Failed to export operator").asJava) - .build() - } + val request = Json.parse(requestJson).as[ResultExportRequest] + val resultExportService = + new ResultExportService(WorkflowIdentity(request.workflowId), request.computingUnitId) + resultExportService.exportToLocal(request) - val finalFileName = fileNameOpt.getOrElse("download.dat") - Response - .ok(streamingOutput, MediaType.APPLICATION_OCTET_STREAM) - .header("Content-Disposition", "attachment; filename=\"" + finalFileName + "\"") - .build() - case _ => - // destination = "dataset" by default - val resultExportService = - new ResultExportService(WorkflowIdentity(request.workflowId), request.computingUnitId) - val exportResponse = - resultExportService.exportAllOperatorsResultToDataset(user.user, request) - Response.ok(exportResponse).build() - } } catch { case ex: Exception => Response diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/service/ResultExportService.scala b/core/amber/src/main/scala/edu/uci/ics/texera/web/service/ResultExportService.scala index d4125883a97..1da0ce6e3c5 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/web/service/ResultExportService.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/web/service/ResultExportService.scala @@ -19,6 +19,9 @@ package edu.uci.ics.texera.web.service +import com.fasterxml.jackson.core.`type`.TypeReference +import com.fasterxml.jackson.databind.ObjectMapper +import com.fasterxml.jackson.module.scala.DefaultScalaModule import com.github.tototoshi.csv.CSVWriter import edu.uci.ics.amber.config.EnvironmentalVariable import edu.uci.ics.amber.core.storage.DocumentFactory @@ -38,6 +41,7 @@ import edu.uci.ics.texera.web.resource.dashboard.user.workflow.{ } import edu.uci.ics.texera.web.service.WorkflowExecutionService.getLatestExecutionId +import scala.jdk.CollectionConverters._ import java.io.{FilterOutputStream, IOException, OutputStream} import java.nio.channels.Channels import java.nio.charset.StandardCharsets @@ -53,10 +57,9 @@ import org.apache.arrow.vector.ipc.ArrowFileWriter import org.apache.commons.lang3.StringUtils import javax.ws.rs.WebApplicationException -import javax.ws.rs.core.StreamingOutput +import javax.ws.rs.core.{MediaType, Response, StreamingOutput} import java.net.{HttpURLConnection, URL, URLEncoder} import scala.collection.mutable.ArrayBuffer - import org.apache.commons.io.IOUtils object Constants { @@ -91,12 +94,12 @@ class ResultExportService(workflowIdentity: WorkflowIdentity, computingUnitId: I import ResultExportService._ /** - * Export results for all specified operators in the request. + * Export operator results to a dataset and return the result. */ - def exportAllOperatorsResultToDataset( + def exportToDataset( user: User, request: ResultExportRequest - ): ResultExportResponse = { + ): Response = { val successMessages = new mutable.ListBuffer[String]() val errorMessages = new mutable.ListBuffer[String]() @@ -111,13 +114,49 @@ class ResultExportService(workflowIdentity: WorkflowIdentity, computingUnitId: I } } + var exportResponse: ResultExportResponse = null if (errorMessages.isEmpty) { - ResultExportResponse("success", successMessages.mkString("\n")) + exportResponse = ResultExportResponse("success", successMessages.mkString("\n")) } else if (successMessages.isEmpty) { - ResultExportResponse("error", errorMessages.mkString("\n")) + exportResponse = ResultExportResponse("error", errorMessages.mkString("\n")) } else { // At least one success, so we consider overall success (with partial possible). - ResultExportResponse("success", successMessages.mkString("\n")) + exportResponse = ResultExportResponse("success", successMessages.mkString("\n")) + } + + Response.ok(exportResponse).build() + } + + /** + * Export operator results as downloadable files. + * If multiple operators are selected, their results are streamed as a ZIP file. + * If a single operator is selected, its result is streamed directly. + */ + def exportToLocal(request: ResultExportRequest): Response = { + if (request.operators.size > 1) { + val (zipStream, zipFileNameOpt) = exportOperatorsAsZip(request) + if (zipStream == null) { + throw new RuntimeException("Zip stream is null") + } + val fileName = zipFileNameOpt.getOrElse("operators.zip") + + Response + .ok(zipStream, "application/zip") + .header("Content-Disposition", s"""attachment; filename="$fileName"""") + .build() + + } else { + val op = request.operators.head + val (streamingOutput, fileNameOpt) = exportOperatorResultAsStream(request, op) + if (streamingOutput == null) { + throw new RuntimeException("Failed to export operator") + } + val fileName = fileNameOpt.getOrElse("download.dat") + + Response + .ok(streamingOutput, MediaType.APPLICATION_OCTET_STREAM) + .header("Content-Disposition", s"""attachment; filename="$fileName"""") + .build() } } @@ -205,10 +244,6 @@ class ResultExportService(workflowIdentity: WorkflowIdentity, computingUnitId: I def exportOperatorsAsZip( request: ResultExportRequest ): (StreamingOutput, Option[String]) = { - if (request.operators.isEmpty) { - return (null, None) - } - val timestamp = LocalDateTime .now() .truncatedTo(ChronoUnit.SECONDS) @@ -562,4 +597,29 @@ class ResultExportService(workflowIdentity: WorkflowIdentity, computingUnitId: I // remove path separators StringUtils.replaceEach(rawName, Array("/", "\\"), Array("", "")) } + + /** + * Parse a JSON string array of operators into a list of OperatorExportInfo objects. + */ + def parseOperators(operatorsJson: String): List[OperatorExportInfo] = { + new ObjectMapper() + .registerModule(DefaultScalaModule) + .readValue(operatorsJson, new TypeReference[List[OperatorExportInfo]] {}) + } + + /** + * Validate an export request by checking if any operators are selected. + * Return an error response if none are selected, otherwise None. + */ + def validateExportRequest(request: ResultExportRequest): Option[Response] = { + if (request.operators.isEmpty) { + Some( + Response + .status(Response.Status.BAD_REQUEST) + .`type`(MediaType.APPLICATION_JSON) + .entity(Map("error" -> "No operator selected").asJava) + .build() + ) + } else None + } } diff --git a/core/gui/src/app/dashboard/service/user/download/download.service.ts b/core/gui/src/app/dashboard/service/user/download/download.service.ts index aafb14a44c6..eff9fa71b61 100644 --- a/core/gui/src/app/dashboard/service/user/download/download.service.ts +++ b/core/gui/src/app/dashboard/service/user/download/download.service.ts @@ -30,9 +30,11 @@ import { AppSettings } from "../../../../common/app-setting"; import { HttpClient, HttpResponse } from "@angular/common/http"; import { WORKFLOW_EXECUTIONS_API_BASE_URL } from "../workflow-executions/workflow-executions.service"; import { DashboardWorkflowComputingUnit } from "../../../../workspace/types/workflow-computing-unit"; +import { TOKEN_KEY } from "../../../../common/service/user/auth.service"; var contentDisposition = require("content-disposition"); export const EXPORT_BASE_URL = "result/export"; +const IFRAME_TIMEOUT_MS = 10000; export const DOWNLOADABILITY_BASE_URL = "result/downloadability"; interface DownloadableItem { @@ -148,7 +150,6 @@ export class DownloadService { rowIndex: number, columnIndex: number, filename: string, - destination: "local" | "dataset" = "dataset", // "local" or "dataset" => default to "dataset" unit: DashboardWorkflowComputingUnit // computing unit for cluster setting ): Observable | HttpResponse> { const computingUnitId = unit.computingUnit.cuid; @@ -161,51 +162,91 @@ export class DownloadService { rowIndex, columnIndex, filename, - destination, computingUnitId, }; const urlPath = unit && unit.computingUnit.type == "kubernetes" && unit.computingUnit?.cuid - ? `${WORKFLOW_EXECUTIONS_API_BASE_URL}/${EXPORT_BASE_URL}?cuid=${unit.computingUnit.cuid}` - : `${WORKFLOW_EXECUTIONS_API_BASE_URL}/${EXPORT_BASE_URL}`; - if (destination === "local") { - return this.http.post(urlPath, requestBody, { - responseType: "blob", - observe: "response", - headers: { - "Content-Type": "application/json", - Accept: "application/octet-stream", - }, - }); - } else { - // dataset => return JSON - return this.http.post(urlPath, requestBody, { - responseType: "json", - observe: "response", - headers: { - "Content-Type": "application/json", - Accept: "application/json", - }, - }); - } + ? `${WORKFLOW_EXECUTIONS_API_BASE_URL}/${EXPORT_BASE_URL}/dataset?cuid=${unit.computingUnit.cuid}` + : `${WORKFLOW_EXECUTIONS_API_BASE_URL}/${EXPORT_BASE_URL}/dataset`; + + return this.http.post(urlPath, requestBody, { + responseType: "json", + observe: "response", + headers: { + "Content-Type": "application/json", + Accept: "application/json", + }, + }); } /** - * Utility function to download a file from the server from blob object. + * Export the workflow result to local filesystem. The export is handled by the browser. */ - public saveBlobFile(response: any, defaultFileName: string): void { - // If the server sets "Content-Disposition: attachment; filename="someName.csv"" header, - // we can parse that out. Otherwise just use defaultFileName. - const dispositionHeader = response.headers.get("Content-Disposition"); - let fileName = defaultFileName; - if (dispositionHeader) { - const parsed = contentDisposition.parse(dispositionHeader); - fileName = parsed.parameters.filename || defaultFileName; - } + public exportWorkflowResultToLocal( + exportType: string, + workflowId: number, + workflowName: string, + operators: { + id: string; + outputType: string; + }[], + rowIndex: number, + columnIndex: number, + filename: string, + unit: DashboardWorkflowComputingUnit // computing unit for cluster setting + ): void { + const computingUnitId = unit.computingUnit.cuid; + const datasetIds: number[] = []; + const requestBody = { + exportType, + workflowId, + workflowName, + operators, + datasetIds, + rowIndex, + columnIndex, + filename, + computingUnitId, + }; + const token = localStorage.getItem(TOKEN_KEY) ?? ""; - const blob = response.body; // the actual file data - this.fileSaverService.saveAs(blob, fileName); + const urlPath = + unit && unit.computingUnit.type == "kubernetes" && unit.computingUnit?.cuid + ? `${WORKFLOW_EXECUTIONS_API_BASE_URL}/${EXPORT_BASE_URL}/local?cuid=${unit.computingUnit.cuid}` + : `${WORKFLOW_EXECUTIONS_API_BASE_URL}/${EXPORT_BASE_URL}/local`; + + const iframe = document.createElement("iframe"); + iframe.name = "download-iframe"; + iframe.style.display = "none"; + document.body.appendChild(iframe); + + const form = document.createElement("form"); + form.method = "POST"; + form.action = urlPath; + form.target = "download-iframe"; + form.enctype = "application/x-www-form-urlencoded"; + form.style.display = "none"; + + const requestInput = document.createElement("input"); + requestInput.type = "hidden"; + requestInput.name = "request"; + requestInput.value = JSON.stringify(requestBody); + form.appendChild(requestInput); + + const tokenInput = document.createElement("input"); + tokenInput.type = "hidden"; + tokenInput.name = "token"; + tokenInput.value = token; + form.appendChild(tokenInput); + + document.body.appendChild(form); + form.submit(); + + setTimeout(() => { + document.body.removeChild(form); + document.body.removeChild(iframe); + }, IFRAME_TIMEOUT_MS); } downloadOperatorsResult( diff --git a/core/gui/src/app/workspace/service/workflow-result-export/workflow-result-export.service.ts b/core/gui/src/app/workspace/service/workflow-result-export/workflow-result-export.service.ts index 1abad167ec5..d57815485e2 100644 --- a/core/gui/src/app/workspace/service/workflow-result-export/workflow-result-export.service.ts +++ b/core/gui/src/app/workspace/service/workflow-result-export/workflow-result-export.service.ts @@ -306,27 +306,34 @@ export class WorkflowResultExportService { this.notificationService.loading("Exporting..."); // Make request - this.downloadService - .exportWorkflowResult( + if (destination === "local") { + // Dataset export to local filesystem (download handled by browser) + this.downloadService.exportWorkflowResultToLocal( exportType, workflowId, workflowName, operatorArray, - [...datasetIds], rowIndex, columnIndex, filename, - destination, unit - ) - .subscribe({ - next: response => { - if (destination === "local") { - // "local" => response is a blob - // We can parse the file name from header or use fallback - this.downloadService.saveBlobFile(response, filename); - this.notificationService.info("Files downloaded successfully"); - } else { + ); + } else { + // Dataset export to dataset via API call + this.downloadService + .exportWorkflowResult( + exportType, + workflowId, + workflowName, + operatorArray, + [...datasetIds], + rowIndex, + columnIndex, + filename, + unit + ) + .subscribe({ + next: response => { // "dataset" => response is JSON // The server should return a JSON with {status, message} const jsonResponse = response as HttpResponse; @@ -336,13 +343,13 @@ export class WorkflowResultExportService { } else { this.notificationService.error(responseBody?.message || "An error occurred during export"); } - } - }, - error: (err: unknown) => { - const errorMessage = (err as any)?.error?.message || (err as any)?.error || err; - this.notificationService.error(`An error happened in exporting operator results: ${errorMessage}`); - }, - }); + }, + error: (err: unknown) => { + const errorMessage = (err as any)?.error?.message || (err as any)?.error || err; + this.notificationService.error(`An error happened in exporting operator results: ${errorMessage}`); + }, + }); + } } /** diff --git a/deployment/k8s/texera-helmchart/templates/envoy-config.yaml b/deployment/k8s/texera-helmchart/templates/envoy-config.yaml index cdce9311765..2ba17e63f8a 100644 --- a/deployment/k8s/texera-helmchart/templates/envoy-config.yaml +++ b/deployment/k8s/texera-helmchart/templates/envoy-config.yaml @@ -66,6 +66,10 @@ data: - name: envoy.filters.http.ext_authz typed_config: "@type": type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthz + with_request_body: + # Max allowed by Envoy (uint32): 4,294,967,295 bytes (~4 GiB) + max_request_bytes: 4294967295 + allow_partial_message: true # forward partial body if larger than limit http_service: server_uri: uri: http://{{ .Release.Name }}-{{ .Values.accessControlService.name }}-svc.{{ .Release.Namespace }}.svc.cluster.local diff --git a/deployment/k8s/texera-helmchart/values.yaml b/deployment/k8s/texera-helmchart/values.yaml index 7a10c086422..a86c0e71b0a 100644 --- a/deployment/k8s/texera-helmchart/values.yaml +++ b/deployment/k8s/texera-helmchart/values.yaml @@ -342,7 +342,8 @@ ingressPaths: pathType: ImplementationSpecific serviceName: envoy-svc servicePort: 10000 - - path: /api/executions/result/export + - path: /api/executions/result/export/* + pathType: ImplementationSpecific serviceName: envoy-svc servicePort: 10000 - path: /api From 97ef79c753efa0977a62744dbae7637018ab5422 Mon Sep 17 00:00:00 2001 From: Grace Chia <94275517+gracecluvohio@users.noreply.github.com> Date: Fri, 10 Oct 2025 21:04:21 -0700 Subject: [PATCH 025/136] fix(ui): remove duplicate left sidebar border and extend to bottom of page (#3849) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ### Purpose This PR is related to #3741, which found inconsistent vertical divider height across interface panels. This PR addresses the left sidebar specifically. ### Changes - Remove duplicate border on left sidebar - Make left sidebar border reach bottom of page if page extends past bottom of viewport ### Demonstration Before: left sidebar border is duplicated and too short 490342553-6f5d8ff5-5a9a-4548-b47e-5414a95ac705 After: Screenshot 2025-10-10 at 4 03 46 PM Before: Gmail page: left sidebar border is too short 490342905-4aaf6236-7b34-4197-b467-c8540bcf4af2 After: extends to bottom Screenshot 2025-10-10 at 4 04 06 PM --------- Co-authored-by: Xinyuan Lin --- .../dashboard/component/dashboard.component.html | 2 +- .../dashboard/component/dashboard.component.scss | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/core/gui/src/app/dashboard/component/dashboard.component.html b/core/gui/src/app/dashboard/component/dashboard.component.html index cf490d33043..b238f56b938 100644 --- a/core/gui/src/app/dashboard/component/dashboard.component.html +++ b/core/gui/src/app/dashboard/component/dashboard.component.html @@ -193,7 +193,7 @@
- + +
+ + +
+ +
+
+ +
+ + {{ response.role === 'user' ? 'You' : agentInfo.name }} +
+ + +
+
+ +
+
+ Execute {{ response.toolCalls.length }} tool{{ response.toolCalls.length > 1 ? 's' : '' }} +
+ + + +
+
+ + +
+
+ + {{ agentInfo.name }} +
+
+ + Thinking... +
+
+
+ + +
+ + + +
+
+ + +
+ + Agent is disconnected. Please check your connection. +
+
+ + + + +
+ +
+

+ + Token Usage +

+ + + {{ selectedResponse.usage.inputTokens || 0 }} + + + {{ selectedResponse.usage.outputTokens || 0 }} + + + {{ selectedResponse.usage.totalTokens || 0 }} + + + {{ selectedResponse.usage.cachedInputTokens || 0 }} + + +
+ + +
+

+ + Tool Calls ({{ selectedResponse.toolCalls.length }}) +

+ + +
+
+ Arguments: +
+ 
{{ formatJson(call.input || call.args) }}
+
+
+
+ Result: +
+ 
{{ formatJson(getToolResult(selectedResponse, idx)) }}
+
+
+
+ Operator Access: +
+
+
+ + + VIEWED: + + + {{ opId }} + +
+
+ + + MODIFIED: + + + {{ opId }} + +
+
+
+ + +
+ + +
+ +
No additional details available for this response.
+
+
+ + + + + + +
+ +
+

+ + System Prompt +

+
+ +
+
+ + +
+

+ + Available Tools ({{ availableTools.length }}) +

+ + + +
+
+ Description: +
+
{{ tool.description }}
+
+ + +
+
+ Input Schema: +
+ 
{{ formatJson(tool.inputSchema) }}
+
+ + +
+
+ + diff --git a/frontend/src/app/workspace/component/agent-panel/agent-chat/agent-chat.component.scss b/frontend/src/app/workspace/component/agent-panel/agent-chat/agent-chat.component.scss new file mode 100644 index 00000000000..5c784194456 --- /dev/null +++ b/frontend/src/app/workspace/component/agent-panel/agent-chat/agent-chat.component.scss @@ -0,0 +1,243 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +.agent-chat-container { + display: flex; + flex-direction: column; + height: 100%; + width: 100%; + background: white; +} + +.chat-toolbar { + display: flex; + justify-content: flex-end; + align-items: center; + padding: 8px 12px; + border-bottom: 1px solid #f0f0f0; + background: white; +} + +.chat-toolbar-controls { + display: flex; + width: 100%; + align-items: center; + justify-content: space-between; + gap: 24px; +} + +.toolbar-item { + display: flex; + align-items: center; + flex-shrink: 0; +} + +.chat-toolbar-buttons { + display: flex; + gap: 4px; + align-items: center; + margin-left: 8px; +} + +.chat-content-wrapper { + flex: 1; + overflow: hidden; + display: flex; + flex-direction: column; +} + +.messages-container { + flex: 1; + overflow-y: auto; + padding: 12px; + display: flex; + flex-direction: column; + gap: 8px; +} + +.message { + display: flex; + flex-direction: column; + gap: 2px; + max-width: 85%; + + &.user-message { + align-self: flex-end; + + .message-content { + background: #1890ff; + color: white; + } + } + + &.ai-message { + align-self: flex-start; + + .message-content { + background: #f5f5f5; + color: #262626; + } + } + + &.loading-message { + .message-content { + background: #e6f7ff; + border: 1px solid #91d5ff; + } + } +} + +.message-header { + display: flex; + align-items: center; + gap: 6px; + padding: 0 8px; + font-size: 12px; + color: #8c8c8c; + + i { + font-size: 14px; + } +} + +.message-content { + padding: 8px 12px; + border-radius: 6px; + line-height: 1.5; + word-wrap: break-word; + font-size: 14px; + user-select: text; + + ::ng-deep markdown { + display: block; + + p { + margin: 0 0 8px 0; + + &:last-child { + margin-bottom: 0; + } + } + + code { + background: rgba(0, 0, 0, 0.06); + padding: 2px 6px; + border-radius: 3px; + font-size: 13px; + } + + pre { + background: rgba(0, 0, 0, 0.06); + padding: 12px; + border-radius: 4px; + overflow-x: auto; + margin: 8px 0; + + code { + background: transparent; + padding: 0; + } + } + + ul, + ol { + margin: 8px 0; + padding-left: 24px; + } + + li { + margin: 4px 0; + } + + blockquote { + border-left: 3px solid rgba(0, 0, 0, 0.1); + padding-left: 12px; + margin: 8px 0; + color: rgba(0, 0, 0, 0.65); + } + + a { + color: #1890ff; + text-decoration: none; + + &:hover { + text-decoration: underline; + } + } + } +} + +.user-message .message-content ::ng-deep markdown { + code { + background: rgba(255, 255, 255, 0.2); + color: white; + } + + pre { + background: rgba(255, 255, 255, 0.15); + + code { + color: white; + } + } + + blockquote { + border-left-color: rgba(255, 255, 255, 0.3); + color: rgba(255, 255, 255, 0.9); + } + + a { + color: #e6f7ff; + + &:hover { + color: white; + } + } +} + +.input-area { + display: flex; + gap: 8px; + padding: 8px 12px; + border-top: 1px solid #f0f0f0; + background: #ffffff; + + textarea { + flex: 1; + } + + button { + align-self: flex-end; + } +} + +.connection-warning { + display: flex; + align-items: center; + gap: 8px; + padding: 8px 16px; + background: #fff7e6; + border-top: 1px solid #ffd666; + color: #d46b08; + font-size: 12px; + + i { + color: #faad14; + } +} diff --git a/frontend/src/app/workspace/component/agent-panel/agent-chat/agent-chat.component.spec.ts b/frontend/src/app/workspace/component/agent-panel/agent-chat/agent-chat.component.spec.ts new file mode 100644 index 00000000000..a972d71c73f --- /dev/null +++ b/frontend/src/app/workspace/component/agent-panel/agent-chat/agent-chat.component.spec.ts @@ -0,0 +1,65 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { ComponentFixture, TestBed } from "@angular/core/testing"; +import { HttpClientTestingModule } from "@angular/common/http/testing"; +import { AgentChatComponent } from "./agent-chat.component"; +import { TexeraCopilotManagerService } from "../../../service/copilot/texera-copilot-manager.service"; +import { NotificationService } from "../../../../common/service/notification/notification.service"; +import { commonTestProviders } from "../../../../common/testing/test-utils"; +import { NO_ERRORS_SCHEMA } from "@angular/core"; + +describe("AgentChatComponent", () => { + let component: AgentChatComponent; + let fixture: ComponentFixture; + let mockCopilotManagerService: jasmine.SpyObj; + let mockNotificationService: jasmine.SpyObj; + + beforeEach(async () => { + mockCopilotManagerService = jasmine.createSpyObj("TexeraCopilotManagerService", [ + "getAgentResponsesObservable", + "getAgentStateObservable", + "sendMessage", + "stopGeneration", + "clearMessages", + "getSystemInfo", + ]); + mockNotificationService = jasmine.createSpyObj("NotificationService", ["info", "error", "success"]); + + await TestBed.configureTestingModule({ + declarations: [AgentChatComponent], + imports: [HttpClientTestingModule], + providers: [ + { provide: TexeraCopilotManagerService, useValue: mockCopilotManagerService }, + { provide: NotificationService, useValue: mockNotificationService }, + ...commonTestProviders, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(AgentChatComponent); + component = fixture.componentInstance; + }); + + it("should create", () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/frontend/src/app/workspace/component/agent-panel/agent-chat/agent-chat.component.ts b/frontend/src/app/workspace/component/agent-panel/agent-chat/agent-chat.component.ts new file mode 100644 index 00000000000..99acf43effe --- /dev/null +++ b/frontend/src/app/workspace/component/agent-panel/agent-chat/agent-chat.component.ts @@ -0,0 +1,277 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { Component, ViewChild, ElementRef, Input, OnInit, AfterViewChecked } from "@angular/core"; +import { UntilDestroy, untilDestroyed } from "@ngneat/until-destroy"; +import { CopilotState, ReActStep } from "../../../service/copilot/texera-copilot"; +import { AgentInfo, TexeraCopilotManagerService } from "../../../service/copilot/texera-copilot-manager.service"; +import { NotificationService } from "../../../../common/service/notification/notification.service"; + +@UntilDestroy() +@Component({ + selector: "texera-agent-chat", + templateUrl: "agent-chat.component.html", + styleUrls: ["agent-chat.component.scss"], +}) +export class AgentChatComponent implements OnInit, AfterViewChecked { + @Input() agentInfo!: AgentInfo; + @ViewChild("messageContainer", { static: false }) messageContainer?: ElementRef; + @ViewChild("messageInput", { static: false }) messageInput?: ElementRef; + + public responses: ReActStep[] = []; + public currentMessage = ""; + private shouldScrollToBottom = false; + public isDetailsModalVisible = false; + public selectedResponse: ReActStep | null = null; + public hoveredMessageIndex: number | null = null; + public isSystemInfoModalVisible = false; + public systemPrompt: string = ""; + public availableTools: Array<{ name: string; description: string; inputSchema: any }> = []; + public agentState: CopilotState = CopilotState.UNAVAILABLE; + + constructor( + private copilotManagerService: TexeraCopilotManagerService, + private notificationService: NotificationService + ) {} + + ngOnInit(): void { + if (!this.agentInfo) { + return; + } + + // Subscribe to agent responses + this.copilotManagerService + .getReActStepsObservable(this.agentInfo.id) + .pipe(untilDestroyed(this)) + .subscribe(responses => { + this.responses = responses; + this.shouldScrollToBottom = true; + }); + + // Subscribe to agent state changes + this.copilotManagerService + .getAgentStateObservable(this.agentInfo.id) + .pipe(untilDestroyed(this)) + .subscribe(state => { + this.agentState = state; + }); + } + + ngAfterViewChecked(): void { + if (this.shouldScrollToBottom) { + this.scrollToBottom(); + this.shouldScrollToBottom = false; + } + } + + public setHoveredMessage(index: number | null): void { + this.hoveredMessageIndex = index; + } + + public showResponseDetails(response: ReActStep): void { + this.selectedResponse = response; + this.isDetailsModalVisible = true; + } + + public closeDetailsModal(): void { + this.isDetailsModalVisible = false; + this.selectedResponse = null; + } + + public showSystemInfo(): void { + this.copilotManagerService + .getSystemInfo(this.agentInfo.id) + .pipe(untilDestroyed(this)) + .subscribe(systemInfo => { + this.systemPrompt = systemInfo.systemPrompt; + this.availableTools = systemInfo.tools; + this.isSystemInfoModalVisible = true; + }); + } + + public closeSystemInfoModal(): void { + this.isSystemInfoModalVisible = false; + } + + public formatJson(data: any): string { + return JSON.stringify(data, null, 2); + } + + public getToolResult(response: ReActStep, toolCallIndex: number): any { + if (!response.toolResults || toolCallIndex >= response.toolResults.length) { + return null; + } + const toolResult = response.toolResults[toolCallIndex]; + return toolResult.output || toolResult.result || toolResult; + } + + public getReActStepOperatorAccess( + response: ReActStep, + toolCallIndex: number + ): { viewedOperatorIds: string[]; modifiedOperatorIds: string[] } | null { + if (!response.toolResults || toolCallIndex >= response.toolResults.length) { + return null; + } + const toolResult = response.toolResults[toolCallIndex]; + const result = toolResult.output || toolResult.result || toolResult; + + // Check if the result has operator access information + if (result && (result.viewedOperatorIds || result.modifiedOperatorIds)) { + return { + viewedOperatorIds: result.viewedOperatorIds || [], + modifiedOperatorIds: result.modifiedOperatorIds || [], + }; + } + + return null; + } + + public getTotalInputTokens(): number { + // Iterate in reverse to find the most recent usage (already sorted by timestamp) + for (let i = this.responses.length - 1; i >= 0; i--) { + if (this.responses[i].usage?.inputTokens !== undefined) { + return this.responses[i].usage!.inputTokens!; + } + } + return 0; + } + + public getTotalOutputTokens(): number { + // Iterate in reverse to find the most recent usage (already sorted by timestamp) + for (let i = this.responses.length - 1; i >= 0; i--) { + if (this.responses[i].usage?.outputTokens !== undefined) { + return this.responses[i].usage!.outputTokens!; + } + } + return 0; + } + + /** + * Send a message to the agent via the copilot manager service. + */ + public sendMessage(): void { + if (!this.currentMessage.trim() || !this.canSendMessage()) { + return; + } + + const userMessage = this.currentMessage.trim(); + this.currentMessage = ""; + + // Send to copilot via manager service + this.copilotManagerService + .sendMessage(this.agentInfo.id, userMessage) + .pipe(untilDestroyed(this)) + .subscribe({ + error: (error: unknown) => { + this.notificationService.error(`Error sending message: ${error}`); + }, + }); + } + + /** + * Check if messages can be sent (only when agent is available). + */ + public canSendMessage(): boolean { + return this.agentState === CopilotState.AVAILABLE; + } + + /** + * Get the NG-ZORRO icon type based on current agent state. + */ + public getStateIcon(): string { + switch (this.agentState) { + case CopilotState.AVAILABLE: + return "check-circle"; + case CopilotState.GENERATING: + case CopilotState.STOPPING: + return "sync"; + case CopilotState.UNAVAILABLE: + default: + return "close-circle"; + } + } + + /** + * Get the icon color based on current agent state. + */ + public getStateIconColor(): string { + switch (this.agentState) { + case CopilotState.AVAILABLE: + return "#52c41a"; + case CopilotState.GENERATING: + case CopilotState.STOPPING: + return "#1890ff"; + case CopilotState.UNAVAILABLE: + default: + return "#ff4d4f"; + } + } + + /** + * Get the tooltip text for the state icon. + */ + public getStateTooltip(): string { + switch (this.agentState) { + case CopilotState.AVAILABLE: + return "Agent is ready"; + case CopilotState.GENERATING: + return "Agent is generating response..."; + case CopilotState.STOPPING: + return "Agent is stopping..."; + case CopilotState.UNAVAILABLE: + return "Agent is unavailable"; + default: + return "Agent status unknown"; + } + } + + public onEnterPress(event: KeyboardEvent): void { + if (!event.shiftKey) { + event.preventDefault(); + this.sendMessage(); + } + } + + private scrollToBottom(): void { + if (this.messageContainer) { + const element = this.messageContainer.nativeElement; + element.scrollTop = element.scrollHeight; + } + } + + public stopGeneration(): void { + this.copilotManagerService.stopGeneration(this.agentInfo.id).pipe(untilDestroyed(this)).subscribe(); + } + + public clearMessages(): void { + this.copilotManagerService.clearMessages(this.agentInfo.id).pipe(untilDestroyed(this)).subscribe(); + } + + public isGenerating(): boolean { + return this.agentState === CopilotState.GENERATING; + } + + public isAvailable(): boolean { + return this.agentState === CopilotState.AVAILABLE; + } + + public isConnected(): boolean { + return this.agentState !== CopilotState.UNAVAILABLE; + } +} diff --git a/frontend/src/app/workspace/component/agent-panel/agent-panel.component.html b/frontend/src/app/workspace/component/agent-panel/agent-panel.component.html new file mode 100644 index 00000000000..4d419bd5764 --- /dev/null +++ b/frontend/src/app/workspace/component/agent-panel/agent-panel.component.html @@ -0,0 +1,138 @@ + + + + + +
+ +
    + +
  • + +
    • +
+ +
+

+ AI Agents +

+ + + + + + + + + + + + + +
+ {{ agent.name }} + +
+ + + + + + + + +
+
+ + + +
+ {{ agents.length }} agent(s) +
+ diff --git a/frontend/src/app/workspace/component/agent-panel/agent-panel.component.scss b/frontend/src/app/workspace/component/agent-panel/agent-panel.component.scss new file mode 100644 index 00000000000..3dc606bba65 --- /dev/null +++ b/frontend/src/app/workspace/component/agent-panel/agent-panel.component.scss @@ -0,0 +1,164 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +:host { + display: block; + width: 100%; + height: 100%; + position: fixed; + z-index: 3; +} + +#agent-container { + position: absolute; + top: calc(-100% + 80px); + right: 0; + z-index: 3; + background: white; +} + +#title { + padding: 5px 9px; + border-bottom: 1px solid #e0e0e0; + position: absolute; + top: 0; + background: white; + width: 100%; + z-index: 2; +} + +#agent-docked-button { + position: fixed; + bottom: 40px; // Position above the mini-map button + right: 10px; + z-index: 4; + box-shadow: + 0 3px 1px -2px #0003, + 0 2px 2px #00000024, + 0 1px 5px #0000001f; +} + +#return-button { + position: absolute; + top: 0; + right: 0; + z-index: 3; + display: flex; +} + +#content { + width: 100%; + height: 100%; + padding-top: 32px; + display: inline-block; + overflow-y: auto; +} + +.shadow { + border-radius: 5px; + box-shadow: + 0 3px 1px -2px #0003, + 0 2px 2px #00000024, + 0 1px 5px #0000001f; +} + +.ant-menu-item { + margin: 0 !important; + height: 32px; + line-height: 32px; + padding: 0 9px; +} + +.agent-tabs { + height: calc(100% - 32px); // Account for the title bar + display: flex; + flex-direction: column; + overflow: hidden; + + ::ng-deep { + .ant-tabs { + height: 100%; + display: flex; + flex-direction: column; + } + + .ant-tabs-nav { + margin-bottom: 0; + } + + .ant-tabs-content-holder { + flex: 1; + overflow: hidden; + } + + .ant-tabs-content { + height: 100%; + } + + .ant-tabs-tabpane { + height: 100%; + overflow: hidden; + padding: 0; + } + } +} + +.agent-tab-title { + display: flex; + align-items: center; + gap: 8px; + + .agent-tab-name { + flex: 1; + } +} + +.agent-tab-close { + padding: 0 !important; + width: 20px !important; + height: 20px !important; + min-width: 20px !important; + display: flex; + align-items: center; + justify-content: center; + opacity: 0.6; + margin-left: 4px; + + &:hover { + opacity: 1; + color: #ff4d4f !important; + background: rgba(255, 77, 79, 0.1) !important; + } + + i { + font-size: 12px; + } +} + +.tab-bar-extra { + padding-right: 8px; +} + +.agent-count { + font-size: 12px; + color: #8c8c8c; + padding: 4px 8px; + background: #f0f0f0; + border-radius: 4px; +} diff --git a/frontend/src/app/workspace/component/agent-panel/agent-panel.component.ts b/frontend/src/app/workspace/component/agent-panel/agent-panel.component.ts new file mode 100644 index 00000000000..47e936ed31b --- /dev/null +++ b/frontend/src/app/workspace/component/agent-panel/agent-panel.component.ts @@ -0,0 +1,200 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { Component, HostListener, OnDestroy, OnInit } from "@angular/core"; +import { UntilDestroy, untilDestroyed } from "@ngneat/until-destroy"; +import { NzResizeEvent } from "ng-zorro-antd/resizable"; +import { TexeraCopilotManagerService, AgentInfo } from "../../service/copilot/texera-copilot-manager.service"; +import { calculateTotalTranslate3d } from "../../../common/util/panel-dock"; + +@UntilDestroy() +@Component({ + selector: "texera-agent-panel", + templateUrl: "agent-panel.component.html", + styleUrls: ["agent-panel.component.scss"], +}) +export class AgentPanelComponent implements OnInit, OnDestroy { + protected readonly window = window; + private static readonly MIN_PANEL_WIDTH = 400; + private static readonly MIN_PANEL_HEIGHT = 450; + + // Panel dimensions and position + width: number = 0; // Start with 0 to show docked button + height = Math.max(AgentPanelComponent.MIN_PANEL_HEIGHT, window.innerHeight * 0.7); + id = -1; + dragPosition = { x: 0, y: 0 }; + returnPosition = { x: 0, y: 0 }; + isDocked = true; + + // Tab management + selectedTabIndex: number = 0; // 0 = registration tab, 1 = action plans tab, 2+ = agent tabs + agents: AgentInfo[] = []; + + constructor(private copilotManagerService: TexeraCopilotManagerService) {} + + ngOnInit(): void { + this.loadPanelSettings(); + + // Subscribe to agent changes + this.copilotManagerService.agentChange$.pipe(untilDestroyed(this)).subscribe(() => { + this.copilotManagerService + .getAllAgents() + .pipe(untilDestroyed(this)) + .subscribe(agents => { + this.agents = agents; + }); + }); + + // Load initial agents + this.copilotManagerService + .getAllAgents() + .pipe(untilDestroyed(this)) + .subscribe(agents => { + this.agents = agents; + }); + } + + @HostListener("window:beforeunload") + ngOnDestroy(): void { + this.savePanelSettings(); + } + + /** + * Open the panel from docked state + */ + public openPanel(): void { + if (this.width === 0) { + // Open panel + this.width = AgentPanelComponent.MIN_PANEL_WIDTH; + } else { + // Close panel (dock it) + this.width = 0; + this.isDocked = true; + } + } + + /** + * Handle agent creation + */ + public onAgentCreated(agentId: string): void { + // The agent is already added to the agents array by the manager service + // Find the index of the newly created agent and switch to that tab + // Tab index 0 is registration, 1 is action plans, so agent tabs start at index 2 + const agentIndex = this.agents.findIndex(agent => agent.id === agentId); + if (agentIndex !== -1) { + this.selectedTabIndex = agentIndex + 2; // +2 because tab 0 is registration, tab 1 is action plans + } + } + + /** + * Delete an agent + */ + public deleteAgent(agentId: string, event: Event): void { + event.stopPropagation(); // Prevent tab switch + + if (confirm("Are you sure you want to delete this agent?")) { + const agentIndex = this.agents.findIndex(agent => agent.id === agentId); + this.copilotManagerService.deleteAgent(agentId); + + // If we're on the deleted agent's tab, switch to registration + if (agentIndex !== -1 && this.selectedTabIndex === agentIndex + 2) { + this.selectedTabIndex = 0; + } else if (this.selectedTabIndex > agentIndex + 2) { + // Adjust selected index if we deleted a tab before the current one + this.selectedTabIndex--; + } + } + } + + /** + * Handle panel resize + */ + onResize({ width, height }: NzResizeEvent): void { + cancelAnimationFrame(this.id); + this.id = requestAnimationFrame(() => { + this.width = width!; + this.height = height!; + }); + } + + /** + * Reset panel to docked position + */ + resetPanelPosition(): void { + this.dragPosition = { x: this.returnPosition.x, y: this.returnPosition.y }; + this.isDocked = true; + } + + /** + * Handle drag start + */ + handleDragStart(): void { + this.isDocked = false; + } + + /** + * Load panel settings from localStorage + */ + private loadPanelSettings(): void { + const savedWidth = localStorage.getItem("agent-panel-width"); + const savedHeight = localStorage.getItem("agent-panel-height"); + const savedStyle = localStorage.getItem("agent-panel-style"); + const savedDocked = localStorage.getItem("agent-panel-docked"); + + // Only restore width if the panel was not docked + if (savedDocked === "false" && savedWidth) { + const parsedWidth = Number(savedWidth); + if (!isNaN(parsedWidth) && parsedWidth >= AgentPanelComponent.MIN_PANEL_WIDTH) { + this.width = parsedWidth; + } + } + + if (savedHeight) { + const parsedHeight = Number(savedHeight); + if (!isNaN(parsedHeight) && parsedHeight >= AgentPanelComponent.MIN_PANEL_HEIGHT) { + this.height = parsedHeight; + } + } + + if (savedStyle) { + const container = document.getElementById("agent-container"); + if (container) { + container.style.cssText = savedStyle; + const translates = container.style.transform; + const [xOffset, yOffset] = calculateTotalTranslate3d(translates); + this.returnPosition = { x: -xOffset, y: -yOffset }; + this.isDocked = this.dragPosition.x === this.returnPosition.x && this.dragPosition.y === this.returnPosition.y; + } + } + } + + /** + * Save panel settings to localStorage + */ + private savePanelSettings(): void { + localStorage.setItem("agent-panel-width", String(this.width)); + localStorage.setItem("agent-panel-height", String(this.height)); + localStorage.setItem("agent-panel-docked", String(this.width === 0)); + + const container = document.getElementById("agent-container"); + if (container) { + localStorage.setItem("agent-panel-style", container.style.cssText); + } + } +} diff --git a/frontend/src/app/workspace/component/agent-panel/agent-registration/agent-registration.component.html b/frontend/src/app/workspace/component/agent-panel/agent-registration/agent-registration.component.html new file mode 100644 index 00000000000..c31e8c3ef92 --- /dev/null +++ b/frontend/src/app/workspace/component/agent-panel/agent-registration/agent-registration.component.html @@ -0,0 +1,101 @@ + + +
+
+

Create New Agent

+

Select a model type and create an AI agent to assist with your workflows

+
+ +
+

Select Model Type

+
+ +

Loading available models...

+
+
+ +

No models available

+
+
+
+
+ +
+
+
{{ modelType.name }}
+

{{ modelType.description }}

+
+
+ +
+
+
+
+ +
+

Agent Name (Optional)

+ +
+ +
+ +
+
diff --git a/frontend/src/app/workspace/component/agent-panel/agent-registration/agent-registration.component.scss b/frontend/src/app/workspace/component/agent-panel/agent-registration/agent-registration.component.scss new file mode 100644 index 00000000000..639dcb78eb0 --- /dev/null +++ b/frontend/src/app/workspace/component/agent-panel/agent-registration/agent-registration.component.scss @@ -0,0 +1,147 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +.agent-registration-container { + display: flex; + flex-direction: column; + gap: 24px; + padding: 20px; + height: 100%; + overflow-y: auto; +} + +.registration-header { + text-align: center; + + h3 { + margin: 0 0 8px 0; + font-size: 20px; + font-weight: 600; + color: #262626; + } + + p { + margin: 0; + font-size: 14px; + color: #8c8c8c; + } +} + +.model-type-selection { + h4 { + margin: 0 0 12px 0; + font-size: 16px; + font-weight: 500; + color: #262626; + } +} + +.model-cards { + display: flex; + flex-direction: column; + gap: 12px; +} + +.model-card { + display: flex; + align-items: center; + gap: 16px; + padding: 16px; + border: 2px solid #d9d9d9; + border-radius: 8px; + cursor: pointer; + transition: all 0.3s ease; + position: relative; + + &:hover { + border-color: #1890ff; + box-shadow: 0 2px 8px rgba(24, 144, 255, 0.2); + } + + &.selected { + border-color: #1890ff; + background: #e6f7ff; + box-shadow: 0 2px 8px rgba(24, 144, 255, 0.3); + } +} + +.model-icon { + display: flex; + align-items: center; + justify-content: center; + width: 48px; + height: 48px; + background: #f0f0f0; + border-radius: 8px; + flex-shrink: 0; + + i { + font-size: 28px; + color: #1890ff; + } +} + +.model-info { + flex: 1; + + h5 { + margin: 0 0 4px 0; + font-size: 15px; + font-weight: 600; + color: #262626; + } + + p { + margin: 0; + font-size: 13px; + color: #8c8c8c; + line-height: 1.4; + } +} + +.selected-indicator { + flex-shrink: 0; + + i { + font-size: 24px; + color: #1890ff; + } +} + +.agent-name-input { + h4 { + margin: 0 0 8px 0; + font-size: 16px; + font-weight: 500; + color: #262626; + } + + input { + width: 100%; + } +} + +.action-buttons { + display: flex; + justify-content: center; + + button { + min-width: 200px; + } +} diff --git a/frontend/src/app/workspace/component/agent-panel/agent-registration/agent-registration.component.ts b/frontend/src/app/workspace/component/agent-panel/agent-registration/agent-registration.component.ts new file mode 100644 index 00000000000..4d9b69706e5 --- /dev/null +++ b/frontend/src/app/workspace/component/agent-panel/agent-registration/agent-registration.component.ts @@ -0,0 +1,112 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { Component, EventEmitter, OnDestroy, OnInit, Output } from "@angular/core"; +import { TexeraCopilotManagerService, ModelType } from "../../../service/copilot/texera-copilot-manager.service"; +import { NotificationService } from "../../../../common/service/notification/notification.service"; +import { Subject, takeUntil } from "rxjs"; + +@Component({ + selector: "texera-agent-registration", + templateUrl: "agent-registration.component.html", + styleUrls: ["agent-registration.component.scss"], +}) +export class AgentRegistrationComponent implements OnInit, OnDestroy { + @Output() agentCreated = new EventEmitter(); + + public modelTypes: ModelType[] = []; + public selectedModelType: string | null = null; + public customAgentName: string = ""; + public isLoadingModels: boolean = false; + public hasLoadingError: boolean = false; + + private destroy$ = new Subject(); + + constructor( + private copilotManagerService: TexeraCopilotManagerService, + private notificationService: NotificationService + ) {} + + ngOnInit(): void { + this.isLoadingModels = true; + this.hasLoadingError = false; + + this.copilotManagerService + .fetchModelTypes() + .pipe(takeUntil(this.destroy$)) + .subscribe({ + next: models => { + this.modelTypes = models; + this.isLoadingModels = false; + if (models.length === 0) { + this.hasLoadingError = true; + this.notificationService.error("No models available. Please check the LiteLLM configuration."); + } + }, + error: (error: unknown) => { + this.isLoadingModels = false; + this.hasLoadingError = true; + const errorMessage = error instanceof Error ? error.message : String(error); + this.notificationService.error(`Failed to fetch models: ${errorMessage}`); + }, + }); + } + + ngOnDestroy(): void { + this.destroy$.next(); + this.destroy$.complete(); + } + + public selectModelType(modelTypeId: string): void { + this.selectedModelType = modelTypeId; + } + + public isCreating: boolean = false; + + /** + * Create a new agent with the selected model type. + */ + public createAgent(): void { + if (!this.selectedModelType || this.isCreating) { + return; + } + + this.isCreating = true; + + this.copilotManagerService + .createAgent(this.selectedModelType, this.customAgentName || undefined) + .pipe(takeUntil(this.destroy$)) + .subscribe({ + next: agentInfo => { + this.agentCreated.emit(agentInfo.id); + this.selectedModelType = null; + this.customAgentName = ""; + this.isCreating = false; + }, + error: (error: unknown) => { + this.notificationService.error(`Failed to create agent: ${error}`); + this.isCreating = false; + }, + }); + } + + public canCreate(): boolean { + return this.selectedModelType !== null && !this.isCreating; + } +} diff --git a/frontend/src/app/workspace/component/workspace.component.html b/frontend/src/app/workspace/component/workspace.component.html index 2e662831a33..abe3d2a786f 100644 --- a/frontend/src/app/workspace/component/workspace.component.html +++ b/frontend/src/app/workspace/component/workspace.component.html @@ -33,5 +33,6 @@ + diff --git a/frontend/src/app/workspace/component/workspace.component.ts b/frontend/src/app/workspace/component/workspace.component.ts index 8958f08df10..14e1a937a0c 100644 --- a/frontend/src/app/workspace/component/workspace.component.ts +++ b/frontend/src/app/workspace/component/workspace.component.ts @@ -283,4 +283,8 @@ export class WorkspaceComponent implements AfterViewInit, OnInit, OnDestroy { public triggerCenter(): void { this.workflowActionService.getTexeraGraph().triggerCenterEvent(); } + + public get copilotEnabled(): boolean { + return this.config.env.copilotEnabled; + } } diff --git a/frontend/src/app/workspace/service/compile-workflow/workflow-compiling.service.ts b/frontend/src/app/workspace/service/compile-workflow/workflow-compiling.service.ts index 1b45f755994..9648d2b305f 100644 --- a/frontend/src/app/workspace/service/compile-workflow/workflow-compiling.service.ts +++ b/frontend/src/app/workspace/service/compile-workflow/workflow-compiling.service.ts @@ -148,6 +148,17 @@ export class WorkflowCompilingService { ); } + public getOperatorOutputSchemaMap(operatorID: string): OperatorPortSchemaMap | undefined { + if ( + this.currentCompilationStateInfo.state == CompilationState.Uninitialized || + !this.currentCompilationStateInfo.operatorOutputPortSchemaMap + ) { + return undefined; + } + + return this.currentCompilationStateInfo.operatorOutputPortSchemaMap[operatorID]; + } + public getPortInputSchema(operatorID: string, portIndex: number): PortSchema | undefined { return this.getOperatorInputSchemaMap(operatorID)?.[serializePortIdentity({ id: portIndex, internal: false })]; } diff --git a/frontend/src/app/workspace/service/copilot/copilot-prompts.ts b/frontend/src/app/workspace/service/copilot/copilot-prompts.ts new file mode 100644 index 00000000000..48842211308 --- /dev/null +++ b/frontend/src/app/workspace/service/copilot/copilot-prompts.ts @@ -0,0 +1,35 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +/** + * System prompts for Texera Copilot + */ + +export const COPILOT_SYSTEM_PROMPT = `# Texera Copilot + +You are Texera Copilot, an AI assistant for helping users do data science using Texera workflows. + +Your job is to leverage tools to help users understand Texera's functionalities, including what operators are available +and how to use them. + +You also need to help users understand the workflow they are currently working on. + +During the process, leverage tool calls whenever needed. Current available tools are all READ-ONLY. Thus you cannot edit +user's workflow. +`; diff --git a/frontend/src/app/workspace/service/copilot/texera-copilot-manager.service.spec.ts b/frontend/src/app/workspace/service/copilot/texera-copilot-manager.service.spec.ts new file mode 100644 index 00000000000..8f3820afce4 --- /dev/null +++ b/frontend/src/app/workspace/service/copilot/texera-copilot-manager.service.spec.ts @@ -0,0 +1,259 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { TestBed } from "@angular/core/testing"; +import { HttpClientTestingModule, HttpTestingController } from "@angular/common/http/testing"; +import { TexeraCopilotManagerService } from "./texera-copilot-manager.service"; +import { CopilotState } from "./texera-copilot"; +import { commonTestProviders } from "../../../common/testing/test-utils"; +import { AppSettings } from "../../../common/app-setting"; + +describe("TexeraCopilotManagerService", () => { + let service: TexeraCopilotManagerService; + let httpMock: HttpTestingController; + + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [HttpClientTestingModule], + providers: [TexeraCopilotManagerService, ...commonTestProviders], + }); + + service = TestBed.inject(TexeraCopilotManagerService); + httpMock = TestBed.inject(HttpTestingController); + }); + + afterEach(() => { + httpMock.verify(); + }); + + it("should be created", () => { + expect(service).toBeTruthy(); + }); + + describe("fetchModelTypes", () => { + it("should fetch and format model types", done => { + const mockResponse = { + data: [ + { id: "gpt-4", object: "model", created: 1234567890, owned_by: "openai" }, + { id: "claude-3", object: "model", created: 1234567891, owned_by: "anthropic" }, + ], + object: "list", + }; + + service.fetchModelTypes().subscribe(models => { + expect(models.length).toBe(2); + expect(models[0].id).toBe("gpt-4"); + expect(models[0].name).toBe("Gpt 4"); + expect(models[1].id).toBe("claude-3"); + expect(models[1].name).toBe("Claude 3"); + done(); + }); + + const req = httpMock.expectOne(`${AppSettings.getApiEndpoint()}/models`); + expect(req.request.method).toBe("GET"); + req.flush(mockResponse); + }); + + it("should handle fetch error gracefully", done => { + service.fetchModelTypes().subscribe(models => { + expect(models).toEqual([]); + done(); + }); + + const req = httpMock.expectOne(`${AppSettings.getApiEndpoint()}/models`); + req.error(new ProgressEvent("error")); + }); + + it("should cache model types with shareReplay", done => { + const mockResponse = { + data: [{ id: "gpt-4", object: "model", created: 1234567890, owned_by: "openai" }], + object: "list", + }; + + service.fetchModelTypes().subscribe(() => { + service.fetchModelTypes().subscribe(models => { + expect(models.length).toBe(1); + done(); + }); + }); + + const req = httpMock.expectOne(`${AppSettings.getApiEndpoint()}/models`); + req.flush(mockResponse); + }); + }); + + describe("getAllAgents", () => { + it("should return empty array initially", done => { + service.getAllAgents().subscribe(agents => { + expect(agents).toEqual([]); + done(); + }); + }); + }); + + describe("getAgentCount", () => { + it("should return 0 initially", done => { + service.getAgentCount().subscribe(count => { + expect(count).toBe(0); + done(); + }); + }); + }); + + describe("getAgent", () => { + it("should throw error when agent not found", done => { + service.getAgent("non-existent").subscribe({ + next: () => fail("Should have thrown error"), + error: (error: unknown) => { + expect((error as Error).message).toContain("not found"); + done(); + }, + }); + }); + }); + + describe("isAgentConnected", () => { + it("should return false for non-existent agent", done => { + service.isAgentConnected("non-existent").subscribe(connected => { + expect(connected).toBe(false); + done(); + }); + }); + }); + + describe("agent lifecycle management", () => { + it("should emit agent change event on agent creation", done => { + let eventEmitted = false; + + service.agentChange$.subscribe(() => { + eventEmitted = true; + }); + + setTimeout(() => { + expect(eventEmitted).toBe(false); + done(); + }, 100); + }); + }); + + describe("sendMessage", () => { + it("should throw error for non-existent agent", done => { + service.sendMessage("non-existent", "test message").subscribe({ + next: () => fail("Should have thrown error"), + error: (error: unknown) => { + expect((error as Error).message).toContain("not found"); + done(); + }, + }); + }); + }); + + describe("getAgentResponses", () => { + it("should throw error for non-existent agent", done => { + service.getAgentResponses("non-existent").subscribe({ + next: () => fail("Should have thrown error"), + error: (error: unknown) => { + expect((error as Error).message).toContain("not found"); + done(); + }, + }); + }); + }); + + describe("getAgentResponsesObservable", () => { + it("should throw error for non-existent agent", done => { + service.getReActStepsObservable("non-existent").subscribe({ + next: () => fail("Should have thrown error"), + error: (error: unknown) => { + expect((error as Error).message).toContain("not found"); + done(); + }, + }); + }); + }); + + describe("clearMessages", () => { + it("should throw error for non-existent agent", done => { + service.clearMessages("non-existent").subscribe({ + next: () => fail("Should have thrown error"), + error: (error: unknown) => { + expect((error as Error).message).toContain("not found"); + done(); + }, + }); + }); + }); + + describe("stopGeneration", () => { + it("should throw error for non-existent agent", done => { + service.stopGeneration("non-existent").subscribe({ + next: () => fail("Should have thrown error"), + error: (error: unknown) => { + expect((error as Error).message).toContain("not found"); + done(); + }, + }); + }); + }); + + describe("getAgentState", () => { + it("should throw error for non-existent agent", done => { + service.getAgentState("non-existent").subscribe({ + next: () => fail("Should have thrown error"), + error: (error: unknown) => { + expect((error as Error).message).toContain("not found"); + done(); + }, + }); + }); + }); + + describe("getAgentStateObservable", () => { + it("should throw error for non-existent agent", done => { + service.getAgentStateObservable("non-existent").subscribe({ + next: () => fail("Should have thrown error"), + error: (error: unknown) => { + expect((error as Error).message).toContain("not found"); + done(); + }, + }); + }); + }); + + describe("getSystemInfo", () => { + it("should throw error for non-existent agent", done => { + service.getSystemInfo("non-existent").subscribe({ + next: () => fail("Should have thrown error"), + error: (error: unknown) => { + expect((error as Error).message).toContain("not found"); + done(); + }, + }); + }); + }); + + describe("deleteAgent", () => { + it("should return false for non-existent agent", done => { + service.deleteAgent("non-existent").subscribe(deleted => { + expect(deleted).toBe(false); + done(); + }); + }); + }); +}); diff --git a/frontend/src/app/workspace/service/copilot/texera-copilot-manager.service.ts b/frontend/src/app/workspace/service/copilot/texera-copilot-manager.service.ts new file mode 100644 index 00000000000..ab7d393265f --- /dev/null +++ b/frontend/src/app/workspace/service/copilot/texera-copilot-manager.service.ts @@ -0,0 +1,248 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { Injectable, Injector } from "@angular/core"; +import { HttpClient } from "@angular/common/http"; +import { TexeraCopilot, ReActStep, CopilotState } from "./texera-copilot"; +import { Observable, Subject, catchError, map, of, shareReplay, tap, defer, throwError, switchMap } from "rxjs"; +import { AppSettings } from "../../../common/app-setting"; + +export interface AgentInfo { + id: string; + name: string; + modelType: string; + instance: TexeraCopilot; + createdAt: Date; +} + +export interface ModelType { + id: string; + name: string; + description: string; + icon: string; +} + +interface LiteLLMModel { + id: string; + object: string; + created: number; + owned_by: string; +} + +interface LiteLLMModelsResponse { + data: LiteLLMModel[]; + object: string; +} + +/** + * Texera Copilot Manager Service manages multiple AI agent instances for workflow assistance. + * + * This service provides centralized management for multiple copilot agents, allowing users to: + * 1. Create and delete multiple agent instances with different LLM models + * 2. Route messages to specific agents + * 3. Track agent states and conversation history + * 4. Query available LLM models from the backend + * + * Each agent is a separate TexeraCopilot instance with its own: + * - Model configuration (e.g., GPT-4, Claude, etc.) + * - Conversation history + * - State (available, generating, stopping, unavailable) + * + * The service acts as a registry and coordinator, ensuring proper lifecycle management + * and providing observable streams for agent changes and state updates. + */ +@Injectable({ + providedIn: "root", +}) +export class TexeraCopilotManagerService { + private agents = new Map(); + private agentCounter = 0; + private agentChangeSubject = new Subject(); + public agentChange$ = this.agentChangeSubject.asObservable(); + + private modelTypes$: Observable | null = null; + + constructor( + private injector: Injector, + private http: HttpClient + ) {} + + public createAgent(modelType: string, customName?: string): Observable { + return defer(() => { + const agentId = `agent-${++this.agentCounter}`; + const agentName = customName || `Agent ${this.agentCounter}`; + + const agentInstance = this.createCopilotInstance(modelType); + agentInstance.setAgentInfo(agentName); + + return agentInstance.initialize().pipe( + map(() => { + const agentInfo: AgentInfo = { + id: agentId, + name: agentName, + modelType, + instance: agentInstance, + createdAt: new Date(), + }; + + this.agents.set(agentId, agentInfo); + this.agentChangeSubject.next(); + + return agentInfo; + }), + catchError((error: unknown) => { + return throwError(() => error); + }) + ); + }); + } + + /** + * Helper method to get an agent and execute a callback with it. + * Handles agent lookup and error throwing if not found. + */ + private withAgent(agentId: string, callback: (agent: AgentInfo) => Observable): Observable { + return defer(() => { + const agent = this.agents.get(agentId); + if (!agent) { + return throwError(() => new Error(`Agent with ID ${agentId} not found`)); + } + return callback(agent); + }); + } + + public getAgent(agentId: string): Observable { + return this.withAgent(agentId, agent => of(agent)); + } + + public getAllAgents(): Observable { + return of(Array.from(this.agents.values())); + } + public deleteAgent(agentId: string): Observable { + return defer(() => { + const agent = this.agents.get(agentId); + if (!agent) { + return of(false); + } + + return agent.instance.disconnect().pipe( + map(() => { + this.agents.delete(agentId); + this.agentChangeSubject.next(); + return true; + }) + ); + }); + } + + public fetchModelTypes(): Observable { + if (!this.modelTypes$) { + this.modelTypes$ = this.http.get(`${AppSettings.getApiEndpoint()}/models`).pipe( + map(response => + response.data.map((model: LiteLLMModel) => ({ + id: model.id, + name: this.formatModelName(model.id), + description: `Model: ${model.id}`, + icon: "robot", + })) + ), + catchError((error: unknown) => { + console.error("Failed to fetch models from API:", error); + return of([]); + }), + shareReplay(1) + ); + } + return this.modelTypes$; + } + + private formatModelName(modelId: string): string { + return modelId + .split("-") + .map(word => word.charAt(0).toUpperCase() + word.slice(1)) + .join(" "); + } + + public getAgentCount(): Observable { + return of(this.agents.size); + } + public sendMessage(agentId: string, message: string): Observable { + return this.withAgent(agentId, agent => agent.instance.sendMessage(message)); + } + + public getReActStepsObservable(agentId: string): Observable { + return this.withAgent(agentId, agent => agent.instance.reActSteps$); + } + + public getAgentResponses(agentId: string): Observable { + return this.withAgent(agentId, agent => of(agent.instance.getReActSteps())); + } + + public clearMessages(agentId: string): Observable { + return this.withAgent(agentId, agent => { + agent.instance.clearMessages(); + return of(undefined); + }); + } + + public stopGeneration(agentId: string): Observable { + return this.withAgent(agentId, agent => { + agent.instance.stopGeneration(); + return of(undefined); + }); + } + + public getAgentState(agentId: string): Observable { + return this.withAgent(agentId, agent => of(agent.instance.getState())); + } + + public getAgentStateObservable(agentId: string): Observable { + return this.withAgent(agentId, agent => agent.instance.state$); + } + + public isAgentConnected(agentId: string): Observable { + return this.withAgent(agentId, agent => of(agent.instance.isConnected())).pipe(catchError(() => of(false))); + } + + public getSystemInfo( + agentId: string + ): Observable<{ systemPrompt: string; tools: Array<{ name: string; description: string; inputSchema: any }> }> { + return this.withAgent(agentId, agent => + of({ + systemPrompt: agent.instance.getSystemPrompt(), + tools: agent.instance.getToolsInfo(), + }) + ); + } + private createCopilotInstance(modelType: string): TexeraCopilot { + const childInjector = Injector.create({ + providers: [ + { + provide: TexeraCopilot, + }, + ], + parent: this.injector, + }); + + const copilotInstance = childInjector.get(TexeraCopilot); + copilotInstance.setModelType(modelType); + + return copilotInstance; + } +} diff --git a/frontend/src/app/workspace/service/copilot/texera-copilot.spec.ts b/frontend/src/app/workspace/service/copilot/texera-copilot.spec.ts new file mode 100644 index 00000000000..dd5a7e5bb6a --- /dev/null +++ b/frontend/src/app/workspace/service/copilot/texera-copilot.spec.ts @@ -0,0 +1,189 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { TestBed } from "@angular/core/testing"; +import { TexeraCopilot, CopilotState } from "./texera-copilot"; +import { WorkflowActionService } from "../workflow-graph/model/workflow-action.service"; +import { WorkflowUtilService } from "../workflow-graph/util/workflow-util.service"; +import { OperatorMetadataService } from "../operator-metadata/operator-metadata.service"; +import { WorkflowCompilingService } from "../compile-workflow/workflow-compiling.service"; +import { NotificationService } from "../../../common/service/notification/notification.service"; +import { commonTestProviders } from "../../../common/testing/test-utils"; + +describe("TexeraCopilot", () => { + let service: TexeraCopilot; + let mockWorkflowActionService: jasmine.SpyObj; + let mockWorkflowUtilService: jasmine.SpyObj; + let mockOperatorMetadataService: jasmine.SpyObj; + let mockWorkflowCompilingService: jasmine.SpyObj; + let mockNotificationService: jasmine.SpyObj; + + beforeEach(() => { + mockWorkflowActionService = jasmine.createSpyObj("WorkflowActionService", ["getTexeraGraph"]); + mockWorkflowUtilService = jasmine.createSpyObj("WorkflowUtilService", ["getOperatorTypeList"]); + mockOperatorMetadataService = jasmine.createSpyObj("OperatorMetadataService", ["getOperatorSchema"]); + mockWorkflowCompilingService = jasmine.createSpyObj("WorkflowCompilingService", [ + "getOperatorInputSchemaMap", + "getOperatorOutputSchemaMap", + ]); + mockNotificationService = jasmine.createSpyObj("NotificationService", ["info", "error"]); + + TestBed.configureTestingModule({ + providers: [ + TexeraCopilot, + { provide: WorkflowActionService, useValue: mockWorkflowActionService }, + { provide: WorkflowUtilService, useValue: mockWorkflowUtilService }, + { provide: OperatorMetadataService, useValue: mockOperatorMetadataService }, + { provide: WorkflowCompilingService, useValue: mockWorkflowCompilingService }, + { provide: NotificationService, useValue: mockNotificationService }, + ...commonTestProviders, + ], + }); + + service = TestBed.inject(TexeraCopilot); + }); + + it("should be created", () => { + expect(service).toBeTruthy(); + }); + + it("should set agent info correctly", () => { + service.setAgentInfo("Test Agent"); + expect(service).toBeTruthy(); + }); + + it("should set model type correctly", () => { + service.setModelType("gpt-4"); + expect(service).toBeTruthy(); + }); + + it("should have initial state as UNAVAILABLE", () => { + expect(service.getState()).toBe(CopilotState.UNAVAILABLE); + }); + + it("should update state correctly", done => { + service.state$.subscribe(state => { + if (state === CopilotState.UNAVAILABLE) { + expect(state).toBe(CopilotState.UNAVAILABLE); + done(); + } + }); + }); + + it("should clear messages correctly", () => { + service.clearMessages(); + expect(service.getReActSteps().length).toBe(0); + }); + + it("should stop generation when in GENERATING state", () => { + service.stopGeneration(); + expect(service).toBeTruthy(); + }); + + it("should return system prompt", () => { + const prompt = service.getSystemPrompt(); + expect(prompt).toBeTruthy(); + expect(typeof prompt).toBe("string"); + }); + + it("should return tools info", done => { + // Tools are only created after initialize() is called + service.initialize().subscribe(() => { + const tools = service.getToolsInfo(); + expect(tools).toBeTruthy(); + expect(Array.isArray(tools)).toBe(true); + expect(tools.length).toBeGreaterThan(0); + tools.forEach(tool => { + expect(tool.name).toBeTruthy(); + expect(tool.description).toBeTruthy(); + }); + done(); + }); + }); + + it("should check if connected", () => { + expect(service.isConnected()).toBe(false); + }); + + it("should emit agent responses correctly", done => { + service.reActSteps$.subscribe(responses => { + if (responses.length > 0) { + expect(responses[0].role).toBe("user"); + expect(responses[0].content).toBe("test message"); + done(); + } + }); + + // emitReActStep signature: (messageId, stepId, role, content, isBegin, isEnd, toolCalls?, toolResults?, usage?, operatorAccess?) + (service as any).emitReActStep("test-id", 0, "user", "test message", true, true); + }); + + it("should return empty agent responses initially", () => { + const responses = service.getReActSteps(); + expect(responses).toEqual([]); + }); + + describe("disconnect", () => { + it("should disconnect and clear state", done => { + service.disconnect().subscribe(() => { + expect(service.getState()).toBe(CopilotState.UNAVAILABLE); + expect(service.getReActSteps().length).toBe(0); + done(); + }); + }); + + it("should show notification on disconnect", done => { + service.setAgentInfo("Test Agent"); + service.disconnect().subscribe(() => { + expect(mockNotificationService.info).toHaveBeenCalled(); + done(); + }); + }); + }); + + describe("state management", () => { + it("should transition from UNAVAILABLE to GENERATING to AVAILABLE", done => { + const states: CopilotState[] = []; + + service.state$.subscribe(state => { + states.push(state); + if (states.length === 1) { + expect(states[0]).toBe(CopilotState.UNAVAILABLE); + done(); + } + }); + }); + }); + + describe("workflow tools", () => { + it("should create workflow tools correctly", () => { + const tools = (service as any).createWorkflowTools(); + expect(tools).toBeTruthy(); + expect(typeof tools).toBe("object"); + // Tool names match the constants in the tool files + expect(tools.listAllOperatorTypes).toBeTruthy(); + expect(tools.listOperatorsInCurrentWorkflow).toBeTruthy(); + expect(tools.listCurrentLinks).toBeTruthy(); + expect(tools.getCurrentOperator).toBeTruthy(); + expect(tools.getOperatorPropertiesSchema).toBeTruthy(); + expect(tools.getOperatorPortsInfo).toBeTruthy(); + expect(tools.getOperatorMetadata).toBeTruthy(); + }); + }); +}); diff --git a/frontend/src/app/workspace/service/copilot/texera-copilot.ts b/frontend/src/app/workspace/service/copilot/texera-copilot.ts new file mode 100644 index 00000000000..cb7cc91e111 --- /dev/null +++ b/frontend/src/app/workspace/service/copilot/texera-copilot.ts @@ -0,0 +1,388 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { Injectable } from "@angular/core"; +import { BehaviorSubject, Observable, from, of, throwError, defer } from "rxjs"; +import { map, catchError, tap, switchMap, finalize } from "rxjs/operators"; +import { WorkflowActionService } from "../workflow-graph/model/workflow-action.service"; +import { toolWithTimeout } from "./tool/tools-utility"; +import * as CurrentWorkflowTools from "./tool/current-workflow-editing-observing-tools"; +import * as MetadataTools from "./tool/workflow-metadata-tools"; +import { ToolOperatorAccess, parseOperatorAccessFromStep } from "./tool/react-step-operator-parser"; +import { OperatorMetadataService } from "../operator-metadata/operator-metadata.service"; +import { createOpenAI } from "@ai-sdk/openai"; +import { generateText, type ModelMessage, stepCountIs } from "ai"; +import { WorkflowUtilService } from "../workflow-graph/util/workflow-util.service"; +import { AppSettings } from "../../../common/app-setting"; +import { WorkflowCompilingService } from "../compile-workflow/workflow-compiling.service"; +import { COPILOT_SYSTEM_PROMPT } from "./copilot-prompts"; +import { NotificationService } from "../../../common/service/notification/notification.service"; + +export enum CopilotState { + UNAVAILABLE = "Unavailable", + AVAILABLE = "Available", + GENERATING = "Generating", + STOPPING = "Stopping", +} + +/** + * Represents a single step in the ReAct (Reasoning and Acting) conversation flow. + * Each step can be either a user message or an agent response with potential tool calls. + */ +export interface ReActStep { + messageId: string; + stepId: number; + role: "user" | "agent"; + content: string; + isBegin: boolean; + isEnd: boolean; + timestamp: number; + toolCalls?: any[]; + toolResults?: any[]; + usage?: { + inputTokens?: number; + outputTokens?: number; + totalTokens?: number; + cachedInputTokens?: number; + }; + /** + * Map from tool call index to operator access information, which tracks operators were viewed or modified during the tool call. + */ + operatorAccess?: Map; +} + +/** + * Texera Copilot Service provides AI-powered assistance for workflow creation and manipulation. + * + * This service manages a single AI agent instance that can: + * 1. Interact with users through natural language messages + * 2. Execute workflow operations using specialized tools + * 3. Maintain conversation history and state + * + * The service communicates with an LLM backend (via LiteLLM) to generate responses and uses + * workflow tools to perform actions like listing operators, getting operator schemas, and + * manipulating workflow components. + * + * State management includes: + * - UNAVAILABLE: Agent not initialized + * - AVAILABLE: Agent ready to receive messages + * - GENERATING: Agent currently processing and generating response + * - STOPPING: Agent in the process of stopping generation + */ +@Injectable() +export class TexeraCopilot { + /** + * Maximum number of ReAct reasoning/action cycles allowed per generation. + * Prevents infinite loops and excessive token usage. + */ + private static readonly MAX_REACT_STEPS = 50; + + private model: any; + private modelType = ""; + private agentName = ""; + + /** + * Conversation history in LLM API format. + * Used internally to maintain context for generateText() API calls. + * Contains the raw message format expected by the AI model. + */ + private messages: ModelMessage[] = []; + + /** + * Representing a step in ReAct (Reasoning + Acting). + * This is what gets displayed in the UI to show the agent's reasoning process. + * Each step contains messageId (randomly generated UUID) and stepId (incremental from 0). + */ + private reActSteps: ReActStep[] = []; + private reActStepsSubject = new BehaviorSubject([]); + public reActSteps$ = this.reActStepsSubject.asObservable(); + + private state = CopilotState.UNAVAILABLE; + private stateSubject = new BehaviorSubject(CopilotState.UNAVAILABLE); + public state$ = this.stateSubject.asObservable(); + private tools: Record = {}; + + constructor( + private workflowActionService: WorkflowActionService, + private workflowUtilService: WorkflowUtilService, + private operatorMetadataService: OperatorMetadataService, + private workflowCompilingService: WorkflowCompilingService, + private notificationService: NotificationService + ) {} + + public setAgentInfo(agentName: string): void { + this.agentName = agentName; + } + + public setModelType(modelType: string): void { + this.modelType = modelType; + } + + private setState(newState: CopilotState): void { + this.state = newState; + this.stateSubject.next(newState); + } + + private emitReActStep( + messageId: string, + stepId: number, + role: "user" | "agent", + content: string, + isBegin: boolean, + isEnd: boolean, + toolCalls?: any[], + toolResults?: any[], + usage?: ReActStep["usage"], + operatorAccess?: Map + ): void { + this.reActSteps.push({ + messageId, + stepId, + role, + content, + isBegin, + isEnd, + timestamp: Date.now(), + toolCalls, + toolResults, + usage, + operatorAccess, + }); + this.reActStepsSubject.next([...this.reActSteps]); + } + + public initialize(): Observable { + return defer(() => { + try { + this.model = createOpenAI({ + baseURL: new URL(`${AppSettings.getApiEndpoint()}`, document.baseURI).toString(), + // apiKey is required by the library for creating the OpenAI compatible client; + // For security reason, we store the apiKey at the backend, thus the value is dummy here. + apiKey: "dummy", + }).chat(this.modelType); + + // Create tools once during initialization + this.tools = this.createWorkflowTools(); + + this.setState(CopilotState.AVAILABLE); + return of(undefined); + } catch (error: unknown) { + this.setState(CopilotState.UNAVAILABLE); + return throwError(() => error); + } + }); + } + + public sendMessage(message: string): Observable { + return defer(() => { + if (!this.model) { + return throwError(() => new Error("Copilot not initialized")); + } + + if (this.state !== CopilotState.AVAILABLE) { + return throwError(() => new Error(`Cannot send message: agent is ${this.state}`)); + } + + this.setState(CopilotState.GENERATING); + + // Generate unique message ID for this conversation turn + const messageId = crypto.randomUUID(); + let stepId = 0; + + // Emit user message as first step + this.emitReActStep(messageId, stepId++, "user", message, true, true); + this.messages.push({ role: "user", content: message }); + + let isFirstStep = true; + + /** + * Generate text using the AI model with ReAct (Reasoning + Acting) pattern. + * This is the core of the agent lifecycle with several callbacks: + * + * Lifecycle flow: + * 1. generateText() starts the LLM generation + * 2. stopWhen() - checked before each step to determine if generation should stop + * 3. onStepFinish() - called DURING generation after each reasoning/action step (real-time updates) + * 4. pipe operators - executed AFTER generation completes (final processing) + */ + return from( + generateText({ + model: this.model, + messages: this.messages, + tools: this.tools, + system: COPILOT_SYSTEM_PROMPT, + /** + * stopWhen - Determines if generation should stop. + * Called before each step during generation. + * Returns true to stop, false to continue. + */ + stopWhen: ({ steps }) => { + if (this.state === CopilotState.STOPPING) { + this.notificationService.info(`Agent ${this.agentName} has stopped generation`); + return true; + } + // Stop if step count reaches max limit to prevent infinite loops + return stepCountIs(TexeraCopilot.MAX_REACT_STEPS)({ steps }); + }, + /** + * onStepFinish is called DURING generation after each ReAct step completes. + * This provides real-time updates to the UI as the agent reasons and acts. + * + * Each step may include: + * - text: The agent's reasoning or response text + * - toolCalls: Tools the agent decided to call + * - toolResults: Results from executed tools + * - usage: Token usage for this step + * + * Note: This is called multiple times during a single generation, + * once per reasoning/action cycle. + */ + onStepFinish: ({ text, toolCalls, toolResults, usage }) => { + if (this.state === CopilotState.STOPPING) { + return; + } + + // Parse operator access from tool results to track viewed/modified operators + const operatorAccess = parseOperatorAccessFromStep(toolCalls || [], toolResults || []); + + this.emitReActStep( + messageId, + stepId++, + "agent", + text || "", + isFirstStep, + false, + toolCalls, + toolResults, + usage as any, + operatorAccess + ); + isFirstStep = false; + }, + }) + ).pipe( + /** + * To this point, generateText has finished. + * All the responses from AI are recorded in responses variable. + */ + tap(({ response }) => { + this.messages.push(...response.messages); + this.reActStepsSubject.next([...this.reActSteps]); + }), + map(() => undefined), + catchError((err: unknown) => { + const errorText = `Error: ${err instanceof Error ? err.message : String(err)}`; + this.messages.push({ role: "assistant", content: errorText }); + this.emitReActStep(messageId, stepId++, "agent", errorText, false, true); + return throwError(() => err); + }), + /** + * Resets agent state back to AVAILABLE so it can handle new messages. + */ + finalize(() => { + this.setState(CopilotState.AVAILABLE); + }) + ); + }); + } + + private createWorkflowTools(): Record { + const listOperatorsInCurrentWorkflowTool = toolWithTimeout( + CurrentWorkflowTools.createListOperatorsInCurrentWorkflowTool(this.workflowActionService) + ); + const listLinksTool = toolWithTimeout(CurrentWorkflowTools.createListCurrentLinksTool(this.workflowActionService)); + const listAllOperatorTypesTool = toolWithTimeout( + MetadataTools.createListAllOperatorTypesTool(this.workflowUtilService) + ); + const getOperatorTool = toolWithTimeout( + CurrentWorkflowTools.createGetCurrentOperatorTool(this.workflowActionService, this.workflowCompilingService) + ); + const getOperatorPropertiesSchemaTool = toolWithTimeout( + MetadataTools.createGetOperatorPropertiesSchemaTool(this.operatorMetadataService) + ); + const getOperatorPortsInfoTool = toolWithTimeout( + MetadataTools.createGetOperatorPortsInfoTool(this.operatorMetadataService) + ); + const getOperatorMetadataTool = toolWithTimeout( + MetadataTools.createGetOperatorMetadataTool(this.operatorMetadataService) + ); + + return { + [MetadataTools.TOOL_NAME_LIST_ALL_OPERATOR_TYPES]: listAllOperatorTypesTool, + [CurrentWorkflowTools.TOOL_NAME_LIST_OPERATORS_IN_CURRENT_WORKFLOW]: listOperatorsInCurrentWorkflowTool, + [CurrentWorkflowTools.TOOL_NAME_LIST_CURRENT_LINKS]: listLinksTool, + [CurrentWorkflowTools.TOOL_NAME_GET_CURRENT_OPERATOR]: getOperatorTool, + [MetadataTools.TOOL_NAME_GET_OPERATOR_PROPERTIES_SCHEMA]: getOperatorPropertiesSchemaTool, + [MetadataTools.TOOL_NAME_GET_OPERATOR_PORTS_INFO]: getOperatorPortsInfoTool, + [MetadataTools.TOOL_NAME_GET_OPERATOR_METADATA]: getOperatorMetadataTool, + }; + } + + public getReActSteps(): ReActStep[] { + return [...this.reActSteps]; + } + + public stopGeneration(): void { + if (this.state !== CopilotState.GENERATING) { + return; + } + this.setState(CopilotState.STOPPING); + } + + public clearMessages(): void { + this.messages = []; + this.reActSteps = []; + this.reActStepsSubject.next([]); + } + + public getState(): CopilotState { + return this.state; + } + + public disconnect(): Observable { + return defer(() => { + if (this.state === CopilotState.GENERATING) { + this.stopGeneration(); + } + + this.clearMessages(); + this.tools = {}; // Clear tools to free memory + this.setState(CopilotState.UNAVAILABLE); + this.notificationService.info(`Agent ${this.agentName} is removed successfully`); + + return of(undefined); + }); + } + + public isConnected(): boolean { + return this.state !== CopilotState.UNAVAILABLE; + } + + public getSystemPrompt(): string { + return COPILOT_SYSTEM_PROMPT; + } + + public getToolsInfo(): Array<{ name: string; description: string; inputSchema: any }> { + return Object.entries(this.tools).map(([name, tool]) => ({ + name: name, + description: tool.description || "No description available", + inputSchema: tool.parameters || {}, + })); + } +} diff --git a/frontend/src/app/workspace/service/copilot/tool/current-workflow-editing-observing-tools.ts b/frontend/src/app/workspace/service/copilot/tool/current-workflow-editing-observing-tools.ts new file mode 100644 index 00000000000..c67a7b1707c --- /dev/null +++ b/frontend/src/app/workspace/service/copilot/tool/current-workflow-editing-observing-tools.ts @@ -0,0 +1,127 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { z } from "zod"; +import { tool } from "ai"; +import { WorkflowActionService } from "../../workflow-graph/model/workflow-action.service"; +import { OperatorMetadataService } from "../../operator-metadata/operator-metadata.service"; +import { OperatorLink } from "../../../types/workflow-common.interface"; +import { WorkflowUtilService } from "../../workflow-graph/util/workflow-util.service"; +import { WorkflowCompilingService } from "../../compile-workflow/workflow-compiling.service"; +import { ValidationWorkflowService } from "../../validation/validation-workflow.service"; +import { createSuccessResult, createErrorResult } from "./tools-utility"; + +// Tool name constants +export const TOOL_NAME_LIST_OPERATORS_IN_CURRENT_WORKFLOW = "listOperatorsInCurrentWorkflow"; +export const TOOL_NAME_LIST_CURRENT_LINKS = "listCurrentLinks"; +export const TOOL_NAME_GET_CURRENT_OPERATOR = "getCurrentOperator"; + +/** + * Create listLinksInCurrentWorkflow tool for getting all links in the workflow + */ +export function createListCurrentLinksTool(workflowActionService: WorkflowActionService) { + return tool({ + name: TOOL_NAME_LIST_CURRENT_LINKS, + description: "Get all links in the current workflow", + inputSchema: z.object({}), + execute: async () => { + try { + const links = workflowActionService.getTexeraGraph().getAllLinks(); + return createSuccessResult( + { + links: links, + count: links.length, + }, + [], + [] + ); + } catch (error: any) { + return createErrorResult(error.message); + } + }, + }); +} + +export function createListOperatorsInCurrentWorkflowTool(workflowActionService: WorkflowActionService) { + return tool({ + name: TOOL_NAME_LIST_OPERATORS_IN_CURRENT_WORKFLOW, + description: "Get all operator IDs, types and custom names in the current workflow", + inputSchema: z.object({}), + execute: async () => { + try { + const operators = workflowActionService.getTexeraGraph().getAllOperators(); + const operatorIds = operators.map(op => op.operatorID); + return createSuccessResult( + { + operators: operators.map(op => ({ + operatorId: op.operatorID, + operatorType: op.operatorType, + customDisplayName: op.customDisplayName, + })), + count: operators.length, + }, + operatorIds, + [] + ); + } catch (error: any) { + return createErrorResult(error.message); + } + }, + }); +} + +export function createGetCurrentOperatorTool( + workflowActionService: WorkflowActionService, + workflowCompilingService: WorkflowCompilingService +) { + return tool({ + name: TOOL_NAME_GET_CURRENT_OPERATOR, + description: + "Get detailed information about a specific operator in the current workflow, including its input and output schemas", + inputSchema: z.object({ + operatorId: z.string().describe("ID of the operator to retrieve"), + }), + execute: async (args: { operatorId: string }) => { + try { + const operator = workflowActionService.getTexeraGraph().getOperator(args.operatorId); + + // Get input schema (empty map if not available) + const inputSchemaMap = workflowCompilingService.getOperatorInputSchemaMap(args.operatorId); + const inputSchema = inputSchemaMap || {}; + + // Get output schema (empty map if not available) + const outputSchemaMap = workflowCompilingService.getOperatorOutputSchemaMap(args.operatorId); + const outputSchema = outputSchemaMap || {}; + + return createSuccessResult( + { + operator: operator, + inputSchema: inputSchema, + outputSchema: outputSchema, + message: `Retrieved operator ${args.operatorId}`, + }, + [args.operatorId], + [] + ); + } catch (error: any) { + return createErrorResult(error.message || `Operator ${args.operatorId} not found`); + } + }, + }); +} diff --git a/frontend/src/app/workspace/service/copilot/tool/react-step-operator-parser.ts b/frontend/src/app/workspace/service/copilot/tool/react-step-operator-parser.ts new file mode 100644 index 00000000000..2477a21579d --- /dev/null +++ b/frontend/src/app/workspace/service/copilot/tool/react-step-operator-parser.ts @@ -0,0 +1,152 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +/** + * Central parser module to extract operator access information from tool results. + * Tools should populate viewedOperatorIds and modifiedOperatorIds in their results. + */ + +/** + * Operator access information indicating which operators were viewed or modified. + * Tools should populate these fields in their results to indicate operator interaction. + */ +export interface ToolOperatorAccess { + viewedOperatorIds: string[]; + modifiedOperatorIds: string[]; +} + +/** + * Parse operator access from a tool call's result. + * Tools should populate viewedOperatorIds and modifiedOperatorIds in their results. + * + * @param toolCall - The tool call object containing toolName and args + * @param toolResult - The tool result object containing the output/result with operator IDs + * @returns ToolOperatorAccess object with viewedOperatorIds and modifiedOperatorIds + */ +export function parseOperatorAccessFromToolCall(toolCall: any, toolResult?: any): ToolOperatorAccess { + const access: ToolOperatorAccess = { viewedOperatorIds: [], modifiedOperatorIds: [] }; + + if (!toolResult || !toolResult.output) { + return access; + } + + try { + const output = toolResult.output; + + // Extract viewedOperatorIds from tool result + if (Array.isArray(output.viewedOperatorIds)) { + access.viewedOperatorIds = output.viewedOperatorIds.filter((id: any) => id && typeof id === "string"); + } + + // Extract modifiedOperatorIds from tool result + if (Array.isArray(output.modifiedOperatorIds)) { + access.modifiedOperatorIds = output.modifiedOperatorIds.filter((id: any) => id && typeof id === "string"); + } + + // Remove duplicates + access.viewedOperatorIds = [...new Set(access.viewedOperatorIds)]; + access.modifiedOperatorIds = [...new Set(access.modifiedOperatorIds)]; + } catch (error) { + console.error("Error parsing operator access from tool result:", error); + } + + return access; +} + +/** + * Parse operator access for all tool calls in a step. + * + * @param toolCalls - Array of tool call objects + * @param toolResults - Array of corresponding tool result objects + * @returns Map from tool call index to ToolOperatorAccess + */ +export function parseOperatorAccessFromStep(toolCalls: any[], toolResults?: any[]): Map { + const accessMap = new Map(); + + if (!toolCalls || toolCalls.length === 0) { + return accessMap; + } + + for (let i = 0; i < toolCalls.length; i++) { + const toolCall = toolCalls[i]; + const toolResult = toolResults && toolResults[i] ? toolResults[i] : undefined; + const access = parseOperatorAccessFromToolCall(toolCall, toolResult); + + // Only add to map if there are any viewed or modified operations + if (access.viewedOperatorIds.length > 0 || access.modifiedOperatorIds.length > 0) { + accessMap.set(i, access); + } + } + + return accessMap; +} + +/** + * Extract all viewed operator IDs from a ReActStep. + * + * @param step - The ReActStep to extract from + * @returns Array of unique operator IDs that were viewed + */ +export function getAllViewedOperatorIds(step: { operatorAccess?: Map }): string[] { + if (!step.operatorAccess) { + return []; + } + + const allViewedIds: string[] = []; + for (const access of step.operatorAccess.values()) { + allViewedIds.push(...access.viewedOperatorIds); + } + + // Return unique operator IDs + return [...new Set(allViewedIds)]; +} + +/** + * Extract all modified operator IDs from a ReActStep. + * + * @param step - The ReActStep to extract from + * @returns Array of unique operator IDs that were modified + */ +export function getAllModifiedOperatorIds(step: { operatorAccess?: Map }): string[] { + if (!step.operatorAccess) { + return []; + } + + const allModifiedIds: string[] = []; + for (const access of step.operatorAccess.values()) { + allModifiedIds.push(...access.modifiedOperatorIds); + } + + // Return unique operator IDs + return [...new Set(allModifiedIds)]; +} + +/** + * Extract all operator IDs (both viewed and modified) from a ReActStep. + * + * @param step - The ReActStep to extract from + * @returns Array of unique operator IDs involved in this step + */ +export function getAllOperatorIds(step: { operatorAccess?: Map }): string[] { + const viewedIds = getAllViewedOperatorIds(step); + const modifiedIds = getAllModifiedOperatorIds(step); + + // Combine and return unique IDs + return [...new Set([...viewedIds, ...modifiedIds])]; +} diff --git a/frontend/src/app/workspace/service/copilot/tool/tools-utility.ts b/frontend/src/app/workspace/service/copilot/tool/tools-utility.ts new file mode 100644 index 00000000000..f098bd1d91c --- /dev/null +++ b/frontend/src/app/workspace/service/copilot/tool/tools-utility.ts @@ -0,0 +1,138 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +// Tool execution timeout in milliseconds (2 minutes) +export const TOOL_TIMEOUT_MS = 120000; + +// Maximum token limit for operator result data to prevent overwhelming LLM context +// Estimated as characters / 4 (common approximation for token counting) +export const MAX_OPERATOR_RESULT_TOKEN_LIMIT = 1000; + +/** + * Base interface for all tool execution results. + * Ensures consistent structure across all tools with required tracking fields. + */ +export interface BaseToolResult { + /** + * Indicates whether the tool execution was successful. + */ + success: boolean; + + /** + * Error message if the tool execution failed. + */ + error?: string; + + /** + * List of operator IDs that were viewed/read during tool execution. + * Empty array if no operators were viewed. + */ + viewedOperatorIds: string[]; + + /** + * List of operator IDs that were modified/written during tool execution. + * Empty array if no operators were modified. + */ + modifiedOperatorIds: string[]; +} + +/** + * Creates a successful tool result with default values for required fields. + * Tools can extend this with additional custom fields. + * + * @param data - Custom data fields for the tool result + * @param viewedOperatorIds - Operator IDs that were viewed (default: []) + * @param modifiedOperatorIds - Operator IDs that were modified (default: []) + * @returns BaseToolResult with success=true and provided data + */ +export function createSuccessResult>( + data: T, + viewedOperatorIds: string[] = [], + modifiedOperatorIds: string[] = [] +): BaseToolResult & T { + return { + success: true, + viewedOperatorIds, + modifiedOperatorIds, + ...data, + }; +} + +/** + * Creates a failed tool result with an error message. + * + * @param error - Error message describing the failure + * @returns BaseToolResult with success=false and error message + */ +export function createErrorResult(error: string): BaseToolResult { + return { + success: false, + error, + viewedOperatorIds: [], + modifiedOperatorIds: [], + }; +} + +/** + * Estimates the number of tokens in a JSON-serializable object + * Uses a common approximation: tokens ≈ characters / 4 + */ +export function estimateTokenCount(data: any): number { + try { + const jsonString = JSON.stringify(data); + return Math.ceil(jsonString.length / 4); + } catch (error) { + // Fallback if JSON.stringify fails + return 0; + } +} + +/** + * Wraps a tool definition to add timeout protection to its execute function + * Uses AbortController to properly cancel operations on timeout + */ +export function toolWithTimeout(toolConfig: any): any { + const originalExecute = toolConfig.execute; + + return { + ...toolConfig, + execute: async (args: any) => { + const abortController = new AbortController(); + + const timeoutPromise = new Promise((_, reject) => { + setTimeout(() => { + abortController.abort(); + reject(new Error("timeout")); + }, TOOL_TIMEOUT_MS); + }); + + try { + const argsWithSignal = { ...args, signal: abortController.signal }; + return await Promise.race([originalExecute(argsWithSignal), timeoutPromise]); + } catch (error: any) { + if (error.message === "timeout") { + return createErrorResult( + "Tool execution timeout - operation took longer than 2 minutes. Please try again later." + ); + } + throw error; + } + }, + }; +} diff --git a/frontend/src/app/workspace/service/copilot/tool/workflow-metadata-tools.ts b/frontend/src/app/workspace/service/copilot/tool/workflow-metadata-tools.ts new file mode 100644 index 00000000000..eca6cb76afc --- /dev/null +++ b/frontend/src/app/workspace/service/copilot/tool/workflow-metadata-tools.ts @@ -0,0 +1,140 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { z } from "zod"; +import { tool } from "ai"; +import { OperatorMetadataService } from "../../operator-metadata/operator-metadata.service"; +import { WorkflowUtilService } from "../../workflow-graph/util/workflow-util.service"; + +// Tool name constants +export const TOOL_NAME_LIST_ALL_OPERATOR_TYPES = "listAllOperatorTypes"; +export const TOOL_NAME_GET_OPERATOR_PROPERTIES_SCHEMA = "getOperatorPropertiesSchema"; +export const TOOL_NAME_GET_OPERATOR_PORTS_INFO = "getOperatorPortsInfo"; +export const TOOL_NAME_GET_OPERATOR_METADATA = "getOperatorMetadata"; + +export function createListAllOperatorTypesTool(workflowUtilService: WorkflowUtilService) { + return tool({ + name: TOOL_NAME_LIST_ALL_OPERATOR_TYPES, + description: "Get all available operator types in the system", + inputSchema: z.object({}), + execute: async () => { + try { + const operatorTypes = workflowUtilService.getOperatorTypeList(); + return { + success: true, + operatorTypes: operatorTypes, + count: operatorTypes.length, + }; + } catch (error: any) { + return { success: false, error: error.message }; + } + }, + }); +} + +/** + * Create getOperatorPropertiesSchema tool for getting just the properties schema + * More token-efficient than getOperatorSchema for property-focused queries + */ +export function createGetOperatorPropertiesSchemaTool(operatorMetadataService: OperatorMetadataService) { + return tool({ + name: TOOL_NAME_GET_OPERATOR_PROPERTIES_SCHEMA, + description: "Get only the properties schema for an operator type. Use this before setting operator properties.", + inputSchema: z.object({ + operatorType: z.string().describe("Type of the operator to get properties schema for"), + }), + execute: async (args: { operatorType: string }) => { + try { + const schema = operatorMetadataService.getOperatorSchema(args.operatorType); + const propertiesSchema = { + properties: schema.jsonSchema.properties, + required: schema.jsonSchema.required, + definitions: schema.jsonSchema.definitions, + }; + + return { + success: true, + propertiesSchema: propertiesSchema, + operatorType: args.operatorType, + message: `Retrieved properties schema for operator type ${args.operatorType}`, + }; + } catch (error: any) { + return { success: false, error: error.message }; + } + }, + }); +} + +export function createGetOperatorPortsInfoTool(operatorMetadataService: OperatorMetadataService) { + return tool({ + name: TOOL_NAME_GET_OPERATOR_PORTS_INFO, + description: + "Get input and output port information for an operator type. This is more token-efficient than getOperatorSchema and returns only port details (display names, multi-input support, etc.).", + inputSchema: z.object({ + operatorType: z.string().describe("Type of the operator to get port information for"), + }), + execute: async (args: { operatorType: string }) => { + try { + const schema = operatorMetadataService.getOperatorSchema(args.operatorType); + const portsInfo = { + inputPorts: schema.additionalMetadata.inputPorts, + outputPorts: schema.additionalMetadata.outputPorts, + dynamicInputPorts: schema.additionalMetadata.dynamicInputPorts, + dynamicOutputPorts: schema.additionalMetadata.dynamicOutputPorts, + }; + + return { + success: true, + portsInfo: portsInfo, + operatorType: args.operatorType, + message: `Retrieved port information for operator type ${args.operatorType}`, + }; + } catch (error: any) { + return { success: false, error: error.message }; + } + }, + }); +} + +export function createGetOperatorMetadataTool(operatorMetadataService: OperatorMetadataService) { + return tool({ + name: TOOL_NAME_GET_OPERATOR_METADATA, + description: + "Get semantic metadata for an operator type, including user-friendly name, description, operator group, and capabilities. This is very useful to understand the semantics and purpose of each operator type - what it does, how it works, and what kind of data transformation it performs.", + inputSchema: z.object({ + operatorType: z.string().describe("Type of the operator to get metadata for"), + }), + execute: async (args: { operatorType: string; signal?: AbortSignal }) => { + try { + const schema = operatorMetadataService.getOperatorSchema(args.operatorType); + + const metadata = schema.additionalMetadata; + return { + success: true, + metadata: metadata, + operatorType: args.operatorType, + operatorVersion: schema.operatorVersion, + message: `Retrieved metadata for operator type ${args.operatorType}`, + }; + } catch (error: any) { + return { success: false, error: error.message }; + } + }, + }); +} diff --git a/frontend/src/app/workspace/service/workflow-graph/util/workflow-util.service.ts b/frontend/src/app/workspace/service/workflow-graph/util/workflow-util.service.ts index f172975e001..8bca014062a 100644 --- a/frontend/src/app/workspace/service/workflow-graph/util/workflow-util.service.ts +++ b/frontend/src/app/workspace/service/workflow-graph/util/workflow-util.service.ts @@ -59,6 +59,13 @@ export class WorkflowUtilService { return this.operatorSchemaListCreatedSubject.asObservable(); } + /** + * Returns a list of all available operator types + */ + public getOperatorTypeList(): string[] { + return this.operatorSchemaList.map(schema => schema.operatorType); + } + /** * Generates a new UUID for operator */ @@ -106,7 +113,7 @@ export class WorkflowUtilService { * @param operatorType type of an Operator * @returns a new OperatorPredicate of the operatorType */ - public getNewOperatorPredicate(operatorType: string): OperatorPredicate { + public getNewOperatorPredicate(operatorType: string, customDisplayName?: string): OperatorPredicate { const operatorSchema = this.operatorSchemaList.find(schema => schema.operatorType === operatorType); if (operatorSchema === undefined) { throw new Error(`operatorType ${operatorType} doesn't exist in operator metadata`); @@ -131,8 +138,8 @@ export class WorkflowUtilService { // by default, the operator is not disabled const isDisabled = false; - // by default, the operator name is the user friendly name - const customDisplayName = operatorSchema.additionalMetadata.userFriendlyName; + // Use provided customDisplayName or default to the user friendly name from schema + const displayName = customDisplayName ?? operatorSchema.additionalMetadata.userFriendlyName; const dynamicInputPorts = operatorSchema.additionalMetadata.dynamicInputPorts ?? false; const dynamicOutputPorts = operatorSchema.additionalMetadata.dynamicOutputPorts ?? false; @@ -160,7 +167,7 @@ export class WorkflowUtilService { outputPorts, showAdvanced, isDisabled, - customDisplayName, + customDisplayName: displayName, dynamicInputPorts, dynamicOutputPorts, }; diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 394dcd78803..910cc1b5f6d 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -24,6 +24,53 @@ __metadata: languageName: node linkType: hard +"@ai-sdk/gateway@npm:2.0.9": + version: 2.0.9 + resolution: "@ai-sdk/gateway@npm:2.0.9" + dependencies: + "@ai-sdk/provider": "npm:2.0.0" + "@ai-sdk/provider-utils": "npm:3.0.17" + "@vercel/oidc": "npm:3.0.3" + peerDependencies: + zod: ^3.25.76 || ^4.1.8 + checksum: 10c0/840f94795b96c0fa6e73897ea8dba95fc78af1f8482f3b7d8439b6233b4f4de6979a8b67206f4bbf32649baf2acfb1153a46792dfa20259ca9f5fd214fb25fa5 + languageName: node + linkType: hard + +"@ai-sdk/openai@npm:2.0.67": + version: 2.0.67 + resolution: "@ai-sdk/openai@npm:2.0.67" + dependencies: + "@ai-sdk/provider": "npm:2.0.0" + "@ai-sdk/provider-utils": "npm:3.0.17" + peerDependencies: + zod: ^3.25.76 || ^4.1.8 + checksum: 10c0/7e5c407504d7902c17c816aaccd83f642a3b82012cd8467c8f58aef5f08a49b6c31fff775439d541d40b0c8b5b94cc384f18096d1968e23670e22a56fe82d8bd + languageName: node + linkType: hard + +"@ai-sdk/provider-utils@npm:3.0.17": + version: 3.0.17 + resolution: "@ai-sdk/provider-utils@npm:3.0.17" + dependencies: + "@ai-sdk/provider": "npm:2.0.0" + "@standard-schema/spec": "npm:^1.0.0" + eventsource-parser: "npm:^3.0.6" + peerDependencies: + zod: ^3.25.76 || ^4.1.8 + checksum: 10c0/1bae6dc4cacd0305b6aa152f9589bbd61c29f150155482c285a77f83d7ed416d52bc2aa7fdaba2e5764530392d9e8f799baea34a63dce6c72ecd3de364dc62d1 + languageName: node + linkType: hard + +"@ai-sdk/provider@npm:2.0.0": + version: 2.0.0 + resolution: "@ai-sdk/provider@npm:2.0.0" + dependencies: + json-schema: "npm:^0.4.0" + checksum: 10c0/e50e520016c9fc0a8b5009cadd47dae2f1c81ec05c1792b9e312d7d15479f024ca8039525813a33425c884e3449019fed21043b1bfabd6a2626152ca9a388199 + languageName: node + linkType: hard + "@ali-hm/angular-tree-component@npm:12.0.5": version: 12.0.5 resolution: "@ali-hm/angular-tree-component@npm:12.0.5" @@ -4598,6 +4645,13 @@ __metadata: languageName: node linkType: hard +"@opentelemetry/api@npm:1.9.0": + version: 1.9.0 + resolution: "@opentelemetry/api@npm:1.9.0" + checksum: 10c0/9aae2fe6e8a3a3eeb6c1fdef78e1939cf05a0f37f8a4fae4d6bf2e09eb1e06f966ece85805626e01ba5fab48072b94f19b835449e58b6d26720ee19a58298add + languageName: node + linkType: hard + "@parcel/watcher-android-arm64@npm:2.4.1": version: 2.4.1 resolution: "@parcel/watcher-android-arm64@npm:2.4.1" @@ -4916,6 +4970,13 @@ __metadata: languageName: node linkType: hard +"@standard-schema/spec@npm:^1.0.0": + version: 1.0.0 + resolution: "@standard-schema/spec@npm:1.0.0" + checksum: 10c0/a1ab9a8bdc09b5b47aa8365d0e0ec40cc2df6437be02853696a0e377321653b0d3ac6f079a8c67d5ddbe9821025584b1fb71d9cc041a6666a96f1fadf2ece15f + languageName: node + linkType: hard + "@stoplight/json-ref-resolver@npm:3.1.5": version: 3.1.5 resolution: "@stoplight/json-ref-resolver@npm:3.1.5" @@ -5927,6 +5988,13 @@ __metadata: languageName: node linkType: hard +"@vercel/oidc@npm:3.0.3": + version: 3.0.3 + resolution: "@vercel/oidc@npm:3.0.3" + checksum: 10c0/c8eecb1324559435f4ab8a955f5ef44f74f546d11c2ddcf28151cb636d989bd4b34e0673fd8716cb21bb21afb34b3de663bacc30c9506036eeecbcbf2fd86241 + languageName: node + linkType: hard + "@vitejs/plugin-basic-ssl@npm:1.0.1": version: 1.0.1 resolution: "@vitejs/plugin-basic-ssl@npm:1.0.1" @@ -6348,6 +6416,20 @@ __metadata: languageName: node linkType: hard +"ai@npm:5.0.93": + version: 5.0.93 + resolution: "ai@npm:5.0.93" + dependencies: + "@ai-sdk/gateway": "npm:2.0.9" + "@ai-sdk/provider": "npm:2.0.0" + "@ai-sdk/provider-utils": "npm:3.0.17" + "@opentelemetry/api": "npm:1.9.0" + peerDependencies: + zod: ^3.25.76 || ^4.1.8 + checksum: 10c0/64e80a36248ef20d42a0e688a58da6ca4255e2510a47d6ee9c2318a669df8e8ffb5c63ddb03a3cadd841058414bd4b324783f168c761f82421e4a1c2ac958933 + languageName: node + linkType: hard + "ajv-formats@npm:2.1.1, ajv-formats@npm:^2.1.1": version: 2.1.1 resolution: "ajv-formats@npm:2.1.1" @@ -10565,6 +10647,13 @@ __metadata: languageName: node linkType: hard +"eventsource-parser@npm:^3.0.6": + version: 3.0.6 + resolution: "eventsource-parser@npm:3.0.6" + checksum: 10c0/70b8ccec7dac767ef2eca43f355e0979e70415701691382a042a2df8d6a68da6c2fca35363669821f3da876d29c02abe9b232964637c1b6635c940df05ada78a + languageName: node + linkType: hard + "execa@npm:^5.0.0": version: 5.1.1 resolution: "execa@npm:5.1.1" @@ -11615,6 +11704,7 @@ __metadata: resolution: "gui@workspace:." dependencies: "@abacritt/angularx-social-login": "npm:2.3.0" + "@ai-sdk/openai": "npm:2.0.67" "@ali-hm/angular-tree-component": "npm:12.0.5" "@angular-builders/custom-webpack": "npm:16.0.1" "@angular-devkit/build-angular": "npm:16.2.12" @@ -11665,6 +11755,7 @@ __metadata: "@types/validator": "npm:13.12.0" "@typescript-eslint/eslint-plugin": "npm:7.0.2" "@typescript-eslint/parser": "npm:7.0.2" + ai: "npm:5.0.93" ajv: "npm:8.10.0" babel-plugin-dynamic-import-node: "npm:2.3.3" backbone: "npm:1.4.1" @@ -11741,6 +11832,7 @@ __metadata: y-quill: "npm:0.1.5" y-websocket: "npm:1.4.0" yjs: "npm:13.5.41" + zod: "npm:3.25.76" zone.js: "npm:0.13.0" languageName: unknown linkType: soft @@ -13109,6 +13201,13 @@ __metadata: languageName: node linkType: hard +"json-schema@npm:^0.4.0": + version: 0.4.0 + resolution: "json-schema@npm:0.4.0" + checksum: 10c0/d4a637ec1d83544857c1c163232f3da46912e971d5bf054ba44fdb88f07d8d359a462b4aec46f2745efbc57053365608d88bc1d7b1729f7b4fc3369765639ed3 + languageName: node + linkType: hard + "json-stable-stringify-without-jsonify@npm:^1.0.1": version: 1.0.1 resolution: "json-stable-stringify-without-jsonify@npm:1.0.1" @@ -20078,6 +20177,13 @@ __metadata: languageName: node linkType: hard +"zod@npm:3.25.76": + version: 3.25.76 + resolution: "zod@npm:3.25.76" + checksum: 10c0/5718ec35e3c40b600316c5b4c5e4976f7fee68151bc8f8d90ec18a469be9571f072e1bbaace10f1e85cf8892ea12d90821b200e980ab46916a6166a4260a983c + languageName: node + linkType: hard + "zone.js@npm:0.13.0": version: 0.13.0 resolution: "zone.js@npm:0.13.0" From 188de638279a2e028166a8050ff4839472926917 Mon Sep 17 00:00:00 2001 From: Jiadong Bai <43344272+bobbai00@users.noreply.github.com> Date: Wed, 26 Nov 2025 11:30:30 -0800 Subject: [PATCH 115/136] chore: update Kubernetes Helm chart image references to Apache registry (#4072) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ### What changes were proposed in this PR? This PR updates all Texera service images in the Kubernetes Helm chart (`bin/k8s/values.yaml`) to use the Apache registry with `latest` tags, aligning with the naming convention established in the CI/CD workflow (#4055). The following image references have been updated: - `texera/texera-example-data-loader:cluster` → `apache/texera-example-data-loader:latest` - `texera/texera-web-application:cluster` → `apache/texera-dashboard-service:latest` - `texera/workflow-computing-unit-managing-service:cluster` → `apache/texera-workflow-computing-unit-managing-service:latest` - `texera/workflow-compiling-service:cluster` → `apache/texera-workflow-compiling-service:latest` - `texera/file-service:cluster` → `apache/texera-file-service:latest` - `texera/config-service:cluster` → `apache/texera-config-service:latest` - `texera/access-control-service:cluster` → `apache/texera-access-control-service:latest` - `texera/computing-unit-master:cluster` → `apache/texera-workflow-execution-coordinator:latest` This ensures that the Kubernetes Helm chart uses the correct image names and registry that are now being built and pushed by the GitHub Actions workflow. ### Any related issues, documentation, discussions? Related to #4055 which introduced the GitHub Actions workflow for building and pushing images to the Apache registry. ### How was this PR tested? This PR only updates image references in the Kubernetes Helm chart configuration file. No code changes were made. ### Was this PR authored or co-authored using generative AI tooling? Generated-by: Claude (Anthropic) --------- Co-authored-by: Claude Co-authored-by: Chen Li --- bin/k8s/values.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/bin/k8s/values.yaml b/bin/k8s/values.yaml index 95810913eb4..f13fcb4a8c4 100644 --- a/bin/k8s/values.yaml +++ b/bin/k8s/values.yaml @@ -113,7 +113,7 @@ texeraImages: # Example data loader configuration exampleDataLoader: enabled: true - image: texera/texera-example-data-loader:cluster + image: apache/texera-example-data-loader:latest username: texera password: texera datasetDir: datasets @@ -122,7 +122,7 @@ exampleDataLoader: webserver: name: webserver numOfPods: 1 # Number of pods for the Texera deployment - imageName: texera/texera-web-application:cluster # image name of the texera + imageName: apache/texera-dashboard-service:latest # image name of the texera service: type: ClusterIP port: 8080 @@ -131,7 +131,7 @@ workflowComputingUnitManager: name: workflow-computing-unit-manager numOfPods: 1 serviceAccountName: workflow-computing-unit-manager-service-account - imageName: texera/workflow-computing-unit-managing-service:cluster + imageName: apache/texera-workflow-computing-unit-managing-service:latest service: type: ClusterIP port: 8888 @@ -139,7 +139,7 @@ workflowComputingUnitManager: workflowCompilingService: name: workflow-compiling-service numOfPods: 1 - imageName: texera/workflow-compiling-service:cluster + imageName: apache/texera-workflow-compiling-service:latest service: type: ClusterIP port: 9090 @@ -147,7 +147,7 @@ workflowCompilingService: fileService: name: file-service numOfPods: 1 - imageName: texera/file-service:cluster + imageName: apache/texera-file-service:latest service: type: ClusterIP port: 9092 @@ -155,7 +155,7 @@ fileService: configService: name: config-service numOfPods: 1 - imageName: texera/config-service:cluster + imageName: apache/texera-config-service:latest service: type: ClusterIP port: 9094 @@ -163,7 +163,7 @@ configService: accessControlService: name: access-control-service numOfPods: 1 - imageName: texera/access-control-service:cluster + imageName: apache/texera-access-control-service:latest service: type: ClusterIP port: 9096 @@ -193,7 +193,7 @@ workflowComputingUnitPool: cpu: 100 memory: 100Gi nvidiaGpu: 5 - imageName: texera/computing-unit-master:cluster + imageName: apache/texera-workflow-execution-coordinator:latest service: port: 8085 targetPort: 8085 From f1f041d4f89852d00c2e8d315b5c43b57a48c066 Mon Sep 17 00:00:00 2001 From: Yicong Huang <17627829+Yicong-Huang@users.noreply.github.com> Date: Fri, 28 Nov 2025 18:49:59 -0800 Subject: [PATCH 116/136] chore: move transformer to `operator-requirements.txt` (#4089) ### What changes were proposed in this PR? Move dependency `transformer` from `requirements.txt` to `operator-requirements.txt`. ### Any related issues, documentation, discussions? The dependency were introduced #2600 for supporting hugging face operators. It should not have been a dependency for pyamber, but the specific operator. - #2600 This blocks #4088 ### How was this PR tested? Existing tests. ### Was this PR authored or co-authored using generative AI tooling? No --- amber/operator-requirements.txt | 1 + amber/requirements.txt | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/amber/operator-requirements.txt b/amber/operator-requirements.txt index fd33ef7470c..ef5208e70ac 100644 --- a/amber/operator-requirements.txt +++ b/amber/operator-requirements.txt @@ -22,3 +22,4 @@ pillow==10.2.0 pybase64==1.3.2 torch==2.8.0 scikit-learn==1.5.0 +transformers==4.53.0 diff --git a/amber/requirements.txt b/amber/requirements.txt index ac130b82237..f07124d64c2 100644 --- a/amber/requirements.txt +++ b/amber/requirements.txt @@ -43,7 +43,6 @@ python-lsp-server[websockets]==1.12.0 bidict==0.22.0 cached_property==1.5.2 psutil==5.9.0 -transformers==4.53.0 tzlocal==2.1 pyiceberg==0.8.1 readerwriterlock==1.0.9 From c94bb9eb812f6b424e8456217cea38fc289b3a46 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Sun, 30 Nov 2025 19:12:53 +0100 Subject: [PATCH 117/136] chore: pin external GitHub Actions (#4092) ### What changes were proposed in this PR? Pin external GitHub Actions ### Any related issues, documentation, discussions? Per https://infra.apache.org/github-actions-policy.html ### Was this PR authored or co-authored using generative AI tooling? No --- .github/workflows/build-and-push-images.yml | 28 ++++++++++----------- .github/workflows/check-header.yml | 2 +- .github/workflows/github-action-build.yml | 4 +-- .github/workflows/lint-pr.yml | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build-and-push-images.yml b/.github/workflows/build-and-push-images.yml index dec5fcf4fbe..8a97c1fcfd9 100644 --- a/.github/workflows/build-and-push-images.yml +++ b/.github/workflows/build-and-push-images.yml @@ -120,9 +120,9 @@ jobs: java-version: 11 - name: Setup sbt launcher - uses: sbt/setup-sbt@v1 + uses: sbt/setup-sbt@3e125ece5c3e5248e18da9ed8d2cce3d335ec8dd # v1.1.14 - - uses: coursier/cache-action@v6 + - uses: coursier/cache-action@4e2615869d13561d626ed48655e1a39e5b192b3c # v6.4.9 with: extraSbtFiles: '["*.sbt", "project/**.{scala,sbt}", "project/build.properties" ]' @@ -319,9 +319,9 @@ jobs: java-version: 11 - name: Setup sbt launcher - uses: sbt/setup-sbt@v1 + uses: sbt/setup-sbt@3e125ece5c3e5248e18da9ed8d2cce3d335ec8dd # v1.1.14 - - uses: coursier/cache-action@v6 + - uses: coursier/cache-action@4e2615869d13561d626ed48655e1a39e5b192b3c # v6.4.9 with: extraSbtFiles: '["*.sbt", "project/**.{scala,sbt}", "project/build.properties" ]' @@ -340,16 +340,16 @@ jobs: df -h - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1 - name: Log in to Docker Hub - uses: docker/login-action@v3 + uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_PASSWORD }} - name: Build and push AMD64 image - uses: docker/build-push-action@v6 + uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0 with: context: ${{ matrix.context }} file: ${{ matrix.dockerfile }} @@ -392,9 +392,9 @@ jobs: java-version: 11 - name: Setup sbt launcher - uses: sbt/setup-sbt@v1 + uses: sbt/setup-sbt@3e125ece5c3e5248e18da9ed8d2cce3d335ec8dd # v1.1.14 - - uses: coursier/cache-action@v6 + - uses: coursier/cache-action@4e2615869d13561d626ed48655e1a39e5b192b3c # v6.4.9 with: extraSbtFiles: '["*.sbt", "project/**.{scala,sbt}", "project/build.properties" ]' @@ -414,21 +414,21 @@ jobs: # Set up QEMU for ARM64 emulation - name: Set up QEMU - uses: docker/setup-qemu-action@v3 + uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0 with: platforms: linux/arm64 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1 - name: Log in to Docker Hub - uses: docker/login-action@v3 + uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_PASSWORD }} - name: Build and push ARM64 image - uses: docker/build-push-action@v6 + uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0 with: context: ${{ matrix.context }} file: ${{ matrix.dockerfile }} @@ -457,7 +457,7 @@ jobs: steps: - name: Log in to Docker Hub - uses: docker/login-action@v3 + uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_PASSWORD }} diff --git a/.github/workflows/check-header.yml b/.github/workflows/check-header.yml index 0f781236e9e..c2cbddc1333 100644 --- a/.github/workflows/check-header.yml +++ b/.github/workflows/check-header.yml @@ -30,4 +30,4 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: apache/skywalking-eyes@v0.7.0 + - uses: apache/skywalking-eyes@5c5b974209f0de5d905f37deb69369068ebfc15c # v0.7.0 diff --git a/.github/workflows/github-action-build.yml b/.github/workflows/github-action-build.yml index fabf68053ec..5264bd454b2 100644 --- a/.github/workflows/github-action-build.yml +++ b/.github/workflows/github-action-build.yml @@ -105,8 +105,8 @@ jobs: distribution: 'temurin' java-version: 11 - name: Setup sbt launcher - uses: sbt/setup-sbt@v1 - - uses: coursier/cache-action@v6 + uses: sbt/setup-sbt@3e125ece5c3e5248e18da9ed8d2cce3d335ec8dd # v1.1.14 + - uses: coursier/cache-action@4e2615869d13561d626ed48655e1a39e5b192b3c # v6.4.9 with: extraSbtFiles: '["*.sbt", "project/**.{scala,sbt}", "project/build.properties" ]' - name: Lint with scalafmt diff --git a/.github/workflows/lint-pr.yml b/.github/workflows/lint-pr.yml index f4151a19047..fcc5d46f0ca 100644 --- a/.github/workflows/lint-pr.yml +++ b/.github/workflows/lint-pr.yml @@ -31,6 +31,6 @@ jobs: permissions: pull-requests: read steps: - - uses: amannn/action-semantic-pull-request@v5 + - uses: amannn/action-semantic-pull-request@0723387faaf9b38adef4775cd42cfd5155ed6017 # v5.5.3 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 1771b8971c43c0f57f1c900ce57b558dbccdb0aa Mon Sep 17 00:00:00 2001 From: yunyad <114192306+yunyad@users.noreply.github.com> Date: Sun, 30 Nov 2025 23:09:26 -0800 Subject: [PATCH 118/136] chore(deps): bump transformers from 4.53.0 to 4.57.3 (#4093) ### What changes were proposed in this PR? Bump `transformers` from 4.53.0 to 4.57.3 to support Hugging Face operators. ### Any related issues, documentation, discussions? Resolves #4091 by updating the `transformers` dependency to support Hugging Face operators. ### How was this PR tested? Tested by running the Hugging Face operators in Texera and verifying that the models load and run successfully (see screenshot below). image ### Was this PR authored or co-authored using generative AI tooling? No. --- amber/operator-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amber/operator-requirements.txt b/amber/operator-requirements.txt index ef5208e70ac..ce114ea8415 100644 --- a/amber/operator-requirements.txt +++ b/amber/operator-requirements.txt @@ -22,4 +22,4 @@ pillow==10.2.0 pybase64==1.3.2 torch==2.8.0 scikit-learn==1.5.0 -transformers==4.53.0 +transformers==4.57.3 From cecaa36571d3275b3f13fd6de922b12bea84f63a Mon Sep 17 00:00:00 2001 From: Yicong Huang <17627829+Yicong-Huang@users.noreply.github.com> Date: Sun, 30 Nov 2025 23:51:17 -0800 Subject: [PATCH 119/136] chore(dep): Bump `pandas` version to 2.2.3 (#4096) ### What changes were proposed in this PR? Bump `pandas` version to 2.2.3 to be [compatible with Python 3.13](https://pandas.pydata.org/pandas-docs/stable/whatsnew/v2.2.3.html#pandas-2-2-3-is-now-compatible-with-python-3-13). ### Any related issues, documentation, discussions? Resolves #4095 ### How was this PR tested? CI ### Was this PR authored or co-authored using generative AI tooling? No Signed-off-by: Yicong Huang <17627829+Yicong-Huang@users.noreply.github.com> --- amber/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amber/requirements.txt b/amber/requirements.txt index f07124d64c2..e2db1342ab3 100644 --- a/amber/requirements.txt +++ b/amber/requirements.txt @@ -17,7 +17,7 @@ wheel==0.41.2 numpy==1.26.4 -pandas==2.2.2 +pandas==2.2.3 flake8==7.1.1 Flake8-pyproject==1.2.3 black==24.3.0 From 7cf3b76f09e09834b8669693549a7727ae99eb47 Mon Sep 17 00:00:00 2001 From: Yicong Huang <17627829+Yicong-Huang@users.noreply.github.com> Date: Mon, 1 Dec 2025 00:26:54 -0800 Subject: [PATCH 120/136] chore(dep): Bump `numpy` version to 2.1.0 (#4098) ### What changes were proposed in this PR? Bump numpy version to 2.1.0 to be [compatible with Python 3.13](https://numpy.org/news/#numpy-210-released). ### Any related issues, documentation, discussions? Closes #4097 ### How was this PR tested? CI ### Was this PR authored or co-authored using generative AI tooling? No --------- Signed-off-by: Yicong Huang <17627829+Yicong-Huang@users.noreply.github.com> --- amber/requirements.txt | 2 +- amber/src/main/python/core/models/test_tuple.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/amber/requirements.txt b/amber/requirements.txt index e2db1342ab3..7e2c5304ec6 100644 --- a/amber/requirements.txt +++ b/amber/requirements.txt @@ -16,7 +16,7 @@ # under the License. wheel==0.41.2 -numpy==1.26.4 +numpy==2.1.0 pandas==2.2.3 flake8==7.1.1 Flake8-pyproject==1.2.3 diff --git a/amber/src/main/python/core/models/test_tuple.py b/amber/src/main/python/core/models/test_tuple.py index 53f1590fe3d..bfce7bb94fe 100644 --- a/amber/src/main/python/core/models/test_tuple.py +++ b/amber/src/main/python/core/models/test_tuple.py @@ -19,8 +19,8 @@ import pandas import pyarrow import pytest +import numpy as np from copy import deepcopy -from numpy import NaN from core.models import Tuple, ArrowTableTupleProvider from core.models.schema.schema import Schema @@ -123,7 +123,7 @@ def test_retrieve_tuple_from_empty_arrow_table(self): def test_finalize_tuple(self): tuple_ = Tuple( - {"name": "texera", "age": 21, "scores": [85, 94, 100], "height": NaN} + {"name": "texera", "age": 21, "scores": [85, 94, 100], "height": np.nan} ) schema = Schema( raw_schema={ From de89d5fa195cefaf20e2c35b6031dc039947081c Mon Sep 17 00:00:00 2001 From: Jiadong Bai <43344272+bobbai00@users.noreply.github.com> Date: Mon, 1 Dec 2025 00:47:03 -0800 Subject: [PATCH 121/136] feat(ci): add Github CI for creating and uploading release candidate artifacts (#4076) ### What changes were proposed in this PR? This PR adds a CI file for uploading the release artifacts to the [dist.apache/](https://dist.apache.org/repos/dist/dev/incubator/texera/) Here are the secrets needed to be set: | Secret | Purpose | |-----------------|-----------------------------------------------| | GPG_PRIVATE_KEY | The GPG private key used to sign the release tarball. Imported via gpg --import to create the .asc signature file. | | GPG_PASSPHRASE | Passphrase for the GPG private key. Used with --passphrase-fd to unlock the key during signing | | SVN_USERNAME | Apache SVN username for committing artifacts to dist.apache.org. Used to authenticate with the ASF distribution repository. | | SVN_PASSWORD | Apache SVN password. Paired with SVN_USERNAME to push release artifacts to the staging directory (dist/dev/incubator/texera/). | ### Any related issues, documentation, discussions? Closes #4081 ### How was this PR tested? This PR is tested manually using the Github actions on my own fork. See: https://github.com/bobbai00/texera/actions/runs/19608186790 ### Was this PR authored or co-authored using generative AI tooling? Yes, co-authored with Claude code --------- Co-authored-by: Claude --- .github/release/vote-email-template.md | 85 +++++ .../workflows/create-release-candidate.yml | 340 ++++++++++++++++++ 2 files changed, 425 insertions(+) create mode 100644 .github/release/vote-email-template.md create mode 100644 .github/workflows/create-release-candidate.yml diff --git a/.github/release/vote-email-template.md b/.github/release/vote-email-template.md new file mode 100644 index 00000000000..8fd6cd471f5 --- /dev/null +++ b/.github/release/vote-email-template.md @@ -0,0 +1,85 @@ +Subject: [VOTE] Release Apache Texera (incubating) ${VERSION} RC${RC_NUM} + +Hi Texera Community, + +This is a call for vote to release Apache Texera (incubating) ${VERSION}. + +== Release Candidate Artifacts == + +The release candidate artifacts can be found at: +https://dist.apache.org/repos/dist/dev/incubator/texera/${RC_DIR}/ + +The artifacts include: +- apache-texera-${VERSION}-rc${RC_NUM}-src.tar.gz (source tarball) +- apache-texera-${VERSION}-rc${RC_NUM}-src.tar.gz.asc (GPG signature) +- apache-texera-${VERSION}-rc${RC_NUM}-src.tar.gz.sha512 (SHA512 checksum) + +== Git Tag == + +The Git tag for this release candidate: +https://github.com/apache/incubator-texera/releases/tag/${TAG_NAME} + +The commit hash for this tag: +${COMMIT_HASH} + +== Release Notes == + +Release notes can be found at: +https://github.com/apache/incubator-texera/releases/tag/${TAG_NAME} + +== Keys == + +The artifacts have been signed with Key [${GPG_KEY_ID}], corresponding to [${GPG_EMAIL}]. + +The KEYS file containing the public keys can be found at: +https://dist.apache.org/repos/dist/dev/incubator/texera/KEYS + +== How to Verify == + +1. Download the release artifacts: + + wget https://dist.apache.org/repos/dist/dev/incubator/texera/${RC_DIR}/apache-texera-${VERSION}-rc${RC_NUM}-src.tar.gz + wget https://dist.apache.org/repos/dist/dev/incubator/texera/${RC_DIR}/apache-texera-${VERSION}-rc${RC_NUM}-src.tar.gz.asc + wget https://dist.apache.org/repos/dist/dev/incubator/texera/${RC_DIR}/apache-texera-${VERSION}-rc${RC_NUM}-src.tar.gz.sha512 + +2. Import the KEYS file and verify the GPG signature: + + wget https://dist.apache.org/repos/dist/dev/incubator/texera/KEYS + gpg --import KEYS + gpg --verify apache-texera-${VERSION}-rc${RC_NUM}-src.tar.gz.asc apache-texera-${VERSION}-rc${RC_NUM}-src.tar.gz + +3. Verify the SHA512 checksum: + + sha512sum -c apache-texera-${VERSION}-rc${RC_NUM}-src.tar.gz.sha512 + +4. Extract and build from source: + + tar -xzf apache-texera-${VERSION}-rc${RC_NUM}-src.tar.gz + cd apache-texera-${VERSION}-rc${RC_NUM}-src + # Follow build instructions in README + +== How to Vote == + +The vote will be open for at least 72 hours. + +Please vote accordingly: + +[ ] +1 Approve the release +[ ] 0 No opinion +[ ] -1 Disapprove the release (please provide the reason) + +== Checklist for Reference == + +When reviewing, please check: + +[ ] Download links are valid +[ ] Checksums and PGP signatures are valid +[ ] LICENSE and NOTICE files are correct +[ ] All files have ASF license headers where appropriate +[ ] No unexpected binary files +[ ] Source tarball matches the Git tag +[ ] Can compile from source successfully + +Thanks, +[Your Name] +Apache Texera (incubating) PPMC diff --git a/.github/workflows/create-release-candidate.yml b/.github/workflows/create-release-candidate.yml new file mode 100644 index 00000000000..719dc10f586 --- /dev/null +++ b/.github/workflows/create-release-candidate.yml @@ -0,0 +1,340 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +name: Create and upload release candidate artifacts + +on: + workflow_dispatch: + inputs: + tag: + description: 'Existing Git tag (e.g., v1.1.0-incubating-rc1)' + required: true + type: string + rc_number: + description: 'Release candidate number for artifacts (e.g., 1 for RC1, 2 for RC2)' + required: true + type: string + default: '1' + +jobs: + create-rc: + runs-on: ubuntu-latest + outputs: + version: ${{ steps.vars.outputs.version }} + rc_num: ${{ steps.vars.outputs.rc_num }} + tag_name: ${{ steps.vars.outputs.tag_name }} + rc_dir: ${{ steps.vars.outputs.rc_dir }} + tarball_name: ${{ steps.vars.outputs.tarball_name }} + + steps: + - name: Checkout code + uses: actions/checkout@v4 + with: + fetch-depth: 0 # Full history for proper tagging + + - name: Validate tag exists + run: | + TAG_NAME="${{ github.event.inputs.tag }}" + + # Check if tag exists + if ! git rev-parse "$TAG_NAME" >/dev/null 2>&1; then + echo "Error: Tag '$TAG_NAME' does not exist" + echo "Available tags:" + git tag -l | tail -10 + exit 1 + fi + + echo "✓ Tag validation passed: $TAG_NAME" + + - name: Set up variables + id: vars + run: | + TAG_NAME="${{ github.event.inputs.tag }}" + RC_NUM="${{ github.event.inputs.rc_number }}" + + # Parse version from tag (format: v1.1.0-incubating or v1.1.0-incubating-rcN) + # Both formats are accepted, but we use the input rc_number for artifacts + if [[ "$TAG_NAME" =~ ^v([0-9]+\.[0-9]+\.[0-9]+-incubating)(-rc[0-9]+)?$ ]]; then + VERSION="${BASH_REMATCH[1]}" + else + echo "Error: Tag must be in format vX.Y.Z-incubating or vX.Y.Z-incubating-rcN (e.g., v1.1.0-incubating-rc1)" + exit 1 + fi + + RC_DIR="${VERSION}-RC${RC_NUM}" + TARBALL_NAME="apache-texera-${VERSION}-rc${RC_NUM}-src.tar.gz" + + echo "version=$VERSION" >> $GITHUB_OUTPUT + echo "rc_num=$RC_NUM" >> $GITHUB_OUTPUT + echo "tag_name=$TAG_NAME" >> $GITHUB_OUTPUT + echo "rc_dir=$RC_DIR" >> $GITHUB_OUTPUT + echo "tarball_name=$TARBALL_NAME" >> $GITHUB_OUTPUT + + echo "Release Candidate: $TAG_NAME" + echo "Version: $VERSION" + echo "RC Number: $RC_NUM" + echo "Tarball: $TARBALL_NAME" + echo "Staging directory: dist/dev/incubator/texera/$RC_DIR" + + - name: Create source tarball + run: | + TAG_NAME="${{ steps.vars.outputs.tag_name }}" + TARBALL_NAME="${{ steps.vars.outputs.tarball_name }}" + VERSION="${{ steps.vars.outputs.version }}" + RC_NUM="${{ steps.vars.outputs.rc_num }}" + + # Create a temporary directory for the archive + TEMP_DIR=$(mktemp -d) + ARCHIVE_DIR="$TEMP_DIR/apache-texera-${VERSION}-rc${RC_NUM}-src" + + echo "Creating source archive in $ARCHIVE_DIR" + + # Export the git repository at the tag + git archive --format=tar --prefix="apache-texera-${VERSION}-rc${RC_NUM}-src/" "$TAG_NAME" | tar -x -C "$TEMP_DIR" + + # Create tarball + cd "$TEMP_DIR" + tar -czf "$GITHUB_WORKSPACE/$TARBALL_NAME" "apache-texera-${VERSION}-rc${RC_NUM}-src" + + cd "$GITHUB_WORKSPACE" + + # Verify tarball was created + if [[ ! -f "$TARBALL_NAME" ]]; then + echo "Error: Tarball was not created" + exit 1 + fi + + # Show tarball info + ls -lh "$TARBALL_NAME" + echo "✓ Created tarball: $TARBALL_NAME" + + - name: Import GPG key + run: | + echo "${{ secrets.GPG_PRIVATE_KEY }}" | gpg --batch --import + + # List imported keys + gpg --list-secret-keys + + echo "✓ GPG key imported successfully" + + - name: Create GPG signature (.asc) + run: | + TARBALL_NAME="${{ steps.vars.outputs.tarball_name }}" + + # Sign the tarball + echo "${{ secrets.GPG_PASSPHRASE }}" | gpg --batch --yes --pinentry-mode loopback --passphrase-fd 0 \ + --armor --detach-sign --output "${TARBALL_NAME}.asc" "$TARBALL_NAME" + + # Verify signature + gpg --verify "${TARBALL_NAME}.asc" "$TARBALL_NAME" + + echo "✓ Created GPG signature: ${TARBALL_NAME}.asc" + + - name: Create SHA512 checksum + run: | + TARBALL_NAME="${{ steps.vars.outputs.tarball_name }}" + + # Create SHA512 checksum + sha512sum "$TARBALL_NAME" > "${TARBALL_NAME}.sha512" + + # Display checksum + cat "${TARBALL_NAME}.sha512" + + echo "✓ Created SHA512 checksum: ${TARBALL_NAME}.sha512" + + - name: Generate vote email template + id: vote_email + run: | + VERSION="${{ steps.vars.outputs.version }}" + RC_NUM="${{ steps.vars.outputs.rc_num }}" + TAG_NAME="${{ steps.vars.outputs.tag_name }}" + RC_DIR="${{ steps.vars.outputs.rc_dir }}" + + # Get commit hash for the tag + COMMIT_HASH=$(git rev-parse "$TAG_NAME") + + # Get GPG key ID from the imported key + GPG_KEY_ID=$(gpg --list-secret-keys --keyid-format LONG | grep 'sec' | head -n1 | awk '{print $2}' | cut -d'/' -f2) + GPG_EMAIL=$(gpg --list-secret-keys | grep 'uid' | head -n1 | grep -oP '[\w\.-]+@[\w\.-]+') + + # Copy template from repository + cp .github/release/vote-email-template.md vote-email.txt + + # Substitute variables in the template + sed -i "s/\${VERSION}/${VERSION}/g" vote-email.txt + sed -i "s/\${RC_NUM}/${RC_NUM}/g" vote-email.txt + sed -i "s/\${RC_DIR}/${RC_DIR}/g" vote-email.txt + sed -i "s/\${TAG_NAME}/${TAG_NAME}/g" vote-email.txt + sed -i "s/\${COMMIT_HASH}/${COMMIT_HASH}/g" vote-email.txt + sed -i "s/\${GPG_KEY_ID}/${GPG_KEY_ID}/g" vote-email.txt + sed -i "s/\${GPG_EMAIL}/${GPG_EMAIL}/g" vote-email.txt + + echo "✓ Vote email template generated!" + + - name: Upload RC artifacts + uses: actions/upload-artifact@v4 + with: + name: rc-artifacts + path: | + ${{ steps.vars.outputs.tarball_name }} + ${{ steps.vars.outputs.tarball_name }}.asc + ${{ steps.vars.outputs.tarball_name }}.sha512 + vote-email.txt + retention-days: 7 + + upload-rc: + runs-on: ubuntu-latest + needs: create-rc + + steps: + - name: Download RC artifacts + uses: actions/download-artifact@v4 + with: + name: rc-artifacts + + - name: Verify downloaded artifacts + run: | + TARBALL_NAME="${{ needs.create-rc.outputs.tarball_name }}" + echo "Verifying downloaded artifacts..." + ls -lh + + if [[ ! -f "$TARBALL_NAME" ]] || [[ ! -f "${TARBALL_NAME}.asc" ]] || [[ ! -f "${TARBALL_NAME}.sha512" ]]; then + echo "Error: Missing required artifacts" + exit 1 + fi + + echo "✓ All artifacts downloaded successfully" + + - name: Install SVN + run: | + sudo apt-get update + sudo apt-get install -y subversion + svn --version + + - name: Checkout SVN dev directory + run: | + RC_DIR="${{ needs.create-rc.outputs.rc_dir }}" + + # Checkout the dev directory with depth=empty (lightweight) + svn co --depth=empty https://dist.apache.org/repos/dist/dev/incubator/texera svn-texera \ + --username "${{ secrets.SVN_USERNAME }}" \ + --password "${{ secrets.SVN_PASSWORD }}" \ + --no-auth-cache + + cd svn-texera + + # Create RC directory if it doesn't exist + if ! svn info "$RC_DIR" >/dev/null 2>&1; then + mkdir -p "$RC_DIR" + svn add "$RC_DIR" + echo "✓ Created new RC directory: $RC_DIR" + else + svn update "$RC_DIR" + echo "✓ RC directory already exists: $RC_DIR" + fi + + - name: Stage artifacts to SVN + run: | + TARBALL_NAME="${{ needs.create-rc.outputs.tarball_name }}" + RC_DIR="${{ needs.create-rc.outputs.rc_dir }}" + + cd svn-texera/"$RC_DIR" + + # Copy artifacts + cp "$GITHUB_WORKSPACE/$TARBALL_NAME" . + cp "$GITHUB_WORKSPACE/${TARBALL_NAME}.asc" . + cp "$GITHUB_WORKSPACE/${TARBALL_NAME}.sha512" . + + # Add files to SVN + svn add "$TARBALL_NAME" "${TARBALL_NAME}.asc" "${TARBALL_NAME}.sha512" --force + + # Check status + svn status + + echo "✓ Staged artifacts to SVN" + + - name: Commit artifacts to dist/dev + run: | + VERSION="${{ needs.create-rc.outputs.version }}" + RC_NUM="${{ needs.create-rc.outputs.rc_num }}" + RC_DIR="${{ needs.create-rc.outputs.rc_dir }}" + + cd svn-texera + + # Commit with descriptive message + svn commit -m "Add Apache Texera ${VERSION} RC${RC_NUM} artifacts" \ + --username "${{ secrets.SVN_USERNAME }}" \ + --password "${{ secrets.SVN_PASSWORD }}" \ + --no-auth-cache + + echo "✓ Committed artifacts to dist/dev/incubator/texera/$RC_DIR" + + - name: Generate release summary + run: | + VERSION="${{ needs.create-rc.outputs.version }}" + RC_NUM="${{ needs.create-rc.outputs.rc_num }}" + TAG_NAME="${{ needs.create-rc.outputs.tag_name }}" + RC_DIR="${{ needs.create-rc.outputs.rc_dir }}" + TARBALL_NAME="${{ needs.create-rc.outputs.tarball_name }}" + + echo "## Release Candidate Created Successfully! 🎉" >> $GITHUB_STEP_SUMMARY + echo "" >> $GITHUB_STEP_SUMMARY + echo "### Release Information" >> $GITHUB_STEP_SUMMARY + echo "- **Version:** ${VERSION}" >> $GITHUB_STEP_SUMMARY + echo "- **RC Number:** RC${RC_NUM}" >> $GITHUB_STEP_SUMMARY + echo "- **Git Tag:** \`${TAG_NAME}\`" >> $GITHUB_STEP_SUMMARY + echo "" >> $GITHUB_STEP_SUMMARY + echo "### Artifacts Location" >> $GITHUB_STEP_SUMMARY + echo "📦 **Staging Directory:** https://dist.apache.org/repos/dist/dev/incubator/texera/${RC_DIR}/" >> $GITHUB_STEP_SUMMARY + echo "" >> $GITHUB_STEP_SUMMARY + echo "### Artifacts Created" >> $GITHUB_STEP_SUMMARY + echo "- \`${TARBALL_NAME}\`" >> $GITHUB_STEP_SUMMARY + echo "- \`${TARBALL_NAME}.asc\` (GPG signature)" >> $GITHUB_STEP_SUMMARY + echo "- \`${TARBALL_NAME}.sha512\` (SHA512 checksum)" >> $GITHUB_STEP_SUMMARY + echo "" >> $GITHUB_STEP_SUMMARY + echo "### Next Steps" >> $GITHUB_STEP_SUMMARY + echo "1. Verify the artifacts at the staging directory" >> $GITHUB_STEP_SUMMARY + echo "2. Send [VOTE] email to dev@texera.apache.org" >> $GITHUB_STEP_SUMMARY + echo "3. Include links to:" >> $GITHUB_STEP_SUMMARY + echo " - Tag: https://github.com/${{ github.repository }}/releases/tag/${TAG_NAME}" >> $GITHUB_STEP_SUMMARY + echo " - Artifacts: https://dist.apache.org/repos/dist/dev/incubator/texera/${RC_DIR}/" >> $GITHUB_STEP_SUMMARY + echo "" >> $GITHUB_STEP_SUMMARY + echo "### Verification Commands" >> $GITHUB_STEP_SUMMARY + echo "\`\`\`bash" >> $GITHUB_STEP_SUMMARY + echo "# Download and verify signature" >> $GITHUB_STEP_SUMMARY + echo "wget https://dist.apache.org/repos/dist/dev/incubator/texera/${RC_DIR}/${TARBALL_NAME}" >> $GITHUB_STEP_SUMMARY + echo "wget https://dist.apache.org/repos/dist/dev/incubator/texera/${RC_DIR}/${TARBALL_NAME}.asc" >> $GITHUB_STEP_SUMMARY + echo "wget https://dist.apache.org/repos/dist/release/incubator/texera/KEYS" >> $GITHUB_STEP_SUMMARY + echo "gpg --import KEYS" >> $GITHUB_STEP_SUMMARY + echo "gpg --verify ${TARBALL_NAME}.asc ${TARBALL_NAME}" >> $GITHUB_STEP_SUMMARY + echo "" >> $GITHUB_STEP_SUMMARY + echo "# Verify SHA512" >> $GITHUB_STEP_SUMMARY + echo "wget https://dist.apache.org/repos/dist/dev/incubator/texera/${RC_DIR}/${TARBALL_NAME}.sha512" >> $GITHUB_STEP_SUMMARY + echo "sha512sum -c ${TARBALL_NAME}.sha512" >> $GITHUB_STEP_SUMMARY + echo "\`\`\`" >> $GITHUB_STEP_SUMMARY + + echo "✓ Release candidate workflow completed successfully!" + + - name: Display vote email template + run: | + echo "## 📧 Vote Email Template" >> $GITHUB_STEP_SUMMARY + echo "" >> $GITHUB_STEP_SUMMARY + echo "Copy the content below to send to dev@texera.apache.org:" >> $GITHUB_STEP_SUMMARY + echo "" >> $GITHUB_STEP_SUMMARY + echo "\`\`\`" >> $GITHUB_STEP_SUMMARY + cat "$GITHUB_WORKSPACE/vote-email.txt" >> $GITHUB_STEP_SUMMARY + echo "\`\`\`" >> $GITHUB_STEP_SUMMARY From e8c80c6f85dad68f0346cb704d96aaf4ebab402f Mon Sep 17 00:00:00 2001 From: Yicong Huang <17627829+Yicong-Huang@users.noreply.github.com> Date: Mon, 1 Dec 2025 13:32:19 -0800 Subject: [PATCH 122/136] chore: Move `apache.amber` to `apache.texera.amber` (#4094) ### What changes were proposed in this PR? This PR refactors the package structure by moving all Amber engine code from `org.apache.amber` to `org.apache.texera.amber`. This aligns the package naming with the Texera project organization and ensures all components are properly namespaced under the Apache Texera organization. **Key Changes:** 1. **Directory Structure Migration** - Moved all source directories: - Scala/Java sources: 8 modules moved - Protobuf definitions: 14 files moved - Python proto generated code: moved under new namespace - Frontend TypeScript proto: moved under new namespace 2. **Code Updates** - Updated across 707 files: - Package declarations in 576 Scala/Java files - Import statements across all Scala/Java files - 57 Python files updated for new proto imports - 14 Protobuf files updated with new Java package - 2 TypeScript files updated with new import paths - Configuration files (cluster.conf) - String literals containing class names for reflection/dynamic loading 3. **Package Namespace Changes:** ```diff - org.apache.amber.engine.common - org.apache.amber.operator.* - org.apache.amber.core.* - org.apache.amber.compiler.* + org.apache.texera.amber.engine.common + org.apache.texera.amber.operator.* + org.apache.texera.amber.core.* + org.apache.texera.amber.compiler.* ``` ### Any related issues, documentation, discussions? Closes #4003 ### How was this PR tested? CI ### Was this PR authored or co-authored using generative AI tooling? Generated-by: Claude Sonnet 4.5 (Cursor IDE) --- .../texera/service/AccessControlService.scala | 2 +- .../architecture/rpc/controlcommands.proto | 18 +- .../architecture/rpc/controllerservice.proto | 6 +- .../architecture/rpc/controlreturns.proto | 6 +- .../architecture/rpc/testerservice.proto | 6 +- .../architecture/rpc/workerservice.proto | 6 +- .../sendsemantics/partitionings.proto | 4 +- .../architecture/worker/statistics.proto | 4 +- .../amber/engine/common/actormessage.proto | 2 +- .../amber/engine/common/ambermessage.proto | 8 +- .../engine/common/executionruntimestate.proto | 12 +- .../actorcommand/actor_handler_base.py | 2 +- .../actorcommand/backpressure_handler.py | 6 +- .../actorcommand/credit_update_handler.py | 2 +- .../control/add_input_channel_handler.py | 2 +- .../control/add_partitioning_handler.py | 2 +- .../handlers/control/assign_port_handler.py | 4 +- .../handlers/control/control_handler_base.py | 2 +- .../handlers/control/debug_command_handler.py | 2 +- .../handlers/control/end_channel_handler.py | 5 +- .../handlers/control/end_worker_handler.py | 2 +- .../control/evaluate_expression_handler.py | 2 +- .../control/initialize_executor_handler.py | 4 +- .../handlers/control/no_operation_handler.py | 2 +- .../handlers/control/open_executor_handler.py | 5 +- .../handlers/control/pause_worker_handler.py | 2 +- .../control/query_statistics_handler.py | 4 +- .../control/replay_current_tuple_handler.py | 7 +- .../handlers/control/resume_worker_handler.py | 2 +- .../handlers/control/start_channel_handler.py | 5 +- .../handlers/control/start_worker_handler.py | 6 +- .../control/update_executor_handler.py | 2 +- .../managers/console_message_manager.py | 2 +- .../core/architecture/managers/context.py | 4 +- .../embedded_control_message_manager.py | 4 +- .../architecture/managers/pause_manager.py | 4 +- .../managers/statistics_manager.py | 4 +- .../managers/test_pause_manager.py | 2 +- .../managers/test_state_manager.py | 2 +- .../managers/tuple_processing_manager.py | 2 +- .../architecture/packaging/input_manager.py | 4 +- .../architecture/packaging/output_manager.py | 6 +- .../core/architecture/rpc/async_rpc_client.py | 6 +- .../core/architecture/rpc/async_rpc_server.py | 6 +- .../sendsemantics/broad_cast_partitioner.py | 6 +- .../hash_based_shuffle_partitioner.py | 6 +- .../sendsemantics/one_to_one_partitioner.py | 6 +- .../architecture/sendsemantics/partitioner.py | 6 +- .../range_based_shuffle_partitioner.py | 6 +- .../sendsemantics/round_robin_partitioner.py | 6 +- .../main/python/core/models/internal_queue.py | 6 +- .../python/core/runnables/data_processor.py | 2 +- .../main/python/core/runnables/main_loop.py | 6 +- .../python/core/runnables/network_receiver.py | 4 +- .../python/core/runnables/network_sender.py | 6 +- .../core/runnables/test_console_message.py | 6 +- .../python/core/runnables/test_main_loop.py | 10 +- .../core/runnables/test_network_receiver.py | 6 +- .../storage/iceberg/test_iceberg_document.py | 2 +- ...ut_port_materialization_reader_runnable.py | 6 +- .../python/core/storage/vfs_uri_factory.py | 2 +- .../python/core/util/buffer/timed_buffer.py | 2 +- .../util/console_message/replace_print.py | 2 +- .../core/util/console_message/timed_buffer.py | 4 +- .../util/expression_evaluator/__init__.py | 5 +- .../test_expression_evaluator.py | 5 +- .../core/util/virtual_identity/__init__.py | 2 +- .../org/apache/{ => texera}/amber/__init__.py | 0 .../{ => texera}/amber/core/__init__.py | 0 .../{ => texera}/amber/engine/__init__.py | 0 .../amber/engine/architecture/__init__.py | 0 .../amber/engine/architecture/rpc/__init__.py | 180 ++++++++-------- .../architecture/sendsemantics/__init__.py | 0 .../engine/architecture/worker/__init__.py | 0 .../amber/engine/common/__init__.py | 0 .../amber/clustering/ClusterListener.scala | 18 +- .../amber/clustering/SingleNodeListener.scala | 4 +- .../common/AkkaActorRefMappingService.scala | 12 +- .../common/AkkaActorService.scala | 6 +- .../common/AkkaMessageTransferService.scala | 14 +- .../architecture/common/AmberProcessor.scala | 20 +- .../common/ExecutorDeployment.scala | 18 +- .../common/ProcessingStepCursor.scala | 6 +- .../architecture/common/WorkflowActor.scala | 18 +- .../architecture/controller/ClientEvent.scala | 12 +- .../architecture/controller/Controller.scala | 26 +-- ...ControllerAsyncRPCHandlerInitializer.scala | 14 +- .../controller/ControllerProcessor.scala | 18 +- .../controller/ControllerTimerService.scala | 12 +- .../controller/GlobalReplayManager.scala | 4 +- .../architecture/controller/Workflow.scala | 4 +- .../controller/WorkflowScheduler.scala | 8 +- .../execution/ChannelExecution.scala | 2 +- .../controller/execution/ExecutionUtils.scala | 11 +- .../controller/execution/LinkExecution.scala | 4 +- .../execution/OperatorExecution.scala | 22 +- .../execution/RegionExecution.scala | 14 +- .../execution/WorkerPortExecution.scala | 2 +- .../execution/WorkflowExecution.scala | 16 +- .../ConsoleMessageHandler.scala | 8 +- .../promisehandlers/DebugCommandHandler.scala | 10 +- .../EmbeddedControlMessageHandler.scala | 14 +- .../EvaluatePythonExpressionHandler.scala | 10 +- .../promisehandlers/LinkWorkersHandler.scala | 8 +- .../promisehandlers/PauseHandler.scala | 18 +- .../PortCompletedHandler.scala | 16 +- .../QueryWorkerStatisticsHandler.scala | 19 +- .../promisehandlers/ResumeHandler.scala | 13 +- .../RetrieveWorkflowStateHandler.scala | 16 +- .../RetryWorkflowHandler.scala | 10 +- .../StartWorkflowHandler.scala | 13 +- .../TakeGlobalCheckpointHandler.scala | 20 +- .../WorkerExecutionCompletedHandler.scala | 10 +- .../WorkerStateUpdatedHandler.scala | 10 +- .../deploysemantics/AddressInfo.scala | 2 +- .../deploystrategy/DeployStrategy.scala | 2 +- .../deploystrategy/OneOnEach.scala | 2 +- .../deploystrategy/RandomDeployment.scala | 2 +- .../deploystrategy/RoundRobinDeployment.scala | 2 +- .../layer/WorkerExecution.scala | 10 +- .../logreplay/AsyncReplayLogWriter.scala | 10 +- .../logreplay/EmptyReplayLogger.scala | 9 +- .../logreplay/OrderEnforcer.scala | 4 +- .../logreplay/ReplayLogGenerator.scala | 8 +- .../logreplay/ReplayLogManager.scala | 19 +- .../architecture/logreplay/ReplayLogger.scala | 9 +- .../logreplay/ReplayLoggerImpl.scala | 11 +- .../logreplay/ReplayOrderEnforcer.scala | 4 +- .../messaginglayer/AmberFIFOChannel.scala | 12 +- .../messaginglayer/CongestionControl.scala | 4 +- .../DeadLetterMonitorActor.scala | 4 +- .../messaginglayer/FlowControl.scala | 8 +- .../messaginglayer/InputGateway.scala | 6 +- .../messaginglayer/InputManager.scala | 18 +- .../messaginglayer/NetworkInputGateway.scala | 8 +- .../messaginglayer/NetworkOutputGateway.scala | 10 +- .../messaginglayer/OrderingEnforcer.scala | 2 +- .../messaginglayer/OutputManager.scala | 28 +-- .../messaginglayer/WorkerPort.scala | 6 +- .../messaginglayer/WorkerTimerService.scala | 19 +- .../pythonworker/PythonProxyClient.scala | 22 +- .../pythonworker/PythonProxyServer.scala | 20 +- .../pythonworker/PythonWorkflowWorker.scala | 26 +-- .../WorkerBatchInternalQueue.scala | 12 +- .../CostBasedScheduleGenerator.scala | 18 +- .../scheduling/CostEstimator.scala | 18 +- .../ExpansionGreedyScheduleGenerator.scala | 14 +- .../architecture/scheduling/Region.scala | 8 +- .../RegionExecutionCoordinator.scala | 34 +-- .../architecture/scheduling/RegionPlan.scala | 4 +- .../architecture/scheduling/Schedule.scala | 2 +- .../scheduling/ScheduleGenerator.scala | 8 +- .../scheduling/SchedulingUtils.scala | 2 +- .../WorkflowExecutionCoordinator.scala | 15 +- .../scheduling/config/ChannelConfig.scala | 6 +- .../scheduling/config/LinkConfig.scala | 8 +- .../scheduling/config/OperatorConfig.scala | 2 +- .../scheduling/config/PortConfig.scala | 4 +- .../scheduling/config/ResourceConfig.scala | 6 +- .../scheduling/config/WorkerConfig.scala | 10 +- .../ExecutionClusterInfo.scala | 2 +- .../resourcePolicies/ResourceAllocator.scala | 22 +- .../partitioners/BroadcastPartitioner.scala | 8 +- .../HashBasedShufflePartitioner.scala | 8 +- .../partitioners/OneToOnePartitioner.scala | 8 +- .../partitioners/Partitioner.scala | 14 +- .../RangeBasedShufflePartitioner.scala | 8 +- .../partitioners/RoundRobinPartitioner.scala | 8 +- .../engine/architecture/worker/DPThread.scala | 25 ++- .../architecture/worker/DataProcessor.scala | 42 ++-- .../DataProcessorRPCHandlerInitializer.scala | 16 +- .../EmbeddedControlMessageManager.scala | 12 +- .../architecture/worker/PauseManager.scala | 8 +- .../architecture/worker/PauseType.scala | 4 +- .../architecture/worker/WorkflowWorker.scala | 29 +-- ...InputPortMaterializationReaderThread.scala | 30 +-- .../OutputPortResultWriterThread.scala | 6 +- .../managers/SerializationManager.scala | 16 +- .../worker/managers/StatisticsManager.scala | 8 +- .../AddInputChannelHandler.scala | 14 +- .../AddPartitioningHandler.scala | 14 +- .../promisehandlers/AssignPortHandler.scala | 23 +- .../promisehandlers/EndChannelHandler.scala | 15 +- .../worker/promisehandlers/EndHandler.scala | 11 +- .../FinalizeCheckpointHandler.scala | 14 +- .../FlushNetworkBufferHandler.scala | 11 +- .../InitializeExecutorHandler.scala | 14 +- .../promisehandlers/OpenExecutorHandler.scala | 11 +- .../worker/promisehandlers/PauseHandler.scala | 20 +- .../PrepareCheckpointHandler.scala | 16 +- .../QueryStatisticsHandler.scala | 13 +- .../promisehandlers/ResumeHandler.scala | 16 +- .../RetrieveStateHandler.scala | 11 +- .../promisehandlers/StartChannelHandler.scala | 17 +- .../worker/promisehandlers/StartHandler.scala | 21 +- .../amber/engine/common/AmberConfig.scala | 2 +- .../engine/common/AmberKryoInitializer.scala | 2 +- .../amber/engine/common/AmberLogging.scala | 6 +- .../amber/engine/common/AmberRuntime.scala | 8 +- .../amber/engine/common/CheckpointState.scala | 2 +- .../engine/common/CheckpointSupport.scala | 6 +- .../engine/common/ElidableStatement.scala | 2 +- .../amber/engine/common/FutureBijection.scala | 2 +- .../amber/engine/common/SerializedState.scala | 2 +- .../amber/engine/common/Utils.scala | 4 +- .../amberexception/BreakpointException.scala | 4 +- .../common/ambermessage/DataPayload.scala | 6 +- .../DirectControlMessagePayload.scala | 2 +- .../common/ambermessage/RecoveryPayload.scala | 4 +- .../WorkflowFIFOMessagePayload.scala | 2 +- .../common/ambermessage/WorkflowMessage.scala | 4 +- .../engine/common/client/AmberClient.scala | 23 +- .../engine/common/client/ClientActor.scala | 35 +-- .../engine/common/rpc/AsyncRPCClient.scala | 24 +-- .../rpc/AsyncRPCHandlerInitializer.scala | 14 +- .../engine/common/rpc/AsyncRPCServer.scala | 17 +- .../common/statetransition/StateManager.scala | 8 +- .../statetransition/WorkerStateManager.scala | 8 +- .../common/storage/EmptyRecordStorage.scala | 4 +- .../common/storage/HDFSRecordStorage.scala | 4 +- .../storage/SequentialRecordStorage.scala | 6 +- .../common/storage/VFSRecordStorage.scala | 4 +- .../engine/common/virtualidentity/util.scala | 4 +- .../{ => texera}/amber/error/ErrorUtils.scala | 12 +- .../texera/web/ComputingUnitMaster.scala | 26 +-- .../texera/web/ComputingUnitWorker.scala | 2 +- .../org/apache/texera/web/SessionState.scala | 2 +- .../texera/web/TexeraWebApplication.scala | 6 +- .../texera/web/WorkflowLifecycleManager.scala | 8 +- .../response/SchemaPropagationResponse.scala | 2 +- .../event/PaginatedResultEvent.scala | 2 +- .../websocket/event/WorkflowErrorEvent.scala | 2 +- .../event/python/ConsoleUpdateEvent.scala | 2 +- .../EditingTimeCompilationRequest.scala | 2 +- .../request/ModifyLogicRequest.scala | 2 +- .../request/WorkflowExecuteRequest.scala | 4 +- .../PythonExpressionEvaluateResponse.scala | 2 +- .../web/resource/CollaborationResource.scala | 2 +- .../web/resource/SystemMetadataResource.scala | 2 +- .../resource/WorkflowWebsocketResource.scala | 12 +- .../aiassistant/AiAssistantManager.scala | 2 +- .../dashboard/DatasetSearchQueryBuilder.scala | 2 +- .../resource/dashboard/hub/HubResource.scala | 2 +- .../workflow/WorkflowExecutionsResource.scala | 23 +- .../user/workflow/WorkflowResource.scala | 4 +- .../workflow/WorkflowVersionResource.scala | 2 +- .../service/EmailNotificationService.scala | 2 +- .../web/service/ExecutionConsoleService.scala | 30 +-- .../ExecutionReconfigurationService.scala | 6 +- .../web/service/ExecutionResultService.scala | 32 +-- .../web/service/ExecutionRuntimeService.scala | 12 +- .../web/service/ExecutionStatsService.scala | 33 +-- .../ExecutionsMetadataPersistService.scala | 2 +- .../FriesReconfigurationAlgorithm.scala | 8 +- .../web/service/ResultExportService.scala | 14 +- .../web/service/WorkflowEmailNotifier.scala | 4 +- .../service/WorkflowExecutionService.scala | 16 +- .../texera/web/service/WorkflowService.scala | 27 +-- .../ExecutionReconfigurationStore.scala | 6 +- .../web/storage/ExecutionStateStore.scala | 6 +- .../texera/web/storage/StateStore.scala | 2 +- .../web/storage/WorkflowStateStore.scala | 2 +- .../apache/texera/workflow/LogicalLink.scala | 4 +- .../apache/texera/workflow/LogicalPlan.scala | 8 +- .../texera/workflow/WorkflowCompiler.scala | 6 +- ...GitVersionControlLocalFileStorageSpec.java | 4 +- .../breakpoint/ExceptionBreakpointSpec.scala | 2 +- .../control/TrivialControlSpec.scala | 22 +- .../control/utils/ChainHandler.scala | 6 +- .../control/utils/CollectHandler.scala | 6 +- .../control/utils/ErrorHandler.scala | 6 +- .../control/utils/MultiCallHandler.scala | 8 +- .../control/utils/NestedHandler.scala | 6 +- .../control/utils/PingPongHandler.scala | 6 +- .../control/utils/RecursionHandler.scala | 6 +- .../TesterAsyncRPCHandlerInitializer.scala | 12 +- .../control/utils/TrivialControlTester.scala | 24 +-- .../controller/ControllerSpec.scala | 4 +- .../NetworkInputGatewaySpec.scala | 8 +- .../messaginglayer/OutputManagerSpec.scala | 12 +- .../RangeBasedShuffleSpec.scala | 10 +- .../PythonWorkflowWorkerSpec.scala | 30 +-- .../CostBasedScheduleGeneratorSpec.scala | 10 +- .../scheduling/DefaultCostEstimatorSpec.scala | 30 +-- ...ExpansionGreedyScheduleGeneratorSpec.scala | 19 +- .../architecture/worker/DPThreadSpec.scala | 31 +-- .../worker/DataProcessorSpec.scala | 34 +-- .../architecture/worker/WorkerSpec.scala | 40 ++-- .../engine/e2e/BatchSizePropagationSpec.scala | 18 +- .../amber/engine/e2e/DataProcessingSpec.scala | 30 +-- .../amber/engine/e2e/PauseSpec.scala | 23 +- .../amber/engine/e2e/TestUtils.scala | 10 +- .../faulttolerance/CheckpointSpec.scala | 25 ++- .../engine/faulttolerance/LoggingSpec.scala | 28 +-- .../engine/faulttolerance/ReplaySpec.scala | 25 ++- .../WorkflowVersionResourceSpec.scala | 2 +- .../service/ExecutionConsoleServiceSpec.scala | 7 +- .../service/ExecutionResultServiceSpec.scala | 2 +- .../ReadonlyLocalFileDocumentSpec.scala | 6 +- common/config/src/main/resources/cluster.conf | 2 +- .../amber/config/AkkaConfig.scala | 2 +- .../amber/config/ApplicationConfig.scala | 2 +- .../amber/config/EnvironmentalVariable.scala | 2 +- .../amber/config/StorageConfig.scala | 4 +- .../{ => texera}/amber/config/UdfConfig.scala | 2 +- .../amber/util/ConfigParserUtil.scala | 2 +- .../{ => texera}/amber/core/executor.proto | 4 +- .../amber/core/virtualidentity.proto | 2 +- .../{ => texera}/amber/core/workflow.proto | 4 +- .../amber/core/workflowruntimestate.proto | 2 +- .../amber/core/WorkflowRuntimeException.scala | 4 +- .../amber/core/executor/ExecFactory.scala | 2 +- .../executor/JavaRuntimeCompilation.scala | 4 +- .../core/executor/OperatorExecutor.scala | 8 +- .../executor/SourceOperatorExecutor.scala | 6 +- .../{ => texera}/amber/core/state/State.scala | 4 +- .../amber/core/storage/DocumentFactory.scala | 20 +- .../amber/core/storage/FileResolver.scala | 2 +- .../core/storage/IcebergCatalogInstance.scala | 6 +- .../amber/core/storage/VFSURIFactory.scala | 14 +- .../storage/model/BufferedItemWriter.scala | 2 +- .../storage/model/DatasetFileDocument.scala | 10 +- .../amber/core/storage/model/OnDataset.scala | 2 +- .../model/ReadonlyLocalFileDocument.scala | 2 +- .../model/ReadonlyVirtualDocument.scala | 2 +- .../storage/model/VirtualCollection.scala | 2 +- .../core/storage/model/VirtualDocument.scala | 2 +- .../core/storage/result/ResultSchema.scala | 4 +- .../storage/result/WorkflowResultStore.scala | 4 +- .../result/iceberg/IcebergDocument.scala | 10 +- .../result/iceberg/IcebergTableWriter.scala | 8 +- .../storage/result/iceberg/OnIceberg.scala | 4 +- .../storage/util/LakeFSStorageClient.scala | 4 +- .../amber/core/storage/util/StorageUtil.scala | 2 +- .../GitVersionControlLocalFileStorage.java | 2 +- .../util/dataset/JGitVersionControl.java | 2 +- .../util/dataset/PhysicalFileNode.java | 2 +- .../amber/core/tuple/Attribute.java | 2 +- .../amber/core/tuple/AttributeType.java | 2 +- .../amber/core/tuple/AttributeTypeUtils.scala | 2 +- .../amber/core/tuple/BigObject.java | 4 +- .../amber/core/tuple/Schema.scala | 2 +- .../{ => texera}/amber/core/tuple/Tuple.scala | 4 +- .../amber/core/tuple/TupleLike.scala | 4 +- .../amber/core/tuple/TupleUtils.scala | 8 +- .../core/workflow/LocationPreference.scala | 2 +- .../amber/core/workflow/PartitionInfo.scala | 2 +- .../amber/core/workflow/PhysicalOp.scala | 8 +- .../amber/core/workflow/PhysicalPlan.scala | 8 +- .../amber/core/workflow/WorkflowContext.scala | 6 +- .../core/workflow/WorkflowSettings.scala | 2 +- .../{ => texera}/amber/util/ArrowUtils.scala | 6 +- .../{ => texera}/amber/util/IcebergUtil.scala | 6 +- .../{ => texera}/amber/util/JSONUtils.scala | 6 +- .../amber/util/VirtualIdentityUtils.scala | 4 +- .../util/serde/GlobalPortIdentitySerde.scala | 6 +- .../serde/PortIdentityKeyDeserializer.scala | 4 +- .../serde/PortIdentityKeySerializer.scala | 6 +- .../service/util/BigObjectInputStream.scala | 2 +- .../service/util/BigObjectOutputStream.scala | 2 +- .../texera/service/util/S3StorageClient.scala | 2 +- .../storage/model/VirtualDocumentSpec.scala | 2 +- .../core/tuple/AttributeTypeUtilsSpec.scala | 6 +- .../amber/core/tuple/SchemaSpec.scala | 2 +- .../amber/core/tuple/TupleSpec.scala | 4 +- .../amber/storage/FileResolverSpec.scala | 4 +- .../IcebergDocumentConsoleMessagesSpec.scala | 12 +- .../result/iceberg/IcebergDocumentSpec.scala | 14 +- .../iceberg/IcebergTableStatsSpec.scala | 14 +- .../amber/util/IcebergUtilSpec.scala | 6 +- .../util/BigObjectInputStreamSpec.scala | 2 +- .../service/util/BigObjectManagerSpec.scala | 2 +- .../util/BigObjectOutputStreamSpec.scala | 2 +- .../service/util/S3StorageTestBase.scala | 2 +- .../amber/operator/DummyProperties.scala | 2 +- .../amber/operator/LogicalOp.scala | 203 +++++++++--------- .../amber/operator/PortDescriptor.scala | 4 +- .../operator/PythonOperatorDescriptor.scala | 10 +- .../operator/SpecialPhysicalOpFactory.scala | 12 +- .../amber/operator/TestOperators.scala | 20 +- .../operator/aggregate/AggregateOpDesc.scala | 25 ++- .../operator/aggregate/AggregateOpExec.scala | 8 +- .../aggregate/AggregationFunction.java | 2 +- .../aggregate/AggregationOperation.scala | 6 +- .../aggregate/DistributedAggregation.scala | 4 +- .../CartesianProductOpDesc.scala | 18 +- .../CartesianProductOpExec.scala | 8 +- .../dictionary/DictionaryMatcherOpDesc.scala | 25 ++- .../dictionary/DictionaryMatcherOpExec.scala | 8 +- .../operator/dictionary/MatchingType.java | 2 +- .../difference/DifferenceOpDesc.scala | 14 +- .../difference/DifferenceOpExec.scala | 6 +- .../operator/distinct/DistinctOpDesc.scala | 14 +- .../operator/distinct/DistinctOpExec.scala | 6 +- .../amber/operator/dummy/DummyOpDesc.scala | 8 +- .../amber/operator/filter/ComparisonType.java | 2 +- .../amber/operator/filter/FilterOpDesc.scala | 8 +- .../amber/operator/filter/FilterOpExec.scala | 6 +- .../operator/filter/FilterPredicate.java | 16 +- .../filter/SpecializedFilterOpDesc.scala | 14 +- .../filter/SpecializedFilterOpExec.scala | 6 +- .../operator/flatmap/FlatMapOpDesc.scala | 4 +- .../operator/flatmap/FlatMapOpExec.scala | 6 +- .../hashJoin/HashJoinBuildOpExec.scala | 8 +- .../operator/hashJoin/HashJoinOpDesc.scala | 24 +-- .../hashJoin/HashJoinProbeOpExec.scala | 10 +- .../amber/operator/hashJoin/JoinType.java | 2 +- ...gingFaceIrisLogisticRegressionOpDesc.scala | 12 +- .../HuggingFaceSentimentAnalysisOpDesc.scala | 12 +- .../HuggingFaceSpamSMSDetectionOpDesc.scala | 12 +- .../HuggingFaceTextSummarizationOpDesc.scala | 12 +- .../amber/operator/ifStatement/IfOpDesc.scala | 16 +- .../amber/operator/ifStatement/IfOpExec.scala | 12 +- .../operator/intersect/IntersectOpDesc.scala | 14 +- .../operator/intersect/IntersectOpExec.scala | 6 +- .../intervalJoin/IntervalJoinOpDesc.scala | 20 +- .../intervalJoin/IntervalJoinOpExec.scala | 12 +- .../intervalJoin/TimeIntervalType.java | 2 +- .../keywordSearch/KeywordSearchOpDesc.scala | 18 +- .../keywordSearch/KeywordSearchOpExec.scala | 8 +- .../amber/operator/limit/LimitOpDesc.scala | 16 +- .../amber/operator/limit/LimitOpExec.scala | 8 +- .../Scorer/MachineLearningScorerOpDesc.scala | 12 +- .../Scorer/classificationMetricsFnc.java | 2 +- .../Scorer/regressionMetricsFnc.java | 2 +- ...rnAdvancedKNNClassifierTrainerOpDesc.scala | 4 +- .../SklearnAdvancedKNNParameters.java | 4 +- ...arnAdvancedKNNRegressorTrainerOpDesc.scala | 4 +- .../SklearnAdvancedSVCParameters.java | 4 +- .../SklearnAdvancedSVCTrainerOpDesc.scala | 4 +- .../SklearnAdvancedSVRParameters.java | 4 +- .../SklearnAdvancedSVRTrainerOpDesc.scala | 4 +- .../sklearnAdvanced/base/HyperParameters.java | 6 +- .../base/SklearnAdvancedBaseDesc.scala | 12 +- .../amber/operator/map/MapOpDesc.scala | 8 +- .../amber/operator/map/MapOpExec.scala | 6 +- .../amber/operator/metadata/OPVersion.java | 2 +- .../metadata/OperatorGroupConstants.scala | 2 +- .../metadata/OperatorMetadataGenerator.scala | 10 +- .../metadata/PropertyNameConstants.scala | 2 +- .../annotations/AutofillAttributeName.java | 2 +- .../AutofillAttributeNameLambda.java | 2 +- .../AutofillAttributeNameList.java | 2 +- .../AutofillAttributeNameOnPort1.java | 2 +- .../metadata/annotations/BatchByColumn.java | 2 +- .../annotations/CommonOpDescAnnotation.java | 2 +- .../metadata/annotations/EnablePresets.java | 2 +- .../metadata/annotations/HideAnnotation.java | 2 +- .../metadata/annotations/UIWidget.java | 2 +- .../operator/projection/AttributeUnit.java | 4 +- .../projection/ProjectionOpDesc.scala | 20 +- .../projection/ProjectionOpExec.scala | 8 +- .../RandomKSamplingOpDesc.scala | 16 +- .../RandomKSamplingOpExec.scala | 6 +- .../amber/operator/regex/RegexOpDesc.scala | 18 +- .../amber/operator/regex/RegexOpExec.scala | 8 +- .../ReservoirSamplingOpDesc.scala | 16 +- .../ReservoirSamplingOpExec.scala | 10 +- .../operator/sink/ProgressiveUtils.scala | 4 +- .../SklearnAdaptiveBoostingOpDesc.scala | 2 +- .../sklearn/SklearnBaggingOpDesc.scala | 2 +- .../SklearnBernoulliNaiveBayesOpDesc.scala | 2 +- .../sklearn/SklearnClassifierOpDesc.scala | 12 +- .../SklearnComplementNaiveBayesOpDesc.scala | 2 +- .../sklearn/SklearnDecisionTreeOpDesc.scala | 2 +- .../SklearnDummyClassifierOpDesc.scala | 2 +- .../sklearn/SklearnExtraTreeOpDesc.scala | 2 +- .../sklearn/SklearnExtraTreesOpDesc.scala | 2 +- .../SklearnGaussianNaiveBayesOpDesc.scala | 2 +- .../SklearnGradientBoostingOpDesc.scala | 2 +- .../operator/sklearn/SklearnKNNOpDesc.scala | 2 +- .../SklearnLinearRegressionOpDesc.scala | 12 +- .../sklearn/SklearnLinearSVMOpDesc.scala | 2 +- .../SklearnLogisticRegressionCVOpDesc.scala | 2 +- .../SklearnLogisticRegressionOpDesc.scala | 2 +- .../SklearnMultiLayerPerceptronOpDesc.scala | 2 +- .../SklearnMultinomialNaiveBayesOpDesc.scala | 2 +- .../SklearnNearestCentroidOpDesc.scala | 2 +- .../SklearnPassiveAggressiveOpDesc.scala | 2 +- .../sklearn/SklearnPerceptronOpDesc.scala | 2 +- .../sklearn/SklearnPredictionOpDesc.scala | 12 +- .../SklearnProbabilityCalibrationOpDesc.scala | 2 +- .../sklearn/SklearnRandomForestOpDesc.scala | 2 +- .../sklearn/SklearnRidgeCVOpDesc.scala | 2 +- .../operator/sklearn/SklearnRidgeOpDesc.scala | 2 +- .../operator/sklearn/SklearnSDGOpDesc.scala | 2 +- .../operator/sklearn/SklearnSVMOpDesc.scala | 2 +- ...klearnTrainingAdaptiveBoostingOpDesc.scala | 2 +- .../SklearnTrainingBaggingOpDesc.scala | 2 +- ...arnTrainingBernoulliNaiveBayesOpDesc.scala | 2 +- ...rnTrainingComplementNaiveBayesOpDesc.scala | 2 +- .../SklearnTrainingDecisionTreeOpDesc.scala | 2 +- ...SklearnTrainingDummyClassifierOpDesc.scala | 2 +- .../SklearnTrainingExtraTreeOpDesc.scala | 2 +- .../SklearnTrainingExtraTreesOpDesc.scala | 2 +- ...earnTrainingGaussianNaiveBayesOpDesc.scala | 2 +- ...klearnTrainingGradientBoostingOpDesc.scala | 2 +- .../training/SklearnTrainingKNNOpDesc.scala | 2 +- ...klearnTrainingLinearRegressionOpDesc.scala | 2 +- .../SklearnTrainingLinearSVMOpDesc.scala | 2 +- ...rnTrainingLogisticRegressionCVOpDesc.scala | 2 +- ...earnTrainingLogisticRegressionOpDesc.scala | 2 +- ...rnTrainingMultiLayerPerceptronOpDesc.scala | 2 +- ...nTrainingMultinomialNaiveBayesOpDesc.scala | 2 +- ...SklearnTrainingNearestCentroidOpDesc.scala | 2 +- .../training/SklearnTrainingOpDesc.scala | 12 +- ...learnTrainingPassiveAggressiveOpDesc.scala | 2 +- .../SklearnTrainingPerceptronOpDesc.scala | 2 +- ...TrainingProbabilityCalibrationOpDesc.scala | 2 +- .../SklearnTrainingRandomForestOpDesc.scala | 2 +- .../SklearnTrainingRidgeCVOpDesc.scala | 2 +- .../training/SklearnTrainingRidgeOpDesc.scala | 2 +- .../training/SklearnTrainingSDGOpDesc.scala | 2 +- .../training/SklearnTrainingSVMOpDesc.scala | 2 +- .../amber/operator/sleep/SleepOpDesc.scala | 16 +- .../amber/operator/sleep/SleepOpExec.scala | 8 +- .../amber/operator/sort/SortCriteriaUnit.java | 6 +- .../amber/operator/sort/SortOpDesc.scala | 10 +- .../amber/operator/sort/SortPreference.java | 2 +- .../operator/sort/StableMergeSortOpDesc.scala | 16 +- .../operator/sort/StableMergeSortOpExec.scala | 8 +- .../sortPartitions/SortPartitionsOpDesc.scala | 18 +- .../sortPartitions/SortPartitionsOpExec.scala | 8 +- .../operator/source/BufferedBlockReader.java | 2 +- .../PythonSourceOperatorDescriptor.scala | 4 +- .../source/SourceOperatorDescriptor.scala | 6 +- .../reddit/RedditSearchSourceOpDesc.scala | 10 +- .../reddit/RedditSourceOperatorFunction.java | 2 +- .../apis/twitter/TwitterSourceOpDesc.scala | 8 +- .../apis/twitter/TwitterSourceOpExec.scala | 6 +- ...TwitterFullArchiveSearchSourceOpDesc.scala | 18 +- ...TwitterFullArchiveSearchSourceOpExec.scala | 10 +- .../v2/TwitterSearchSourceOpDesc.scala | 18 +- .../v2/TwitterSearchSourceOpExec.scala | 10 +- .../source/apis/twitter/v2/TwitterUtils.scala | 4 +- .../source/cache/CacheSourceOpExec.scala | 10 +- .../source/fetcher/DecodingMethod.java | 2 +- .../source/fetcher/RandomUserAgent.java | 2 +- .../source/fetcher/URLFetchUtil.scala | 2 +- .../source/fetcher/URLFetcherOpDesc.scala | 18 +- .../source/fetcher/URLFetcherOpExec.scala | 10 +- .../source/scan/AutoClosingIterator.scala | 2 +- .../source/scan/FileAttributeType.java | 4 +- .../source/scan/FileDecodingMethod.java | 2 +- .../source/scan/FileScanSourceOpDesc.scala | 18 +- .../source/scan/FileScanSourceOpExec.scala | 12 +- .../source/scan/ScanSourceOpDesc.scala | 12 +- .../source/scan/arrow/ArrowSourceOpDesc.scala | 20 +- .../source/scan/arrow/ArrowSourceOpExec.scala | 12 +- .../source/scan/csv/CSVScanSourceOpDesc.scala | 20 +- .../source/scan/csv/CSVScanSourceOpExec.scala | 10 +- .../csv/ParallelCSVScanSourceOpDesc.scala | 20 +- .../csv/ParallelCSVScanSourceOpExec.scala | 12 +- .../scan/csvOld/CSVOldScanSourceOpDesc.scala | 20 +- .../scan/csvOld/CSVOldScanSourceOpExec.scala | 10 +- .../scan/json/JSONLScanSourceOpDesc.scala | 20 +- .../scan/json/JSONLScanSourceOpExec.scala | 14 +- .../operator/source/scan/json/JSONUtil.scala | 2 +- .../scan/text/TextInputSourceOpDesc.scala | 20 +- .../scan/text/TextInputSourceOpExec.scala | 12 +- .../source/scan/text/TextSourceOpDesc.scala | 6 +- .../operator/source/sql/SQLSourceOpDesc.scala | 8 +- .../operator/source/sql/SQLSourceOpExec.scala | 10 +- .../sql/asterixdb/AsterixDBConnUtil.scala | 2 +- .../sql/asterixdb/AsterixDBSourceOpDesc.scala | 24 +-- .../sql/asterixdb/AsterixDBSourceOpExec.scala | 12 +- .../source/sql/mysql/MySQLConnUtil.scala | 2 +- .../source/sql/mysql/MySQLSourceOpDesc.scala | 18 +- .../source/sql/mysql/MySQLSourceOpExec.scala | 10 +- .../sql/postgresql/PostgreSQLConnUtil.scala | 2 +- .../postgresql/PostgreSQLSourceOpDesc.scala | 20 +- .../postgresql/PostgreSQLSourceOpExec.scala | 10 +- .../amber/operator/split/SplitOpDesc.scala | 18 +- .../amber/operator/split/SplitOpExec.scala | 10 +- .../SubstringSearchOpDesc.scala | 18 +- .../SubstringSearchOpExec.scala | 8 +- .../SymmetricDifferenceOpDesc.scala | 14 +- .../SymmetricDifferenceOpExec.scala | 6 +- .../timeSeriesPlot/TimeSeriesPlot.scala | 14 +- .../typecasting/TypeCastingOpDesc.scala | 18 +- .../typecasting/TypeCastingOpExec.scala | 8 +- .../operator/typecasting/TypeCastingUnit.java | 6 +- .../operator/udf/java/JavaUDFOpDesc.scala | 20 +- .../DualInputPortsPythonUDFOpDescV2.scala | 14 +- .../udf/python/LambdaAttributeUnit.java | 8 +- .../python/PythonLambdaFunctionOpDesc.scala | 10 +- .../udf/python/PythonTableReducerOpDesc.scala | 10 +- .../udf/python/PythonUDFOpDescV2.scala | 14 +- .../source/PythonUDFSourceOpDescV2.scala | 14 +- .../amber/operator/udf/r/RUDFOpDesc.scala | 14 +- .../operator/udf/r/RUDFSourceOpDesc.scala | 14 +- .../amber/operator/union/UnionOpDesc.scala | 14 +- .../amber/operator/union/UnionOpExec.scala | 6 +- .../unneststring/UnnestStringOpDesc.scala | 25 ++- .../unneststring/UnnestStringOpExec.scala | 8 +- .../util/OperatorDescriptorUtils.scala | 2 +- .../visualization/DotPlot/DotPlotOpDesc.scala | 14 +- .../IcicleChart/IcicleChartOpDesc.scala | 16 +- .../operator/visualization/ImageUtility.scala | 2 +- .../ImageViz/ImageVisualizerOpDesc.scala | 14 +- .../ScatterMatrixChartOpDesc.scala | 14 +- .../barChart/BarChartOpDesc.scala | 14 +- .../boxViolinPlot/BoxViolinPlotOpDesc.scala | 14 +- .../BoxViolinPlotQuartileFunction.java | 2 +- .../bubbleChart/BubbleChartOpDesc.scala | 14 +- .../bulletChart/BulletChartOpDesc.scala | 14 +- .../BulletChartStepDefinition.scala | 2 +- .../CandlestickChartOpDesc.scala | 14 +- .../choroplethMap/ChoroplethMapOpDesc.scala | 14 +- .../continuousErrorBands/BandConfig.scala | 6 +- .../ContinuousErrorBandsOpDesc.scala | 12 +- .../ContourPlotColoringFunction.java | 2 +- .../contourPlot/ContourPlotOpDesc.scala | 14 +- .../dendrogram/DendrogramOpDesc.scala | 14 +- .../dumbbellPlot/DumbbellDotConfig.scala | 4 +- .../dumbbellPlot/DumbbellPlotOpDesc.scala | 14 +- .../FigureFactoryTableConfig.scala | 4 +- .../FigureFactoryTableOpDesc.scala | 12 +- .../filledAreaPlot/FilledAreaPlotOpDesc.scala | 14 +- .../funnelPlot/FunnelPlotOpDesc.scala | 14 +- .../ganttChart/GanttChartOpDesc.scala | 14 +- .../gaugeChart/GaugeChartOpDesc.scala | 14 +- .../gaugeChart/GaugeChartSteps.scala | 2 +- .../visualization/heatMap/HeatMapOpDesc.scala | 14 +- .../hierarchychart/HierarchyChartOpDesc.scala | 14 +- .../hierarchychart/HierarchyChartType.java | 2 +- .../hierarchychart/HierarchySection.scala | 4 +- .../histogram/HistogramChartOpDesc.scala | 14 +- .../histogram2d/Histogram2DOpDesc.scala | 14 +- .../histogram2d/NormalizationType.java | 2 +- .../visualization/htmlviz/HtmlVizOpDesc.scala | 27 ++- .../visualization/htmlviz/HtmlVizOpExec.scala | 8 +- .../lineChart/LineChartOpDesc.scala | 12 +- .../visualization/lineChart/LineConfig.scala | 4 +- .../visualization/lineChart/LineMode.java | 2 +- .../nestedTable/NestedTableConfig.scala | 4 +- .../nestedTable/NestedTableOpDesc.scala | 12 +- .../networkGraph/NetworkGraphOpDesc.scala | 14 +- .../pieChart/PieChartOpDesc.scala | 14 +- .../quiverPlot/QuiverPlotOpDesc.scala | 14 +- .../RangeSliderHandleDuplicateFunction.java | 2 +- .../rangeSlider/RangeSliderOpDesc.scala | 14 +- .../sankeyDiagram/SankeyDiagramOpDesc.scala | 14 +- .../scatter3DChart/Scatter3dChartOpDesc.scala | 14 +- .../scatterplot/ScatterplotOpDesc.scala | 14 +- .../stripChart/StripChartOpDesc.scala | 14 +- .../tablesChart/TablesConfig.scala | 4 +- .../tablesChart/TablesPlotOpDesc.scala | 12 +- .../ternaryPlot/TernaryPlotOpDesc.scala | 14 +- .../treeplot/TreeplotOpDesc.scala | 14 +- .../visualization/urlviz/UrlVizOpDesc.scala | 27 ++- .../visualization/urlviz/UrlVizOpExec.scala | 8 +- .../volcanoPlot/VolcanoPlotOpDesc.scala | 14 +- .../waterfallChart/WaterfallChartOpDesc.scala | 14 +- .../wordCloud/WordCloudOpDesc.scala | 16 +- .../amber/util/ObjectMapperUtils.scala | 4 +- .../operator/aggregate/AggregateOpSpec.scala | 6 +- .../CartesianProductOpExecSpec.scala | 6 +- .../DictionaryMatcherOpExecSpec.scala | 8 +- .../difference/DifferenceOpExecSpec.scala | 4 +- .../distinct/DistinctOpExecSpec.scala | 4 +- .../filter/SpecializedFilterOpExecSpec.scala | 6 +- .../operator/hashJoin/HashJoinOpSpec.scala | 10 +- .../intersect/IntersectOpExecSpec.scala | 8 +- .../intervalJoin/IntervalOpExecSpec.scala | 10 +- .../KeywordSearchOpExecSpec.scala | 6 +- .../projection/ProjectionOpDescSpec.scala | 6 +- .../projection/ProjectionOpExecSpec.scala | 6 +- .../sort/StableMergeSortOpExecSpec.scala | 6 +- .../SortPartitionsOpExecSpec.scala | 6 +- .../source/fetcher/URLFetcherOpExecSpec.scala | 6 +- .../scan/FileScanSourceOpExecSpec.scala | 6 +- .../scan/csv/CSVScanSourceOpDescSpec.scala | 13 +- .../scan/text/FileScanSourceOpDescSpec.scala | 12 +- .../scan/text/TextInputSourceOpDescSpec.scala | 10 +- .../SymmetricDifferenceOpExecSpec.scala | 4 +- .../typecasting/TypeCastingOpExecSpec.scala | 6 +- .../PythonLambdaFunctionOpDescSpec.scala | 6 +- .../unneststring/UnnestStringOpExecSpec.scala | 8 +- .../DotPlot/DotPlotOpDescSpec.scala | 2 +- .../ImageViz/ImageVisualizerOpDescSpec.scala | 2 +- .../barChart/BarChartOpDescSpec.scala | 2 +- .../bubbleChart/BubbleChartOpDescSpec.scala | 2 +- .../FilledAreaPlotOpDescSpec.scala | 2 +- .../ganttChart/GanttChartOpDescSpec.scala | 2 +- .../HierarchyChartOpDescSpec.scala | 2 +- .../htmlviz/HtmlVizOpExecSpec.scala | 8 +- .../pieChart/PieChartOpDescSpec.scala | 2 +- .../scatterplot/ScatterPlotOpDescSpec.scala | 2 +- .../amber/util/ArrowUtilsSpec.scala | 6 +- .../ComputingUnitManagingService.scala | 2 +- .../ComputingUnitManagingResource.scala | 2 +- .../apache/texera/service/ConfigService.scala | 2 +- .../apache/texera/service/FileService.scala | 4 +- .../service/resource/DatasetResource.scala | 8 +- .../type/dataset/DatasetFileNode.scala | 2 +- .../apache/texera/service/MockLakeFS.scala | 2 +- .../resource/DatasetResourceSpec.scala | 2 +- frontend/src/app/common/type/physical-plan.ts | 4 +- .../amber/engine/common/virtualidentity.ts | 2 +- .../amber/engine/common/workflow.ts | 2 +- .../app/common/util/port-identity-serde.ts | 2 +- .../amber/compiler/WorkflowCompiler.scala | 21 +- .../amber/compiler/model/LogicalLink.scala | 6 +- .../amber/compiler/model/LogicalPlan.scala | 12 +- .../compiler/model/LogicalPlanPojo.scala | 4 +- .../service/WorkflowCompilingService.scala | 4 +- .../WorkflowCompilationResource.scala | 14 +- .../WorkflowCompilationResourceSpec.scala | 18 +- 709 files changed, 3239 insertions(+), 3020 deletions(-) rename amber/src/main/protobuf/org/apache/{ => texera}/amber/engine/architecture/rpc/controlcommands.proto (90%) rename amber/src/main/protobuf/org/apache/{ => texera}/amber/engine/architecture/rpc/controllerservice.proto (90%) rename amber/src/main/protobuf/org/apache/{ => texera}/amber/engine/architecture/rpc/controlreturns.proto (93%) rename amber/src/main/protobuf/org/apache/{ => texera}/amber/engine/architecture/rpc/testerservice.proto (87%) rename amber/src/main/protobuf/org/apache/{ => texera}/amber/engine/architecture/rpc/workerservice.proto (91%) rename amber/src/main/protobuf/org/apache/{ => texera}/amber/engine/architecture/sendsemantics/partitionings.proto (93%) rename amber/src/main/protobuf/org/apache/{ => texera}/amber/engine/architecture/worker/statistics.proto (93%) rename amber/src/main/protobuf/org/apache/{ => texera}/amber/engine/common/actormessage.proto (96%) rename amber/src/main/protobuf/org/apache/{ => texera}/amber/engine/common/ambermessage.proto (84%) rename amber/src/main/protobuf/org/apache/{ => texera}/amber/engine/common/executionruntimestate.proto (86%) rename amber/src/main/python/proto/org/apache/{ => texera}/amber/__init__.py (100%) rename amber/src/main/python/proto/org/apache/{ => texera}/amber/core/__init__.py (100%) rename amber/src/main/python/proto/org/apache/{ => texera}/amber/engine/__init__.py (100%) rename amber/src/main/python/proto/org/apache/{ => texera}/amber/engine/architecture/__init__.py (100%) rename amber/src/main/python/proto/org/apache/{ => texera}/amber/engine/architecture/rpc/__init__.py (87%) rename amber/src/main/python/proto/org/apache/{ => texera}/amber/engine/architecture/sendsemantics/__init__.py (100%) rename amber/src/main/python/proto/org/apache/{ => texera}/amber/engine/architecture/worker/__init__.py (100%) rename amber/src/main/python/proto/org/apache/{ => texera}/amber/engine/common/__init__.py (100%) rename amber/src/main/scala/org/apache/{ => texera}/amber/clustering/ClusterListener.scala (88%) rename amber/src/main/scala/org/apache/{ => texera}/amber/clustering/SingleNodeListener.scala (89%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/common/AkkaActorRefMappingService.scala (91%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/common/AkkaActorService.scala (92%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/common/AkkaMessageTransferService.scala (91%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/common/AmberProcessor.scala (74%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/common/ExecutorDeployment.scala (79%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/common/ProcessingStepCursor.scala (86%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/common/WorkflowActor.scala (92%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/controller/ClientEvent.scala (78%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/controller/Controller.scala (88%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/controller/ControllerAsyncRPCHandlerInitializer.scala (75%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/controller/ControllerProcessor.scala (79%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/controller/ControllerTimerService.scala (78%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/controller/GlobalReplayManager.scala (91%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/controller/Workflow.scala (87%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/controller/WorkflowScheduler.scala (86%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/controller/execution/ChannelExecution.scala (92%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/controller/execution/ExecutionUtils.scala (92%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/controller/execution/LinkExecution.scala (89%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/controller/execution/OperatorExecution.scala (84%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/controller/execution/RegionExecution.scala (90%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/controller/execution/WorkerPortExecution.scala (92%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/controller/execution/WorkflowExecution.scala (90%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/controller/promisehandlers/ConsoleMessageHandler.scala (78%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/controller/promisehandlers/DebugCommandHandler.scala (74%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/controller/promisehandlers/EmbeddedControlMessageHandler.scala (86%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/controller/promisehandlers/EvaluatePythonExpressionHandler.scala (81%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/controller/promisehandlers/LinkWorkersHandler.scala (86%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/controller/promisehandlers/PauseHandler.scala (86%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/controller/promisehandlers/PortCompletedHandler.scala (86%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/controller/promisehandlers/QueryWorkerStatisticsHandler.scala (88%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/controller/promisehandlers/ResumeHandler.scala (84%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/controller/promisehandlers/RetrieveWorkflowStateHandler.scala (75%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/controller/promisehandlers/RetryWorkflowHandler.scala (79%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/controller/promisehandlers/StartWorkflowHandler.scala (76%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/controller/promisehandlers/TakeGlobalCheckpointHandler.scala (81%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/controller/promisehandlers/WorkerExecutionCompletedHandler.scala (86%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/controller/promisehandlers/WorkerStateUpdatedHandler.scala (83%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/deploysemantics/AddressInfo.scala (93%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/deploysemantics/deploystrategy/DeployStrategy.scala (92%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/deploysemantics/deploystrategy/OneOnEach.scala (93%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/deploysemantics/deploystrategy/RandomDeployment.scala (93%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/deploysemantics/deploystrategy/RoundRobinDeployment.scala (93%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/deploysemantics/layer/WorkerExecution.scala (88%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/logreplay/AsyncReplayLogWriter.scala (89%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/logreplay/EmptyReplayLogger.scala (82%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/logreplay/OrderEnforcer.scala (87%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/logreplay/ReplayLogGenerator.scala (85%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/logreplay/ReplayLogManager.scala (86%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/logreplay/ReplayLogger.scala (81%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/logreplay/ReplayLoggerImpl.scala (89%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/logreplay/ReplayOrderEnforcer.scala (95%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/messaginglayer/AmberFIFOChannel.scala (88%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/messaginglayer/CongestionControl.scala (95%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/messaginglayer/DeadLetterMonitorActor.scala (89%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/messaginglayer/FlowControl.scala (94%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/messaginglayer/InputGateway.scala (85%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/messaginglayer/InputManager.scala (88%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/messaginglayer/NetworkInputGateway.scala (90%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/messaginglayer/NetworkOutputGateway.scala (90%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/messaginglayer/OrderingEnforcer.scala (95%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/messaginglayer/OutputManager.scala (92%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/messaginglayer/WorkerPort.scala (84%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/messaginglayer/WorkerTimerService.scala (77%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/pythonworker/PythonProxyClient.scala (91%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/pythonworker/PythonProxyServer.scala (90%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/pythonworker/PythonWorkflowWorker.scala (86%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/pythonworker/WorkerBatchInternalQueue.scala (89%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/scheduling/CostBasedScheduleGenerator.scala (97%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/scheduling/CostEstimator.scala (90%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/scheduling/ExpansionGreedyScheduleGenerator.scala (97%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/scheduling/Region.scala (92%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/scheduling/RegionExecutionCoordinator.scala (94%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/scheduling/RegionPlan.scala (93%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/scheduling/Schedule.scala (95%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/scheduling/ScheduleGenerator.scala (94%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/scheduling/SchedulingUtils.scala (96%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/scheduling/WorkflowExecutionCoordinator.scala (89%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/scheduling/config/ChannelConfig.scala (90%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/scheduling/config/LinkConfig.scala (91%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/scheduling/config/OperatorConfig.scala (93%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/scheduling/config/PortConfig.scala (93%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/scheduling/config/ResourceConfig.scala (82%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/scheduling/config/WorkerConfig.scala (83%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/scheduling/resourcePolicies/ExecutionClusterInfo.scala (91%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/scheduling/resourcePolicies/ResourceAllocator.scala (90%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/sendsemantics/partitioners/BroadcastPartitioner.scala (79%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/sendsemantics/partitioners/HashBasedShufflePartitioner.scala (82%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/sendsemantics/partitioners/OneToOnePartitioner.scala (79%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/sendsemantics/partitioners/Partitioner.scala (77%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/sendsemantics/partitioners/RangeBasedShufflePartitioner.scala (86%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/sendsemantics/partitioners/RoundRobinPartitioner.scala (80%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/worker/DPThread.scala (89%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/worker/DataProcessor.scala (86%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/worker/DataProcessorRPCHandlerInitializer.scala (78%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/worker/EmbeddedControlMessageManager.scala (87%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/worker/PauseManager.scala (89%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/worker/PauseType.scala (88%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/worker/WorkflowWorker.scala (85%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/worker/managers/InputPortMaterializationReaderThread.scala (80%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/worker/managers/OutputPortResultWriterThread.scala (89%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/worker/managers/SerializationManager.scala (79%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/worker/managers/StatisticsManager.scala (94%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/worker/promisehandlers/AddInputChannelHandler.scala (74%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/worker/promisehandlers/AddPartitioningHandler.scala (74%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/worker/promisehandlers/AssignPortHandler.scala (75%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/worker/promisehandlers/EndChannelHandler.scala (82%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/worker/promisehandlers/EndHandler.scala (83%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/worker/promisehandlers/FinalizeCheckpointHandler.scala (83%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/worker/promisehandlers/FlushNetworkBufferHandler.scala (75%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/worker/promisehandlers/InitializeExecutorHandler.scala (78%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/worker/promisehandlers/OpenExecutorHandler.scala (74%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/worker/promisehandlers/PauseHandler.scala (71%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/worker/promisehandlers/PrepareCheckpointHandler.scala (84%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/worker/promisehandlers/QueryStatisticsHandler.scala (71%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/worker/promisehandlers/ResumeHandler.scala (72%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/worker/promisehandlers/RetrieveStateHandler.scala (74%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/worker/promisehandlers/StartChannelHandler.scala (69%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/architecture/worker/promisehandlers/StartHandler.scala (75%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/common/AmberConfig.scala (95%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/common/AmberKryoInitializer.scala (96%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/common/AmberLogging.scala (86%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/common/AmberRuntime.scala (94%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/common/CheckpointState.scala (96%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/common/CheckpointSupport.scala (88%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/common/ElidableStatement.scala (96%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/common/FutureBijection.scala (97%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/common/SerializedState.scala (97%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/common/Utils.scala (97%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/common/amberexception/BreakpointException.scala (88%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/common/ambermessage/DataPayload.scala (90%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/common/ambermessage/DirectControlMessagePayload.scala (93%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/common/ambermessage/RecoveryPayload.scala (91%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/common/ambermessage/WorkflowFIFOMessagePayload.scala (93%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/common/ambermessage/WorkflowMessage.scala (90%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/common/client/AmberClient.scala (83%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/common/client/ClientActor.scala (80%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/common/rpc/AsyncRPCClient.scala (88%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/common/rpc/AsyncRPCHandlerInitializer.scala (82%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/common/rpc/AsyncRPCServer.scala (87%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/common/statetransition/StateManager.scala (90%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/common/statetransition/WorkerStateManager.scala (83%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/common/storage/EmptyRecordStorage.scala (92%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/common/storage/HDFSRecordStorage.scala (95%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/common/storage/SequentialRecordStorage.scala (95%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/common/storage/VFSRecordStorage.scala (94%) rename amber/src/main/scala/org/apache/{ => texera}/amber/engine/common/virtualidentity/util.scala (88%) rename amber/src/main/scala/org/apache/{ => texera}/amber/error/ErrorUtils.scala (90%) rename amber/src/test/scala/org/apache/{ => texera}/amber/engine/architecture/breakpoint/ExceptionBreakpointSpec.scala (99%) rename amber/src/test/scala/org/apache/{ => texera}/amber/engine/architecture/control/TrivialControlSpec.scala (85%) rename amber/src/test/scala/org/apache/{ => texera}/amber/engine/architecture/control/utils/ChainHandler.scala (85%) rename amber/src/test/scala/org/apache/{ => texera}/amber/engine/architecture/control/utils/CollectHandler.scala (87%) rename amber/src/test/scala/org/apache/{ => texera}/amber/engine/architecture/control/utils/ErrorHandler.scala (84%) rename amber/src/test/scala/org/apache/{ => texera}/amber/engine/architecture/control/utils/MultiCallHandler.scala (81%) rename amber/src/test/scala/org/apache/{ => texera}/amber/engine/architecture/control/utils/NestedHandler.scala (86%) rename amber/src/test/scala/org/apache/{ => texera}/amber/engine/architecture/control/utils/PingPongHandler.scala (88%) rename amber/src/test/scala/org/apache/{ => texera}/amber/engine/architecture/control/utils/RecursionHandler.scala (85%) rename amber/src/test/scala/org/apache/{ => texera}/amber/engine/architecture/control/utils/TesterAsyncRPCHandlerInitializer.scala (72%) rename amber/src/test/scala/org/apache/{ => texera}/amber/engine/architecture/control/utils/TrivialControlTester.scala (73%) rename amber/src/test/scala/org/apache/{ => texera}/amber/engine/architecture/controller/ControllerSpec.scala (99%) rename amber/src/test/scala/org/apache/{ => texera}/amber/engine/architecture/messaginglayer/NetworkInputGatewaySpec.scala (89%) rename amber/src/test/scala/org/apache/{ => texera}/amber/engine/architecture/messaginglayer/OutputManagerSpec.scala (88%) rename amber/src/test/scala/org/apache/{ => texera}/amber/engine/architecture/messaginglayer/RangeBasedShuffleSpec.scala (91%) rename amber/src/test/scala/org/apache/{ => texera}/amber/engine/architecture/pythonworker/PythonWorkflowWorkerSpec.scala (83%) rename amber/src/test/scala/org/apache/{ => texera}/amber/engine/architecture/scheduling/CostBasedScheduleGeneratorSpec.scala (96%) rename amber/src/test/scala/org/apache/{ => texera}/amber/engine/architecture/scheduling/DefaultCostEstimatorSpec.scala (91%) rename amber/src/test/scala/org/apache/{ => texera}/amber/engine/architecture/scheduling/ExpansionGreedyScheduleGeneratorSpec.scala (95%) rename amber/src/test/scala/org/apache/{ => texera}/amber/engine/architecture/worker/DPThreadSpec.scala (89%) rename amber/src/test/scala/org/apache/{ => texera}/amber/engine/architecture/worker/DataProcessorSpec.scala (85%) rename amber/src/test/scala/org/apache/{ => texera}/amber/engine/architecture/worker/WorkerSpec.scala (86%) rename amber/src/test/scala/org/apache/{ => texera}/amber/engine/e2e/BatchSizePropagationSpec.scala (94%) rename amber/src/test/scala/org/apache/{ => texera}/amber/engine/e2e/DataProcessingSpec.scala (91%) rename amber/src/test/scala/org/apache/{ => texera}/amber/engine/e2e/PauseSpec.scala (86%) rename amber/src/test/scala/org/apache/{ => texera}/amber/engine/e2e/TestUtils.scala (94%) rename amber/src/test/scala/org/apache/{ => texera}/amber/engine/faulttolerance/CheckpointSpec.scala (86%) rename amber/src/test/scala/org/apache/{ => texera}/amber/engine/faulttolerance/LoggingSpec.scala (80%) rename amber/src/test/scala/org/apache/{ => texera}/amber/engine/faulttolerance/ReplaySpec.scala (83%) rename common/config/src/main/scala/org/apache/{ => texera}/amber/config/AkkaConfig.scala (96%) rename common/config/src/main/scala/org/apache/{ => texera}/amber/config/ApplicationConfig.scala (99%) rename common/config/src/main/scala/org/apache/{ => texera}/amber/config/EnvironmentalVariable.scala (99%) rename common/config/src/main/scala/org/apache/{ => texera}/amber/config/StorageConfig.scala (98%) rename common/config/src/main/scala/org/apache/{ => texera}/amber/config/UdfConfig.scala (97%) rename common/config/src/main/scala/org/apache/{ => texera}/amber/util/ConfigParserUtil.scala (97%) rename common/workflow-core/src/main/protobuf/org/apache/{ => texera}/amber/core/executor.proto (93%) rename common/workflow-core/src/main/protobuf/org/apache/{ => texera}/amber/core/virtualidentity.proto (97%) rename common/workflow-core/src/main/protobuf/org/apache/{ => texera}/amber/core/workflow.proto (95%) rename common/workflow-core/src/main/protobuf/org/apache/{ => texera}/amber/core/workflowruntimestate.proto (97%) rename common/workflow-core/src/main/scala/org/apache/{ => texera}/amber/core/WorkflowRuntimeException.scala (93%) rename common/workflow-core/src/main/scala/org/apache/{ => texera}/amber/core/executor/ExecFactory.scala (97%) rename common/workflow-core/src/main/scala/org/apache/{ => texera}/amber/core/executor/JavaRuntimeCompilation.scala (97%) rename common/workflow-core/src/main/scala/org/apache/{ => texera}/amber/core/executor/OperatorExecutor.scala (88%) rename common/workflow-core/src/main/scala/org/apache/{ => texera}/amber/core/executor/SourceOperatorExecutor.scala (90%) rename common/workflow-core/src/main/scala/org/apache/{ => texera}/amber/core/state/State.scala (93%) rename common/workflow-core/src/main/scala/org/apache/{ => texera}/amber/core/storage/DocumentFactory.scala (91%) rename common/workflow-core/src/main/scala/org/apache/{ => texera}/amber/core/storage/FileResolver.scala (99%) rename common/workflow-core/src/main/scala/org/apache/{ => texera}/amber/core/storage/IcebergCatalogInstance.scala (94%) rename common/workflow-core/src/main/scala/org/apache/{ => texera}/amber/core/storage/VFSURIFactory.scala (93%) rename common/workflow-core/src/main/scala/org/apache/{ => texera}/amber/core/storage/model/BufferedItemWriter.scala (97%) rename common/workflow-core/src/main/scala/org/apache/{ => texera}/amber/core/storage/model/DatasetFileDocument.scala (95%) rename common/workflow-core/src/main/scala/org/apache/{ => texera}/amber/core/storage/model/OnDataset.scala (94%) rename common/workflow-core/src/main/scala/org/apache/{ => texera}/amber/core/storage/model/ReadonlyLocalFileDocument.scala (97%) rename common/workflow-core/src/main/scala/org/apache/{ => texera}/amber/core/storage/model/ReadonlyVirtualDocument.scala (97%) rename common/workflow-core/src/main/scala/org/apache/{ => texera}/amber/core/storage/model/VirtualCollection.scala (96%) rename common/workflow-core/src/main/scala/org/apache/{ => texera}/amber/core/storage/model/VirtualDocument.scala (99%) rename common/workflow-core/src/main/scala/org/apache/{ => texera}/amber/core/storage/result/ResultSchema.scala (92%) rename common/workflow-core/src/main/scala/org/apache/{ => texera}/amber/core/storage/result/WorkflowResultStore.scala (89%) rename common/workflow-core/src/main/scala/org/apache/{ => texera}/amber/core/storage/result/iceberg/IcebergDocument.scala (98%) rename common/workflow-core/src/main/scala/org/apache/{ => texera}/amber/core/storage/result/iceberg/IcebergTableWriter.scala (95%) rename common/workflow-core/src/main/scala/org/apache/{ => texera}/amber/core/storage/result/iceberg/OnIceberg.scala (94%) rename common/workflow-core/src/main/scala/org/apache/{ => texera}/amber/core/storage/util/LakeFSStorageClient.scala (99%) rename common/workflow-core/src/main/scala/org/apache/{ => texera}/amber/core/storage/util/StorageUtil.scala (96%) rename common/workflow-core/src/main/scala/org/apache/{ => texera}/amber/core/storage/util/dataset/GitVersionControlLocalFileStorage.java (99%) rename common/workflow-core/src/main/scala/org/apache/{ => texera}/amber/core/storage/util/dataset/JGitVersionControl.java (99%) rename common/workflow-core/src/main/scala/org/apache/{ => texera}/amber/core/storage/util/dataset/PhysicalFileNode.java (98%) rename common/workflow-core/src/main/scala/org/apache/{ => texera}/amber/core/tuple/Attribute.java (98%) rename common/workflow-core/src/main/scala/org/apache/{ => texera}/amber/core/tuple/AttributeType.java (99%) rename common/workflow-core/src/main/scala/org/apache/{ => texera}/amber/core/tuple/AttributeTypeUtils.scala (99%) rename common/workflow-core/src/main/scala/org/apache/{ => texera}/amber/core/tuple/BigObject.java (96%) rename common/workflow-core/src/main/scala/org/apache/{ => texera}/amber/core/tuple/Schema.scala (99%) rename common/workflow-core/src/main/scala/org/apache/{ => texera}/amber/core/tuple/Tuple.scala (98%) rename common/workflow-core/src/main/scala/org/apache/{ => texera}/amber/core/tuple/TupleLike.scala (98%) rename common/workflow-core/src/main/scala/org/apache/{ => texera}/amber/core/tuple/TupleUtils.scala (91%) rename common/workflow-core/src/main/scala/org/apache/{ => texera}/amber/core/workflow/LocationPreference.scala (96%) rename common/workflow-core/src/main/scala/org/apache/{ => texera}/amber/core/workflow/PartitionInfo.scala (98%) rename common/workflow-core/src/main/scala/org/apache/{ => texera}/amber/core/workflow/PhysicalOp.scala (98%) rename common/workflow-core/src/main/scala/org/apache/{ => texera}/amber/core/workflow/PhysicalPlan.scala (98%) rename common/workflow-core/src/main/scala/org/apache/{ => texera}/amber/core/workflow/WorkflowContext.scala (87%) rename common/workflow-core/src/main/scala/org/apache/{ => texera}/amber/core/workflow/WorkflowSettings.scala (95%) rename common/workflow-core/src/main/scala/org/apache/{ => texera}/amber/util/ArrowUtils.scala (98%) rename common/workflow-core/src/main/scala/org/apache/{ => texera}/amber/util/IcebergUtil.scala (98%) rename common/workflow-core/src/main/scala/org/apache/{ => texera}/amber/util/JSONUtils.scala (96%) rename common/workflow-core/src/main/scala/org/apache/{ => texera}/amber/util/VirtualIdentityUtils.scala (97%) rename common/workflow-core/src/main/scala/org/apache/{ => texera}/amber/util/serde/GlobalPortIdentitySerde.scala (93%) rename common/workflow-core/src/main/scala/org/apache/{ => texera}/amber/util/serde/PortIdentityKeyDeserializer.scala (92%) rename common/workflow-core/src/main/scala/org/apache/{ => texera}/amber/util/serde/PortIdentityKeySerializer.scala (88%) rename common/workflow-core/src/test/scala/org/apache/{ => texera}/amber/core/storage/model/VirtualDocumentSpec.scala (99%) rename common/workflow-core/src/test/scala/org/apache/{ => texera}/amber/core/tuple/AttributeTypeUtilsSpec.scala (98%) rename common/workflow-core/src/test/scala/org/apache/{ => texera}/amber/core/tuple/SchemaSpec.scala (99%) rename common/workflow-core/src/test/scala/org/apache/{ => texera}/amber/core/tuple/TupleSpec.scala (98%) rename common/workflow-core/src/test/scala/org/apache/{ => texera}/amber/storage/FileResolverSpec.scala (97%) rename common/workflow-core/src/test/scala/org/apache/{ => texera}/amber/storage/result/iceberg/IcebergDocumentConsoleMessagesSpec.scala (88%) rename common/workflow-core/src/test/scala/org/apache/{ => texera}/amber/storage/result/iceberg/IcebergDocumentSpec.scala (92%) rename common/workflow-core/src/test/scala/org/apache/{ => texera}/amber/storage/result/iceberg/IcebergTableStatsSpec.scala (94%) rename common/workflow-core/src/test/scala/org/apache/{ => texera}/amber/util/IcebergUtilSpec.scala (98%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/DummyProperties.scala (96%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/LogicalOp.scala (70%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/PortDescriptor.scala (92%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/PythonOperatorDescriptor.scala (88%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/SpecialPhysicalOpFactory.scala (86%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/TestOperators.scala (90%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/aggregate/AggregateOpDesc.scala (85%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/aggregate/AggregateOpExec.scala (92%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/aggregate/AggregationFunction.java (96%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/aggregate/AggregationOperation.scala (97%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/aggregate/DistributedAggregation.scala (95%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/cartesianProduct/CartesianProductOpDesc.scala (86%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/cartesianProduct/CartesianProductOpExec.scala (89%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/dictionary/DictionaryMatcherOpDesc.scala (79%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/dictionary/DictionaryMatcherOpExec.scala (96%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/dictionary/MatchingType.java (97%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/difference/DifferenceOpDesc.scala (80%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/difference/DifferenceOpExec.scala (90%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/distinct/DistinctOpDesc.scala (74%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/distinct/DistinctOpExec.scala (89%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/dummy/DummyOpDesc.scala (88%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/filter/ComparisonType.java (97%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/filter/FilterOpDesc.scala (81%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/filter/FilterOpExec.scala (87%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/filter/FilterPredicate.java (91%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/filter/SpecializedFilterOpDesc.scala (78%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/filter/SpecializedFilterOpExec.scala (87%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/flatmap/FlatMapOpDesc.scala (89%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/flatmap/FlatMapOpExec.scala (88%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/hashJoin/HashJoinBuildOpExec.scala (88%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/hashJoin/HashJoinOpDesc.scala (89%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/hashJoin/HashJoinProbeOpExec.scala (93%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/hashJoin/JoinType.java (95%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/huggingFace/HuggingFaceIrisLogisticRegressionOpDesc.scala (91%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/huggingFace/HuggingFaceSentimentAnalysisOpDesc.scala (91%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/huggingFace/HuggingFaceSpamSMSDetectionOpDesc.scala (87%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/huggingFace/HuggingFaceTextSummarizationOpDesc.scala (88%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/ifStatement/IfOpDesc.scala (81%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/ifStatement/IfOpExec.scala (83%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/intersect/IntersectOpDesc.scala (77%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/intersect/IntersectOpExec.scala (91%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/intervalJoin/IntervalJoinOpDesc.scala (89%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/intervalJoin/IntervalJoinOpExec.scala (95%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/intervalJoin/TimeIntervalType.java (96%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/keywordSearch/KeywordSearchOpDesc.scala (76%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/keywordSearch/KeywordSearchOpExec.scala (90%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/limit/LimitOpDesc.scala (81%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/limit/LimitOpExec.scala (84%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/machineLearning/Scorer/MachineLearningScorerOpDesc.scala (93%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/machineLearning/Scorer/classificationMetricsFnc.java (94%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/machineLearning/Scorer/regressionMetricsFnc.java (94%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/machineLearning/sklearnAdvanced/KNNTrainer/SklearnAdvancedKNNClassifierTrainerOpDesc.scala (85%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/machineLearning/sklearnAdvanced/KNNTrainer/SklearnAdvancedKNNParameters.java (89%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/machineLearning/sklearnAdvanced/KNNTrainer/SklearnAdvancedKNNRegressorTrainerOpDesc.scala (85%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/machineLearning/sklearnAdvanced/SVCTrainer/SklearnAdvancedSVCParameters.java (89%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/machineLearning/sklearnAdvanced/SVCTrainer/SklearnAdvancedSVCTrainerOpDesc.scala (85%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/machineLearning/sklearnAdvanced/SVRTrainer/SklearnAdvancedSVRParameters.java (90%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/machineLearning/sklearnAdvanced/SVRTrainer/SklearnAdvancedSVRTrainerOpDesc.scala (85%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/machineLearning/sklearnAdvanced/base/HyperParameters.java (91%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/machineLearning/sklearnAdvanced/base/SklearnAdvancedBaseDesc.scala (92%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/map/MapOpDesc.scala (81%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/map/MapOpExec.scala (89%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/metadata/OPVersion.java (97%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/metadata/OperatorGroupConstants.scala (98%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/metadata/OperatorMetadataGenerator.scala (95%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/metadata/PropertyNameConstants.scala (97%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/metadata/annotations/AutofillAttributeName.java (96%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/metadata/annotations/AutofillAttributeNameLambda.java (97%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/metadata/annotations/AutofillAttributeNameList.java (96%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/metadata/annotations/AutofillAttributeNameOnPort1.java (96%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/metadata/annotations/BatchByColumn.java (95%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/metadata/annotations/CommonOpDescAnnotation.java (95%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/metadata/annotations/EnablePresets.java (95%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/metadata/annotations/HideAnnotation.java (97%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/metadata/annotations/UIWidget.java (95%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/projection/AttributeUnit.java (94%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/projection/ProjectionOpDesc.scala (83%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/projection/ProjectionOpExec.scala (90%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/randomksampling/RandomKSamplingOpDesc.scala (76%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/randomksampling/RandomKSamplingOpExec.scala (86%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/regex/RegexOpDesc.scala (78%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/regex/RegexOpExec.scala (86%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/reservoirsampling/ReservoirSamplingOpDesc.scala (76%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/reservoirsampling/ReservoirSamplingOpExec.scala (84%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sink/ProgressiveUtils.scala (94%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/SklearnAdaptiveBoostingOpDesc.scala (95%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/SklearnBaggingOpDesc.scala (95%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/SklearnBernoulliNaiveBayesOpDesc.scala (95%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/SklearnClassifierOpDesc.scala (92%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/SklearnComplementNaiveBayesOpDesc.scala (95%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/SklearnDecisionTreeOpDesc.scala (95%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/SklearnDummyClassifierOpDesc.scala (95%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/SklearnExtraTreeOpDesc.scala (95%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/SklearnExtraTreesOpDesc.scala (95%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/SklearnGaussianNaiveBayesOpDesc.scala (95%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/SklearnGradientBoostingOpDesc.scala (95%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/SklearnKNNOpDesc.scala (95%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/SklearnLinearRegressionOpDesc.scala (88%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/SklearnLinearSVMOpDesc.scala (95%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/SklearnLogisticRegressionCVOpDesc.scala (95%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/SklearnLogisticRegressionOpDesc.scala (95%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/SklearnMultiLayerPerceptronOpDesc.scala (95%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/SklearnMultinomialNaiveBayesOpDesc.scala (95%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/SklearnNearestCentroidOpDesc.scala (95%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/SklearnPassiveAggressiveOpDesc.scala (95%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/SklearnPerceptronOpDesc.scala (95%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/SklearnPredictionOpDesc.scala (89%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/SklearnProbabilityCalibrationOpDesc.scala (95%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/SklearnRandomForestOpDesc.scala (95%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/SklearnRidgeCVOpDesc.scala (95%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/SklearnRidgeOpDesc.scala (95%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/SklearnSDGOpDesc.scala (95%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/SklearnSVMOpDesc.scala (95%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/training/SklearnTrainingAdaptiveBoostingOpDesc.scala (94%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/training/SklearnTrainingBaggingOpDesc.scala (94%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/training/SklearnTrainingBernoulliNaiveBayesOpDesc.scala (94%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/training/SklearnTrainingComplementNaiveBayesOpDesc.scala (94%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/training/SklearnTrainingDecisionTreeOpDesc.scala (94%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/training/SklearnTrainingDummyClassifierOpDesc.scala (94%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/training/SklearnTrainingExtraTreeOpDesc.scala (94%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/training/SklearnTrainingExtraTreesOpDesc.scala (94%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/training/SklearnTrainingGaussianNaiveBayesOpDesc.scala (94%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/training/SklearnTrainingGradientBoostingOpDesc.scala (94%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/training/SklearnTrainingKNNOpDesc.scala (94%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/training/SklearnTrainingLinearRegressionOpDesc.scala (94%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/training/SklearnTrainingLinearSVMOpDesc.scala (94%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/training/SklearnTrainingLogisticRegressionCVOpDesc.scala (94%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/training/SklearnTrainingLogisticRegressionOpDesc.scala (94%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/training/SklearnTrainingMultiLayerPerceptronOpDesc.scala (94%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/training/SklearnTrainingMultinomialNaiveBayesOpDesc.scala (94%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/training/SklearnTrainingNearestCentroidOpDesc.scala (94%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/training/SklearnTrainingOpDesc.scala (91%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/training/SklearnTrainingPassiveAggressiveOpDesc.scala (94%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/training/SklearnTrainingPerceptronOpDesc.scala (94%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/training/SklearnTrainingProbabilityCalibrationOpDesc.scala (94%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/training/SklearnTrainingRandomForestOpDesc.scala (94%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/training/SklearnTrainingRidgeCVOpDesc.scala (94%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/training/SklearnTrainingRidgeOpDesc.scala (94%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/training/SklearnTrainingSDGOpDesc.scala (94%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sklearn/training/SklearnTrainingSVMOpDesc.scala (94%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sleep/SleepOpDesc.scala (76%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sleep/SleepOpExec.scala (82%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sort/SortCriteriaUnit.java (85%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sort/SortOpDesc.scala (88%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sort/SortPreference.java (94%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sort/StableMergeSortOpDesc.scala (80%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sort/StableMergeSortOpExec.scala (97%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sortPartitions/SortPartitionsOpDesc.scala (79%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/sortPartitions/SortPartitionsOpExec.scala (88%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/source/BufferedBlockReader.java (98%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/source/PythonSourceOperatorDescriptor.scala (89%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/source/SourceOperatorDescriptor.scala (86%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/source/apis/reddit/RedditSearchSourceOpDesc.scala (94%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/source/apis/reddit/RedditSourceOperatorFunction.java (95%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/source/apis/twitter/TwitterSourceOpDesc.scala (86%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/source/apis/twitter/TwitterSourceOpExec.scala (91%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/source/apis/twitter/v2/TwitterFullArchiveSearchSourceOpDesc.scala (86%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/source/apis/twitter/v2/TwitterFullArchiveSearchSourceOpExec.scala (93%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/source/apis/twitter/v2/TwitterSearchSourceOpDesc.scala (85%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/source/apis/twitter/v2/TwitterSearchSourceOpExec.scala (93%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/source/apis/twitter/v2/TwitterUtils.scala (96%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/source/cache/CacheSourceOpExec.scala (79%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/source/fetcher/DecodingMethod.java (95%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/source/fetcher/RandomUserAgent.java (99%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/source/fetcher/URLFetchUtil.scala (96%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/source/fetcher/URLFetcherOpDesc.scala (78%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/source/fetcher/URLFetcherOpExec.scala (82%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/source/scan/AutoClosingIterator.scala (96%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/source/scan/FileAttributeType.java (94%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/source/scan/FileDecodingMethod.java (96%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/source/scan/FileScanSourceOpDesc.scala (82%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/source/scan/FileScanSourceOpExec.scala (92%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/source/scan/ScanSourceOpDesc.scala (88%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/source/scan/arrow/ArrowSourceOpDesc.scala (79%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/source/scan/arrow/ArrowSourceOpExec.scala (90%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/source/scan/csv/CSVScanSourceOpDesc.scala (84%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/source/scan/csv/CSVScanSourceOpExec.scala (90%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/source/scan/csv/ParallelCSVScanSourceOpDesc.scala (82%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/source/scan/csv/ParallelCSVScanSourceOpExec.scala (91%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/source/scan/csvOld/CSVOldScanSourceOpDesc.scala (82%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/source/scan/csvOld/CSVOldScanSourceOpExec.scala (88%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/source/scan/json/JSONLScanSourceOpDesc.scala (82%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/source/scan/json/JSONLScanSourceOpExec.scala (85%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/source/scan/json/JSONUtil.scala (98%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/source/scan/text/TextInputSourceOpDesc.scala (74%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/source/scan/text/TextInputSourceOpExec.scala (81%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/source/scan/text/TextSourceOpDesc.scala (93%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/source/sql/SQLSourceOpDesc.scala (96%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/source/sql/SQLSourceOpExec.scala (98%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/source/sql/asterixdb/AsterixDBConnUtil.scala (98%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/source/sql/asterixdb/AsterixDBSourceOpDesc.scala (86%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/source/sql/asterixdb/AsterixDBSourceOpExec.scala (96%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/source/sql/mysql/MySQLConnUtil.scala (95%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/source/sql/mysql/MySQLSourceOpDesc.scala (73%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/source/sql/mysql/MySQLSourceOpExec.scala (88%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/source/sql/postgresql/PostgreSQLConnUtil.scala (95%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/source/sql/postgresql/PostgreSQLSourceOpDesc.scala (76%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/source/sql/postgresql/PostgreSQLSourceOpExec.scala (88%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/split/SplitOpDesc.scala (84%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/split/SplitOpExec.scala (84%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/substringSearch/SubstringSearchOpDesc.scala (77%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/substringSearch/SubstringSearchOpExec.scala (85%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/symmetricDifference/SymmetricDifferenceOpDesc.scala (81%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/symmetricDifference/SymmetricDifferenceOpExec.scala (90%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/timeSeriesPlot/TimeSeriesPlot.scala (91%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/typecasting/TypeCastingOpDesc.scala (79%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/typecasting/TypeCastingOpExec.scala (83%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/typecasting/TypeCastingUnit.java (95%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/udf/java/JavaUDFOpDesc.scala (89%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/udf/python/DualInputPortsPythonUDFOpDescV2.scala (92%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/udf/python/LambdaAttributeUnit.java (92%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/udf/python/PythonLambdaFunctionOpDesc.scala (90%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/udf/python/PythonTableReducerOpDesc.scala (86%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/udf/python/PythonUDFOpDescV2.scala (92%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/udf/python/source/PythonUDFSourceOpDescV2.scala (85%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/udf/r/RUDFOpDesc.scala (92%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/udf/r/RUDFSourceOpDesc.scala (86%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/union/UnionOpDesc.scala (74%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/union/UnionOpExec.scala (84%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/unneststring/UnnestStringOpDesc.scala (78%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/unneststring/UnnestStringOpExec.scala (84%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/util/OperatorDescriptorUtils.scala (97%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/DotPlot/DotPlotOpDesc.scala (88%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/IcicleChart/IcicleChartOpDesc.scala (88%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/ImageUtility.scala (96%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/ImageViz/ImageVisualizerOpDesc.scala (87%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/ScatterMatrixChart/ScatterMatrixChartOpDesc.scala (87%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/barChart/BarChartOpDesc.scala (91%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/boxViolinPlot/BoxViolinPlotOpDesc.scala (91%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/boxViolinPlot/BoxViolinPlotQuartileFunction.java (94%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/bubbleChart/BubbleChartOpDesc.scala (91%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/bulletChart/BulletChartOpDesc.scala (95%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/bulletChart/BulletChartStepDefinition.scala (94%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/candlestickChart/CandlestickChartOpDesc.scala (87%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/choroplethMap/ChoroplethMapOpDesc.scala (89%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/continuousErrorBands/BandConfig.scala (86%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/continuousErrorBands/ContinuousErrorBandsOpDesc.scala (92%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/contourPlot/ContourPlotColoringFunction.java (94%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/contourPlot/ContourPlotOpDesc.scala (89%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/dendrogram/DendrogramOpDesc.scala (89%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/dumbbellPlot/DumbbellDotConfig.scala (90%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/dumbbellPlot/DumbbellPlotOpDesc.scala (93%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/figureFactoryTable/FigureFactoryTableConfig.scala (87%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/figureFactoryTable/FigureFactoryTableOpDesc.scala (91%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/filledAreaPlot/FilledAreaPlotOpDesc.scala (92%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/funnelPlot/FunnelPlotOpDesc.scala (88%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/ganttChart/GanttChartOpDesc.scala (91%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/gaugeChart/GaugeChartOpDesc.scala (94%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/gaugeChart/GaugeChartSteps.scala (94%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/heatMap/HeatMapOpDesc.scala (87%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/hierarchychart/HierarchyChartOpDesc.scala (90%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/hierarchychart/HierarchyChartType.java (94%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/hierarchychart/HierarchySection.scala (89%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/histogram/HistogramChartOpDesc.scala (89%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/histogram2d/Histogram2DOpDesc.scala (88%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/histogram2d/NormalizationType.java (94%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/htmlviz/HtmlVizOpDesc.scala (72%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/htmlviz/HtmlVizOpExec.scala (82%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/lineChart/LineChartOpDesc.scala (90%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/lineChart/LineConfig.scala (93%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/lineChart/LineMode.java (96%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/nestedTable/NestedTableConfig.scala (89%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/nestedTable/NestedTableOpDesc.scala (92%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/networkGraph/NetworkGraphOpDesc.scala (93%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/pieChart/PieChartOpDesc.scala (89%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/quiverPlot/QuiverPlotOpDesc.scala (90%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/rangeSlider/RangeSliderHandleDuplicateFunction.java (95%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/rangeSlider/RangeSliderOpDesc.scala (90%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/sankeyDiagram/SankeyDiagramOpDesc.scala (91%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/scatter3DChart/Scatter3dChartOpDesc.scala (89%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/scatterplot/ScatterplotOpDesc.scala (91%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/stripChart/StripChartOpDesc.scala (89%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/tablesChart/TablesConfig.scala (88%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/tablesChart/TablesPlotOpDesc.scala (89%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/ternaryPlot/TernaryPlotOpDesc.scala (91%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/treeplot/TreeplotOpDesc.scala (93%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/urlviz/UrlVizOpDesc.scala (73%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/urlviz/UrlVizOpExec.scala (86%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/volcanoPlot/VolcanoPlotOpDesc.scala (89%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/waterfallChart/WaterfallChartOpDesc.scala (88%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/operator/visualization/wordCloud/WordCloudOpDesc.scala (87%) rename common/workflow-operator/src/main/scala/org/apache/{ => texera}/amber/util/ObjectMapperUtils.scala (92%) rename common/workflow-operator/src/test/scala/org/apache/{ => texera}/amber/operator/aggregate/AggregateOpSpec.scala (98%) rename common/workflow-operator/src/test/scala/org/apache/{ => texera}/amber/operator/cartesianProduct/CartesianProductOpExecSpec.scala (97%) rename common/workflow-operator/src/test/scala/org/apache/{ => texera}/amber/operator/dictionary/DictionaryMatcherOpExecSpec.scala (97%) rename common/workflow-operator/src/test/scala/org/apache/{ => texera}/amber/operator/difference/DifferenceOpExecSpec.scala (97%) rename common/workflow-operator/src/test/scala/org/apache/{ => texera}/amber/operator/distinct/DistinctOpExecSpec.scala (96%) rename common/workflow-operator/src/test/scala/org/apache/{ => texera}/amber/operator/filter/SpecializedFilterOpExecSpec.scala (96%) rename common/workflow-operator/src/test/scala/org/apache/{ => texera}/amber/operator/hashJoin/HashJoinOpSpec.scala (95%) rename common/workflow-operator/src/test/scala/org/apache/{ => texera}/amber/operator/intersect/IntersectOpExecSpec.scala (94%) rename common/workflow-operator/src/test/scala/org/apache/{ => texera}/amber/operator/intervalJoin/IntervalOpExecSpec.scala (97%) rename common/workflow-operator/src/test/scala/org/apache/{ => texera}/amber/operator/keywordSearch/KeywordSearchOpExecSpec.scala (97%) rename common/workflow-operator/src/test/scala/org/apache/{ => texera}/amber/operator/projection/ProjectionOpDescSpec.scala (94%) rename common/workflow-operator/src/test/scala/org/apache/{ => texera}/amber/operator/projection/ProjectionOpExecSpec.scala (97%) rename common/workflow-operator/src/test/scala/org/apache/{ => texera}/amber/operator/sort/StableMergeSortOpExecSpec.scala (99%) rename common/workflow-operator/src/test/scala/org/apache/{ => texera}/amber/operator/sortPartitions/SortPartitionsOpExecSpec.scala (93%) rename common/workflow-operator/src/test/scala/org/apache/{ => texera}/amber/operator/source/fetcher/URLFetcherOpExecSpec.scala (92%) rename common/workflow-operator/src/test/scala/org/apache/{ => texera}/amber/operator/source/scan/FileScanSourceOpExecSpec.scala (96%) rename common/workflow-operator/src/test/scala/org/apache/{ => texera}/amber/operator/source/scan/csv/CSVScanSourceOpDescSpec.scala (93%) rename common/workflow-operator/src/test/scala/org/apache/{ => texera}/amber/operator/source/scan/text/FileScanSourceOpDescSpec.scala (95%) rename common/workflow-operator/src/test/scala/org/apache/{ => texera}/amber/operator/source/scan/text/TextInputSourceOpDescSpec.scala (95%) rename common/workflow-operator/src/test/scala/org/apache/{ => texera}/amber/operator/symmetricDifference/SymmetricDifferenceOpExecSpec.scala (97%) rename common/workflow-operator/src/test/scala/org/apache/{ => texera}/amber/operator/typecasting/TypeCastingOpExecSpec.scala (95%) rename common/workflow-operator/src/test/scala/org/apache/{ => texera}/amber/operator/udf/python/PythonLambdaFunctionOpDescSpec.scala (94%) rename common/workflow-operator/src/test/scala/org/apache/{ => texera}/amber/operator/unneststring/UnnestStringOpExecSpec.scala (96%) rename common/workflow-operator/src/test/scala/org/apache/{ => texera}/amber/operator/visualization/DotPlot/DotPlotOpDescSpec.scala (95%) rename common/workflow-operator/src/test/scala/org/apache/{ => texera}/amber/operator/visualization/ImageViz/ImageVisualizerOpDescSpec.scala (94%) rename common/workflow-operator/src/test/scala/org/apache/{ => texera}/amber/operator/visualization/barChart/BarChartOpDescSpec.scala (96%) rename common/workflow-operator/src/test/scala/org/apache/{ => texera}/amber/operator/visualization/bubbleChart/BubbleChartOpDescSpec.scala (95%) rename common/workflow-operator/src/test/scala/org/apache/{ => texera}/amber/operator/visualization/filledAreaPlot/FilledAreaPlotOpDescSpec.scala (96%) rename common/workflow-operator/src/test/scala/org/apache/{ => texera}/amber/operator/visualization/ganttChart/GanttChartOpDescSpec.scala (97%) rename common/workflow-operator/src/test/scala/org/apache/{ => texera}/amber/operator/visualization/hierarchychart/HierarchyChartOpDescSpec.scala (96%) rename common/workflow-operator/src/test/scala/org/apache/{ => texera}/amber/operator/visualization/htmlviz/HtmlVizOpExecSpec.scala (91%) rename common/workflow-operator/src/test/scala/org/apache/{ => texera}/amber/operator/visualization/pieChart/PieChartOpDescSpec.scala (94%) rename common/workflow-operator/src/test/scala/org/apache/{ => texera}/amber/operator/visualization/scatterplot/ScatterPlotOpDescSpec.scala (95%) rename common/workflow-operator/src/test/scala/org/apache/{ => texera}/amber/util/ArrowUtilsSpec.scala (97%) rename frontend/src/app/common/type/proto/org/apache/{ => texera}/amber/engine/common/virtualidentity.ts (99%) rename frontend/src/app/common/type/proto/org/apache/{ => texera}/amber/engine/common/workflow.ts (99%) rename workflow-compiling-service/src/main/scala/org/apache/{ => texera}/amber/compiler/WorkflowCompiler.scala (93%) rename workflow-compiling-service/src/main/scala/org/apache/{ => texera}/amber/compiler/model/LogicalLink.scala (88%) rename workflow-compiling-service/src/main/scala/org/apache/{ => texera}/amber/compiler/model/LogicalPlan.scala (92%) rename workflow-compiling-service/src/main/scala/org/apache/{ => texera}/amber/compiler/model/LogicalPlanPojo.scala (90%) diff --git a/access-control-service/src/main/scala/org/apache/texera/service/AccessControlService.scala b/access-control-service/src/main/scala/org/apache/texera/service/AccessControlService.scala index 63941213726..7fac58328d0 100644 --- a/access-control-service/src/main/scala/org/apache/texera/service/AccessControlService.scala +++ b/access-control-service/src/main/scala/org/apache/texera/service/AccessControlService.scala @@ -22,7 +22,7 @@ import com.typesafe.scalalogging.LazyLogging import io.dropwizard.auth.AuthDynamicFeature import io.dropwizard.core.Application import io.dropwizard.core.setup.{Bootstrap, Environment} -import org.apache.amber.config.StorageConfig +import org.apache.texera.amber.config.StorageConfig import org.apache.texera.auth.{JwtAuthFilter, SessionUser} import org.apache.texera.dao.SqlServer import org.apache.texera.service.resource.{ diff --git a/amber/src/main/protobuf/org/apache/amber/engine/architecture/rpc/controlcommands.proto b/amber/src/main/protobuf/org/apache/texera/amber/engine/architecture/rpc/controlcommands.proto similarity index 90% rename from amber/src/main/protobuf/org/apache/amber/engine/architecture/rpc/controlcommands.proto rename to amber/src/main/protobuf/org/apache/texera/amber/engine/architecture/rpc/controlcommands.proto index 41f0976314c..ed17be236dc 100644 --- a/amber/src/main/protobuf/org/apache/amber/engine/architecture/rpc/controlcommands.proto +++ b/amber/src/main/protobuf/org/apache/texera/amber/engine/architecture/rpc/controlcommands.proto @@ -16,13 +16,13 @@ // under the License. syntax = "proto3"; -package org.apache.amber.engine.architecture.rpc; +package org.apache.texera.amber.engine.architecture.rpc; -import "org/apache/amber/core/virtualidentity.proto"; -import "org/apache/amber/core/workflow.proto"; -import "org/apache/amber/core/executor.proto"; -import "org/apache/amber/engine/architecture/worker/statistics.proto"; -import "org/apache/amber/engine/architecture/sendsemantics/partitionings.proto"; +import "org/apache/texera/amber/core/virtualidentity.proto"; +import "org/apache/texera/amber/core/workflow.proto"; +import "org/apache/texera/amber/core/executor.proto"; +import "org/apache/texera/amber/engine/architecture/worker/statistics.proto"; +import "org/apache/texera/amber/engine/architecture/sendsemantics/partitionings.proto"; import "scalapb/scalapb.proto"; import "google/protobuf/timestamp.proto"; import "google/protobuf/any.proto"; @@ -81,7 +81,7 @@ message AsyncRPCContext { } message ControlInvocation { - option (scalapb.message).extends = "org.apache.amber.engine.common.ambermessage.DirectControlMessagePayload"; + option (scalapb.message).extends = "org.apache.texera.amber.engine.common.ambermessage.DirectControlMessagePayload"; string methodName = 1; ControlRequest command = 2 [(scalapb.field).no_box = true]; AsyncRPCContext context = 3; @@ -95,7 +95,7 @@ enum EmbeddedControlMessageType { } message EmbeddedControlMessage { - option (scalapb.message).extends = "org.apache.amber.engine.common.ambermessage.WorkflowFIFOMessagePayload"; + option (scalapb.message).extends = "org.apache.texera.amber.engine.common.ambermessage.WorkflowFIFOMessagePayload"; core.EmbeddedControlMessageIdentity id = 1 [(scalapb.field).no_box = true]; EmbeddedControlMessageType ecm_type = 2; repeated core.ChannelIdentity scope = 3; @@ -150,7 +150,7 @@ enum ConsoleMessageType{ } message ConsoleMessage { - option (scalapb.message).extends = "org.apache.amber.engine.architecture.controller.ClientEvent"; + option (scalapb.message).extends = "org.apache.texera.amber.engine.architecture.controller.ClientEvent"; string worker_id = 1; google.protobuf.Timestamp timestamp = 2 [(scalapb.field).no_box = true]; ConsoleMessageType msg_type = 3; diff --git a/amber/src/main/protobuf/org/apache/amber/engine/architecture/rpc/controllerservice.proto b/amber/src/main/protobuf/org/apache/texera/amber/engine/architecture/rpc/controllerservice.proto similarity index 90% rename from amber/src/main/protobuf/org/apache/amber/engine/architecture/rpc/controllerservice.proto rename to amber/src/main/protobuf/org/apache/texera/amber/engine/architecture/rpc/controllerservice.proto index b03cd0f51f1..70d189a3411 100644 --- a/amber/src/main/protobuf/org/apache/amber/engine/architecture/rpc/controllerservice.proto +++ b/amber/src/main/protobuf/org/apache/texera/amber/engine/architecture/rpc/controllerservice.proto @@ -16,10 +16,10 @@ // under the License. syntax = "proto3"; -package org.apache.amber.engine.architecture.rpc; +package org.apache.texera.amber.engine.architecture.rpc; -import "org/apache/amber/engine/architecture/rpc/controlcommands.proto"; -import "org/apache/amber/engine/architecture/rpc/controlreturns.proto"; +import "org/apache/texera/amber/engine/architecture/rpc/controlcommands.proto"; +import "org/apache/texera/amber/engine/architecture/rpc/controlreturns.proto"; import "scalapb/scalapb.proto"; option (scalapb.options) = { diff --git a/amber/src/main/protobuf/org/apache/amber/engine/architecture/rpc/controlreturns.proto b/amber/src/main/protobuf/org/apache/texera/amber/engine/architecture/rpc/controlreturns.proto similarity index 93% rename from amber/src/main/protobuf/org/apache/amber/engine/architecture/rpc/controlreturns.proto rename to amber/src/main/protobuf/org/apache/texera/amber/engine/architecture/rpc/controlreturns.proto index 87434d34148..43613b5cfdc 100644 --- a/amber/src/main/protobuf/org/apache/amber/engine/architecture/rpc/controlreturns.proto +++ b/amber/src/main/protobuf/org/apache/texera/amber/engine/architecture/rpc/controlreturns.proto @@ -16,9 +16,9 @@ // under the License. syntax = "proto3"; -package org.apache.amber.engine.architecture.rpc; +package org.apache.texera.amber.engine.architecture.rpc; -import "org/apache/amber/engine/architecture/worker/statistics.proto"; +import "org/apache/texera/amber/engine/architecture/worker/statistics.proto"; import "scalapb/scalapb.proto"; option (scalapb.options) = { @@ -67,7 +67,7 @@ message ControlError { } message ReturnInvocation { - option (scalapb.message).extends = "org.apache.amber.engine.common.ambermessage.DirectControlMessagePayload"; + option (scalapb.message).extends = "org.apache.texera.amber.engine.common.ambermessage.DirectControlMessagePayload"; int64 commandId = 1; ControlReturn returnValue = 2 [(scalapb.field).no_box = true]; } diff --git a/amber/src/main/protobuf/org/apache/amber/engine/architecture/rpc/testerservice.proto b/amber/src/main/protobuf/org/apache/texera/amber/engine/architecture/rpc/testerservice.proto similarity index 87% rename from amber/src/main/protobuf/org/apache/amber/engine/architecture/rpc/testerservice.proto rename to amber/src/main/protobuf/org/apache/texera/amber/engine/architecture/rpc/testerservice.proto index fcb1ab444fd..229b03f689c 100644 --- a/amber/src/main/protobuf/org/apache/amber/engine/architecture/rpc/testerservice.proto +++ b/amber/src/main/protobuf/org/apache/texera/amber/engine/architecture/rpc/testerservice.proto @@ -16,10 +16,10 @@ // under the License. syntax = "proto3"; -package org.apache.amber.engine.architecture.rpc; +package org.apache.texera.amber.engine.architecture.rpc; -import "org/apache/amber/engine/architecture/rpc/controlcommands.proto"; -import "org/apache/amber/engine/architecture/rpc/controlreturns.proto"; +import "org/apache/texera/amber/engine/architecture/rpc/controlcommands.proto"; +import "org/apache/texera/amber/engine/architecture/rpc/controlreturns.proto"; import "scalapb/scalapb.proto"; option (scalapb.options) = { diff --git a/amber/src/main/protobuf/org/apache/amber/engine/architecture/rpc/workerservice.proto b/amber/src/main/protobuf/org/apache/texera/amber/engine/architecture/rpc/workerservice.proto similarity index 91% rename from amber/src/main/protobuf/org/apache/amber/engine/architecture/rpc/workerservice.proto rename to amber/src/main/protobuf/org/apache/texera/amber/engine/architecture/rpc/workerservice.proto index 3b5b38ad7f7..dbcd6d8a5e0 100644 --- a/amber/src/main/protobuf/org/apache/amber/engine/architecture/rpc/workerservice.proto +++ b/amber/src/main/protobuf/org/apache/texera/amber/engine/architecture/rpc/workerservice.proto @@ -16,10 +16,10 @@ // under the License. syntax = "proto3"; -package org.apache.amber.engine.architecture.rpc; +package org.apache.texera.amber.engine.architecture.rpc; -import "org/apache/amber/engine/architecture/rpc/controlcommands.proto"; -import "org/apache/amber/engine/architecture/rpc/controlreturns.proto"; +import "org/apache/texera/amber/engine/architecture/rpc/controlcommands.proto"; +import "org/apache/texera/amber/engine/architecture/rpc/controlreturns.proto"; import "scalapb/scalapb.proto"; option (scalapb.options) = { diff --git a/amber/src/main/protobuf/org/apache/amber/engine/architecture/sendsemantics/partitionings.proto b/amber/src/main/protobuf/org/apache/texera/amber/engine/architecture/sendsemantics/partitionings.proto similarity index 93% rename from amber/src/main/protobuf/org/apache/amber/engine/architecture/sendsemantics/partitionings.proto rename to amber/src/main/protobuf/org/apache/texera/amber/engine/architecture/sendsemantics/partitionings.proto index 8a5c1be786f..813a4041b31 100644 --- a/amber/src/main/protobuf/org/apache/amber/engine/architecture/sendsemantics/partitionings.proto +++ b/amber/src/main/protobuf/org/apache/texera/amber/engine/architecture/sendsemantics/partitionings.proto @@ -17,9 +17,9 @@ syntax = "proto3"; -package org.apache.amber.engine.architecture.sendsemantics; +package org.apache.texera.amber.engine.architecture.sendsemantics; -import "org/apache/amber/core/virtualidentity.proto"; +import "org/apache/texera/amber/core/virtualidentity.proto"; import "scalapb/scalapb.proto"; option (scalapb.options) = { diff --git a/amber/src/main/protobuf/org/apache/amber/engine/architecture/worker/statistics.proto b/amber/src/main/protobuf/org/apache/texera/amber/engine/architecture/worker/statistics.proto similarity index 93% rename from amber/src/main/protobuf/org/apache/amber/engine/architecture/worker/statistics.proto rename to amber/src/main/protobuf/org/apache/texera/amber/engine/architecture/worker/statistics.proto index 36d3b8036c6..85d1fcf4aaa 100644 --- a/amber/src/main/protobuf/org/apache/amber/engine/architecture/worker/statistics.proto +++ b/amber/src/main/protobuf/org/apache/texera/amber/engine/architecture/worker/statistics.proto @@ -17,9 +17,9 @@ syntax = "proto3"; -package org.apache.amber.engine.architecture.worker; +package org.apache.texera.amber.engine.architecture.worker; -import "org/apache/amber/core/workflow.proto"; +import "org/apache/texera/amber/core/workflow.proto"; import "scalapb/scalapb.proto"; option (scalapb.options) = { diff --git a/amber/src/main/protobuf/org/apache/amber/engine/common/actormessage.proto b/amber/src/main/protobuf/org/apache/texera/amber/engine/common/actormessage.proto similarity index 96% rename from amber/src/main/protobuf/org/apache/amber/engine/common/actormessage.proto rename to amber/src/main/protobuf/org/apache/texera/amber/engine/common/actormessage.proto index f0e24b16216..2a548e6f753 100644 --- a/amber/src/main/protobuf/org/apache/amber/engine/common/actormessage.proto +++ b/amber/src/main/protobuf/org/apache/texera/amber/engine/common/actormessage.proto @@ -17,7 +17,7 @@ syntax = "proto3"; -package org.apache.amber.engine.common; +package org.apache.texera.amber.engine.common; import "scalapb/scalapb.proto"; diff --git a/amber/src/main/protobuf/org/apache/amber/engine/common/ambermessage.proto b/amber/src/main/protobuf/org/apache/texera/amber/engine/common/ambermessage.proto similarity index 84% rename from amber/src/main/protobuf/org/apache/amber/engine/common/ambermessage.proto rename to amber/src/main/protobuf/org/apache/texera/amber/engine/common/ambermessage.proto index 1446f07b94b..54bd36abfc4 100644 --- a/amber/src/main/protobuf/org/apache/amber/engine/common/ambermessage.proto +++ b/amber/src/main/protobuf/org/apache/texera/amber/engine/common/ambermessage.proto @@ -17,11 +17,11 @@ syntax = "proto3"; -package org.apache.amber.engine.common; +package org.apache.texera.amber.engine.common; -import "org/apache/amber/engine/architecture/rpc/controlcommands.proto"; -import "org/apache/amber/engine/architecture/rpc/controlreturns.proto"; -import "org/apache/amber/core/virtualidentity.proto"; +import "org/apache/texera/amber/engine/architecture/rpc/controlcommands.proto"; +import "org/apache/texera/amber/engine/architecture/rpc/controlreturns.proto"; +import "org/apache/texera/amber/core/virtualidentity.proto"; import "scalapb/scalapb.proto"; option (scalapb.options) = { diff --git a/amber/src/main/protobuf/org/apache/amber/engine/common/executionruntimestate.proto b/amber/src/main/protobuf/org/apache/texera/amber/engine/common/executionruntimestate.proto similarity index 86% rename from amber/src/main/protobuf/org/apache/amber/engine/common/executionruntimestate.proto rename to amber/src/main/protobuf/org/apache/texera/amber/engine/common/executionruntimestate.proto index 4ddfb054bf1..e712b3adc8a 100644 --- a/amber/src/main/protobuf/org/apache/amber/engine/common/executionruntimestate.proto +++ b/amber/src/main/protobuf/org/apache/texera/amber/engine/common/executionruntimestate.proto @@ -17,13 +17,13 @@ syntax = "proto3"; -package org.apache.amber.engine.common; +package org.apache.texera.amber.engine.common; -import "org/apache/amber/engine/architecture/rpc/controlcommands.proto"; -import "org/apache/amber/engine/architecture/rpc/controlreturns.proto"; -import "org/apache/amber/engine/architecture/worker/statistics.proto"; -import "org/apache/amber/core/virtualidentity.proto"; -import "org/apache/amber/core/workflowruntimestate.proto"; +import "org/apache/texera/amber/engine/architecture/rpc/controlcommands.proto"; +import "org/apache/texera/amber/engine/architecture/rpc/controlreturns.proto"; +import "org/apache/texera/amber/engine/architecture/worker/statistics.proto"; +import "org/apache/texera/amber/core/virtualidentity.proto"; +import "org/apache/texera/amber/core/workflowruntimestate.proto"; import "scalapb/scalapb.proto"; option (scalapb.options) = { diff --git a/amber/src/main/python/core/architecture/handlers/actorcommand/actor_handler_base.py b/amber/src/main/python/core/architecture/handlers/actorcommand/actor_handler_base.py index 756e4ee8abf..59a68312cf8 100644 --- a/amber/src/main/python/core/architecture/handlers/actorcommand/actor_handler_base.py +++ b/amber/src/main/python/core/architecture/handlers/actorcommand/actor_handler_base.py @@ -18,7 +18,7 @@ from abc import ABC from core.models import InternalQueue -from proto.org.apache.amber.engine.common import ActorCommand +from proto.org.apache.texera.amber.engine.common import ActorCommand class ActorCommandHandler(ABC): diff --git a/amber/src/main/python/core/architecture/handlers/actorcommand/backpressure_handler.py b/amber/src/main/python/core/architecture/handlers/actorcommand/backpressure_handler.py index d165ae8899b..764348b1d13 100644 --- a/amber/src/main/python/core/architecture/handlers/actorcommand/backpressure_handler.py +++ b/amber/src/main/python/core/architecture/handlers/actorcommand/backpressure_handler.py @@ -20,14 +20,14 @@ ) from core.models.internal_queue import DCMElement, InternalQueue from core.util import set_one_of -from proto.org.apache.amber.core import ActorVirtualIdentity, ChannelIdentity -from proto.org.apache.amber.engine.architecture.rpc import ( +from proto.org.apache.texera.amber.core import ActorVirtualIdentity, ChannelIdentity +from proto.org.apache.texera.amber.engine.architecture.rpc import ( ControlInvocation, ControlRequest, EmptyRequest, AsyncRpcContext, ) -from proto.org.apache.amber.engine.common import ( +from proto.org.apache.texera.amber.engine.common import ( Backpressure, DirectControlMessagePayloadV2, ) diff --git a/amber/src/main/python/core/architecture/handlers/actorcommand/credit_update_handler.py b/amber/src/main/python/core/architecture/handlers/actorcommand/credit_update_handler.py index dc235180ebc..b7430b0fefb 100644 --- a/amber/src/main/python/core/architecture/handlers/actorcommand/credit_update_handler.py +++ b/amber/src/main/python/core/architecture/handlers/actorcommand/credit_update_handler.py @@ -19,7 +19,7 @@ ActorCommandHandler, ) from core.models import InternalQueue -from proto.org.apache.amber.engine.common import CreditUpdate +from proto.org.apache.texera.amber.engine.common import CreditUpdate class CreditUpdateHandler(ActorCommandHandler): diff --git a/amber/src/main/python/core/architecture/handlers/control/add_input_channel_handler.py b/amber/src/main/python/core/architecture/handlers/control/add_input_channel_handler.py index 663f7c1d8df..9d398210b52 100644 --- a/amber/src/main/python/core/architecture/handlers/control/add_input_channel_handler.py +++ b/amber/src/main/python/core/architecture/handlers/control/add_input_channel_handler.py @@ -16,7 +16,7 @@ # under the License. from core.architecture.handlers.control.control_handler_base import ControlHandler -from proto.org.apache.amber.engine.architecture.rpc import ( +from proto.org.apache.texera.amber.engine.architecture.rpc import ( EmptyReturn, AddInputChannelRequest, ) diff --git a/amber/src/main/python/core/architecture/handlers/control/add_partitioning_handler.py b/amber/src/main/python/core/architecture/handlers/control/add_partitioning_handler.py index 269cd0320b9..10b0d3fb0ba 100644 --- a/amber/src/main/python/core/architecture/handlers/control/add_partitioning_handler.py +++ b/amber/src/main/python/core/architecture/handlers/control/add_partitioning_handler.py @@ -16,7 +16,7 @@ # under the License. from core.architecture.handlers.control.control_handler_base import ControlHandler -from proto.org.apache.amber.engine.architecture.rpc import ( +from proto.org.apache.texera.amber.engine.architecture.rpc import ( EmptyReturn, AddPartitioningRequest, ) diff --git a/amber/src/main/python/core/architecture/handlers/control/assign_port_handler.py b/amber/src/main/python/core/architecture/handlers/control/assign_port_handler.py index 1ef342c6111..df669735ff3 100644 --- a/amber/src/main/python/core/architecture/handlers/control/assign_port_handler.py +++ b/amber/src/main/python/core/architecture/handlers/control/assign_port_handler.py @@ -18,8 +18,8 @@ from core.architecture.handlers.control.control_handler_base import ControlHandler from core.models import Schema from core.util.virtual_identity import get_from_actor_id_for_input_port_storage -from proto.org.apache.amber.core import ActorVirtualIdentity, ChannelIdentity -from proto.org.apache.amber.engine.architecture.rpc import ( +from proto.org.apache.texera.amber.core import ActorVirtualIdentity, ChannelIdentity +from proto.org.apache.texera.amber.engine.architecture.rpc import ( EmptyReturn, AssignPortRequest, ) diff --git a/amber/src/main/python/core/architecture/handlers/control/control_handler_base.py b/amber/src/main/python/core/architecture/handlers/control/control_handler_base.py index 4e2ce02635a..9378a5e561b 100644 --- a/amber/src/main/python/core/architecture/handlers/control/control_handler_base.py +++ b/amber/src/main/python/core/architecture/handlers/control/control_handler_base.py @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -from proto.org.apache.amber.engine.architecture.rpc import WorkerServiceBase +from proto.org.apache.texera.amber.engine.architecture.rpc import WorkerServiceBase class ControlHandler(WorkerServiceBase): diff --git a/amber/src/main/python/core/architecture/handlers/control/debug_command_handler.py b/amber/src/main/python/core/architecture/handlers/control/debug_command_handler.py index 4945f226b49..e7d35a64173 100644 --- a/amber/src/main/python/core/architecture/handlers/control/debug_command_handler.py +++ b/amber/src/main/python/core/architecture/handlers/control/debug_command_handler.py @@ -18,7 +18,7 @@ from core.architecture.handlers.control.control_handler_base import ControlHandler from core.architecture.managers.context import Context from core.architecture.managers.pause_manager import PauseType -from proto.org.apache.amber.engine.architecture.rpc import ( +from proto.org.apache.texera.amber.engine.architecture.rpc import ( EmptyReturn, DebugCommandRequest, ) diff --git a/amber/src/main/python/core/architecture/handlers/control/end_channel_handler.py b/amber/src/main/python/core/architecture/handlers/control/end_channel_handler.py index 9cf7d36bd41..d60b3874754 100644 --- a/amber/src/main/python/core/architecture/handlers/control/end_channel_handler.py +++ b/amber/src/main/python/core/architecture/handlers/control/end_channel_handler.py @@ -17,7 +17,10 @@ from core.architecture.handlers.control.control_handler_base import ControlHandler from core.models.internal_marker import EndChannel -from proto.org.apache.amber.engine.architecture.rpc import EmptyReturn, EmptyRequest +from proto.org.apache.texera.amber.engine.architecture.rpc import ( + EmptyReturn, + EmptyRequest, +) class EndChannelHandler(ControlHandler): diff --git a/amber/src/main/python/core/architecture/handlers/control/end_worker_handler.py b/amber/src/main/python/core/architecture/handlers/control/end_worker_handler.py index 12789469a86..434225a5f0a 100644 --- a/amber/src/main/python/core/architecture/handlers/control/end_worker_handler.py +++ b/amber/src/main/python/core/architecture/handlers/control/end_worker_handler.py @@ -19,7 +19,7 @@ from core.architecture.handlers.control.control_handler_base import ControlHandler from core.util import IQueue -from proto.org.apache.amber.engine.architecture.rpc import ( +from proto.org.apache.texera.amber.engine.architecture.rpc import ( EmptyReturn, EmptyRequest, ) diff --git a/amber/src/main/python/core/architecture/handlers/control/evaluate_expression_handler.py b/amber/src/main/python/core/architecture/handlers/control/evaluate_expression_handler.py index 396e625fea0..7d35a6c1b85 100644 --- a/amber/src/main/python/core/architecture/handlers/control/evaluate_expression_handler.py +++ b/amber/src/main/python/core/architecture/handlers/control/evaluate_expression_handler.py @@ -17,7 +17,7 @@ from core.architecture.handlers.control.control_handler_base import ControlHandler from core.util.expression_evaluator import ExpressionEvaluator -from proto.org.apache.amber.engine.architecture.rpc import ( +from proto.org.apache.texera.amber.engine.architecture.rpc import ( EvaluatedValue, EvaluatePythonExpressionRequest, ) diff --git a/amber/src/main/python/core/architecture/handlers/control/initialize_executor_handler.py b/amber/src/main/python/core/architecture/handlers/control/initialize_executor_handler.py index 0d86dbc212a..0dd3e45287f 100644 --- a/amber/src/main/python/core/architecture/handlers/control/initialize_executor_handler.py +++ b/amber/src/main/python/core/architecture/handlers/control/initialize_executor_handler.py @@ -17,8 +17,8 @@ from core.architecture.handlers.control.control_handler_base import ControlHandler from core.util import get_one_of -from proto.org.apache.amber.core import OpExecWithCode -from proto.org.apache.amber.engine.architecture.rpc import ( +from proto.org.apache.texera.amber.core import OpExecWithCode +from proto.org.apache.texera.amber.engine.architecture.rpc import ( EmptyReturn, InitializeExecutorRequest, ) diff --git a/amber/src/main/python/core/architecture/handlers/control/no_operation_handler.py b/amber/src/main/python/core/architecture/handlers/control/no_operation_handler.py index 769f7504d0f..353e6eec9c5 100644 --- a/amber/src/main/python/core/architecture/handlers/control/no_operation_handler.py +++ b/amber/src/main/python/core/architecture/handlers/control/no_operation_handler.py @@ -16,7 +16,7 @@ # under the License. from core.architecture.handlers.control.control_handler_base import ControlHandler -from proto.org.apache.amber.engine.architecture.rpc import ( +from proto.org.apache.texera.amber.engine.architecture.rpc import ( EmptyReturn, EmptyRequest, ) diff --git a/amber/src/main/python/core/architecture/handlers/control/open_executor_handler.py b/amber/src/main/python/core/architecture/handlers/control/open_executor_handler.py index 30cfb6e49dd..7c76fd58b94 100644 --- a/amber/src/main/python/core/architecture/handlers/control/open_executor_handler.py +++ b/amber/src/main/python/core/architecture/handlers/control/open_executor_handler.py @@ -16,7 +16,10 @@ # under the License. from core.architecture.handlers.control.control_handler_base import ControlHandler -from proto.org.apache.amber.engine.architecture.rpc import EmptyReturn, EmptyRequest +from proto.org.apache.texera.amber.engine.architecture.rpc import ( + EmptyReturn, + EmptyRequest, +) class OpenExecutorHandler(ControlHandler): diff --git a/amber/src/main/python/core/architecture/handlers/control/pause_worker_handler.py b/amber/src/main/python/core/architecture/handlers/control/pause_worker_handler.py index 8713da7737f..db5f6e7c41e 100644 --- a/amber/src/main/python/core/architecture/handlers/control/pause_worker_handler.py +++ b/amber/src/main/python/core/architecture/handlers/control/pause_worker_handler.py @@ -17,7 +17,7 @@ from core.architecture.handlers.control.control_handler_base import ControlHandler from core.architecture.managers.pause_manager import PauseType -from proto.org.apache.amber.engine.architecture.rpc import ( +from proto.org.apache.texera.amber.engine.architecture.rpc import ( WorkerStateResponse, EmptyRequest, ) diff --git a/amber/src/main/python/core/architecture/handlers/control/query_statistics_handler.py b/amber/src/main/python/core/architecture/handlers/control/query_statistics_handler.py index d6b6210dddc..e6f384509c2 100644 --- a/amber/src/main/python/core/architecture/handlers/control/query_statistics_handler.py +++ b/amber/src/main/python/core/architecture/handlers/control/query_statistics_handler.py @@ -16,11 +16,11 @@ # under the License. from core.architecture.handlers.control.control_handler_base import ControlHandler -from proto.org.apache.amber.engine.architecture.rpc import ( +from proto.org.apache.texera.amber.engine.architecture.rpc import ( WorkerMetricsResponse, EmptyRequest, ) -from proto.org.apache.amber.engine.architecture.worker import ( +from proto.org.apache.texera.amber.engine.architecture.worker import ( WorkerMetrics, ) diff --git a/amber/src/main/python/core/architecture/handlers/control/replay_current_tuple_handler.py b/amber/src/main/python/core/architecture/handlers/control/replay_current_tuple_handler.py index c3760a52a2b..b5070df652a 100644 --- a/amber/src/main/python/core/architecture/handlers/control/replay_current_tuple_handler.py +++ b/amber/src/main/python/core/architecture/handlers/control/replay_current_tuple_handler.py @@ -19,8 +19,11 @@ from core.architecture.handlers.control.control_handler_base import ControlHandler from core.architecture.managers.pause_manager import PauseType -from proto.org.apache.amber.engine.architecture.rpc import EmptyReturn, EmptyRequest -from proto.org.apache.amber.engine.architecture.worker import ( +from proto.org.apache.texera.amber.engine.architecture.rpc import ( + EmptyReturn, + EmptyRequest, +) +from proto.org.apache.texera.amber.engine.architecture.worker import ( WorkerState, ) diff --git a/amber/src/main/python/core/architecture/handlers/control/resume_worker_handler.py b/amber/src/main/python/core/architecture/handlers/control/resume_worker_handler.py index 2aea43681fb..c49d90af58e 100644 --- a/amber/src/main/python/core/architecture/handlers/control/resume_worker_handler.py +++ b/amber/src/main/python/core/architecture/handlers/control/resume_worker_handler.py @@ -17,7 +17,7 @@ from core.architecture.handlers.control.control_handler_base import ControlHandler from core.architecture.managers.pause_manager import PauseType -from proto.org.apache.amber.engine.architecture.rpc import ( +from proto.org.apache.texera.amber.engine.architecture.rpc import ( WorkerStateResponse, EmptyRequest, ) diff --git a/amber/src/main/python/core/architecture/handlers/control/start_channel_handler.py b/amber/src/main/python/core/architecture/handlers/control/start_channel_handler.py index 047e502feb3..36747351e1e 100644 --- a/amber/src/main/python/core/architecture/handlers/control/start_channel_handler.py +++ b/amber/src/main/python/core/architecture/handlers/control/start_channel_handler.py @@ -17,7 +17,10 @@ from core.architecture.handlers.control.control_handler_base import ControlHandler from core.models.internal_marker import StartChannel -from proto.org.apache.amber.engine.architecture.rpc import EmptyReturn, EmptyRequest +from proto.org.apache.texera.amber.engine.architecture.rpc import ( + EmptyReturn, + EmptyRequest, +) class StartChannelHandler(ControlHandler): diff --git a/amber/src/main/python/core/architecture/handlers/control/start_worker_handler.py b/amber/src/main/python/core/architecture/handlers/control/start_worker_handler.py index 572b066c7cb..bfa1556722f 100644 --- a/amber/src/main/python/core/architecture/handlers/control/start_worker_handler.py +++ b/amber/src/main/python/core/architecture/handlers/control/start_worker_handler.py @@ -19,13 +19,13 @@ from core.architecture.packaging.input_manager import InputManager from core.models import Schema from core.models.internal_queue import ECMElement -from proto.org.apache.amber.core import ( +from proto.org.apache.texera.amber.core import ( ChannelIdentity, ActorVirtualIdentity, PortIdentity, EmbeddedControlMessageIdentity, ) -from proto.org.apache.amber.engine.architecture.rpc import ( +from proto.org.apache.texera.amber.engine.architecture.rpc import ( WorkerStateResponse, ControlInvocation, EmptyRequest, @@ -34,7 +34,7 @@ ControlRequest, EmbeddedControlMessageType, ) -from proto.org.apache.amber.engine.architecture.worker import ( +from proto.org.apache.texera.amber.engine.architecture.worker import ( WorkerState, ) diff --git a/amber/src/main/python/core/architecture/handlers/control/update_executor_handler.py b/amber/src/main/python/core/architecture/handlers/control/update_executor_handler.py index 2657f9727ad..fe33b2dec0d 100644 --- a/amber/src/main/python/core/architecture/handlers/control/update_executor_handler.py +++ b/amber/src/main/python/core/architecture/handlers/control/update_executor_handler.py @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -# from proto.org.apache.amber.engine.architecture.worker import UpdateExecutorV2 +# from proto.org.apache.texera.amber.engine.architecture.worker import UpdateExecutorV2 # from core.architecture.handlers.control.control_handler_base import ControlHandler # from core.architecture.managers.context import Context # diff --git a/amber/src/main/python/core/architecture/managers/console_message_manager.py b/amber/src/main/python/core/architecture/managers/console_message_manager.py index d2bac73cf73..f75c74cda0f 100644 --- a/amber/src/main/python/core/architecture/managers/console_message_manager.py +++ b/amber/src/main/python/core/architecture/managers/console_message_manager.py @@ -18,7 +18,7 @@ from typing import Iterator from core.util.buffer.timed_buffer import TimedBuffer -from proto.org.apache.amber.engine.architecture.rpc import ConsoleMessage +from proto.org.apache.texera.amber.engine.architecture.rpc import ConsoleMessage class ConsoleMessageManager: diff --git a/amber/src/main/python/core/architecture/managers/context.py b/amber/src/main/python/core/architecture/managers/context.py index 826006ccb63..3629a435a79 100644 --- a/amber/src/main/python/core/architecture/managers/context.py +++ b/amber/src/main/python/core/architecture/managers/context.py @@ -17,8 +17,8 @@ from typing import Optional -from proto.org.apache.amber.core import ActorVirtualIdentity, ChannelIdentity -from proto.org.apache.amber.engine.architecture.worker import WorkerState +from proto.org.apache.texera.amber.core import ActorVirtualIdentity, ChannelIdentity +from proto.org.apache.texera.amber.engine.architecture.worker import WorkerState from .console_message_manager import ConsoleMessageManager from .debug_manager import DebugManager from .embedded_control_message_manager import EmbeddedControlMessageManager diff --git a/amber/src/main/python/core/architecture/managers/embedded_control_message_manager.py b/amber/src/main/python/core/architecture/managers/embedded_control_message_manager.py index 8207d7e78f5..43acb1c4e18 100644 --- a/amber/src/main/python/core/architecture/managers/embedded_control_message_manager.py +++ b/amber/src/main/python/core/architecture/managers/embedded_control_message_manager.py @@ -19,8 +19,8 @@ from typing import Set, Dict from core.architecture.packaging.input_manager import Channel -from proto.org.apache.amber.core import ActorVirtualIdentity, ChannelIdentity -from proto.org.apache.amber.engine.architecture.rpc import ( +from proto.org.apache.texera.amber.core import ActorVirtualIdentity, ChannelIdentity +from proto.org.apache.texera.amber.engine.architecture.rpc import ( EmbeddedControlMessage, EmbeddedControlMessageType, ) diff --git a/amber/src/main/python/core/architecture/managers/pause_manager.py b/amber/src/main/python/core/architecture/managers/pause_manager.py index b68480e8799..7a5cbc3824f 100644 --- a/amber/src/main/python/core/architecture/managers/pause_manager.py +++ b/amber/src/main/python/core/architecture/managers/pause_manager.py @@ -20,8 +20,8 @@ from loguru import logger from typing import Set, Dict -from proto.org.apache.amber.core import ChannelIdentity -from proto.org.apache.amber.engine.architecture.worker import WorkerState +from proto.org.apache.texera.amber.core import ChannelIdentity +from proto.org.apache.texera.amber.engine.architecture.worker import WorkerState from . import state_manager from ...models import InternalQueue diff --git a/amber/src/main/python/core/architecture/managers/statistics_manager.py b/amber/src/main/python/core/architecture/managers/statistics_manager.py index 60c7e2c6c44..6b36b78e577 100644 --- a/amber/src/main/python/core/architecture/managers/statistics_manager.py +++ b/amber/src/main/python/core/architecture/managers/statistics_manager.py @@ -18,8 +18,8 @@ from collections import defaultdict from typing import DefaultDict -from proto.org.apache.amber.core import PortIdentity -from proto.org.apache.amber.engine.architecture.worker import ( +from proto.org.apache.texera.amber.core import PortIdentity +from proto.org.apache.texera.amber.engine.architecture.worker import ( WorkerStatistics, PortTupleMetricsMapping, TupleMetrics, diff --git a/amber/src/main/python/core/architecture/managers/test_pause_manager.py b/amber/src/main/python/core/architecture/managers/test_pause_manager.py index f27bfc0249f..501c1335005 100644 --- a/amber/src/main/python/core/architecture/managers/test_pause_manager.py +++ b/amber/src/main/python/core/architecture/managers/test_pause_manager.py @@ -20,7 +20,7 @@ from core.architecture.managers import StateManager from core.architecture.managers.pause_manager import PauseManager, PauseType from core.models import InternalQueue -from proto.org.apache.amber.engine.architecture.worker import WorkerState +from proto.org.apache.texera.amber.engine.architecture.worker import WorkerState class TestPauseManager: diff --git a/amber/src/main/python/core/architecture/managers/test_state_manager.py b/amber/src/main/python/core/architecture/managers/test_state_manager.py index a0c9caa9597..9ebe6e847c8 100644 --- a/amber/src/main/python/core/architecture/managers/test_state_manager.py +++ b/amber/src/main/python/core/architecture/managers/test_state_manager.py @@ -22,7 +22,7 @@ InvalidTransitionException, StateManager, ) -from proto.org.apache.amber.engine.architecture.worker import WorkerState +from proto.org.apache.texera.amber.engine.architecture.worker import WorkerState class TestStateManager: diff --git a/amber/src/main/python/core/architecture/managers/tuple_processing_manager.py b/amber/src/main/python/core/architecture/managers/tuple_processing_manager.py index 9e6df4000fa..a67949e6717 100644 --- a/amber/src/main/python/core/architecture/managers/tuple_processing_manager.py +++ b/amber/src/main/python/core/architecture/managers/tuple_processing_manager.py @@ -19,7 +19,7 @@ from typing import Optional, Tuple, Iterator from core.models import InternalMarker -from proto.org.apache.amber.core import PortIdentity +from proto.org.apache.texera.amber.core import PortIdentity class TupleProcessingManager: diff --git a/amber/src/main/python/core/architecture/packaging/input_manager.py b/amber/src/main/python/core/architecture/packaging/input_manager.py index de1dfaed7df..b5ef1151551 100644 --- a/amber/src/main/python/core/architecture/packaging/input_manager.py +++ b/amber/src/main/python/core/architecture/packaging/input_manager.py @@ -25,12 +25,12 @@ from core.storage.runnables.input_port_materialization_reader_runnable import ( InputPortMaterializationReaderRunnable, ) -from proto.org.apache.amber.core import ( +from proto.org.apache.texera.amber.core import ( ActorVirtualIdentity, PortIdentity, ChannelIdentity, ) -from proto.org.apache.amber.engine.architecture.sendsemantics import Partitioning +from proto.org.apache.texera.amber.engine.architecture.sendsemantics import Partitioning class Channel: diff --git a/amber/src/main/python/core/architecture/packaging/output_manager.py b/amber/src/main/python/core/architecture/packaging/output_manager.py index 76be4116b45..4003429baf6 100644 --- a/amber/src/main/python/core/architecture/packaging/output_manager.py +++ b/amber/src/main/python/core/architecture/packaging/output_manager.py @@ -51,14 +51,14 @@ ) from core.util import get_one_of from core.util.virtual_identity import get_worker_index -from proto.org.apache.amber.core import ( +from proto.org.apache.texera.amber.core import ( ActorVirtualIdentity, PhysicalLink, PortIdentity, ChannelIdentity, ) -from proto.org.apache.amber.engine.architecture.rpc import EmbeddedControlMessage -from proto.org.apache.amber.engine.architecture.sendsemantics import ( +from proto.org.apache.texera.amber.engine.architecture.rpc import EmbeddedControlMessage +from proto.org.apache.texera.amber.engine.architecture.sendsemantics import ( HashBasedShufflePartitioning, OneToOnePartitioning, Partitioning, diff --git a/amber/src/main/python/core/architecture/rpc/async_rpc_client.py b/amber/src/main/python/core/architecture/rpc/async_rpc_client.py index a99ff160125..0b97c4c62d0 100644 --- a/amber/src/main/python/core/architecture/rpc/async_rpc_client.py +++ b/amber/src/main/python/core/architecture/rpc/async_rpc_client.py @@ -26,8 +26,8 @@ from core.architecture.managers.context import Context from core.models.internal_queue import InternalQueue, DCMElement from core.util import set_one_of -from proto.org.apache.amber.core import ActorVirtualIdentity, ChannelIdentity -from proto.org.apache.amber.engine.architecture.rpc import ( +from proto.org.apache.texera.amber.core import ActorVirtualIdentity, ChannelIdentity +from proto.org.apache.texera.amber.engine.architecture.rpc import ( AsyncRpcContext, ReturnInvocation, ControlReturn, @@ -36,7 +36,7 @@ WorkerServiceStub, ControlRequest, ) -from proto.org.apache.amber.engine.common import DirectControlMessagePayloadV2 +from proto.org.apache.texera.amber.engine.common import DirectControlMessagePayloadV2 R = TypeVar("R") diff --git a/amber/src/main/python/core/architecture/rpc/async_rpc_server.py b/amber/src/main/python/core/architecture/rpc/async_rpc_server.py index 3b6268e9f40..d7763070301 100644 --- a/amber/src/main/python/core/architecture/rpc/async_rpc_server.py +++ b/amber/src/main/python/core/architecture/rpc/async_rpc_server.py @@ -25,8 +25,8 @@ ) from core.models.internal_queue import InternalQueue, DCMElement from core.util import get_one_of, set_one_of -from proto.org.apache.amber.core import ChannelIdentity -from proto.org.apache.amber.engine.architecture.rpc import ( +from proto.org.apache.texera.amber.core import ChannelIdentity +from proto.org.apache.texera.amber.engine.architecture.rpc import ( ReturnInvocation, ControlRequest, ControlInvocation, @@ -34,7 +34,7 @@ ControlError, ErrorLanguage, ) -from proto.org.apache.amber.engine.common import DirectControlMessagePayloadV2 +from proto.org.apache.texera.amber.engine.common import DirectControlMessagePayloadV2 class AsyncRPCServer: diff --git a/amber/src/main/python/core/architecture/sendsemantics/broad_cast_partitioner.py b/amber/src/main/python/core/architecture/sendsemantics/broad_cast_partitioner.py index bd9a375f043..bd1b1d29ecf 100644 --- a/amber/src/main/python/core/architecture/sendsemantics/broad_cast_partitioner.py +++ b/amber/src/main/python/core/architecture/sendsemantics/broad_cast_partitioner.py @@ -23,9 +23,9 @@ from core.models import Tuple from core.models.state import State from core.util import set_one_of -from proto.org.apache.amber.core import ActorVirtualIdentity -from proto.org.apache.amber.engine.architecture.rpc import EmbeddedControlMessage -from proto.org.apache.amber.engine.architecture.sendsemantics import ( +from proto.org.apache.texera.amber.core import ActorVirtualIdentity +from proto.org.apache.texera.amber.engine.architecture.rpc import EmbeddedControlMessage +from proto.org.apache.texera.amber.engine.architecture.sendsemantics import ( Partitioning, BroadcastPartitioning, ) diff --git a/amber/src/main/python/core/architecture/sendsemantics/hash_based_shuffle_partitioner.py b/amber/src/main/python/core/architecture/sendsemantics/hash_based_shuffle_partitioner.py index 8447c28ebf4..de018e5a3ce 100644 --- a/amber/src/main/python/core/architecture/sendsemantics/hash_based_shuffle_partitioner.py +++ b/amber/src/main/python/core/architecture/sendsemantics/hash_based_shuffle_partitioner.py @@ -24,9 +24,9 @@ from core.models import Tuple from core.models.state import State from core.util import set_one_of -from proto.org.apache.amber.core import ActorVirtualIdentity -from proto.org.apache.amber.engine.architecture.rpc import EmbeddedControlMessage -from proto.org.apache.amber.engine.architecture.sendsemantics import ( +from proto.org.apache.texera.amber.core import ActorVirtualIdentity +from proto.org.apache.texera.amber.engine.architecture.rpc import EmbeddedControlMessage +from proto.org.apache.texera.amber.engine.architecture.sendsemantics import ( HashBasedShufflePartitioning, Partitioning, ) diff --git a/amber/src/main/python/core/architecture/sendsemantics/one_to_one_partitioner.py b/amber/src/main/python/core/architecture/sendsemantics/one_to_one_partitioner.py index d42ebef1013..d6a568be6a3 100644 --- a/amber/src/main/python/core/architecture/sendsemantics/one_to_one_partitioner.py +++ b/amber/src/main/python/core/architecture/sendsemantics/one_to_one_partitioner.py @@ -23,9 +23,9 @@ from core.models import Tuple from core.models.state import State from core.util import set_one_of -from proto.org.apache.amber.core import ActorVirtualIdentity -from proto.org.apache.amber.engine.architecture.rpc import EmbeddedControlMessage -from proto.org.apache.amber.engine.architecture.sendsemantics import ( +from proto.org.apache.texera.amber.core import ActorVirtualIdentity +from proto.org.apache.texera.amber.engine.architecture.rpc import EmbeddedControlMessage +from proto.org.apache.texera.amber.engine.architecture.sendsemantics import ( OneToOnePartitioning, Partitioning, ) diff --git a/amber/src/main/python/core/architecture/sendsemantics/partitioner.py b/amber/src/main/python/core/architecture/sendsemantics/partitioner.py index ffe49532e83..c4aac57cbe4 100644 --- a/amber/src/main/python/core/architecture/sendsemantics/partitioner.py +++ b/amber/src/main/python/core/architecture/sendsemantics/partitioner.py @@ -23,9 +23,9 @@ from core.models import Tuple from core.models.state import State from core.util import get_one_of -from proto.org.apache.amber.core import ActorVirtualIdentity -from proto.org.apache.amber.engine.architecture.rpc import EmbeddedControlMessage -from proto.org.apache.amber.engine.architecture.sendsemantics import Partitioning +from proto.org.apache.texera.amber.core import ActorVirtualIdentity +from proto.org.apache.texera.amber.engine.architecture.rpc import EmbeddedControlMessage +from proto.org.apache.texera.amber.engine.architecture.sendsemantics import Partitioning class Partitioner(ABC): diff --git a/amber/src/main/python/core/architecture/sendsemantics/range_based_shuffle_partitioner.py b/amber/src/main/python/core/architecture/sendsemantics/range_based_shuffle_partitioner.py index 9a48930dd2b..28aff35935f 100644 --- a/amber/src/main/python/core/architecture/sendsemantics/range_based_shuffle_partitioner.py +++ b/amber/src/main/python/core/architecture/sendsemantics/range_based_shuffle_partitioner.py @@ -24,9 +24,9 @@ from core.models import Tuple from core.models.state import State from core.util import set_one_of -from proto.org.apache.amber.core import ActorVirtualIdentity -from proto.org.apache.amber.engine.architecture.rpc import EmbeddedControlMessage -from proto.org.apache.amber.engine.architecture.sendsemantics import ( +from proto.org.apache.texera.amber.core import ActorVirtualIdentity +from proto.org.apache.texera.amber.engine.architecture.rpc import EmbeddedControlMessage +from proto.org.apache.texera.amber.engine.architecture.sendsemantics import ( RangeBasedShufflePartitioning, Partitioning, ) diff --git a/amber/src/main/python/core/architecture/sendsemantics/round_robin_partitioner.py b/amber/src/main/python/core/architecture/sendsemantics/round_robin_partitioner.py index b108a507f6c..87c3fee87d8 100644 --- a/amber/src/main/python/core/architecture/sendsemantics/round_robin_partitioner.py +++ b/amber/src/main/python/core/architecture/sendsemantics/round_robin_partitioner.py @@ -23,9 +23,9 @@ from core.models import Tuple from core.models.state import State from core.util import set_one_of -from proto.org.apache.amber.core import ActorVirtualIdentity -from proto.org.apache.amber.engine.architecture.rpc import EmbeddedControlMessage -from proto.org.apache.amber.engine.architecture.sendsemantics import ( +from proto.org.apache.texera.amber.core import ActorVirtualIdentity +from proto.org.apache.texera.amber.engine.architecture.rpc import EmbeddedControlMessage +from proto.org.apache.texera.amber.engine.architecture.sendsemantics import ( Partitioning, RoundRobinPartitioning, ) diff --git a/amber/src/main/python/core/models/internal_queue.py b/amber/src/main/python/core/models/internal_queue.py index e7483aef4ac..645b4263669 100644 --- a/amber/src/main/python/core/models/internal_queue.py +++ b/amber/src/main/python/core/models/internal_queue.py @@ -28,9 +28,9 @@ LinkedBlockingMultiQueue, ) from core.util.customized_queue.queue_base import IQueue, QueueElement -from proto.org.apache.amber.core import ChannelIdentity -from proto.org.apache.amber.engine.architecture.rpc import EmbeddedControlMessage -from proto.org.apache.amber.engine.common import DirectControlMessagePayloadV2 +from proto.org.apache.texera.amber.core import ChannelIdentity +from proto.org.apache.texera.amber.engine.architecture.rpc import EmbeddedControlMessage +from proto.org.apache.texera.amber.engine.common import DirectControlMessagePayloadV2 @dataclass diff --git a/amber/src/main/python/core/runnables/data_processor.py b/amber/src/main/python/core/runnables/data_processor.py index ce8f9371421..4399b1a3a2f 100644 --- a/amber/src/main/python/core/runnables/data_processor.py +++ b/amber/src/main/python/core/runnables/data_processor.py @@ -30,7 +30,7 @@ from core.util.console_message.replace_print import replace_print from core.util.console_message.timestamp import current_time_in_local_timezone from core.util.runnable.runnable import Runnable -from proto.org.apache.amber.engine.architecture.rpc import ( +from proto.org.apache.texera.amber.engine.architecture.rpc import ( ConsoleMessage, ConsoleMessageType, ) diff --git a/amber/src/main/python/core/runnables/main_loop.py b/amber/src/main/python/core/runnables/main_loop.py index ec662ec721b..6b77d88cd55 100644 --- a/amber/src/main/python/core/runnables/main_loop.py +++ b/amber/src/main/python/core/runnables/main_loop.py @@ -43,13 +43,13 @@ from core.util import StoppableQueueBlockingRunnable, get_one_of from core.util.console_message.timestamp import current_time_in_local_timezone from core.util.customized_queue.queue_base import QueueElement -from proto.org.apache.amber.core import ( +from proto.org.apache.texera.amber.core import ( ActorVirtualIdentity, PortIdentity, ChannelIdentity, EmbeddedControlMessageIdentity, ) -from proto.org.apache.amber.engine.architecture.rpc import ( +from proto.org.apache.texera.amber.engine.architecture.rpc import ( ConsoleMessage, ControlInvocation, ConsoleMessageType, @@ -62,7 +62,7 @@ AsyncRpcContext, ControlRequest, ) -from proto.org.apache.amber.engine.architecture.worker import ( +from proto.org.apache.texera.amber.engine.architecture.worker import ( WorkerState, ) diff --git a/amber/src/main/python/core/runnables/network_receiver.py b/amber/src/main/python/core/runnables/network_receiver.py index b99cff554a7..fd42a8f589b 100644 --- a/amber/src/main/python/core/runnables/network_receiver.py +++ b/amber/src/main/python/core/runnables/network_receiver.py @@ -44,8 +44,8 @@ from core.proxy import ProxyServer from core.util import Stoppable, get_one_of from core.util.runnable.runnable import Runnable -from proto.org.apache.amber.engine.architecture.rpc import EmbeddedControlMessage -from proto.org.apache.amber.engine.common import ( +from proto.org.apache.texera.amber.engine.architecture.rpc import EmbeddedControlMessage +from proto.org.apache.texera.amber.engine.common import ( PythonControlMessage, PythonDataHeader, PythonActorMessage, diff --git a/amber/src/main/python/core/runnables/network_sender.py b/amber/src/main/python/core/runnables/network_sender.py index 3744b369cab..9595433fb70 100644 --- a/amber/src/main/python/core/runnables/network_sender.py +++ b/amber/src/main/python/core/runnables/network_sender.py @@ -29,9 +29,9 @@ ) from core.proxy import ProxyClient from core.util import StoppableQueueBlockingRunnable -from proto.org.apache.amber.core import ChannelIdentity -from proto.org.apache.amber.engine.architecture.rpc import EmbeddedControlMessage -from proto.org.apache.amber.engine.common import ( +from proto.org.apache.texera.amber.core import ChannelIdentity +from proto.org.apache.texera.amber.engine.architecture.rpc import EmbeddedControlMessage +from proto.org.apache.texera.amber.engine.common import ( DirectControlMessagePayloadV2, PythonControlMessage, PythonDataHeader, diff --git a/amber/src/main/python/core/runnables/test_console_message.py b/amber/src/main/python/core/runnables/test_console_message.py index 6413eba3149..fbe9041f96d 100644 --- a/amber/src/main/python/core/runnables/test_console_message.py +++ b/amber/src/main/python/core/runnables/test_console_message.py @@ -21,14 +21,14 @@ from core.models.internal_queue import InternalQueue from core.util import set_one_of from core.util.buffer.timed_buffer import TimedBuffer -from proto.org.apache.amber.core import ActorVirtualIdentity, ChannelIdentity -from proto.org.apache.amber.engine.architecture.rpc import ( +from proto.org.apache.texera.amber.core import ActorVirtualIdentity, ChannelIdentity +from proto.org.apache.texera.amber.engine.architecture.rpc import ( ControlInvocation, ControlRequest, ConsoleMessage, ConsoleMessageType, ) -from proto.org.apache.amber.engine.common import ( +from proto.org.apache.texera.amber.engine.common import ( DirectControlMessagePayloadV2, PythonControlMessage, ) diff --git a/amber/src/main/python/core/runnables/test_main_loop.py b/amber/src/main/python/core/runnables/test_main_loop.py index 0c1ea6231fe..4931389c0b4 100644 --- a/amber/src/main/python/core/runnables/test_main_loop.py +++ b/amber/src/main/python/core/runnables/test_main_loop.py @@ -34,7 +34,7 @@ ) from core.runnables import MainLoop from core.util import set_one_of -from proto.org.apache.amber.core import ( +from proto.org.apache.texera.amber.core import ( ActorVirtualIdentity, PhysicalLink, PhysicalOpIdentity, @@ -45,7 +45,7 @@ OpExecInitInfo, EmbeddedControlMessageIdentity, ) -from proto.org.apache.amber.engine.architecture.rpc import ( +from proto.org.apache.texera.amber.engine.architecture.rpc import ( ControlRequest, AssignPortRequest, ControlInvocation, @@ -63,18 +63,18 @@ EmbeddedControlMessageType, EmbeddedControlMessage, ) -from proto.org.apache.amber.engine.architecture.sendsemantics import ( +from proto.org.apache.texera.amber.engine.architecture.sendsemantics import ( OneToOnePartitioning, Partitioning, ) -from proto.org.apache.amber.engine.architecture.worker import ( +from proto.org.apache.texera.amber.engine.architecture.worker import ( WorkerMetrics, WorkerState, WorkerStatistics, PortTupleMetricsMapping, TupleMetrics, ) -from proto.org.apache.amber.engine.common import DirectControlMessagePayloadV2 +from proto.org.apache.texera.amber.engine.common import DirectControlMessagePayloadV2 from pytexera.udf.examples.count_batch_operator import CountBatchOperator from pytexera.udf.examples.echo_operator import EchoOperator diff --git a/amber/src/main/python/core/runnables/test_network_receiver.py b/amber/src/main/python/core/runnables/test_network_receiver.py index 50f0a20a9b2..2cc2541f2d5 100644 --- a/amber/src/main/python/core/runnables/test_network_receiver.py +++ b/amber/src/main/python/core/runnables/test_network_receiver.py @@ -30,12 +30,12 @@ from core.runnables.network_receiver import NetworkReceiver from core.runnables.network_sender import NetworkSender from core.util.proto import set_one_of -from proto.org.apache.amber.core import ( +from proto.org.apache.texera.amber.core import ( ActorVirtualIdentity, ChannelIdentity, EmbeddedControlMessageIdentity, ) -from proto.org.apache.amber.engine.architecture.rpc import ( +from proto.org.apache.texera.amber.engine.architecture.rpc import ( ControlInvocation, EmbeddedControlMessage, EmbeddedControlMessageType, @@ -43,7 +43,7 @@ AsyncRpcContext, ControlRequest, ) -from proto.org.apache.amber.engine.common import DirectControlMessagePayloadV2 +from proto.org.apache.texera.amber.engine.common import DirectControlMessagePayloadV2 class TestNetworkReceiver: diff --git a/amber/src/main/python/core/storage/iceberg/test_iceberg_document.py b/amber/src/main/python/core/storage/iceberg/test_iceberg_document.py index 29e289bf934..6d7f7017c62 100644 --- a/amber/src/main/python/core/storage/iceberg/test_iceberg_document.py +++ b/amber/src/main/python/core/storage/iceberg/test_iceberg_document.py @@ -26,7 +26,7 @@ from core.storage.document_factory import DocumentFactory from core.storage.storage_config import StorageConfig from core.storage.vfs_uri_factory import VFSURIFactory -from proto.org.apache.amber.core import ( +from proto.org.apache.texera.amber.core import ( WorkflowIdentity, ExecutionIdentity, OperatorIdentity, diff --git a/amber/src/main/python/core/storage/runnables/input_port_materialization_reader_runnable.py b/amber/src/main/python/core/storage/runnables/input_port_materialization_reader_runnable.py index 138c9c424ff..c82926a60a0 100644 --- a/amber/src/main/python/core/storage/runnables/input_port_materialization_reader_runnable.py +++ b/amber/src/main/python/core/storage/runnables/input_port_materialization_reader_runnable.py @@ -40,12 +40,12 @@ from core.util import Stoppable, get_one_of from core.util.runnable.runnable import Runnable from core.util.virtual_identity import get_from_actor_id_for_input_port_storage -from proto.org.apache.amber.core import ( +from proto.org.apache.texera.amber.core import ( ActorVirtualIdentity, ChannelIdentity, EmbeddedControlMessageIdentity, ) -from proto.org.apache.amber.engine.architecture.rpc import ( +from proto.org.apache.texera.amber.engine.architecture.rpc import ( ControlInvocation, EmptyRequest, EmbeddedControlMessageType, @@ -53,7 +53,7 @@ AsyncRpcContext, ControlRequest, ) -from proto.org.apache.amber.engine.architecture.sendsemantics import ( +from proto.org.apache.texera.amber.engine.architecture.sendsemantics import ( HashBasedShufflePartitioning, OneToOnePartitioning, Partitioning, diff --git a/amber/src/main/python/core/storage/vfs_uri_factory.py b/amber/src/main/python/core/storage/vfs_uri_factory.py index 44d184c7aa1..de0c5db56ec 100644 --- a/amber/src/main/python/core/storage/vfs_uri_factory.py +++ b/amber/src/main/python/core/storage/vfs_uri_factory.py @@ -23,7 +23,7 @@ serialize_global_port_identity, deserialize_global_port_identity, ) -from proto.org.apache.amber.core import ( +from proto.org.apache.texera.amber.core import ( WorkflowIdentity, ExecutionIdentity, GlobalPortIdentity, diff --git a/amber/src/main/python/core/util/buffer/timed_buffer.py b/amber/src/main/python/core/util/buffer/timed_buffer.py index 8eee57792e1..abaacb15705 100644 --- a/amber/src/main/python/core/util/buffer/timed_buffer.py +++ b/amber/src/main/python/core/util/buffer/timed_buffer.py @@ -19,7 +19,7 @@ from typing import List, Iterator from core.util.buffer.buffer_base import IBuffer -from proto.org.apache.amber.engine.architecture.rpc import ConsoleMessage +from proto.org.apache.texera.amber.engine.architecture.rpc import ConsoleMessage class TimedBuffer(IBuffer): diff --git a/amber/src/main/python/core/util/console_message/replace_print.py b/amber/src/main/python/core/util/console_message/replace_print.py index 3f7a2da235b..7feeeeb52d0 100644 --- a/amber/src/main/python/core/util/console_message/replace_print.py +++ b/amber/src/main/python/core/util/console_message/replace_print.py @@ -23,7 +23,7 @@ from core.util.buffer.buffer_base import IBuffer from core.util.console_message.timestamp import current_time_in_local_timezone -from proto.org.apache.amber.engine.architecture.rpc import ( +from proto.org.apache.texera.amber.engine.architecture.rpc import ( ConsoleMessage, ConsoleMessageType, ) diff --git a/amber/src/main/python/core/util/console_message/timed_buffer.py b/amber/src/main/python/core/util/console_message/timed_buffer.py index e0c7f527af1..59369f16b21 100644 --- a/amber/src/main/python/core/util/console_message/timed_buffer.py +++ b/amber/src/main/python/core/util/console_message/timed_buffer.py @@ -18,7 +18,9 @@ from datetime import datetime from typing import Tuple, List, Iterator -from proto.org.apache.amber.engine.architecture.worker import PythonConsoleMessageV2 +from proto.org.apache.texera.amber.engine.architecture.worker import ( + PythonConsoleMessageV2, +) class TimedBuffer: diff --git a/amber/src/main/python/core/util/expression_evaluator/__init__.py b/amber/src/main/python/core/util/expression_evaluator/__init__.py index d74b7080cfa..b13e6a05191 100644 --- a/amber/src/main/python/core/util/expression_evaluator/__init__.py +++ b/amber/src/main/python/core/util/expression_evaluator/__init__.py @@ -20,7 +20,10 @@ from collections.abc import Iterator, Mapping from typing import Any, Dict, List, Optional, Pattern, Tuple -from proto.org.apache.amber.engine.architecture.rpc import EvaluatedValue, TypedValue +from proto.org.apache.texera.amber.engine.architecture.rpc import ( + EvaluatedValue, + TypedValue, +) class ExpressionEvaluator: diff --git a/amber/src/main/python/core/util/expression_evaluator/test_expression_evaluator.py b/amber/src/main/python/core/util/expression_evaluator/test_expression_evaluator.py index c523767e25c..19340bdccda 100644 --- a/amber/src/main/python/core/util/expression_evaluator/test_expression_evaluator.py +++ b/amber/src/main/python/core/util/expression_evaluator/test_expression_evaluator.py @@ -16,7 +16,10 @@ # under the License. from core.util.expression_evaluator import ExpressionEvaluator -from proto.org.apache.amber.engine.architecture.rpc import EvaluatedValue, TypedValue +from proto.org.apache.texera.amber.engine.architecture.rpc import ( + EvaluatedValue, + TypedValue, +) class TestExpressionEvaluator: diff --git a/amber/src/main/python/core/util/virtual_identity/__init__.py b/amber/src/main/python/core/util/virtual_identity/__init__.py index deb5aa7053b..93a887d7c68 100644 --- a/amber/src/main/python/core/util/virtual_identity/__init__.py +++ b/amber/src/main/python/core/util/virtual_identity/__init__.py @@ -16,7 +16,7 @@ # under the License. import re -from proto.org.apache.amber.core import ( +from proto.org.apache.texera.amber.core import ( GlobalPortIdentity, PhysicalOpIdentity, OperatorIdentity, diff --git a/amber/src/main/python/proto/org/apache/amber/__init__.py b/amber/src/main/python/proto/org/apache/texera/amber/__init__.py similarity index 100% rename from amber/src/main/python/proto/org/apache/amber/__init__.py rename to amber/src/main/python/proto/org/apache/texera/amber/__init__.py diff --git a/amber/src/main/python/proto/org/apache/amber/core/__init__.py b/amber/src/main/python/proto/org/apache/texera/amber/core/__init__.py similarity index 100% rename from amber/src/main/python/proto/org/apache/amber/core/__init__.py rename to amber/src/main/python/proto/org/apache/texera/amber/core/__init__.py diff --git a/amber/src/main/python/proto/org/apache/amber/engine/__init__.py b/amber/src/main/python/proto/org/apache/texera/amber/engine/__init__.py similarity index 100% rename from amber/src/main/python/proto/org/apache/amber/engine/__init__.py rename to amber/src/main/python/proto/org/apache/texera/amber/engine/__init__.py diff --git a/amber/src/main/python/proto/org/apache/amber/engine/architecture/__init__.py b/amber/src/main/python/proto/org/apache/texera/amber/engine/architecture/__init__.py similarity index 100% rename from amber/src/main/python/proto/org/apache/amber/engine/architecture/__init__.py rename to amber/src/main/python/proto/org/apache/texera/amber/engine/architecture/__init__.py diff --git a/amber/src/main/python/proto/org/apache/amber/engine/architecture/rpc/__init__.py b/amber/src/main/python/proto/org/apache/texera/amber/engine/architecture/rpc/__init__.py similarity index 87% rename from amber/src/main/python/proto/org/apache/amber/engine/architecture/rpc/__init__.py rename to amber/src/main/python/proto/org/apache/texera/amber/engine/architecture/rpc/__init__.py index 0a913e8b889..1fc9bf2b5bb 100644 --- a/amber/src/main/python/proto/org/apache/amber/engine/architecture/rpc/__init__.py +++ b/amber/src/main/python/proto/org/apache/texera/amber/engine/architecture/rpc/__init__.py @@ -544,7 +544,7 @@ async def send_ping( metadata: Optional["MetadataLike"] = None ) -> "IntResponse": return await self._unary_unary( - "/org.apache.amber.engine.architecture.rpc.RPCTester/SendPing", + "/org.apache.texera.amber.engine.architecture.rpc.RPCTester/SendPing", ping, IntResponse, timeout=timeout, @@ -561,7 +561,7 @@ async def send_pong( metadata: Optional["MetadataLike"] = None ) -> "IntResponse": return await self._unary_unary( - "/org.apache.amber.engine.architecture.rpc.RPCTester/SendPong", + "/org.apache.texera.amber.engine.architecture.rpc.RPCTester/SendPong", pong, IntResponse, timeout=timeout, @@ -578,7 +578,7 @@ async def send_nested( metadata: Optional["MetadataLike"] = None ) -> "StringResponse": return await self._unary_unary( - "/org.apache.amber.engine.architecture.rpc.RPCTester/SendNested", + "/org.apache.texera.amber.engine.architecture.rpc.RPCTester/SendNested", nested, StringResponse, timeout=timeout, @@ -595,7 +595,7 @@ async def send_pass( metadata: Optional["MetadataLike"] = None ) -> "StringResponse": return await self._unary_unary( - "/org.apache.amber.engine.architecture.rpc.RPCTester/SendPass", + "/org.apache.texera.amber.engine.architecture.rpc.RPCTester/SendPass", pass_, StringResponse, timeout=timeout, @@ -612,7 +612,7 @@ async def send_error_command( metadata: Optional["MetadataLike"] = None ) -> "StringResponse": return await self._unary_unary( - "/org.apache.amber.engine.architecture.rpc.RPCTester/SendErrorCommand", + "/org.apache.texera.amber.engine.architecture.rpc.RPCTester/SendErrorCommand", error_command, StringResponse, timeout=timeout, @@ -629,7 +629,7 @@ async def send_recursion( metadata: Optional["MetadataLike"] = None ) -> "StringResponse": return await self._unary_unary( - "/org.apache.amber.engine.architecture.rpc.RPCTester/SendRecursion", + "/org.apache.texera.amber.engine.architecture.rpc.RPCTester/SendRecursion", recursion, StringResponse, timeout=timeout, @@ -646,7 +646,7 @@ async def send_collect( metadata: Optional["MetadataLike"] = None ) -> "StringResponse": return await self._unary_unary( - "/org.apache.amber.engine.architecture.rpc.RPCTester/SendCollect", + "/org.apache.texera.amber.engine.architecture.rpc.RPCTester/SendCollect", collect, StringResponse, timeout=timeout, @@ -663,7 +663,7 @@ async def send_generate_number( metadata: Optional["MetadataLike"] = None ) -> "IntResponse": return await self._unary_unary( - "/org.apache.amber.engine.architecture.rpc.RPCTester/SendGenerateNumber", + "/org.apache.texera.amber.engine.architecture.rpc.RPCTester/SendGenerateNumber", generate_number, IntResponse, timeout=timeout, @@ -680,7 +680,7 @@ async def send_multi_call( metadata: Optional["MetadataLike"] = None ) -> "StringResponse": return await self._unary_unary( - "/org.apache.amber.engine.architecture.rpc.RPCTester/SendMultiCall", + "/org.apache.texera.amber.engine.architecture.rpc.RPCTester/SendMultiCall", multi_call, StringResponse, timeout=timeout, @@ -697,7 +697,7 @@ async def send_chain( metadata: Optional["MetadataLike"] = None ) -> "StringResponse": return await self._unary_unary( - "/org.apache.amber.engine.architecture.rpc.RPCTester/SendChain", + "/org.apache.texera.amber.engine.architecture.rpc.RPCTester/SendChain", chain, StringResponse, timeout=timeout, @@ -716,7 +716,7 @@ async def add_input_channel( metadata: Optional["MetadataLike"] = None ) -> "EmptyReturn": return await self._unary_unary( - "/org.apache.amber.engine.architecture.rpc.WorkerService/AddInputChannel", + "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/AddInputChannel", add_input_channel_request, EmptyReturn, timeout=timeout, @@ -733,7 +733,7 @@ async def add_partitioning( metadata: Optional["MetadataLike"] = None ) -> "EmptyReturn": return await self._unary_unary( - "/org.apache.amber.engine.architecture.rpc.WorkerService/AddPartitioning", + "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/AddPartitioning", add_partitioning_request, EmptyReturn, timeout=timeout, @@ -750,7 +750,7 @@ async def assign_port( metadata: Optional["MetadataLike"] = None ) -> "EmptyReturn": return await self._unary_unary( - "/org.apache.amber.engine.architecture.rpc.WorkerService/AssignPort", + "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/AssignPort", assign_port_request, EmptyReturn, timeout=timeout, @@ -767,7 +767,7 @@ async def finalize_checkpoint( metadata: Optional["MetadataLike"] = None ) -> "FinalizeCheckpointResponse": return await self._unary_unary( - "/org.apache.amber.engine.architecture.rpc.WorkerService/FinalizeCheckpoint", + "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/FinalizeCheckpoint", finalize_checkpoint_request, FinalizeCheckpointResponse, timeout=timeout, @@ -784,7 +784,7 @@ async def flush_network_buffer( metadata: Optional["MetadataLike"] = None ) -> "EmptyReturn": return await self._unary_unary( - "/org.apache.amber.engine.architecture.rpc.WorkerService/FlushNetworkBuffer", + "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/FlushNetworkBuffer", empty_request, EmptyReturn, timeout=timeout, @@ -801,7 +801,7 @@ async def initialize_executor( metadata: Optional["MetadataLike"] = None ) -> "EmptyReturn": return await self._unary_unary( - "/org.apache.amber.engine.architecture.rpc.WorkerService/InitializeExecutor", + "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/InitializeExecutor", initialize_executor_request, EmptyReturn, timeout=timeout, @@ -818,7 +818,7 @@ async def open_executor( metadata: Optional["MetadataLike"] = None ) -> "EmptyReturn": return await self._unary_unary( - "/org.apache.amber.engine.architecture.rpc.WorkerService/OpenExecutor", + "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/OpenExecutor", empty_request, EmptyReturn, timeout=timeout, @@ -835,7 +835,7 @@ async def pause_worker( metadata: Optional["MetadataLike"] = None ) -> "WorkerStateResponse": return await self._unary_unary( - "/org.apache.amber.engine.architecture.rpc.WorkerService/PauseWorker", + "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/PauseWorker", empty_request, WorkerStateResponse, timeout=timeout, @@ -852,7 +852,7 @@ async def prepare_checkpoint( metadata: Optional["MetadataLike"] = None ) -> "EmptyReturn": return await self._unary_unary( - "/org.apache.amber.engine.architecture.rpc.WorkerService/PrepareCheckpoint", + "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/PrepareCheckpoint", prepare_checkpoint_request, EmptyReturn, timeout=timeout, @@ -869,7 +869,7 @@ async def query_statistics( metadata: Optional["MetadataLike"] = None ) -> "WorkerMetricsResponse": return await self._unary_unary( - "/org.apache.amber.engine.architecture.rpc.WorkerService/QueryStatistics", + "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/QueryStatistics", empty_request, WorkerMetricsResponse, timeout=timeout, @@ -886,7 +886,7 @@ async def resume_worker( metadata: Optional["MetadataLike"] = None ) -> "WorkerStateResponse": return await self._unary_unary( - "/org.apache.amber.engine.architecture.rpc.WorkerService/ResumeWorker", + "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/ResumeWorker", empty_request, WorkerStateResponse, timeout=timeout, @@ -903,7 +903,7 @@ async def retrieve_state( metadata: Optional["MetadataLike"] = None ) -> "EmptyReturn": return await self._unary_unary( - "/org.apache.amber.engine.architecture.rpc.WorkerService/RetrieveState", + "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/RetrieveState", empty_request, EmptyReturn, timeout=timeout, @@ -920,7 +920,7 @@ async def retry_current_tuple( metadata: Optional["MetadataLike"] = None ) -> "EmptyReturn": return await self._unary_unary( - "/org.apache.amber.engine.architecture.rpc.WorkerService/RetryCurrentTuple", + "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/RetryCurrentTuple", empty_request, EmptyReturn, timeout=timeout, @@ -937,7 +937,7 @@ async def start_worker( metadata: Optional["MetadataLike"] = None ) -> "WorkerStateResponse": return await self._unary_unary( - "/org.apache.amber.engine.architecture.rpc.WorkerService/StartWorker", + "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/StartWorker", empty_request, WorkerStateResponse, timeout=timeout, @@ -954,7 +954,7 @@ async def end_worker( metadata: Optional["MetadataLike"] = None ) -> "EmptyReturn": return await self._unary_unary( - "/org.apache.amber.engine.architecture.rpc.WorkerService/EndWorker", + "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/EndWorker", empty_request, EmptyReturn, timeout=timeout, @@ -971,7 +971,7 @@ async def start_channel( metadata: Optional["MetadataLike"] = None ) -> "EmptyReturn": return await self._unary_unary( - "/org.apache.amber.engine.architecture.rpc.WorkerService/StartChannel", + "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/StartChannel", empty_request, EmptyReturn, timeout=timeout, @@ -988,7 +988,7 @@ async def end_channel( metadata: Optional["MetadataLike"] = None ) -> "EmptyReturn": return await self._unary_unary( - "/org.apache.amber.engine.architecture.rpc.WorkerService/EndChannel", + "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/EndChannel", empty_request, EmptyReturn, timeout=timeout, @@ -1005,7 +1005,7 @@ async def debug_command( metadata: Optional["MetadataLike"] = None ) -> "EmptyReturn": return await self._unary_unary( - "/org.apache.amber.engine.architecture.rpc.WorkerService/DebugCommand", + "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/DebugCommand", debug_command_request, EmptyReturn, timeout=timeout, @@ -1022,7 +1022,7 @@ async def evaluate_python_expression( metadata: Optional["MetadataLike"] = None ) -> "EvaluatedValue": return await self._unary_unary( - "/org.apache.amber.engine.architecture.rpc.WorkerService/EvaluatePythonExpression", + "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/EvaluatePythonExpression", evaluate_python_expression_request, EvaluatedValue, timeout=timeout, @@ -1039,7 +1039,7 @@ async def no_operation( metadata: Optional["MetadataLike"] = None ) -> "EmptyReturn": return await self._unary_unary( - "/org.apache.amber.engine.architecture.rpc.WorkerService/NoOperation", + "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/NoOperation", empty_request, EmptyReturn, timeout=timeout, @@ -1058,7 +1058,7 @@ async def retrieve_workflow_state( metadata: Optional["MetadataLike"] = None ) -> "RetrieveWorkflowStateResponse": return await self._unary_unary( - "/org.apache.amber.engine.architecture.rpc.ControllerService/RetrieveWorkflowState", + "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/RetrieveWorkflowState", empty_request, RetrieveWorkflowStateResponse, timeout=timeout, @@ -1075,7 +1075,7 @@ async def propagate_embedded_control_message( metadata: Optional["MetadataLike"] = None ) -> "PropagateEmbeddedControlMessageResponse": return await self._unary_unary( - "/org.apache.amber.engine.architecture.rpc.ControllerService/PropagateEmbeddedControlMessage", + "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/PropagateEmbeddedControlMessage", propagate_embedded_control_message_request, PropagateEmbeddedControlMessageResponse, timeout=timeout, @@ -1092,7 +1092,7 @@ async def take_global_checkpoint( metadata: Optional["MetadataLike"] = None ) -> "TakeGlobalCheckpointResponse": return await self._unary_unary( - "/org.apache.amber.engine.architecture.rpc.ControllerService/TakeGlobalCheckpoint", + "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/TakeGlobalCheckpoint", take_global_checkpoint_request, TakeGlobalCheckpointResponse, timeout=timeout, @@ -1109,7 +1109,7 @@ async def debug_command( metadata: Optional["MetadataLike"] = None ) -> "EmptyReturn": return await self._unary_unary( - "/org.apache.amber.engine.architecture.rpc.ControllerService/DebugCommand", + "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/DebugCommand", debug_command_request, EmptyReturn, timeout=timeout, @@ -1126,7 +1126,7 @@ async def evaluate_python_expression( metadata: Optional["MetadataLike"] = None ) -> "EvaluatePythonExpressionResponse": return await self._unary_unary( - "/org.apache.amber.engine.architecture.rpc.ControllerService/EvaluatePythonExpression", + "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/EvaluatePythonExpression", evaluate_python_expression_request, EvaluatePythonExpressionResponse, timeout=timeout, @@ -1143,7 +1143,7 @@ async def console_message_triggered( metadata: Optional["MetadataLike"] = None ) -> "EmptyReturn": return await self._unary_unary( - "/org.apache.amber.engine.architecture.rpc.ControllerService/ConsoleMessageTriggered", + "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/ConsoleMessageTriggered", console_message_triggered_request, EmptyReturn, timeout=timeout, @@ -1160,7 +1160,7 @@ async def port_completed( metadata: Optional["MetadataLike"] = None ) -> "EmptyReturn": return await self._unary_unary( - "/org.apache.amber.engine.architecture.rpc.ControllerService/PortCompleted", + "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/PortCompleted", port_completed_request, EmptyReturn, timeout=timeout, @@ -1177,7 +1177,7 @@ async def start_workflow( metadata: Optional["MetadataLike"] = None ) -> "StartWorkflowResponse": return await self._unary_unary( - "/org.apache.amber.engine.architecture.rpc.ControllerService/StartWorkflow", + "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/StartWorkflow", empty_request, StartWorkflowResponse, timeout=timeout, @@ -1194,7 +1194,7 @@ async def resume_workflow( metadata: Optional["MetadataLike"] = None ) -> "EmptyReturn": return await self._unary_unary( - "/org.apache.amber.engine.architecture.rpc.ControllerService/ResumeWorkflow", + "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/ResumeWorkflow", empty_request, EmptyReturn, timeout=timeout, @@ -1211,7 +1211,7 @@ async def pause_workflow( metadata: Optional["MetadataLike"] = None ) -> "EmptyReturn": return await self._unary_unary( - "/org.apache.amber.engine.architecture.rpc.ControllerService/PauseWorkflow", + "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/PauseWorkflow", empty_request, EmptyReturn, timeout=timeout, @@ -1228,7 +1228,7 @@ async def worker_state_updated( metadata: Optional["MetadataLike"] = None ) -> "EmptyReturn": return await self._unary_unary( - "/org.apache.amber.engine.architecture.rpc.ControllerService/WorkerStateUpdated", + "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/WorkerStateUpdated", worker_state_updated_request, EmptyReturn, timeout=timeout, @@ -1245,7 +1245,7 @@ async def worker_execution_completed( metadata: Optional["MetadataLike"] = None ) -> "EmptyReturn": return await self._unary_unary( - "/org.apache.amber.engine.architecture.rpc.ControllerService/WorkerExecutionCompleted", + "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/WorkerExecutionCompleted", empty_request, EmptyReturn, timeout=timeout, @@ -1262,7 +1262,7 @@ async def link_workers( metadata: Optional["MetadataLike"] = None ) -> "EmptyReturn": return await self._unary_unary( - "/org.apache.amber.engine.architecture.rpc.ControllerService/LinkWorkers", + "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/LinkWorkers", link_workers_request, EmptyReturn, timeout=timeout, @@ -1279,7 +1279,7 @@ async def controller_initiate_query_statistics( metadata: Optional["MetadataLike"] = None ) -> "EmptyReturn": return await self._unary_unary( - "/org.apache.amber.engine.architecture.rpc.ControllerService/ControllerInitiateQueryStatistics", + "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/ControllerInitiateQueryStatistics", query_statistics_request, EmptyReturn, timeout=timeout, @@ -1296,7 +1296,7 @@ async def retry_workflow( metadata: Optional["MetadataLike"] = None ) -> "EmptyReturn": return await self._unary_unary( - "/org.apache.amber.engine.architecture.rpc.ControllerService/RetryWorkflow", + "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/RetryWorkflow", retry_workflow_request, EmptyReturn, timeout=timeout, @@ -1413,61 +1413,61 @@ async def __rpc_send_chain( def __mapping__(self) -> Dict[str, grpclib.const.Handler]: return { - "/org.apache.amber.engine.architecture.rpc.RPCTester/SendPing": grpclib.const.Handler( + "/org.apache.texera.amber.engine.architecture.rpc.RPCTester/SendPing": grpclib.const.Handler( self.__rpc_send_ping, grpclib.const.Cardinality.UNARY_UNARY, Ping, IntResponse, ), - "/org.apache.amber.engine.architecture.rpc.RPCTester/SendPong": grpclib.const.Handler( + "/org.apache.texera.amber.engine.architecture.rpc.RPCTester/SendPong": grpclib.const.Handler( self.__rpc_send_pong, grpclib.const.Cardinality.UNARY_UNARY, Pong, IntResponse, ), - "/org.apache.amber.engine.architecture.rpc.RPCTester/SendNested": grpclib.const.Handler( + "/org.apache.texera.amber.engine.architecture.rpc.RPCTester/SendNested": grpclib.const.Handler( self.__rpc_send_nested, grpclib.const.Cardinality.UNARY_UNARY, Nested, StringResponse, ), - "/org.apache.amber.engine.architecture.rpc.RPCTester/SendPass": grpclib.const.Handler( + "/org.apache.texera.amber.engine.architecture.rpc.RPCTester/SendPass": grpclib.const.Handler( self.__rpc_send_pass, grpclib.const.Cardinality.UNARY_UNARY, Pass, StringResponse, ), - "/org.apache.amber.engine.architecture.rpc.RPCTester/SendErrorCommand": grpclib.const.Handler( + "/org.apache.texera.amber.engine.architecture.rpc.RPCTester/SendErrorCommand": grpclib.const.Handler( self.__rpc_send_error_command, grpclib.const.Cardinality.UNARY_UNARY, ErrorCommand, StringResponse, ), - "/org.apache.amber.engine.architecture.rpc.RPCTester/SendRecursion": grpclib.const.Handler( + "/org.apache.texera.amber.engine.architecture.rpc.RPCTester/SendRecursion": grpclib.const.Handler( self.__rpc_send_recursion, grpclib.const.Cardinality.UNARY_UNARY, Recursion, StringResponse, ), - "/org.apache.amber.engine.architecture.rpc.RPCTester/SendCollect": grpclib.const.Handler( + "/org.apache.texera.amber.engine.architecture.rpc.RPCTester/SendCollect": grpclib.const.Handler( self.__rpc_send_collect, grpclib.const.Cardinality.UNARY_UNARY, Collect, StringResponse, ), - "/org.apache.amber.engine.architecture.rpc.RPCTester/SendGenerateNumber": grpclib.const.Handler( + "/org.apache.texera.amber.engine.architecture.rpc.RPCTester/SendGenerateNumber": grpclib.const.Handler( self.__rpc_send_generate_number, grpclib.const.Cardinality.UNARY_UNARY, GenerateNumber, IntResponse, ), - "/org.apache.amber.engine.architecture.rpc.RPCTester/SendMultiCall": grpclib.const.Handler( + "/org.apache.texera.amber.engine.architecture.rpc.RPCTester/SendMultiCall": grpclib.const.Handler( self.__rpc_send_multi_call, grpclib.const.Cardinality.UNARY_UNARY, MultiCall, StringResponse, ), - "/org.apache.amber.engine.architecture.rpc.RPCTester/SendChain": grpclib.const.Handler( + "/org.apache.texera.amber.engine.architecture.rpc.RPCTester/SendChain": grpclib.const.Handler( self.__rpc_send_chain, grpclib.const.Cardinality.UNARY_UNARY, Chain, @@ -1708,121 +1708,121 @@ async def __rpc_no_operation( def __mapping__(self) -> Dict[str, grpclib.const.Handler]: return { - "/org.apache.amber.engine.architecture.rpc.WorkerService/AddInputChannel": grpclib.const.Handler( + "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/AddInputChannel": grpclib.const.Handler( self.__rpc_add_input_channel, grpclib.const.Cardinality.UNARY_UNARY, AddInputChannelRequest, EmptyReturn, ), - "/org.apache.amber.engine.architecture.rpc.WorkerService/AddPartitioning": grpclib.const.Handler( + "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/AddPartitioning": grpclib.const.Handler( self.__rpc_add_partitioning, grpclib.const.Cardinality.UNARY_UNARY, AddPartitioningRequest, EmptyReturn, ), - "/org.apache.amber.engine.architecture.rpc.WorkerService/AssignPort": grpclib.const.Handler( + "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/AssignPort": grpclib.const.Handler( self.__rpc_assign_port, grpclib.const.Cardinality.UNARY_UNARY, AssignPortRequest, EmptyReturn, ), - "/org.apache.amber.engine.architecture.rpc.WorkerService/FinalizeCheckpoint": grpclib.const.Handler( + "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/FinalizeCheckpoint": grpclib.const.Handler( self.__rpc_finalize_checkpoint, grpclib.const.Cardinality.UNARY_UNARY, FinalizeCheckpointRequest, FinalizeCheckpointResponse, ), - "/org.apache.amber.engine.architecture.rpc.WorkerService/FlushNetworkBuffer": grpclib.const.Handler( + "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/FlushNetworkBuffer": grpclib.const.Handler( self.__rpc_flush_network_buffer, grpclib.const.Cardinality.UNARY_UNARY, EmptyRequest, EmptyReturn, ), - "/org.apache.amber.engine.architecture.rpc.WorkerService/InitializeExecutor": grpclib.const.Handler( + "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/InitializeExecutor": grpclib.const.Handler( self.__rpc_initialize_executor, grpclib.const.Cardinality.UNARY_UNARY, InitializeExecutorRequest, EmptyReturn, ), - "/org.apache.amber.engine.architecture.rpc.WorkerService/OpenExecutor": grpclib.const.Handler( + "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/OpenExecutor": grpclib.const.Handler( self.__rpc_open_executor, grpclib.const.Cardinality.UNARY_UNARY, EmptyRequest, EmptyReturn, ), - "/org.apache.amber.engine.architecture.rpc.WorkerService/PauseWorker": grpclib.const.Handler( + "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/PauseWorker": grpclib.const.Handler( self.__rpc_pause_worker, grpclib.const.Cardinality.UNARY_UNARY, EmptyRequest, WorkerStateResponse, ), - "/org.apache.amber.engine.architecture.rpc.WorkerService/PrepareCheckpoint": grpclib.const.Handler( + "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/PrepareCheckpoint": grpclib.const.Handler( self.__rpc_prepare_checkpoint, grpclib.const.Cardinality.UNARY_UNARY, PrepareCheckpointRequest, EmptyReturn, ), - "/org.apache.amber.engine.architecture.rpc.WorkerService/QueryStatistics": grpclib.const.Handler( + "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/QueryStatistics": grpclib.const.Handler( self.__rpc_query_statistics, grpclib.const.Cardinality.UNARY_UNARY, EmptyRequest, WorkerMetricsResponse, ), - "/org.apache.amber.engine.architecture.rpc.WorkerService/ResumeWorker": grpclib.const.Handler( + "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/ResumeWorker": grpclib.const.Handler( self.__rpc_resume_worker, grpclib.const.Cardinality.UNARY_UNARY, EmptyRequest, WorkerStateResponse, ), - "/org.apache.amber.engine.architecture.rpc.WorkerService/RetrieveState": grpclib.const.Handler( + "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/RetrieveState": grpclib.const.Handler( self.__rpc_retrieve_state, grpclib.const.Cardinality.UNARY_UNARY, EmptyRequest, EmptyReturn, ), - "/org.apache.amber.engine.architecture.rpc.WorkerService/RetryCurrentTuple": grpclib.const.Handler( + "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/RetryCurrentTuple": grpclib.const.Handler( self.__rpc_retry_current_tuple, grpclib.const.Cardinality.UNARY_UNARY, EmptyRequest, EmptyReturn, ), - "/org.apache.amber.engine.architecture.rpc.WorkerService/StartWorker": grpclib.const.Handler( + "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/StartWorker": grpclib.const.Handler( self.__rpc_start_worker, grpclib.const.Cardinality.UNARY_UNARY, EmptyRequest, WorkerStateResponse, ), - "/org.apache.amber.engine.architecture.rpc.WorkerService/EndWorker": grpclib.const.Handler( + "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/EndWorker": grpclib.const.Handler( self.__rpc_end_worker, grpclib.const.Cardinality.UNARY_UNARY, EmptyRequest, EmptyReturn, ), - "/org.apache.amber.engine.architecture.rpc.WorkerService/StartChannel": grpclib.const.Handler( + "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/StartChannel": grpclib.const.Handler( self.__rpc_start_channel, grpclib.const.Cardinality.UNARY_UNARY, EmptyRequest, EmptyReturn, ), - "/org.apache.amber.engine.architecture.rpc.WorkerService/EndChannel": grpclib.const.Handler( + "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/EndChannel": grpclib.const.Handler( self.__rpc_end_channel, grpclib.const.Cardinality.UNARY_UNARY, EmptyRequest, EmptyReturn, ), - "/org.apache.amber.engine.architecture.rpc.WorkerService/DebugCommand": grpclib.const.Handler( + "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/DebugCommand": grpclib.const.Handler( self.__rpc_debug_command, grpclib.const.Cardinality.UNARY_UNARY, DebugCommandRequest, EmptyReturn, ), - "/org.apache.amber.engine.architecture.rpc.WorkerService/EvaluatePythonExpression": grpclib.const.Handler( + "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/EvaluatePythonExpression": grpclib.const.Handler( self.__rpc_evaluate_python_expression, grpclib.const.Cardinality.UNARY_UNARY, EvaluatePythonExpressionRequest, EvaluatedValue, ), - "/org.apache.amber.engine.architecture.rpc.WorkerService/NoOperation": grpclib.const.Handler( + "/org.apache.texera.amber.engine.architecture.rpc.WorkerService/NoOperation": grpclib.const.Handler( self.__rpc_no_operation, grpclib.const.Cardinality.UNARY_UNARY, EmptyRequest, @@ -2017,91 +2017,91 @@ async def __rpc_retry_workflow( def __mapping__(self) -> Dict[str, grpclib.const.Handler]: return { - "/org.apache.amber.engine.architecture.rpc.ControllerService/RetrieveWorkflowState": grpclib.const.Handler( + "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/RetrieveWorkflowState": grpclib.const.Handler( self.__rpc_retrieve_workflow_state, grpclib.const.Cardinality.UNARY_UNARY, EmptyRequest, RetrieveWorkflowStateResponse, ), - "/org.apache.amber.engine.architecture.rpc.ControllerService/PropagateEmbeddedControlMessage": grpclib.const.Handler( + "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/PropagateEmbeddedControlMessage": grpclib.const.Handler( self.__rpc_propagate_embedded_control_message, grpclib.const.Cardinality.UNARY_UNARY, PropagateEmbeddedControlMessageRequest, PropagateEmbeddedControlMessageResponse, ), - "/org.apache.amber.engine.architecture.rpc.ControllerService/TakeGlobalCheckpoint": grpclib.const.Handler( + "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/TakeGlobalCheckpoint": grpclib.const.Handler( self.__rpc_take_global_checkpoint, grpclib.const.Cardinality.UNARY_UNARY, TakeGlobalCheckpointRequest, TakeGlobalCheckpointResponse, ), - "/org.apache.amber.engine.architecture.rpc.ControllerService/DebugCommand": grpclib.const.Handler( + "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/DebugCommand": grpclib.const.Handler( self.__rpc_debug_command, grpclib.const.Cardinality.UNARY_UNARY, DebugCommandRequest, EmptyReturn, ), - "/org.apache.amber.engine.architecture.rpc.ControllerService/EvaluatePythonExpression": grpclib.const.Handler( + "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/EvaluatePythonExpression": grpclib.const.Handler( self.__rpc_evaluate_python_expression, grpclib.const.Cardinality.UNARY_UNARY, EvaluatePythonExpressionRequest, EvaluatePythonExpressionResponse, ), - "/org.apache.amber.engine.architecture.rpc.ControllerService/ConsoleMessageTriggered": grpclib.const.Handler( + "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/ConsoleMessageTriggered": grpclib.const.Handler( self.__rpc_console_message_triggered, grpclib.const.Cardinality.UNARY_UNARY, ConsoleMessageTriggeredRequest, EmptyReturn, ), - "/org.apache.amber.engine.architecture.rpc.ControllerService/PortCompleted": grpclib.const.Handler( + "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/PortCompleted": grpclib.const.Handler( self.__rpc_port_completed, grpclib.const.Cardinality.UNARY_UNARY, PortCompletedRequest, EmptyReturn, ), - "/org.apache.amber.engine.architecture.rpc.ControllerService/StartWorkflow": grpclib.const.Handler( + "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/StartWorkflow": grpclib.const.Handler( self.__rpc_start_workflow, grpclib.const.Cardinality.UNARY_UNARY, EmptyRequest, StartWorkflowResponse, ), - "/org.apache.amber.engine.architecture.rpc.ControllerService/ResumeWorkflow": grpclib.const.Handler( + "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/ResumeWorkflow": grpclib.const.Handler( self.__rpc_resume_workflow, grpclib.const.Cardinality.UNARY_UNARY, EmptyRequest, EmptyReturn, ), - "/org.apache.amber.engine.architecture.rpc.ControllerService/PauseWorkflow": grpclib.const.Handler( + "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/PauseWorkflow": grpclib.const.Handler( self.__rpc_pause_workflow, grpclib.const.Cardinality.UNARY_UNARY, EmptyRequest, EmptyReturn, ), - "/org.apache.amber.engine.architecture.rpc.ControllerService/WorkerStateUpdated": grpclib.const.Handler( + "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/WorkerStateUpdated": grpclib.const.Handler( self.__rpc_worker_state_updated, grpclib.const.Cardinality.UNARY_UNARY, WorkerStateUpdatedRequest, EmptyReturn, ), - "/org.apache.amber.engine.architecture.rpc.ControllerService/WorkerExecutionCompleted": grpclib.const.Handler( + "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/WorkerExecutionCompleted": grpclib.const.Handler( self.__rpc_worker_execution_completed, grpclib.const.Cardinality.UNARY_UNARY, EmptyRequest, EmptyReturn, ), - "/org.apache.amber.engine.architecture.rpc.ControllerService/LinkWorkers": grpclib.const.Handler( + "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/LinkWorkers": grpclib.const.Handler( self.__rpc_link_workers, grpclib.const.Cardinality.UNARY_UNARY, LinkWorkersRequest, EmptyReturn, ), - "/org.apache.amber.engine.architecture.rpc.ControllerService/ControllerInitiateQueryStatistics": grpclib.const.Handler( + "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/ControllerInitiateQueryStatistics": grpclib.const.Handler( self.__rpc_controller_initiate_query_statistics, grpclib.const.Cardinality.UNARY_UNARY, QueryStatisticsRequest, EmptyReturn, ), - "/org.apache.amber.engine.architecture.rpc.ControllerService/RetryWorkflow": grpclib.const.Handler( + "/org.apache.texera.amber.engine.architecture.rpc.ControllerService/RetryWorkflow": grpclib.const.Handler( self.__rpc_retry_workflow, grpclib.const.Cardinality.UNARY_UNARY, RetryWorkflowRequest, diff --git a/amber/src/main/python/proto/org/apache/amber/engine/architecture/sendsemantics/__init__.py b/amber/src/main/python/proto/org/apache/texera/amber/engine/architecture/sendsemantics/__init__.py similarity index 100% rename from amber/src/main/python/proto/org/apache/amber/engine/architecture/sendsemantics/__init__.py rename to amber/src/main/python/proto/org/apache/texera/amber/engine/architecture/sendsemantics/__init__.py diff --git a/amber/src/main/python/proto/org/apache/amber/engine/architecture/worker/__init__.py b/amber/src/main/python/proto/org/apache/texera/amber/engine/architecture/worker/__init__.py similarity index 100% rename from amber/src/main/python/proto/org/apache/amber/engine/architecture/worker/__init__.py rename to amber/src/main/python/proto/org/apache/texera/amber/engine/architecture/worker/__init__.py diff --git a/amber/src/main/python/proto/org/apache/amber/engine/common/__init__.py b/amber/src/main/python/proto/org/apache/texera/amber/engine/common/__init__.py similarity index 100% rename from amber/src/main/python/proto/org/apache/amber/engine/common/__init__.py rename to amber/src/main/python/proto/org/apache/texera/amber/engine/common/__init__.py diff --git a/amber/src/main/scala/org/apache/amber/clustering/ClusterListener.scala b/amber/src/main/scala/org/apache/texera/amber/clustering/ClusterListener.scala similarity index 88% rename from amber/src/main/scala/org/apache/amber/clustering/ClusterListener.scala rename to amber/src/main/scala/org/apache/texera/amber/clustering/ClusterListener.scala index 738b346abf7..e3e9afab3fb 100644 --- a/amber/src/main/scala/org/apache/amber/clustering/ClusterListener.scala +++ b/amber/src/main/scala/org/apache/texera/amber/clustering/ClusterListener.scala @@ -17,24 +17,24 @@ * under the License. */ -package org.apache.amber.clustering +package org.apache.texera.amber.clustering import org.apache.pekko.actor.{Actor, Address} import org.apache.pekko.cluster.Cluster import org.apache.pekko.cluster.ClusterEvent._ import com.google.protobuf.timestamp.Timestamp import com.twitter.util.{Await, Future} -import org.apache.amber.clustering.ClusterListener.numWorkerNodesInCluster -import org.apache.amber.config.ApplicationConfig -import org.apache.amber.core.virtualidentity.ActorVirtualIdentity -import org.apache.amber.core.workflowruntimestate.FatalErrorType.EXECUTION_FAILURE -import org.apache.amber.core.workflowruntimestate.WorkflowFatalError -import org.apache.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState.{ +import org.apache.texera.amber.clustering.ClusterListener.numWorkerNodesInCluster +import org.apache.texera.amber.config.ApplicationConfig +import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity +import org.apache.texera.amber.core.workflowruntimestate.FatalErrorType.EXECUTION_FAILURE +import org.apache.texera.amber.core.workflowruntimestate.WorkflowFatalError +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState.{ COMPLETED, FAILED } -import org.apache.amber.engine.common.AmberLogging -import org.apache.amber.error.ErrorUtils.getStackTraceWithAllCauses +import org.apache.texera.amber.engine.common.AmberLogging +import org.apache.texera.amber.error.ErrorUtils.getStackTraceWithAllCauses import org.apache.texera.web.SessionState import org.apache.texera.web.model.websocket.response.ClusterStatusUpdateEvent import org.apache.texera.web.service.{WorkflowExecutionService, WorkflowService} diff --git a/amber/src/main/scala/org/apache/amber/clustering/SingleNodeListener.scala b/amber/src/main/scala/org/apache/texera/amber/clustering/SingleNodeListener.scala similarity index 89% rename from amber/src/main/scala/org/apache/amber/clustering/SingleNodeListener.scala rename to amber/src/main/scala/org/apache/texera/amber/clustering/SingleNodeListener.scala index 70b564c6a4a..282710524ae 100644 --- a/amber/src/main/scala/org/apache/amber/clustering/SingleNodeListener.scala +++ b/amber/src/main/scala/org/apache/texera/amber/clustering/SingleNodeListener.scala @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.amber.clustering +package org.apache.texera.amber.clustering import org.apache.pekko.actor.{Actor, ActorLogging} -import org.apache.amber.clustering.ClusterListener.GetAvailableNodeAddresses +import org.apache.texera.amber.clustering.ClusterListener.GetAvailableNodeAddresses class SingleNodeListener extends Actor with ActorLogging { override def receive: Receive = { diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/common/AkkaActorRefMappingService.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/common/AkkaActorRefMappingService.scala similarity index 91% rename from amber/src/main/scala/org/apache/amber/engine/architecture/common/AkkaActorRefMappingService.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/common/AkkaActorRefMappingService.scala index 393a7cb38f0..6cad3147031 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/common/AkkaActorRefMappingService.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/common/AkkaActorRefMappingService.scala @@ -17,19 +17,19 @@ * under the License. */ -package org.apache.amber.engine.architecture.common +package org.apache.texera.amber.engine.architecture.common import org.apache.pekko.actor.ActorRef -import org.apache.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} -import org.apache.amber.engine.architecture.common.WorkflowActor.{ +import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} +import org.apache.texera.amber.engine.architecture.common.WorkflowActor.{ CreditRequest, GetActorRef, NetworkMessage, RegisterActorRef } -import org.apache.amber.engine.common.AmberLogging -import org.apache.amber.engine.common.virtualidentity.util.{CONTROLLER, SELF} -import org.apache.amber.util.VirtualIdentityUtils +import org.apache.texera.amber.engine.common.AmberLogging +import org.apache.texera.amber.engine.common.virtualidentity.util.{CONTROLLER, SELF} +import org.apache.texera.amber.util.VirtualIdentityUtils import scala.collection.mutable diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/common/AkkaActorService.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/common/AkkaActorService.scala similarity index 92% rename from amber/src/main/scala/org/apache/amber/engine/architecture/common/AkkaActorService.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/common/AkkaActorService.scala index b389c762e48..10a6d7a38c6 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/common/AkkaActorService.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/common/AkkaActorService.scala @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.amber.engine.architecture.common +package org.apache.texera.amber.engine.architecture.common import org.apache.pekko import pekko.actor.{ActorContext, ActorRef, Address, Cancellable, Props} import pekko.util.Timeout -import org.apache.amber.core.virtualidentity.ActorVirtualIdentity -import org.apache.amber.engine.common.FutureBijection._ +import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity +import org.apache.texera.amber.engine.common.FutureBijection._ import scala.concurrent.ExecutionContext import scala.concurrent.duration.{DurationInt, FiniteDuration} diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/common/AkkaMessageTransferService.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/common/AkkaMessageTransferService.scala similarity index 91% rename from amber/src/main/scala/org/apache/amber/engine/architecture/common/AkkaMessageTransferService.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/common/AkkaMessageTransferService.scala index 7ad24739f2c..3401e3ff639 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/common/AkkaMessageTransferService.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/common/AkkaMessageTransferService.scala @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.amber.engine.architecture.common +package org.apache.texera.amber.engine.architecture.common import org.apache.pekko.actor.Cancellable -import org.apache.amber.config.ApplicationConfig -import org.apache.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} -import org.apache.amber.engine.architecture.common.WorkflowActor.NetworkMessage -import org.apache.amber.engine.architecture.messaginglayer.{CongestionControl, FlowControl} -import org.apache.amber.engine.common.AmberLogging -import org.apache.amber.engine.common.ambermessage.WorkflowFIFOMessage +import org.apache.texera.amber.config.ApplicationConfig +import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} +import org.apache.texera.amber.engine.architecture.common.WorkflowActor.NetworkMessage +import org.apache.texera.amber.engine.architecture.messaginglayer.{CongestionControl, FlowControl} +import org.apache.texera.amber.engine.common.AmberLogging +import org.apache.texera.amber.engine.common.ambermessage.WorkflowFIFOMessage import scala.collection.mutable import scala.concurrent.duration.DurationInt diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/common/AmberProcessor.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/common/AmberProcessor.scala similarity index 74% rename from amber/src/main/scala/org/apache/amber/engine/architecture/common/AmberProcessor.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/common/AmberProcessor.scala index 912c0799d06..e7763073232 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/common/AmberProcessor.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/common/AmberProcessor.scala @@ -17,24 +17,24 @@ * under the License. */ -package org.apache.amber.engine.architecture.common +package org.apache.texera.amber.engine.architecture.common -import org.apache.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} -import org.apache.amber.engine.architecture.messaginglayer.{ +import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} +import org.apache.texera.amber.engine.architecture.messaginglayer.{ InputGateway, NetworkInputGateway, NetworkOutputGateway } -import org.apache.amber.engine.architecture.rpc.controlcommands.ControlInvocation -import org.apache.amber.engine.architecture.rpc.controlreturns.ReturnInvocation -import org.apache.amber.engine.architecture.worker.WorkflowWorker.MainThreadDelegateMessage -import org.apache.amber.engine.architecture.worker.managers.StatisticsManager -import org.apache.amber.engine.common.AmberLogging -import org.apache.amber.engine.common.ambermessage.{ +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.ControlInvocation +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.ReturnInvocation +import org.apache.texera.amber.engine.architecture.worker.WorkflowWorker.MainThreadDelegateMessage +import org.apache.texera.amber.engine.architecture.worker.managers.StatisticsManager +import org.apache.texera.amber.engine.common.AmberLogging +import org.apache.texera.amber.engine.common.ambermessage.{ DirectControlMessagePayload, WorkflowFIFOMessage } -import org.apache.amber.engine.common.rpc.{AsyncRPCClient, AsyncRPCServer} +import org.apache.texera.amber.engine.common.rpc.{AsyncRPCClient, AsyncRPCServer} abstract class AmberProcessor( val actorId: ActorVirtualIdentity, diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/common/ExecutorDeployment.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/common/ExecutorDeployment.scala similarity index 79% rename from amber/src/main/scala/org/apache/amber/engine/architecture/common/ExecutorDeployment.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/common/ExecutorDeployment.scala index 6309926e91e..cf41297c981 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/common/ExecutorDeployment.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/common/ExecutorDeployment.scala @@ -17,22 +17,22 @@ * under the License. */ -package org.apache.amber.engine.architecture.common +package org.apache.texera.amber.engine.architecture.common import org.apache.pekko.actor.{Address, Deploy} import org.apache.pekko.remote.RemoteScope -import org.apache.amber.core.workflow.{PhysicalOp, PreferController, RoundRobinPreference} -import org.apache.amber.engine.architecture.controller.execution.OperatorExecution -import org.apache.amber.engine.architecture.deploysemantics.AddressInfo -import org.apache.amber.engine.architecture.pythonworker.PythonWorkflowWorker -import org.apache.amber.engine.architecture.scheduling.config.OperatorConfig -import org.apache.amber.engine.architecture.worker.WorkflowWorker -import org.apache.amber.engine.architecture.worker.WorkflowWorker.{ +import org.apache.texera.amber.core.workflow.{PhysicalOp, PreferController, RoundRobinPreference} +import org.apache.texera.amber.engine.architecture.controller.execution.OperatorExecution +import org.apache.texera.amber.engine.architecture.deploysemantics.AddressInfo +import org.apache.texera.amber.engine.architecture.pythonworker.PythonWorkflowWorker +import org.apache.texera.amber.engine.architecture.scheduling.config.OperatorConfig +import org.apache.texera.amber.engine.architecture.worker.WorkflowWorker +import org.apache.texera.amber.engine.architecture.worker.WorkflowWorker.{ FaultToleranceConfig, StateRestoreConfig, WorkerReplayInitialization } -import org.apache.amber.util.VirtualIdentityUtils +import org.apache.texera.amber.util.VirtualIdentityUtils object ExecutorDeployment { diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/common/ProcessingStepCursor.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/common/ProcessingStepCursor.scala similarity index 86% rename from amber/src/main/scala/org/apache/amber/engine/architecture/common/ProcessingStepCursor.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/common/ProcessingStepCursor.scala index a225e4cbf56..ac92781737a 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/common/ProcessingStepCursor.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/common/ProcessingStepCursor.scala @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.amber.engine.architecture.common +package org.apache.texera.amber.engine.architecture.common -import org.apache.amber.core.virtualidentity.ChannelIdentity -import org.apache.amber.engine.architecture.common.ProcessingStepCursor.INIT_STEP +import org.apache.texera.amber.core.virtualidentity.ChannelIdentity +import org.apache.texera.amber.engine.architecture.common.ProcessingStepCursor.INIT_STEP object ProcessingStepCursor { // step value before processing any incoming message diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/common/WorkflowActor.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/common/WorkflowActor.scala similarity index 92% rename from amber/src/main/scala/org/apache/amber/engine/architecture/common/WorkflowActor.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/common/WorkflowActor.scala index 02bd766f121..5ce64a0a3e0 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/common/WorkflowActor.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/common/WorkflowActor.scala @@ -17,29 +17,29 @@ * under the License. */ -package org.apache.amber.engine.architecture.common +package org.apache.texera.amber.engine.architecture.common import org.apache.pekko.actor.{Actor, ActorRef, Address, Stash} import org.apache.pekko.pattern.ask import org.apache.pekko.util.Timeout -import org.apache.amber.clustering.ClusterListener.GetAvailableNodeAddresses -import org.apache.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} -import org.apache.amber.engine.architecture.common.WorkflowActor._ -import org.apache.amber.engine.architecture.logreplay.{ +import org.apache.texera.amber.clustering.ClusterListener.GetAvailableNodeAddresses +import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} +import org.apache.texera.amber.engine.architecture.common.WorkflowActor._ +import org.apache.texera.amber.engine.architecture.logreplay.{ ReplayLogGenerator, ReplayLogManager, ReplayLogRecord, ReplayOrderEnforcer } -import org.apache.amber.engine.architecture.worker.WorkflowWorker.{ +import org.apache.texera.amber.engine.architecture.worker.WorkflowWorker.{ FaultToleranceConfig, MainThreadDelegateMessage, StateRestoreConfig, TriggerSend } -import org.apache.amber.engine.common.ambermessage.WorkflowFIFOMessage -import org.apache.amber.engine.common.storage.SequentialRecordStorage -import org.apache.amber.engine.common.{AmberLogging, CheckpointState} +import org.apache.texera.amber.engine.common.ambermessage.WorkflowFIFOMessage +import org.apache.texera.amber.engine.common.storage.SequentialRecordStorage +import org.apache.texera.amber.engine.common.{AmberLogging, CheckpointState} import scala.concurrent.Await import scala.concurrent.duration.DurationInt diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/ClientEvent.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/ClientEvent.scala similarity index 78% rename from amber/src/main/scala/org/apache/amber/engine/architecture/controller/ClientEvent.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/ClientEvent.scala index 0f00e03f755..ea83eedd2a9 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/ClientEvent.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/ClientEvent.scala @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.amber.engine.architecture.controller +package org.apache.texera.amber.engine.architecture.controller -import org.apache.amber.core.tuple.Tuple -import org.apache.amber.core.virtualidentity.ActorVirtualIdentity -import org.apache.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState -import org.apache.amber.engine.common.ambermessage.WorkflowFIFOMessagePayload -import org.apache.amber.engine.common.executionruntimestate.OperatorMetrics +import org.apache.texera.amber.core.tuple.Tuple +import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState +import org.apache.texera.amber.engine.common.ambermessage.WorkflowFIFOMessagePayload +import org.apache.texera.amber.engine.common.executionruntimestate.OperatorMetrics trait ClientEvent extends WorkflowFIFOMessagePayload diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/Controller.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/Controller.scala similarity index 88% rename from amber/src/main/scala/org/apache/amber/engine/architecture/controller/Controller.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/Controller.scala index 36b108f0316..85ae04d4e9f 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/Controller.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/Controller.scala @@ -17,32 +17,32 @@ * under the License. */ -package org.apache.amber.engine.architecture.controller +package org.apache.texera.amber.engine.architecture.controller import org.apache.pekko.actor.SupervisorStrategy.Stop import org.apache.pekko.actor.{AllForOneStrategy, Props, SupervisorStrategy} import org.apache.texera.web.model.websocket.response.RegionUpdateEvent -import org.apache.amber.config.ApplicationConfig -import org.apache.amber.core.virtualidentity.ChannelIdentity -import org.apache.amber.core.workflow.{PhysicalPlan, WorkflowContext} -import org.apache.amber.engine.architecture.common.WorkflowActor.NetworkAck -import org.apache.amber.engine.architecture.common.{ExecutorDeployment, WorkflowActor} -import org.apache.amber.engine.architecture.controller.execution.OperatorExecution -import org.apache.amber.engine.architecture.rpc.controlcommands.{ +import org.apache.texera.amber.config.ApplicationConfig +import org.apache.texera.amber.core.virtualidentity.ChannelIdentity +import org.apache.texera.amber.core.workflow.{PhysicalPlan, WorkflowContext} +import org.apache.texera.amber.engine.architecture.common.WorkflowActor.NetworkAck +import org.apache.texera.amber.engine.architecture.common.{ExecutorDeployment, WorkflowActor} +import org.apache.texera.amber.engine.architecture.controller.execution.OperatorExecution +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{ ControlInvocation, EmbeddedControlMessage } -import org.apache.amber.engine.architecture.worker.WorkflowWorker.{ +import org.apache.texera.amber.engine.architecture.worker.WorkflowWorker.{ FaultToleranceConfig, StateRestoreConfig } -import org.apache.amber.engine.common.ambermessage.WorkflowMessage.getInMemSize -import org.apache.amber.engine.common.ambermessage.{ +import org.apache.texera.amber.engine.common.ambermessage.WorkflowMessage.getInMemSize +import org.apache.texera.amber.engine.common.ambermessage.{ DirectControlMessagePayload, WorkflowFIFOMessage } -import org.apache.amber.engine.common.virtualidentity.util.{CLIENT, CONTROLLER, SELF} -import org.apache.amber.engine.common.{CheckpointState, SerializedState} +import org.apache.texera.amber.engine.common.virtualidentity.util.{CLIENT, CONTROLLER, SELF} +import org.apache.texera.amber.engine.common.{CheckpointState, SerializedState} import org.apache.texera.web.SessionState import scala.concurrent.duration.DurationInt diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/ControllerAsyncRPCHandlerInitializer.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/ControllerAsyncRPCHandlerInitializer.scala similarity index 75% rename from amber/src/main/scala/org/apache/amber/engine/architecture/controller/ControllerAsyncRPCHandlerInitializer.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/ControllerAsyncRPCHandlerInitializer.scala index 61d5e3869b2..4d9a36bab43 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/ControllerAsyncRPCHandlerInitializer.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/ControllerAsyncRPCHandlerInitializer.scala @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.amber.engine.architecture.controller +package org.apache.texera.amber.engine.architecture.controller import com.twitter.util.Future -import org.apache.amber.core.virtualidentity.ActorVirtualIdentity -import org.apache.amber.engine.architecture.controller.promisehandlers._ -import org.apache.amber.engine.architecture.rpc.controlcommands.AsyncRPCContext -import org.apache.amber.engine.architecture.rpc.controllerservice.ControllerServiceFs2Grpc -import org.apache.amber.engine.common.AmberLogging -import org.apache.amber.engine.common.rpc.AsyncRPCHandlerInitializer +import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity +import org.apache.texera.amber.engine.architecture.controller.promisehandlers._ +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.AsyncRPCContext +import org.apache.texera.amber.engine.architecture.rpc.controllerservice.ControllerServiceFs2Grpc +import org.apache.texera.amber.engine.common.AmberLogging +import org.apache.texera.amber.engine.common.rpc.AsyncRPCHandlerInitializer class ControllerAsyncRPCHandlerInitializer( val cp: ControllerProcessor diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/ControllerProcessor.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/ControllerProcessor.scala similarity index 79% rename from amber/src/main/scala/org/apache/amber/engine/architecture/controller/ControllerProcessor.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/ControllerProcessor.scala index 2f7342fa3e2..7a8e94cf3a7 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/ControllerProcessor.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/ControllerProcessor.scala @@ -17,21 +17,21 @@ * under the License. */ -package org.apache.amber.engine.architecture.controller +package org.apache.texera.amber.engine.architecture.controller -import org.apache.amber.core.virtualidentity.ActorVirtualIdentity -import org.apache.amber.core.workflow.WorkflowContext -import org.apache.amber.engine.architecture.common.{ +import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity +import org.apache.texera.amber.core.workflow.WorkflowContext +import org.apache.texera.amber.engine.architecture.common.{ AkkaActorRefMappingService, AkkaActorService, AkkaMessageTransferService, AmberProcessor } -import org.apache.amber.engine.architecture.controller.execution.WorkflowExecution -import org.apache.amber.engine.architecture.logreplay.ReplayLogManager -import org.apache.amber.engine.architecture.scheduling.WorkflowExecutionCoordinator -import org.apache.amber.engine.architecture.worker.WorkflowWorker.MainThreadDelegateMessage -import org.apache.amber.engine.common.ambermessage.WorkflowFIFOMessage +import org.apache.texera.amber.engine.architecture.controller.execution.WorkflowExecution +import org.apache.texera.amber.engine.architecture.logreplay.ReplayLogManager +import org.apache.texera.amber.engine.architecture.scheduling.WorkflowExecutionCoordinator +import org.apache.texera.amber.engine.architecture.worker.WorkflowWorker.MainThreadDelegateMessage +import org.apache.texera.amber.engine.common.ambermessage.WorkflowFIFOMessage class ControllerProcessor( workflowContext: WorkflowContext, diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/ControllerTimerService.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/ControllerTimerService.scala similarity index 78% rename from amber/src/main/scala/org/apache/amber/engine/architecture/controller/ControllerTimerService.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/ControllerTimerService.scala index bdd65e3964c..20ebff9fc01 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/ControllerTimerService.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/ControllerTimerService.scala @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.amber.engine.architecture.controller +package org.apache.texera.amber.engine.architecture.controller import org.apache.pekko.actor.Cancellable -import org.apache.amber.engine.architecture.common.AkkaActorService -import org.apache.amber.engine.architecture.rpc.controlcommands.{ +import org.apache.texera.amber.engine.architecture.common.AkkaActorService +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{ AsyncRPCContext, QueryStatisticsRequest } -import org.apache.amber.engine.architecture.rpc.controllerservice.ControllerServiceGrpc.METHOD_CONTROLLER_INITIATE_QUERY_STATISTICS -import org.apache.amber.engine.common.rpc.AsyncRPCClient.ControlInvocation -import org.apache.amber.engine.common.virtualidentity.util.SELF +import org.apache.texera.amber.engine.architecture.rpc.controllerservice.ControllerServiceGrpc.METHOD_CONTROLLER_INITIATE_QUERY_STATISTICS +import org.apache.texera.amber.engine.common.rpc.AsyncRPCClient.ControlInvocation +import org.apache.texera.amber.engine.common.virtualidentity.util.SELF import scala.concurrent.duration.{DurationInt, FiniteDuration, MILLISECONDS} diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/GlobalReplayManager.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/GlobalReplayManager.scala similarity index 91% rename from amber/src/main/scala/org/apache/amber/engine/architecture/controller/GlobalReplayManager.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/GlobalReplayManager.scala index 4d8b680fff8..b8dc3fb6072 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/GlobalReplayManager.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/GlobalReplayManager.scala @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.amber.engine.architecture.controller +package org.apache.texera.amber.engine.architecture.controller -import org.apache.amber.core.virtualidentity.ActorVirtualIdentity +import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity import scala.collection.mutable diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/Workflow.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/Workflow.scala similarity index 87% rename from amber/src/main/scala/org/apache/amber/engine/architecture/controller/Workflow.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/Workflow.scala index 4f6871f26b6..4c2220ae9aa 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/Workflow.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/Workflow.scala @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.amber.engine.architecture.controller +package org.apache.texera.amber.engine.architecture.controller -import org.apache.amber.core.workflow.{PhysicalPlan, WorkflowContext} +import org.apache.texera.amber.core.workflow.{PhysicalPlan, WorkflowContext} import org.apache.texera.workflow.LogicalPlan case class Workflow( diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/WorkflowScheduler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/WorkflowScheduler.scala similarity index 86% rename from amber/src/main/scala/org/apache/amber/engine/architecture/controller/WorkflowScheduler.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/WorkflowScheduler.scala index 6fd8c3ff03a..9dcf3ad4bfc 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/WorkflowScheduler.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/WorkflowScheduler.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.engine.architecture.controller +package org.apache.texera.amber.engine.architecture.controller -import org.apache.amber.core.virtualidentity.ActorVirtualIdentity -import org.apache.amber.core.workflow.{PhysicalPlan, WorkflowContext} -import org.apache.amber.engine.architecture.scheduling.{ +import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity +import org.apache.texera.amber.core.workflow.{PhysicalPlan, WorkflowContext} +import org.apache.texera.amber.engine.architecture.scheduling.{ CostBasedScheduleGenerator, Region, Schedule diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/execution/ChannelExecution.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/execution/ChannelExecution.scala similarity index 92% rename from amber/src/main/scala/org/apache/amber/engine/architecture/controller/execution/ChannelExecution.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/execution/ChannelExecution.scala index 78954ef4c45..960cad507ea 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/execution/ChannelExecution.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/execution/ChannelExecution.scala @@ -17,6 +17,6 @@ * under the License. */ -package org.apache.amber.engine.architecture.controller.execution +package org.apache.texera.amber.engine.architecture.controller.execution case class ChannelExecution() diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/execution/ExecutionUtils.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/execution/ExecutionUtils.scala similarity index 92% rename from amber/src/main/scala/org/apache/amber/engine/architecture/controller/execution/ExecutionUtils.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/execution/ExecutionUtils.scala index 89247cb5ef3..7ee9bc04735 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/execution/ExecutionUtils.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/execution/ExecutionUtils.scala @@ -17,14 +17,17 @@ * under the License. */ -package org.apache.amber.engine.architecture.controller.execution +package org.apache.texera.amber.engine.architecture.controller.execution -import org.apache.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState -import org.apache.amber.engine.architecture.worker.statistics.{ +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState +import org.apache.texera.amber.engine.architecture.worker.statistics.{ PortTupleMetricsMapping, TupleMetrics } -import org.apache.amber.engine.common.executionruntimestate.{OperatorMetrics, OperatorStatistics} +import org.apache.texera.amber.engine.common.executionruntimestate.{ + OperatorMetrics, + OperatorStatistics +} object ExecutionUtils { diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/execution/LinkExecution.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/execution/LinkExecution.scala similarity index 89% rename from amber/src/main/scala/org/apache/amber/engine/architecture/controller/execution/LinkExecution.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/execution/LinkExecution.scala index 88daceaebc2..434636e16f6 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/execution/LinkExecution.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/execution/LinkExecution.scala @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.amber.engine.architecture.controller.execution +package org.apache.texera.amber.engine.architecture.controller.execution -import org.apache.amber.core.virtualidentity.ChannelIdentity +import org.apache.texera.amber.core.virtualidentity.ChannelIdentity import scala.collection.mutable diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/execution/OperatorExecution.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/execution/OperatorExecution.scala similarity index 84% rename from amber/src/main/scala/org/apache/amber/engine/architecture/controller/execution/OperatorExecution.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/execution/OperatorExecution.scala index 205182bbd65..5a7f57083a4 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/execution/OperatorExecution.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/execution/OperatorExecution.scala @@ -17,15 +17,21 @@ * under the License. */ -package org.apache.amber.engine.architecture.controller.execution +package org.apache.texera.amber.engine.architecture.controller.execution -import org.apache.amber.core.virtualidentity.ActorVirtualIdentity -import org.apache.amber.core.workflow.PortIdentity -import org.apache.amber.engine.architecture.controller.execution.ExecutionUtils.aggregateStates -import org.apache.amber.engine.architecture.deploysemantics.layer.WorkerExecution -import org.apache.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState -import org.apache.amber.engine.architecture.worker.statistics.{PortTupleMetricsMapping, WorkerState} -import org.apache.amber.engine.common.executionruntimestate.{OperatorMetrics, OperatorStatistics} +import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity +import org.apache.texera.amber.core.workflow.PortIdentity +import org.apache.texera.amber.engine.architecture.controller.execution.ExecutionUtils.aggregateStates +import org.apache.texera.amber.engine.architecture.deploysemantics.layer.WorkerExecution +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState +import org.apache.texera.amber.engine.architecture.worker.statistics.{ + PortTupleMetricsMapping, + WorkerState +} +import org.apache.texera.amber.engine.common.executionruntimestate.{ + OperatorMetrics, + OperatorStatistics +} import java.util import scala.jdk.CollectionConverters._ diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/execution/RegionExecution.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/execution/RegionExecution.scala similarity index 90% rename from amber/src/main/scala/org/apache/amber/engine/architecture/controller/execution/RegionExecution.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/execution/RegionExecution.scala index 87fcbaf34ec..d5939c2e3b1 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/execution/RegionExecution.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/execution/RegionExecution.scala @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.amber.engine.architecture.controller.execution +package org.apache.texera.amber.engine.architecture.controller.execution import com.rits.cloning.Cloner -import org.apache.amber.core.virtualidentity.PhysicalOpIdentity -import org.apache.amber.core.workflow.PhysicalLink -import org.apache.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState -import org.apache.amber.engine.architecture.scheduling.Region -import org.apache.amber.engine.architecture.worker.statistics.WorkerStatistics -import org.apache.amber.engine.common.executionruntimestate.OperatorMetrics +import org.apache.texera.amber.core.virtualidentity.PhysicalOpIdentity +import org.apache.texera.amber.core.workflow.PhysicalLink +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState +import org.apache.texera.amber.engine.architecture.scheduling.Region +import org.apache.texera.amber.engine.architecture.worker.statistics.WorkerStatistics +import org.apache.texera.amber.engine.common.executionruntimestate.OperatorMetrics import scala.collection.mutable diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/execution/WorkerPortExecution.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/execution/WorkerPortExecution.scala similarity index 92% rename from amber/src/main/scala/org/apache/amber/engine/architecture/controller/execution/WorkerPortExecution.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/execution/WorkerPortExecution.scala index 6c5a6019a0c..0b7c3a39397 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/execution/WorkerPortExecution.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/execution/WorkerPortExecution.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.engine.architecture.controller.execution +package org.apache.texera.amber.engine.architecture.controller.execution case class WorkerPortExecution() { var completed: Boolean = false diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/execution/WorkflowExecution.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/execution/WorkflowExecution.scala similarity index 90% rename from amber/src/main/scala/org/apache/amber/engine/architecture/controller/execution/WorkflowExecution.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/execution/WorkflowExecution.scala index 6d737c7566e..dea9b692a4f 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/execution/WorkflowExecution.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/execution/WorkflowExecution.scala @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.amber.engine.architecture.controller.execution - -import org.apache.amber.core.virtualidentity.PhysicalOpIdentity -import org.apache.amber.engine.architecture.controller.execution.ExecutionUtils.aggregateMetrics -import org.apache.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState -import org.apache.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState._ -import org.apache.amber.engine.architecture.scheduling.{Region, RegionIdentity} -import org.apache.amber.engine.common.executionruntimestate.OperatorMetrics +package org.apache.texera.amber.engine.architecture.controller.execution + +import org.apache.texera.amber.core.virtualidentity.PhysicalOpIdentity +import org.apache.texera.amber.engine.architecture.controller.execution.ExecutionUtils.aggregateMetrics +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState._ +import org.apache.texera.amber.engine.architecture.scheduling.{Region, RegionIdentity} +import org.apache.texera.amber.engine.common.executionruntimestate.OperatorMetrics import scala.collection.mutable diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/promisehandlers/ConsoleMessageHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/ConsoleMessageHandler.scala similarity index 78% rename from amber/src/main/scala/org/apache/amber/engine/architecture/controller/promisehandlers/ConsoleMessageHandler.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/ConsoleMessageHandler.scala index 29832ba2903..4030ad7d3ee 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/promisehandlers/ConsoleMessageHandler.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/ConsoleMessageHandler.scala @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.amber.engine.architecture.controller.promisehandlers +package org.apache.texera.amber.engine.architecture.controller.promisehandlers import com.twitter.util.Future -import org.apache.amber.engine.architecture.controller.ControllerAsyncRPCHandlerInitializer -import org.apache.amber.engine.architecture.rpc.controlcommands.{ +import org.apache.texera.amber.engine.architecture.controller.ControllerAsyncRPCHandlerInitializer +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{ AsyncRPCContext, ConsoleMessageTriggeredRequest } -import org.apache.amber.engine.architecture.rpc.controlreturns.EmptyReturn +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.EmptyReturn trait ConsoleMessageHandler { this: ControllerAsyncRPCHandlerInitializer => diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/promisehandlers/DebugCommandHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/DebugCommandHandler.scala similarity index 74% rename from amber/src/main/scala/org/apache/amber/engine/architecture/controller/promisehandlers/DebugCommandHandler.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/DebugCommandHandler.scala index d162be64c5e..2e18ec6ba14 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/promisehandlers/DebugCommandHandler.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/DebugCommandHandler.scala @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.amber.engine.architecture.controller.promisehandlers +package org.apache.texera.amber.engine.architecture.controller.promisehandlers import com.twitter.util.Future -import org.apache.amber.core.virtualidentity.ActorVirtualIdentity -import org.apache.amber.engine.architecture.controller.ControllerAsyncRPCHandlerInitializer -import org.apache.amber.engine.architecture.rpc.controlcommands.{ +import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity +import org.apache.texera.amber.engine.architecture.controller.ControllerAsyncRPCHandlerInitializer +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{ AsyncRPCContext, DebugCommandRequest } -import org.apache.amber.engine.architecture.rpc.controlreturns.EmptyReturn +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.EmptyReturn trait DebugCommandHandler { this: ControllerAsyncRPCHandlerInitializer => diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/promisehandlers/EmbeddedControlMessageHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/EmbeddedControlMessageHandler.scala similarity index 86% rename from amber/src/main/scala/org/apache/amber/engine/architecture/controller/promisehandlers/EmbeddedControlMessageHandler.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/EmbeddedControlMessageHandler.scala index 2166c3f8b7d..45a4491ad95 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/promisehandlers/EmbeddedControlMessageHandler.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/EmbeddedControlMessageHandler.scala @@ -17,22 +17,22 @@ * under the License. */ -package org.apache.amber.engine.architecture.controller.promisehandlers +package org.apache.texera.amber.engine.architecture.controller.promisehandlers import com.twitter.util.Future -import org.apache.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} -import org.apache.amber.engine.architecture.controller.ControllerAsyncRPCHandlerInitializer -import org.apache.amber.engine.architecture.rpc.controlcommands.{ +import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} +import org.apache.texera.amber.engine.architecture.controller.ControllerAsyncRPCHandlerInitializer +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{ AsyncRPCContext, ControlInvocation, PropagateEmbeddedControlMessageRequest } -import org.apache.amber.engine.architecture.rpc.controlreturns.{ +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.{ ControlReturn, PropagateEmbeddedControlMessageResponse } -import org.apache.amber.engine.common.virtualidentity.util.CONTROLLER -import org.apache.amber.util.VirtualIdentityUtils +import org.apache.texera.amber.engine.common.virtualidentity.util.CONTROLLER +import org.apache.texera.amber.util.VirtualIdentityUtils trait EmbeddedControlMessageHandler { this: ControllerAsyncRPCHandlerInitializer => diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/promisehandlers/EvaluatePythonExpressionHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/EvaluatePythonExpressionHandler.scala similarity index 81% rename from amber/src/main/scala/org/apache/amber/engine/architecture/controller/promisehandlers/EvaluatePythonExpressionHandler.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/EvaluatePythonExpressionHandler.scala index ff57b869b6d..6a235b2e77f 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/promisehandlers/EvaluatePythonExpressionHandler.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/EvaluatePythonExpressionHandler.scala @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.amber.engine.architecture.controller.promisehandlers +package org.apache.texera.amber.engine.architecture.controller.promisehandlers import com.twitter.util.Future -import org.apache.amber.core.virtualidentity.OperatorIdentity -import org.apache.amber.engine.architecture.controller.ControllerAsyncRPCHandlerInitializer -import org.apache.amber.engine.architecture.rpc.controlcommands.{ +import org.apache.texera.amber.core.virtualidentity.OperatorIdentity +import org.apache.texera.amber.engine.architecture.controller.ControllerAsyncRPCHandlerInitializer +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{ AsyncRPCContext, EvaluatePythonExpressionRequest } -import org.apache.amber.engine.architecture.rpc.controlreturns.EvaluatePythonExpressionResponse +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.EvaluatePythonExpressionResponse trait EvaluatePythonExpressionHandler { this: ControllerAsyncRPCHandlerInitializer => diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/promisehandlers/LinkWorkersHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/LinkWorkersHandler.scala similarity index 86% rename from amber/src/main/scala/org/apache/amber/engine/architecture/controller/promisehandlers/LinkWorkersHandler.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/LinkWorkersHandler.scala index 0d91fa309b4..f8a967aad73 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/promisehandlers/LinkWorkersHandler.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/LinkWorkersHandler.scala @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.amber.engine.architecture.controller.promisehandlers +package org.apache.texera.amber.engine.architecture.controller.promisehandlers import com.twitter.util.Future -import org.apache.amber.engine.architecture.controller.ControllerAsyncRPCHandlerInitializer -import org.apache.amber.engine.architecture.rpc.controlcommands.{ +import org.apache.texera.amber.engine.architecture.controller.ControllerAsyncRPCHandlerInitializer +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{ AddInputChannelRequest, AddPartitioningRequest, AsyncRPCContext, LinkWorkersRequest } -import org.apache.amber.engine.architecture.rpc.controlreturns.EmptyReturn +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.EmptyReturn /** add a data transfer partitioning to the sender workers and update input linking * for the receiver workers of a link strategy. diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/promisehandlers/PauseHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/PauseHandler.scala similarity index 86% rename from amber/src/main/scala/org/apache/amber/engine/architecture/controller/promisehandlers/PauseHandler.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/PauseHandler.scala index dd35044df93..5511fea6abb 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/promisehandlers/PauseHandler.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/PauseHandler.scala @@ -17,18 +17,24 @@ * under the License. */ -package org.apache.amber.engine.architecture.controller.promisehandlers +package org.apache.texera.amber.engine.architecture.controller.promisehandlers import com.twitter.util.Future -import org.apache.amber.core.tuple.Tuple -import org.apache.amber.core.virtualidentity.ActorVirtualIdentity -import org.apache.amber.engine.architecture.controller.{ +import org.apache.texera.amber.core.tuple.Tuple +import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity +import org.apache.texera.amber.engine.architecture.controller.{ ControllerAsyncRPCHandlerInitializer, ExecutionStateUpdate, ExecutionStatsUpdate } -import org.apache.amber.engine.architecture.rpc.controlcommands.{AsyncRPCContext, EmptyRequest} -import org.apache.amber.engine.architecture.rpc.controlreturns.{EmptyReturn, WorkerMetricsResponse} +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{ + AsyncRPCContext, + EmptyRequest +} +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.{ + EmptyReturn, + WorkerMetricsResponse +} import scala.collection.mutable diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/promisehandlers/PortCompletedHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/PortCompletedHandler.scala similarity index 86% rename from amber/src/main/scala/org/apache/amber/engine/architecture/controller/promisehandlers/PortCompletedHandler.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/PortCompletedHandler.scala index 8c0b909af5a..0add56eba3f 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/promisehandlers/PortCompletedHandler.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/PortCompletedHandler.scala @@ -17,23 +17,23 @@ * under the License. */ -package org.apache.amber.engine.architecture.controller.promisehandlers +package org.apache.texera.amber.engine.architecture.controller.promisehandlers import com.twitter.util.Future -import org.apache.amber.core.WorkflowRuntimeException -import org.apache.amber.core.workflow.GlobalPortIdentity -import org.apache.amber.engine.architecture.controller.{ +import org.apache.texera.amber.core.WorkflowRuntimeException +import org.apache.texera.amber.core.workflow.GlobalPortIdentity +import org.apache.texera.amber.engine.architecture.controller.{ ControllerAsyncRPCHandlerInitializer, FatalError } -import org.apache.amber.engine.architecture.rpc.controlcommands.{ +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{ AsyncRPCContext, PortCompletedRequest, QueryStatisticsRequest } -import org.apache.amber.engine.architecture.rpc.controlreturns.EmptyReturn -import org.apache.amber.engine.common.virtualidentity.util.CONTROLLER -import org.apache.amber.util.VirtualIdentityUtils +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.EmptyReturn +import org.apache.texera.amber.engine.common.virtualidentity.util.CONTROLLER +import org.apache.texera.amber.util.VirtualIdentityUtils /** Notify the completion of a port: * - For input port, it means the worker has finished consuming and processing all the data diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/promisehandlers/QueryWorkerStatisticsHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/QueryWorkerStatisticsHandler.scala similarity index 88% rename from amber/src/main/scala/org/apache/amber/engine/architecture/controller/promisehandlers/QueryWorkerStatisticsHandler.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/QueryWorkerStatisticsHandler.scala index 57ed5ea2e6b..fb725f850e5 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/promisehandlers/QueryWorkerStatisticsHandler.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/QueryWorkerStatisticsHandler.scala @@ -17,23 +17,26 @@ * under the License. */ -package org.apache.amber.engine.architecture.controller.promisehandlers +package org.apache.texera.amber.engine.architecture.controller.promisehandlers import com.twitter.util.Future -import org.apache.amber.core.virtualidentity.PhysicalOpIdentity -import org.apache.amber.engine.architecture.controller.{ +import org.apache.texera.amber.core.virtualidentity.PhysicalOpIdentity +import org.apache.texera.amber.engine.architecture.controller.{ ControllerAsyncRPCHandlerInitializer, ExecutionStatsUpdate } -import org.apache.amber.engine.architecture.deploysemantics.layer.WorkerExecution -import org.apache.amber.engine.architecture.rpc.controlcommands.{ +import org.apache.texera.amber.engine.architecture.deploysemantics.layer.WorkerExecution +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{ AsyncRPCContext, EmptyRequest, QueryStatisticsRequest } -import org.apache.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState.COMPLETED -import org.apache.amber.engine.architecture.rpc.controlreturns.{EmptyReturn, WorkerMetricsResponse} -import org.apache.amber.util.VirtualIdentityUtils +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState.COMPLETED +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.{ + EmptyReturn, + WorkerMetricsResponse +} +import org.apache.texera.amber.util.VirtualIdentityUtils /** Get statistics from all the workers * diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/promisehandlers/ResumeHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/ResumeHandler.scala similarity index 84% rename from amber/src/main/scala/org/apache/amber/engine/architecture/controller/promisehandlers/ResumeHandler.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/ResumeHandler.scala index d3f7b2709a7..020ad40a1c9 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/promisehandlers/ResumeHandler.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/ResumeHandler.scala @@ -17,16 +17,19 @@ * under the License. */ -package org.apache.amber.engine.architecture.controller.promisehandlers +package org.apache.texera.amber.engine.architecture.controller.promisehandlers import com.twitter.util.Future -import org.apache.amber.engine.architecture.controller.{ +import org.apache.texera.amber.engine.architecture.controller.{ ControllerAsyncRPCHandlerInitializer, ExecutionStatsUpdate } -import org.apache.amber.engine.architecture.rpc.controlcommands.{AsyncRPCContext, EmptyRequest} -import org.apache.amber.engine.architecture.rpc.controlreturns.EmptyReturn -import org.apache.amber.util.VirtualIdentityUtils +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{ + AsyncRPCContext, + EmptyRequest +} +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.EmptyReturn +import org.apache.texera.amber.util.VirtualIdentityUtils /** resume the entire workflow * diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/promisehandlers/RetrieveWorkflowStateHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/RetrieveWorkflowStateHandler.scala similarity index 75% rename from amber/src/main/scala/org/apache/amber/engine/architecture/controller/promisehandlers/RetrieveWorkflowStateHandler.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/RetrieveWorkflowStateHandler.scala index 9612e35bb50..b6e75cd823b 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/promisehandlers/RetrieveWorkflowStateHandler.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/RetrieveWorkflowStateHandler.scala @@ -17,23 +17,23 @@ * under the License. */ -package org.apache.amber.engine.architecture.controller.promisehandlers +package org.apache.texera.amber.engine.architecture.controller.promisehandlers import com.twitter.util.Future -import org.apache.amber.core.virtualidentity.EmbeddedControlMessageIdentity -import org.apache.amber.engine.architecture.controller.ControllerAsyncRPCHandlerInitializer -import org.apache.amber.engine.architecture.rpc.controlcommands.EmbeddedControlMessageType.NO_ALIGNMENT -import org.apache.amber.engine.architecture.rpc.controlcommands.{ +import org.apache.texera.amber.core.virtualidentity.EmbeddedControlMessageIdentity +import org.apache.texera.amber.engine.architecture.controller.ControllerAsyncRPCHandlerInitializer +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.EmbeddedControlMessageType.NO_ALIGNMENT +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{ AsyncRPCContext, EmptyRequest, PropagateEmbeddedControlMessageRequest } -import org.apache.amber.engine.architecture.rpc.controlreturns.{ +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.{ RetrieveWorkflowStateResponse, StringResponse } -import org.apache.amber.engine.architecture.rpc.workerservice.WorkerServiceGrpc.METHOD_RETRIEVE_STATE -import org.apache.amber.engine.common.virtualidentity.util.SELF +import org.apache.texera.amber.engine.architecture.rpc.workerservice.WorkerServiceGrpc.METHOD_RETRIEVE_STATE +import org.apache.texera.amber.engine.common.virtualidentity.util.SELF import java.time.Instant diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/promisehandlers/RetryWorkflowHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/RetryWorkflowHandler.scala similarity index 79% rename from amber/src/main/scala/org/apache/amber/engine/architecture/controller/promisehandlers/RetryWorkflowHandler.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/RetryWorkflowHandler.scala index 0013daac173..a2e1e257f8a 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/promisehandlers/RetryWorkflowHandler.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/RetryWorkflowHandler.scala @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.amber.engine.architecture.controller.promisehandlers +package org.apache.texera.amber.engine.architecture.controller.promisehandlers import com.twitter.util.Future -import org.apache.amber.engine.architecture.controller.ControllerAsyncRPCHandlerInitializer -import org.apache.amber.engine.architecture.rpc.controlcommands.{ +import org.apache.texera.amber.engine.architecture.controller.ControllerAsyncRPCHandlerInitializer +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{ AsyncRPCContext, EmptyRequest, RetryWorkflowRequest } -import org.apache.amber.engine.architecture.rpc.controlreturns.EmptyReturn -import org.apache.amber.engine.common.virtualidentity.util.CONTROLLER +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.EmptyReturn +import org.apache.texera.amber.engine.common.virtualidentity.util.CONTROLLER /** retry the execution of the entire workflow * diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/promisehandlers/StartWorkflowHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/StartWorkflowHandler.scala similarity index 76% rename from amber/src/main/scala/org/apache/amber/engine/architecture/controller/promisehandlers/StartWorkflowHandler.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/StartWorkflowHandler.scala index 0935dfbcd52..2ce28afb0f0 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/promisehandlers/StartWorkflowHandler.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/StartWorkflowHandler.scala @@ -17,13 +17,16 @@ * under the License. */ -package org.apache.amber.engine.architecture.controller.promisehandlers +package org.apache.texera.amber.engine.architecture.controller.promisehandlers import com.twitter.util.Future -import org.apache.amber.engine.architecture.controller.ControllerAsyncRPCHandlerInitializer -import org.apache.amber.engine.architecture.rpc.controlcommands.{AsyncRPCContext, EmptyRequest} -import org.apache.amber.engine.architecture.rpc.controlreturns.StartWorkflowResponse -import org.apache.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState.RUNNING +import org.apache.texera.amber.engine.architecture.controller.ControllerAsyncRPCHandlerInitializer +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{ + AsyncRPCContext, + EmptyRequest +} +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.StartWorkflowResponse +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState.RUNNING /** start the workflow by starting the source workers * note that this SHOULD only be called once per workflow diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/promisehandlers/TakeGlobalCheckpointHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/TakeGlobalCheckpointHandler.scala similarity index 81% rename from amber/src/main/scala/org/apache/amber/engine/architecture/controller/promisehandlers/TakeGlobalCheckpointHandler.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/TakeGlobalCheckpointHandler.scala index f5db61d11aa..128c00fc562 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/promisehandlers/TakeGlobalCheckpointHandler.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/TakeGlobalCheckpointHandler.scala @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.amber.engine.architecture.controller.promisehandlers +package org.apache.texera.amber.engine.architecture.controller.promisehandlers import com.twitter.util.Future -import org.apache.amber.core.virtualidentity.ActorVirtualIdentity -import org.apache.amber.engine.architecture.controller.ControllerAsyncRPCHandlerInitializer -import org.apache.amber.engine.architecture.rpc.controlcommands.EmbeddedControlMessageType.NO_ALIGNMENT -import org.apache.amber.engine.architecture.rpc.controlcommands._ -import org.apache.amber.engine.architecture.rpc.controlreturns.TakeGlobalCheckpointResponse -import org.apache.amber.engine.architecture.rpc.workerservice.WorkerServiceGrpc.METHOD_PREPARE_CHECKPOINT -import org.apache.amber.engine.common.storage.SequentialRecordStorage -import org.apache.amber.engine.common.virtualidentity.util.SELF -import org.apache.amber.engine.common.{CheckpointState, SerializedState} +import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity +import org.apache.texera.amber.engine.architecture.controller.ControllerAsyncRPCHandlerInitializer +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.EmbeddedControlMessageType.NO_ALIGNMENT +import org.apache.texera.amber.engine.architecture.rpc.controlcommands._ +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.TakeGlobalCheckpointResponse +import org.apache.texera.amber.engine.architecture.rpc.workerservice.WorkerServiceGrpc.METHOD_PREPARE_CHECKPOINT +import org.apache.texera.amber.engine.common.storage.SequentialRecordStorage +import org.apache.texera.amber.engine.common.virtualidentity.util.SELF +import org.apache.texera.amber.engine.common.{CheckpointState, SerializedState} import java.net.URI diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/promisehandlers/WorkerExecutionCompletedHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/WorkerExecutionCompletedHandler.scala similarity index 86% rename from amber/src/main/scala/org/apache/amber/engine/architecture/controller/promisehandlers/WorkerExecutionCompletedHandler.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/WorkerExecutionCompletedHandler.scala index b2c135471bf..594673caa53 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/promisehandlers/WorkerExecutionCompletedHandler.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/WorkerExecutionCompletedHandler.scala @@ -17,20 +17,20 @@ * under the License. */ -package org.apache.amber.engine.architecture.controller.promisehandlers +package org.apache.texera.amber.engine.architecture.controller.promisehandlers import com.twitter.util.Future -import org.apache.amber.engine.architecture.controller.{ +import org.apache.texera.amber.engine.architecture.controller.{ ControllerAsyncRPCHandlerInitializer, ExecutionStateUpdate } -import org.apache.amber.engine.architecture.rpc.controlcommands.{ +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{ AsyncRPCContext, EmptyRequest, QueryStatisticsRequest } -import org.apache.amber.engine.architecture.rpc.controlreturns.EmptyReturn -import org.apache.amber.engine.common.virtualidentity.util.SELF +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.EmptyReturn +import org.apache.texera.amber.engine.common.virtualidentity.util.SELF /** indicate a worker has completed its execution * i.e. received and processed all data from upstreams diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/promisehandlers/WorkerStateUpdatedHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/WorkerStateUpdatedHandler.scala similarity index 83% rename from amber/src/main/scala/org/apache/amber/engine/architecture/controller/promisehandlers/WorkerStateUpdatedHandler.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/WorkerStateUpdatedHandler.scala index 7393a418384..c1fa6b1ef7a 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/controller/promisehandlers/WorkerStateUpdatedHandler.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/controller/promisehandlers/WorkerStateUpdatedHandler.scala @@ -17,19 +17,19 @@ * under the License. */ -package org.apache.amber.engine.architecture.controller.promisehandlers +package org.apache.texera.amber.engine.architecture.controller.promisehandlers import com.twitter.util.Future -import org.apache.amber.engine.architecture.controller.{ +import org.apache.texera.amber.engine.architecture.controller.{ ControllerAsyncRPCHandlerInitializer, ExecutionStatsUpdate } -import org.apache.amber.engine.architecture.rpc.controlcommands.{ +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{ AsyncRPCContext, WorkerStateUpdatedRequest } -import org.apache.amber.engine.architecture.rpc.controlreturns.EmptyReturn -import org.apache.amber.util.VirtualIdentityUtils +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.EmptyReturn +import org.apache.texera.amber.util.VirtualIdentityUtils /** indicate the state change of a worker * diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/deploysemantics/AddressInfo.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/deploysemantics/AddressInfo.scala similarity index 93% rename from amber/src/main/scala/org/apache/amber/engine/architecture/deploysemantics/AddressInfo.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/deploysemantics/AddressInfo.scala index f2fbf5640c6..f23e54d736d 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/deploysemantics/AddressInfo.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/deploysemantics/AddressInfo.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.engine.architecture.deploysemantics +package org.apache.texera.amber.engine.architecture.deploysemantics import org.apache.pekko.actor.Address diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/deploysemantics/deploystrategy/DeployStrategy.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/deploysemantics/deploystrategy/DeployStrategy.scala similarity index 92% rename from amber/src/main/scala/org/apache/amber/engine/architecture/deploysemantics/deploystrategy/DeployStrategy.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/deploysemantics/deploystrategy/DeployStrategy.scala index e4a525d0024..079d253c848 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/deploysemantics/deploystrategy/DeployStrategy.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/deploysemantics/deploystrategy/DeployStrategy.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.engine.architecture.deploysemantics.deploystrategy +package org.apache.texera.amber.engine.architecture.deploysemantics.deploystrategy import org.apache.pekko.actor.Address diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/deploysemantics/deploystrategy/OneOnEach.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/deploysemantics/deploystrategy/OneOnEach.scala similarity index 93% rename from amber/src/main/scala/org/apache/amber/engine/architecture/deploysemantics/deploystrategy/OneOnEach.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/deploysemantics/deploystrategy/OneOnEach.scala index 4f7b638fd28..62cf288263b 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/deploysemantics/deploystrategy/OneOnEach.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/deploysemantics/deploystrategy/OneOnEach.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.engine.architecture.deploysemantics.deploystrategy +package org.apache.texera.amber.engine.architecture.deploysemantics.deploystrategy import org.apache.pekko.actor.Address diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/deploysemantics/deploystrategy/RandomDeployment.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/deploysemantics/deploystrategy/RandomDeployment.scala similarity index 93% rename from amber/src/main/scala/org/apache/amber/engine/architecture/deploysemantics/deploystrategy/RandomDeployment.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/deploysemantics/deploystrategy/RandomDeployment.scala index 18a120615f6..aebab32fca9 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/deploysemantics/deploystrategy/RandomDeployment.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/deploysemantics/deploystrategy/RandomDeployment.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.engine.architecture.deploysemantics.deploystrategy +package org.apache.texera.amber.engine.architecture.deploysemantics.deploystrategy import org.apache.pekko.actor.Address diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/deploysemantics/deploystrategy/RoundRobinDeployment.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/deploysemantics/deploystrategy/RoundRobinDeployment.scala similarity index 93% rename from amber/src/main/scala/org/apache/amber/engine/architecture/deploysemantics/deploystrategy/RoundRobinDeployment.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/deploysemantics/deploystrategy/RoundRobinDeployment.scala index be8c4fdd1aa..3fee912d7d9 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/deploysemantics/deploystrategy/RoundRobinDeployment.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/deploysemantics/deploystrategy/RoundRobinDeployment.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.engine.architecture.deploysemantics.deploystrategy +package org.apache.texera.amber.engine.architecture.deploysemantics.deploystrategy import org.apache.pekko.actor.Address diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/deploysemantics/layer/WorkerExecution.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/deploysemantics/layer/WorkerExecution.scala similarity index 88% rename from amber/src/main/scala/org/apache/amber/engine/architecture/deploysemantics/layer/WorkerExecution.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/deploysemantics/layer/WorkerExecution.scala index 0e8295f5881..55e1e309181 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/deploysemantics/layer/WorkerExecution.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/deploysemantics/layer/WorkerExecution.scala @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.amber.engine.architecture.deploysemantics.layer +package org.apache.texera.amber.engine.architecture.deploysemantics.layer -import org.apache.amber.core.workflow.PortIdentity -import org.apache.amber.engine.architecture.controller.execution.WorkerPortExecution -import org.apache.amber.engine.architecture.worker.statistics.WorkerState.UNINITIALIZED -import org.apache.amber.engine.architecture.worker.statistics.{WorkerState, WorkerStatistics} +import org.apache.texera.amber.core.workflow.PortIdentity +import org.apache.texera.amber.engine.architecture.controller.execution.WorkerPortExecution +import org.apache.texera.amber.engine.architecture.worker.statistics.WorkerState.UNINITIALIZED +import org.apache.texera.amber.engine.architecture.worker.statistics.{WorkerState, WorkerStatistics} import scala.collection.mutable diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/logreplay/AsyncReplayLogWriter.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/AsyncReplayLogWriter.scala similarity index 89% rename from amber/src/main/scala/org/apache/amber/engine/architecture/logreplay/AsyncReplayLogWriter.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/AsyncReplayLogWriter.scala index 94507e6a153..39969340d39 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/logreplay/AsyncReplayLogWriter.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/AsyncReplayLogWriter.scala @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.amber.engine.architecture.logreplay +package org.apache.texera.amber.engine.architecture.logreplay import com.google.common.collect.Queues -import org.apache.amber.config.ApplicationConfig -import org.apache.amber.engine.architecture.worker.WorkflowWorker.MainThreadDelegateMessage -import org.apache.amber.engine.common.ambermessage.WorkflowFIFOMessage -import org.apache.amber.engine.common.storage.SequentialRecordStorage.SequentialRecordWriter +import org.apache.texera.amber.config.ApplicationConfig +import org.apache.texera.amber.engine.architecture.worker.WorkflowWorker.MainThreadDelegateMessage +import org.apache.texera.amber.engine.common.ambermessage.WorkflowFIFOMessage +import org.apache.texera.amber.engine.common.storage.SequentialRecordStorage.SequentialRecordWriter import java.util import java.util.concurrent.CompletableFuture diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/logreplay/EmptyReplayLogger.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/EmptyReplayLogger.scala similarity index 82% rename from amber/src/main/scala/org/apache/amber/engine/architecture/logreplay/EmptyReplayLogger.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/EmptyReplayLogger.scala index b56b658e8c9..74be96acdbd 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/logreplay/EmptyReplayLogger.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/EmptyReplayLogger.scala @@ -17,10 +17,13 @@ * under the License. */ -package org.apache.amber.engine.architecture.logreplay +package org.apache.texera.amber.engine.architecture.logreplay -import org.apache.amber.core.virtualidentity.{ChannelIdentity, EmbeddedControlMessageIdentity} -import org.apache.amber.engine.common.ambermessage.WorkflowFIFOMessage +import org.apache.texera.amber.core.virtualidentity.{ + ChannelIdentity, + EmbeddedControlMessageIdentity +} +import org.apache.texera.amber.engine.common.ambermessage.WorkflowFIFOMessage class EmptyReplayLogger extends ReplayLogger { diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/logreplay/OrderEnforcer.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/OrderEnforcer.scala similarity index 87% rename from amber/src/main/scala/org/apache/amber/engine/architecture/logreplay/OrderEnforcer.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/OrderEnforcer.scala index 64b85e36869..b18151992fd 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/logreplay/OrderEnforcer.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/OrderEnforcer.scala @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.amber.engine.architecture.logreplay +package org.apache.texera.amber.engine.architecture.logreplay -import org.apache.amber.core.virtualidentity.ChannelIdentity +import org.apache.texera.amber.core.virtualidentity.ChannelIdentity trait OrderEnforcer { var isCompleted: Boolean diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/logreplay/ReplayLogGenerator.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/ReplayLogGenerator.scala similarity index 85% rename from amber/src/main/scala/org/apache/amber/engine/architecture/logreplay/ReplayLogGenerator.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/ReplayLogGenerator.scala index 641baef2fc8..d159263db33 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/logreplay/ReplayLogGenerator.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/ReplayLogGenerator.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.engine.architecture.logreplay +package org.apache.texera.amber.engine.architecture.logreplay -import org.apache.amber.core.virtualidentity.EmbeddedControlMessageIdentity -import org.apache.amber.engine.common.ambermessage.WorkflowFIFOMessage -import org.apache.amber.engine.common.storage.SequentialRecordStorage +import org.apache.texera.amber.core.virtualidentity.EmbeddedControlMessageIdentity +import org.apache.texera.amber.engine.common.ambermessage.WorkflowFIFOMessage +import org.apache.texera.amber.engine.common.storage.SequentialRecordStorage import scala.collection.mutable diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/logreplay/ReplayLogManager.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/ReplayLogManager.scala similarity index 86% rename from amber/src/main/scala/org/apache/amber/engine/architecture/logreplay/ReplayLogManager.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/ReplayLogManager.scala index 9dc1c577d8c..a894ab3c8ef 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/logreplay/ReplayLogManager.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/ReplayLogManager.scala @@ -17,14 +17,17 @@ * under the License. */ -package org.apache.amber.engine.architecture.logreplay - -import org.apache.amber.core.virtualidentity.{ChannelIdentity, EmbeddedControlMessageIdentity} -import org.apache.amber.engine.architecture.common.ProcessingStepCursor -import org.apache.amber.engine.architecture.worker.WorkflowWorker.MainThreadDelegateMessage -import org.apache.amber.engine.common.ambermessage.WorkflowFIFOMessage -import org.apache.amber.engine.common.storage.SequentialRecordStorage.SequentialRecordWriter -import org.apache.amber.engine.common.storage.{EmptyRecordStorage, SequentialRecordStorage} +package org.apache.texera.amber.engine.architecture.logreplay + +import org.apache.texera.amber.core.virtualidentity.{ + ChannelIdentity, + EmbeddedControlMessageIdentity +} +import org.apache.texera.amber.engine.architecture.common.ProcessingStepCursor +import org.apache.texera.amber.engine.architecture.worker.WorkflowWorker.MainThreadDelegateMessage +import org.apache.texera.amber.engine.common.ambermessage.WorkflowFIFOMessage +import org.apache.texera.amber.engine.common.storage.SequentialRecordStorage.SequentialRecordWriter +import org.apache.texera.amber.engine.common.storage.{EmptyRecordStorage, SequentialRecordStorage} //In-mem formats: sealed trait ReplayLogRecord extends Serializable diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/logreplay/ReplayLogger.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/ReplayLogger.scala similarity index 81% rename from amber/src/main/scala/org/apache/amber/engine/architecture/logreplay/ReplayLogger.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/ReplayLogger.scala index 8291b7df92e..9fbd8bf1a0b 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/logreplay/ReplayLogger.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/ReplayLogger.scala @@ -17,10 +17,13 @@ * under the License. */ -package org.apache.amber.engine.architecture.logreplay +package org.apache.texera.amber.engine.architecture.logreplay -import org.apache.amber.core.virtualidentity.{ChannelIdentity, EmbeddedControlMessageIdentity} -import org.apache.amber.engine.common.ambermessage.WorkflowFIFOMessage +import org.apache.texera.amber.core.virtualidentity.{ + ChannelIdentity, + EmbeddedControlMessageIdentity +} +import org.apache.texera.amber.engine.common.ambermessage.WorkflowFIFOMessage abstract class ReplayLogger { diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/logreplay/ReplayLoggerImpl.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/ReplayLoggerImpl.scala similarity index 89% rename from amber/src/main/scala/org/apache/amber/engine/architecture/logreplay/ReplayLoggerImpl.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/ReplayLoggerImpl.scala index 5981cc8bee0..42f5b9e2069 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/logreplay/ReplayLoggerImpl.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/ReplayLoggerImpl.scala @@ -17,11 +17,14 @@ * under the License. */ -package org.apache.amber.engine.architecture.logreplay +package org.apache.texera.amber.engine.architecture.logreplay -import org.apache.amber.core.virtualidentity.{ChannelIdentity, EmbeddedControlMessageIdentity} -import org.apache.amber.engine.architecture.common.ProcessingStepCursor.INIT_STEP -import org.apache.amber.engine.common.ambermessage.WorkflowFIFOMessage +import org.apache.texera.amber.core.virtualidentity.{ + ChannelIdentity, + EmbeddedControlMessageIdentity +} +import org.apache.texera.amber.engine.architecture.common.ProcessingStepCursor.INIT_STEP +import org.apache.texera.amber.engine.common.ambermessage.WorkflowFIFOMessage import scala.collection.mutable diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/logreplay/ReplayOrderEnforcer.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/ReplayOrderEnforcer.scala similarity index 95% rename from amber/src/main/scala/org/apache/amber/engine/architecture/logreplay/ReplayOrderEnforcer.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/ReplayOrderEnforcer.scala index eee28dd876d..6441aae2c20 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/logreplay/ReplayOrderEnforcer.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/logreplay/ReplayOrderEnforcer.scala @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.amber.engine.architecture.logreplay +package org.apache.texera.amber.engine.architecture.logreplay -import org.apache.amber.core.virtualidentity.ChannelIdentity +import org.apache.texera.amber.core.virtualidentity.ChannelIdentity import scala.collection.mutable diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/messaginglayer/AmberFIFOChannel.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/AmberFIFOChannel.scala similarity index 88% rename from amber/src/main/scala/org/apache/amber/engine/architecture/messaginglayer/AmberFIFOChannel.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/AmberFIFOChannel.scala index 0fde839aa51..d81b4239ba7 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/messaginglayer/AmberFIFOChannel.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/AmberFIFOChannel.scala @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.amber.engine.architecture.messaginglayer +package org.apache.texera.amber.engine.architecture.messaginglayer -import org.apache.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} -import org.apache.amber.core.workflow.PortIdentity -import org.apache.amber.engine.common.AmberLogging -import org.apache.amber.engine.common.ambermessage.WorkflowFIFOMessage -import org.apache.amber.engine.common.ambermessage.WorkflowMessage.getInMemSize +import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} +import org.apache.texera.amber.core.workflow.PortIdentity +import org.apache.texera.amber.engine.common.AmberLogging +import org.apache.texera.amber.engine.common.ambermessage.WorkflowFIFOMessage +import org.apache.texera.amber.engine.common.ambermessage.WorkflowMessage.getInMemSize import java.util.concurrent.atomic.AtomicLong import scala.collection.mutable diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/messaginglayer/CongestionControl.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/CongestionControl.scala similarity index 95% rename from amber/src/main/scala/org/apache/amber/engine/architecture/messaginglayer/CongestionControl.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/CongestionControl.scala index 8d60bd8723b..337be75cf19 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/messaginglayer/CongestionControl.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/CongestionControl.scala @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.amber.engine.architecture.messaginglayer +package org.apache.texera.amber.engine.architecture.messaginglayer -import org.apache.amber.engine.architecture.common.WorkflowActor.NetworkMessage +import org.apache.texera.amber.engine.architecture.common.WorkflowActor.NetworkMessage import scala.collection.mutable diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/messaginglayer/DeadLetterMonitorActor.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/DeadLetterMonitorActor.scala similarity index 89% rename from amber/src/main/scala/org/apache/amber/engine/architecture/messaginglayer/DeadLetterMonitorActor.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/DeadLetterMonitorActor.scala index cad3a7f44ac..323761fca11 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/messaginglayer/DeadLetterMonitorActor.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/DeadLetterMonitorActor.scala @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.amber.engine.architecture.messaginglayer +package org.apache.texera.amber.engine.architecture.messaginglayer import org.apache.pekko.actor.{Actor, DeadLetter} -import org.apache.amber.engine.architecture.common.WorkflowActor.{ +import org.apache.texera.amber.engine.architecture.common.WorkflowActor.{ MessageBecomesDeadLetter, NetworkMessage } diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/messaginglayer/FlowControl.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/FlowControl.scala similarity index 94% rename from amber/src/main/scala/org/apache/amber/engine/architecture/messaginglayer/FlowControl.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/FlowControl.scala index 8269afe553b..d4b24dad1d8 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/messaginglayer/FlowControl.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/FlowControl.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.engine.architecture.messaginglayer +package org.apache.texera.amber.engine.architecture.messaginglayer -import org.apache.amber.config.ApplicationConfig -import org.apache.amber.engine.architecture.common.WorkflowActor.NetworkMessage -import org.apache.amber.engine.common.ambermessage.WorkflowMessage.getInMemSize +import org.apache.texera.amber.config.ApplicationConfig +import org.apache.texera.amber.engine.architecture.common.WorkflowActor.NetworkMessage +import org.apache.texera.amber.engine.common.ambermessage.WorkflowMessage.getInMemSize import scala.collection.mutable import scala.util.control.Breaks.{break, breakable} diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/messaginglayer/InputGateway.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/InputGateway.scala similarity index 85% rename from amber/src/main/scala/org/apache/amber/engine/architecture/messaginglayer/InputGateway.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/InputGateway.scala index 6466c72c188..8d0c313f806 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/messaginglayer/InputGateway.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/InputGateway.scala @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.amber.engine.architecture.messaginglayer +package org.apache.texera.amber.engine.architecture.messaginglayer -import org.apache.amber.core.virtualidentity.ChannelIdentity -import org.apache.amber.engine.architecture.logreplay.OrderEnforcer +import org.apache.texera.amber.core.virtualidentity.ChannelIdentity +import org.apache.texera.amber.engine.architecture.logreplay.OrderEnforcer trait InputGateway { diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/messaginglayer/InputManager.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/InputManager.scala similarity index 88% rename from amber/src/main/scala/org/apache/amber/engine/architecture/messaginglayer/InputManager.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/InputManager.scala index de7df73b891..4e297829431 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/messaginglayer/InputManager.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/InputManager.scala @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.amber.engine.architecture.messaginglayer - -import org.apache.amber.core.tuple.{Schema, Tuple} -import org.apache.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} -import org.apache.amber.core.workflow.PortIdentity -import org.apache.amber.engine.architecture.sendsemantics.partitionings.Partitioning -import org.apache.amber.engine.architecture.worker.WorkflowWorker.DPInputQueueElement -import org.apache.amber.engine.architecture.worker.managers.InputPortMaterializationReaderThread -import org.apache.amber.engine.common.AmberLogging +package org.apache.texera.amber.engine.architecture.messaginglayer + +import org.apache.texera.amber.core.tuple.{Schema, Tuple} +import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} +import org.apache.texera.amber.core.workflow.PortIdentity +import org.apache.texera.amber.engine.architecture.sendsemantics.partitionings.Partitioning +import org.apache.texera.amber.engine.architecture.worker.WorkflowWorker.DPInputQueueElement +import org.apache.texera.amber.engine.architecture.worker.managers.InputPortMaterializationReaderThread +import org.apache.texera.amber.engine.common.AmberLogging import java.net.URI import java.util.concurrent.LinkedBlockingQueue diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/messaginglayer/NetworkInputGateway.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/NetworkInputGateway.scala similarity index 90% rename from amber/src/main/scala/org/apache/amber/engine/architecture/messaginglayer/NetworkInputGateway.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/NetworkInputGateway.scala index 5ede42eb62a..5cfd8aabc04 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/messaginglayer/NetworkInputGateway.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/NetworkInputGateway.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.engine.architecture.messaginglayer +package org.apache.texera.amber.engine.architecture.messaginglayer -import org.apache.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} -import org.apache.amber.engine.architecture.logreplay.OrderEnforcer -import org.apache.amber.engine.common.AmberLogging +import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} +import org.apache.texera.amber.engine.architecture.logreplay.OrderEnforcer +import org.apache.texera.amber.engine.common.AmberLogging import scala.collection.mutable diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/messaginglayer/NetworkOutputGateway.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/NetworkOutputGateway.scala similarity index 90% rename from amber/src/main/scala/org/apache/amber/engine/architecture/messaginglayer/NetworkOutputGateway.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/NetworkOutputGateway.scala index fd447a31f55..929a30f4efa 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/messaginglayer/NetworkOutputGateway.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/NetworkOutputGateway.scala @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.amber.engine.architecture.messaginglayer +package org.apache.texera.amber.engine.architecture.messaginglayer -import org.apache.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} -import org.apache.amber.engine.common.AmberLogging -import org.apache.amber.engine.common.ambermessage.{ +import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} +import org.apache.texera.amber.engine.common.AmberLogging +import org.apache.texera.amber.engine.common.ambermessage.{ DataPayload, DirectControlMessagePayload, WorkflowFIFOMessage, WorkflowFIFOMessagePayload } -import org.apache.amber.engine.common.virtualidentity.util.SELF +import org.apache.texera.amber.engine.common.virtualidentity.util.SELF import java.util.concurrent.atomic.AtomicLong import scala.collection.mutable diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/messaginglayer/OrderingEnforcer.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/OrderingEnforcer.scala similarity index 95% rename from amber/src/main/scala/org/apache/amber/engine/architecture/messaginglayer/OrderingEnforcer.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/OrderingEnforcer.scala index 9f0cb996aed..d840738a45d 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/messaginglayer/OrderingEnforcer.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/OrderingEnforcer.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.engine.architecture.messaginglayer +package org.apache.texera.amber.engine.architecture.messaginglayer import scala.collection.mutable diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/messaginglayer/OutputManager.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/OutputManager.scala similarity index 92% rename from amber/src/main/scala/org/apache/amber/engine/architecture/messaginglayer/OutputManager.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/OutputManager.scala index e786ea432eb..4ab3d18056f 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/messaginglayer/OutputManager.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/OutputManager.scala @@ -17,27 +17,27 @@ * under the License. */ -package org.apache.amber.engine.architecture.messaginglayer - -import org.apache.amber.core.state.State -import org.apache.amber.core.storage.DocumentFactory -import org.apache.amber.core.storage.model.BufferedItemWriter -import org.apache.amber.core.tuple._ -import org.apache.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} -import org.apache.amber.core.workflow.{PhysicalLink, PortIdentity} -import org.apache.amber.engine.architecture.messaginglayer.OutputManager.{ +package org.apache.texera.amber.engine.architecture.messaginglayer + +import org.apache.texera.amber.core.state.State +import org.apache.texera.amber.core.storage.DocumentFactory +import org.apache.texera.amber.core.storage.model.BufferedItemWriter +import org.apache.texera.amber.core.tuple._ +import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} +import org.apache.texera.amber.core.workflow.{PhysicalLink, PortIdentity} +import org.apache.texera.amber.engine.architecture.messaginglayer.OutputManager.{ DPOutputIterator, getBatchSize, toPartitioner } -import org.apache.amber.engine.architecture.sendsemantics.partitioners._ -import org.apache.amber.engine.architecture.sendsemantics.partitionings._ -import org.apache.amber.engine.architecture.worker.managers.{ +import org.apache.texera.amber.engine.architecture.sendsemantics.partitioners._ +import org.apache.texera.amber.engine.architecture.sendsemantics.partitionings._ +import org.apache.texera.amber.engine.architecture.worker.managers.{ OutputPortResultWriterThread, PortStorageWriterTerminateSignal } -import org.apache.amber.engine.common.AmberLogging -import org.apache.amber.util.VirtualIdentityUtils +import org.apache.texera.amber.engine.common.AmberLogging +import org.apache.texera.amber.util.VirtualIdentityUtils import java.net.URI import scala.collection.mutable diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/messaginglayer/WorkerPort.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/WorkerPort.scala similarity index 84% rename from amber/src/main/scala/org/apache/amber/engine/architecture/messaginglayer/WorkerPort.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/WorkerPort.scala index c12fe0a0da2..504aaf93704 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/messaginglayer/WorkerPort.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/WorkerPort.scala @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.amber.engine.architecture.messaginglayer +package org.apache.texera.amber.engine.architecture.messaginglayer -import org.apache.amber.core.tuple.Schema -import org.apache.amber.core.virtualidentity.ChannelIdentity +import org.apache.texera.amber.core.tuple.Schema +import org.apache.texera.amber.core.virtualidentity.ChannelIdentity import scala.collection.mutable case class WorkerPort( diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/messaginglayer/WorkerTimerService.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/WorkerTimerService.scala similarity index 77% rename from amber/src/main/scala/org/apache/amber/engine/architecture/messaginglayer/WorkerTimerService.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/WorkerTimerService.scala index 61c0d8249f3..3bb87febd93 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/messaginglayer/WorkerTimerService.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/messaginglayer/WorkerTimerService.scala @@ -17,16 +17,19 @@ * under the License. */ -package org.apache.amber.engine.architecture.messaginglayer +package org.apache.texera.amber.engine.architecture.messaginglayer import org.apache.pekko.actor.Cancellable -import org.apache.amber.config.ApplicationConfig -import org.apache.amber.engine.architecture.common.AkkaActorService -import org.apache.amber.engine.architecture.rpc.controlcommands.{AsyncRPCContext, EmptyRequest} -import org.apache.amber.engine.architecture.rpc.workerservice.WorkerServiceGrpc.METHOD_FLUSH_NETWORK_BUFFER -import org.apache.amber.engine.common.rpc.AsyncRPCClient -import org.apache.amber.engine.common.rpc.AsyncRPCClient.ControlInvocation -import org.apache.amber.engine.common.virtualidentity.util.SELF +import org.apache.texera.amber.config.ApplicationConfig +import org.apache.texera.amber.engine.architecture.common.AkkaActorService +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{ + AsyncRPCContext, + EmptyRequest +} +import org.apache.texera.amber.engine.architecture.rpc.workerservice.WorkerServiceGrpc.METHOD_FLUSH_NETWORK_BUFFER +import org.apache.texera.amber.engine.common.rpc.AsyncRPCClient +import org.apache.texera.amber.engine.common.rpc.AsyncRPCClient.ControlInvocation +import org.apache.texera.amber.engine.common.virtualidentity.util.SELF import scala.concurrent.duration.{DurationInt, FiniteDuration, MILLISECONDS} diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/pythonworker/PythonProxyClient.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/pythonworker/PythonProxyClient.scala similarity index 91% rename from amber/src/main/scala/org/apache/amber/engine/architecture/pythonworker/PythonProxyClient.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/pythonworker/PythonProxyClient.scala index a08ee7a1480..6618e857b1d 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/pythonworker/PythonProxyClient.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/pythonworker/PythonProxyClient.scala @@ -17,27 +17,27 @@ * under the License. */ -package org.apache.amber.engine.architecture.pythonworker +package org.apache.texera.amber.engine.architecture.pythonworker import com.twitter.util.{Await, Promise} -import org.apache.amber.core.WorkflowRuntimeException -import org.apache.amber.core.tuple.{Schema, Tuple} -import org.apache.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} -import org.apache.amber.engine.architecture.pythonworker.WorkerBatchInternalQueue.{ +import org.apache.texera.amber.core.WorkflowRuntimeException +import org.apache.texera.amber.core.tuple.{Schema, Tuple} +import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} +import org.apache.texera.amber.engine.architecture.pythonworker.WorkerBatchInternalQueue.{ ActorCommandElement, ControlElement, DataElement, EmbeddedControlMessageElement } -import org.apache.amber.engine.architecture.rpc.controlcommands.{ +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{ ControlInvocation, EmbeddedControlMessage } -import org.apache.amber.engine.architecture.rpc.controlreturns.ReturnInvocation -import org.apache.amber.engine.common.AmberLogging -import org.apache.amber.engine.common.actormessage.{ActorCommand, PythonActorMessage} -import org.apache.amber.engine.common.ambermessage._ -import org.apache.amber.util.ArrowUtils +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.ReturnInvocation +import org.apache.texera.amber.engine.common.AmberLogging +import org.apache.texera.amber.engine.common.actormessage.{ActorCommand, PythonActorMessage} +import org.apache.texera.amber.engine.common.ambermessage._ +import org.apache.texera.amber.util.ArrowUtils import org.apache.arrow.flight._ import org.apache.arrow.memory.{ArrowBuf, BufferAllocator, RootAllocator} import org.apache.arrow.vector.types.pojo.{ArrowType, Field, FieldType, Schema => ArrowSchema} diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/pythonworker/PythonProxyServer.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/pythonworker/PythonProxyServer.scala similarity index 90% rename from amber/src/main/scala/org/apache/amber/engine/architecture/pythonworker/PythonProxyServer.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/pythonworker/PythonProxyServer.scala index a522bc7e29c..c904e436bcd 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/pythonworker/PythonProxyServer.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/pythonworker/PythonProxyServer.scala @@ -17,22 +17,22 @@ * under the License. */ -package org.apache.amber.engine.architecture.pythonworker +package org.apache.texera.amber.engine.architecture.pythonworker import com.google.common.primitives.Longs import com.twitter.util.Promise -import org.apache.amber.core.state.State -import org.apache.amber.core.tuple.Tuple -import org.apache.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} -import org.apache.amber.engine.architecture.messaginglayer.NetworkOutputGateway -import org.apache.amber.engine.architecture.rpc.controlcommands.EmbeddedControlMessage -import org.apache.amber.engine.common.AmberLogging -import org.apache.amber.engine.common.ambermessage.DirectControlMessagePayloadV2.Value.{ +import org.apache.texera.amber.core.state.State +import org.apache.texera.amber.core.tuple.Tuple +import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} +import org.apache.texera.amber.engine.architecture.messaginglayer.NetworkOutputGateway +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.EmbeddedControlMessage +import org.apache.texera.amber.engine.common.AmberLogging +import org.apache.texera.amber.engine.common.ambermessage.DirectControlMessagePayloadV2.Value.{ ControlInvocation => ControlInvocationV2, ReturnInvocation => ReturnInvocationV2 } -import org.apache.amber.engine.common.ambermessage._ -import org.apache.amber.util.ArrowUtils +import org.apache.texera.amber.engine.common.ambermessage._ +import org.apache.texera.amber.util.ArrowUtils import org.apache.arrow.flight._ import org.apache.arrow.memory.{ArrowBuf, BufferAllocator, RootAllocator} import org.apache.arrow.util.AutoCloseables diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/pythonworker/PythonWorkflowWorker.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/pythonworker/PythonWorkflowWorker.scala similarity index 86% rename from amber/src/main/scala/org/apache/amber/engine/architecture/pythonworker/PythonWorkflowWorker.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/pythonworker/PythonWorkflowWorker.scala index fa43d2c7d9b..f32d227fc70 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/pythonworker/PythonWorkflowWorker.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/pythonworker/PythonWorkflowWorker.scala @@ -17,28 +17,28 @@ * under the License. */ -package org.apache.amber.engine.architecture.pythonworker +package org.apache.texera.amber.engine.architecture.pythonworker import org.apache.pekko.actor.Props import com.twitter.util.Promise -import org.apache.amber.config.{StorageConfig, UdfConfig} -import org.apache.amber.core.virtualidentity.ChannelIdentity -import org.apache.amber.engine.architecture.common.WorkflowActor -import org.apache.amber.engine.architecture.common.WorkflowActor.NetworkAck -import org.apache.amber.engine.architecture.messaginglayer.{ +import org.apache.texera.amber.config.{StorageConfig, UdfConfig} +import org.apache.texera.amber.core.virtualidentity.ChannelIdentity +import org.apache.texera.amber.engine.architecture.common.WorkflowActor +import org.apache.texera.amber.engine.architecture.common.WorkflowActor.NetworkAck +import org.apache.texera.amber.engine.architecture.messaginglayer.{ NetworkInputGateway, NetworkOutputGateway } -import org.apache.amber.engine.architecture.pythonworker.WorkerBatchInternalQueue.{ +import org.apache.texera.amber.engine.architecture.pythonworker.WorkerBatchInternalQueue.{ DataElement, EmbeddedControlMessageElement } -import org.apache.amber.engine.architecture.rpc.controlcommands.EmbeddedControlMessage -import org.apache.amber.engine.architecture.scheduling.config.WorkerConfig -import org.apache.amber.engine.common.actormessage.{Backpressure, CreditUpdate} -import org.apache.amber.engine.common.ambermessage.WorkflowMessage.getInMemSize -import org.apache.amber.engine.common.ambermessage._ -import org.apache.amber.engine.common.{CheckpointState, Utils} +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.EmbeddedControlMessage +import org.apache.texera.amber.engine.architecture.scheduling.config.WorkerConfig +import org.apache.texera.amber.engine.common.actormessage.{Backpressure, CreditUpdate} +import org.apache.texera.amber.engine.common.ambermessage.WorkflowMessage.getInMemSize +import org.apache.texera.amber.engine.common.ambermessage._ +import org.apache.texera.amber.engine.common.{CheckpointState, Utils} import java.nio.file.Path import java.util.concurrent.{ExecutorService, Executors} diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/pythonworker/WorkerBatchInternalQueue.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/pythonworker/WorkerBatchInternalQueue.scala similarity index 89% rename from amber/src/main/scala/org/apache/amber/engine/architecture/pythonworker/WorkerBatchInternalQueue.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/pythonworker/WorkerBatchInternalQueue.scala index 1949bcb36d8..11f9b6b802b 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/pythonworker/WorkerBatchInternalQueue.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/pythonworker/WorkerBatchInternalQueue.scala @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.amber.engine.architecture.pythonworker +package org.apache.texera.amber.engine.architecture.pythonworker import lbmq.LinkedBlockingMultiQueue -import org.apache.amber.core.virtualidentity.ChannelIdentity -import org.apache.amber.engine.architecture.pythonworker.WorkerBatchInternalQueue._ -import org.apache.amber.engine.architecture.rpc.controlcommands.EmbeddedControlMessage -import org.apache.amber.engine.common.actormessage.ActorCommand -import org.apache.amber.engine.common.ambermessage.{ +import org.apache.texera.amber.core.virtualidentity.ChannelIdentity +import org.apache.texera.amber.engine.architecture.pythonworker.WorkerBatchInternalQueue._ +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.EmbeddedControlMessage +import org.apache.texera.amber.engine.common.actormessage.ActorCommand +import org.apache.texera.amber.engine.common.ambermessage.{ DataFrame, DataPayload, DirectControlMessagePayload diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/CostBasedScheduleGenerator.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/CostBasedScheduleGenerator.scala similarity index 97% rename from amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/CostBasedScheduleGenerator.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/CostBasedScheduleGenerator.scala index 8d7f5ea889b..0b68aad221e 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/CostBasedScheduleGenerator.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/CostBasedScheduleGenerator.scala @@ -17,19 +17,19 @@ * under the License. */ -package org.apache.amber.engine.architecture.scheduling - -import org.apache.amber.config.ApplicationConfig -import org.apache.amber.core.storage.VFSURIFactory.createResultURI -import org.apache.amber.core.virtualidentity.{ActorVirtualIdentity, PhysicalOpIdentity} -import org.apache.amber.core.workflow._ -import org.apache.amber.engine.architecture.scheduling.SchedulingUtils.replaceVertex -import org.apache.amber.engine.architecture.scheduling.config.{ +package org.apache.texera.amber.engine.architecture.scheduling + +import org.apache.texera.amber.config.ApplicationConfig +import org.apache.texera.amber.core.storage.VFSURIFactory.createResultURI +import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, PhysicalOpIdentity} +import org.apache.texera.amber.core.workflow._ +import org.apache.texera.amber.engine.architecture.scheduling.SchedulingUtils.replaceVertex +import org.apache.texera.amber.engine.architecture.scheduling.config.{ IntermediateInputPortConfig, OutputPortConfig, ResourceConfig } -import org.apache.amber.engine.common.AmberLogging +import org.apache.texera.amber.engine.common.AmberLogging import org.jgrapht.Graph import org.jgrapht.alg.connectivity.BiconnectivityInspector import org.jgrapht.graph.{DirectedAcyclicGraph, DirectedPseudograph} diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/CostEstimator.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/CostEstimator.scala similarity index 90% rename from amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/CostEstimator.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/CostEstimator.scala index e14a9f7f6f8..d86101a1f06 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/CostEstimator.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/CostEstimator.scala @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.amber.engine.architecture.scheduling +package org.apache.texera.amber.engine.architecture.scheduling -import org.apache.amber.core.storage.DocumentFactory -import org.apache.amber.core.tuple.Tuple -import org.apache.amber.core.virtualidentity.ActorVirtualIdentity -import org.apache.amber.core.workflow.WorkflowContext -import org.apache.amber.engine.architecture.scheduling.DefaultCostEstimator.DEFAULT_OPERATOR_COST -import org.apache.amber.engine.architecture.scheduling.config.ResourceConfig -import org.apache.amber.engine.architecture.scheduling.resourcePolicies.ResourceAllocator -import org.apache.amber.engine.common.AmberLogging +import org.apache.texera.amber.core.storage.DocumentFactory +import org.apache.texera.amber.core.tuple.Tuple +import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity +import org.apache.texera.amber.core.workflow.WorkflowContext +import org.apache.texera.amber.engine.architecture.scheduling.DefaultCostEstimator.DEFAULT_OPERATOR_COST +import org.apache.texera.amber.engine.architecture.scheduling.config.ResourceConfig +import org.apache.texera.amber.engine.architecture.scheduling.resourcePolicies.ResourceAllocator +import org.apache.texera.amber.engine.common.AmberLogging import org.apache.texera.dao.SqlServer import org.apache.texera.dao.SqlServer.withTransaction import org.apache.texera.dao.jooq.generated.Tables.{WORKFLOW_EXECUTIONS, WORKFLOW_VERSION} diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/ExpansionGreedyScheduleGenerator.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/ExpansionGreedyScheduleGenerator.scala similarity index 97% rename from amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/ExpansionGreedyScheduleGenerator.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/ExpansionGreedyScheduleGenerator.scala index 06dcac3b91c..4bb89338967 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/ExpansionGreedyScheduleGenerator.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/ExpansionGreedyScheduleGenerator.scala @@ -17,20 +17,20 @@ * under the License. */ -package org.apache.amber.engine.architecture.scheduling +package org.apache.texera.amber.engine.architecture.scheduling import com.typesafe.scalalogging.LazyLogging -import org.apache.amber.core.WorkflowRuntimeException -import org.apache.amber.core.storage.VFSURIFactory.createResultURI -import org.apache.amber.core.virtualidentity.PhysicalOpIdentity -import org.apache.amber.core.workflow.{ +import org.apache.texera.amber.core.WorkflowRuntimeException +import org.apache.texera.amber.core.storage.VFSURIFactory.createResultURI +import org.apache.texera.amber.core.virtualidentity.PhysicalOpIdentity +import org.apache.texera.amber.core.workflow.{ GlobalPortIdentity, PhysicalLink, PhysicalPlan, WorkflowContext } -import org.apache.amber.engine.architecture.scheduling.SchedulingUtils.replaceVertex -import org.apache.amber.engine.architecture.scheduling.config.{ +import org.apache.texera.amber.engine.architecture.scheduling.SchedulingUtils.replaceVertex +import org.apache.texera.amber.engine.architecture.scheduling.config.{ IntermediateInputPortConfig, OutputPortConfig, ResourceConfig diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/Region.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/Region.scala similarity index 92% rename from amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/Region.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/Region.scala index d6096c9a299..248a3ece3c1 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/Region.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/Region.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.engine.architecture.scheduling +package org.apache.texera.amber.engine.architecture.scheduling -import org.apache.amber.core.virtualidentity.PhysicalOpIdentity -import org.apache.amber.core.workflow.{GlobalPortIdentity, PhysicalLink, PhysicalOp} -import org.apache.amber.engine.architecture.scheduling.config.ResourceConfig +import org.apache.texera.amber.core.virtualidentity.PhysicalOpIdentity +import org.apache.texera.amber.core.workflow.{GlobalPortIdentity, PhysicalLink, PhysicalOp} +import org.apache.texera.amber.engine.architecture.scheduling.config.ResourceConfig import org.jgrapht.graph.{DefaultEdge, DirectedAcyclicGraph} import org.jgrapht.traverse.TopologicalOrderIterator diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/RegionExecutionCoordinator.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/RegionExecutionCoordinator.scala similarity index 94% rename from amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/RegionExecutionCoordinator.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/RegionExecutionCoordinator.scala index a83af49dde1..7e5b228801f 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/RegionExecutionCoordinator.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/RegionExecutionCoordinator.scala @@ -17,43 +17,43 @@ * under the License. */ -package org.apache.amber.engine.architecture.scheduling +package org.apache.texera.amber.engine.architecture.scheduling import org.apache.pekko.pattern.gracefulStop import com.twitter.util.{Future, Return, Throw} -import org.apache.amber.core.storage.DocumentFactory -import org.apache.amber.core.storage.VFSURIFactory.decodeURI -import org.apache.amber.core.virtualidentity.ActorVirtualIdentity -import org.apache.amber.core.workflow.{GlobalPortIdentity, PhysicalLink, PhysicalOp} -import org.apache.amber.engine.architecture.common.{ +import org.apache.texera.amber.core.storage.DocumentFactory +import org.apache.texera.amber.core.storage.VFSURIFactory.decodeURI +import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity +import org.apache.texera.amber.core.workflow.{GlobalPortIdentity, PhysicalLink, PhysicalOp} +import org.apache.texera.amber.engine.architecture.common.{ AkkaActorRefMappingService, AkkaActorService, ExecutorDeployment } -import org.apache.amber.engine.architecture.controller.execution.{ +import org.apache.texera.amber.engine.architecture.controller.execution.{ OperatorExecution, RegionExecution, WorkflowExecution } -import org.apache.amber.engine.architecture.controller.{ +import org.apache.texera.amber.engine.architecture.controller.{ ControllerConfig, ExecutionStatsUpdate, WorkerAssignmentUpdate } -import org.apache.amber.engine.architecture.rpc.controlcommands._ -import org.apache.amber.engine.architecture.rpc.controlreturns.EmptyReturn -import org.apache.amber.engine.architecture.scheduling.config.{ +import org.apache.texera.amber.engine.architecture.rpc.controlcommands._ +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.EmptyReturn +import org.apache.texera.amber.engine.architecture.scheduling.config.{ InputPortConfig, OperatorConfig, OutputPortConfig, ResourceConfig } -import org.apache.amber.engine.architecture.sendsemantics.partitionings.Partitioning -import org.apache.amber.engine.architecture.worker.statistics.WorkerState -import org.apache.amber.engine.common.AmberLogging -import org.apache.amber.engine.common.FutureBijection._ -import org.apache.amber.engine.common.rpc.AsyncRPCClient -import org.apache.amber.engine.common.virtualidentity.util.CONTROLLER +import org.apache.texera.amber.engine.architecture.sendsemantics.partitionings.Partitioning +import org.apache.texera.amber.engine.architecture.worker.statistics.WorkerState +import org.apache.texera.amber.engine.common.AmberLogging +import org.apache.texera.amber.engine.common.FutureBijection._ +import org.apache.texera.amber.engine.common.rpc.AsyncRPCClient +import org.apache.texera.amber.engine.common.virtualidentity.util.CONTROLLER import org.apache.texera.web.SessionState import org.apache.texera.web.model.websocket.event.RegionStateEvent import org.apache.texera.web.resource.dashboard.user.workflow.WorkflowExecutionsResource diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/RegionPlan.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/RegionPlan.scala similarity index 93% rename from amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/RegionPlan.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/RegionPlan.scala index 561f5dade64..95937517de2 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/RegionPlan.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/RegionPlan.scala @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.amber.engine.architecture.scheduling +package org.apache.texera.amber.engine.architecture.scheduling -import org.apache.amber.core.workflow.{GlobalPortIdentity, PhysicalLink} +import org.apache.texera.amber.core.workflow.{GlobalPortIdentity, PhysicalLink} import org.jgrapht.graph.DirectedAcyclicGraph import org.jgrapht.traverse.TopologicalOrderIterator diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/Schedule.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/Schedule.scala similarity index 95% rename from amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/Schedule.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/Schedule.scala index 421b7aa325a..6f34c9ed1e5 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/Schedule.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/Schedule.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.engine.architecture.scheduling +package org.apache.texera.amber.engine.architecture.scheduling case class Schedule(private val levelSets: Map[Int, Set[Region]]) extends Iterator[Set[Region]] { private var currentLevel = levelSets.keys.minOption.getOrElse(0) diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/ScheduleGenerator.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/ScheduleGenerator.scala similarity index 94% rename from amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/ScheduleGenerator.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/ScheduleGenerator.scala index 76c2c7b705a..0fe8ffc9639 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/ScheduleGenerator.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/ScheduleGenerator.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.engine.architecture.scheduling +package org.apache.texera.amber.engine.architecture.scheduling -import org.apache.amber.config.ApplicationConfig -import org.apache.amber.core.workflow._ -import org.apache.amber.engine.architecture.scheduling.resourcePolicies.{ +import org.apache.texera.amber.config.ApplicationConfig +import org.apache.texera.amber.core.workflow._ +import org.apache.texera.amber.engine.architecture.scheduling.resourcePolicies.{ DefaultResourceAllocator, ExecutionClusterInfo } diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/SchedulingUtils.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/SchedulingUtils.scala similarity index 96% rename from amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/SchedulingUtils.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/SchedulingUtils.scala index e0c13b1987e..72cd2158627 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/SchedulingUtils.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/SchedulingUtils.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.engine.architecture.scheduling +package org.apache.texera.amber.engine.architecture.scheduling import org.jgrapht.graph.DirectedAcyclicGraph diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/WorkflowExecutionCoordinator.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/WorkflowExecutionCoordinator.scala similarity index 89% rename from amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/WorkflowExecutionCoordinator.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/WorkflowExecutionCoordinator.scala index 48cbe3440cf..05585f88d8d 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/WorkflowExecutionCoordinator.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/WorkflowExecutionCoordinator.scala @@ -17,15 +17,18 @@ * under the License. */ -package org.apache.amber.engine.architecture.scheduling +package org.apache.texera.amber.engine.architecture.scheduling import com.twitter.util.Future import com.typesafe.scalalogging.LazyLogging -import org.apache.amber.core.workflow.{GlobalPortIdentity, PhysicalLink} -import org.apache.amber.engine.architecture.common.{AkkaActorRefMappingService, AkkaActorService} -import org.apache.amber.engine.architecture.controller.ControllerConfig -import org.apache.amber.engine.architecture.controller.execution.WorkflowExecution -import org.apache.amber.engine.common.rpc.AsyncRPCClient +import org.apache.texera.amber.core.workflow.{GlobalPortIdentity, PhysicalLink} +import org.apache.texera.amber.engine.architecture.common.{ + AkkaActorRefMappingService, + AkkaActorService +} +import org.apache.texera.amber.engine.architecture.controller.ControllerConfig +import org.apache.texera.amber.engine.architecture.controller.execution.WorkflowExecution +import org.apache.texera.amber.engine.common.rpc.AsyncRPCClient import scala.collection.mutable diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/config/ChannelConfig.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/config/ChannelConfig.scala similarity index 90% rename from amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/config/ChannelConfig.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/config/ChannelConfig.scala index fb1ddcd6fcb..83d4ed985a3 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/config/ChannelConfig.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/config/ChannelConfig.scala @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.amber.engine.architecture.scheduling.config +package org.apache.texera.amber.engine.architecture.scheduling.config -import org.apache.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} -import org.apache.amber.core.workflow._ +import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} +import org.apache.texera.amber.core.workflow._ case object ChannelConfig { def generateChannelConfigs( diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/config/LinkConfig.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/config/LinkConfig.scala similarity index 91% rename from amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/config/LinkConfig.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/config/LinkConfig.scala index 8f45022f225..ef0117834cc 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/config/LinkConfig.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/config/LinkConfig.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.engine.architecture.scheduling.config +package org.apache.texera.amber.engine.architecture.scheduling.config -import org.apache.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} -import org.apache.amber.core.workflow._ -import org.apache.amber.engine.architecture.sendsemantics.partitionings._ +import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} +import org.apache.texera.amber.core.workflow._ +import org.apache.texera.amber.engine.architecture.sendsemantics.partitionings._ case object LinkConfig { def toPartitioning( diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/config/OperatorConfig.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/config/OperatorConfig.scala similarity index 93% rename from amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/config/OperatorConfig.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/config/OperatorConfig.scala index edaf4c41a8c..883a09e4bf0 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/config/OperatorConfig.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/config/OperatorConfig.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.engine.architecture.scheduling.config +package org.apache.texera.amber.engine.architecture.scheduling.config case object OperatorConfig { def empty: OperatorConfig = { diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/config/PortConfig.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/config/PortConfig.scala similarity index 93% rename from amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/config/PortConfig.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/config/PortConfig.scala index e76651eb10a..b4a1e058b44 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/config/PortConfig.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/config/PortConfig.scala @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.amber.engine.architecture.scheduling.config +package org.apache.texera.amber.engine.architecture.scheduling.config -import org.apache.amber.engine.architecture.sendsemantics.partitionings.Partitioning +import org.apache.texera.amber.engine.architecture.sendsemantics.partitionings.Partitioning import java.net.URI diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/config/ResourceConfig.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/config/ResourceConfig.scala similarity index 82% rename from amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/config/ResourceConfig.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/config/ResourceConfig.scala index 9d7a6117f5e..b89ff9a5a91 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/config/ResourceConfig.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/config/ResourceConfig.scala @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.amber.engine.architecture.scheduling.config +package org.apache.texera.amber.engine.architecture.scheduling.config -import org.apache.amber.core.virtualidentity.PhysicalOpIdentity -import org.apache.amber.core.workflow.{GlobalPortIdentity, PhysicalLink} +import org.apache.texera.amber.core.virtualidentity.PhysicalOpIdentity +import org.apache.texera.amber.core.workflow.{GlobalPortIdentity, PhysicalLink} case class ResourceConfig( operatorConfigs: Map[PhysicalOpIdentity, OperatorConfig] = Map.empty, diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/config/WorkerConfig.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/config/WorkerConfig.scala similarity index 83% rename from amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/config/WorkerConfig.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/config/WorkerConfig.scala index 4de0f4301e1..60a55151850 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/config/WorkerConfig.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/config/WorkerConfig.scala @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.amber.engine.architecture.scheduling.config +package org.apache.texera.amber.engine.architecture.scheduling.config -import org.apache.amber.config.ApplicationConfig -import org.apache.amber.core.virtualidentity.ActorVirtualIdentity -import org.apache.amber.core.workflow.PhysicalOp -import org.apache.amber.util.VirtualIdentityUtils +import org.apache.texera.amber.config.ApplicationConfig +import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity +import org.apache.texera.amber.core.workflow.PhysicalOp +import org.apache.texera.amber.util.VirtualIdentityUtils case object WorkerConfig { def generateWorkerConfigs(physicalOp: PhysicalOp): List[WorkerConfig] = { diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/resourcePolicies/ExecutionClusterInfo.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/resourcePolicies/ExecutionClusterInfo.scala similarity index 91% rename from amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/resourcePolicies/ExecutionClusterInfo.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/resourcePolicies/ExecutionClusterInfo.scala index 56939ab1a99..c99121b735e 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/resourcePolicies/ExecutionClusterInfo.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/resourcePolicies/ExecutionClusterInfo.scala @@ -17,6 +17,6 @@ * under the License. */ -package org.apache.amber.engine.architecture.scheduling.resourcePolicies +package org.apache.texera.amber.engine.architecture.scheduling.resourcePolicies class ExecutionClusterInfo() {} diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/resourcePolicies/ResourceAllocator.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/resourcePolicies/ResourceAllocator.scala similarity index 90% rename from amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/resourcePolicies/ResourceAllocator.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/resourcePolicies/ResourceAllocator.scala index 822e199320c..2953ece0b34 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/scheduling/resourcePolicies/ResourceAllocator.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/resourcePolicies/ResourceAllocator.scala @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.amber.engine.architecture.scheduling.resourcePolicies - -import org.apache.amber.core.virtualidentity.PhysicalOpIdentity -import org.apache.amber.core.workflow._ -import org.apache.amber.engine.architecture.scheduling.Region -import org.apache.amber.engine.architecture.scheduling.config.ChannelConfig.generateChannelConfigs -import org.apache.amber.engine.architecture.scheduling.config.LinkConfig.toPartitioning -import org.apache.amber.engine.architecture.scheduling.config.WorkerConfig.generateWorkerConfigs -import org.apache.amber.engine.architecture.scheduling.config._ -import org.apache.amber.engine.architecture.sendsemantics.partitionings.Partitioning -import org.apache.amber.util.VirtualIdentityUtils.getFromActorIdForInputPortStorage +package org.apache.texera.amber.engine.architecture.scheduling.resourcePolicies + +import org.apache.texera.amber.core.virtualidentity.PhysicalOpIdentity +import org.apache.texera.amber.core.workflow._ +import org.apache.texera.amber.engine.architecture.scheduling.Region +import org.apache.texera.amber.engine.architecture.scheduling.config.ChannelConfig.generateChannelConfigs +import org.apache.texera.amber.engine.architecture.scheduling.config.LinkConfig.toPartitioning +import org.apache.texera.amber.engine.architecture.scheduling.config.WorkerConfig.generateWorkerConfigs +import org.apache.texera.amber.engine.architecture.scheduling.config._ +import org.apache.texera.amber.engine.architecture.sendsemantics.partitionings.Partitioning +import org.apache.texera.amber.util.VirtualIdentityUtils.getFromActorIdForInputPortStorage import java.net.URI import scala.collection.mutable diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/sendsemantics/partitioners/BroadcastPartitioner.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/sendsemantics/partitioners/BroadcastPartitioner.scala similarity index 79% rename from amber/src/main/scala/org/apache/amber/engine/architecture/sendsemantics/partitioners/BroadcastPartitioner.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/sendsemantics/partitioners/BroadcastPartitioner.scala index 98f255e1f47..71de92ced60 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/sendsemantics/partitioners/BroadcastPartitioner.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/sendsemantics/partitioners/BroadcastPartitioner.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.engine.architecture.sendsemantics.partitioners +package org.apache.texera.amber.engine.architecture.sendsemantics.partitioners -import org.apache.amber.core.tuple.Tuple -import org.apache.amber.core.virtualidentity.ActorVirtualIdentity -import org.apache.amber.engine.architecture.sendsemantics.partitionings.BroadcastPartitioning +import org.apache.texera.amber.core.tuple.Tuple +import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity +import org.apache.texera.amber.engine.architecture.sendsemantics.partitionings.BroadcastPartitioning case class BroadcastPartitioner(partitioning: BroadcastPartitioning) extends Partitioner { diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/sendsemantics/partitioners/HashBasedShufflePartitioner.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/sendsemantics/partitioners/HashBasedShufflePartitioner.scala similarity index 82% rename from amber/src/main/scala/org/apache/amber/engine/architecture/sendsemantics/partitioners/HashBasedShufflePartitioner.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/sendsemantics/partitioners/HashBasedShufflePartitioner.scala index b02e5d016fd..7025a4bd2cf 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/sendsemantics/partitioners/HashBasedShufflePartitioner.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/sendsemantics/partitioners/HashBasedShufflePartitioner.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.engine.architecture.sendsemantics.partitioners +package org.apache.texera.amber.engine.architecture.sendsemantics.partitioners -import org.apache.amber.core.tuple.Tuple -import org.apache.amber.core.virtualidentity.ActorVirtualIdentity -import org.apache.amber.engine.architecture.sendsemantics.partitionings.HashBasedShufflePartitioning +import org.apache.texera.amber.core.tuple.Tuple +import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity +import org.apache.texera.amber.engine.architecture.sendsemantics.partitionings.HashBasedShufflePartitioning case class HashBasedShufflePartitioner(partitioning: HashBasedShufflePartitioning) extends Partitioner { diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/sendsemantics/partitioners/OneToOnePartitioner.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/sendsemantics/partitioners/OneToOnePartitioner.scala similarity index 79% rename from amber/src/main/scala/org/apache/amber/engine/architecture/sendsemantics/partitioners/OneToOnePartitioner.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/sendsemantics/partitioners/OneToOnePartitioner.scala index ca459bc570a..f1360f8be4a 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/sendsemantics/partitioners/OneToOnePartitioner.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/sendsemantics/partitioners/OneToOnePartitioner.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.engine.architecture.sendsemantics.partitioners +package org.apache.texera.amber.engine.architecture.sendsemantics.partitioners -import org.apache.amber.core.tuple.Tuple -import org.apache.amber.core.virtualidentity.ActorVirtualIdentity -import org.apache.amber.engine.architecture.sendsemantics.partitionings.OneToOnePartitioning +import org.apache.texera.amber.core.tuple.Tuple +import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity +import org.apache.texera.amber.engine.architecture.sendsemantics.partitionings.OneToOnePartitioning case class OneToOnePartitioner(partitioning: OneToOnePartitioning, actorId: ActorVirtualIdentity) extends Partitioner { diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/sendsemantics/partitioners/Partitioner.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/sendsemantics/partitioners/Partitioner.scala similarity index 77% rename from amber/src/main/scala/org/apache/amber/engine/architecture/sendsemantics/partitioners/Partitioner.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/sendsemantics/partitioners/Partitioner.scala index 8b8394d7452..eac77bce365 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/sendsemantics/partitioners/Partitioner.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/sendsemantics/partitioners/Partitioner.scala @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.amber.engine.architecture.sendsemantics.partitioners +package org.apache.texera.amber.engine.architecture.sendsemantics.partitioners -import org.apache.amber.config.ApplicationConfig -import org.apache.amber.core.state.State -import org.apache.amber.core.tuple.Tuple -import org.apache.amber.core.virtualidentity.ActorVirtualIdentity -import org.apache.amber.engine.architecture.messaginglayer.NetworkOutputGateway -import org.apache.amber.engine.common.ambermessage.{DataFrame, StateFrame} +import org.apache.texera.amber.config.ApplicationConfig +import org.apache.texera.amber.core.state.State +import org.apache.texera.amber.core.tuple.Tuple +import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity +import org.apache.texera.amber.engine.architecture.messaginglayer.NetworkOutputGateway +import org.apache.texera.amber.engine.common.ambermessage.{DataFrame, StateFrame} import scala.collection.mutable.ArrayBuffer diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/sendsemantics/partitioners/RangeBasedShufflePartitioner.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/sendsemantics/partitioners/RangeBasedShufflePartitioner.scala similarity index 86% rename from amber/src/main/scala/org/apache/amber/engine/architecture/sendsemantics/partitioners/RangeBasedShufflePartitioner.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/sendsemantics/partitioners/RangeBasedShufflePartitioner.scala index 8a7259094b4..9b8aae263f1 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/sendsemantics/partitioners/RangeBasedShufflePartitioner.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/sendsemantics/partitioners/RangeBasedShufflePartitioner.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.engine.architecture.sendsemantics.partitioners +package org.apache.texera.amber.engine.architecture.sendsemantics.partitioners -import org.apache.amber.core.tuple.{AttributeType, Tuple} -import org.apache.amber.core.virtualidentity.ActorVirtualIdentity -import org.apache.amber.engine.architecture.sendsemantics.partitionings.RangeBasedShufflePartitioning +import org.apache.texera.amber.core.tuple.{AttributeType, Tuple} +import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity +import org.apache.texera.amber.engine.architecture.sendsemantics.partitionings.RangeBasedShufflePartitioning case class RangeBasedShufflePartitioner(partitioning: RangeBasedShufflePartitioning) extends Partitioner { diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/sendsemantics/partitioners/RoundRobinPartitioner.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/sendsemantics/partitioners/RoundRobinPartitioner.scala similarity index 80% rename from amber/src/main/scala/org/apache/amber/engine/architecture/sendsemantics/partitioners/RoundRobinPartitioner.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/sendsemantics/partitioners/RoundRobinPartitioner.scala index 63af7a71c29..185f2e5e3ac 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/sendsemantics/partitioners/RoundRobinPartitioner.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/sendsemantics/partitioners/RoundRobinPartitioner.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.engine.architecture.sendsemantics.partitioners +package org.apache.texera.amber.engine.architecture.sendsemantics.partitioners -import org.apache.amber.core.tuple.Tuple -import org.apache.amber.core.virtualidentity.ActorVirtualIdentity -import org.apache.amber.engine.architecture.sendsemantics.partitionings.RoundRobinPartitioning +import org.apache.texera.amber.core.tuple.Tuple +import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity +import org.apache.texera.amber.engine.architecture.sendsemantics.partitionings.RoundRobinPartitioning case class RoundRobinPartitioner(partitioning: RoundRobinPartitioning) extends Partitioner { private var roundRobinIndex = 0 diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/DPThread.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/DPThread.scala similarity index 89% rename from amber/src/main/scala/org/apache/amber/engine/architecture/worker/DPThread.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/DPThread.scala index 3865cae91ef..0c136d613a5 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/DPThread.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/DPThread.scala @@ -17,25 +17,28 @@ * under the License. */ -package org.apache.amber.engine.architecture.worker +package org.apache.texera.amber.engine.architecture.worker -import org.apache.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} -import org.apache.amber.engine.architecture.logreplay.ReplayLogManager -import org.apache.amber.engine.architecture.rpc.controlcommands.EmbeddedControlMessage -import org.apache.amber.engine.architecture.worker.WorkflowWorker.{ +import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} +import org.apache.texera.amber.engine.architecture.logreplay.ReplayLogManager +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.EmbeddedControlMessage +import org.apache.texera.amber.engine.architecture.worker.WorkflowWorker.{ DPInputQueueElement, MainThreadDelegateMessage } -import org.apache.amber.engine.architecture.worker.statistics.WorkerState.{READY, UNINITIALIZED} -import org.apache.amber.engine.common.AmberLogging -import org.apache.amber.engine.common.actormessage.{ActorCommand, Backpressure} -import org.apache.amber.engine.common.ambermessage.{ +import org.apache.texera.amber.engine.architecture.worker.statistics.WorkerState.{ + READY, + UNINITIALIZED +} +import org.apache.texera.amber.engine.common.AmberLogging +import org.apache.texera.amber.engine.common.actormessage.{ActorCommand, Backpressure} +import org.apache.texera.amber.engine.common.ambermessage.{ DataPayload, DirectControlMessagePayload, WorkflowFIFOMessage } -import org.apache.amber.engine.common.virtualidentity.util.SELF -import org.apache.amber.error.ErrorUtils.safely +import org.apache.texera.amber.engine.common.virtualidentity.util.SELF +import org.apache.texera.amber.error.ErrorUtils.safely import java.util.concurrent._ diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/DataProcessor.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/DataProcessor.scala similarity index 86% rename from amber/src/main/scala/org/apache/amber/engine/architecture/worker/DataProcessor.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/DataProcessor.scala index e97bfe19ed8..3aa5fa90a46 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/DataProcessor.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/DataProcessor.scala @@ -17,48 +17,48 @@ * under the License. */ -package org.apache.amber.engine.architecture.worker +package org.apache.texera.amber.engine.architecture.worker import com.softwaremill.macwire.wire import io.grpc.MethodDescriptor -import org.apache.amber.core.executor.OperatorExecutor -import org.apache.amber.core.state.State -import org.apache.amber.core.tuple._ -import org.apache.amber.core.virtualidentity.{ +import org.apache.texera.amber.core.executor.OperatorExecutor +import org.apache.texera.amber.core.state.State +import org.apache.texera.amber.core.tuple._ +import org.apache.texera.amber.core.virtualidentity.{ ActorVirtualIdentity, ChannelIdentity, EmbeddedControlMessageIdentity } -import org.apache.amber.core.workflow.PortIdentity -import org.apache.amber.engine.architecture.common.AmberProcessor -import org.apache.amber.engine.architecture.logreplay.ReplayLogManager -import org.apache.amber.engine.architecture.messaginglayer.{ +import org.apache.texera.amber.core.workflow.PortIdentity +import org.apache.texera.amber.engine.architecture.common.AmberProcessor +import org.apache.texera.amber.engine.architecture.logreplay.ReplayLogManager +import org.apache.texera.amber.engine.architecture.messaginglayer.{ InputManager, OutputManager, WorkerTimerService } -import org.apache.amber.engine.architecture.rpc.controlcommands.EmbeddedControlMessageType.{ +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.EmbeddedControlMessageType.{ NO_ALIGNMENT, PORT_ALIGNMENT } -import org.apache.amber.engine.architecture.rpc.controlcommands._ -import org.apache.amber.engine.architecture.rpc.controlreturns.EmptyReturn -import org.apache.amber.engine.architecture.rpc.workerservice.WorkerServiceGrpc.METHOD_END_CHANNEL -import org.apache.amber.engine.architecture.worker.WorkflowWorker.{ +import org.apache.texera.amber.engine.architecture.rpc.controlcommands._ +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.EmptyReturn +import org.apache.texera.amber.engine.architecture.rpc.workerservice.WorkerServiceGrpc.METHOD_END_CHANNEL +import org.apache.texera.amber.engine.architecture.worker.WorkflowWorker.{ DPInputQueueElement, MainThreadDelegateMessage } -import org.apache.amber.engine.architecture.worker.managers.SerializationManager -import org.apache.amber.engine.architecture.worker.statistics.WorkerState.{ +import org.apache.texera.amber.engine.architecture.worker.managers.SerializationManager +import org.apache.texera.amber.engine.architecture.worker.statistics.WorkerState.{ COMPLETED, READY, RUNNING } -import org.apache.amber.engine.architecture.worker.statistics.WorkerStatistics -import org.apache.amber.engine.common.ambermessage._ -import org.apache.amber.engine.common.statetransition.WorkerStateManager -import org.apache.amber.engine.common.virtualidentity.util.CONTROLLER -import org.apache.amber.error.ErrorUtils.{mkConsoleMessage, safely} +import org.apache.texera.amber.engine.architecture.worker.statistics.WorkerStatistics +import org.apache.texera.amber.engine.common.ambermessage._ +import org.apache.texera.amber.engine.common.statetransition.WorkerStateManager +import org.apache.texera.amber.engine.common.virtualidentity.util.CONTROLLER +import org.apache.texera.amber.error.ErrorUtils.{mkConsoleMessage, safely} import java.util.concurrent.LinkedBlockingQueue diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/DataProcessorRPCHandlerInitializer.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/DataProcessorRPCHandlerInitializer.scala similarity index 78% rename from amber/src/main/scala/org/apache/amber/engine/architecture/worker/DataProcessorRPCHandlerInitializer.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/DataProcessorRPCHandlerInitializer.scala index 11fcc77add2..2abcdf66975 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/DataProcessorRPCHandlerInitializer.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/DataProcessorRPCHandlerInitializer.scala @@ -17,21 +17,21 @@ * under the License. */ -package org.apache.amber.engine.architecture.worker +package org.apache.texera.amber.engine.architecture.worker import com.twitter.util.Future -import org.apache.amber.core.virtualidentity.ActorVirtualIdentity -import org.apache.amber.engine.architecture.rpc.controlcommands.{ +import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{ AsyncRPCContext, DebugCommandRequest, EmptyRequest, EvaluatePythonExpressionRequest } -import org.apache.amber.engine.architecture.rpc.controlreturns.{EmptyReturn, EvaluatedValue} -import org.apache.amber.engine.architecture.rpc.workerservice.WorkerServiceFs2Grpc -import org.apache.amber.engine.architecture.worker.promisehandlers._ -import org.apache.amber.engine.common.AmberLogging -import org.apache.amber.engine.common.rpc.AsyncRPCHandlerInitializer +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.{EmptyReturn, EvaluatedValue} +import org.apache.texera.amber.engine.architecture.rpc.workerservice.WorkerServiceFs2Grpc +import org.apache.texera.amber.engine.architecture.worker.promisehandlers._ +import org.apache.texera.amber.engine.common.AmberLogging +import org.apache.texera.amber.engine.common.rpc.AsyncRPCHandlerInitializer class DataProcessorRPCHandlerInitializer(val dp: DataProcessor) extends AsyncRPCHandlerInitializer(dp.asyncRPCClient, dp.asyncRPCServer) diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/EmbeddedControlMessageManager.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/EmbeddedControlMessageManager.scala similarity index 87% rename from amber/src/main/scala/org/apache/amber/engine/architecture/worker/EmbeddedControlMessageManager.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/EmbeddedControlMessageManager.scala index 3f731a4e535..2837c11d80d 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/EmbeddedControlMessageManager.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/EmbeddedControlMessageManager.scala @@ -17,21 +17,21 @@ * under the License. */ -package org.apache.amber.engine.architecture.worker +package org.apache.texera.amber.engine.architecture.worker -import org.apache.amber.core.virtualidentity.{ +import org.apache.texera.amber.core.virtualidentity.{ ActorVirtualIdentity, ChannelIdentity, EmbeddedControlMessageIdentity } -import org.apache.amber.engine.architecture.messaginglayer.{InputGateway, InputManager} -import org.apache.amber.engine.architecture.rpc.controlcommands.EmbeddedControlMessage -import org.apache.amber.engine.architecture.rpc.controlcommands.EmbeddedControlMessageType.{ +import org.apache.texera.amber.engine.architecture.messaginglayer.{InputGateway, InputManager} +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.EmbeddedControlMessage +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.EmbeddedControlMessageType.{ ALL_ALIGNMENT, NO_ALIGNMENT, PORT_ALIGNMENT } -import org.apache.amber.engine.common.{AmberLogging, CheckpointState} +import org.apache.texera.amber.engine.common.{AmberLogging, CheckpointState} import scala.collection.mutable diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/PauseManager.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/PauseManager.scala similarity index 89% rename from amber/src/main/scala/org/apache/amber/engine/architecture/worker/PauseManager.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/PauseManager.scala index b70f5af680f..80cf9c1415d 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/PauseManager.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/PauseManager.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.engine.architecture.worker +package org.apache.texera.amber.engine.architecture.worker -import org.apache.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} -import org.apache.amber.engine.architecture.messaginglayer.InputGateway -import org.apache.amber.engine.common.AmberLogging +import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} +import org.apache.texera.amber.engine.architecture.messaginglayer.InputGateway +import org.apache.texera.amber.engine.common.AmberLogging import scala.collection.mutable diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/PauseType.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/PauseType.scala similarity index 88% rename from amber/src/main/scala/org/apache/amber/engine/architecture/worker/PauseType.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/PauseType.scala index 64d4edc5bb0..30671b094c5 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/PauseType.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/PauseType.scala @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.amber.engine.architecture.worker +package org.apache.texera.amber.engine.architecture.worker -import org.apache.amber.core.virtualidentity.EmbeddedControlMessageIdentity +import org.apache.texera.amber.core.virtualidentity.EmbeddedControlMessageIdentity sealed trait PauseType diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/WorkflowWorker.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/WorkflowWorker.scala similarity index 85% rename from amber/src/main/scala/org/apache/amber/engine/architecture/worker/WorkflowWorker.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/WorkflowWorker.scala index 9d780e29fa3..d1a0a300d93 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/WorkflowWorker.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/WorkflowWorker.scala @@ -17,21 +17,24 @@ * under the License. */ -package org.apache.amber.engine.architecture.worker +package org.apache.texera.amber.engine.architecture.worker import org.apache.pekko.actor.Props -import org.apache.amber.core.virtualidentity.{ChannelIdentity, EmbeddedControlMessageIdentity} -import org.apache.amber.engine.architecture.common.WorkflowActor -import org.apache.amber.engine.architecture.common.WorkflowActor.NetworkAck -import org.apache.amber.engine.architecture.controller.ReplayStatusUpdate -import org.apache.amber.engine.architecture.messaginglayer.WorkerTimerService -import org.apache.amber.engine.architecture.rpc.controlcommands.ControlInvocation -import org.apache.amber.engine.architecture.scheduling.config.WorkerConfig -import org.apache.amber.engine.architecture.worker.WorkflowWorker._ -import org.apache.amber.engine.common.actormessage.{ActorCommand, Backpressure} -import org.apache.amber.engine.common.ambermessage.WorkflowFIFOMessage -import org.apache.amber.engine.common.ambermessage.WorkflowMessage.getInMemSize -import org.apache.amber.engine.common.{CheckpointState, SerializedState} +import org.apache.texera.amber.core.virtualidentity.{ + ChannelIdentity, + EmbeddedControlMessageIdentity +} +import org.apache.texera.amber.engine.architecture.common.WorkflowActor +import org.apache.texera.amber.engine.architecture.common.WorkflowActor.NetworkAck +import org.apache.texera.amber.engine.architecture.controller.ReplayStatusUpdate +import org.apache.texera.amber.engine.architecture.messaginglayer.WorkerTimerService +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.ControlInvocation +import org.apache.texera.amber.engine.architecture.scheduling.config.WorkerConfig +import org.apache.texera.amber.engine.architecture.worker.WorkflowWorker._ +import org.apache.texera.amber.engine.common.actormessage.{ActorCommand, Backpressure} +import org.apache.texera.amber.engine.common.ambermessage.WorkflowFIFOMessage +import org.apache.texera.amber.engine.common.ambermessage.WorkflowMessage.getInMemSize +import org.apache.texera.amber.engine.common.{CheckpointState, SerializedState} import java.net.URI import java.util.concurrent.LinkedBlockingQueue diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/managers/InputPortMaterializationReaderThread.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/managers/InputPortMaterializationReaderThread.scala similarity index 80% rename from amber/src/main/scala/org/apache/amber/engine/architecture/worker/managers/InputPortMaterializationReaderThread.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/managers/InputPortMaterializationReaderThread.scala index efb6f6c2437..10fbbc44a2c 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/managers/InputPortMaterializationReaderThread.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/managers/InputPortMaterializationReaderThread.scala @@ -17,36 +17,36 @@ * under the License. */ -package org.apache.amber.engine.architecture.worker.managers +package org.apache.texera.amber.engine.architecture.worker.managers import io.grpc.MethodDescriptor -import org.apache.amber.config.ApplicationConfig -import org.apache.amber.core.storage.DocumentFactory -import org.apache.amber.core.storage.model.VirtualDocument -import org.apache.amber.core.tuple.Tuple -import org.apache.amber.core.virtualidentity.{ +import org.apache.texera.amber.config.ApplicationConfig +import org.apache.texera.amber.core.storage.DocumentFactory +import org.apache.texera.amber.core.storage.model.VirtualDocument +import org.apache.texera.amber.core.tuple.Tuple +import org.apache.texera.amber.core.virtualidentity.{ ActorVirtualIdentity, ChannelIdentity, EmbeddedControlMessageIdentity } -import org.apache.amber.engine.architecture.messaginglayer.OutputManager.toPartitioner -import org.apache.amber.engine.architecture.rpc.controlcommands.EmbeddedControlMessageType.{ +import org.apache.texera.amber.engine.architecture.messaginglayer.OutputManager.toPartitioner +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.EmbeddedControlMessageType.{ NO_ALIGNMENT, PORT_ALIGNMENT } -import org.apache.amber.engine.architecture.rpc.controlcommands._ -import org.apache.amber.engine.architecture.rpc.controlreturns.EmptyReturn -import org.apache.amber.engine.architecture.rpc.workerservice.WorkerServiceGrpc.{ +import org.apache.texera.amber.engine.architecture.rpc.controlcommands._ +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.EmptyReturn +import org.apache.texera.amber.engine.architecture.rpc.workerservice.WorkerServiceGrpc.{ METHOD_END_CHANNEL, METHOD_START_CHANNEL } -import org.apache.amber.engine.architecture.sendsemantics.partitionings.Partitioning -import org.apache.amber.engine.architecture.worker.WorkflowWorker.{ +import org.apache.texera.amber.engine.architecture.sendsemantics.partitionings.Partitioning +import org.apache.texera.amber.engine.architecture.worker.WorkflowWorker.{ DPInputQueueElement, FIFOMessageElement } -import org.apache.amber.engine.common.ambermessage.{DataFrame, WorkflowFIFOMessage} -import org.apache.amber.util.VirtualIdentityUtils.getFromActorIdForInputPortStorage +import org.apache.texera.amber.engine.common.ambermessage.{DataFrame, WorkflowFIFOMessage} +import org.apache.texera.amber.util.VirtualIdentityUtils.getFromActorIdForInputPortStorage import java.net.URI import java.util.concurrent.LinkedBlockingQueue diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/managers/OutputPortResultWriterThread.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/managers/OutputPortResultWriterThread.scala similarity index 89% rename from amber/src/main/scala/org/apache/amber/engine/architecture/worker/managers/OutputPortResultWriterThread.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/managers/OutputPortResultWriterThread.scala index 80ff5d3ca25..28e5d2af667 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/managers/OutputPortResultWriterThread.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/managers/OutputPortResultWriterThread.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.engine.architecture.worker.managers +package org.apache.texera.amber.engine.architecture.worker.managers import com.google.common.collect.Queues -import org.apache.amber.core.storage.model.BufferedItemWriter -import org.apache.amber.core.tuple.Tuple +import org.apache.texera.amber.core.storage.model.BufferedItemWriter +import org.apache.texera.amber.core.tuple.Tuple import java.util.concurrent.LinkedBlockingQueue diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/managers/SerializationManager.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/managers/SerializationManager.scala similarity index 79% rename from amber/src/main/scala/org/apache/amber/engine/architecture/worker/managers/SerializationManager.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/managers/SerializationManager.scala index b880f3f910c..b4afe510306 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/managers/SerializationManager.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/managers/SerializationManager.scala @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.amber.engine.architecture.worker.managers +package org.apache.texera.amber.engine.architecture.worker.managers -import org.apache.amber.core.executor._ -import org.apache.amber.core.tuple.TupleLike -import org.apache.amber.core.virtualidentity.ActorVirtualIdentity -import org.apache.amber.core.workflow.PortIdentity -import org.apache.amber.engine.architecture.rpc.controlcommands.InitializeExecutorRequest -import org.apache.amber.engine.common.{AmberLogging, CheckpointState, CheckpointSupport} -import org.apache.amber.util.VirtualIdentityUtils +import org.apache.texera.amber.core.executor._ +import org.apache.texera.amber.core.tuple.TupleLike +import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity +import org.apache.texera.amber.core.workflow.PortIdentity +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.InitializeExecutorRequest +import org.apache.texera.amber.engine.common.{AmberLogging, CheckpointState, CheckpointSupport} +import org.apache.texera.amber.util.VirtualIdentityUtils class SerializationManager(val actorId: ActorVirtualIdentity) extends AmberLogging { diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/managers/StatisticsManager.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/managers/StatisticsManager.scala similarity index 94% rename from amber/src/main/scala/org/apache/amber/engine/architecture/worker/managers/StatisticsManager.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/managers/StatisticsManager.scala index 24fdbc14d47..8ae0419f0a3 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/managers/StatisticsManager.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/managers/StatisticsManager.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.engine.architecture.worker.managers +package org.apache.texera.amber.engine.architecture.worker.managers -import org.apache.amber.core.executor.OperatorExecutor -import org.apache.amber.core.workflow.PortIdentity -import org.apache.amber.engine.architecture.worker.statistics.{ +import org.apache.texera.amber.core.executor.OperatorExecutor +import org.apache.texera.amber.core.workflow.PortIdentity +import org.apache.texera.amber.engine.architecture.worker.statistics.{ PortTupleMetricsMapping, TupleMetrics, WorkerStatistics diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/promisehandlers/AddInputChannelHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/AddInputChannelHandler.scala similarity index 74% rename from amber/src/main/scala/org/apache/amber/engine/architecture/worker/promisehandlers/AddInputChannelHandler.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/AddInputChannelHandler.scala index 4ba7ba2faa8..685f244aeee 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/promisehandlers/AddInputChannelHandler.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/AddInputChannelHandler.scala @@ -17,16 +17,20 @@ * under the License. */ -package org.apache.amber.engine.architecture.worker.promisehandlers +package org.apache.texera.amber.engine.architecture.worker.promisehandlers import com.twitter.util.Future -import org.apache.amber.engine.architecture.rpc.controlcommands.{ +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{ AddInputChannelRequest, AsyncRPCContext } -import org.apache.amber.engine.architecture.rpc.controlreturns.EmptyReturn -import org.apache.amber.engine.architecture.worker.DataProcessorRPCHandlerInitializer -import org.apache.amber.engine.architecture.worker.statistics.WorkerState.{PAUSED, READY, RUNNING} +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.EmptyReturn +import org.apache.texera.amber.engine.architecture.worker.DataProcessorRPCHandlerInitializer +import org.apache.texera.amber.engine.architecture.worker.statistics.WorkerState.{ + PAUSED, + READY, + RUNNING +} trait AddInputChannelHandler { this: DataProcessorRPCHandlerInitializer => diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/promisehandlers/AddPartitioningHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/AddPartitioningHandler.scala similarity index 74% rename from amber/src/main/scala/org/apache/amber/engine/architecture/worker/promisehandlers/AddPartitioningHandler.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/AddPartitioningHandler.scala index f6bb5fce6cc..c2da82214bd 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/promisehandlers/AddPartitioningHandler.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/AddPartitioningHandler.scala @@ -17,16 +17,20 @@ * under the License. */ -package org.apache.amber.engine.architecture.worker.promisehandlers +package org.apache.texera.amber.engine.architecture.worker.promisehandlers import com.twitter.util.Future -import org.apache.amber.engine.architecture.rpc.controlcommands.{ +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{ AddPartitioningRequest, AsyncRPCContext } -import org.apache.amber.engine.architecture.rpc.controlreturns.EmptyReturn -import org.apache.amber.engine.architecture.worker.DataProcessorRPCHandlerInitializer -import org.apache.amber.engine.architecture.worker.statistics.WorkerState.{PAUSED, READY, RUNNING} +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.EmptyReturn +import org.apache.texera.amber.engine.architecture.worker.DataProcessorRPCHandlerInitializer +import org.apache.texera.amber.engine.architecture.worker.statistics.WorkerState.{ + PAUSED, + READY, + RUNNING +} trait AddPartitioningHandler { this: DataProcessorRPCHandlerInitializer => diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/promisehandlers/AssignPortHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/AssignPortHandler.scala similarity index 75% rename from amber/src/main/scala/org/apache/amber/engine/architecture/worker/promisehandlers/AssignPortHandler.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/AssignPortHandler.scala index e508421c499..fe959733abb 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/promisehandlers/AssignPortHandler.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/AssignPortHandler.scala @@ -17,16 +17,23 @@ * under the License. */ -package org.apache.amber.engine.architecture.worker.promisehandlers +package org.apache.texera.amber.engine.architecture.worker.promisehandlers import com.twitter.util.Future -import org.apache.amber.core.tuple.Schema -import org.apache.amber.core.virtualidentity.ChannelIdentity -import org.apache.amber.engine.architecture.rpc.controlcommands.{AssignPortRequest, AsyncRPCContext} -import org.apache.amber.engine.architecture.rpc.controlreturns.EmptyReturn -import org.apache.amber.engine.architecture.worker.DataProcessorRPCHandlerInitializer -import org.apache.amber.engine.architecture.worker.statistics.WorkerState.{PAUSED, READY, RUNNING} -import org.apache.amber.util.VirtualIdentityUtils.getFromActorIdForInputPortStorage +import org.apache.texera.amber.core.tuple.Schema +import org.apache.texera.amber.core.virtualidentity.ChannelIdentity +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{ + AssignPortRequest, + AsyncRPCContext +} +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.EmptyReturn +import org.apache.texera.amber.engine.architecture.worker.DataProcessorRPCHandlerInitializer +import org.apache.texera.amber.engine.architecture.worker.statistics.WorkerState.{ + PAUSED, + READY, + RUNNING +} +import org.apache.texera.amber.util.VirtualIdentityUtils.getFromActorIdForInputPortStorage import java.net.URI diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/promisehandlers/EndChannelHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/EndChannelHandler.scala similarity index 82% rename from amber/src/main/scala/org/apache/amber/engine/architecture/worker/promisehandlers/EndChannelHandler.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/EndChannelHandler.scala index 4bb37e2ff28..7794342690b 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/promisehandlers/EndChannelHandler.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/EndChannelHandler.scala @@ -17,14 +17,17 @@ * under the License. */ -package org.apache.amber.engine.architecture.worker.promisehandlers +package org.apache.texera.amber.engine.architecture.worker.promisehandlers import com.twitter.util.Future -import org.apache.amber.core.tuple.FinalizePort -import org.apache.amber.engine.architecture.rpc.controlcommands.{AsyncRPCContext, EmptyRequest} -import org.apache.amber.engine.architecture.rpc.controlreturns.EmptyReturn -import org.apache.amber.engine.architecture.worker.DataProcessorRPCHandlerInitializer -import org.apache.amber.error.ErrorUtils.safely +import org.apache.texera.amber.core.tuple.FinalizePort +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{ + AsyncRPCContext, + EmptyRequest +} +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.EmptyReturn +import org.apache.texera.amber.engine.architecture.worker.DataProcessorRPCHandlerInitializer +import org.apache.texera.amber.error.ErrorUtils.safely trait EndChannelHandler { this: DataProcessorRPCHandlerInitializer => diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/promisehandlers/EndHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/EndHandler.scala similarity index 83% rename from amber/src/main/scala/org/apache/amber/engine/architecture/worker/promisehandlers/EndHandler.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/EndHandler.scala index c9e06ad9152..2a6a20b3d3e 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/promisehandlers/EndHandler.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/EndHandler.scala @@ -17,12 +17,15 @@ * under the License. */ -package org.apache.amber.engine.architecture.worker.promisehandlers +package org.apache.texera.amber.engine.architecture.worker.promisehandlers import com.twitter.util.Future -import org.apache.amber.engine.architecture.rpc.controlcommands.{AsyncRPCContext, EmptyRequest} -import org.apache.amber.engine.architecture.rpc.controlreturns.EmptyReturn -import org.apache.amber.engine.architecture.worker.DataProcessorRPCHandlerInitializer +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{ + AsyncRPCContext, + EmptyRequest +} +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.EmptyReturn +import org.apache.texera.amber.engine.architecture.worker.DataProcessorRPCHandlerInitializer /** * The EndWorker control messages is needed to ensure all the other control messages in a worker diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/promisehandlers/FinalizeCheckpointHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/FinalizeCheckpointHandler.scala similarity index 83% rename from amber/src/main/scala/org/apache/amber/engine/architecture/worker/promisehandlers/FinalizeCheckpointHandler.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/FinalizeCheckpointHandler.scala index c787b5bef0a..96d7b4dfaff 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/promisehandlers/FinalizeCheckpointHandler.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/FinalizeCheckpointHandler.scala @@ -17,21 +17,21 @@ * under the License. */ -package org.apache.amber.engine.architecture.worker.promisehandlers +package org.apache.texera.amber.engine.architecture.worker.promisehandlers import com.twitter.util.Future -import org.apache.amber.engine.architecture.rpc.controlcommands.{ +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{ AsyncRPCContext, FinalizeCheckpointRequest } -import org.apache.amber.engine.architecture.rpc.controlreturns.FinalizeCheckpointResponse -import org.apache.amber.engine.architecture.worker.WorkflowWorker.MainThreadDelegateMessage -import org.apache.amber.engine.architecture.worker.{ +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.FinalizeCheckpointResponse +import org.apache.texera.amber.engine.architecture.worker.WorkflowWorker.MainThreadDelegateMessage +import org.apache.texera.amber.engine.architecture.worker.{ DataProcessorRPCHandlerInitializer, WorkflowWorker } -import org.apache.amber.engine.common.storage.SequentialRecordStorage -import org.apache.amber.engine.common.{CheckpointState, CheckpointSupport, SerializedState} +import org.apache.texera.amber.engine.common.storage.SequentialRecordStorage +import org.apache.texera.amber.engine.common.{CheckpointState, CheckpointSupport, SerializedState} import java.net.URI import java.util.concurrent.CompletableFuture diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/promisehandlers/FlushNetworkBufferHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/FlushNetworkBufferHandler.scala similarity index 75% rename from amber/src/main/scala/org/apache/amber/engine/architecture/worker/promisehandlers/FlushNetworkBufferHandler.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/FlushNetworkBufferHandler.scala index 201deb1421c..446ac5b3cdc 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/promisehandlers/FlushNetworkBufferHandler.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/FlushNetworkBufferHandler.scala @@ -17,12 +17,15 @@ * under the License. */ -package org.apache.amber.engine.architecture.worker.promisehandlers +package org.apache.texera.amber.engine.architecture.worker.promisehandlers import com.twitter.util.Future -import org.apache.amber.engine.architecture.rpc.controlcommands.{AsyncRPCContext, EmptyRequest} -import org.apache.amber.engine.architecture.rpc.controlreturns.EmptyReturn -import org.apache.amber.engine.architecture.worker.DataProcessorRPCHandlerInitializer +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{ + AsyncRPCContext, + EmptyRequest +} +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.EmptyReturn +import org.apache.texera.amber.engine.architecture.worker.DataProcessorRPCHandlerInitializer trait FlushNetworkBufferHandler { this: DataProcessorRPCHandlerInitializer => diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/promisehandlers/InitializeExecutorHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/InitializeExecutorHandler.scala similarity index 78% rename from amber/src/main/scala/org/apache/amber/engine/architecture/worker/promisehandlers/InitializeExecutorHandler.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/InitializeExecutorHandler.scala index 32a718606cb..bf45d8eff9a 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/promisehandlers/InitializeExecutorHandler.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/InitializeExecutorHandler.scala @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.amber.engine.architecture.worker.promisehandlers +package org.apache.texera.amber.engine.architecture.worker.promisehandlers import com.twitter.util.Future -import org.apache.amber.core.executor._ -import org.apache.amber.engine.architecture.rpc.controlcommands.{ +import org.apache.texera.amber.core.executor._ +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{ AsyncRPCContext, InitializeExecutorRequest } -import org.apache.amber.engine.architecture.rpc.controlreturns.EmptyReturn -import org.apache.amber.engine.architecture.worker.DataProcessorRPCHandlerInitializer -import org.apache.amber.operator.source.cache.CacheSourceOpExec -import org.apache.amber.util.VirtualIdentityUtils +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.EmptyReturn +import org.apache.texera.amber.engine.architecture.worker.DataProcessorRPCHandlerInitializer +import org.apache.texera.amber.operator.source.cache.CacheSourceOpExec +import org.apache.texera.amber.util.VirtualIdentityUtils import java.net.URI diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/promisehandlers/OpenExecutorHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/OpenExecutorHandler.scala similarity index 74% rename from amber/src/main/scala/org/apache/amber/engine/architecture/worker/promisehandlers/OpenExecutorHandler.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/OpenExecutorHandler.scala index 4f4fab38d99..81298a58d88 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/promisehandlers/OpenExecutorHandler.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/OpenExecutorHandler.scala @@ -17,12 +17,15 @@ * under the License. */ -package org.apache.amber.engine.architecture.worker.promisehandlers +package org.apache.texera.amber.engine.architecture.worker.promisehandlers import com.twitter.util.Future -import org.apache.amber.engine.architecture.rpc.controlcommands.{AsyncRPCContext, EmptyRequest} -import org.apache.amber.engine.architecture.rpc.controlreturns.EmptyReturn -import org.apache.amber.engine.architecture.worker.DataProcessorRPCHandlerInitializer +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{ + AsyncRPCContext, + EmptyRequest +} +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.EmptyReturn +import org.apache.texera.amber.engine.architecture.worker.DataProcessorRPCHandlerInitializer trait OpenExecutorHandler { this: DataProcessorRPCHandlerInitializer => diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/promisehandlers/PauseHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/PauseHandler.scala similarity index 71% rename from amber/src/main/scala/org/apache/amber/engine/architecture/worker/promisehandlers/PauseHandler.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/PauseHandler.scala index 418c03fc71a..cec7ca87e63 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/promisehandlers/PauseHandler.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/PauseHandler.scala @@ -17,13 +17,23 @@ * under the License. */ -package org.apache.amber.engine.architecture.worker.promisehandlers +package org.apache.texera.amber.engine.architecture.worker.promisehandlers import com.twitter.util.Future -import org.apache.amber.engine.architecture.rpc.controlcommands.{AsyncRPCContext, EmptyRequest} -import org.apache.amber.engine.architecture.rpc.controlreturns.WorkerStateResponse -import org.apache.amber.engine.architecture.worker.statistics.WorkerState.{PAUSED, READY, RUNNING} -import org.apache.amber.engine.architecture.worker.{DataProcessorRPCHandlerInitializer, UserPause} +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{ + AsyncRPCContext, + EmptyRequest +} +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkerStateResponse +import org.apache.texera.amber.engine.architecture.worker.statistics.WorkerState.{ + PAUSED, + READY, + RUNNING +} +import org.apache.texera.amber.engine.architecture.worker.{ + DataProcessorRPCHandlerInitializer, + UserPause +} trait PauseHandler { this: DataProcessorRPCHandlerInitializer => diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/promisehandlers/PrepareCheckpointHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/PrepareCheckpointHandler.scala similarity index 84% rename from amber/src/main/scala/org/apache/amber/engine/architecture/worker/promisehandlers/PrepareCheckpointHandler.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/PrepareCheckpointHandler.scala index 52fc0ed49df..3333f54e90d 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/promisehandlers/PrepareCheckpointHandler.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/PrepareCheckpointHandler.scala @@ -17,22 +17,22 @@ * under the License. */ -package org.apache.amber.engine.architecture.worker.promisehandlers +package org.apache.texera.amber.engine.architecture.worker.promisehandlers import com.twitter.util.Future -import org.apache.amber.core.virtualidentity.EmbeddedControlMessageIdentity -import org.apache.amber.engine.architecture.rpc.controlcommands.{ +import org.apache.texera.amber.core.virtualidentity.EmbeddedControlMessageIdentity +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{ AsyncRPCContext, PrepareCheckpointRequest } -import org.apache.amber.engine.architecture.rpc.controlreturns.EmptyReturn -import org.apache.amber.engine.architecture.worker.WorkflowWorker.MainThreadDelegateMessage -import org.apache.amber.engine.architecture.worker.{ +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.EmptyReturn +import org.apache.texera.amber.engine.architecture.worker.WorkflowWorker.MainThreadDelegateMessage +import org.apache.texera.amber.engine.architecture.worker.{ DataProcessorRPCHandlerInitializer, WorkflowWorker } -import org.apache.amber.engine.common.ambermessage.WorkflowFIFOMessage -import org.apache.amber.engine.common.{CheckpointState, CheckpointSupport, SerializedState} +import org.apache.texera.amber.engine.common.ambermessage.WorkflowFIFOMessage +import org.apache.texera.amber.engine.common.{CheckpointState, CheckpointSupport, SerializedState} import java.util.concurrent.CompletableFuture import scala.collection.mutable diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/promisehandlers/QueryStatisticsHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/QueryStatisticsHandler.scala similarity index 71% rename from amber/src/main/scala/org/apache/amber/engine/architecture/worker/promisehandlers/QueryStatisticsHandler.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/QueryStatisticsHandler.scala index 01ee4339512..74d8d14faa6 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/promisehandlers/QueryStatisticsHandler.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/QueryStatisticsHandler.scala @@ -17,13 +17,16 @@ * under the License. */ -package org.apache.amber.engine.architecture.worker.promisehandlers +package org.apache.texera.amber.engine.architecture.worker.promisehandlers import com.twitter.util.Future -import org.apache.amber.engine.architecture.rpc.controlcommands.{AsyncRPCContext, EmptyRequest} -import org.apache.amber.engine.architecture.rpc.controlreturns.WorkerMetricsResponse -import org.apache.amber.engine.architecture.worker.DataProcessorRPCHandlerInitializer -import org.apache.amber.engine.architecture.worker.statistics.WorkerMetrics +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{ + AsyncRPCContext, + EmptyRequest +} +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkerMetricsResponse +import org.apache.texera.amber.engine.architecture.worker.DataProcessorRPCHandlerInitializer +import org.apache.texera.amber.engine.architecture.worker.statistics.WorkerMetrics trait QueryStatisticsHandler { this: DataProcessorRPCHandlerInitializer => diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/promisehandlers/ResumeHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/ResumeHandler.scala similarity index 72% rename from amber/src/main/scala/org/apache/amber/engine/architecture/worker/promisehandlers/ResumeHandler.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/ResumeHandler.scala index ddc9b04bb59..434c50c914c 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/promisehandlers/ResumeHandler.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/ResumeHandler.scala @@ -17,13 +17,19 @@ * under the License. */ -package org.apache.amber.engine.architecture.worker.promisehandlers +package org.apache.texera.amber.engine.architecture.worker.promisehandlers import com.twitter.util.Future -import org.apache.amber.engine.architecture.rpc.controlcommands.{AsyncRPCContext, EmptyRequest} -import org.apache.amber.engine.architecture.rpc.controlreturns.WorkerStateResponse -import org.apache.amber.engine.architecture.worker.statistics.WorkerState.{PAUSED, RUNNING} -import org.apache.amber.engine.architecture.worker.{DataProcessorRPCHandlerInitializer, UserPause} +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{ + AsyncRPCContext, + EmptyRequest +} +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkerStateResponse +import org.apache.texera.amber.engine.architecture.worker.statistics.WorkerState.{PAUSED, RUNNING} +import org.apache.texera.amber.engine.architecture.worker.{ + DataProcessorRPCHandlerInitializer, + UserPause +} trait ResumeHandler { this: DataProcessorRPCHandlerInitializer => diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/promisehandlers/RetrieveStateHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/RetrieveStateHandler.scala similarity index 74% rename from amber/src/main/scala/org/apache/amber/engine/architecture/worker/promisehandlers/RetrieveStateHandler.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/RetrieveStateHandler.scala index d967c083d71..2b0721a2525 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/promisehandlers/RetrieveStateHandler.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/RetrieveStateHandler.scala @@ -17,12 +17,15 @@ * under the License. */ -package org.apache.amber.engine.architecture.worker.promisehandlers +package org.apache.texera.amber.engine.architecture.worker.promisehandlers import com.twitter.util.Future -import org.apache.amber.engine.architecture.rpc.controlcommands.{AsyncRPCContext, EmptyRequest} -import org.apache.amber.engine.architecture.rpc.controlreturns.EmptyReturn -import org.apache.amber.engine.architecture.worker.DataProcessorRPCHandlerInitializer +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{ + AsyncRPCContext, + EmptyRequest +} +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.EmptyReturn +import org.apache.texera.amber.engine.architecture.worker.DataProcessorRPCHandlerInitializer trait RetrieveStateHandler { this: DataProcessorRPCHandlerInitializer => diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/promisehandlers/StartChannelHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/StartChannelHandler.scala similarity index 69% rename from amber/src/main/scala/org/apache/amber/engine/architecture/worker/promisehandlers/StartChannelHandler.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/StartChannelHandler.scala index 222c0a289d7..01cbb858bd7 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/promisehandlers/StartChannelHandler.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/StartChannelHandler.scala @@ -17,15 +17,18 @@ * under the License. */ -package org.apache.amber.engine.architecture.worker.promisehandlers +package org.apache.texera.amber.engine.architecture.worker.promisehandlers import com.twitter.util.Future -import org.apache.amber.engine.architecture.rpc.controlcommands.EmbeddedControlMessageType.NO_ALIGNMENT -import org.apache.amber.engine.architecture.rpc.controlcommands.{AsyncRPCContext, EmptyRequest} -import org.apache.amber.engine.architecture.rpc.controlreturns.EmptyReturn -import org.apache.amber.engine.architecture.rpc.workerservice.WorkerServiceGrpc.METHOD_START_CHANNEL -import org.apache.amber.engine.architecture.worker.DataProcessorRPCHandlerInitializer -import org.apache.amber.error.ErrorUtils.safely +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.EmbeddedControlMessageType.NO_ALIGNMENT +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{ + AsyncRPCContext, + EmptyRequest +} +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.EmptyReturn +import org.apache.texera.amber.engine.architecture.rpc.workerservice.WorkerServiceGrpc.METHOD_START_CHANNEL +import org.apache.texera.amber.engine.architecture.worker.DataProcessorRPCHandlerInitializer +import org.apache.texera.amber.error.ErrorUtils.safely trait StartChannelHandler { this: DataProcessorRPCHandlerInitializer => diff --git a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/promisehandlers/StartHandler.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/StartHandler.scala similarity index 75% rename from amber/src/main/scala/org/apache/amber/engine/architecture/worker/promisehandlers/StartHandler.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/StartHandler.scala index 1caf52108a5..5d1bf8ccbde 100644 --- a/amber/src/main/scala/org/apache/amber/engine/architecture/worker/promisehandlers/StartHandler.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/worker/promisehandlers/StartHandler.scala @@ -17,17 +17,20 @@ * under the License. */ -package org.apache.amber.engine.architecture.worker.promisehandlers +package org.apache.texera.amber.engine.architecture.worker.promisehandlers import com.twitter.util.Future -import org.apache.amber.core.WorkflowRuntimeException -import org.apache.amber.core.executor.SourceOperatorExecutor -import org.apache.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} -import org.apache.amber.core.workflow.PortIdentity -import org.apache.amber.engine.architecture.rpc.controlcommands.{AsyncRPCContext, EmptyRequest} -import org.apache.amber.engine.architecture.rpc.controlreturns.WorkerStateResponse -import org.apache.amber.engine.architecture.worker.DataProcessorRPCHandlerInitializer -import org.apache.amber.engine.architecture.worker.statistics.WorkerState.{READY, RUNNING} +import org.apache.texera.amber.core.WorkflowRuntimeException +import org.apache.texera.amber.core.executor.SourceOperatorExecutor +import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} +import org.apache.texera.amber.core.workflow.PortIdentity +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{ + AsyncRPCContext, + EmptyRequest +} +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkerStateResponse +import org.apache.texera.amber.engine.architecture.worker.DataProcessorRPCHandlerInitializer +import org.apache.texera.amber.engine.architecture.worker.statistics.WorkerState.{READY, RUNNING} trait StartHandler { this: DataProcessorRPCHandlerInitializer => diff --git a/amber/src/main/scala/org/apache/amber/engine/common/AmberConfig.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/AmberConfig.scala similarity index 95% rename from amber/src/main/scala/org/apache/amber/engine/common/AmberConfig.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/common/AmberConfig.scala index b8017b21d44..2b05cc771af 100644 --- a/amber/src/main/scala/org/apache/amber/engine/common/AmberConfig.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/AmberConfig.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.amber.engine.common +package org.apache.texera.amber.engine.common import org.apache.pekko.actor.Address diff --git a/amber/src/main/scala/org/apache/amber/engine/common/AmberKryoInitializer.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/AmberKryoInitializer.scala similarity index 96% rename from amber/src/main/scala/org/apache/amber/engine/common/AmberKryoInitializer.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/common/AmberKryoInitializer.scala index 6511f652c5a..1721764d414 100644 --- a/amber/src/main/scala/org/apache/amber/engine/common/AmberKryoInitializer.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/AmberKryoInitializer.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.engine.common +package org.apache.texera.amber.engine.common import com.esotericsoftware.kryo.kryo5.serializers.ClosureSerializer import io.altoo.serialization.kryo.pekko.DefaultKryoInitializer diff --git a/amber/src/main/scala/org/apache/amber/engine/common/AmberLogging.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/AmberLogging.scala similarity index 86% rename from amber/src/main/scala/org/apache/amber/engine/common/AmberLogging.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/common/AmberLogging.scala index 3b47a6e6911..0fd16475d9f 100644 --- a/amber/src/main/scala/org/apache/amber/engine/common/AmberLogging.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/AmberLogging.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.engine.common +package org.apache.texera.amber.engine.common import com.typesafe.scalalogging.Logger -import org.apache.amber.core.virtualidentity.ActorVirtualIdentity -import org.apache.amber.util.VirtualIdentityUtils +import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity +import org.apache.texera.amber.util.VirtualIdentityUtils import org.slf4j.LoggerFactory trait AmberLogging { diff --git a/amber/src/main/scala/org/apache/amber/engine/common/AmberRuntime.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/AmberRuntime.scala similarity index 94% rename from amber/src/main/scala/org/apache/amber/engine/common/AmberRuntime.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/common/AmberRuntime.scala index 411814669cf..7078f766a63 100644 --- a/amber/src/main/scala/org/apache/amber/engine/common/AmberRuntime.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/AmberRuntime.scala @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.amber.engine.common +package org.apache.texera.amber.engine.common import org.apache.pekko.actor.{ActorSystem, Address, Cancellable, DeadLetter, Props} import org.apache.pekko.serialization.{Serialization, SerializationExtension} import com.typesafe.config.{Config, ConfigFactory} -import org.apache.amber.clustering.ClusterListener -import org.apache.amber.config.AkkaConfig -import org.apache.amber.engine.architecture.messaginglayer.DeadLetterMonitorActor +import org.apache.texera.amber.clustering.ClusterListener +import org.apache.texera.amber.config.AkkaConfig +import org.apache.texera.amber.engine.architecture.messaginglayer.DeadLetterMonitorActor import java.io.{BufferedReader, InputStreamReader} import java.net.URL diff --git a/amber/src/main/scala/org/apache/amber/engine/common/CheckpointState.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/CheckpointState.scala similarity index 96% rename from amber/src/main/scala/org/apache/amber/engine/common/CheckpointState.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/common/CheckpointState.scala index 4d803515bcb..0f1159a2ef7 100644 --- a/amber/src/main/scala/org/apache/amber/engine/common/CheckpointState.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/CheckpointState.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.engine.common +package org.apache.texera.amber.engine.common import scala.collection.mutable diff --git a/amber/src/main/scala/org/apache/amber/engine/common/CheckpointSupport.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/CheckpointSupport.scala similarity index 88% rename from amber/src/main/scala/org/apache/amber/engine/common/CheckpointSupport.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/common/CheckpointSupport.scala index b5a0b4bd834..d409e5da91e 100644 --- a/amber/src/main/scala/org/apache/amber/engine/common/CheckpointSupport.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/CheckpointSupport.scala @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.amber.engine.common +package org.apache.texera.amber.engine.common -import org.apache.amber.core.tuple.TupleLike -import org.apache.amber.core.workflow.PortIdentity +import org.apache.texera.amber.core.tuple.TupleLike +import org.apache.texera.amber.core.workflow.PortIdentity trait CheckpointSupport { def serializeState( diff --git a/amber/src/main/scala/org/apache/amber/engine/common/ElidableStatement.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/ElidableStatement.scala similarity index 96% rename from amber/src/main/scala/org/apache/amber/engine/common/ElidableStatement.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/common/ElidableStatement.scala index 773e20169c8..bf78b290c31 100644 --- a/amber/src/main/scala/org/apache/amber/engine/common/ElidableStatement.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/ElidableStatement.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.engine.common +package org.apache.texera.amber.engine.common import scala.annotation.elidable import scala.annotation.elidable._ diff --git a/amber/src/main/scala/org/apache/amber/engine/common/FutureBijection.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/FutureBijection.scala similarity index 97% rename from amber/src/main/scala/org/apache/amber/engine/common/FutureBijection.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/common/FutureBijection.scala index e9a925ba132..41f8113ef52 100644 --- a/amber/src/main/scala/org/apache/amber/engine/common/FutureBijection.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/FutureBijection.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.engine.common +package org.apache.texera.amber.engine.common import com.twitter.util.{Return, Throw, Future => TwitterFuture, Promise => TwitterPromise} diff --git a/amber/src/main/scala/org/apache/amber/engine/common/SerializedState.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/SerializedState.scala similarity index 97% rename from amber/src/main/scala/org/apache/amber/engine/common/SerializedState.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/common/SerializedState.scala index 80f96014902..c1a7bae6b88 100644 --- a/amber/src/main/scala/org/apache/amber/engine/common/SerializedState.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/SerializedState.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.engine.common +package org.apache.texera.amber.engine.common import org.apache.pekko.serialization.{Serialization, Serializers} diff --git a/amber/src/main/scala/org/apache/amber/engine/common/Utils.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/Utils.scala similarity index 97% rename from amber/src/main/scala/org/apache/amber/engine/common/Utils.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/common/Utils.scala index 81e9c186a44..dc074c1094d 100644 --- a/amber/src/main/scala/org/apache/amber/engine/common/Utils.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/Utils.scala @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.amber.engine.common +package org.apache.texera.amber.engine.common import com.typesafe.scalalogging.LazyLogging -import org.apache.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState import java.nio.file.{Files, Path, Paths} import java.util.concurrent.locks.Lock diff --git a/amber/src/main/scala/org/apache/amber/engine/common/amberexception/BreakpointException.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/amberexception/BreakpointException.scala similarity index 88% rename from amber/src/main/scala/org/apache/amber/engine/common/amberexception/BreakpointException.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/common/amberexception/BreakpointException.scala index 290cd86b006..647a5248ece 100644 --- a/amber/src/main/scala/org/apache/amber/engine/common/amberexception/BreakpointException.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/amberexception/BreakpointException.scala @@ -17,8 +17,8 @@ * under the License. */ -package org.apache.amber.engine.common.amberexception +package org.apache.texera.amber.engine.common.amberexception -import org.apache.amber.core.WorkflowRuntimeException +import org.apache.texera.amber.core.WorkflowRuntimeException class BreakpointException extends WorkflowRuntimeException("breakpoint triggered") {} diff --git a/amber/src/main/scala/org/apache/amber/engine/common/ambermessage/DataPayload.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/ambermessage/DataPayload.scala similarity index 90% rename from amber/src/main/scala/org/apache/amber/engine/common/ambermessage/DataPayload.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/common/ambermessage/DataPayload.scala index df30473572c..54f577a0beb 100644 --- a/amber/src/main/scala/org/apache/amber/engine/common/ambermessage/DataPayload.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/ambermessage/DataPayload.scala @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.amber.engine.common.ambermessage +package org.apache.texera.amber.engine.common.ambermessage -import org.apache.amber.core.state.State -import org.apache.amber.core.tuple.Tuple +import org.apache.texera.amber.core.state.State +import org.apache.texera.amber.core.tuple.Tuple sealed trait DataPayload extends WorkflowFIFOMessagePayload {} diff --git a/amber/src/main/scala/org/apache/amber/engine/common/ambermessage/DirectControlMessagePayload.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/ambermessage/DirectControlMessagePayload.scala similarity index 93% rename from amber/src/main/scala/org/apache/amber/engine/common/ambermessage/DirectControlMessagePayload.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/common/ambermessage/DirectControlMessagePayload.scala index e5402f34ef0..1f95cbcbc5e 100644 --- a/amber/src/main/scala/org/apache/amber/engine/common/ambermessage/DirectControlMessagePayload.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/ambermessage/DirectControlMessagePayload.scala @@ -17,6 +17,6 @@ * under the License. */ -package org.apache.amber.engine.common.ambermessage +package org.apache.texera.amber.engine.common.ambermessage trait DirectControlMessagePayload extends WorkflowFIFOMessagePayload diff --git a/amber/src/main/scala/org/apache/amber/engine/common/ambermessage/RecoveryPayload.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/ambermessage/RecoveryPayload.scala similarity index 91% rename from amber/src/main/scala/org/apache/amber/engine/common/ambermessage/RecoveryPayload.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/common/ambermessage/RecoveryPayload.scala index 45c8e3fd21a..dcd83f3a3fc 100644 --- a/amber/src/main/scala/org/apache/amber/engine/common/ambermessage/RecoveryPayload.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/ambermessage/RecoveryPayload.scala @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.amber.engine.common.ambermessage +package org.apache.texera.amber.engine.common.ambermessage import org.apache.pekko.actor.{ActorRef, Address} -import org.apache.amber.core.virtualidentity.ActorVirtualIdentity +import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity sealed trait RecoveryPayload extends Serializable {} diff --git a/amber/src/main/scala/org/apache/amber/engine/common/ambermessage/WorkflowFIFOMessagePayload.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/ambermessage/WorkflowFIFOMessagePayload.scala similarity index 93% rename from amber/src/main/scala/org/apache/amber/engine/common/ambermessage/WorkflowFIFOMessagePayload.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/common/ambermessage/WorkflowFIFOMessagePayload.scala index 66c388e9f55..e77ed2a2b88 100644 --- a/amber/src/main/scala/org/apache/amber/engine/common/ambermessage/WorkflowFIFOMessagePayload.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/ambermessage/WorkflowFIFOMessagePayload.scala @@ -17,6 +17,6 @@ * under the License. */ -package org.apache.amber.engine.common.ambermessage +package org.apache.texera.amber.engine.common.ambermessage trait WorkflowFIFOMessagePayload extends Serializable diff --git a/amber/src/main/scala/org/apache/amber/engine/common/ambermessage/WorkflowMessage.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/ambermessage/WorkflowMessage.scala similarity index 90% rename from amber/src/main/scala/org/apache/amber/engine/common/ambermessage/WorkflowMessage.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/common/ambermessage/WorkflowMessage.scala index 501f5317d05..a54d4c20310 100644 --- a/amber/src/main/scala/org/apache/amber/engine/common/ambermessage/WorkflowMessage.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/ambermessage/WorkflowMessage.scala @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.amber.engine.common.ambermessage +package org.apache.texera.amber.engine.common.ambermessage -import org.apache.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} +import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} case object WorkflowMessage { def getInMemSize(msg: WorkflowMessage): Long = { diff --git a/amber/src/main/scala/org/apache/amber/engine/common/client/AmberClient.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/client/AmberClient.scala similarity index 83% rename from amber/src/main/scala/org/apache/amber/engine/common/client/AmberClient.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/common/client/AmberClient.scala index cb33632394a..91d2ba06ba5 100644 --- a/amber/src/main/scala/org/apache/amber/engine/common/client/AmberClient.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/client/AmberClient.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.engine.common.client +package org.apache.texera.amber.engine.common.client import org.apache.pekko.actor.{ActorSystem, Address, PoisonPill, Props} import org.apache.pekko.pattern._ @@ -26,19 +26,22 @@ import com.twitter.util.{Future, Promise} import io.reactivex.rxjava3.core.Observable import io.reactivex.rxjava3.disposables.Disposable import io.reactivex.rxjava3.subjects.PublishSubject -import org.apache.amber.core.workflow.{PhysicalPlan, WorkflowContext} -import org.apache.amber.engine.architecture.controller.ControllerConfig -import org.apache.amber.engine.architecture.rpc.controlcommands.ControlRequest -import org.apache.amber.engine.architecture.rpc.controllerservice.ControllerServiceFs2Grpc -import org.apache.amber.engine.architecture.rpc.controlreturns.ControlReturn -import org.apache.amber.engine.common.FutureBijection._ -import org.apache.amber.engine.common.ambermessage.{NotifyFailedNode, WorkflowRecoveryMessage} -import org.apache.amber.engine.common.client.ClientActor.{ +import org.apache.texera.amber.core.workflow.{PhysicalPlan, WorkflowContext} +import org.apache.texera.amber.engine.architecture.controller.ControllerConfig +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.ControlRequest +import org.apache.texera.amber.engine.architecture.rpc.controllerservice.ControllerServiceFs2Grpc +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.ControlReturn +import org.apache.texera.amber.engine.common.FutureBijection._ +import org.apache.texera.amber.engine.common.ambermessage.{ + NotifyFailedNode, + WorkflowRecoveryMessage +} +import org.apache.texera.amber.engine.common.client.ClientActor.{ CommandRequest, InitializeRequest, ObservableRequest } -import org.apache.amber.engine.common.virtualidentity.util.CLIENT +import org.apache.texera.amber.engine.common.virtualidentity.util.CLIENT import java.lang.reflect.{InvocationHandler, Method, Proxy} import scala.collection.mutable diff --git a/amber/src/main/scala/org/apache/amber/engine/common/client/ClientActor.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/client/ClientActor.scala similarity index 80% rename from amber/src/main/scala/org/apache/amber/engine/common/client/ClientActor.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/common/client/ClientActor.scala index 5a9a5bd4b25..9df86ec3ffe 100644 --- a/amber/src/main/scala/org/apache/amber/engine/common/client/ClientActor.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/client/ClientActor.scala @@ -17,43 +17,50 @@ * under the License. */ -package org.apache.amber.engine.common.client +package org.apache.texera.amber.engine.common.client import org.apache.pekko.actor.{Actor, ActorRef} import org.apache.pekko.pattern.StatusReply.Ack import com.twitter.util.Promise -import org.apache.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} -import org.apache.amber.core.workflow.{PhysicalPlan, WorkflowContext} -import org.apache.amber.engine.architecture.common.WorkflowActor.{ +import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} +import org.apache.texera.amber.core.workflow.{PhysicalPlan, WorkflowContext} +import org.apache.texera.amber.engine.architecture.common.WorkflowActor.{ CreditRequest, CreditResponse, NetworkAck, NetworkMessage } -import org.apache.amber.engine.architecture.controller.{ClientEvent, Controller, ControllerConfig} -import org.apache.amber.engine.architecture.rpc.controlcommands.{AsyncRPCContext, ControlRequest} -import org.apache.amber.engine.architecture.rpc.controlreturns.{ +import org.apache.texera.amber.engine.architecture.controller.{ + ClientEvent, + Controller, + ControllerConfig +} +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{ + AsyncRPCContext, + ControlRequest +} +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.{ ControlError, ControlReturn, ReturnInvocation } -import org.apache.amber.engine.common.AmberLogging -import org.apache.amber.engine.common.ambermessage.WorkflowMessage.getInMemSize -import org.apache.amber.engine.common.ambermessage.{ +import org.apache.texera.amber.engine.common.AmberLogging +import org.apache.texera.amber.engine.common.ambermessage.WorkflowMessage.getInMemSize +import org.apache.texera.amber.engine.common.ambermessage.{ DataPayload, DirectControlMessagePayload, WorkflowFIFOMessage, WorkflowRecoveryMessage } -import org.apache.amber.engine.common.client.ClientActor.{ +import org.apache.texera.amber.engine.common.client.ClientActor.{ ClosureRequest, CommandRequest, InitializeRequest, ObservableRequest } -import org.apache.amber.engine.common.rpc.AsyncRPCClient -import org.apache.amber.engine.common.virtualidentity.util.{CLIENT, CONTROLLER} -import org.apache.amber.error.ErrorUtils.reconstructThrowable +import org.apache.texera.amber.engine.common.rpc.AsyncRPCClient +import org.apache.texera.amber.engine.common.virtualidentity.util.{CLIENT, CONTROLLER} +import org.apache.texera.amber.error.ErrorUtils.reconstructThrowable import scala.collection.mutable diff --git a/amber/src/main/scala/org/apache/amber/engine/common/rpc/AsyncRPCClient.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/rpc/AsyncRPCClient.scala similarity index 88% rename from amber/src/main/scala/org/apache/amber/engine/common/rpc/AsyncRPCClient.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/common/rpc/AsyncRPCClient.scala index ee0731eb871..704ebd7f476 100644 --- a/amber/src/main/scala/org/apache/amber/engine/common/rpc/AsyncRPCClient.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/rpc/AsyncRPCClient.scala @@ -17,30 +17,30 @@ * under the License. */ -package org.apache.amber.engine.common.rpc +package org.apache.texera.amber.engine.common.rpc import com.twitter.util.{Future, Promise} import io.grpc.MethodDescriptor -import org.apache.amber.core.virtualidentity.{ +import org.apache.texera.amber.core.virtualidentity.{ ActorVirtualIdentity, ChannelIdentity, EmbeddedControlMessageIdentity } -import org.apache.amber.engine.architecture.controller.ClientEvent -import org.apache.amber.engine.architecture.messaginglayer.NetworkOutputGateway -import org.apache.amber.engine.architecture.rpc.controlcommands._ -import org.apache.amber.engine.architecture.rpc.controllerservice.ControllerServiceFs2Grpc -import org.apache.amber.engine.architecture.rpc.controlreturns.{ +import org.apache.texera.amber.engine.architecture.controller.ClientEvent +import org.apache.texera.amber.engine.architecture.messaginglayer.NetworkOutputGateway +import org.apache.texera.amber.engine.architecture.rpc.controlcommands._ +import org.apache.texera.amber.engine.architecture.rpc.controllerservice.ControllerServiceFs2Grpc +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.{ ControlError, ControlReturn, ReturnInvocation, WorkerMetricsResponse } -import org.apache.amber.engine.architecture.rpc.workerservice.WorkerServiceFs2Grpc -import org.apache.amber.engine.common.AmberLogging -import org.apache.amber.engine.common.rpc.AsyncRPCClient.createProxy -import org.apache.amber.engine.common.virtualidentity.util.CLIENT -import org.apache.amber.error.ErrorUtils.reconstructThrowable +import org.apache.texera.amber.engine.architecture.rpc.workerservice.WorkerServiceFs2Grpc +import org.apache.texera.amber.engine.common.AmberLogging +import org.apache.texera.amber.engine.common.rpc.AsyncRPCClient.createProxy +import org.apache.texera.amber.engine.common.virtualidentity.util.CLIENT +import org.apache.texera.amber.error.ErrorUtils.reconstructThrowable import java.lang.reflect.{InvocationHandler, Method, Proxy} import scala.collection.mutable diff --git a/amber/src/main/scala/org/apache/amber/engine/common/rpc/AsyncRPCHandlerInitializer.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/rpc/AsyncRPCHandlerInitializer.scala similarity index 82% rename from amber/src/main/scala/org/apache/amber/engine/common/rpc/AsyncRPCHandlerInitializer.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/common/rpc/AsyncRPCHandlerInitializer.scala index 2b70d083dd8..f658e0875f7 100644 --- a/amber/src/main/scala/org/apache/amber/engine/common/rpc/AsyncRPCHandlerInitializer.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/rpc/AsyncRPCHandlerInitializer.scala @@ -17,19 +17,19 @@ * under the License. */ -package org.apache.amber.engine.common.rpc +package org.apache.texera.amber.engine.common.rpc import com.twitter.util.Future -import org.apache.amber.core.virtualidentity.{ +import org.apache.texera.amber.core.virtualidentity.{ ActorVirtualIdentity, ChannelIdentity, EmbeddedControlMessageIdentity } -import org.apache.amber.engine.architecture.controller.ClientEvent -import org.apache.amber.engine.architecture.rpc.controlcommands._ -import org.apache.amber.engine.architecture.rpc.controllerservice.ControllerServiceFs2Grpc -import org.apache.amber.engine.architecture.rpc.controlreturns._ -import org.apache.amber.engine.architecture.rpc.workerservice.WorkerServiceFs2Grpc +import org.apache.texera.amber.engine.architecture.controller.ClientEvent +import org.apache.texera.amber.engine.architecture.rpc.controlcommands._ +import org.apache.texera.amber.engine.architecture.rpc.controllerservice.ControllerServiceFs2Grpc +import org.apache.texera.amber.engine.architecture.rpc.controlreturns._ +import org.apache.texera.amber.engine.architecture.rpc.workerservice.WorkerServiceFs2Grpc import scala.language.implicitConversions diff --git a/amber/src/main/scala/org/apache/amber/engine/common/rpc/AsyncRPCServer.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/rpc/AsyncRPCServer.scala similarity index 87% rename from amber/src/main/scala/org/apache/amber/engine/common/rpc/AsyncRPCServer.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/common/rpc/AsyncRPCServer.scala index 63b5227443e..e9a3e2cc455 100644 --- a/amber/src/main/scala/org/apache/amber/engine/common/rpc/AsyncRPCServer.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/rpc/AsyncRPCServer.scala @@ -17,19 +17,22 @@ * under the License. */ -package org.apache.amber.engine.common.rpc +package org.apache.texera.amber.engine.common.rpc import com.twitter.util.Future -import org.apache.amber.core.virtualidentity.ActorVirtualIdentity -import org.apache.amber.engine.architecture.messaginglayer.NetworkOutputGateway -import org.apache.amber.engine.architecture.rpc.controlcommands.{ +import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity +import org.apache.texera.amber.engine.architecture.messaginglayer.NetworkOutputGateway +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{ AsyncRPCContext, ControlInvocation, ControlRequest } -import org.apache.amber.engine.architecture.rpc.controlreturns.{ControlReturn, ReturnInvocation} -import org.apache.amber.engine.common.AmberLogging -import org.apache.amber.error.ErrorUtils.mkControlError +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.{ + ControlReturn, + ReturnInvocation +} +import org.apache.texera.amber.engine.common.AmberLogging +import org.apache.texera.amber.error.ErrorUtils.mkControlError import java.lang.reflect.Method import scala.collection.mutable diff --git a/amber/src/main/scala/org/apache/amber/engine/common/statetransition/StateManager.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/statetransition/StateManager.scala similarity index 90% rename from amber/src/main/scala/org/apache/amber/engine/common/statetransition/StateManager.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/common/statetransition/StateManager.scala index 28ba43c6bc9..9bd951389ea 100644 --- a/amber/src/main/scala/org/apache/amber/engine/common/statetransition/StateManager.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/statetransition/StateManager.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.engine.common.statetransition +package org.apache.texera.amber.engine.common.statetransition -import org.apache.amber.core.WorkflowRuntimeException -import org.apache.amber.core.virtualidentity.ActorVirtualIdentity -import org.apache.amber.engine.common.statetransition.StateManager.{ +import org.apache.texera.amber.core.WorkflowRuntimeException +import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity +import org.apache.texera.amber.engine.common.statetransition.StateManager.{ InvalidStateException, InvalidTransitionException } diff --git a/amber/src/main/scala/org/apache/amber/engine/common/statetransition/WorkerStateManager.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/statetransition/WorkerStateManager.scala similarity index 83% rename from amber/src/main/scala/org/apache/amber/engine/common/statetransition/WorkerStateManager.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/common/statetransition/WorkerStateManager.scala index bf8248589c6..4f5e92e0ae7 100644 --- a/amber/src/main/scala/org/apache/amber/engine/common/statetransition/WorkerStateManager.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/statetransition/WorkerStateManager.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.engine.common.statetransition +package org.apache.texera.amber.engine.common.statetransition -import org.apache.amber.core.virtualidentity.ActorVirtualIdentity -import org.apache.amber.engine.architecture.worker.statistics.WorkerState -import org.apache.amber.engine.architecture.worker.statistics.WorkerState._ +import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity +import org.apache.texera.amber.engine.architecture.worker.statistics.WorkerState +import org.apache.texera.amber.engine.architecture.worker.statistics.WorkerState._ // The following pattern is a good practice of enum in scala // We've always used this pattern in the codebase diff --git a/amber/src/main/scala/org/apache/amber/engine/common/storage/EmptyRecordStorage.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/storage/EmptyRecordStorage.scala similarity index 92% rename from amber/src/main/scala/org/apache/amber/engine/common/storage/EmptyRecordStorage.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/common/storage/EmptyRecordStorage.scala index c8ac4e784dd..0dbbd61b519 100644 --- a/amber/src/main/scala/org/apache/amber/engine/common/storage/EmptyRecordStorage.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/storage/EmptyRecordStorage.scala @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.amber.engine.common.storage +package org.apache.texera.amber.engine.common.storage -import org.apache.amber.engine.common.storage.SequentialRecordStorage.{ +import org.apache.texera.amber.engine.common.storage.SequentialRecordStorage.{ SequentialRecordReader, SequentialRecordWriter } diff --git a/amber/src/main/scala/org/apache/amber/engine/common/storage/HDFSRecordStorage.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/storage/HDFSRecordStorage.scala similarity index 95% rename from amber/src/main/scala/org/apache/amber/engine/common/storage/HDFSRecordStorage.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/common/storage/HDFSRecordStorage.scala index d5d58646997..07d6bab0373 100644 --- a/amber/src/main/scala/org/apache/amber/engine/common/storage/HDFSRecordStorage.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/storage/HDFSRecordStorage.scala @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.amber.engine.common.storage +package org.apache.texera.amber.engine.common.storage import com.typesafe.scalalogging.LazyLogging -import org.apache.amber.engine.common.storage.SequentialRecordStorage.{ +import org.apache.texera.amber.engine.common.storage.SequentialRecordStorage.{ SequentialRecordReader, SequentialRecordWriter } diff --git a/amber/src/main/scala/org/apache/amber/engine/common/storage/SequentialRecordStorage.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/storage/SequentialRecordStorage.scala similarity index 95% rename from amber/src/main/scala/org/apache/amber/engine/common/storage/SequentialRecordStorage.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/common/storage/SequentialRecordStorage.scala index b89551f7c5f..f5664e6a49c 100644 --- a/amber/src/main/scala/org/apache/amber/engine/common/storage/SequentialRecordStorage.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/storage/SequentialRecordStorage.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.engine.common.storage +package org.apache.texera.amber.engine.common.storage import com.esotericsoftware.kryo.io.{Input, Output} -import org.apache.amber.engine.common.AmberRuntime -import org.apache.amber.engine.common.storage.SequentialRecordStorage.{ +import org.apache.texera.amber.engine.common.AmberRuntime +import org.apache.texera.amber.engine.common.storage.SequentialRecordStorage.{ SequentialRecordReader, SequentialRecordWriter } diff --git a/amber/src/main/scala/org/apache/amber/engine/common/storage/VFSRecordStorage.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/storage/VFSRecordStorage.scala similarity index 94% rename from amber/src/main/scala/org/apache/amber/engine/common/storage/VFSRecordStorage.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/common/storage/VFSRecordStorage.scala index ecff9dab9e7..a514360d6d6 100644 --- a/amber/src/main/scala/org/apache/amber/engine/common/storage/VFSRecordStorage.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/storage/VFSRecordStorage.scala @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.amber.engine.common.storage +package org.apache.texera.amber.engine.common.storage import com.typesafe.scalalogging.LazyLogging -import org.apache.amber.engine.common.storage.SequentialRecordStorage.{ +import org.apache.texera.amber.engine.common.storage.SequentialRecordStorage.{ SequentialRecordReader, SequentialRecordWriter } diff --git a/amber/src/main/scala/org/apache/amber/engine/common/virtualidentity/util.scala b/amber/src/main/scala/org/apache/texera/amber/engine/common/virtualidentity/util.scala similarity index 88% rename from amber/src/main/scala/org/apache/amber/engine/common/virtualidentity/util.scala rename to amber/src/main/scala/org/apache/texera/amber/engine/common/virtualidentity/util.scala index 240be71e3bb..481aecab1dc 100644 --- a/amber/src/main/scala/org/apache/amber/engine/common/virtualidentity/util.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/common/virtualidentity/util.scala @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.amber.engine.common.virtualidentity +package org.apache.texera.amber.engine.common.virtualidentity -import org.apache.amber.core.virtualidentity.ActorVirtualIdentity +import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity object util { diff --git a/amber/src/main/scala/org/apache/amber/error/ErrorUtils.scala b/amber/src/main/scala/org/apache/texera/amber/error/ErrorUtils.scala similarity index 90% rename from amber/src/main/scala/org/apache/amber/error/ErrorUtils.scala rename to amber/src/main/scala/org/apache/texera/amber/error/ErrorUtils.scala index d4fa4f607b7..af16044af29 100644 --- a/amber/src/main/scala/org/apache/amber/error/ErrorUtils.scala +++ b/amber/src/main/scala/org/apache/texera/amber/error/ErrorUtils.scala @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.amber.error +package org.apache.texera.amber.error import com.google.protobuf.timestamp.Timestamp -import org.apache.amber.core.virtualidentity.ActorVirtualIdentity -import org.apache.amber.engine.architecture.rpc.controlcommands.ConsoleMessage -import org.apache.amber.engine.architecture.rpc.controlcommands.ConsoleMessageType.ERROR -import org.apache.amber.engine.architecture.rpc.controlreturns.{ControlError, ErrorLanguage} -import org.apache.amber.util.VirtualIdentityUtils +import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.ConsoleMessage +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.ConsoleMessageType.ERROR +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.{ControlError, ErrorLanguage} +import org.apache.texera.amber.util.VirtualIdentityUtils import java.time.Instant import scala.util.control.ControlThrowable diff --git a/amber/src/main/scala/org/apache/texera/web/ComputingUnitMaster.scala b/amber/src/main/scala/org/apache/texera/web/ComputingUnitMaster.scala index 1e70e09e211..225f5c152a5 100644 --- a/amber/src/main/scala/org/apache/texera/web/ComputingUnitMaster.scala +++ b/amber/src/main/scala/org/apache/texera/web/ComputingUnitMaster.scala @@ -24,22 +24,22 @@ import com.typesafe.scalalogging.LazyLogging import io.dropwizard.Configuration import io.dropwizard.setup.{Bootstrap, Environment} import io.dropwizard.websockets.WebsocketBundle -import org.apache.amber.config.{ApplicationConfig, StorageConfig} -import org.apache.amber.core.storage.DocumentFactory -import org.apache.amber.core.virtualidentity.ExecutionIdentity -import org.apache.amber.core.workflow.{PhysicalPlan, WorkflowContext} -import org.apache.amber.engine.architecture.controller.ControllerConfig -import org.apache.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState.{ +import org.apache.texera.amber.config.{ApplicationConfig, StorageConfig} +import org.apache.texera.amber.core.storage.DocumentFactory +import org.apache.texera.amber.core.virtualidentity.ExecutionIdentity +import org.apache.texera.amber.core.workflow.{PhysicalPlan, WorkflowContext} +import org.apache.texera.amber.engine.architecture.controller.ControllerConfig +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState.{ COMPLETED, FAILED } -import org.apache.amber.engine.common.AmberRuntime.scheduleRecurringCallThroughActorSystem -import org.apache.amber.engine.common.Utils.maptoStatusCode -import org.apache.amber.engine.common.client.AmberClient -import org.apache.amber.engine.common.storage.SequentialRecordStorage -import org.apache.amber.engine.common.{AmberRuntime, Utils} -import org.apache.amber.util.JSONUtils.objectMapper -import org.apache.amber.util.ObjectMapperUtils +import org.apache.texera.amber.engine.common.AmberRuntime.scheduleRecurringCallThroughActorSystem +import org.apache.texera.amber.engine.common.Utils.maptoStatusCode +import org.apache.texera.amber.engine.common.client.AmberClient +import org.apache.texera.amber.engine.common.storage.SequentialRecordStorage +import org.apache.texera.amber.engine.common.{AmberRuntime, Utils} +import org.apache.texera.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.util.ObjectMapperUtils import org.apache.commons.jcs3.access.exception.InvalidArgumentException import org.apache.texera.auth.SessionUser import org.apache.texera.dao.SqlServer diff --git a/amber/src/main/scala/org/apache/texera/web/ComputingUnitWorker.scala b/amber/src/main/scala/org/apache/texera/web/ComputingUnitWorker.scala index 21eaa80ae0b..e17acb98f24 100644 --- a/amber/src/main/scala/org/apache/texera/web/ComputingUnitWorker.scala +++ b/amber/src/main/scala/org/apache/texera/web/ComputingUnitWorker.scala @@ -19,7 +19,7 @@ package org.apache.texera.web -import org.apache.amber.engine.common.AmberRuntime +import org.apache.texera.amber.engine.common.AmberRuntime import org.apache.commons.jcs3.access.exception.InvalidArgumentException import scala.annotation.tailrec diff --git a/amber/src/main/scala/org/apache/texera/web/SessionState.scala b/amber/src/main/scala/org/apache/texera/web/SessionState.scala index 99e779dfd9a..b50df866afe 100644 --- a/amber/src/main/scala/org/apache/texera/web/SessionState.scala +++ b/amber/src/main/scala/org/apache/texera/web/SessionState.scala @@ -20,7 +20,7 @@ package org.apache.texera.web import io.reactivex.rxjava3.disposables.Disposable -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.util.JSONUtils.objectMapper import org.apache.texera.dao.jooq.generated.enums.PrivilegeEnum import org.apache.texera.web.model.websocket.event.TexeraWebSocketEvent import org.apache.texera.web.service.WorkflowService diff --git a/amber/src/main/scala/org/apache/texera/web/TexeraWebApplication.scala b/amber/src/main/scala/org/apache/texera/web/TexeraWebApplication.scala index 0f69aad20e2..c2780add35d 100644 --- a/amber/src/main/scala/org/apache/texera/web/TexeraWebApplication.scala +++ b/amber/src/main/scala/org/apache/texera/web/TexeraWebApplication.scala @@ -25,9 +25,9 @@ import com.typesafe.scalalogging.LazyLogging import io.dropwizard.auth.AuthValueFactoryProvider import io.dropwizard.setup.{Bootstrap, Environment} import io.dropwizard.websockets.WebsocketBundle -import org.apache.amber.config.StorageConfig -import org.apache.amber.engine.common.Utils -import org.apache.amber.util.ObjectMapperUtils +import org.apache.texera.amber.config.StorageConfig +import org.apache.texera.amber.engine.common.Utils +import org.apache.texera.amber.util.ObjectMapperUtils import org.apache.texera.auth.SessionUser import org.apache.texera.dao.SqlServer import org.apache.texera.web.auth.JwtAuth.setupJwtAuth diff --git a/amber/src/main/scala/org/apache/texera/web/WorkflowLifecycleManager.scala b/amber/src/main/scala/org/apache/texera/web/WorkflowLifecycleManager.scala index fee2113ecdf..6f2f456dda7 100644 --- a/amber/src/main/scala/org/apache/texera/web/WorkflowLifecycleManager.scala +++ b/amber/src/main/scala/org/apache/texera/web/WorkflowLifecycleManager.scala @@ -21,10 +21,10 @@ package org.apache.texera.web import org.apache.pekko.actor.Cancellable import com.typesafe.scalalogging.LazyLogging -import org.apache.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState -import org.apache.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState.RUNNING -import org.apache.amber.engine.common.AmberRuntime -import org.apache.amber.engine.common.executionruntimestate.ExecutionMetadataStore +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState.RUNNING +import org.apache.texera.amber.engine.common.AmberRuntime +import org.apache.texera.amber.engine.common.executionruntimestate.ExecutionMetadataStore import org.apache.texera.web.storage.ExecutionStateStore import java.time.{LocalDateTime, Duration => JDuration} diff --git a/amber/src/main/scala/org/apache/texera/web/model/http/response/SchemaPropagationResponse.scala b/amber/src/main/scala/org/apache/texera/web/model/http/response/SchemaPropagationResponse.scala index 62bbb3dbabd..7cdee2cc814 100644 --- a/amber/src/main/scala/org/apache/texera/web/model/http/response/SchemaPropagationResponse.scala +++ b/amber/src/main/scala/org/apache/texera/web/model/http/response/SchemaPropagationResponse.scala @@ -19,7 +19,7 @@ package org.apache.texera.web.model.http.response -import org.apache.amber.core.tuple.Attribute +import org.apache.texera.amber.core.tuple.Attribute case class SchemaPropagationResponse( code: Int, diff --git a/amber/src/main/scala/org/apache/texera/web/model/websocket/event/PaginatedResultEvent.scala b/amber/src/main/scala/org/apache/texera/web/model/websocket/event/PaginatedResultEvent.scala index 64f67427d3d..081d072180b 100644 --- a/amber/src/main/scala/org/apache/texera/web/model/websocket/event/PaginatedResultEvent.scala +++ b/amber/src/main/scala/org/apache/texera/web/model/websocket/event/PaginatedResultEvent.scala @@ -20,7 +20,7 @@ package org.apache.texera.web.model.websocket.event import com.fasterxml.jackson.databind.node.ObjectNode -import org.apache.amber.core.tuple.Attribute +import org.apache.texera.amber.core.tuple.Attribute import org.apache.texera.web.model.websocket.request.ResultPaginationRequest object PaginatedResultEvent { diff --git a/amber/src/main/scala/org/apache/texera/web/model/websocket/event/WorkflowErrorEvent.scala b/amber/src/main/scala/org/apache/texera/web/model/websocket/event/WorkflowErrorEvent.scala index d053f2f8867..5169a1f759e 100644 --- a/amber/src/main/scala/org/apache/texera/web/model/websocket/event/WorkflowErrorEvent.scala +++ b/amber/src/main/scala/org/apache/texera/web/model/websocket/event/WorkflowErrorEvent.scala @@ -19,7 +19,7 @@ package org.apache.texera.web.model.websocket.event -import org.apache.amber.core.workflowruntimestate.WorkflowFatalError +import org.apache.texera.amber.core.workflowruntimestate.WorkflowFatalError case class WorkflowErrorEvent( fatalErrors: Seq[WorkflowFatalError] diff --git a/amber/src/main/scala/org/apache/texera/web/model/websocket/event/python/ConsoleUpdateEvent.scala b/amber/src/main/scala/org/apache/texera/web/model/websocket/event/python/ConsoleUpdateEvent.scala index ee3ace41f7c..4ec4732e358 100644 --- a/amber/src/main/scala/org/apache/texera/web/model/websocket/event/python/ConsoleUpdateEvent.scala +++ b/amber/src/main/scala/org/apache/texera/web/model/websocket/event/python/ConsoleUpdateEvent.scala @@ -19,7 +19,7 @@ package org.apache.texera.web.model.websocket.event.python -import org.apache.amber.engine.architecture.rpc.controlcommands.ConsoleMessage +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.ConsoleMessage import org.apache.texera.web.model.websocket.event.TexeraWebSocketEvent object ConsoleUpdateEvent {} diff --git a/amber/src/main/scala/org/apache/texera/web/model/websocket/request/EditingTimeCompilationRequest.scala b/amber/src/main/scala/org/apache/texera/web/model/websocket/request/EditingTimeCompilationRequest.scala index 944ab2dc1fa..e15b441fcae 100644 --- a/amber/src/main/scala/org/apache/texera/web/model/websocket/request/EditingTimeCompilationRequest.scala +++ b/amber/src/main/scala/org/apache/texera/web/model/websocket/request/EditingTimeCompilationRequest.scala @@ -19,7 +19,7 @@ package org.apache.texera.web.model.websocket.request -import org.apache.amber.operator.LogicalOp +import org.apache.texera.amber.operator.LogicalOp import org.apache.texera.workflow.LogicalLink case class EditingTimeCompilationRequest( diff --git a/amber/src/main/scala/org/apache/texera/web/model/websocket/request/ModifyLogicRequest.scala b/amber/src/main/scala/org/apache/texera/web/model/websocket/request/ModifyLogicRequest.scala index 9eb3d79e946..84ae56eecc6 100644 --- a/amber/src/main/scala/org/apache/texera/web/model/websocket/request/ModifyLogicRequest.scala +++ b/amber/src/main/scala/org/apache/texera/web/model/websocket/request/ModifyLogicRequest.scala @@ -19,6 +19,6 @@ package org.apache.texera.web.model.websocket.request -import org.apache.amber.operator.LogicalOp +import org.apache.texera.amber.operator.LogicalOp case class ModifyLogicRequest(operator: LogicalOp) extends TexeraWebSocketRequest diff --git a/amber/src/main/scala/org/apache/texera/web/model/websocket/request/WorkflowExecuteRequest.scala b/amber/src/main/scala/org/apache/texera/web/model/websocket/request/WorkflowExecuteRequest.scala index 8295950a18b..a346a1ec0a4 100644 --- a/amber/src/main/scala/org/apache/texera/web/model/websocket/request/WorkflowExecuteRequest.scala +++ b/amber/src/main/scala/org/apache/texera/web/model/websocket/request/WorkflowExecuteRequest.scala @@ -20,8 +20,8 @@ package org.apache.texera.web.model.websocket.request import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import org.apache.amber.core.workflow.WorkflowSettings -import org.apache.amber.operator.LogicalOp +import org.apache.texera.amber.core.workflow.WorkflowSettings +import org.apache.texera.amber.operator.LogicalOp import org.apache.texera.workflow.LogicalLink case class ReplayExecutionInfo( diff --git a/amber/src/main/scala/org/apache/texera/web/model/websocket/response/python/PythonExpressionEvaluateResponse.scala b/amber/src/main/scala/org/apache/texera/web/model/websocket/response/python/PythonExpressionEvaluateResponse.scala index 6f82c4fca9b..f4f4a77ab4a 100644 --- a/amber/src/main/scala/org/apache/texera/web/model/websocket/response/python/PythonExpressionEvaluateResponse.scala +++ b/amber/src/main/scala/org/apache/texera/web/model/websocket/response/python/PythonExpressionEvaluateResponse.scala @@ -19,7 +19,7 @@ package org.apache.texera.web.model.websocket.response.python -import org.apache.amber.engine.architecture.rpc.controlreturns.EvaluatedValue +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.EvaluatedValue import org.apache.texera.web.model.websocket.event.TexeraWebSocketEvent case class PythonExpressionEvaluateResponse( diff --git a/amber/src/main/scala/org/apache/texera/web/resource/CollaborationResource.scala b/amber/src/main/scala/org/apache/texera/web/resource/CollaborationResource.scala index 9b311809a9b..4ac0e8769c9 100644 --- a/amber/src/main/scala/org/apache/texera/web/resource/CollaborationResource.scala +++ b/amber/src/main/scala/org/apache/texera/web/resource/CollaborationResource.scala @@ -20,7 +20,7 @@ package org.apache.texera.web.resource import com.typesafe.scalalogging.LazyLogging -import org.apache.amber.util.JSONUtils +import org.apache.texera.amber.util.JSONUtils import org.apache.texera.dao.jooq.generated.tables.pojos.User import org.apache.texera.web.ServletAwareConfigurator import org.apache.texera.web.model.collab.event._ diff --git a/amber/src/main/scala/org/apache/texera/web/resource/SystemMetadataResource.scala b/amber/src/main/scala/org/apache/texera/web/resource/SystemMetadataResource.scala index c8c98f12028..a17cb736a8c 100644 --- a/amber/src/main/scala/org/apache/texera/web/resource/SystemMetadataResource.scala +++ b/amber/src/main/scala/org/apache/texera/web/resource/SystemMetadataResource.scala @@ -19,7 +19,7 @@ package org.apache.texera.web.resource -import org.apache.amber.operator.metadata.{AllOperatorMetadata, OperatorMetadataGenerator} +import org.apache.texera.amber.operator.metadata.{AllOperatorMetadata, OperatorMetadataGenerator} import javax.ws.rs.core.MediaType import javax.ws.rs.{GET, Path, Produces} diff --git a/amber/src/main/scala/org/apache/texera/web/resource/WorkflowWebsocketResource.scala b/amber/src/main/scala/org/apache/texera/web/resource/WorkflowWebsocketResource.scala index 473234c14f1..3a02a9a4c21 100644 --- a/amber/src/main/scala/org/apache/texera/web/resource/WorkflowWebsocketResource.scala +++ b/amber/src/main/scala/org/apache/texera/web/resource/WorkflowWebsocketResource.scala @@ -21,12 +21,12 @@ package org.apache.texera.web.resource import com.google.protobuf.timestamp.Timestamp import com.typesafe.scalalogging.LazyLogging -import org.apache.amber.clustering.ClusterListener -import org.apache.amber.core.virtualidentity.WorkflowIdentity -import org.apache.amber.core.workflowruntimestate.FatalErrorType.COMPILATION_ERROR -import org.apache.amber.core.workflowruntimestate.WorkflowFatalError -import org.apache.amber.error.ErrorUtils.getStackTraceWithAllCauses -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.clustering.ClusterListener +import org.apache.texera.amber.core.virtualidentity.WorkflowIdentity +import org.apache.texera.amber.core.workflowruntimestate.FatalErrorType.COMPILATION_ERROR +import org.apache.texera.amber.core.workflowruntimestate.WorkflowFatalError +import org.apache.texera.amber.error.ErrorUtils.getStackTraceWithAllCauses +import org.apache.texera.amber.util.JSONUtils.objectMapper import org.apache.texera.auth.util.HeaderField import org.apache.texera.dao.jooq.generated.enums.PrivilegeEnum import org.apache.texera.dao.jooq.generated.tables.pojos.User diff --git a/amber/src/main/scala/org/apache/texera/web/resource/aiassistant/AiAssistantManager.scala b/amber/src/main/scala/org/apache/texera/web/resource/aiassistant/AiAssistantManager.scala index 85fdb892b30..374525ff3ff 100644 --- a/amber/src/main/scala/org/apache/texera/web/resource/aiassistant/AiAssistantManager.scala +++ b/amber/src/main/scala/org/apache/texera/web/resource/aiassistant/AiAssistantManager.scala @@ -20,7 +20,7 @@ package org.apache.texera.web.resource.aiassistant import com.typesafe.config.Config -import org.apache.amber.config.ApplicationConfig +import org.apache.texera.amber.config.ApplicationConfig import java.net.{HttpURLConnection, URL} diff --git a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/DatasetSearchQueryBuilder.scala b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/DatasetSearchQueryBuilder.scala index 7f3a836a1cb..89fe805d58c 100644 --- a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/DatasetSearchQueryBuilder.scala +++ b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/DatasetSearchQueryBuilder.scala @@ -20,7 +20,7 @@ package org.apache.texera.web.resource.dashboard import com.typesafe.scalalogging.LazyLogging -import org.apache.amber.core.storage.util.LakeFSStorageClient +import org.apache.texera.amber.core.storage.util.LakeFSStorageClient import org.apache.texera.dao.jooq.generated.Tables.{DATASET, DATASET_USER_ACCESS} import org.apache.texera.dao.jooq.generated.enums.PrivilegeEnum import org.apache.texera.dao.jooq.generated.tables.User.USER diff --git a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/hub/HubResource.scala b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/hub/HubResource.scala index 03853aff200..e4ecc769c16 100644 --- a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/hub/HubResource.scala +++ b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/hub/HubResource.scala @@ -20,7 +20,7 @@ package org.apache.texera.web.resource.dashboard.hub import io.dropwizard.auth.Auth -import org.apache.amber.core.storage.util.LakeFSStorageClient +import org.apache.texera.amber.core.storage.util.LakeFSStorageClient import org.apache.texera.auth.SessionUser import org.apache.texera.dao.SqlServer import org.apache.texera.dao.jooq.generated.Tables._ diff --git a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowExecutionsResource.scala b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowExecutionsResource.scala index ab31ab0cd29..d4bf3ffd410 100644 --- a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowExecutionsResource.scala +++ b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowExecutionsResource.scala @@ -20,15 +20,20 @@ package org.apache.texera.web.resource.dashboard.user.workflow import io.dropwizard.auth.Auth -import org.apache.amber.core.storage.{DocumentFactory, FileResolver, VFSResourceType, VFSURIFactory} -import org.apache.amber.core.tuple.Tuple -import org.apache.amber.core.virtualidentity._ -import org.apache.amber.core.workflow.{GlobalPortIdentity, PortIdentity} -import org.apache.amber.engine.architecture.logreplay.{ReplayDestination, ReplayLogRecord} -import org.apache.amber.engine.common.Utils.{maptoStatusCode, stringToAggregatedState} -import org.apache.amber.engine.common.storage.SequentialRecordStorage -import org.apache.amber.util.JSONUtils.objectMapper -import org.apache.amber.util.serde.GlobalPortIdentitySerde.SerdeOps +import org.apache.texera.amber.core.storage.{ + DocumentFactory, + FileResolver, + VFSResourceType, + VFSURIFactory +} +import org.apache.texera.amber.core.tuple.Tuple +import org.apache.texera.amber.core.virtualidentity._ +import org.apache.texera.amber.core.workflow.{GlobalPortIdentity, PortIdentity} +import org.apache.texera.amber.engine.architecture.logreplay.{ReplayDestination, ReplayLogRecord} +import org.apache.texera.amber.engine.common.Utils.{maptoStatusCode, stringToAggregatedState} +import org.apache.texera.amber.engine.common.storage.SequentialRecordStorage +import org.apache.texera.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.util.serde.GlobalPortIdentitySerde.SerdeOps import org.apache.texera.auth.{JwtParser, SessionUser} import org.apache.texera.dao.SqlServer import org.apache.texera.dao.SqlServer.withTransaction diff --git a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowResource.scala b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowResource.scala index c6917d9390a..0f66388c852 100644 --- a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowResource.scala +++ b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowResource.scala @@ -23,8 +23,8 @@ import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.module.scala.DefaultScalaModule import com.typesafe.scalalogging.LazyLogging import io.dropwizard.auth.Auth -import org.apache.amber.core.storage.DocumentFactory -import org.apache.amber.core.virtualidentity.ExecutionIdentity +import org.apache.texera.amber.core.storage.DocumentFactory +import org.apache.texera.amber.core.virtualidentity.ExecutionIdentity import org.apache.texera.auth.SessionUser import org.apache.texera.dao.SqlServer import org.apache.texera.dao.jooq.generated.Tables._ diff --git a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowVersionResource.scala b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowVersionResource.scala index 6396a68a160..7b8141be7f5 100644 --- a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowVersionResource.scala +++ b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowVersionResource.scala @@ -21,7 +21,7 @@ package org.apache.texera.web.resource.dashboard.user.workflow import com.flipkart.zjsonpatch.{JsonDiff, JsonPatch} import io.dropwizard.auth.Auth -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.util.JSONUtils.objectMapper import org.apache.texera.auth.SessionUser import org.apache.texera.config.UserSystemConfig import org.apache.texera.dao.SqlServer diff --git a/amber/src/main/scala/org/apache/texera/web/service/EmailNotificationService.scala b/amber/src/main/scala/org/apache/texera/web/service/EmailNotificationService.scala index 55e66e99b89..8f1c49c9595 100644 --- a/amber/src/main/scala/org/apache/texera/web/service/EmailNotificationService.scala +++ b/amber/src/main/scala/org/apache/texera/web/service/EmailNotificationService.scala @@ -19,7 +19,7 @@ package org.apache.texera.web.service -import org.apache.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState import java.util.concurrent.{ExecutorService, Executors} import scala.concurrent.{ExecutionContext, Future} diff --git a/amber/src/main/scala/org/apache/texera/web/service/ExecutionConsoleService.scala b/amber/src/main/scala/org/apache/texera/web/service/ExecutionConsoleService.scala index 2f54e195ea2..1678494e937 100644 --- a/amber/src/main/scala/org/apache/texera/web/service/ExecutionConsoleService.scala +++ b/amber/src/main/scala/org/apache/texera/web/service/ExecutionConsoleService.scala @@ -22,34 +22,34 @@ package org.apache.texera.web.service import com.google.protobuf.timestamp.Timestamp import com.twitter.util.{Await, Duration} import com.typesafe.scalalogging.LazyLogging -import org.apache.amber.config.ApplicationConfig -import org.apache.amber.core.storage.model.BufferedItemWriter -import org.apache.amber.core.storage.result.ResultSchema -import org.apache.amber.core.storage.{DocumentFactory, VFSURIFactory} -import org.apache.amber.core.tuple.Tuple -import org.apache.amber.core.virtualidentity.{ActorVirtualIdentity, OperatorIdentity} -import org.apache.amber.core.workflow.WorkflowContext -import org.apache.amber.engine.architecture.controller.ExecutionStateUpdate -import org.apache.amber.engine.architecture.rpc.controlcommands.ConsoleMessageType.COMMAND -import org.apache.amber.engine.architecture.rpc.controlcommands.{ +import org.apache.texera.amber.config.ApplicationConfig +import org.apache.texera.amber.core.storage.model.BufferedItemWriter +import org.apache.texera.amber.core.storage.result.ResultSchema +import org.apache.texera.amber.core.storage.{DocumentFactory, VFSURIFactory} +import org.apache.texera.amber.core.tuple.Tuple +import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, OperatorIdentity} +import org.apache.texera.amber.core.workflow.WorkflowContext +import org.apache.texera.amber.engine.architecture.controller.ExecutionStateUpdate +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.ConsoleMessageType.COMMAND +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{ ConsoleMessage, ConsoleMessageType, EvaluatePythonExpressionRequest, DebugCommandRequest => AmberDebugCommandRequest } -import org.apache.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState -import org.apache.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState.{ +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState.{ COMPLETED, FAILED, KILLED } -import org.apache.amber.engine.common.client.AmberClient -import org.apache.amber.engine.common.executionruntimestate.{ +import org.apache.texera.amber.engine.common.client.AmberClient +import org.apache.texera.amber.engine.common.executionruntimestate.{ EvaluatedValueList, ExecutionConsoleStore, OperatorConsole } -import org.apache.amber.util.VirtualIdentityUtils +import org.apache.texera.amber.util.VirtualIdentityUtils import org.apache.texera.web.model.websocket.event.TexeraWebSocketEvent import org.apache.texera.web.model.websocket.event.python.ConsoleUpdateEvent import org.apache.texera.web.model.websocket.request.RetryRequest diff --git a/amber/src/main/scala/org/apache/texera/web/service/ExecutionReconfigurationService.scala b/amber/src/main/scala/org/apache/texera/web/service/ExecutionReconfigurationService.scala index 6c7155c2ff5..e5867277fc9 100644 --- a/amber/src/main/scala/org/apache/texera/web/service/ExecutionReconfigurationService.scala +++ b/amber/src/main/scala/org/apache/texera/web/service/ExecutionReconfigurationService.scala @@ -19,8 +19,8 @@ package org.apache.texera.web.service -import org.apache.amber.engine.architecture.controller.Workflow -import org.apache.amber.engine.common.client.AmberClient +import org.apache.texera.amber.engine.architecture.controller.Workflow +import org.apache.texera.amber.engine.common.client.AmberClient import org.apache.texera.web.SubscriptionManager import org.apache.texera.web.model.websocket.event.TexeraWebSocketEvent import org.apache.texera.web.model.websocket.request.ModifyLogicRequest @@ -112,7 +112,7 @@ class ExecutionReconfigurationService( // case (op, stateTransferFunc) => // val bytes = AmberRuntime.serde.serialize(op.opExecInitInfo).get // val protoAny = Any.of( - // "org.apache.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo", + // "org.apache.texera.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo", // ByteString.copyFrom(bytes) // ) // val stateTransferFuncOpt = stateTransferFunc.map { func => diff --git a/amber/src/main/scala/org/apache/texera/web/service/ExecutionResultService.scala b/amber/src/main/scala/org/apache/texera/web/service/ExecutionResultService.scala index 246c4e49671..b90de7e01f6 100644 --- a/amber/src/main/scala/org/apache/texera/web/service/ExecutionResultService.scala +++ b/amber/src/main/scala/org/apache/texera/web/service/ExecutionResultService.scala @@ -23,26 +23,30 @@ import org.apache.pekko.actor.Cancellable import com.fasterxml.jackson.annotation.{JsonTypeInfo, JsonTypeName} import com.fasterxml.jackson.databind.node.ObjectNode import com.typesafe.scalalogging.LazyLogging -import org.apache.amber.config.{ApplicationConfig, StorageConfig} -import org.apache.amber.core.storage.DocumentFactory.ICEBERG -import org.apache.amber.core.storage.model.VirtualDocument -import org.apache.amber.core.storage.result._ -import org.apache.amber.core.storage.{DocumentFactory, VFSURIFactory} -import org.apache.amber.core.tuple.{AttributeType, Tuple, TupleUtils} -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, OperatorIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow.OutputPort.OutputMode -import org.apache.amber.core.workflow.{PhysicalOp, PhysicalPlan, PortIdentity} -import org.apache.amber.engine.architecture.controller.{ExecutionStateUpdate, FatalError} -import org.apache.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState.{ +import org.apache.texera.amber.config.{ApplicationConfig, StorageConfig} +import org.apache.texera.amber.core.storage.DocumentFactory.ICEBERG +import org.apache.texera.amber.core.storage.model.VirtualDocument +import org.apache.texera.amber.core.storage.result._ +import org.apache.texera.amber.core.storage.{DocumentFactory, VFSURIFactory} +import org.apache.texera.amber.core.tuple.{AttributeType, Tuple, TupleUtils} +import org.apache.texera.amber.core.virtualidentity.{ + ExecutionIdentity, + OperatorIdentity, + WorkflowIdentity +} +import org.apache.texera.amber.core.workflow.OutputPort.OutputMode +import org.apache.texera.amber.core.workflow.{PhysicalOp, PhysicalPlan, PortIdentity} +import org.apache.texera.amber.engine.architecture.controller.{ExecutionStateUpdate, FatalError} +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState.{ COMPLETED, FAILED, KILLED, RUNNING, TERMINATED } -import org.apache.amber.engine.common.AmberRuntime -import org.apache.amber.engine.common.client.AmberClient -import org.apache.amber.engine.common.executionruntimestate.ExecutionMetadataStore +import org.apache.texera.amber.engine.common.AmberRuntime +import org.apache.texera.amber.engine.common.client.AmberClient +import org.apache.texera.amber.engine.common.executionruntimestate.ExecutionMetadataStore import org.apache.texera.web.SubscriptionManager import org.apache.texera.web.model.websocket.event.{ PaginatedResultEvent, diff --git a/amber/src/main/scala/org/apache/texera/web/service/ExecutionRuntimeService.scala b/amber/src/main/scala/org/apache/texera/web/service/ExecutionRuntimeService.scala index 267e63c2600..70b2f07920a 100644 --- a/amber/src/main/scala/org/apache/texera/web/service/ExecutionRuntimeService.scala +++ b/amber/src/main/scala/org/apache/texera/web/service/ExecutionRuntimeService.scala @@ -20,15 +20,15 @@ package org.apache.texera.web.service import com.typesafe.scalalogging.LazyLogging -import org.apache.amber.core.virtualidentity.EmbeddedControlMessageIdentity -import org.apache.amber.engine.architecture.controller.ExecutionStateUpdate -import org.apache.amber.engine.architecture.rpc.controlcommands.{ +import org.apache.texera.amber.core.virtualidentity.EmbeddedControlMessageIdentity +import org.apache.texera.amber.engine.architecture.controller.ExecutionStateUpdate +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{ EmptyRequest, TakeGlobalCheckpointRequest } -import org.apache.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState._ -import org.apache.amber.engine.architecture.worker.WorkflowWorker.FaultToleranceConfig -import org.apache.amber.engine.common.client.AmberClient +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState._ +import org.apache.texera.amber.engine.architecture.worker.WorkflowWorker.FaultToleranceConfig +import org.apache.texera.amber.engine.common.client.AmberClient import org.apache.texera.web.model.websocket.request._ import org.apache.texera.web.storage.ExecutionStateStore import org.apache.texera.web.storage.ExecutionStateStore.updateWorkflowState diff --git a/amber/src/main/scala/org/apache/texera/web/service/ExecutionStatsService.scala b/amber/src/main/scala/org/apache/texera/web/service/ExecutionStatsService.scala index 72d052c35a9..841c7112c7b 100644 --- a/amber/src/main/scala/org/apache/texera/web/service/ExecutionStatsService.scala +++ b/amber/src/main/scala/org/apache/texera/web/service/ExecutionStatsService.scala @@ -21,29 +21,32 @@ package org.apache.texera.web.service import com.google.protobuf.timestamp.Timestamp import com.typesafe.scalalogging.LazyLogging -import org.apache.amber.core.storage.model.BufferedItemWriter -import org.apache.amber.core.storage.result.ResultSchema -import org.apache.amber.core.storage.{DocumentFactory, VFSURIFactory} -import org.apache.amber.core.tuple.Tuple -import org.apache.amber.core.workflow.WorkflowContext -import org.apache.amber.core.workflowruntimestate.FatalErrorType.EXECUTION_FAILURE -import org.apache.amber.core.workflowruntimestate.WorkflowFatalError -import org.apache.amber.engine.architecture.controller._ -import org.apache.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState -import org.apache.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState.{ +import org.apache.texera.amber.core.storage.model.BufferedItemWriter +import org.apache.texera.amber.core.storage.result.ResultSchema +import org.apache.texera.amber.core.storage.{DocumentFactory, VFSURIFactory} +import org.apache.texera.amber.core.tuple.Tuple +import org.apache.texera.amber.core.workflow.WorkflowContext +import org.apache.texera.amber.core.workflowruntimestate.FatalErrorType.EXECUTION_FAILURE +import org.apache.texera.amber.core.workflowruntimestate.WorkflowFatalError +import org.apache.texera.amber.engine.architecture.controller._ +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState.{ COMPLETED, FAILED, KILLED } -import org.apache.amber.engine.common.Utils -import org.apache.amber.engine.common.Utils.maptoStatusCode -import org.apache.amber.engine.common.client.AmberClient -import org.apache.amber.engine.common.executionruntimestate.{ +import org.apache.texera.amber.engine.common.Utils +import org.apache.texera.amber.engine.common.Utils.maptoStatusCode +import org.apache.texera.amber.engine.common.client.AmberClient +import org.apache.texera.amber.engine.common.executionruntimestate.{ OperatorMetrics, OperatorStatistics, OperatorWorkerMapping } -import org.apache.amber.error.ErrorUtils.{getOperatorFromActorIdOpt, getStackTraceWithAllCauses} +import org.apache.texera.amber.error.ErrorUtils.{ + getOperatorFromActorIdOpt, + getStackTraceWithAllCauses +} import org.apache.texera.web.SubscriptionManager import org.apache.texera.web.model.websocket.event.{ ExecutionDurationUpdateEvent, diff --git a/amber/src/main/scala/org/apache/texera/web/service/ExecutionsMetadataPersistService.scala b/amber/src/main/scala/org/apache/texera/web/service/ExecutionsMetadataPersistService.scala index 48a79335cca..1140f5f5ccd 100644 --- a/amber/src/main/scala/org/apache/texera/web/service/ExecutionsMetadataPersistService.scala +++ b/amber/src/main/scala/org/apache/texera/web/service/ExecutionsMetadataPersistService.scala @@ -20,7 +20,7 @@ package org.apache.texera.web.service import com.typesafe.scalalogging.LazyLogging -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import org.apache.texera.dao.SqlServer import org.apache.texera.dao.jooq.generated.tables.daos.WorkflowExecutionsDao import org.apache.texera.dao.jooq.generated.tables.pojos.WorkflowExecutions diff --git a/amber/src/main/scala/org/apache/texera/web/service/FriesReconfigurationAlgorithm.scala b/amber/src/main/scala/org/apache/texera/web/service/FriesReconfigurationAlgorithm.scala index ac727dc56c6..c2a15106b19 100644 --- a/amber/src/main/scala/org/apache/texera/web/service/FriesReconfigurationAlgorithm.scala +++ b/amber/src/main/scala/org/apache/texera/web/service/FriesReconfigurationAlgorithm.scala @@ -19,13 +19,13 @@ package org.apache.texera.web.service -import org.apache.amber.core.virtualidentity.PhysicalOpIdentity -import org.apache.amber.core.workflow.PhysicalPlan -import org.apache.amber.engine.architecture.rpc.controlcommands.{ +import org.apache.texera.amber.core.virtualidentity.PhysicalOpIdentity +import org.apache.texera.amber.core.workflow.PhysicalPlan +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{ ModifyLogicRequest, PropagateEmbeddedControlMessageRequest } -import org.apache.amber.engine.architecture.scheduling.{Region, WorkflowExecutionCoordinator} +import org.apache.texera.amber.engine.architecture.scheduling.{Region, WorkflowExecutionCoordinator} import org.jgrapht.alg.connectivity.ConnectivityInspector import scala.collection.mutable diff --git a/amber/src/main/scala/org/apache/texera/web/service/ResultExportService.scala b/amber/src/main/scala/org/apache/texera/web/service/ResultExportService.scala index 92ce07fa5ad..e4fdc92da94 100644 --- a/amber/src/main/scala/org/apache/texera/web/service/ResultExportService.scala +++ b/amber/src/main/scala/org/apache/texera/web/service/ResultExportService.scala @@ -23,13 +23,13 @@ import com.fasterxml.jackson.core.`type`.TypeReference import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.module.scala.DefaultScalaModule import com.github.tototoshi.csv.CSVWriter -import org.apache.amber.config.EnvironmentalVariable -import org.apache.amber.core.storage.DocumentFactory -import org.apache.amber.core.storage.model.VirtualDocument -import org.apache.amber.core.tuple.Tuple -import org.apache.amber.core.virtualidentity.{OperatorIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow.PortIdentity -import org.apache.amber.util.ArrowUtils +import org.apache.texera.amber.config.EnvironmentalVariable +import org.apache.texera.amber.core.storage.DocumentFactory +import org.apache.texera.amber.core.storage.model.VirtualDocument +import org.apache.texera.amber.core.tuple.Tuple +import org.apache.texera.amber.core.virtualidentity.{OperatorIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow.PortIdentity +import org.apache.texera.amber.util.ArrowUtils import org.apache.arrow.memory.RootAllocator import org.apache.arrow.vector._ import org.apache.arrow.vector.ipc.ArrowFileWriter diff --git a/amber/src/main/scala/org/apache/texera/web/service/WorkflowEmailNotifier.scala b/amber/src/main/scala/org/apache/texera/web/service/WorkflowEmailNotifier.scala index 68f8067a485..af9a26286d4 100644 --- a/amber/src/main/scala/org/apache/texera/web/service/WorkflowEmailNotifier.scala +++ b/amber/src/main/scala/org/apache/texera/web/service/WorkflowEmailNotifier.scala @@ -20,8 +20,8 @@ package org.apache.texera.web.service import com.typesafe.scalalogging.LazyLogging -import org.apache.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState -import org.apache.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState._ +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState._ import org.apache.texera.web.resource.dashboard.user.workflow.WorkflowResource import org.apache.texera.web.resource.{EmailMessage, GmailResource} import org.hibernate.validator.internal.constraintvalidators.hv.EmailValidator diff --git a/amber/src/main/scala/org/apache/texera/web/service/WorkflowExecutionService.scala b/amber/src/main/scala/org/apache/texera/web/service/WorkflowExecutionService.scala index bfbff230e18..741687e02c9 100644 --- a/amber/src/main/scala/org/apache/texera/web/service/WorkflowExecutionService.scala +++ b/amber/src/main/scala/org/apache/texera/web/service/WorkflowExecutionService.scala @@ -20,14 +20,14 @@ package org.apache.texera.web.service import com.typesafe.scalalogging.LazyLogging -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow.WorkflowContext -import org.apache.amber.engine.architecture.controller.{ControllerConfig, Workflow} -import org.apache.amber.engine.architecture.rpc.controlcommands.EmptyRequest -import org.apache.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState._ -import org.apache.amber.engine.common.Utils -import org.apache.amber.engine.common.client.AmberClient -import org.apache.amber.engine.common.executionruntimestate.ExecutionMetadataStore +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow.WorkflowContext +import org.apache.texera.amber.engine.architecture.controller.{ControllerConfig, Workflow} +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.EmptyRequest +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState._ +import org.apache.texera.amber.engine.common.Utils +import org.apache.texera.amber.engine.common.client.AmberClient +import org.apache.texera.amber.engine.common.executionruntimestate.ExecutionMetadataStore import org.apache.texera.web.model.websocket.event.{ TexeraWebSocketEvent, WorkflowErrorEvent, diff --git a/amber/src/main/scala/org/apache/texera/web/service/WorkflowService.scala b/amber/src/main/scala/org/apache/texera/web/service/WorkflowService.scala index c9f1bee3463..ae67407a811 100644 --- a/amber/src/main/scala/org/apache/texera/web/service/WorkflowService.scala +++ b/amber/src/main/scala/org/apache/texera/web/service/WorkflowService.scala @@ -23,28 +23,31 @@ import com.google.protobuf.timestamp.Timestamp import com.typesafe.scalalogging.LazyLogging import io.reactivex.rxjava3.disposables.{CompositeDisposable, Disposable} import io.reactivex.rxjava3.subjects.BehaviorSubject -import org.apache.amber.config.ApplicationConfig -import org.apache.amber.core.WorkflowRuntimeException -import org.apache.amber.core.storage.DocumentFactory -import org.apache.amber.core.storage.result.iceberg.OnIceberg -import org.apache.amber.core.virtualidentity.{ +import org.apache.texera.amber.config.ApplicationConfig +import org.apache.texera.amber.core.WorkflowRuntimeException +import org.apache.texera.amber.core.storage.DocumentFactory +import org.apache.texera.amber.core.storage.result.iceberg.OnIceberg +import org.apache.texera.amber.core.virtualidentity.{ EmbeddedControlMessageIdentity, ExecutionIdentity, WorkflowIdentity } -import org.apache.amber.core.workflow.WorkflowContext -import org.apache.amber.core.workflowruntimestate.FatalErrorType.EXECUTION_FAILURE -import org.apache.amber.core.workflowruntimestate.WorkflowFatalError -import org.apache.amber.engine.architecture.controller.ControllerConfig -import org.apache.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState.{ +import org.apache.texera.amber.core.workflow.WorkflowContext +import org.apache.texera.amber.core.workflowruntimestate.FatalErrorType.EXECUTION_FAILURE +import org.apache.texera.amber.core.workflowruntimestate.WorkflowFatalError +import org.apache.texera.amber.engine.architecture.controller.ControllerConfig +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState.{ COMPLETED, FAILED } -import org.apache.amber.engine.architecture.worker.WorkflowWorker.{ +import org.apache.texera.amber.engine.architecture.worker.WorkflowWorker.{ FaultToleranceConfig, StateRestoreConfig } -import org.apache.amber.error.ErrorUtils.{getOperatorFromActorIdOpt, getStackTraceWithAllCauses} +import org.apache.texera.amber.error.ErrorUtils.{ + getOperatorFromActorIdOpt, + getStackTraceWithAllCauses +} import org.apache.texera.dao.jooq.generated.tables.pojos.User import org.apache.texera.service.util.BigObjectManager import org.apache.texera.web.model.websocket.event.TexeraWebSocketEvent diff --git a/amber/src/main/scala/org/apache/texera/web/storage/ExecutionReconfigurationStore.scala b/amber/src/main/scala/org/apache/texera/web/storage/ExecutionReconfigurationStore.scala index 9cdb191c428..946a189ae9f 100644 --- a/amber/src/main/scala/org/apache/texera/web/storage/ExecutionReconfigurationStore.scala +++ b/amber/src/main/scala/org/apache/texera/web/storage/ExecutionReconfigurationStore.scala @@ -19,9 +19,9 @@ package org.apache.texera.web.storage -import org.apache.amber.core.virtualidentity.ActorVirtualIdentity -import org.apache.amber.core.workflow.PhysicalOp -import org.apache.amber.operator.StateTransferFunc +import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity +import org.apache.texera.amber.core.workflow.PhysicalOp +import org.apache.texera.amber.operator.StateTransferFunc case class ExecutionReconfigurationStore( currentReconfigId: Option[String] = None, diff --git a/amber/src/main/scala/org/apache/texera/web/storage/ExecutionStateStore.scala b/amber/src/main/scala/org/apache/texera/web/storage/ExecutionStateStore.scala index 3700b445600..654acbbefd1 100644 --- a/amber/src/main/scala/org/apache/texera/web/storage/ExecutionStateStore.scala +++ b/amber/src/main/scala/org/apache/texera/web/storage/ExecutionStateStore.scala @@ -19,9 +19,9 @@ package org.apache.texera.web.storage -import org.apache.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState -import org.apache.amber.engine.common.Utils.maptoStatusCode -import org.apache.amber.engine.common.executionruntimestate.{ +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState +import org.apache.texera.amber.engine.common.Utils.maptoStatusCode +import org.apache.texera.amber.engine.common.executionruntimestate.{ ExecutionBreakpointStore, ExecutionConsoleStore, ExecutionMetadataStore, diff --git a/amber/src/main/scala/org/apache/texera/web/storage/StateStore.scala b/amber/src/main/scala/org/apache/texera/web/storage/StateStore.scala index 96df4068ac4..eb49e97b96f 100644 --- a/amber/src/main/scala/org/apache/texera/web/storage/StateStore.scala +++ b/amber/src/main/scala/org/apache/texera/web/storage/StateStore.scala @@ -22,7 +22,7 @@ package org.apache.texera.web.storage import io.reactivex.rxjava3.core.{Observable, Single} import io.reactivex.rxjava3.disposables.Disposable import io.reactivex.rxjava3.subjects.BehaviorSubject -import org.apache.amber.engine.common.Utils.withLock +import org.apache.texera.amber.engine.common.Utils.withLock import org.apache.texera.web.model.websocket.event.TexeraWebSocketEvent import java.util diff --git a/amber/src/main/scala/org/apache/texera/web/storage/WorkflowStateStore.scala b/amber/src/main/scala/org/apache/texera/web/storage/WorkflowStateStore.scala index b86b1481cc0..f207dfb85f4 100644 --- a/amber/src/main/scala/org/apache/texera/web/storage/WorkflowStateStore.scala +++ b/amber/src/main/scala/org/apache/texera/web/storage/WorkflowStateStore.scala @@ -19,7 +19,7 @@ package org.apache.texera.web.storage -import org.apache.amber.core.storage.result.WorkflowResultStore +import org.apache.texera.amber.core.storage.result.WorkflowResultStore // states that across executions. class WorkflowStateStore { diff --git a/amber/src/main/scala/org/apache/texera/workflow/LogicalLink.scala b/amber/src/main/scala/org/apache/texera/workflow/LogicalLink.scala index 95737bd38ec..5bbc9164b72 100644 --- a/amber/src/main/scala/org/apache/texera/workflow/LogicalLink.scala +++ b/amber/src/main/scala/org/apache/texera/workflow/LogicalLink.scala @@ -20,8 +20,8 @@ package org.apache.texera.workflow import com.fasterxml.jackson.annotation.{JsonCreator, JsonProperty} -import org.apache.amber.core.virtualidentity.OperatorIdentity -import org.apache.amber.core.workflow.PortIdentity +import org.apache.texera.amber.core.virtualidentity.OperatorIdentity +import org.apache.texera.amber.core.workflow.PortIdentity case class LogicalLink( @JsonProperty("fromOpId") fromOpId: OperatorIdentity, diff --git a/amber/src/main/scala/org/apache/texera/workflow/LogicalPlan.scala b/amber/src/main/scala/org/apache/texera/workflow/LogicalPlan.scala index 9459844596a..974d17f40a4 100644 --- a/amber/src/main/scala/org/apache/texera/workflow/LogicalPlan.scala +++ b/amber/src/main/scala/org/apache/texera/workflow/LogicalPlan.scala @@ -20,10 +20,10 @@ package org.apache.texera.workflow import com.typesafe.scalalogging.LazyLogging -import org.apache.amber.core.storage.FileResolver -import org.apache.amber.core.virtualidentity.OperatorIdentity -import org.apache.amber.operator.LogicalOp -import org.apache.amber.operator.source.scan.ScanSourceOpDesc +import org.apache.texera.amber.core.storage.FileResolver +import org.apache.texera.amber.core.virtualidentity.OperatorIdentity +import org.apache.texera.amber.operator.LogicalOp +import org.apache.texera.amber.operator.source.scan.ScanSourceOpDesc import org.apache.texera.web.model.websocket.request.LogicalPlanPojo import org.jgrapht.graph.DirectedAcyclicGraph import org.jgrapht.util.SupplierUtil 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 048fe87b392..50d07a98194 100644 --- a/amber/src/main/scala/org/apache/texera/workflow/WorkflowCompiler.scala +++ b/amber/src/main/scala/org/apache/texera/workflow/WorkflowCompiler.scala @@ -20,9 +20,9 @@ package org.apache.texera.workflow import com.typesafe.scalalogging.LazyLogging -import org.apache.amber.core.virtualidentity.OperatorIdentity -import org.apache.amber.core.workflow._ -import org.apache.amber.engine.architecture.controller.Workflow +import org.apache.texera.amber.core.virtualidentity.OperatorIdentity +import org.apache.texera.amber.core.workflow._ +import org.apache.texera.amber.engine.architecture.controller.Workflow import org.apache.texera.web.model.websocket.request.LogicalPlanPojo import scala.collection.mutable diff --git a/amber/src/test/java/org/apache/texera/web/resource/dashboard/user/dataset/GitVersionControlLocalFileStorageSpec.java b/amber/src/test/java/org/apache/texera/web/resource/dashboard/user/dataset/GitVersionControlLocalFileStorageSpec.java index 71115c36e35..a07410b1450 100644 --- a/amber/src/test/java/org/apache/texera/web/resource/dashboard/user/dataset/GitVersionControlLocalFileStorageSpec.java +++ b/amber/src/test/java/org/apache/texera/web/resource/dashboard/user/dataset/GitVersionControlLocalFileStorageSpec.java @@ -19,8 +19,8 @@ package org.apache.texera.web.resource.dashboard.user.dataset; -import org.apache.amber.core.storage.util.dataset.GitVersionControlLocalFileStorage; -import org.apache.amber.core.storage.util.dataset.PhysicalFileNode; +import org.apache.texera.amber.core.storage.util.dataset.GitVersionControlLocalFileStorage; +import org.apache.texera.amber.core.storage.util.dataset.PhysicalFileNode; import org.eclipse.jgit.api.errors.GitAPIException; import org.junit.After; import org.junit.Assert; diff --git a/amber/src/test/scala/org/apache/amber/engine/architecture/breakpoint/ExceptionBreakpointSpec.scala b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/breakpoint/ExceptionBreakpointSpec.scala similarity index 99% rename from amber/src/test/scala/org/apache/amber/engine/architecture/breakpoint/ExceptionBreakpointSpec.scala rename to amber/src/test/scala/org/apache/texera/amber/engine/architecture/breakpoint/ExceptionBreakpointSpec.scala index 8f68d1adbb3..45f0d1bcb80 100644 --- a/amber/src/test/scala/org/apache/amber/engine/architecture/breakpoint/ExceptionBreakpointSpec.scala +++ b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/breakpoint/ExceptionBreakpointSpec.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.engine.architecture.breakpoint +package org.apache.texera.amber.engine.architecture.breakpoint import org.apache.pekko.actor.ActorSystem import org.apache.pekko.event.LoggingAdapter diff --git a/amber/src/test/scala/org/apache/amber/engine/architecture/control/TrivialControlSpec.scala b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/TrivialControlSpec.scala similarity index 85% rename from amber/src/test/scala/org/apache/amber/engine/architecture/control/TrivialControlSpec.scala rename to amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/TrivialControlSpec.scala index bfaf494f758..f89b0a60ae5 100644 --- a/amber/src/test/scala/org/apache/amber/engine/architecture/control/TrivialControlSpec.scala +++ b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/TrivialControlSpec.scala @@ -17,30 +17,30 @@ * under the License. */ -package org.apache.amber.engine.architecture.control +package org.apache.texera.amber.engine.architecture.control import org.apache.pekko.actor.{ActorRef, ActorSystem, PoisonPill, Props} import org.apache.pekko.testkit.{TestKit, TestProbe} import io.grpc.MethodDescriptor -import org.apache.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} -import org.apache.amber.engine.architecture.common.WorkflowActor.{ +import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} +import org.apache.texera.amber.engine.architecture.common.WorkflowActor.{ GetActorRef, NetworkAck, NetworkMessage, RegisterActorRef } -import org.apache.amber.engine.architecture.control.utils.TrivialControlTester -import org.apache.amber.engine.architecture.rpc.controlcommands._ -import org.apache.amber.engine.architecture.rpc.controlreturns.{ +import org.apache.texera.amber.engine.architecture.control.utils.TrivialControlTester +import org.apache.texera.amber.engine.architecture.rpc.controlcommands._ +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.{ IntResponse, ReturnInvocation, StringResponse } -import org.apache.amber.engine.architecture.rpc.testerservice.RPCTesterGrpc._ -import org.apache.amber.engine.common.ambermessage.WorkflowFIFOMessage -import org.apache.amber.engine.common.ambermessage.WorkflowMessage.getInMemSize -import org.apache.amber.engine.common.rpc.AsyncRPCClient.ControlInvocation -import org.apache.amber.engine.common.virtualidentity.util.CONTROLLER +import org.apache.texera.amber.engine.architecture.rpc.testerservice.RPCTesterGrpc._ +import org.apache.texera.amber.engine.common.ambermessage.WorkflowFIFOMessage +import org.apache.texera.amber.engine.common.ambermessage.WorkflowMessage.getInMemSize +import org.apache.texera.amber.engine.common.rpc.AsyncRPCClient.ControlInvocation +import org.apache.texera.amber.engine.common.virtualidentity.util.CONTROLLER import org.scalatest.wordspec.AnyWordSpecLike import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach} diff --git a/amber/src/test/scala/org/apache/amber/engine/architecture/control/utils/ChainHandler.scala b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/ChainHandler.scala similarity index 85% rename from amber/src/test/scala/org/apache/amber/engine/architecture/control/utils/ChainHandler.scala rename to amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/ChainHandler.scala index 388a3f4f7bb..9e7eff617d9 100644 --- a/amber/src/test/scala/org/apache/amber/engine/architecture/control/utils/ChainHandler.scala +++ b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/ChainHandler.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.engine.architecture.control.utils +package org.apache.texera.amber.engine.architecture.control.utils import com.twitter.util.Future -import org.apache.amber.engine.architecture.rpc.controlcommands._ -import org.apache.amber.engine.architecture.rpc.controlreturns._ +import org.apache.texera.amber.engine.architecture.rpc.controlcommands._ +import org.apache.texera.amber.engine.architecture.rpc.controlreturns._ trait ChainHandler { this: TesterAsyncRPCHandlerInitializer => diff --git a/amber/src/test/scala/org/apache/amber/engine/architecture/control/utils/CollectHandler.scala b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/CollectHandler.scala similarity index 87% rename from amber/src/test/scala/org/apache/amber/engine/architecture/control/utils/CollectHandler.scala rename to amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/CollectHandler.scala index 1dca572249f..f36ca3c2b7b 100644 --- a/amber/src/test/scala/org/apache/amber/engine/architecture/control/utils/CollectHandler.scala +++ b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/CollectHandler.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.engine.architecture.control.utils +package org.apache.texera.amber.engine.architecture.control.utils import com.twitter.util.Future -import org.apache.amber.engine.architecture.rpc.controlcommands._ -import org.apache.amber.engine.architecture.rpc.controlreturns._ +import org.apache.texera.amber.engine.architecture.rpc.controlcommands._ +import org.apache.texera.amber.engine.architecture.rpc.controlreturns._ import scala.util.Random diff --git a/amber/src/test/scala/org/apache/amber/engine/architecture/control/utils/ErrorHandler.scala b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/ErrorHandler.scala similarity index 84% rename from amber/src/test/scala/org/apache/amber/engine/architecture/control/utils/ErrorHandler.scala rename to amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/ErrorHandler.scala index 0fc94e02d9f..a1e6b94d05e 100644 --- a/amber/src/test/scala/org/apache/amber/engine/architecture/control/utils/ErrorHandler.scala +++ b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/ErrorHandler.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.engine.architecture.control.utils +package org.apache.texera.amber.engine.architecture.control.utils import com.twitter.util.Future -import org.apache.amber.engine.architecture.rpc.controlcommands._ -import org.apache.amber.engine.architecture.rpc.controlreturns._ +import org.apache.texera.amber.engine.architecture.rpc.controlcommands._ +import org.apache.texera.amber.engine.architecture.rpc.controlreturns._ trait ErrorHandler { this: TesterAsyncRPCHandlerInitializer => diff --git a/amber/src/test/scala/org/apache/amber/engine/architecture/control/utils/MultiCallHandler.scala b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/MultiCallHandler.scala similarity index 81% rename from amber/src/test/scala/org/apache/amber/engine/architecture/control/utils/MultiCallHandler.scala rename to amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/MultiCallHandler.scala index 0d4cf0c37be..21400b83f2c 100644 --- a/amber/src/test/scala/org/apache/amber/engine/architecture/control/utils/MultiCallHandler.scala +++ b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/MultiCallHandler.scala @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.amber.engine.architecture.control.utils +package org.apache.texera.amber.engine.architecture.control.utils import com.twitter.util.Future -import org.apache.amber.core.virtualidentity.ActorVirtualIdentity -import org.apache.amber.engine.architecture.rpc.controlcommands._ -import org.apache.amber.engine.architecture.rpc.controlreturns._ +import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity +import org.apache.texera.amber.engine.architecture.rpc.controlcommands._ +import org.apache.texera.amber.engine.architecture.rpc.controlreturns._ trait MultiCallHandler { this: TesterAsyncRPCHandlerInitializer => diff --git a/amber/src/test/scala/org/apache/amber/engine/architecture/control/utils/NestedHandler.scala b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/NestedHandler.scala similarity index 86% rename from amber/src/test/scala/org/apache/amber/engine/architecture/control/utils/NestedHandler.scala rename to amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/NestedHandler.scala index 7e59d7f8c89..31aa70d4470 100644 --- a/amber/src/test/scala/org/apache/amber/engine/architecture/control/utils/NestedHandler.scala +++ b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/NestedHandler.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.engine.architecture.control.utils +package org.apache.texera.amber.engine.architecture.control.utils import com.twitter.util.Future -import org.apache.amber.engine.architecture.rpc.controlcommands._ -import org.apache.amber.engine.architecture.rpc.controlreturns._ +import org.apache.texera.amber.engine.architecture.rpc.controlcommands._ +import org.apache.texera.amber.engine.architecture.rpc.controlreturns._ trait NestedHandler { this: TesterAsyncRPCHandlerInitializer => diff --git a/amber/src/test/scala/org/apache/amber/engine/architecture/control/utils/PingPongHandler.scala b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/PingPongHandler.scala similarity index 88% rename from amber/src/test/scala/org/apache/amber/engine/architecture/control/utils/PingPongHandler.scala rename to amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/PingPongHandler.scala index c074d48bc8e..5ea7bf298e7 100644 --- a/amber/src/test/scala/org/apache/amber/engine/architecture/control/utils/PingPongHandler.scala +++ b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/PingPongHandler.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.engine.architecture.control.utils +package org.apache.texera.amber.engine.architecture.control.utils import com.twitter.util.Future -import org.apache.amber.engine.architecture.rpc.controlcommands._ -import org.apache.amber.engine.architecture.rpc.controlreturns._ +import org.apache.texera.amber.engine.architecture.rpc.controlcommands._ +import org.apache.texera.amber.engine.architecture.rpc.controlreturns._ trait PingPongHandler { this: TesterAsyncRPCHandlerInitializer => diff --git a/amber/src/test/scala/org/apache/amber/engine/architecture/control/utils/RecursionHandler.scala b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/RecursionHandler.scala similarity index 85% rename from amber/src/test/scala/org/apache/amber/engine/architecture/control/utils/RecursionHandler.scala rename to amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/RecursionHandler.scala index 7e426ad84e8..7d2b7a38e22 100644 --- a/amber/src/test/scala/org/apache/amber/engine/architecture/control/utils/RecursionHandler.scala +++ b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/RecursionHandler.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.engine.architecture.control.utils +package org.apache.texera.amber.engine.architecture.control.utils import com.twitter.util.Future -import org.apache.amber.engine.architecture.rpc.controlcommands._ -import org.apache.amber.engine.architecture.rpc.controlreturns._ +import org.apache.texera.amber.engine.architecture.rpc.controlcommands._ +import org.apache.texera.amber.engine.architecture.rpc.controlreturns._ trait RecursionHandler { this: TesterAsyncRPCHandlerInitializer => diff --git a/amber/src/test/scala/org/apache/amber/engine/architecture/control/utils/TesterAsyncRPCHandlerInitializer.scala b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/TesterAsyncRPCHandlerInitializer.scala similarity index 72% rename from amber/src/test/scala/org/apache/amber/engine/architecture/control/utils/TesterAsyncRPCHandlerInitializer.scala rename to amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/TesterAsyncRPCHandlerInitializer.scala index 5f97be1cb90..24033da6bbf 100644 --- a/amber/src/test/scala/org/apache/amber/engine/architecture/control/utils/TesterAsyncRPCHandlerInitializer.scala +++ b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/TesterAsyncRPCHandlerInitializer.scala @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.amber.engine.architecture.control.utils +package org.apache.texera.amber.engine.architecture.control.utils import com.twitter.util.Future -import org.apache.amber.core.virtualidentity.ActorVirtualIdentity -import org.apache.amber.engine.architecture.control.utils.TrivialControlTester.ControlTesterRPCClient -import org.apache.amber.engine.architecture.rpc.controlcommands.AsyncRPCContext -import org.apache.amber.engine.architecture.rpc.testerservice.RPCTesterFs2Grpc -import org.apache.amber.engine.common.rpc.{AsyncRPCHandlerInitializer, AsyncRPCServer} +import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity +import org.apache.texera.amber.engine.architecture.control.utils.TrivialControlTester.ControlTesterRPCClient +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.AsyncRPCContext +import org.apache.texera.amber.engine.architecture.rpc.testerservice.RPCTesterFs2Grpc +import org.apache.texera.amber.engine.common.rpc.{AsyncRPCHandlerInitializer, AsyncRPCServer} class TesterAsyncRPCHandlerInitializer( val myID: ActorVirtualIdentity, diff --git a/amber/src/test/scala/org/apache/amber/engine/architecture/control/utils/TrivialControlTester.scala b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/TrivialControlTester.scala similarity index 73% rename from amber/src/test/scala/org/apache/amber/engine/architecture/control/utils/TrivialControlTester.scala rename to amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/TrivialControlTester.scala index 4f37058da92..e236ac760b7 100644 --- a/amber/src/test/scala/org/apache/amber/engine/architecture/control/utils/TrivialControlTester.scala +++ b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/control/utils/TrivialControlTester.scala @@ -17,24 +17,24 @@ * under the License. */ -package org.apache.amber.engine.architecture.control.utils +package org.apache.texera.amber.engine.architecture.control.utils import com.twitter.util.Future -import org.apache.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} -import org.apache.amber.engine.architecture.common.WorkflowActor.NetworkAck -import org.apache.amber.engine.architecture.common.{AmberProcessor, WorkflowActor} -import org.apache.amber.engine.architecture.control.utils.TrivialControlTester.ControlTesterRPCClient -import org.apache.amber.engine.architecture.messaginglayer.NetworkOutputGateway -import org.apache.amber.engine.architecture.rpc.controlcommands.AsyncRPCContext -import org.apache.amber.engine.architecture.rpc.testerservice.RPCTesterFs2Grpc -import org.apache.amber.engine.common.CheckpointState -import org.apache.amber.engine.common.ambermessage.WorkflowMessage.getInMemSize -import org.apache.amber.engine.common.ambermessage.{ +import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} +import org.apache.texera.amber.engine.architecture.common.WorkflowActor.NetworkAck +import org.apache.texera.amber.engine.architecture.common.{AmberProcessor, WorkflowActor} +import org.apache.texera.amber.engine.architecture.control.utils.TrivialControlTester.ControlTesterRPCClient +import org.apache.texera.amber.engine.architecture.messaginglayer.NetworkOutputGateway +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.AsyncRPCContext +import org.apache.texera.amber.engine.architecture.rpc.testerservice.RPCTesterFs2Grpc +import org.apache.texera.amber.engine.common.CheckpointState +import org.apache.texera.amber.engine.common.ambermessage.WorkflowMessage.getInMemSize +import org.apache.texera.amber.engine.common.ambermessage.{ DataPayload, DirectControlMessagePayload, WorkflowFIFOMessage } -import org.apache.amber.engine.common.rpc.AsyncRPCClient +import org.apache.texera.amber.engine.common.rpc.AsyncRPCClient object TrivialControlTester { class ControlTesterRPCClient(outputGateway: NetworkOutputGateway, actorId: ActorVirtualIdentity) diff --git a/amber/src/test/scala/org/apache/amber/engine/architecture/controller/ControllerSpec.scala b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/controller/ControllerSpec.scala similarity index 99% rename from amber/src/test/scala/org/apache/amber/engine/architecture/controller/ControllerSpec.scala rename to amber/src/test/scala/org/apache/texera/amber/engine/architecture/controller/ControllerSpec.scala index 4be7d582162..f3f8ca5dd0d 100644 --- a/amber/src/test/scala/org/apache/amber/engine/architecture/controller/ControllerSpec.scala +++ b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/controller/ControllerSpec.scala @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.amber.engine.architecture.controller +package org.apache.texera.amber.engine.architecture.controller import org.apache.pekko.actor.{ActorSystem, Props} import org.apache.pekko.testkit.{ImplicitSender, TestKit} import org.apache.pekko.util.Timeout -import org.apache.amber.clustering.SingleNodeListener +import org.apache.texera.amber.clustering.SingleNodeListener import org.scalatest.BeforeAndAfterAll import org.scalatest.flatspec.AnyFlatSpecLike diff --git a/amber/src/test/scala/org/apache/amber/engine/architecture/messaginglayer/NetworkInputGatewaySpec.scala b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/messaginglayer/NetworkInputGatewaySpec.scala similarity index 89% rename from amber/src/test/scala/org/apache/amber/engine/architecture/messaginglayer/NetworkInputGatewaySpec.scala rename to amber/src/test/scala/org/apache/texera/amber/engine/architecture/messaginglayer/NetworkInputGatewaySpec.scala index 6ad441ca840..16791443541 100644 --- a/amber/src/test/scala/org/apache/amber/engine/architecture/messaginglayer/NetworkInputGatewaySpec.scala +++ b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/messaginglayer/NetworkInputGatewaySpec.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.engine.architecture.messaginglayer +package org.apache.texera.amber.engine.architecture.messaginglayer -import org.apache.amber.core.tuple.{AttributeType, Schema, TupleLike} -import org.apache.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} -import org.apache.amber.engine.common.ambermessage.{DataFrame, WorkflowFIFOMessage} +import org.apache.texera.amber.core.tuple.{AttributeType, Schema, TupleLike} +import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} +import org.apache.texera.amber.engine.common.ambermessage.{DataFrame, WorkflowFIFOMessage} import org.scalamock.scalatest.MockFactory import org.scalatest.flatspec.AnyFlatSpec diff --git a/amber/src/test/scala/org/apache/amber/engine/architecture/messaginglayer/OutputManagerSpec.scala b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/messaginglayer/OutputManagerSpec.scala similarity index 88% rename from amber/src/test/scala/org/apache/amber/engine/architecture/messaginglayer/OutputManagerSpec.scala rename to amber/src/test/scala/org/apache/texera/amber/engine/architecture/messaginglayer/OutputManagerSpec.scala index 8456e9302f0..405d9247068 100644 --- a/amber/src/test/scala/org/apache/amber/engine/architecture/messaginglayer/OutputManagerSpec.scala +++ b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/messaginglayer/OutputManagerSpec.scala @@ -17,19 +17,19 @@ * under the License. */ -package org.apache.amber.engine.architecture.messaginglayer +package org.apache.texera.amber.engine.architecture.messaginglayer import com.softwaremill.macwire.wire -import org.apache.amber.core.tuple.{AttributeType, Schema, TupleLike} -import org.apache.amber.core.virtualidentity.{ +import org.apache.texera.amber.core.tuple.{AttributeType, Schema, TupleLike} +import org.apache.texera.amber.core.virtualidentity.{ ActorVirtualIdentity, ChannelIdentity, OperatorIdentity, PhysicalOpIdentity } -import org.apache.amber.core.workflow.{PhysicalLink, PortIdentity} -import org.apache.amber.engine.architecture.sendsemantics.partitionings.OneToOnePartitioning -import org.apache.amber.engine.common.ambermessage._ +import org.apache.texera.amber.core.workflow.{PhysicalLink, PortIdentity} +import org.apache.texera.amber.engine.architecture.sendsemantics.partitionings.OneToOnePartitioning +import org.apache.texera.amber.engine.common.ambermessage._ import org.scalamock.scalatest.MockFactory import org.scalatest.flatspec.AnyFlatSpec diff --git a/amber/src/test/scala/org/apache/amber/engine/architecture/messaginglayer/RangeBasedShuffleSpec.scala b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/messaginglayer/RangeBasedShuffleSpec.scala similarity index 91% rename from amber/src/test/scala/org/apache/amber/engine/architecture/messaginglayer/RangeBasedShuffleSpec.scala rename to amber/src/test/scala/org/apache/texera/amber/engine/architecture/messaginglayer/RangeBasedShuffleSpec.scala index 2ca54086fda..2f906f59732 100644 --- a/amber/src/test/scala/org/apache/amber/engine/architecture/messaginglayer/RangeBasedShuffleSpec.scala +++ b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/messaginglayer/RangeBasedShuffleSpec.scala @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.amber.engine.architecture.messaginglayer +package org.apache.texera.amber.engine.architecture.messaginglayer -import org.apache.amber.core.tuple.{Attribute, AttributeType, Schema, Tuple} -import org.apache.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} -import org.apache.amber.engine.architecture.sendsemantics.partitioners.RangeBasedShufflePartitioner -import org.apache.amber.engine.architecture.sendsemantics.partitionings.RangeBasedShufflePartitioning +import org.apache.texera.amber.core.tuple.{Attribute, AttributeType, Schema, Tuple} +import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} +import org.apache.texera.amber.engine.architecture.sendsemantics.partitioners.RangeBasedShufflePartitioner +import org.apache.texera.amber.engine.architecture.sendsemantics.partitionings.RangeBasedShufflePartitioning import org.scalamock.scalatest.MockFactory import org.scalatest.flatspec.AnyFlatSpec diff --git a/amber/src/test/scala/org/apache/amber/engine/architecture/pythonworker/PythonWorkflowWorkerSpec.scala b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/pythonworker/PythonWorkflowWorkerSpec.scala similarity index 83% rename from amber/src/test/scala/org/apache/amber/engine/architecture/pythonworker/PythonWorkflowWorkerSpec.scala rename to amber/src/test/scala/org/apache/texera/amber/engine/architecture/pythonworker/PythonWorkflowWorkerSpec.scala index 0826faf9ecc..1ca0572dca6 100644 --- a/amber/src/test/scala/org/apache/amber/engine/architecture/pythonworker/PythonWorkflowWorkerSpec.scala +++ b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/pythonworker/PythonWorkflowWorkerSpec.scala @@ -17,20 +17,20 @@ * under the License. */ -//package org.apache.amber.engine.architecture.pythonworker +//package org.apache.texera.amber.engine.architecture.pythonworker // //import org.apache.pekko.actor.{ActorRef, ActorSystem, Props} //import org.apache.pekko.testkit.{ImplicitSender, TestActorRef, TestKit} -//import org.apache.amber.clustering.SingleNodeListener -//import org.apache.amber.engine.architecture.common.WorkflowActor.{NetworkAck, NetworkMessage} -//import org.apache.amber.engine.architecture.pythonworker.promisehandlers.InitializeOperatorLogicHandler.InitializeOperatorLogic -//import org.apache.amber.engine.architecture.sendsemantics.partitionings.OneToOnePartitioning -//import org.apache.amber.engine.architecture.worker.controlcommands.LinkOrdinal -//import org.apache.amber.engine.architecture.worker.promisehandlers.AddPartitioningHandler.AddPartitioning -//import org.apache.amber.engine.architecture.worker.promisehandlers.OpenOperatorHandler.OpenOperator -//import org.apache.amber.engine.architecture.worker.promisehandlers.UpdateInputLinkingHandler.UpdateInputLinking -//import org.apache.amber.engine.common.Constants -//import org.apache.amber.engine.common.ambermessage.{ +//import org.apache.texera.amber.clustering.SingleNodeListener +//import org.apache.texera.amber.engine.architecture.common.WorkflowActor.{NetworkAck, NetworkMessage} +//import org.apache.texera.amber.engine.architecture.pythonworker.promisehandlers.InitializeOperatorLogicHandler.InitializeOperatorLogic +//import org.apache.texera.amber.engine.architecture.sendsemantics.partitionings.OneToOnePartitioning +//import org.apache.texera.amber.engine.architecture.worker.controlcommands.LinkOrdinal +//import org.apache.texera.amber.engine.architecture.worker.promisehandlers.AddPartitioningHandler.AddPartitioning +//import org.apache.texera.amber.engine.architecture.worker.promisehandlers.OpenOperatorHandler.OpenOperator +//import org.apache.texera.amber.engine.architecture.worker.promisehandlers.UpdateInputLinkingHandler.UpdateInputLinking +//import org.apache.texera.amber.engine.common.Constants +//import org.apache.texera.amber.engine.common.ambermessage.{ // ChannelIdentity, // ControlPayload, // DataFrame, @@ -38,15 +38,15 @@ // EndOfUpstream, // WorkflowFIFOMessage //} -//import org.apache.amber.engine.common.rpc.AsyncRPCClient.{ControlInvocation, ReturnInvocation} -//import org.apache.amber.engine.common.virtualidentity.util.CONTROLLER -//import org.apache.amber.core.virtualidentity.{ +//import org.apache.texera.amber.engine.common.rpc.AsyncRPCClient.{ControlInvocation, ReturnInvocation} +//import org.apache.texera.amber.engine.common.virtualidentity.util.CONTROLLER +//import org.apache.texera.amber.core.virtualidentity.{ // ActorVirtualIdentity, // PhysicalLink, // PhysicalLink, // OperatorIdentity //} -//import org.apache.amber.engine.e2e.TestOperators +//import org.apache.texera.amber.engine.e2e.TestOperators //import org.apache.texera.workflow.common.tuple.Tuple //import org.apache.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} //import org.scalamock.scalatest.MockFactory diff --git a/amber/src/test/scala/org/apache/amber/engine/architecture/scheduling/CostBasedScheduleGeneratorSpec.scala b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/scheduling/CostBasedScheduleGeneratorSpec.scala similarity index 96% rename from amber/src/test/scala/org/apache/amber/engine/architecture/scheduling/CostBasedScheduleGeneratorSpec.scala rename to amber/src/test/scala/org/apache/texera/amber/engine/architecture/scheduling/CostBasedScheduleGeneratorSpec.scala index 2a9b738964b..07c1758d9e8 100644 --- a/amber/src/test/scala/org/apache/amber/engine/architecture/scheduling/CostBasedScheduleGeneratorSpec.scala +++ b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/scheduling/CostBasedScheduleGeneratorSpec.scala @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.amber.engine.architecture.scheduling +package org.apache.texera.amber.engine.architecture.scheduling -import org.apache.amber.core.workflow.{PortIdentity, WorkflowContext} -import org.apache.amber.engine.common.virtualidentity.util.CONTROLLER -import org.apache.amber.engine.e2e.TestUtils.buildWorkflow -import org.apache.amber.operator.TestOperators +import org.apache.texera.amber.core.workflow.{PortIdentity, WorkflowContext} +import org.apache.texera.amber.engine.common.virtualidentity.util.CONTROLLER +import org.apache.texera.amber.engine.e2e.TestUtils.buildWorkflow +import org.apache.texera.amber.operator.TestOperators import org.apache.texera.workflow.LogicalLink import org.scalamock.scalatest.MockFactory import org.scalatest.flatspec.AnyFlatSpec diff --git a/amber/src/test/scala/org/apache/amber/engine/architecture/scheduling/DefaultCostEstimatorSpec.scala b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/scheduling/DefaultCostEstimatorSpec.scala similarity index 91% rename from amber/src/test/scala/org/apache/amber/engine/architecture/scheduling/DefaultCostEstimatorSpec.scala rename to amber/src/test/scala/org/apache/texera/amber/engine/architecture/scheduling/DefaultCostEstimatorSpec.scala index 1f33d8c56e5..d1b2595cbb5 100644 --- a/amber/src/test/scala/org/apache/amber/engine/architecture/scheduling/DefaultCostEstimatorSpec.scala +++ b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/scheduling/DefaultCostEstimatorSpec.scala @@ -17,24 +17,24 @@ * under the License. */ -package org.apache.amber.engine.architecture.scheduling - -import org.apache.amber.core.storage.model.{BufferedItemWriter, VirtualDocument} -import org.apache.amber.core.storage.result.ResultSchema -import org.apache.amber.core.storage.{DocumentFactory, VFSURIFactory} -import org.apache.amber.core.tuple.Tuple -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow.{GlobalPortIdentity, PortIdentity, WorkflowContext} -import org.apache.amber.engine.architecture.scheduling.resourcePolicies.{ +package org.apache.texera.amber.engine.architecture.scheduling + +import org.apache.texera.amber.core.storage.model.{BufferedItemWriter, VirtualDocument} +import org.apache.texera.amber.core.storage.result.ResultSchema +import org.apache.texera.amber.core.storage.{DocumentFactory, VFSURIFactory} +import org.apache.texera.amber.core.tuple.Tuple +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow.{GlobalPortIdentity, PortIdentity, WorkflowContext} +import org.apache.texera.amber.engine.architecture.scheduling.resourcePolicies.{ DefaultResourceAllocator, ExecutionClusterInfo } -import org.apache.amber.engine.common.virtualidentity.util.CONTROLLER -import org.apache.amber.engine.e2e.TestUtils.buildWorkflow -import org.apache.amber.operator.TestOperators -import org.apache.amber.operator.aggregate.{AggregateOpDesc, AggregationFunction} -import org.apache.amber.operator.keywordSearch.KeywordSearchOpDesc -import org.apache.amber.operator.source.scan.csv.CSVScanSourceOpDesc +import org.apache.texera.amber.engine.common.virtualidentity.util.CONTROLLER +import org.apache.texera.amber.engine.e2e.TestUtils.buildWorkflow +import org.apache.texera.amber.operator.TestOperators +import org.apache.texera.amber.operator.aggregate.{AggregateOpDesc, AggregationFunction} +import org.apache.texera.amber.operator.keywordSearch.KeywordSearchOpDesc +import org.apache.texera.amber.operator.source.scan.csv.CSVScanSourceOpDesc import org.apache.texera.dao.MockTexeraDB import org.apache.texera.dao.jooq.generated.enums.UserRoleEnum import org.apache.texera.dao.jooq.generated.tables.daos._ diff --git a/amber/src/test/scala/org/apache/amber/engine/architecture/scheduling/ExpansionGreedyScheduleGeneratorSpec.scala b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/scheduling/ExpansionGreedyScheduleGeneratorSpec.scala similarity index 95% rename from amber/src/test/scala/org/apache/amber/engine/architecture/scheduling/ExpansionGreedyScheduleGeneratorSpec.scala rename to amber/src/test/scala/org/apache/texera/amber/engine/architecture/scheduling/ExpansionGreedyScheduleGeneratorSpec.scala index da00dcd4ee2..e720b9c6cb5 100644 --- a/amber/src/test/scala/org/apache/amber/engine/architecture/scheduling/ExpansionGreedyScheduleGeneratorSpec.scala +++ b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/scheduling/ExpansionGreedyScheduleGeneratorSpec.scala @@ -17,14 +17,17 @@ * under the License. */ -package org.apache.amber.engine.architecture.scheduling - -import org.apache.amber.core.virtualidentity.OperatorIdentity -import org.apache.amber.core.workflow.{PortIdentity, WorkflowContext} -import org.apache.amber.engine.e2e.TestUtils.buildWorkflow -import org.apache.amber.operator.TestOperators -import org.apache.amber.operator.split.SplitOpDesc -import org.apache.amber.operator.udf.python.{DualInputPortsPythonUDFOpDescV2, PythonUDFOpDescV2} +package org.apache.texera.amber.engine.architecture.scheduling + +import org.apache.texera.amber.core.virtualidentity.OperatorIdentity +import org.apache.texera.amber.core.workflow.{PortIdentity, WorkflowContext} +import org.apache.texera.amber.engine.e2e.TestUtils.buildWorkflow +import org.apache.texera.amber.operator.TestOperators +import org.apache.texera.amber.operator.split.SplitOpDesc +import org.apache.texera.amber.operator.udf.python.{ + DualInputPortsPythonUDFOpDescV2, + PythonUDFOpDescV2 +} import org.apache.texera.workflow.LogicalLink import org.scalamock.scalatest.MockFactory import org.scalatest.flatspec.AnyFlatSpec diff --git a/amber/src/test/scala/org/apache/amber/engine/architecture/worker/DPThreadSpec.scala b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/worker/DPThreadSpec.scala similarity index 89% rename from amber/src/test/scala/org/apache/amber/engine/architecture/worker/DPThreadSpec.scala rename to amber/src/test/scala/org/apache/texera/amber/engine/architecture/worker/DPThreadSpec.scala index 6a1e261511a..d8b5d57d638 100644 --- a/amber/src/test/scala/org/apache/amber/engine/architecture/worker/DPThreadSpec.scala +++ b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/worker/DPThreadSpec.scala @@ -17,28 +17,31 @@ * under the License. */ -package org.apache.amber.engine.architecture.worker +package org.apache.texera.amber.engine.architecture.worker -import org.apache.amber.core.executor.OperatorExecutor -import org.apache.amber.core.tuple.{AttributeType, Schema, Tuple, TupleLike} -import org.apache.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} -import org.apache.amber.core.workflow.PortIdentity -import org.apache.amber.engine.architecture.logreplay.{ReplayLogManager, ReplayLogRecord} -import org.apache.amber.engine.architecture.messaginglayer.WorkerTimerService -import org.apache.amber.engine.architecture.rpc.controlcommands.{AsyncRPCContext, EmptyRequest} -import org.apache.amber.engine.architecture.rpc.workerservice.WorkerServiceGrpc.{ +import org.apache.texera.amber.core.executor.OperatorExecutor +import org.apache.texera.amber.core.tuple.{AttributeType, Schema, Tuple, TupleLike} +import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} +import org.apache.texera.amber.core.workflow.PortIdentity +import org.apache.texera.amber.engine.architecture.logreplay.{ReplayLogManager, ReplayLogRecord} +import org.apache.texera.amber.engine.architecture.messaginglayer.WorkerTimerService +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{ + AsyncRPCContext, + EmptyRequest +} +import org.apache.texera.amber.engine.architecture.rpc.workerservice.WorkerServiceGrpc.{ METHOD_PAUSE_WORKER, METHOD_RESUME_WORKER } -import org.apache.amber.engine.architecture.worker.WorkflowWorker.{ +import org.apache.texera.amber.engine.architecture.worker.WorkflowWorker.{ DPInputQueueElement, FIFOMessageElement, TimerBasedControlElement } -import org.apache.amber.engine.common.ambermessage.{DataFrame, WorkflowFIFOMessage} -import org.apache.amber.engine.common.rpc.AsyncRPCClient.ControlInvocation -import org.apache.amber.engine.common.storage.SequentialRecordStorage -import org.apache.amber.engine.common.virtualidentity.util.SELF +import org.apache.texera.amber.engine.common.ambermessage.{DataFrame, WorkflowFIFOMessage} +import org.apache.texera.amber.engine.common.rpc.AsyncRPCClient.ControlInvocation +import org.apache.texera.amber.engine.common.storage.SequentialRecordStorage +import org.apache.texera.amber.engine.common.virtualidentity.util.SELF import org.scalamock.scalatest.MockFactory import org.scalatest.flatspec.AnyFlatSpec diff --git a/amber/src/test/scala/org/apache/amber/engine/architecture/worker/DataProcessorSpec.scala b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/worker/DataProcessorSpec.scala similarity index 85% rename from amber/src/test/scala/org/apache/amber/engine/architecture/worker/DataProcessorSpec.scala rename to amber/src/test/scala/org/apache/texera/amber/engine/architecture/worker/DataProcessorSpec.scala index d6aa86fd6d4..0f4840f9653 100644 --- a/amber/src/test/scala/org/apache/amber/engine/architecture/worker/DataProcessorSpec.scala +++ b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/worker/DataProcessorSpec.scala @@ -17,36 +17,36 @@ * under the License. */ -package org.apache.amber.engine.architecture.worker +package org.apache.texera.amber.engine.architecture.worker -import org.apache.amber.core.executor.OperatorExecutor -import org.apache.amber.core.tuple.{AttributeType, Schema, Tuple, TupleLike} -import org.apache.amber.core.virtualidentity._ -import org.apache.amber.core.workflow.PortIdentity -import org.apache.amber.core.workflow.WorkflowContext.DEFAULT_WORKFLOW_ID -import org.apache.amber.engine.architecture.logreplay.{ReplayLogManager, ReplayLogRecord} -import org.apache.amber.engine.architecture.messaginglayer.WorkerTimerService -import org.apache.amber.engine.architecture.rpc.controlcommands.{ +import org.apache.texera.amber.core.executor.OperatorExecutor +import org.apache.texera.amber.core.tuple.{AttributeType, Schema, Tuple, TupleLike} +import org.apache.texera.amber.core.virtualidentity._ +import org.apache.texera.amber.core.workflow.PortIdentity +import org.apache.texera.amber.core.workflow.WorkflowContext.DEFAULT_WORKFLOW_ID +import org.apache.texera.amber.engine.architecture.logreplay.{ReplayLogManager, ReplayLogRecord} +import org.apache.texera.amber.engine.architecture.messaginglayer.WorkerTimerService +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{ AsyncRPCContext, EmbeddedControlMessage, EmbeddedControlMessageType, EmptyRequest } -import org.apache.amber.engine.architecture.rpc.workerservice.WorkerServiceGrpc.{ +import org.apache.texera.amber.engine.architecture.rpc.workerservice.WorkerServiceGrpc.{ METHOD_END_CHANNEL, METHOD_FLUSH_NETWORK_BUFFER, METHOD_OPEN_EXECUTOR } -import org.apache.amber.engine.architecture.worker.WorkflowWorker.{ +import org.apache.texera.amber.engine.architecture.worker.WorkflowWorker.{ DPInputQueueElement, MainThreadDelegateMessage } -import org.apache.amber.engine.architecture.worker.statistics.WorkerState.READY -import org.apache.amber.engine.common.ambermessage.{DataFrame, WorkflowFIFOMessage} -import org.apache.amber.engine.common.rpc.AsyncRPCClient.ControlInvocation -import org.apache.amber.engine.common.storage.SequentialRecordStorage -import org.apache.amber.engine.common.virtualidentity.util.CONTROLLER -import org.apache.amber.util.VirtualIdentityUtils +import org.apache.texera.amber.engine.architecture.worker.statistics.WorkerState.READY +import org.apache.texera.amber.engine.common.ambermessage.{DataFrame, WorkflowFIFOMessage} +import org.apache.texera.amber.engine.common.rpc.AsyncRPCClient.ControlInvocation +import org.apache.texera.amber.engine.common.storage.SequentialRecordStorage +import org.apache.texera.amber.engine.common.virtualidentity.util.CONTROLLER +import org.apache.texera.amber.util.VirtualIdentityUtils import org.scalamock.scalatest.MockFactory import org.scalatest.BeforeAndAfterEach import org.scalatest.flatspec.AnyFlatSpec diff --git a/amber/src/test/scala/org/apache/amber/engine/architecture/worker/WorkerSpec.scala b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/worker/WorkerSpec.scala similarity index 86% rename from amber/src/test/scala/org/apache/amber/engine/architecture/worker/WorkerSpec.scala rename to amber/src/test/scala/org/apache/texera/amber/engine/architecture/worker/WorkerSpec.scala index 1bc3a160783..890fe97b852 100644 --- a/amber/src/test/scala/org/apache/amber/engine/architecture/worker/WorkerSpec.scala +++ b/amber/src/test/scala/org/apache/texera/amber/engine/architecture/worker/WorkerSpec.scala @@ -17,34 +17,38 @@ * under the License. */ -package org.apache.amber.engine.architecture.worker +package org.apache.texera.amber.engine.architecture.worker import org.apache.pekko.actor.{ActorRef, ActorSystem, Props} import org.apache.pekko.testkit.{ImplicitSender, TestActorRef, TestKit} -import org.apache.amber.clustering.SingleNodeListener -import org.apache.amber.core.executor.{OpExecWithClassName, OperatorExecutor} -import org.apache.amber.core.tuple._ -import org.apache.amber.core.virtualidentity.{ +import org.apache.texera.amber.clustering.SingleNodeListener +import org.apache.texera.amber.core.executor.{OpExecWithClassName, OperatorExecutor} +import org.apache.texera.amber.core.tuple._ +import org.apache.texera.amber.core.virtualidentity.{ ActorVirtualIdentity, ChannelIdentity, OperatorIdentity, PhysicalOpIdentity } -import org.apache.amber.core.workflow.{PhysicalLink, PortIdentity} -import org.apache.amber.engine.architecture.common.WorkflowActor.NetworkMessage -import org.apache.amber.engine.architecture.rpc.controlcommands._ -import org.apache.amber.engine.architecture.rpc.workerservice.WorkerServiceGrpc._ -import org.apache.amber.engine.architecture.scheduling.config.WorkerConfig -import org.apache.amber.engine.architecture.sendsemantics.partitionings.OneToOnePartitioning -import org.apache.amber.engine.architecture.worker.WorkflowWorker.{ +import org.apache.texera.amber.core.workflow.{PhysicalLink, PortIdentity} +import org.apache.texera.amber.engine.architecture.common.WorkflowActor.NetworkMessage +import org.apache.texera.amber.engine.architecture.rpc.controlcommands._ +import org.apache.texera.amber.engine.architecture.rpc.workerservice.WorkerServiceGrpc._ +import org.apache.texera.amber.engine.architecture.scheduling.config.WorkerConfig +import org.apache.texera.amber.engine.architecture.sendsemantics.partitionings.OneToOnePartitioning +import org.apache.texera.amber.engine.architecture.worker.WorkflowWorker.{ DPInputQueueElement, MainThreadDelegateMessage, WorkerReplayInitialization } -import org.apache.amber.engine.common.AmberRuntime -import org.apache.amber.engine.common.ambermessage.{DataFrame, DataPayload, WorkflowFIFOMessage} -import org.apache.amber.engine.common.rpc.AsyncRPCClient -import org.apache.amber.engine.common.virtualidentity.util.CONTROLLER +import org.apache.texera.amber.engine.common.AmberRuntime +import org.apache.texera.amber.engine.common.ambermessage.{ + DataFrame, + DataPayload, + WorkflowFIFOMessage +} +import org.apache.texera.amber.engine.common.rpc.AsyncRPCClient +import org.apache.texera.amber.engine.common.virtualidentity.util.CONTROLLER import org.scalamock.scalatest.MockFactory import org.scalatest.BeforeAndAfterAll import org.scalatest.flatspec.AnyFlatSpecLike @@ -193,7 +197,9 @@ class WorkerSpec METHOD_INITIALIZE_EXECUTOR, InitializeExecutorRequest( 1, - OpExecWithClassName("org.apache.amber.engine.architecture.worker.DummyOperatorExecutor"), + OpExecWithClassName( + "org.apache.texera.amber.engine.architecture.worker.DummyOperatorExecutor" + ), isSource = false ), AsyncRPCContext(CONTROLLER, identifier1), diff --git a/amber/src/test/scala/org/apache/amber/engine/e2e/BatchSizePropagationSpec.scala b/amber/src/test/scala/org/apache/texera/amber/engine/e2e/BatchSizePropagationSpec.scala similarity index 94% rename from amber/src/test/scala/org/apache/amber/engine/e2e/BatchSizePropagationSpec.scala rename to amber/src/test/scala/org/apache/texera/amber/engine/e2e/BatchSizePropagationSpec.scala index b4ac0a9541c..e9b830bdfdc 100644 --- a/amber/src/test/scala/org/apache/amber/engine/e2e/BatchSizePropagationSpec.scala +++ b/amber/src/test/scala/org/apache/texera/amber/engine/e2e/BatchSizePropagationSpec.scala @@ -17,19 +17,19 @@ * under the License. */ -package org.apache.amber.engine.e2e +package org.apache.texera.amber.engine.e2e import org.apache.pekko.actor.{ActorSystem, Props} import org.apache.pekko.testkit.{ImplicitSender, TestKit} import org.apache.pekko.util.Timeout -import org.apache.amber.clustering.SingleNodeListener -import org.apache.amber.core.workflow.{PortIdentity, WorkflowContext, WorkflowSettings} -import org.apache.amber.engine.architecture.controller._ -import org.apache.amber.engine.architecture.sendsemantics.partitionings._ -import org.apache.amber.engine.common.virtualidentity.util.CONTROLLER -import org.apache.amber.engine.e2e.TestUtils.buildWorkflow -import org.apache.amber.operator.TestOperators -import org.apache.amber.operator.aggregate.AggregationFunction +import org.apache.texera.amber.clustering.SingleNodeListener +import org.apache.texera.amber.core.workflow.{PortIdentity, WorkflowContext, WorkflowSettings} +import org.apache.texera.amber.engine.architecture.controller._ +import org.apache.texera.amber.engine.architecture.sendsemantics.partitionings._ +import org.apache.texera.amber.engine.common.virtualidentity.util.CONTROLLER +import org.apache.texera.amber.engine.e2e.TestUtils.buildWorkflow +import org.apache.texera.amber.operator.TestOperators +import org.apache.texera.amber.operator.aggregate.AggregationFunction import org.apache.texera.workflow.LogicalLink import org.scalatest.flatspec.AnyFlatSpecLike import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach} diff --git a/amber/src/test/scala/org/apache/amber/engine/e2e/DataProcessingSpec.scala b/amber/src/test/scala/org/apache/texera/amber/engine/e2e/DataProcessingSpec.scala similarity index 91% rename from amber/src/test/scala/org/apache/amber/engine/e2e/DataProcessingSpec.scala rename to amber/src/test/scala/org/apache/texera/amber/engine/e2e/DataProcessingSpec.scala index 9e27795d094..b341c1a8f67 100644 --- a/amber/src/test/scala/org/apache/amber/engine/e2e/DataProcessingSpec.scala +++ b/amber/src/test/scala/org/apache/texera/amber/engine/e2e/DataProcessingSpec.scala @@ -17,31 +17,31 @@ * under the License. */ -package org.apache.amber.engine.e2e +package org.apache.texera.amber.engine.e2e import org.apache.pekko.actor.{ActorSystem, Props} import org.apache.pekko.testkit.{ImplicitSender, TestKit} import org.apache.pekko.util.Timeout import com.twitter.util.{Await, Duration, Promise} -import org.apache.amber.clustering.SingleNodeListener -import org.apache.amber.core.storage.DocumentFactory -import org.apache.amber.core.storage.model.VirtualDocument -import org.apache.amber.core.tuple.{AttributeType, Tuple} -import org.apache.amber.core.virtualidentity.OperatorIdentity -import org.apache.amber.core.workflow.{PortIdentity, WorkflowContext} -import org.apache.amber.engine.architecture.controller._ -import org.apache.amber.engine.architecture.rpc.controlcommands.EmptyRequest -import org.apache.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState.COMPLETED -import org.apache.amber.engine.common.AmberRuntime -import org.apache.amber.engine.common.client.AmberClient -import org.apache.amber.engine.e2e.TestUtils.{ +import org.apache.texera.amber.clustering.SingleNodeListener +import org.apache.texera.amber.core.storage.DocumentFactory +import org.apache.texera.amber.core.storage.model.VirtualDocument +import org.apache.texera.amber.core.tuple.{AttributeType, Tuple} +import org.apache.texera.amber.core.virtualidentity.OperatorIdentity +import org.apache.texera.amber.core.workflow.{PortIdentity, WorkflowContext} +import org.apache.texera.amber.engine.architecture.controller._ +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.EmptyRequest +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState.COMPLETED +import org.apache.texera.amber.engine.common.AmberRuntime +import org.apache.texera.amber.engine.common.client.AmberClient +import org.apache.texera.amber.engine.e2e.TestUtils.{ buildWorkflow, cleanupWorkflowExecutionData, initiateTexeraDBForTestCases, setUpWorkflowExecutionData } -import org.apache.amber.operator.TestOperators -import org.apache.amber.operator.aggregate.AggregationFunction +import org.apache.texera.amber.operator.TestOperators +import org.apache.texera.amber.operator.aggregate.AggregationFunction import org.apache.texera.web.resource.dashboard.user.workflow.WorkflowExecutionsResource.getResultUriByLogicalPortId import org.apache.texera.workflow.LogicalLink import org.scalatest.flatspec.AnyFlatSpecLike diff --git a/amber/src/test/scala/org/apache/amber/engine/e2e/PauseSpec.scala b/amber/src/test/scala/org/apache/texera/amber/engine/e2e/PauseSpec.scala similarity index 86% rename from amber/src/test/scala/org/apache/amber/engine/e2e/PauseSpec.scala rename to amber/src/test/scala/org/apache/texera/amber/engine/e2e/PauseSpec.scala index 441d6467391..921e2de2bd1 100644 --- a/amber/src/test/scala/org/apache/amber/engine/e2e/PauseSpec.scala +++ b/amber/src/test/scala/org/apache/texera/amber/engine/e2e/PauseSpec.scala @@ -17,26 +17,29 @@ * under the License. */ -package org.apache.amber.engine.e2e +package org.apache.texera.amber.engine.e2e import org.apache.pekko.actor.{ActorSystem, Props} import org.apache.pekko.testkit.{ImplicitSender, TestKit} import org.apache.pekko.util.Timeout import com.twitter.util.{Await, Duration, Promise} import com.typesafe.scalalogging.Logger -import org.apache.amber.clustering.SingleNodeListener -import org.apache.amber.core.workflow.{PortIdentity, WorkflowContext} -import org.apache.amber.engine.architecture.controller.{ControllerConfig, ExecutionStateUpdate} -import org.apache.amber.engine.architecture.rpc.controlcommands.EmptyRequest -import org.apache.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState.COMPLETED -import org.apache.amber.engine.common.AmberRuntime -import org.apache.amber.engine.common.client.AmberClient -import org.apache.amber.engine.e2e.TestUtils.{ +import org.apache.texera.amber.clustering.SingleNodeListener +import org.apache.texera.amber.core.workflow.{PortIdentity, WorkflowContext} +import org.apache.texera.amber.engine.architecture.controller.{ + ControllerConfig, + ExecutionStateUpdate +} +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.EmptyRequest +import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState.COMPLETED +import org.apache.texera.amber.engine.common.AmberRuntime +import org.apache.texera.amber.engine.common.client.AmberClient +import org.apache.texera.amber.engine.e2e.TestUtils.{ cleanupWorkflowExecutionData, initiateTexeraDBForTestCases, setUpWorkflowExecutionData } -import org.apache.amber.operator.{LogicalOp, TestOperators} +import org.apache.texera.amber.operator.{LogicalOp, TestOperators} import org.apache.texera.workflow.LogicalLink import org.scalatest.flatspec.AnyFlatSpecLike import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach, Outcome, Retries} diff --git a/amber/src/test/scala/org/apache/amber/engine/e2e/TestUtils.scala b/amber/src/test/scala/org/apache/texera/amber/engine/e2e/TestUtils.scala similarity index 94% rename from amber/src/test/scala/org/apache/amber/engine/e2e/TestUtils.scala rename to amber/src/test/scala/org/apache/texera/amber/engine/e2e/TestUtils.scala index 03fb25bcd7e..e7d729c5e23 100644 --- a/amber/src/test/scala/org/apache/amber/engine/e2e/TestUtils.scala +++ b/amber/src/test/scala/org/apache/texera/amber/engine/e2e/TestUtils.scala @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.amber.engine.e2e +package org.apache.texera.amber.engine.e2e -import org.apache.amber.config.StorageConfig -import org.apache.amber.core.workflow.WorkflowContext -import org.apache.amber.engine.architecture.controller.Workflow -import org.apache.amber.operator.LogicalOp +import org.apache.texera.amber.config.StorageConfig +import org.apache.texera.amber.core.workflow.WorkflowContext +import org.apache.texera.amber.engine.architecture.controller.Workflow +import org.apache.texera.amber.operator.LogicalOp import org.apache.texera.dao.SqlServer import org.apache.texera.dao.jooq.generated.enums.UserRoleEnum import org.apache.texera.dao.jooq.generated.tables.daos.{ diff --git a/amber/src/test/scala/org/apache/amber/engine/faulttolerance/CheckpointSpec.scala b/amber/src/test/scala/org/apache/texera/amber/engine/faulttolerance/CheckpointSpec.scala similarity index 86% rename from amber/src/test/scala/org/apache/amber/engine/faulttolerance/CheckpointSpec.scala rename to amber/src/test/scala/org/apache/texera/amber/engine/faulttolerance/CheckpointSpec.scala index bdf9c1a6b00..ee5a0b9a609 100644 --- a/amber/src/test/scala/org/apache/amber/engine/faulttolerance/CheckpointSpec.scala +++ b/amber/src/test/scala/org/apache/texera/amber/engine/faulttolerance/CheckpointSpec.scala @@ -17,19 +17,22 @@ * under the License. */ -package org.apache.amber.engine.faulttolerance +package org.apache.texera.amber.engine.faulttolerance import org.apache.pekko.actor.{ActorSystem, Props} -import org.apache.amber.clustering.SingleNodeListener -import org.apache.amber.core.workflow.{PortIdentity, WorkflowContext} -import org.apache.amber.engine.architecture.controller.{ControllerConfig, ControllerProcessor} -import org.apache.amber.engine.architecture.worker.DataProcessor -import org.apache.amber.engine.architecture.worker.WorkflowWorker.DPInputQueueElement -import org.apache.amber.engine.common.SerializedState.{CP_STATE_KEY, DP_STATE_KEY} -import org.apache.amber.engine.common.virtualidentity.util.{CONTROLLER, SELF} -import org.apache.amber.engine.common.{AmberRuntime, CheckpointState} -import org.apache.amber.engine.e2e.TestUtils.buildWorkflow -import org.apache.amber.operator.TestOperators +import org.apache.texera.amber.clustering.SingleNodeListener +import org.apache.texera.amber.core.workflow.{PortIdentity, WorkflowContext} +import org.apache.texera.amber.engine.architecture.controller.{ + ControllerConfig, + ControllerProcessor +} +import org.apache.texera.amber.engine.architecture.worker.DataProcessor +import org.apache.texera.amber.engine.architecture.worker.WorkflowWorker.DPInputQueueElement +import org.apache.texera.amber.engine.common.SerializedState.{CP_STATE_KEY, DP_STATE_KEY} +import org.apache.texera.amber.engine.common.virtualidentity.util.{CONTROLLER, SELF} +import org.apache.texera.amber.engine.common.{AmberRuntime, CheckpointState} +import org.apache.texera.amber.engine.e2e.TestUtils.buildWorkflow +import org.apache.texera.amber.operator.TestOperators import org.apache.texera.workflow.LogicalLink import org.scalatest.BeforeAndAfterAll import org.scalatest.flatspec.AnyFlatSpecLike diff --git a/amber/src/test/scala/org/apache/amber/engine/faulttolerance/LoggingSpec.scala b/amber/src/test/scala/org/apache/texera/amber/engine/faulttolerance/LoggingSpec.scala similarity index 80% rename from amber/src/test/scala/org/apache/amber/engine/faulttolerance/LoggingSpec.scala rename to amber/src/test/scala/org/apache/texera/amber/engine/faulttolerance/LoggingSpec.scala index bb7fb38a67e..87e3ca148ee 100644 --- a/amber/src/test/scala/org/apache/amber/engine/faulttolerance/LoggingSpec.scala +++ b/amber/src/test/scala/org/apache/texera/amber/engine/faulttolerance/LoggingSpec.scala @@ -17,41 +17,41 @@ * under the License. */ -package org.apache.amber.engine.faulttolerance +package org.apache.texera.amber.engine.faulttolerance import org.apache.pekko.actor.ActorSystem import org.apache.pekko.testkit.{ImplicitSender, TestKit} -import org.apache.amber.core.tuple.{AttributeType, Schema, TupleLike} -import org.apache.amber.core.virtualidentity.{ +import org.apache.texera.amber.core.tuple.{AttributeType, Schema, TupleLike} +import org.apache.texera.amber.core.virtualidentity.{ ActorVirtualIdentity, ChannelIdentity, OperatorIdentity, PhysicalOpIdentity } -import org.apache.amber.core.workflow.{PhysicalLink, PortIdentity} -import org.apache.amber.engine.architecture.logreplay.{ReplayLogManager, ReplayLogRecord} -import org.apache.amber.engine.architecture.rpc.controlcommands.{ +import org.apache.texera.amber.core.workflow.{PhysicalLink, PortIdentity} +import org.apache.texera.amber.engine.architecture.logreplay.{ReplayLogManager, ReplayLogRecord} +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{ AddPartitioningRequest, AsyncRPCContext, EmptyRequest } -import org.apache.amber.engine.architecture.rpc.controllerservice.ControllerServiceGrpc.METHOD_WORKER_EXECUTION_COMPLETED -import org.apache.amber.engine.architecture.rpc.workerservice.WorkerServiceGrpc.{ +import org.apache.texera.amber.engine.architecture.rpc.controllerservice.ControllerServiceGrpc.METHOD_WORKER_EXECUTION_COMPLETED +import org.apache.texera.amber.engine.architecture.rpc.workerservice.WorkerServiceGrpc.{ METHOD_ADD_PARTITIONING, METHOD_PAUSE_WORKER, METHOD_RESUME_WORKER, METHOD_START_WORKER } -import org.apache.amber.engine.architecture.sendsemantics.partitionings.OneToOnePartitioning -import org.apache.amber.engine.common.AmberRuntime -import org.apache.amber.engine.common.ambermessage.{ +import org.apache.texera.amber.engine.architecture.sendsemantics.partitionings.OneToOnePartitioning +import org.apache.texera.amber.engine.common.AmberRuntime +import org.apache.texera.amber.engine.common.ambermessage.{ DataFrame, WorkflowFIFOMessage, WorkflowFIFOMessagePayload } -import org.apache.amber.engine.common.rpc.AsyncRPCClient.ControlInvocation -import org.apache.amber.engine.common.storage.SequentialRecordStorage -import org.apache.amber.engine.common.virtualidentity.util.{CONTROLLER, SELF} +import org.apache.texera.amber.engine.common.rpc.AsyncRPCClient.ControlInvocation +import org.apache.texera.amber.engine.common.storage.SequentialRecordStorage +import org.apache.texera.amber.engine.common.virtualidentity.util.{CONTROLLER, SELF} import org.scalatest.BeforeAndAfterAll import org.scalatest.concurrent.TimeLimitedTests import org.scalatest.flatspec.AnyFlatSpecLike diff --git a/amber/src/test/scala/org/apache/amber/engine/faulttolerance/ReplaySpec.scala b/amber/src/test/scala/org/apache/texera/amber/engine/faulttolerance/ReplaySpec.scala similarity index 83% rename from amber/src/test/scala/org/apache/amber/engine/faulttolerance/ReplaySpec.scala rename to amber/src/test/scala/org/apache/texera/amber/engine/faulttolerance/ReplaySpec.scala index f567a091fe4..57c97d4d444 100644 --- a/amber/src/test/scala/org/apache/amber/engine/faulttolerance/ReplaySpec.scala +++ b/amber/src/test/scala/org/apache/texera/amber/engine/faulttolerance/ReplaySpec.scala @@ -17,25 +17,28 @@ * under the License. */ -package org.apache.amber.engine.faulttolerance +package org.apache.texera.amber.engine.faulttolerance import org.apache.pekko.actor.ActorSystem import org.apache.pekko.testkit.{ImplicitSender, TestKit} -import org.apache.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} -import org.apache.amber.engine.architecture.logreplay.{ +import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} +import org.apache.texera.amber.engine.architecture.logreplay.{ ProcessingStep, ReplayLogManagerImpl, ReplayLogRecord, ReplayOrderEnforcer } -import org.apache.amber.engine.architecture.messaginglayer.NetworkInputGateway -import org.apache.amber.engine.architecture.rpc.controlcommands.{AsyncRPCContext, EmptyRequest} -import org.apache.amber.engine.architecture.rpc.workerservice.WorkerServiceGrpc.METHOD_START_WORKER -import org.apache.amber.engine.common.ambermessage.WorkflowFIFOMessage -import org.apache.amber.engine.common.rpc.AsyncRPCClient.ControlInvocation -import org.apache.amber.engine.common.storage.SequentialRecordStorage -import org.apache.amber.engine.common.storage.SequentialRecordStorage.SequentialRecordReader -import org.apache.amber.engine.common.virtualidentity.util.CONTROLLER +import org.apache.texera.amber.engine.architecture.messaginglayer.NetworkInputGateway +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{ + AsyncRPCContext, + EmptyRequest +} +import org.apache.texera.amber.engine.architecture.rpc.workerservice.WorkerServiceGrpc.METHOD_START_WORKER +import org.apache.texera.amber.engine.common.ambermessage.WorkflowFIFOMessage +import org.apache.texera.amber.engine.common.rpc.AsyncRPCClient.ControlInvocation +import org.apache.texera.amber.engine.common.storage.SequentialRecordStorage +import org.apache.texera.amber.engine.common.storage.SequentialRecordStorage.SequentialRecordReader +import org.apache.texera.amber.engine.common.virtualidentity.util.CONTROLLER import org.scalatest.BeforeAndAfterAll import org.scalatest.flatspec.AnyFlatSpecLike diff --git a/amber/src/test/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowVersionResourceSpec.scala b/amber/src/test/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowVersionResourceSpec.scala index c08b4a7b1ad..ecf704f663b 100644 --- a/amber/src/test/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowVersionResourceSpec.scala +++ b/amber/src/test/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowVersionResourceSpec.scala @@ -19,7 +19,7 @@ package org.apache.texera.web.resource.dashboard.user.workflow -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.util.JSONUtils.objectMapper import org.apache.texera.dao.MockTexeraDB import org.apache.texera.dao.jooq.generated.Tables import org.apache.texera.dao.jooq.generated.tables.daos.{WorkflowDao, WorkflowVersionDao} diff --git a/amber/src/test/scala/org/apache/texera/web/service/ExecutionConsoleServiceSpec.scala b/amber/src/test/scala/org/apache/texera/web/service/ExecutionConsoleServiceSpec.scala index 7ba7886eff2..d4753984cf1 100644 --- a/amber/src/test/scala/org/apache/texera/web/service/ExecutionConsoleServiceSpec.scala +++ b/amber/src/test/scala/org/apache/texera/web/service/ExecutionConsoleServiceSpec.scala @@ -20,8 +20,11 @@ package org.apache.texera.web.service import com.google.protobuf.timestamp.Timestamp -import org.apache.amber.engine.architecture.rpc.controlcommands.{ConsoleMessage, ConsoleMessageType} -import org.apache.amber.engine.common.executionruntimestate.ExecutionConsoleStore +import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{ + ConsoleMessage, + ConsoleMessageType +} +import org.apache.texera.amber.engine.common.executionruntimestate.ExecutionConsoleStore import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers diff --git a/amber/src/test/scala/org/apache/texera/web/service/ExecutionResultServiceSpec.scala b/amber/src/test/scala/org/apache/texera/web/service/ExecutionResultServiceSpec.scala index 21e12bac59b..d9b3f60e6ff 100644 --- a/amber/src/test/scala/org/apache/texera/web/service/ExecutionResultServiceSpec.scala +++ b/amber/src/test/scala/org/apache/texera/web/service/ExecutionResultServiceSpec.scala @@ -19,7 +19,7 @@ package org.apache.texera.web.service -import org.apache.amber.core.tuple.{Attribute, AttributeType, Schema, Tuple} +import org.apache.texera.amber.core.tuple.{Attribute, AttributeType, Schema, Tuple} import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers diff --git a/amber/src/test/scala/org/apache/texera/workflow/common/storage/ReadonlyLocalFileDocumentSpec.scala b/amber/src/test/scala/org/apache/texera/workflow/common/storage/ReadonlyLocalFileDocumentSpec.scala index 95d8e509621..a5837bed8b8 100644 --- a/amber/src/test/scala/org/apache/texera/workflow/common/storage/ReadonlyLocalFileDocumentSpec.scala +++ b/amber/src/test/scala/org/apache/texera/workflow/common/storage/ReadonlyLocalFileDocumentSpec.scala @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.amber.engine.common.storage +package org.apache.texera.amber.engine.common.storage -import org.apache.amber.core.storage.DocumentFactory -import org.apache.amber.core.storage.model.ReadonlyVirtualDocument +import org.apache.texera.amber.core.storage.DocumentFactory +import org.apache.texera.amber.core.storage.model.ReadonlyVirtualDocument import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers diff --git a/common/config/src/main/resources/cluster.conf b/common/config/src/main/resources/cluster.conf index e2fb2df803f..adf42fccde8 100644 --- a/common/config/src/main/resources/cluster.conf +++ b/common/config/src/main/resources/cluster.conf @@ -76,4 +76,4 @@ pekko { } } -pekko-kryo-serialization.kryo-initializer = "org.apache.amber.engine.common.AmberKryoInitializer" +pekko-kryo-serialization.kryo-initializer = "org.apache.texera.amber.engine.common.AmberKryoInitializer" diff --git a/common/config/src/main/scala/org/apache/amber/config/AkkaConfig.scala b/common/config/src/main/scala/org/apache/texera/amber/config/AkkaConfig.scala similarity index 96% rename from common/config/src/main/scala/org/apache/amber/config/AkkaConfig.scala rename to common/config/src/main/scala/org/apache/texera/amber/config/AkkaConfig.scala index 65a20b5f6ba..7f2097063a9 100644 --- a/common/config/src/main/scala/org/apache/amber/config/AkkaConfig.scala +++ b/common/config/src/main/scala/org/apache/texera/amber/config/AkkaConfig.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.amber.config +package org.apache.texera.amber.config import com.typesafe.config.{Config, ConfigFactory} diff --git a/common/config/src/main/scala/org/apache/amber/config/ApplicationConfig.scala b/common/config/src/main/scala/org/apache/texera/amber/config/ApplicationConfig.scala similarity index 99% rename from common/config/src/main/scala/org/apache/amber/config/ApplicationConfig.scala rename to common/config/src/main/scala/org/apache/texera/amber/config/ApplicationConfig.scala index 4e75186687b..415a23d23c3 100644 --- a/common/config/src/main/scala/org/apache/amber/config/ApplicationConfig.scala +++ b/common/config/src/main/scala/org/apache/texera/amber/config/ApplicationConfig.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.amber.config +package org.apache.texera.amber.config import com.typesafe.config.{Config, ConfigFactory} diff --git a/common/config/src/main/scala/org/apache/amber/config/EnvironmentalVariable.scala b/common/config/src/main/scala/org/apache/texera/amber/config/EnvironmentalVariable.scala similarity index 99% rename from common/config/src/main/scala/org/apache/amber/config/EnvironmentalVariable.scala rename to common/config/src/main/scala/org/apache/texera/amber/config/EnvironmentalVariable.scala index a239cc635c8..099e12260d2 100644 --- a/common/config/src/main/scala/org/apache/amber/config/EnvironmentalVariable.scala +++ b/common/config/src/main/scala/org/apache/texera/amber/config/EnvironmentalVariable.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.amber.config +package org.apache.texera.amber.config // Environment variable names for all the *.conf files // TODO: currently these values are hard-coded, it would be good to have a way to dynamically load these names to avoid 2-copy diff --git a/common/config/src/main/scala/org/apache/amber/config/StorageConfig.scala b/common/config/src/main/scala/org/apache/texera/amber/config/StorageConfig.scala similarity index 98% rename from common/config/src/main/scala/org/apache/amber/config/StorageConfig.scala rename to common/config/src/main/scala/org/apache/texera/amber/config/StorageConfig.scala index e5df6506701..c5bd3302862 100644 --- a/common/config/src/main/scala/org/apache/amber/config/StorageConfig.scala +++ b/common/config/src/main/scala/org/apache/texera/amber/config/StorageConfig.scala @@ -16,10 +16,10 @@ * limitations under the License. */ -package org.apache.amber.config +package org.apache.texera.amber.config import com.typesafe.config.{Config, ConfigFactory} -import org.apache.amber.util.ConfigParserUtil.parseSizeStringToBytes +import org.apache.texera.amber.util.ConfigParserUtil.parseSizeStringToBytes import java.nio.file.Path diff --git a/common/config/src/main/scala/org/apache/amber/config/UdfConfig.scala b/common/config/src/main/scala/org/apache/texera/amber/config/UdfConfig.scala similarity index 97% rename from common/config/src/main/scala/org/apache/amber/config/UdfConfig.scala rename to common/config/src/main/scala/org/apache/texera/amber/config/UdfConfig.scala index 5558c74fb67..2c4035d2224 100644 --- a/common/config/src/main/scala/org/apache/amber/config/UdfConfig.scala +++ b/common/config/src/main/scala/org/apache/texera/amber/config/UdfConfig.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.amber.config +package org.apache.texera.amber.config import com.typesafe.config.{Config, ConfigFactory} diff --git a/common/config/src/main/scala/org/apache/amber/util/ConfigParserUtil.scala b/common/config/src/main/scala/org/apache/texera/amber/util/ConfigParserUtil.scala similarity index 97% rename from common/config/src/main/scala/org/apache/amber/util/ConfigParserUtil.scala rename to common/config/src/main/scala/org/apache/texera/amber/util/ConfigParserUtil.scala index 5c2eba6e45f..b1a90cd6125 100644 --- a/common/config/src/main/scala/org/apache/amber/util/ConfigParserUtil.scala +++ b/common/config/src/main/scala/org/apache/texera/amber/util/ConfigParserUtil.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.amber.util +package org.apache.texera.amber.util object ConfigParserUtil { def parseSizeStringToBytes(size: String): Long = { diff --git a/common/workflow-core/src/main/protobuf/org/apache/amber/core/executor.proto b/common/workflow-core/src/main/protobuf/org/apache/texera/amber/core/executor.proto similarity index 93% rename from common/workflow-core/src/main/protobuf/org/apache/amber/core/executor.proto rename to common/workflow-core/src/main/protobuf/org/apache/texera/amber/core/executor.proto index dce7dda8ffe..20504c8c1c4 100644 --- a/common/workflow-core/src/main/protobuf/org/apache/amber/core/executor.proto +++ b/common/workflow-core/src/main/protobuf/org/apache/texera/amber/core/executor.proto @@ -16,10 +16,10 @@ // under the License. syntax = "proto3"; -package org.apache.amber.core; +package org.apache.texera.amber.core; -import "org/apache/amber/core/virtualidentity.proto"; +import "org/apache/texera/amber/core/virtualidentity.proto"; import "scalapb/scalapb.proto"; option (scalapb.options) = { diff --git a/common/workflow-core/src/main/protobuf/org/apache/amber/core/virtualidentity.proto b/common/workflow-core/src/main/protobuf/org/apache/texera/amber/core/virtualidentity.proto similarity index 97% rename from common/workflow-core/src/main/protobuf/org/apache/amber/core/virtualidentity.proto rename to common/workflow-core/src/main/protobuf/org/apache/texera/amber/core/virtualidentity.proto index f09e106faab..3103606a4ac 100644 --- a/common/workflow-core/src/main/protobuf/org/apache/amber/core/virtualidentity.proto +++ b/common/workflow-core/src/main/protobuf/org/apache/texera/amber/core/virtualidentity.proto @@ -17,7 +17,7 @@ syntax = "proto3"; -package org.apache.amber.core; +package org.apache.texera.amber.core; import "scalapb/scalapb.proto"; diff --git a/common/workflow-core/src/main/protobuf/org/apache/amber/core/workflow.proto b/common/workflow-core/src/main/protobuf/org/apache/texera/amber/core/workflow.proto similarity index 95% rename from common/workflow-core/src/main/protobuf/org/apache/amber/core/workflow.proto rename to common/workflow-core/src/main/protobuf/org/apache/texera/amber/core/workflow.proto index 349edd804dd..984536fca72 100644 --- a/common/workflow-core/src/main/protobuf/org/apache/amber/core/workflow.proto +++ b/common/workflow-core/src/main/protobuf/org/apache/texera/amber/core/workflow.proto @@ -17,9 +17,9 @@ syntax = "proto3"; -package org.apache.amber.core; +package org.apache.texera.amber.core; -import "org/apache/amber/core/virtualidentity.proto"; +import "org/apache/texera/amber/core/virtualidentity.proto"; import "scalapb/scalapb.proto"; option (scalapb.options) = { diff --git a/common/workflow-core/src/main/protobuf/org/apache/amber/core/workflowruntimestate.proto b/common/workflow-core/src/main/protobuf/org/apache/texera/amber/core/workflowruntimestate.proto similarity index 97% rename from common/workflow-core/src/main/protobuf/org/apache/amber/core/workflowruntimestate.proto rename to common/workflow-core/src/main/protobuf/org/apache/texera/amber/core/workflowruntimestate.proto index 607d8ffbdc7..6c6105de847 100644 --- a/common/workflow-core/src/main/protobuf/org/apache/amber/core/workflowruntimestate.proto +++ b/common/workflow-core/src/main/protobuf/org/apache/texera/amber/core/workflowruntimestate.proto @@ -17,7 +17,7 @@ syntax = "proto3"; -package org.apache.amber.core; +package org.apache.texera.amber.core; import "google/protobuf/timestamp.proto"; import "scalapb/scalapb.proto"; diff --git a/common/workflow-core/src/main/scala/org/apache/amber/core/WorkflowRuntimeException.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/WorkflowRuntimeException.scala similarity index 93% rename from common/workflow-core/src/main/scala/org/apache/amber/core/WorkflowRuntimeException.scala rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/WorkflowRuntimeException.scala index 373d1ee7012..80d5cce0e17 100644 --- a/common/workflow-core/src/main/scala/org/apache/amber/core/WorkflowRuntimeException.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/WorkflowRuntimeException.scala @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.amber.core +package org.apache.texera.amber.core -import org.apache.amber.core.virtualidentity.ActorVirtualIdentity +import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity class WorkflowRuntimeException( val message: String, diff --git a/common/workflow-core/src/main/scala/org/apache/amber/core/executor/ExecFactory.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/executor/ExecFactory.scala similarity index 97% rename from common/workflow-core/src/main/scala/org/apache/amber/core/executor/ExecFactory.scala rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/executor/ExecFactory.scala index 5cb6aea594a..88deaf7bebf 100644 --- a/common/workflow-core/src/main/scala/org/apache/amber/core/executor/ExecFactory.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/executor/ExecFactory.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.core.executor +package org.apache.texera.amber.core.executor object ExecFactory { diff --git a/common/workflow-core/src/main/scala/org/apache/amber/core/executor/JavaRuntimeCompilation.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/executor/JavaRuntimeCompilation.scala similarity index 97% rename from common/workflow-core/src/main/scala/org/apache/amber/core/executor/JavaRuntimeCompilation.scala rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/executor/JavaRuntimeCompilation.scala index 3bed3e92e0f..eb50c273f9f 100644 --- a/common/workflow-core/src/main/scala/org/apache/amber/core/executor/JavaRuntimeCompilation.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/executor/JavaRuntimeCompilation.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.core.executor +package org.apache.texera.amber.core.executor import java.io.ByteArrayOutputStream import java.net.URI @@ -28,7 +28,7 @@ object JavaRuntimeCompilation { val compiler: JavaCompiler = ToolProvider.getSystemJavaCompiler def compileCode(code: String): Class[_] = { - val packageName = "org.apache.amber.operators.udf.java" + val packageName = "org.apache.texera.amber.operators.udf.java" //to hide it from user we will append the package in the udf code. val codeToCompile = s"package $packageName;\n$code" diff --git a/common/workflow-core/src/main/scala/org/apache/amber/core/executor/OperatorExecutor.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/executor/OperatorExecutor.scala similarity index 88% rename from common/workflow-core/src/main/scala/org/apache/amber/core/executor/OperatorExecutor.scala rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/executor/OperatorExecutor.scala index 69e62a8f308..f99739acc04 100644 --- a/common/workflow-core/src/main/scala/org/apache/amber/core/executor/OperatorExecutor.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/executor/OperatorExecutor.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.core.executor +package org.apache.texera.amber.core.executor -import org.apache.amber.core.state.State -import org.apache.amber.core.tuple.{Tuple, TupleLike} -import org.apache.amber.core.workflow.PortIdentity +import org.apache.texera.amber.core.state.State +import org.apache.texera.amber.core.tuple.{Tuple, TupleLike} +import org.apache.texera.amber.core.workflow.PortIdentity trait OperatorExecutor { diff --git a/common/workflow-core/src/main/scala/org/apache/amber/core/executor/SourceOperatorExecutor.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/executor/SourceOperatorExecutor.scala similarity index 90% rename from common/workflow-core/src/main/scala/org/apache/amber/core/executor/SourceOperatorExecutor.scala rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/executor/SourceOperatorExecutor.scala index 82bc6886078..633314679a4 100644 --- a/common/workflow-core/src/main/scala/org/apache/amber/core/executor/SourceOperatorExecutor.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/executor/SourceOperatorExecutor.scala @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.amber.core.executor +package org.apache.texera.amber.core.executor -import org.apache.amber.core.tuple.{Tuple, TupleLike} -import org.apache.amber.core.workflow.PortIdentity +import org.apache.texera.amber.core.tuple.{Tuple, TupleLike} +import org.apache.texera.amber.core.workflow.PortIdentity trait SourceOperatorExecutor extends OperatorExecutor { override def open(): Unit = {} diff --git a/common/workflow-core/src/main/scala/org/apache/amber/core/state/State.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/state/State.scala similarity index 93% rename from common/workflow-core/src/main/scala/org/apache/amber/core/state/State.scala rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/state/State.scala index 5e33f91f4c9..3226c9d2fe7 100644 --- a/common/workflow-core/src/main/scala/org/apache/amber/core/state/State.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/state/State.scala @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.amber.core.state +package org.apache.texera.amber.core.state -import org.apache.amber.core.tuple.{Attribute, AttributeType, Schema, Tuple} +import org.apache.texera.amber.core.tuple.{Attribute, AttributeType, Schema, Tuple} import scala.collection.mutable diff --git a/common/workflow-core/src/main/scala/org/apache/amber/core/storage/DocumentFactory.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/DocumentFactory.scala similarity index 91% rename from common/workflow-core/src/main/scala/org/apache/amber/core/storage/DocumentFactory.scala rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/DocumentFactory.scala index 7c343b13df1..a828ab12b7d 100644 --- a/common/workflow-core/src/main/scala/org/apache/amber/core/storage/DocumentFactory.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/DocumentFactory.scala @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.amber.core.storage - -import org.apache.amber.config.StorageConfig -import org.apache.amber.core.storage.FileResolver.DATASET_FILE_URI_SCHEME -import org.apache.amber.core.storage.VFSResourceType._ -import org.apache.amber.core.storage.VFSURIFactory.{VFS_FILE_URI_SCHEME, decodeURI} -import org.apache.amber.core.storage.model._ -import org.apache.amber.core.storage.result.iceberg.IcebergDocument -import org.apache.amber.core.tuple.{Schema, Tuple} -import org.apache.amber.util.IcebergUtil +package org.apache.texera.amber.core.storage + +import org.apache.texera.amber.config.StorageConfig +import org.apache.texera.amber.core.storage.FileResolver.DATASET_FILE_URI_SCHEME +import org.apache.texera.amber.core.storage.VFSResourceType._ +import org.apache.texera.amber.core.storage.VFSURIFactory.{VFS_FILE_URI_SCHEME, decodeURI} +import org.apache.texera.amber.core.storage.model._ +import org.apache.texera.amber.core.storage.result.iceberg.IcebergDocument +import org.apache.texera.amber.core.tuple.{Schema, Tuple} +import org.apache.texera.amber.util.IcebergUtil import org.apache.iceberg.data.Record import org.apache.iceberg.{Schema => IcebergSchema} diff --git a/common/workflow-core/src/main/scala/org/apache/amber/core/storage/FileResolver.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/FileResolver.scala similarity index 99% rename from common/workflow-core/src/main/scala/org/apache/amber/core/storage/FileResolver.scala rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/FileResolver.scala index bbd47fa3eea..cda5b28779b 100644 --- a/common/workflow-core/src/main/scala/org/apache/amber/core/storage/FileResolver.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/FileResolver.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.core.storage +package org.apache.texera.amber.core.storage import org.apache.commons.vfs2.FileNotFoundException import org.apache.texera.dao.SqlServer diff --git a/common/workflow-core/src/main/scala/org/apache/amber/core/storage/IcebergCatalogInstance.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/IcebergCatalogInstance.scala similarity index 94% rename from common/workflow-core/src/main/scala/org/apache/amber/core/storage/IcebergCatalogInstance.scala rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/IcebergCatalogInstance.scala index 94233c3e4de..e3512874c9b 100644 --- a/common/workflow-core/src/main/scala/org/apache/amber/core/storage/IcebergCatalogInstance.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/IcebergCatalogInstance.scala @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.amber.core.storage +package org.apache.texera.amber.core.storage -import org.apache.amber.config.StorageConfig -import org.apache.amber.util.IcebergUtil +import org.apache.texera.amber.config.StorageConfig +import org.apache.texera.amber.util.IcebergUtil import org.apache.iceberg.catalog.Catalog /** diff --git a/common/workflow-core/src/main/scala/org/apache/amber/core/storage/VFSURIFactory.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/VFSURIFactory.scala similarity index 93% rename from common/workflow-core/src/main/scala/org/apache/amber/core/storage/VFSURIFactory.scala rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/VFSURIFactory.scala index 4ebb369ac4c..3513ac5ecd8 100644 --- a/common/workflow-core/src/main/scala/org/apache/amber/core/storage/VFSURIFactory.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/VFSURIFactory.scala @@ -17,12 +17,16 @@ * under the License. */ -package org.apache.amber.core.storage +package org.apache.texera.amber.core.storage -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, OperatorIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow.GlobalPortIdentity -import org.apache.amber.util.serde.GlobalPortIdentitySerde -import org.apache.amber.util.serde.GlobalPortIdentitySerde.SerdeOps +import org.apache.texera.amber.core.virtualidentity.{ + ExecutionIdentity, + OperatorIdentity, + WorkflowIdentity +} +import org.apache.texera.amber.core.workflow.GlobalPortIdentity +import org.apache.texera.amber.util.serde.GlobalPortIdentitySerde +import org.apache.texera.amber.util.serde.GlobalPortIdentitySerde.SerdeOps import java.net.URI diff --git a/common/workflow-core/src/main/scala/org/apache/amber/core/storage/model/BufferedItemWriter.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/model/BufferedItemWriter.scala similarity index 97% rename from common/workflow-core/src/main/scala/org/apache/amber/core/storage/model/BufferedItemWriter.scala rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/model/BufferedItemWriter.scala index 303e457c5fd..cfcd19fb9be 100644 --- a/common/workflow-core/src/main/scala/org/apache/amber/core/storage/model/BufferedItemWriter.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/model/BufferedItemWriter.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.core.storage.model +package org.apache.texera.amber.core.storage.model /** * BufferedItemWriter provides an interface for writing items to a buffer and performing I/O operations. diff --git a/common/workflow-core/src/main/scala/org/apache/amber/core/storage/model/DatasetFileDocument.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/model/DatasetFileDocument.scala similarity index 95% rename from common/workflow-core/src/main/scala/org/apache/amber/core/storage/model/DatasetFileDocument.scala rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/model/DatasetFileDocument.scala index 5faf95570be..b62b6583658 100644 --- a/common/workflow-core/src/main/scala/org/apache/amber/core/storage/model/DatasetFileDocument.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/model/DatasetFileDocument.scala @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.amber.core.storage.model +package org.apache.texera.amber.core.storage.model import com.typesafe.scalalogging.LazyLogging -import org.apache.amber.config.EnvironmentalVariable -import org.apache.amber.core.storage.model.DatasetFileDocument.{ +import org.apache.texera.amber.config.EnvironmentalVariable +import org.apache.texera.amber.core.storage.model.DatasetFileDocument.{ fileServiceGetPresignURLEndpoint, userJwtToken } -import org.apache.amber.core.storage.util.LakeFSStorageClient -import org.apache.amber.core.storage.util.dataset.GitVersionControlLocalFileStorage +import org.apache.texera.amber.core.storage.util.LakeFSStorageClient +import org.apache.texera.amber.core.storage.util.dataset.GitVersionControlLocalFileStorage import java.io.{File, FileOutputStream, InputStream} import java.net._ diff --git a/common/workflow-core/src/main/scala/org/apache/amber/core/storage/model/OnDataset.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/model/OnDataset.scala similarity index 94% rename from common/workflow-core/src/main/scala/org/apache/amber/core/storage/model/OnDataset.scala rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/model/OnDataset.scala index 945194a82de..6c19ee1002b 100644 --- a/common/workflow-core/src/main/scala/org/apache/amber/core/storage/model/OnDataset.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/model/OnDataset.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.core.storage.model +package org.apache.texera.amber.core.storage.model trait OnDataset { def getRepositoryName(): String diff --git a/common/workflow-core/src/main/scala/org/apache/amber/core/storage/model/ReadonlyLocalFileDocument.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/model/ReadonlyLocalFileDocument.scala similarity index 97% rename from common/workflow-core/src/main/scala/org/apache/amber/core/storage/model/ReadonlyLocalFileDocument.scala rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/model/ReadonlyLocalFileDocument.scala index adc9dceb258..75302656c4f 100644 --- a/common/workflow-core/src/main/scala/org/apache/amber/core/storage/model/ReadonlyLocalFileDocument.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/model/ReadonlyLocalFileDocument.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.core.storage.model +package org.apache.texera.amber.core.storage.model import java.io.{File, FileInputStream, InputStream} import java.net.URI diff --git a/common/workflow-core/src/main/scala/org/apache/amber/core/storage/model/ReadonlyVirtualDocument.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/model/ReadonlyVirtualDocument.scala similarity index 97% rename from common/workflow-core/src/main/scala/org/apache/amber/core/storage/model/ReadonlyVirtualDocument.scala rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/model/ReadonlyVirtualDocument.scala index 51f81e148ad..19710e2fc18 100644 --- a/common/workflow-core/src/main/scala/org/apache/amber/core/storage/model/ReadonlyVirtualDocument.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/model/ReadonlyVirtualDocument.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.core.storage.model +package org.apache.texera.amber.core.storage.model import java.io.{File, InputStream} import java.net.URI diff --git a/common/workflow-core/src/main/scala/org/apache/amber/core/storage/model/VirtualCollection.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/model/VirtualCollection.scala similarity index 96% rename from common/workflow-core/src/main/scala/org/apache/amber/core/storage/model/VirtualCollection.scala rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/model/VirtualCollection.scala index 24f6a541b49..c5d6b107e77 100644 --- a/common/workflow-core/src/main/scala/org/apache/amber/core/storage/model/VirtualCollection.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/model/VirtualCollection.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.core.storage.model +package org.apache.texera.amber.core.storage.model import java.net.URI diff --git a/common/workflow-core/src/main/scala/org/apache/amber/core/storage/model/VirtualDocument.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/model/VirtualDocument.scala similarity index 99% rename from common/workflow-core/src/main/scala/org/apache/amber/core/storage/model/VirtualDocument.scala rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/model/VirtualDocument.scala index 4b7e11e4a0b..c0407c37d20 100644 --- a/common/workflow-core/src/main/scala/org/apache/amber/core/storage/model/VirtualDocument.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/model/VirtualDocument.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.core.storage.model +package org.apache.texera.amber.core.storage.model import java.io.{File, InputStream} import java.net.URI diff --git a/common/workflow-core/src/main/scala/org/apache/amber/core/storage/result/ResultSchema.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/result/ResultSchema.scala similarity index 92% rename from common/workflow-core/src/main/scala/org/apache/amber/core/storage/result/ResultSchema.scala rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/result/ResultSchema.scala index 8282d660626..ade33283f7f 100644 --- a/common/workflow-core/src/main/scala/org/apache/amber/core/storage/result/ResultSchema.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/result/ResultSchema.scala @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.amber.core.storage.result +package org.apache.texera.amber.core.storage.result -import org.apache.amber.core.tuple.{Attribute, AttributeType, Schema} +import org.apache.texera.amber.core.tuple.{Attribute, AttributeType, Schema} object ResultSchema { val runtimeStatisticsSchema: Schema = new Schema( diff --git a/common/workflow-core/src/main/scala/org/apache/amber/core/storage/result/WorkflowResultStore.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/result/WorkflowResultStore.scala similarity index 89% rename from common/workflow-core/src/main/scala/org/apache/amber/core/storage/result/WorkflowResultStore.scala rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/result/WorkflowResultStore.scala index 88589db5906..c0d7d0edf8c 100644 --- a/common/workflow-core/src/main/scala/org/apache/amber/core/storage/result/WorkflowResultStore.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/result/WorkflowResultStore.scala @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.amber.core.storage.result +package org.apache.texera.amber.core.storage.result -import org.apache.amber.core.virtualidentity.OperatorIdentity +import org.apache.texera.amber.core.virtualidentity.OperatorIdentity case class OperatorResultMetadata(tupleCount: Int = 0, changeDetector: String = "") diff --git a/common/workflow-core/src/main/scala/org/apache/amber/core/storage/result/iceberg/IcebergDocument.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/result/iceberg/IcebergDocument.scala similarity index 98% rename from common/workflow-core/src/main/scala/org/apache/amber/core/storage/result/iceberg/IcebergDocument.scala rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/result/iceberg/IcebergDocument.scala index a05e0cdfdde..cef8273afb2 100644 --- a/common/workflow-core/src/main/scala/org/apache/amber/core/storage/result/iceberg/IcebergDocument.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/result/iceberg/IcebergDocument.scala @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.amber.core.storage.result.iceberg +package org.apache.texera.amber.core.storage.result.iceberg -import org.apache.amber.core.storage.IcebergCatalogInstance -import org.apache.amber.core.storage.model.{BufferedItemWriter, VirtualDocument} -import org.apache.amber.core.storage.util.StorageUtil.{withLock, withReadLock, withWriteLock} -import org.apache.amber.util.IcebergUtil +import org.apache.texera.amber.core.storage.IcebergCatalogInstance +import org.apache.texera.amber.core.storage.model.{BufferedItemWriter, VirtualDocument} +import org.apache.texera.amber.core.storage.util.StorageUtil.{withLock, withReadLock, withWriteLock} +import org.apache.texera.amber.util.IcebergUtil import org.apache.commons.io.IOUtils import org.apache.iceberg.catalog.{Catalog, TableIdentifier} import org.apache.iceberg.data.Record diff --git a/common/workflow-core/src/main/scala/org/apache/amber/core/storage/result/iceberg/IcebergTableWriter.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/result/iceberg/IcebergTableWriter.scala similarity index 95% rename from common/workflow-core/src/main/scala/org/apache/amber/core/storage/result/iceberg/IcebergTableWriter.scala rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/result/iceberg/IcebergTableWriter.scala index 19a91ba8071..549cb4b9d17 100644 --- a/common/workflow-core/src/main/scala/org/apache/amber/core/storage/result/iceberg/IcebergTableWriter.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/result/iceberg/IcebergTableWriter.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.core.storage.result.iceberg +package org.apache.texera.amber.core.storage.result.iceberg -import org.apache.amber.config.StorageConfig -import org.apache.amber.core.storage.model.BufferedItemWriter -import org.apache.amber.util.IcebergUtil +import org.apache.texera.amber.config.StorageConfig +import org.apache.texera.amber.core.storage.model.BufferedItemWriter +import org.apache.texera.amber.util.IcebergUtil import org.apache.iceberg.catalog.Catalog import org.apache.iceberg.data.Record import org.apache.iceberg.data.parquet.GenericParquetWriter diff --git a/common/workflow-core/src/main/scala/org/apache/amber/core/storage/result/iceberg/OnIceberg.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/result/iceberg/OnIceberg.scala similarity index 94% rename from common/workflow-core/src/main/scala/org/apache/amber/core/storage/result/iceberg/OnIceberg.scala rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/result/iceberg/OnIceberg.scala index 37cacc38316..2c00a1b0929 100644 --- a/common/workflow-core/src/main/scala/org/apache/amber/core/storage/result/iceberg/OnIceberg.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/result/iceberg/OnIceberg.scala @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.amber.core.storage.result.iceberg +package org.apache.texera.amber.core.storage.result.iceberg -import org.apache.amber.util.IcebergUtil +import org.apache.texera.amber.util.IcebergUtil import org.apache.iceberg.exceptions.NoSuchTableException trait OnIceberg { diff --git a/common/workflow-core/src/main/scala/org/apache/amber/core/storage/util/LakeFSStorageClient.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/util/LakeFSStorageClient.scala similarity index 99% rename from common/workflow-core/src/main/scala/org/apache/amber/core/storage/util/LakeFSStorageClient.scala rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/util/LakeFSStorageClient.scala index 3933cc06eb8..63c09f4c30b 100644 --- a/common/workflow-core/src/main/scala/org/apache/amber/core/storage/util/LakeFSStorageClient.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/util/LakeFSStorageClient.scala @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.amber.core.storage.util +package org.apache.texera.amber.core.storage.util import io.lakefs.clients.sdk._ import io.lakefs.clients.sdk.model.ResetCreation.TypeEnum import io.lakefs.clients.sdk.model._ -import org.apache.amber.config.StorageConfig +import org.apache.texera.amber.config.StorageConfig import java.io.{File, FileOutputStream, InputStream} import java.nio.file.Files diff --git a/common/workflow-core/src/main/scala/org/apache/amber/core/storage/util/StorageUtil.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/util/StorageUtil.scala similarity index 96% rename from common/workflow-core/src/main/scala/org/apache/amber/core/storage/util/StorageUtil.scala rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/util/StorageUtil.scala index 218bd0ad3ba..fb75794c372 100644 --- a/common/workflow-core/src/main/scala/org/apache/amber/core/storage/util/StorageUtil.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/util/StorageUtil.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.core.storage.util +package org.apache.texera.amber.core.storage.util import java.util.concurrent.locks.{Lock, ReadWriteLock} diff --git a/common/workflow-core/src/main/scala/org/apache/amber/core/storage/util/dataset/GitVersionControlLocalFileStorage.java b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/util/dataset/GitVersionControlLocalFileStorage.java similarity index 99% rename from common/workflow-core/src/main/scala/org/apache/amber/core/storage/util/dataset/GitVersionControlLocalFileStorage.java rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/util/dataset/GitVersionControlLocalFileStorage.java index 469f606aff5..72566dd2d70 100644 --- a/common/workflow-core/src/main/scala/org/apache/amber/core/storage/util/dataset/GitVersionControlLocalFileStorage.java +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/util/dataset/GitVersionControlLocalFileStorage.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.core.storage.util.dataset; +package org.apache.texera.amber.core.storage.util.dataset; import org.eclipse.jgit.api.errors.GitAPIException; diff --git a/common/workflow-core/src/main/scala/org/apache/amber/core/storage/util/dataset/JGitVersionControl.java b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/util/dataset/JGitVersionControl.java similarity index 99% rename from common/workflow-core/src/main/scala/org/apache/amber/core/storage/util/dataset/JGitVersionControl.java rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/util/dataset/JGitVersionControl.java index 209414b2650..4b438ae537c 100644 --- a/common/workflow-core/src/main/scala/org/apache/amber/core/storage/util/dataset/JGitVersionControl.java +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/util/dataset/JGitVersionControl.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.core.storage.util.dataset; +package org.apache.texera.amber.core.storage.util.dataset; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.ResetCommand; diff --git a/common/workflow-core/src/main/scala/org/apache/amber/core/storage/util/dataset/PhysicalFileNode.java b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/util/dataset/PhysicalFileNode.java similarity index 98% rename from common/workflow-core/src/main/scala/org/apache/amber/core/storage/util/dataset/PhysicalFileNode.java rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/util/dataset/PhysicalFileNode.java index e369d1a9eda..07510335c1e 100644 --- a/common/workflow-core/src/main/scala/org/apache/amber/core/storage/util/dataset/PhysicalFileNode.java +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/storage/util/dataset/PhysicalFileNode.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.core.storage.util.dataset; +package org.apache.texera.amber.core.storage.util.dataset; import java.nio.file.Files; import java.nio.file.Path; diff --git a/common/workflow-core/src/main/scala/org/apache/amber/core/tuple/Attribute.java b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/tuple/Attribute.java similarity index 98% rename from common/workflow-core/src/main/scala/org/apache/amber/core/tuple/Attribute.java rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/tuple/Attribute.java index dab5c96c64a..84d52fddced 100644 --- a/common/workflow-core/src/main/scala/org/apache/amber/core/tuple/Attribute.java +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/tuple/Attribute.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.core.tuple; +package org.apache.texera.amber.core.tuple; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/common/workflow-core/src/main/scala/org/apache/amber/core/tuple/AttributeType.java b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/tuple/AttributeType.java similarity index 99% rename from common/workflow-core/src/main/scala/org/apache/amber/core/tuple/AttributeType.java rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/tuple/AttributeType.java index 64fa921d461..fa8f93ea9e8 100644 --- a/common/workflow-core/src/main/scala/org/apache/amber/core/tuple/AttributeType.java +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/tuple/AttributeType.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.core.tuple; +package org.apache.texera.amber.core.tuple; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/common/workflow-core/src/main/scala/org/apache/amber/core/tuple/AttributeTypeUtils.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/tuple/AttributeTypeUtils.scala similarity index 99% rename from common/workflow-core/src/main/scala/org/apache/amber/core/tuple/AttributeTypeUtils.scala rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/tuple/AttributeTypeUtils.scala index b959c38981b..41c04c41e85 100644 --- a/common/workflow-core/src/main/scala/org/apache/amber/core/tuple/AttributeTypeUtils.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/tuple/AttributeTypeUtils.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.core.tuple +package org.apache.texera.amber.core.tuple import com.github.sisyphsu.dateparser.DateParserUtils diff --git a/common/workflow-core/src/main/scala/org/apache/amber/core/tuple/BigObject.java b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/tuple/BigObject.java similarity index 96% rename from common/workflow-core/src/main/scala/org/apache/amber/core/tuple/BigObject.java rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/tuple/BigObject.java index 2be14dc167c..4feb5673ab6 100644 --- a/common/workflow-core/src/main/scala/org/apache/amber/core/tuple/BigObject.java +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/tuple/BigObject.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.amber.core.tuple; +package org.apache.texera.amber.core.tuple; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; -import org.apache.amber.core.executor.OperatorExecutor; +import org.apache.texera.amber.core.executor.OperatorExecutor; import org.apache.texera.service.util.BigObjectManager; import java.net.URI; diff --git a/common/workflow-core/src/main/scala/org/apache/amber/core/tuple/Schema.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/tuple/Schema.scala similarity index 99% rename from common/workflow-core/src/main/scala/org/apache/amber/core/tuple/Schema.scala rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/tuple/Schema.scala index 0bdf84a9eba..1dd38fbfe47 100644 --- a/common/workflow-core/src/main/scala/org/apache/amber/core/tuple/Schema.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/tuple/Schema.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.core.tuple +package org.apache.texera.amber.core.tuple import com.fasterxml.jackson.annotation.{JsonCreator, JsonIgnore, JsonProperty} import com.google.common.base.Preconditions.checkNotNull diff --git a/common/workflow-core/src/main/scala/org/apache/amber/core/tuple/Tuple.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/tuple/Tuple.scala similarity index 98% rename from common/workflow-core/src/main/scala/org/apache/amber/core/tuple/Tuple.scala rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/tuple/Tuple.scala index 7bee0a0fc53..cc3220827d0 100644 --- a/common/workflow-core/src/main/scala/org/apache/amber/core/tuple/Tuple.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/tuple/Tuple.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.core.tuple +package org.apache.texera.amber.core.tuple import com.fasterxml.jackson.annotation.{JsonCreator, JsonIgnore, JsonProperty} import com.google.common.base.Preconditions.checkNotNull -import org.apache.amber.core.tuple.Tuple.checkSchemaMatchesFields +import org.apache.texera.amber.core.tuple.Tuple.checkSchemaMatchesFields import org.ehcache.sizeof.SizeOf import java.util diff --git a/common/workflow-core/src/main/scala/org/apache/amber/core/tuple/TupleLike.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/tuple/TupleLike.scala similarity index 98% rename from common/workflow-core/src/main/scala/org/apache/amber/core/tuple/TupleLike.scala rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/tuple/TupleLike.scala index a96da69d407..040b94977a1 100644 --- a/common/workflow-core/src/main/scala/org/apache/amber/core/tuple/TupleLike.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/tuple/TupleLike.scala @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.amber.core.tuple +package org.apache.texera.amber.core.tuple -import org.apache.amber.core.workflow.PortIdentity +import org.apache.texera.amber.core.workflow.PortIdentity import scala.jdk.CollectionConverters.CollectionHasAsScala diff --git a/common/workflow-core/src/main/scala/org/apache/amber/core/tuple/TupleUtils.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/tuple/TupleUtils.scala similarity index 91% rename from common/workflow-core/src/main/scala/org/apache/amber/core/tuple/TupleUtils.scala rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/tuple/TupleUtils.scala index e33de58362b..6938dcc6ca8 100644 --- a/common/workflow-core/src/main/scala/org/apache/amber/core/tuple/TupleUtils.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/tuple/TupleUtils.scala @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.amber.core.tuple +package org.apache.texera.amber.core.tuple import com.fasterxml.jackson.databind.JsonNode import com.fasterxml.jackson.databind.node.ObjectNode -import org.apache.amber.core.tuple.AttributeTypeUtils.{inferSchemaFromRows, parseField} -import org.apache.amber.util.JSONUtils -import org.apache.amber.util.JSONUtils.{JSONToMap, objectMapper} +import org.apache.texera.amber.core.tuple.AttributeTypeUtils.{inferSchemaFromRows, parseField} +import org.apache.texera.amber.util.JSONUtils +import org.apache.texera.amber.util.JSONUtils.{JSONToMap, objectMapper} import scala.collection.mutable.ArrayBuffer diff --git a/common/workflow-core/src/main/scala/org/apache/amber/core/workflow/LocationPreference.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/LocationPreference.scala similarity index 96% rename from common/workflow-core/src/main/scala/org/apache/amber/core/workflow/LocationPreference.scala rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/LocationPreference.scala index 7a9ea1a8b47..a8308d3f3fd 100644 --- a/common/workflow-core/src/main/scala/org/apache/amber/core/workflow/LocationPreference.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/LocationPreference.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.core.workflow +package org.apache.texera.amber.core.workflow // LocationPreference defines where operators should run. sealed trait LocationPreference extends Serializable diff --git a/common/workflow-core/src/main/scala/org/apache/amber/core/workflow/PartitionInfo.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/PartitionInfo.scala similarity index 98% rename from common/workflow-core/src/main/scala/org/apache/amber/core/workflow/PartitionInfo.scala rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/PartitionInfo.scala index 90f3f3a5bdc..90210c7a9b7 100644 --- a/common/workflow-core/src/main/scala/org/apache/amber/core/workflow/PartitionInfo.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/PartitionInfo.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.core.workflow +package org.apache.texera.amber.core.workflow import com.fasterxml.jackson.annotation.JsonSubTypes.Type import com.fasterxml.jackson.annotation.{JsonSubTypes, JsonTypeInfo} diff --git a/common/workflow-core/src/main/scala/org/apache/amber/core/workflow/PhysicalOp.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/PhysicalOp.scala similarity index 98% rename from common/workflow-core/src/main/scala/org/apache/amber/core/workflow/PhysicalOp.scala rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/PhysicalOp.scala index 82d5b638e10..0ac04c7a630 100644 --- a/common/workflow-core/src/main/scala/org/apache/amber/core/workflow/PhysicalOp.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/PhysicalOp.scala @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.amber.core.workflow +package org.apache.texera.amber.core.workflow import com.fasterxml.jackson.annotation.{JsonIgnore, JsonIgnoreProperties} import com.typesafe.scalalogging.LazyLogging -import org.apache.amber.core.executor.{OpExecInitInfo, OpExecWithCode} -import org.apache.amber.core.tuple.Schema -import org.apache.amber.core.virtualidentity.{ +import org.apache.texera.amber.core.executor.{OpExecInitInfo, OpExecWithCode} +import org.apache.texera.amber.core.tuple.Schema +import org.apache.texera.amber.core.virtualidentity.{ ExecutionIdentity, OperatorIdentity, PhysicalOpIdentity, diff --git a/common/workflow-core/src/main/scala/org/apache/amber/core/workflow/PhysicalPlan.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/PhysicalPlan.scala similarity index 98% rename from common/workflow-core/src/main/scala/org/apache/amber/core/workflow/PhysicalPlan.scala rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/PhysicalPlan.scala index 5cbea5aca64..5a2a2a61b28 100644 --- a/common/workflow-core/src/main/scala/org/apache/amber/core/workflow/PhysicalPlan.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/PhysicalPlan.scala @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.amber.core.workflow +package org.apache.texera.amber.core.workflow import com.fasterxml.jackson.annotation.JsonIgnore import com.typesafe.scalalogging.LazyLogging -import org.apache.amber.core.tuple.Schema -import org.apache.amber.core.virtualidentity.{ +import org.apache.texera.amber.core.tuple.Schema +import org.apache.texera.amber.core.virtualidentity.{ ActorVirtualIdentity, OperatorIdentity, PhysicalOpIdentity } -import org.apache.amber.util.VirtualIdentityUtils +import org.apache.texera.amber.util.VirtualIdentityUtils import org.jgrapht.alg.connectivity.BiconnectivityInspector import org.jgrapht.alg.shortestpath.AllDirectedPaths import org.jgrapht.graph.DirectedAcyclicGraph diff --git a/common/workflow-core/src/main/scala/org/apache/amber/core/workflow/WorkflowContext.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/WorkflowContext.scala similarity index 87% rename from common/workflow-core/src/main/scala/org/apache/amber/core/workflow/WorkflowContext.scala rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/WorkflowContext.scala index fcc1737ae9c..ee7659d0ca9 100644 --- a/common/workflow-core/src/main/scala/org/apache/amber/core/workflow/WorkflowContext.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/WorkflowContext.scala @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.amber.core.workflow +package org.apache.texera.amber.core.workflow -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow.WorkflowContext.{ +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow.WorkflowContext.{ DEFAULT_EXECUTION_ID, DEFAULT_WORKFLOW_ID, DEFAULT_WORKFLOW_SETTINGS diff --git a/common/workflow-core/src/main/scala/org/apache/amber/core/workflow/WorkflowSettings.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/WorkflowSettings.scala similarity index 95% rename from common/workflow-core/src/main/scala/org/apache/amber/core/workflow/WorkflowSettings.scala rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/WorkflowSettings.scala index 679da0d3ee2..88ebcb068f4 100644 --- a/common/workflow-core/src/main/scala/org/apache/amber/core/workflow/WorkflowSettings.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/WorkflowSettings.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.core.workflow +package org.apache.texera.amber.core.workflow case class WorkflowSettings( dataTransferBatchSize: Int, diff --git a/common/workflow-core/src/main/scala/org/apache/amber/util/ArrowUtils.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/util/ArrowUtils.scala similarity index 98% rename from common/workflow-core/src/main/scala/org/apache/amber/util/ArrowUtils.scala rename to common/workflow-core/src/main/scala/org/apache/texera/amber/util/ArrowUtils.scala index 25443d5dc7f..8e306c12a56 100644 --- a/common/workflow-core/src/main/scala/org/apache/amber/util/ArrowUtils.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/util/ArrowUtils.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.util +package org.apache.texera.amber.util import com.typesafe.scalalogging.LazyLogging -import org.apache.amber.core.tuple.AttributeTypeUtils.AttributeTypeException -import org.apache.amber.core.tuple._ +import org.apache.texera.amber.core.tuple.AttributeTypeUtils.AttributeTypeException +import org.apache.texera.amber.core.tuple._ import org.apache.arrow.memory.{BufferAllocator, RootAllocator} import org.apache.arrow.vector.types.FloatingPointPrecision import org.apache.arrow.vector.types.TimeUnit.MILLISECOND diff --git a/common/workflow-core/src/main/scala/org/apache/amber/util/IcebergUtil.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/util/IcebergUtil.scala similarity index 98% rename from common/workflow-core/src/main/scala/org/apache/amber/util/IcebergUtil.scala rename to common/workflow-core/src/main/scala/org/apache/texera/amber/util/IcebergUtil.scala index 7216530a91a..19ed81efa48 100644 --- a/common/workflow-core/src/main/scala/org/apache/amber/util/IcebergUtil.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/util/IcebergUtil.scala @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.amber.util +package org.apache.texera.amber.util -import org.apache.amber.config.StorageConfig -import org.apache.amber.core.tuple.{Attribute, AttributeType, BigObject, Schema, Tuple} +import org.apache.texera.amber.config.StorageConfig +import org.apache.texera.amber.core.tuple.{Attribute, AttributeType, BigObject, Schema, Tuple} import org.apache.hadoop.conf.Configuration import org.apache.iceberg.catalog.{Catalog, TableIdentifier} import org.apache.iceberg.data.parquet.GenericParquetReaders diff --git a/common/workflow-core/src/main/scala/org/apache/amber/util/JSONUtils.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/util/JSONUtils.scala similarity index 96% rename from common/workflow-core/src/main/scala/org/apache/amber/util/JSONUtils.scala rename to common/workflow-core/src/main/scala/org/apache/texera/amber/util/JSONUtils.scala index bcd09b8f2b8..1f99726ea7a 100644 --- a/common/workflow-core/src/main/scala/org/apache/amber/util/JSONUtils.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/util/JSONUtils.scala @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.amber.util +package org.apache.texera.amber.util import com.fasterxml.jackson.annotation.JsonInclude.Include import com.fasterxml.jackson.databind.module.SimpleModule import com.fasterxml.jackson.databind.{JsonNode, ObjectMapper} import com.fasterxml.jackson.module.noctordeser.NoCtorDeserModule import com.fasterxml.jackson.module.scala.DefaultScalaModule -import org.apache.amber.core.workflow.PortIdentity -import org.apache.amber.util.serde.{PortIdentityKeyDeserializer, PortIdentityKeySerializer} +import org.apache.texera.amber.core.workflow.PortIdentity +import org.apache.texera.amber.util.serde.{PortIdentityKeyDeserializer, PortIdentityKeySerializer} import java.text.SimpleDateFormat import scala.jdk.CollectionConverters.IteratorHasAsScala diff --git a/common/workflow-core/src/main/scala/org/apache/amber/util/VirtualIdentityUtils.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/util/VirtualIdentityUtils.scala similarity index 97% rename from common/workflow-core/src/main/scala/org/apache/amber/util/VirtualIdentityUtils.scala rename to common/workflow-core/src/main/scala/org/apache/texera/amber/util/VirtualIdentityUtils.scala index 27f5d5f607c..031c4b8c7f9 100644 --- a/common/workflow-core/src/main/scala/org/apache/amber/util/VirtualIdentityUtils.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/util/VirtualIdentityUtils.scala @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.amber.util +package org.apache.texera.amber.util -import org.apache.amber.core.virtualidentity.{ +import org.apache.texera.amber.core.virtualidentity.{ ActorVirtualIdentity, OperatorIdentity, PhysicalOpIdentity, diff --git a/common/workflow-core/src/main/scala/org/apache/amber/util/serde/GlobalPortIdentitySerde.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/util/serde/GlobalPortIdentitySerde.scala similarity index 93% rename from common/workflow-core/src/main/scala/org/apache/amber/util/serde/GlobalPortIdentitySerde.scala rename to common/workflow-core/src/main/scala/org/apache/texera/amber/util/serde/GlobalPortIdentitySerde.scala index 295b4a96020..48c087443c1 100644 --- a/common/workflow-core/src/main/scala/org/apache/amber/util/serde/GlobalPortIdentitySerde.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/util/serde/GlobalPortIdentitySerde.scala @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.amber.util.serde -import org.apache.amber.core.virtualidentity.{OperatorIdentity, PhysicalOpIdentity} -import org.apache.amber.core.workflow.{GlobalPortIdentity, PortIdentity} +package org.apache.texera.amber.util.serde +import org.apache.texera.amber.core.virtualidentity.{OperatorIdentity, PhysicalOpIdentity} +import org.apache.texera.amber.core.workflow.{GlobalPortIdentity, PortIdentity} /** * Serialize and deserializes a GlobalPortIdentity object to a string using a custom, human-readable format diff --git a/common/workflow-core/src/main/scala/org/apache/amber/util/serde/PortIdentityKeyDeserializer.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/util/serde/PortIdentityKeyDeserializer.scala similarity index 92% rename from common/workflow-core/src/main/scala/org/apache/amber/util/serde/PortIdentityKeyDeserializer.scala rename to common/workflow-core/src/main/scala/org/apache/texera/amber/util/serde/PortIdentityKeyDeserializer.scala index 96d3ddc6dee..70d6e0ef696 100644 --- a/common/workflow-core/src/main/scala/org/apache/amber/util/serde/PortIdentityKeyDeserializer.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/util/serde/PortIdentityKeyDeserializer.scala @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.amber.util.serde +package org.apache.texera.amber.util.serde import com.fasterxml.jackson.databind.{DeserializationContext, KeyDeserializer} -import org.apache.amber.core.workflow.PortIdentity +import org.apache.texera.amber.core.workflow.PortIdentity class PortIdentityKeyDeserializer extends KeyDeserializer { override def deserializeKey(key: String, ctxt: DeserializationContext): PortIdentity = { diff --git a/common/workflow-core/src/main/scala/org/apache/amber/util/serde/PortIdentityKeySerializer.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/util/serde/PortIdentityKeySerializer.scala similarity index 88% rename from common/workflow-core/src/main/scala/org/apache/amber/util/serde/PortIdentityKeySerializer.scala rename to common/workflow-core/src/main/scala/org/apache/texera/amber/util/serde/PortIdentityKeySerializer.scala index 8cf044631d7..fc7e0ad72e7 100644 --- a/common/workflow-core/src/main/scala/org/apache/amber/util/serde/PortIdentityKeySerializer.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/util/serde/PortIdentityKeySerializer.scala @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.amber.util.serde +package org.apache.texera.amber.util.serde import com.fasterxml.jackson.core.JsonGenerator import com.fasterxml.jackson.databind.{JsonSerializer, SerializerProvider} -import org.apache.amber.core.workflow.PortIdentity -import org.apache.amber.util.serde.PortIdentityKeySerializer.portIdToString +import org.apache.texera.amber.core.workflow.PortIdentity +import org.apache.texera.amber.util.serde.PortIdentityKeySerializer.portIdToString case object PortIdentityKeySerializer { def portIdToString(portId: PortIdentity): String = { diff --git a/common/workflow-core/src/main/scala/org/apache/texera/service/util/BigObjectInputStream.scala b/common/workflow-core/src/main/scala/org/apache/texera/service/util/BigObjectInputStream.scala index cdc7e5b77af..8a3da1d6b78 100644 --- a/common/workflow-core/src/main/scala/org/apache/texera/service/util/BigObjectInputStream.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/service/util/BigObjectInputStream.scala @@ -19,7 +19,7 @@ package org.apache.texera.service.util -import org.apache.amber.core.tuple.BigObject +import org.apache.texera.amber.core.tuple.BigObject import java.io.InputStream diff --git a/common/workflow-core/src/main/scala/org/apache/texera/service/util/BigObjectOutputStream.scala b/common/workflow-core/src/main/scala/org/apache/texera/service/util/BigObjectOutputStream.scala index 80214a973f9..e0526107fac 100644 --- a/common/workflow-core/src/main/scala/org/apache/texera/service/util/BigObjectOutputStream.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/service/util/BigObjectOutputStream.scala @@ -20,7 +20,7 @@ package org.apache.texera.service.util import com.typesafe.scalalogging.LazyLogging -import org.apache.amber.core.tuple.BigObject +import org.apache.texera.amber.core.tuple.BigObject import java.io.{IOException, OutputStream, PipedInputStream, PipedOutputStream} import java.util.concurrent.atomic.AtomicReference diff --git a/common/workflow-core/src/main/scala/org/apache/texera/service/util/S3StorageClient.scala b/common/workflow-core/src/main/scala/org/apache/texera/service/util/S3StorageClient.scala index 8c3bc2f5f33..94007e988e5 100644 --- a/common/workflow-core/src/main/scala/org/apache/texera/service/util/S3StorageClient.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/service/util/S3StorageClient.scala @@ -19,7 +19,7 @@ package org.apache.texera.service.util -import org.apache.amber.config.StorageConfig +import org.apache.texera.amber.config.StorageConfig import software.amazon.awssdk.auth.credentials.{AwsBasicCredentials, StaticCredentialsProvider} import software.amazon.awssdk.regions.Region import software.amazon.awssdk.services.s3.model._ diff --git a/common/workflow-core/src/test/scala/org/apache/amber/core/storage/model/VirtualDocumentSpec.scala b/common/workflow-core/src/test/scala/org/apache/texera/amber/core/storage/model/VirtualDocumentSpec.scala similarity index 99% rename from common/workflow-core/src/test/scala/org/apache/amber/core/storage/model/VirtualDocumentSpec.scala rename to common/workflow-core/src/test/scala/org/apache/texera/amber/core/storage/model/VirtualDocumentSpec.scala index 3d10472ff72..3b8e04189cb 100644 --- a/common/workflow-core/src/test/scala/org/apache/amber/core/storage/model/VirtualDocumentSpec.scala +++ b/common/workflow-core/src/test/scala/org/apache/texera/amber/core/storage/model/VirtualDocumentSpec.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.core.storage.model +package org.apache.texera.amber.core.storage.model import org.scalatest.BeforeAndAfterEach import org.scalatest.flatspec.AnyFlatSpec diff --git a/common/workflow-core/src/test/scala/org/apache/amber/core/tuple/AttributeTypeUtilsSpec.scala b/common/workflow-core/src/test/scala/org/apache/texera/amber/core/tuple/AttributeTypeUtilsSpec.scala similarity index 98% rename from common/workflow-core/src/test/scala/org/apache/amber/core/tuple/AttributeTypeUtilsSpec.scala rename to common/workflow-core/src/test/scala/org/apache/texera/amber/core/tuple/AttributeTypeUtilsSpec.scala index 492be4a3882..e99c54d5d69 100644 --- a/common/workflow-core/src/test/scala/org/apache/amber/core/tuple/AttributeTypeUtilsSpec.scala +++ b/common/workflow-core/src/test/scala/org/apache/texera/amber/core/tuple/AttributeTypeUtilsSpec.scala @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.amber.core.tuple +package org.apache.texera.amber.core.tuple -import org.apache.amber.core.tuple.AttributeType._ -import org.apache.amber.core.tuple.AttributeTypeUtils.{ +import org.apache.texera.amber.core.tuple.AttributeType._ +import org.apache.texera.amber.core.tuple.AttributeTypeUtils.{ AttributeTypeException, inferField, inferSchemaFromRows, diff --git a/common/workflow-core/src/test/scala/org/apache/amber/core/tuple/SchemaSpec.scala b/common/workflow-core/src/test/scala/org/apache/texera/amber/core/tuple/SchemaSpec.scala similarity index 99% rename from common/workflow-core/src/test/scala/org/apache/amber/core/tuple/SchemaSpec.scala rename to common/workflow-core/src/test/scala/org/apache/texera/amber/core/tuple/SchemaSpec.scala index 05f305bad62..1e2d22d6a33 100644 --- a/common/workflow-core/src/test/scala/org/apache/amber/core/tuple/SchemaSpec.scala +++ b/common/workflow-core/src/test/scala/org/apache/texera/amber/core/tuple/SchemaSpec.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.core.tuple +package org.apache.texera.amber.core.tuple import org.scalatest.flatspec.AnyFlatSpec diff --git a/common/workflow-core/src/test/scala/org/apache/amber/core/tuple/TupleSpec.scala b/common/workflow-core/src/test/scala/org/apache/texera/amber/core/tuple/TupleSpec.scala similarity index 98% rename from common/workflow-core/src/test/scala/org/apache/amber/core/tuple/TupleSpec.scala rename to common/workflow-core/src/test/scala/org/apache/texera/amber/core/tuple/TupleSpec.scala index 7d8f5a74958..4adb48fa0d7 100644 --- a/common/workflow-core/src/test/scala/org/apache/amber/core/tuple/TupleSpec.scala +++ b/common/workflow-core/src/test/scala/org/apache/texera/amber/core/tuple/TupleSpec.scala @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.amber.core.tuple +package org.apache.texera.amber.core.tuple -import org.apache.amber.core.tuple.TupleUtils.{json2tuple, tuple2json} +import org.apache.texera.amber.core.tuple.TupleUtils.{json2tuple, tuple2json} import org.scalatest.flatspec.AnyFlatSpec import java.sql.Timestamp diff --git a/common/workflow-core/src/test/scala/org/apache/amber/storage/FileResolverSpec.scala b/common/workflow-core/src/test/scala/org/apache/texera/amber/storage/FileResolverSpec.scala similarity index 97% rename from common/workflow-core/src/test/scala/org/apache/amber/storage/FileResolverSpec.scala rename to common/workflow-core/src/test/scala/org/apache/texera/amber/storage/FileResolverSpec.scala index 91680d1c734..593ac8d3471 100644 --- a/common/workflow-core/src/test/scala/org/apache/amber/storage/FileResolverSpec.scala +++ b/common/workflow-core/src/test/scala/org/apache/texera/amber/storage/FileResolverSpec.scala @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.amber.storage +package org.apache.texera.amber.storage -import org.apache.amber.core.storage.FileResolver +import org.apache.texera.amber.core.storage.FileResolver import org.apache.commons.vfs2.FileNotFoundException import org.apache.texera.dao.MockTexeraDB import org.apache.texera.dao.jooq.generated.enums.UserRoleEnum diff --git a/common/workflow-core/src/test/scala/org/apache/amber/storage/result/iceberg/IcebergDocumentConsoleMessagesSpec.scala b/common/workflow-core/src/test/scala/org/apache/texera/amber/storage/result/iceberg/IcebergDocumentConsoleMessagesSpec.scala similarity index 88% rename from common/workflow-core/src/test/scala/org/apache/amber/storage/result/iceberg/IcebergDocumentConsoleMessagesSpec.scala rename to common/workflow-core/src/test/scala/org/apache/texera/amber/storage/result/iceberg/IcebergDocumentConsoleMessagesSpec.scala index 58726147cd6..4a1827b0915 100644 --- a/common/workflow-core/src/test/scala/org/apache/amber/storage/result/iceberg/IcebergDocumentConsoleMessagesSpec.scala +++ b/common/workflow-core/src/test/scala/org/apache/texera/amber/storage/result/iceberg/IcebergDocumentConsoleMessagesSpec.scala @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.amber.storage.result.iceberg +package org.apache.texera.amber.storage.result.iceberg -import org.apache.amber.core.storage.model._ -import org.apache.amber.core.storage.result.ResultSchema -import org.apache.amber.core.storage.{DocumentFactory, VFSURIFactory} -import org.apache.amber.core.tuple.{Schema, Tuple} -import org.apache.amber.core.virtualidentity._ +import org.apache.texera.amber.core.storage.model._ +import org.apache.texera.amber.core.storage.result.ResultSchema +import org.apache.texera.amber.core.storage.{DocumentFactory, VFSURIFactory} +import org.apache.texera.amber.core.tuple.{Schema, Tuple} +import org.apache.texera.amber.core.virtualidentity._ import org.scalatest.BeforeAndAfterAll import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers diff --git a/common/workflow-core/src/test/scala/org/apache/amber/storage/result/iceberg/IcebergDocumentSpec.scala b/common/workflow-core/src/test/scala/org/apache/texera/amber/storage/result/iceberg/IcebergDocumentSpec.scala similarity index 92% rename from common/workflow-core/src/test/scala/org/apache/amber/storage/result/iceberg/IcebergDocumentSpec.scala rename to common/workflow-core/src/test/scala/org/apache/texera/amber/storage/result/iceberg/IcebergDocumentSpec.scala index 95dd0d30d1a..fe06a47d191 100644 --- a/common/workflow-core/src/test/scala/org/apache/amber/storage/result/iceberg/IcebergDocumentSpec.scala +++ b/common/workflow-core/src/test/scala/org/apache/texera/amber/storage/result/iceberg/IcebergDocumentSpec.scala @@ -17,19 +17,19 @@ * under the License. */ -package org.apache.amber.storage.result.iceberg +package org.apache.texera.amber.storage.result.iceberg -import org.apache.amber.core.storage.model.{VirtualDocument, VirtualDocumentSpec} -import org.apache.amber.core.storage.{DocumentFactory, VFSURIFactory} -import org.apache.amber.core.tuple.{Attribute, AttributeType, Schema, Tuple} -import org.apache.amber.core.virtualidentity.{ +import org.apache.texera.amber.core.storage.model.{VirtualDocument, VirtualDocumentSpec} +import org.apache.texera.amber.core.storage.{DocumentFactory, VFSURIFactory} +import org.apache.texera.amber.core.tuple.{Attribute, AttributeType, Schema, Tuple} +import org.apache.texera.amber.core.virtualidentity.{ ExecutionIdentity, OperatorIdentity, PhysicalOpIdentity, WorkflowIdentity } -import org.apache.amber.core.workflow.{GlobalPortIdentity, PortIdentity} -import org.apache.amber.util.IcebergUtil +import org.apache.texera.amber.core.workflow.{GlobalPortIdentity, PortIdentity} +import org.apache.texera.amber.util.IcebergUtil import org.apache.iceberg.catalog.Catalog import org.apache.iceberg.data.Record import org.apache.iceberg.{Schema => IcebergSchema} diff --git a/common/workflow-core/src/test/scala/org/apache/amber/storage/result/iceberg/IcebergTableStatsSpec.scala b/common/workflow-core/src/test/scala/org/apache/texera/amber/storage/result/iceberg/IcebergTableStatsSpec.scala similarity index 94% rename from common/workflow-core/src/test/scala/org/apache/amber/storage/result/iceberg/IcebergTableStatsSpec.scala rename to common/workflow-core/src/test/scala/org/apache/texera/amber/storage/result/iceberg/IcebergTableStatsSpec.scala index 897042802c3..175ebc2c01b 100644 --- a/common/workflow-core/src/test/scala/org/apache/amber/storage/result/iceberg/IcebergTableStatsSpec.scala +++ b/common/workflow-core/src/test/scala/org/apache/texera/amber/storage/result/iceberg/IcebergTableStatsSpec.scala @@ -17,19 +17,19 @@ * under the License. */ -package org.apache.amber.storage.result.iceberg +package org.apache.texera.amber.storage.result.iceberg -import org.apache.amber.core.storage.model.VirtualDocument -import org.apache.amber.core.storage.{DocumentFactory, VFSURIFactory} -import org.apache.amber.core.tuple.{Attribute, AttributeType, Schema, Tuple} -import org.apache.amber.core.virtualidentity.{ +import org.apache.texera.amber.core.storage.model.VirtualDocument +import org.apache.texera.amber.core.storage.{DocumentFactory, VFSURIFactory} +import org.apache.texera.amber.core.tuple.{Attribute, AttributeType, Schema, Tuple} +import org.apache.texera.amber.core.virtualidentity.{ ExecutionIdentity, OperatorIdentity, PhysicalOpIdentity, WorkflowIdentity } -import org.apache.amber.core.workflow.{GlobalPortIdentity, PortIdentity} -import org.apache.amber.util.IcebergUtil +import org.apache.texera.amber.core.workflow.{GlobalPortIdentity, PortIdentity} +import org.apache.texera.amber.util.IcebergUtil import org.apache.iceberg.catalog.Catalog import org.apache.iceberg.data.Record import org.apache.iceberg.{Schema => IcebergSchema} diff --git a/common/workflow-core/src/test/scala/org/apache/amber/util/IcebergUtilSpec.scala b/common/workflow-core/src/test/scala/org/apache/texera/amber/util/IcebergUtilSpec.scala similarity index 98% rename from common/workflow-core/src/test/scala/org/apache/amber/util/IcebergUtilSpec.scala rename to common/workflow-core/src/test/scala/org/apache/texera/amber/util/IcebergUtilSpec.scala index 0b20d5cd970..59a04ad6680 100644 --- a/common/workflow-core/src/test/scala/org/apache/amber/util/IcebergUtilSpec.scala +++ b/common/workflow-core/src/test/scala/org/apache/texera/amber/util/IcebergUtilSpec.scala @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.amber.util +package org.apache.texera.amber.util -import org.apache.amber.core.tuple.{AttributeType, BigObject, Schema, Tuple} -import org.apache.amber.util.IcebergUtil.toIcebergSchema +import org.apache.texera.amber.core.tuple.{AttributeType, BigObject, Schema, Tuple} +import org.apache.texera.amber.util.IcebergUtil.toIcebergSchema import org.apache.iceberg.data.GenericRecord import org.apache.iceberg.types.Types import org.apache.iceberg.{Schema => IcebergSchema} diff --git a/common/workflow-core/src/test/scala/org/apache/texera/service/util/BigObjectInputStreamSpec.scala b/common/workflow-core/src/test/scala/org/apache/texera/service/util/BigObjectInputStreamSpec.scala index a163326b9d8..e964d0a1cc9 100644 --- a/common/workflow-core/src/test/scala/org/apache/texera/service/util/BigObjectInputStreamSpec.scala +++ b/common/workflow-core/src/test/scala/org/apache/texera/service/util/BigObjectInputStreamSpec.scala @@ -19,7 +19,7 @@ package org.apache.texera.service.util -import org.apache.amber.core.tuple.BigObject +import org.apache.texera.amber.core.tuple.BigObject import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach} import org.scalatest.funsuite.AnyFunSuite diff --git a/common/workflow-core/src/test/scala/org/apache/texera/service/util/BigObjectManagerSpec.scala b/common/workflow-core/src/test/scala/org/apache/texera/service/util/BigObjectManagerSpec.scala index ce1d4f4e691..c40e87a4a84 100644 --- a/common/workflow-core/src/test/scala/org/apache/texera/service/util/BigObjectManagerSpec.scala +++ b/common/workflow-core/src/test/scala/org/apache/texera/service/util/BigObjectManagerSpec.scala @@ -19,7 +19,7 @@ package org.apache.texera.service.util -import org.apache.amber.core.tuple.BigObject +import org.apache.texera.amber.core.tuple.BigObject import org.scalatest.funsuite.AnyFunSuite class BigObjectManagerSpec extends AnyFunSuite with S3StorageTestBase { diff --git a/common/workflow-core/src/test/scala/org/apache/texera/service/util/BigObjectOutputStreamSpec.scala b/common/workflow-core/src/test/scala/org/apache/texera/service/util/BigObjectOutputStreamSpec.scala index 14fdfa1ddb0..b4c106d6197 100644 --- a/common/workflow-core/src/test/scala/org/apache/texera/service/util/BigObjectOutputStreamSpec.scala +++ b/common/workflow-core/src/test/scala/org/apache/texera/service/util/BigObjectOutputStreamSpec.scala @@ -19,7 +19,7 @@ package org.apache.texera.service.util -import org.apache.amber.core.tuple.BigObject +import org.apache.texera.amber.core.tuple.BigObject import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach} import org.scalatest.funsuite.AnyFunSuite diff --git a/common/workflow-core/src/test/scala/org/apache/texera/service/util/S3StorageTestBase.scala b/common/workflow-core/src/test/scala/org/apache/texera/service/util/S3StorageTestBase.scala index ad80e6c40eb..1d3b77dbb16 100644 --- a/common/workflow-core/src/test/scala/org/apache/texera/service/util/S3StorageTestBase.scala +++ b/common/workflow-core/src/test/scala/org/apache/texera/service/util/S3StorageTestBase.scala @@ -20,7 +20,7 @@ package org.apache.texera.service.util import com.dimafeng.testcontainers.MinIOContainer -import org.apache.amber.config.StorageConfig +import org.apache.texera.amber.config.StorageConfig import org.scalatest.{BeforeAndAfterAll, Suite} import org.testcontainers.utility.DockerImageName diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/DummyProperties.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/DummyProperties.scala similarity index 96% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/DummyProperties.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/DummyProperties.scala index 6951161e343..b119c8f93e4 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/DummyProperties.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/DummyProperties.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator +package org.apache.texera.amber.operator import com.fasterxml.jackson.annotation.JsonProperty import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/LogicalOp.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/LogicalOp.scala similarity index 70% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/LogicalOp.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/LogicalOp.scala index 6fb27d92c3f..eb319a82d1d 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/LogicalOp.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/LogicalOp.scala @@ -17,120 +17,127 @@ * under the License. */ -package org.apache.amber.operator +package org.apache.texera.amber.operator import com.fasterxml.jackson.annotation.JsonSubTypes.Type import com.fasterxml.jackson.annotation._ import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.core.executor.OperatorExecutor -import org.apache.amber.core.tuple.Schema -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, OperatorIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow.WorkflowContext.{DEFAULT_EXECUTION_ID, DEFAULT_WORKFLOW_ID} -import org.apache.amber.core.workflow.{PhysicalOp, PhysicalPlan, PortIdentity} -import org.apache.amber.operator.aggregate.AggregateOpDesc -import org.apache.amber.operator.cartesianProduct.CartesianProductOpDesc -import org.apache.amber.operator.dictionary.DictionaryMatcherOpDesc -import org.apache.amber.operator.difference.DifferenceOpDesc -import org.apache.amber.operator.distinct.DistinctOpDesc -import org.apache.amber.operator.dummy.DummyOpDesc -import org.apache.amber.operator.filter.SpecializedFilterOpDesc -import org.apache.amber.operator.hashJoin.HashJoinOpDesc -import org.apache.amber.operator.huggingFace.{ +import org.apache.texera.amber.core.executor.OperatorExecutor +import org.apache.texera.amber.core.tuple.Schema +import org.apache.texera.amber.core.virtualidentity.{ + ExecutionIdentity, + OperatorIdentity, + WorkflowIdentity +} +import org.apache.texera.amber.core.workflow.WorkflowContext.{ + DEFAULT_EXECUTION_ID, + DEFAULT_WORKFLOW_ID +} +import org.apache.texera.amber.core.workflow.{PhysicalOp, PhysicalPlan, PortIdentity} +import org.apache.texera.amber.operator.aggregate.AggregateOpDesc +import org.apache.texera.amber.operator.cartesianProduct.CartesianProductOpDesc +import org.apache.texera.amber.operator.dictionary.DictionaryMatcherOpDesc +import org.apache.texera.amber.operator.difference.DifferenceOpDesc +import org.apache.texera.amber.operator.distinct.DistinctOpDesc +import org.apache.texera.amber.operator.dummy.DummyOpDesc +import org.apache.texera.amber.operator.filter.SpecializedFilterOpDesc +import org.apache.texera.amber.operator.hashJoin.HashJoinOpDesc +import org.apache.texera.amber.operator.huggingFace.{ HuggingFaceIrisLogisticRegressionOpDesc, HuggingFaceSentimentAnalysisOpDesc, HuggingFaceSpamSMSDetectionOpDesc, HuggingFaceTextSummarizationOpDesc } -import org.apache.amber.operator.ifStatement.IfOpDesc -import org.apache.amber.operator.intersect.IntersectOpDesc -import org.apache.amber.operator.intervalJoin.IntervalJoinOpDesc -import org.apache.amber.operator.keywordSearch.KeywordSearchOpDesc -import org.apache.amber.operator.limit.LimitOpDesc -import org.apache.amber.operator.machineLearning.Scorer.MachineLearningScorerOpDesc -import org.apache.amber.operator.machineLearning.sklearnAdvanced.KNNTrainer.{ +import org.apache.texera.amber.operator.ifStatement.IfOpDesc +import org.apache.texera.amber.operator.intersect.IntersectOpDesc +import org.apache.texera.amber.operator.intervalJoin.IntervalJoinOpDesc +import org.apache.texera.amber.operator.keywordSearch.KeywordSearchOpDesc +import org.apache.texera.amber.operator.limit.LimitOpDesc +import org.apache.texera.amber.operator.machineLearning.Scorer.MachineLearningScorerOpDesc +import org.apache.texera.amber.operator.machineLearning.sklearnAdvanced.KNNTrainer.{ SklearnAdvancedKNNClassifierTrainerOpDesc, SklearnAdvancedKNNRegressorTrainerOpDesc } -import org.apache.amber.operator.machineLearning.sklearnAdvanced.SVCTrainer.SklearnAdvancedSVCTrainerOpDesc -import org.apache.amber.operator.machineLearning.sklearnAdvanced.SVRTrainer.SklearnAdvancedSVRTrainerOpDesc -import org.apache.amber.operator.metadata.{OPVersion, OperatorInfo, PropertyNameConstants} -import org.apache.amber.operator.projection.ProjectionOpDesc -import org.apache.amber.operator.randomksampling.RandomKSamplingOpDesc -import org.apache.amber.operator.regex.RegexOpDesc -import org.apache.amber.operator.reservoirsampling.ReservoirSamplingOpDesc -import org.apache.amber.operator.sklearn._ -import org.apache.amber.operator.sklearn.training._ -import org.apache.amber.operator.sleep.SleepOpDesc -import org.apache.amber.operator.sort.{SortOpDesc, StableMergeSortOpDesc} -import org.apache.amber.operator.sortPartitions.SortPartitionsOpDesc -import org.apache.amber.operator.source.apis.reddit.RedditSearchSourceOpDesc -import org.apache.amber.operator.source.apis.twitter.v2.{ +import org.apache.texera.amber.operator.machineLearning.sklearnAdvanced.SVCTrainer.SklearnAdvancedSVCTrainerOpDesc +import org.apache.texera.amber.operator.machineLearning.sklearnAdvanced.SVRTrainer.SklearnAdvancedSVRTrainerOpDesc +import org.apache.texera.amber.operator.metadata.{OPVersion, OperatorInfo, PropertyNameConstants} +import org.apache.texera.amber.operator.projection.ProjectionOpDesc +import org.apache.texera.amber.operator.randomksampling.RandomKSamplingOpDesc +import org.apache.texera.amber.operator.regex.RegexOpDesc +import org.apache.texera.amber.operator.reservoirsampling.ReservoirSamplingOpDesc +import org.apache.texera.amber.operator.sklearn._ +import org.apache.texera.amber.operator.sklearn.training._ +import org.apache.texera.amber.operator.sleep.SleepOpDesc +import org.apache.texera.amber.operator.sort.{SortOpDesc, StableMergeSortOpDesc} +import org.apache.texera.amber.operator.sortPartitions.SortPartitionsOpDesc +import org.apache.texera.amber.operator.source.apis.reddit.RedditSearchSourceOpDesc +import org.apache.texera.amber.operator.source.apis.twitter.v2.{ TwitterFullArchiveSearchSourceOpDesc, TwitterSearchSourceOpDesc } -import org.apache.amber.operator.source.fetcher.URLFetcherOpDesc -import org.apache.amber.operator.source.scan.FileScanSourceOpDesc -import org.apache.amber.operator.source.scan.arrow.ArrowSourceOpDesc -import org.apache.amber.operator.source.scan.csv.CSVScanSourceOpDesc -import org.apache.amber.operator.source.scan.csvOld.CSVOldScanSourceOpDesc -import org.apache.amber.operator.source.scan.json.JSONLScanSourceOpDesc -import org.apache.amber.operator.source.scan.text.TextInputSourceOpDesc -import org.apache.amber.operator.source.sql.asterixdb.AsterixDBSourceOpDesc -import org.apache.amber.operator.source.sql.mysql.MySQLSourceOpDesc -import org.apache.amber.operator.source.sql.postgresql.PostgreSQLSourceOpDesc -import org.apache.amber.operator.split.SplitOpDesc -import org.apache.amber.operator.substringSearch.SubstringSearchOpDesc -import org.apache.amber.operator.symmetricDifference.SymmetricDifferenceOpDesc -import org.apache.amber.operator.typecasting.TypeCastingOpDesc -import org.apache.amber.operator.udf.java.JavaUDFOpDesc -import org.apache.amber.operator.udf.python._ -import org.apache.amber.operator.udf.python.source.PythonUDFSourceOpDescV2 -import org.apache.amber.operator.udf.r.{RUDFOpDesc, RUDFSourceOpDesc} -import org.apache.amber.operator.union.UnionOpDesc -import org.apache.amber.operator.unneststring.UnnestStringOpDesc -import org.apache.amber.operator.visualization.DotPlot.DotPlotOpDesc -import org.apache.amber.operator.visualization.IcicleChart.IcicleChartOpDesc -import org.apache.amber.operator.visualization.ImageViz.ImageVisualizerOpDesc -import org.apache.amber.operator.visualization.ScatterMatrixChart.ScatterMatrixChartOpDesc -import org.apache.amber.operator.visualization.barChart.BarChartOpDesc -import org.apache.amber.operator.visualization.boxViolinPlot.BoxViolinPlotOpDesc -import org.apache.amber.operator.visualization.bubbleChart.BubbleChartOpDesc -import org.apache.amber.operator.visualization.bulletChart.BulletChartOpDesc -import org.apache.amber.operator.visualization.candlestickChart.CandlestickChartOpDesc -import org.apache.amber.operator.visualization.choroplethMap.ChoroplethMapOpDesc -import org.apache.amber.operator.visualization.continuousErrorBands.ContinuousErrorBandsOpDesc -import org.apache.amber.operator.visualization.contourPlot.ContourPlotOpDesc -import org.apache.amber.operator.visualization.dendrogram.DendrogramOpDesc -import org.apache.amber.operator.visualization.dumbbellPlot.DumbbellPlotOpDesc -import org.apache.amber.operator.visualization.figureFactoryTable.FigureFactoryTableOpDesc -import org.apache.amber.operator.visualization.filledAreaPlot.FilledAreaPlotOpDesc -import org.apache.amber.operator.visualization.funnelPlot.FunnelPlotOpDesc -import org.apache.amber.operator.visualization.ganttChart.GanttChartOpDesc -import org.apache.amber.operator.visualization.gaugeChart.GaugeChartOpDesc -import org.apache.amber.operator.visualization.heatMap.HeatMapOpDesc -import org.apache.amber.operator.visualization.hierarchychart.HierarchyChartOpDesc -import org.apache.amber.operator.visualization.histogram.HistogramChartOpDesc -import org.apache.amber.operator.visualization.histogram2d.Histogram2DOpDesc -import org.apache.amber.operator.visualization.htmlviz.HtmlVizOpDesc -import org.apache.amber.operator.visualization.lineChart.LineChartOpDesc -import org.apache.amber.operator.visualization.nestedTable.NestedTableOpDesc -import org.apache.amber.operator.visualization.networkGraph.NetworkGraphOpDesc -import org.apache.amber.operator.visualization.pieChart.PieChartOpDesc -import org.apache.amber.operator.visualization.quiverPlot.QuiverPlotOpDesc -import org.apache.amber.operator.visualization.rangeSlider.RangeSliderOpDesc -import org.apache.amber.operator.visualization.sankeyDiagram.SankeyDiagramOpDesc -import org.apache.amber.operator.visualization.scatter3DChart.Scatter3dChartOpDesc -import org.apache.amber.operator.visualization.scatterplot.ScatterplotOpDesc -import org.apache.amber.operator.visualization.tablesChart.TablesPlotOpDesc -import org.apache.amber.operator.visualization.ternaryPlot.TernaryPlotOpDesc -import org.apache.amber.operator.visualization.timeSeriesplot.TimeSeriesOpDesc -import org.apache.amber.operator.visualization.treeplot.TreePlotOpDesc -import org.apache.amber.operator.visualization.urlviz.UrlVizOpDesc -import org.apache.amber.operator.visualization.volcanoPlot.VolcanoPlotOpDesc -import org.apache.amber.operator.visualization.waterfallChart.WaterfallChartOpDesc -import org.apache.amber.operator.visualization.wordCloud.WordCloudOpDesc +import org.apache.texera.amber.operator.source.fetcher.URLFetcherOpDesc +import org.apache.texera.amber.operator.source.scan.FileScanSourceOpDesc +import org.apache.texera.amber.operator.source.scan.arrow.ArrowSourceOpDesc +import org.apache.texera.amber.operator.source.scan.csv.CSVScanSourceOpDesc +import org.apache.texera.amber.operator.source.scan.csvOld.CSVOldScanSourceOpDesc +import org.apache.texera.amber.operator.source.scan.json.JSONLScanSourceOpDesc +import org.apache.texera.amber.operator.source.scan.text.TextInputSourceOpDesc +import org.apache.texera.amber.operator.source.sql.asterixdb.AsterixDBSourceOpDesc +import org.apache.texera.amber.operator.source.sql.mysql.MySQLSourceOpDesc +import org.apache.texera.amber.operator.source.sql.postgresql.PostgreSQLSourceOpDesc +import org.apache.texera.amber.operator.split.SplitOpDesc +import org.apache.texera.amber.operator.substringSearch.SubstringSearchOpDesc +import org.apache.texera.amber.operator.symmetricDifference.SymmetricDifferenceOpDesc +import org.apache.texera.amber.operator.typecasting.TypeCastingOpDesc +import org.apache.texera.amber.operator.udf.java.JavaUDFOpDesc +import org.apache.texera.amber.operator.udf.python._ +import org.apache.texera.amber.operator.udf.python.source.PythonUDFSourceOpDescV2 +import org.apache.texera.amber.operator.udf.r.{RUDFOpDesc, RUDFSourceOpDesc} +import org.apache.texera.amber.operator.union.UnionOpDesc +import org.apache.texera.amber.operator.unneststring.UnnestStringOpDesc +import org.apache.texera.amber.operator.visualization.DotPlot.DotPlotOpDesc +import org.apache.texera.amber.operator.visualization.IcicleChart.IcicleChartOpDesc +import org.apache.texera.amber.operator.visualization.ImageViz.ImageVisualizerOpDesc +import org.apache.texera.amber.operator.visualization.ScatterMatrixChart.ScatterMatrixChartOpDesc +import org.apache.texera.amber.operator.visualization.barChart.BarChartOpDesc +import org.apache.texera.amber.operator.visualization.boxViolinPlot.BoxViolinPlotOpDesc +import org.apache.texera.amber.operator.visualization.bubbleChart.BubbleChartOpDesc +import org.apache.texera.amber.operator.visualization.bulletChart.BulletChartOpDesc +import org.apache.texera.amber.operator.visualization.candlestickChart.CandlestickChartOpDesc +import org.apache.texera.amber.operator.visualization.choroplethMap.ChoroplethMapOpDesc +import org.apache.texera.amber.operator.visualization.continuousErrorBands.ContinuousErrorBandsOpDesc +import org.apache.texera.amber.operator.visualization.contourPlot.ContourPlotOpDesc +import org.apache.texera.amber.operator.visualization.dendrogram.DendrogramOpDesc +import org.apache.texera.amber.operator.visualization.dumbbellPlot.DumbbellPlotOpDesc +import org.apache.texera.amber.operator.visualization.figureFactoryTable.FigureFactoryTableOpDesc +import org.apache.texera.amber.operator.visualization.filledAreaPlot.FilledAreaPlotOpDesc +import org.apache.texera.amber.operator.visualization.funnelPlot.FunnelPlotOpDesc +import org.apache.texera.amber.operator.visualization.ganttChart.GanttChartOpDesc +import org.apache.texera.amber.operator.visualization.gaugeChart.GaugeChartOpDesc +import org.apache.texera.amber.operator.visualization.heatMap.HeatMapOpDesc +import org.apache.texera.amber.operator.visualization.hierarchychart.HierarchyChartOpDesc +import org.apache.texera.amber.operator.visualization.histogram.HistogramChartOpDesc +import org.apache.texera.amber.operator.visualization.histogram2d.Histogram2DOpDesc +import org.apache.texera.amber.operator.visualization.htmlviz.HtmlVizOpDesc +import org.apache.texera.amber.operator.visualization.lineChart.LineChartOpDesc +import org.apache.texera.amber.operator.visualization.nestedTable.NestedTableOpDesc +import org.apache.texera.amber.operator.visualization.networkGraph.NetworkGraphOpDesc +import org.apache.texera.amber.operator.visualization.pieChart.PieChartOpDesc +import org.apache.texera.amber.operator.visualization.quiverPlot.QuiverPlotOpDesc +import org.apache.texera.amber.operator.visualization.rangeSlider.RangeSliderOpDesc +import org.apache.texera.amber.operator.visualization.sankeyDiagram.SankeyDiagramOpDesc +import org.apache.texera.amber.operator.visualization.scatter3DChart.Scatter3dChartOpDesc +import org.apache.texera.amber.operator.visualization.scatterplot.ScatterplotOpDesc +import org.apache.texera.amber.operator.visualization.tablesChart.TablesPlotOpDesc +import org.apache.texera.amber.operator.visualization.ternaryPlot.TernaryPlotOpDesc +import org.apache.texera.amber.operator.visualization.timeSeriesplot.TimeSeriesOpDesc +import org.apache.texera.amber.operator.visualization.treeplot.TreePlotOpDesc +import org.apache.texera.amber.operator.visualization.urlviz.UrlVizOpDesc +import org.apache.texera.amber.operator.visualization.volcanoPlot.VolcanoPlotOpDesc +import org.apache.texera.amber.operator.visualization.waterfallChart.WaterfallChartOpDesc +import org.apache.texera.amber.operator.visualization.wordCloud.WordCloudOpDesc import org.apache.commons.lang3.builder.{EqualsBuilder, HashCodeBuilder, ToStringBuilder} -import org.apache.amber.operator.visualization.stripChart.StripChartOpDesc +import org.apache.texera.amber.operator.visualization.stripChart.StripChartOpDesc import java.util.UUID import scala.util.Try diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/PortDescriptor.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/PortDescriptor.scala similarity index 92% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/PortDescriptor.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/PortDescriptor.scala index a5c9b061ae5..73f1ef26007 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/PortDescriptor.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/PortDescriptor.scala @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.amber.operator +package org.apache.texera.amber.operator import com.fasterxml.jackson.annotation.JsonProperty -import org.apache.amber.core.workflow.PartitionInfo +import org.apache.texera.amber.core.workflow.PartitionInfo case class PortDescription( portID: String, diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/PythonOperatorDescriptor.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/PythonOperatorDescriptor.scala similarity index 88% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/PythonOperatorDescriptor.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/PythonOperatorDescriptor.scala index 6e228b24eff..e47b32718a1 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/PythonOperatorDescriptor.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/PythonOperatorDescriptor.scala @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.amber.operator +package org.apache.texera.amber.operator -import org.apache.amber.core.executor.OpExecWithCode -import org.apache.amber.core.tuple.Schema -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow.{PhysicalOp, PortIdentity, SchemaPropagationFunc} +import org.apache.texera.amber.core.executor.OpExecWithCode +import org.apache.texera.amber.core.tuple.Schema +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow.{PhysicalOp, PortIdentity, SchemaPropagationFunc} trait PythonOperatorDescriptor extends LogicalOp { private def generatePythonCodeForRaisingException(ex: Throwable): String = { diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/SpecialPhysicalOpFactory.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/SpecialPhysicalOpFactory.scala similarity index 86% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/SpecialPhysicalOpFactory.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/SpecialPhysicalOpFactory.scala index c387db7cbfa..07d0d7e5d33 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/SpecialPhysicalOpFactory.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/SpecialPhysicalOpFactory.scala @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.amber.operator +package org.apache.texera.amber.operator -import org.apache.amber.core.executor.OpExecSource -import org.apache.amber.core.storage.VFSURIFactory -import org.apache.amber.core.tuple.Schema -import org.apache.amber.core.virtualidentity.{ +import org.apache.texera.amber.core.executor.OpExecSource +import org.apache.texera.amber.core.storage.VFSURIFactory +import org.apache.texera.amber.core.tuple.Schema +import org.apache.texera.amber.core.virtualidentity.{ ExecutionIdentity, PhysicalOpIdentity, WorkflowIdentity } -import org.apache.amber.core.workflow._ +import org.apache.texera.amber.core.workflow._ import java.net.URI diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/TestOperators.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/TestOperators.scala similarity index 90% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/TestOperators.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/TestOperators.scala index 93c79020fc8..ab7e8dc2de5 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/TestOperators.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/TestOperators.scala @@ -17,21 +17,21 @@ * under the License. */ -package org.apache.amber.operator +package org.apache.texera.amber.operator -import org.apache.amber.core.storage.FileResolver -import org.apache.amber.operator.aggregate.{ +import org.apache.texera.amber.core.storage.FileResolver +import org.apache.texera.amber.operator.aggregate.{ AggregateOpDesc, AggregationFunction, AggregationOperation } -import org.apache.amber.operator.hashJoin.HashJoinOpDesc -import org.apache.amber.operator.keywordSearch.KeywordSearchOpDesc -import org.apache.amber.operator.source.scan.csv.CSVScanSourceOpDesc -import org.apache.amber.operator.source.scan.json.JSONLScanSourceOpDesc -import org.apache.amber.operator.source.sql.asterixdb.AsterixDBSourceOpDesc -import org.apache.amber.operator.source.sql.mysql.MySQLSourceOpDesc -import org.apache.amber.operator.udf.python.PythonUDFOpDescV2 +import org.apache.texera.amber.operator.hashJoin.HashJoinOpDesc +import org.apache.texera.amber.operator.keywordSearch.KeywordSearchOpDesc +import org.apache.texera.amber.operator.source.scan.csv.CSVScanSourceOpDesc +import org.apache.texera.amber.operator.source.scan.json.JSONLScanSourceOpDesc +import org.apache.texera.amber.operator.source.sql.asterixdb.AsterixDBSourceOpDesc +import org.apache.texera.amber.operator.source.sql.mysql.MySQLSourceOpDesc +import org.apache.texera.amber.operator.udf.python.PythonUDFOpDescV2 import java.nio.file.Path diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/aggregate/AggregateOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/aggregate/AggregateOpDesc.scala similarity index 85% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/aggregate/AggregateOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/aggregate/AggregateOpDesc.scala index 569bef2a346..7e76b3ce7e0 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/aggregate/AggregateOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/aggregate/AggregateOpDesc.scala @@ -17,22 +17,22 @@ * under the License. */ -package org.apache.amber.operator.aggregate +package org.apache.texera.amber.operator.aggregate import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.core.executor.OpExecWithClassName -import org.apache.amber.core.tuple.Schema -import org.apache.amber.core.virtualidentity.{ +import org.apache.texera.amber.core.executor.OpExecWithClassName +import org.apache.texera.amber.core.tuple.Schema +import org.apache.texera.amber.core.virtualidentity.{ ExecutionIdentity, PhysicalOpIdentity, WorkflowIdentity } -import org.apache.amber.core.workflow._ -import org.apache.amber.operator.LogicalOp -import org.apache.amber.operator.metadata.annotations.AutofillAttributeNameList -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.workflow._ +import org.apache.texera.amber.operator.LogicalOp +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeNameList +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.util.JSONUtils.objectMapper import javax.validation.constraints.{NotNull, Size} @@ -65,7 +65,10 @@ class AggregateOpDesc extends LogicalOp { PhysicalOpIdentity(operatorIdentifier, "localAgg"), workflowId, executionId, - OpExecWithClassName("org.apache.amber.operator.aggregate.AggregateOpExec", partialDesc) + OpExecWithClassName( + "org.apache.texera.amber.operator.aggregate.AggregateOpExec", + partialDesc + ) ) .withIsOneToManyOp(true) .withInputPorts(List(inputPort)) @@ -94,7 +97,7 @@ class AggregateOpDesc extends LogicalOp { PhysicalOpIdentity(operatorIdentifier, "globalAgg"), workflowId, executionId, - OpExecWithClassName("org.apache.amber.operator.aggregate.AggregateOpExec", finalDesc) + OpExecWithClassName("org.apache.texera.amber.operator.aggregate.AggregateOpExec", finalDesc) ) .withParallelizable(false) .withIsOneToManyOp(true) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/aggregate/AggregateOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/aggregate/AggregateOpExec.scala similarity index 92% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/aggregate/AggregateOpExec.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/aggregate/AggregateOpExec.scala index 2d545e0e39c..a61703b28cf 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/aggregate/AggregateOpExec.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/aggregate/AggregateOpExec.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.operator.aggregate +package org.apache.texera.amber.operator.aggregate -import org.apache.amber.core.executor.OperatorExecutor -import org.apache.amber.core.tuple.{Tuple, TupleLike} -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.OperatorExecutor +import org.apache.texera.amber.core.tuple.{Tuple, TupleLike} +import org.apache.texera.amber.util.JSONUtils.objectMapper import scala.collection.mutable diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/aggregate/AggregationFunction.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/aggregate/AggregationFunction.java similarity index 96% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/aggregate/AggregationFunction.java rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/aggregate/AggregationFunction.java index afcc3c7066b..253d6548524 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/aggregate/AggregationFunction.java +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/aggregate/AggregationFunction.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.aggregate; +package org.apache.texera.amber.operator.aggregate; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/aggregate/AggregationOperation.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/aggregate/AggregationOperation.scala similarity index 97% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/aggregate/AggregationOperation.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/aggregate/AggregationOperation.scala index 931163e9ed3..70105de9ef4 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/aggregate/AggregationOperation.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/aggregate/AggregationOperation.scala @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.amber.operator.aggregate +package org.apache.texera.amber.operator.aggregate import com.fasterxml.jackson.annotation.{JsonIgnore, JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} -import org.apache.amber.core.tuple.{Attribute, AttributeType, AttributeTypeUtils, Tuple} -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.core.tuple.{Attribute, AttributeType, AttributeTypeUtils, Tuple} +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName import javax.validation.constraints.NotNull diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/aggregate/DistributedAggregation.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/aggregate/DistributedAggregation.scala similarity index 95% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/aggregate/DistributedAggregation.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/aggregate/DistributedAggregation.scala index 9f632536320..eab33e430be 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/aggregate/DistributedAggregation.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/aggregate/DistributedAggregation.scala @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.amber.operator.aggregate +package org.apache.texera.amber.operator.aggregate -import org.apache.amber.core.tuple.Tuple +import org.apache.texera.amber.core.tuple.Tuple /** * This class defines the necessary functions required by a distributed aggregation. diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/cartesianProduct/CartesianProductOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/cartesianProduct/CartesianProductOpDesc.scala similarity index 86% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/cartesianProduct/CartesianProductOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/cartesianProduct/CartesianProductOpDesc.scala index 7a2f4b95c17..16005c67a59 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/cartesianProduct/CartesianProductOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/cartesianProduct/CartesianProductOpDesc.scala @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.amber.operator.cartesianProduct +package org.apache.texera.amber.operator.cartesianProduct -import org.apache.amber.core.executor.OpExecWithClassName -import org.apache.amber.core.tuple.{Attribute, Schema} -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow._ -import org.apache.amber.operator.LogicalOp -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.executor.OpExecWithClassName +import org.apache.texera.amber.core.tuple.{Attribute, Schema} +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow._ +import org.apache.texera.amber.operator.LogicalOp +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} class CartesianProductOpDesc extends LogicalOp { override def getPhysicalOp( @@ -36,7 +36,9 @@ class CartesianProductOpDesc extends LogicalOp { workflowId, executionId, operatorIdentifier, - OpExecWithClassName("org.apache.amber.operator.cartesianProduct.CartesianProductOpExec") + OpExecWithClassName( + "org.apache.texera.amber.operator.cartesianProduct.CartesianProductOpExec" + ) ) .withInputPorts(operatorInfo.inputPorts) .withOutputPorts(operatorInfo.outputPorts) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/cartesianProduct/CartesianProductOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/cartesianProduct/CartesianProductOpExec.scala similarity index 89% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/cartesianProduct/CartesianProductOpExec.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/cartesianProduct/CartesianProductOpExec.scala index f4c8901a5c7..c97487e06a6 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/cartesianProduct/CartesianProductOpExec.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/cartesianProduct/CartesianProductOpExec.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.operator.cartesianProduct +package org.apache.texera.amber.operator.cartesianProduct -import org.apache.amber.core.executor.OperatorExecutor -import org.apache.amber.core.tuple.{Tuple, TupleLike} -import org.apache.amber.operator.hashJoin.JoinUtils +import org.apache.texera.amber.core.executor.OperatorExecutor +import org.apache.texera.amber.core.tuple.{Tuple, TupleLike} +import org.apache.texera.amber.operator.hashJoin.JoinUtils import scala.collection.mutable.ArrayBuffer diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/dictionary/DictionaryMatcherOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/dictionary/DictionaryMatcherOpDesc.scala similarity index 79% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/dictionary/DictionaryMatcherOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/dictionary/DictionaryMatcherOpDesc.scala index 3ecbea56002..cfb2b5e76fa 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/dictionary/DictionaryMatcherOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/dictionary/DictionaryMatcherOpDesc.scala @@ -17,17 +17,22 @@ * under the License. */ -package org.apache.amber.operator.dictionary +package org.apache.texera.amber.operator.dictionary import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} -import org.apache.amber.core.executor.OpExecWithClassName -import org.apache.amber.core.tuple.{Attribute, AttributeType} -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow.{InputPort, OutputPort, PhysicalOp, SchemaPropagationFunc} -import org.apache.amber.operator.map.MapOpDesc -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.OpExecWithClassName +import org.apache.texera.amber.core.tuple.{Attribute, AttributeType} +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow.{ + InputPort, + OutputPort, + PhysicalOp, + SchemaPropagationFunc +} +import org.apache.texera.amber.operator.map.MapOpDesc +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.util.JSONUtils.objectMapper /** * Dictionary matcher operator matches a tuple if the specified column is in the given dictionary. @@ -58,7 +63,7 @@ class DictionaryMatcherOpDesc extends MapOpDesc { executionId, operatorIdentifier, OpExecWithClassName( - "org.apache.amber.operator.dictionary.DictionaryMatcherOpExec", + "org.apache.texera.amber.operator.dictionary.DictionaryMatcherOpExec", objectMapper.writeValueAsString(this) ) ) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/dictionary/DictionaryMatcherOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/dictionary/DictionaryMatcherOpExec.scala similarity index 96% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/dictionary/DictionaryMatcherOpExec.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/dictionary/DictionaryMatcherOpExec.scala index 38005aaaa2a..2d4eaf612e4 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/dictionary/DictionaryMatcherOpExec.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/dictionary/DictionaryMatcherOpExec.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.operator.dictionary +package org.apache.texera.amber.operator.dictionary -import org.apache.amber.core.tuple.{Tuple, TupleLike} -import org.apache.amber.operator.map.MapOpExec -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.tuple.{Tuple, TupleLike} +import org.apache.texera.amber.operator.map.MapOpExec +import org.apache.texera.amber.util.JSONUtils.objectMapper import org.apache.lucene.analysis.Analyzer import org.apache.lucene.analysis.en.EnglishAnalyzer import org.apache.lucene.analysis.tokenattributes.CharTermAttribute diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/dictionary/MatchingType.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/dictionary/MatchingType.java similarity index 97% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/dictionary/MatchingType.java rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/dictionary/MatchingType.java index 7096586aea4..d2d27e822de 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/dictionary/MatchingType.java +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/dictionary/MatchingType.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.dictionary; +package org.apache.texera.amber.operator.dictionary; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/difference/DifferenceOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/difference/DifferenceOpDesc.scala similarity index 80% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/difference/DifferenceOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/difference/DifferenceOpDesc.scala index d4f1f8aa6b5..c12f057a25b 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/difference/DifferenceOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/difference/DifferenceOpDesc.scala @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.amber.operator.difference +package org.apache.texera.amber.operator.difference import com.google.common.base.Preconditions -import org.apache.amber.core.executor.OpExecWithClassName -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow._ -import org.apache.amber.operator.LogicalOp -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.executor.OpExecWithClassName +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow._ +import org.apache.texera.amber.operator.LogicalOp +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} class DifferenceOpDesc extends LogicalOp { @@ -37,7 +37,7 @@ class DifferenceOpDesc extends LogicalOp { workflowId, executionId, operatorIdentifier, - OpExecWithClassName("org.apache.amber.operator.difference.DifferenceOpExec") + OpExecWithClassName("org.apache.texera.amber.operator.difference.DifferenceOpExec") ) .withInputPorts(operatorInfo.inputPorts) .withOutputPorts(operatorInfo.outputPorts) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/difference/DifferenceOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/difference/DifferenceOpExec.scala similarity index 90% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/difference/DifferenceOpExec.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/difference/DifferenceOpExec.scala index 2705b73fa04..27a9941dc9d 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/difference/DifferenceOpExec.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/difference/DifferenceOpExec.scala @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.amber.operator.difference +package org.apache.texera.amber.operator.difference -import org.apache.amber.core.executor.OperatorExecutor -import org.apache.amber.core.tuple.{Tuple, TupleLike} +import org.apache.texera.amber.core.executor.OperatorExecutor +import org.apache.texera.amber.core.tuple.{Tuple, TupleLike} import scala.collection.mutable diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/distinct/DistinctOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/distinct/DistinctOpDesc.scala similarity index 74% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/distinct/DistinctOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/distinct/DistinctOpDesc.scala index eefa99ab8b0..9e75e648bb4 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/distinct/DistinctOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/distinct/DistinctOpDesc.scala @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.amber.operator.distinct +package org.apache.texera.amber.operator.distinct -import org.apache.amber.core.executor.OpExecWithClassName -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow.{HashPartition, InputPort, OutputPort, PhysicalOp} -import org.apache.amber.operator.LogicalOp -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.executor.OpExecWithClassName +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow.{HashPartition, InputPort, OutputPort, PhysicalOp} +import org.apache.texera.amber.operator.LogicalOp +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} class DistinctOpDesc extends LogicalOp { @@ -36,7 +36,7 @@ class DistinctOpDesc extends LogicalOp { workflowId, executionId, operatorIdentifier, - OpExecWithClassName("org.apache.amber.operator.distinct.DistinctOpExec") + OpExecWithClassName("org.apache.texera.amber.operator.distinct.DistinctOpExec") ) .withInputPorts(operatorInfo.inputPorts) .withOutputPorts(operatorInfo.outputPorts) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/distinct/DistinctOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/distinct/DistinctOpExec.scala similarity index 89% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/distinct/DistinctOpExec.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/distinct/DistinctOpExec.scala index 578cb2bd7ca..50348581a05 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/distinct/DistinctOpExec.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/distinct/DistinctOpExec.scala @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.amber.operator.distinct +package org.apache.texera.amber.operator.distinct -import org.apache.amber.core.executor.OperatorExecutor -import org.apache.amber.core.tuple.{Tuple, TupleLike} +import org.apache.texera.amber.core.executor.OperatorExecutor +import org.apache.texera.amber.core.tuple.{Tuple, TupleLike} import scala.collection.mutable diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/dummy/DummyOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/dummy/DummyOpDesc.scala similarity index 88% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/dummy/DummyOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/dummy/DummyOpDesc.scala index 73ba170b967..c1ae1dd05fc 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/dummy/DummyOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/dummy/DummyOpDesc.scala @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.amber.operator.dummy +package org.apache.texera.amber.operator.dummy import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import org.apache.amber.operator.{LogicalOp, PortDescription, PortDescriptor} +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.operator.{LogicalOp, PortDescription, PortDescriptor} class DummyOpDesc extends LogicalOp with PortDescriptor { diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/filter/ComparisonType.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/filter/ComparisonType.java similarity index 97% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/filter/ComparisonType.java rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/filter/ComparisonType.java index e0247461baa..2c8216a123d 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/filter/ComparisonType.java +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/filter/ComparisonType.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.filter; +package org.apache.texera.amber.operator.filter; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/filter/FilterOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/filter/FilterOpDesc.scala similarity index 81% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/filter/FilterOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/filter/FilterOpDesc.scala index f59ea1bf9c4..a12ab5097f4 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/filter/FilterOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/filter/FilterOpDesc.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.operator.filter +package org.apache.texera.amber.operator.filter -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow.PhysicalOp -import org.apache.amber.operator.{LogicalOp, StateTransferFunc} +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow.PhysicalOp +import org.apache.texera.amber.operator.{LogicalOp, StateTransferFunc} import scala.util.{Success, Try} diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/filter/FilterOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/filter/FilterOpExec.scala similarity index 87% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/filter/FilterOpExec.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/filter/FilterOpExec.scala index 3f1ed4ef116..071faf65bae 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/filter/FilterOpExec.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/filter/FilterOpExec.scala @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.amber.operator.filter +package org.apache.texera.amber.operator.filter -import org.apache.amber.core.executor.OperatorExecutor -import org.apache.amber.core.tuple.{Tuple, TupleLike} +import org.apache.texera.amber.core.executor.OperatorExecutor +import org.apache.texera.amber.core.tuple.{Tuple, TupleLike} abstract class FilterOpExec extends OperatorExecutor with Serializable { diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/filter/FilterPredicate.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/filter/FilterPredicate.java similarity index 91% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/filter/FilterPredicate.java rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/filter/FilterPredicate.java index 10a1fa73cc9..3732bd23e3d 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/filter/FilterPredicate.java +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/filter/FilterPredicate.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.amber.operator.filter; +package org.apache.texera.amber.operator.filter; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaInject; import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaString; -import org.apache.amber.core.tuple.AttributeType; -import org.apache.amber.core.tuple.AttributeTypeUtils; -import org.apache.amber.core.tuple.Tuple; -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName; -import org.apache.amber.operator.metadata.annotations.HideAnnotation; +import org.apache.texera.amber.core.tuple.AttributeType; +import org.apache.texera.amber.core.tuple.AttributeTypeUtils; +import org.apache.texera.amber.core.tuple.Tuple; +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName; +import org.apache.texera.amber.operator.metadata.annotations.HideAnnotation; import java.sql.Timestamp; import java.util.Objects; @@ -85,9 +85,9 @@ private static > boolean evaluateFilter(T tupleValue, T @JsonIgnore public boolean evaluate(Tuple tuple) { boolean isFieldNull = tuple.getField(attribute) == null; - if (condition == org.apache.amber.operator.filter.ComparisonType.IS_NULL) { + if (condition == org.apache.texera.amber.operator.filter.ComparisonType.IS_NULL) { return isFieldNull; - } else if (condition == org.apache.amber.operator.filter.ComparisonType.IS_NOT_NULL) { + } else if (condition == org.apache.texera.amber.operator.filter.ComparisonType.IS_NOT_NULL) { return !isFieldNull; } else if (isFieldNull) { return false; diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/filter/SpecializedFilterOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/filter/SpecializedFilterOpDesc.scala similarity index 78% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/filter/SpecializedFilterOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/filter/SpecializedFilterOpDesc.scala index 85192a916fe..9e86773df7c 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/filter/SpecializedFilterOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/filter/SpecializedFilterOpDesc.scala @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.amber.operator.filter +package org.apache.texera.amber.operator.filter import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} -import org.apache.amber.core.executor.OpExecWithClassName -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow.{InputPort, OutputPort, PhysicalOp} -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.OpExecWithClassName +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PhysicalOp} +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.util.JSONUtils.objectMapper class SpecializedFilterOpDesc extends FilterOpDesc { @@ -42,7 +42,7 @@ class SpecializedFilterOpDesc extends FilterOpDesc { executionId, operatorIdentifier, OpExecWithClassName( - "org.apache.amber.operator.filter.SpecializedFilterOpExec", + "org.apache.texera.amber.operator.filter.SpecializedFilterOpExec", objectMapper.writeValueAsString(this) ) ) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/filter/SpecializedFilterOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/filter/SpecializedFilterOpExec.scala similarity index 87% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/filter/SpecializedFilterOpExec.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/filter/SpecializedFilterOpExec.scala index a549f862ee7..30f1d955865 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/filter/SpecializedFilterOpExec.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/filter/SpecializedFilterOpExec.scala @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.amber.operator.filter +package org.apache.texera.amber.operator.filter -import org.apache.amber.core.tuple.Tuple -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.tuple.Tuple +import org.apache.texera.amber.util.JSONUtils.objectMapper class SpecializedFilterOpExec(descString: String) extends FilterOpExec { private val desc: SpecializedFilterOpDesc = diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/flatmap/FlatMapOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/flatmap/FlatMapOpDesc.scala similarity index 89% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/flatmap/FlatMapOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/flatmap/FlatMapOpDesc.scala index 67d6ea7e34d..05ef92a7138 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/flatmap/FlatMapOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/flatmap/FlatMapOpDesc.scala @@ -17,8 +17,8 @@ * under the License. */ -package org.apache.amber.operator.flatmap +package org.apache.texera.amber.operator.flatmap -import org.apache.amber.operator.LogicalOp +import org.apache.texera.amber.operator.LogicalOp abstract class FlatMapOpDesc extends LogicalOp {} diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/flatmap/FlatMapOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/flatmap/FlatMapOpExec.scala similarity index 88% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/flatmap/FlatMapOpExec.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/flatmap/FlatMapOpExec.scala index 9d4accb92d8..4666fc35100 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/flatmap/FlatMapOpExec.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/flatmap/FlatMapOpExec.scala @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.amber.operator.flatmap +package org.apache.texera.amber.operator.flatmap -import org.apache.amber.core.executor.OperatorExecutor -import org.apache.amber.core.tuple.{Tuple, TupleLike} +import org.apache.texera.amber.core.executor.OperatorExecutor +import org.apache.texera.amber.core.tuple.{Tuple, TupleLike} /** * Executes a flatMap() operation. diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/hashJoin/HashJoinBuildOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/hashJoin/HashJoinBuildOpExec.scala similarity index 88% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/hashJoin/HashJoinBuildOpExec.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/hashJoin/HashJoinBuildOpExec.scala index 16151eb9fd7..459a2190b0b 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/hashJoin/HashJoinBuildOpExec.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/hashJoin/HashJoinBuildOpExec.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.operator.hashJoin +package org.apache.texera.amber.operator.hashJoin -import org.apache.amber.core.executor.OperatorExecutor -import org.apache.amber.core.tuple.{Tuple, TupleLike} -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.OperatorExecutor +import org.apache.texera.amber.core.tuple.{Tuple, TupleLike} +import org.apache.texera.amber.util.JSONUtils.objectMapper import scala.collection.mutable import scala.collection.mutable.ListBuffer diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/hashJoin/HashJoinOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/hashJoin/HashJoinOpDesc.scala similarity index 89% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/hashJoin/HashJoinOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/hashJoin/HashJoinOpDesc.scala index 243ecab2c79..708546a84ad 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/hashJoin/HashJoinOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/hashJoin/HashJoinOpDesc.scala @@ -17,26 +17,26 @@ * under the License. */ -package org.apache.amber.operator.hashJoin +package org.apache.texera.amber.operator.hashJoin import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} -import org.apache.amber.core.executor.OpExecWithClassName -import org.apache.amber.core.tuple.{Attribute, Schema} -import org.apache.amber.core.virtualidentity.{ +import org.apache.texera.amber.core.executor.OpExecWithClassName +import org.apache.texera.amber.core.tuple.{Attribute, Schema} +import org.apache.texera.amber.core.virtualidentity.{ ExecutionIdentity, PhysicalOpIdentity, WorkflowIdentity } -import org.apache.amber.core.workflow._ -import org.apache.amber.operator.LogicalOp -import org.apache.amber.operator.hashJoin.HashJoinOpDesc.HASH_JOIN_INTERNAL_KEY_NAME -import org.apache.amber.operator.metadata.annotations.{ +import org.apache.texera.amber.core.workflow._ +import org.apache.texera.amber.operator.LogicalOp +import org.apache.texera.amber.operator.hashJoin.HashJoinOpDesc.HASH_JOIN_INTERNAL_KEY_NAME +import org.apache.texera.amber.operator.metadata.annotations.{ AutofillAttributeName, AutofillAttributeNameOnPort1 } -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.util.JSONUtils.objectMapper object HashJoinOpDesc { val HASH_JOIN_INTERNAL_KEY_NAME = "__internal__hashtable__key__" @@ -87,7 +87,7 @@ class HashJoinOpDesc[K] extends LogicalOp { workflowId, executionId, OpExecWithClassName( - "org.apache.amber.operator.hashJoin.HashJoinBuildOpExec", + "org.apache.texera.amber.operator.hashJoin.HashJoinBuildOpExec", objectMapper.writeValueAsString(this) ) ) @@ -125,7 +125,7 @@ class HashJoinOpDesc[K] extends LogicalOp { workflowId, executionId, OpExecWithClassName( - "org.apache.amber.operator.hashJoin.HashJoinProbeOpExec", + "org.apache.texera.amber.operator.hashJoin.HashJoinProbeOpExec", objectMapper.writeValueAsString(this) ) ) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/hashJoin/HashJoinProbeOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/hashJoin/HashJoinProbeOpExec.scala similarity index 93% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/hashJoin/HashJoinProbeOpExec.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/hashJoin/HashJoinProbeOpExec.scala index ae8421ff954..a27ae1d5e24 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/hashJoin/HashJoinProbeOpExec.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/hashJoin/HashJoinProbeOpExec.scala @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.amber.operator.hashJoin +package org.apache.texera.amber.operator.hashJoin -import org.apache.amber.core.executor.OperatorExecutor -import org.apache.amber.core.tuple.{Tuple, TupleLike} -import org.apache.amber.operator.hashJoin.HashJoinOpDesc.HASH_JOIN_INTERNAL_KEY_NAME -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.OperatorExecutor +import org.apache.texera.amber.core.tuple.{Tuple, TupleLike} +import org.apache.texera.amber.operator.hashJoin.HashJoinOpDesc.HASH_JOIN_INTERNAL_KEY_NAME +import org.apache.texera.amber.util.JSONUtils.objectMapper import scala.collection.mutable import scala.collection.mutable.ListBuffer diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/hashJoin/JoinType.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/hashJoin/JoinType.java similarity index 95% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/hashJoin/JoinType.java rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/hashJoin/JoinType.java index 09f18dada08..5ac03b3b873 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/hashJoin/JoinType.java +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/hashJoin/JoinType.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.hashJoin; +package org.apache.texera.amber.operator.hashJoin; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/huggingFace/HuggingFaceIrisLogisticRegressionOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/huggingFace/HuggingFaceIrisLogisticRegressionOpDesc.scala similarity index 91% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/huggingFace/HuggingFaceIrisLogisticRegressionOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/huggingFace/HuggingFaceIrisLogisticRegressionOpDesc.scala index b538cbd703e..81ae9e03df5 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/huggingFace/HuggingFaceIrisLogisticRegressionOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/huggingFace/HuggingFaceIrisLogisticRegressionOpDesc.scala @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.amber.operator.huggingFace +package org.apache.texera.amber.operator.huggingFace import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} class HuggingFaceIrisLogisticRegressionOpDesc extends PythonOperatorDescriptor { @JsonProperty(value = "petalLengthCmAttribute", required = true) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/huggingFace/HuggingFaceSentimentAnalysisOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/huggingFace/HuggingFaceSentimentAnalysisOpDesc.scala similarity index 91% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/huggingFace/HuggingFaceSentimentAnalysisOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/huggingFace/HuggingFaceSentimentAnalysisOpDesc.scala index 464adf0828d..551b25b4810 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/huggingFace/HuggingFaceSentimentAnalysisOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/huggingFace/HuggingFaceSentimentAnalysisOpDesc.scala @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.amber.operator.huggingFace +package org.apache.texera.amber.operator.huggingFace import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} class HuggingFaceSentimentAnalysisOpDesc extends PythonOperatorDescriptor { @JsonProperty(value = "attribute", required = true) @JsonPropertyDescription("column to perform sentiment analysis on") diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/huggingFace/HuggingFaceSpamSMSDetectionOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/huggingFace/HuggingFaceSpamSMSDetectionOpDesc.scala similarity index 87% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/huggingFace/HuggingFaceSpamSMSDetectionOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/huggingFace/HuggingFaceSpamSMSDetectionOpDesc.scala index 52ae8f40dc8..d5fdb24deba 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/huggingFace/HuggingFaceSpamSMSDetectionOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/huggingFace/HuggingFaceSpamSMSDetectionOpDesc.scala @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.amber.operator.huggingFace +package org.apache.texera.amber.operator.huggingFace import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} class HuggingFaceSpamSMSDetectionOpDesc extends PythonOperatorDescriptor { @JsonProperty(value = "attribute", required = true) @JsonPropertyDescription("column to perform spam detection on") diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/huggingFace/HuggingFaceTextSummarizationOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/huggingFace/HuggingFaceTextSummarizationOpDesc.scala similarity index 88% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/huggingFace/HuggingFaceTextSummarizationOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/huggingFace/HuggingFaceTextSummarizationOpDesc.scala index a80f89538c3..41d16c5c1b4 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/huggingFace/HuggingFaceTextSummarizationOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/huggingFace/HuggingFaceTextSummarizationOpDesc.scala @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.amber.operator.huggingFace +package org.apache.texera.amber.operator.huggingFace import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} class HuggingFaceTextSummarizationOpDesc extends PythonOperatorDescriptor { @JsonProperty(value = "attribute", required = true) @JsonPropertyDescription("attribute to perform text summarization on") diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/ifStatement/IfOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/ifStatement/IfOpDesc.scala similarity index 81% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/ifStatement/IfOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/ifStatement/IfOpDesc.scala index c14b858e7e7..f811ed34296 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/ifStatement/IfOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/ifStatement/IfOpDesc.scala @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.amber.operator.ifStatement +package org.apache.texera.amber.operator.ifStatement import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.core.executor.OpExecWithClassName -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow._ -import org.apache.amber.operator.LogicalOp -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.OpExecWithClassName +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow._ +import org.apache.texera.amber.operator.LogicalOp +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.util.JSONUtils.objectMapper class IfOpDesc extends LogicalOp { @JsonProperty(required = true) @@ -44,7 +44,7 @@ class IfOpDesc extends LogicalOp { executionId, operatorIdentifier, OpExecWithClassName( - "org.apache.amber.operator.ifStatement.IfOpExec", + "org.apache.texera.amber.operator.ifStatement.IfOpExec", objectMapper.writeValueAsString(this) ) ) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/ifStatement/IfOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/ifStatement/IfOpExec.scala similarity index 83% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/ifStatement/IfOpExec.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/ifStatement/IfOpExec.scala index 6b7f585f603..462bdd0969a 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/ifStatement/IfOpExec.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/ifStatement/IfOpExec.scala @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.amber.operator.ifStatement +package org.apache.texera.amber.operator.ifStatement -import org.apache.amber.core.executor.OperatorExecutor -import org.apache.amber.core.state.State -import org.apache.amber.core.tuple.{Tuple, TupleLike} -import org.apache.amber.core.workflow.PortIdentity -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.OperatorExecutor +import org.apache.texera.amber.core.state.State +import org.apache.texera.amber.core.tuple.{Tuple, TupleLike} +import org.apache.texera.amber.core.workflow.PortIdentity +import org.apache.texera.amber.util.JSONUtils.objectMapper class IfOpExec(descString: String) extends OperatorExecutor { private val desc: IfOpDesc = objectMapper.readValue(descString, classOf[IfOpDesc]) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/intersect/IntersectOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/intersect/IntersectOpDesc.scala similarity index 77% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/intersect/IntersectOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/intersect/IntersectOpDesc.scala index 7d7a5de0bbc..323d51b0ad5 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/intersect/IntersectOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/intersect/IntersectOpDesc.scala @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.amber.operator.intersect +package org.apache.texera.amber.operator.intersect -import org.apache.amber.core.executor.OpExecWithClassName -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow._ -import org.apache.amber.operator.LogicalOp -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.executor.OpExecWithClassName +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow._ +import org.apache.texera.amber.operator.LogicalOp +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} class IntersectOpDesc extends LogicalOp { @@ -36,7 +36,7 @@ class IntersectOpDesc extends LogicalOp { workflowId, executionId, operatorIdentifier, - OpExecWithClassName("org.apache.amber.operator.intersect.IntersectOpExec") + OpExecWithClassName("org.apache.texera.amber.operator.intersect.IntersectOpExec") ) .withInputPorts(operatorInfo.inputPorts) .withOutputPorts(operatorInfo.outputPorts) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/intersect/IntersectOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/intersect/IntersectOpExec.scala similarity index 91% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/intersect/IntersectOpExec.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/intersect/IntersectOpExec.scala index 6645f1a04b3..973abbcfbe1 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/intersect/IntersectOpExec.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/intersect/IntersectOpExec.scala @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.amber.operator.intersect +package org.apache.texera.amber.operator.intersect -import org.apache.amber.core.executor.OperatorExecutor -import org.apache.amber.core.tuple.{Tuple, TupleLike} +import org.apache.texera.amber.core.executor.OperatorExecutor +import org.apache.texera.amber.core.tuple.{Tuple, TupleLike} import scala.collection.mutable diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/intervalJoin/IntervalJoinOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/intervalJoin/IntervalJoinOpDesc.scala similarity index 89% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/intervalJoin/IntervalJoinOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/intervalJoin/IntervalJoinOpDesc.scala index 7ca18d516c8..2218fe2cce1 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/intervalJoin/IntervalJoinOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/intervalJoin/IntervalJoinOpDesc.scala @@ -17,22 +17,22 @@ * under the License. */ -package org.apache.amber.operator.intervalJoin +package org.apache.texera.amber.operator.intervalJoin import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.fasterxml.jackson.databind.annotation.JsonDeserialize import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} -import org.apache.amber.core.executor.OpExecWithClassName -import org.apache.amber.core.tuple.{Attribute, Schema} -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow._ -import org.apache.amber.operator.LogicalOp -import org.apache.amber.operator.metadata.annotations.{ +import org.apache.texera.amber.core.executor.OpExecWithClassName +import org.apache.texera.amber.core.tuple.{Attribute, Schema} +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow._ +import org.apache.texera.amber.operator.LogicalOp +import org.apache.texera.amber.operator.metadata.annotations.{ AutofillAttributeName, AutofillAttributeNameOnPort1 } -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.util.JSONUtils.objectMapper /** This Operator have two assumptions: * 1. The tuples in both inputs come in ascending order @@ -102,7 +102,7 @@ class IntervalJoinOpDesc extends LogicalOp { executionId, operatorIdentifier, OpExecWithClassName( - "org.apache.amber.operator.intervalJoin.IntervalJoinOpExec", + "org.apache.texera.amber.operator.intervalJoin.IntervalJoinOpExec", objectMapper.writeValueAsString(this) ) ) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/intervalJoin/IntervalJoinOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/intervalJoin/IntervalJoinOpExec.scala similarity index 95% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/intervalJoin/IntervalJoinOpExec.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/intervalJoin/IntervalJoinOpExec.scala index 8540741f7b4..4a4c987540d 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/intervalJoin/IntervalJoinOpExec.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/intervalJoin/IntervalJoinOpExec.scala @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.amber.operator.intervalJoin +package org.apache.texera.amber.operator.intervalJoin -import org.apache.amber.core.WorkflowRuntimeException -import org.apache.amber.core.executor.OperatorExecutor -import org.apache.amber.core.tuple.{AttributeType, Tuple, TupleLike} -import org.apache.amber.operator.hashJoin.JoinUtils -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.WorkflowRuntimeException +import org.apache.texera.amber.core.executor.OperatorExecutor +import org.apache.texera.amber.core.tuple.{AttributeType, Tuple, TupleLike} +import org.apache.texera.amber.operator.hashJoin.JoinUtils +import org.apache.texera.amber.util.JSONUtils.objectMapper import java.sql.Timestamp import scala.collection.mutable.ListBuffer diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/intervalJoin/TimeIntervalType.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/intervalJoin/TimeIntervalType.java similarity index 96% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/intervalJoin/TimeIntervalType.java rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/intervalJoin/TimeIntervalType.java index 50d178d021a..2070b950443 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/intervalJoin/TimeIntervalType.java +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/intervalJoin/TimeIntervalType.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.intervalJoin; +package org.apache.texera.amber.operator.intervalJoin; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/keywordSearch/KeywordSearchOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/keywordSearch/KeywordSearchOpDesc.scala similarity index 76% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/keywordSearch/KeywordSearchOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/keywordSearch/KeywordSearchOpDesc.scala index f5101aaffb1..0aef079e61a 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/keywordSearch/KeywordSearchOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/keywordSearch/KeywordSearchOpDesc.scala @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.amber.operator.keywordSearch +package org.apache.texera.amber.operator.keywordSearch import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.core.executor.OpExecWithClassName -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow.{InputPort, OutputPort, PhysicalOp} -import org.apache.amber.operator.filter.FilterOpDesc -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.OpExecWithClassName +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PhysicalOp} +import org.apache.texera.amber.operator.filter.FilterOpDesc +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.util.JSONUtils.objectMapper class KeywordSearchOpDesc extends FilterOpDesc { @@ -52,7 +52,7 @@ class KeywordSearchOpDesc extends FilterOpDesc { executionId, operatorIdentifier, OpExecWithClassName( - "org.apache.amber.operator.keywordSearch.KeywordSearchOpExec", + "org.apache.texera.amber.operator.keywordSearch.KeywordSearchOpExec", objectMapper.writeValueAsString(this) ) ) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/keywordSearch/KeywordSearchOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/keywordSearch/KeywordSearchOpExec.scala similarity index 90% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/keywordSearch/KeywordSearchOpExec.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/keywordSearch/KeywordSearchOpExec.scala index 41948343693..1354f2f0aff 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/keywordSearch/KeywordSearchOpExec.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/keywordSearch/KeywordSearchOpExec.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.operator.keywordSearch +package org.apache.texera.amber.operator.keywordSearch -import org.apache.amber.core.tuple.Tuple -import org.apache.amber.operator.filter.FilterOpExec -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.tuple.Tuple +import org.apache.texera.amber.operator.filter.FilterOpExec +import org.apache.texera.amber.util.JSONUtils.objectMapper import org.apache.lucene.analysis.standard.StandardAnalyzer import org.apache.lucene.index.memory.MemoryIndex import org.apache.lucene.queryparser.classic.QueryParser diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/limit/LimitOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/limit/LimitOpDesc.scala similarity index 81% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/limit/LimitOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/limit/LimitOpDesc.scala index a7936ae389c..6e1b7f37af3 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/limit/LimitOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/limit/LimitOpDesc.scala @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.amber.operator.limit +package org.apache.texera.amber.operator.limit import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.core.executor.OpExecWithClassName -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow.{InputPort, OutputPort, PhysicalOp} -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import org.apache.amber.operator.{LogicalOp, StateTransferFunc} -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.OpExecWithClassName +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PhysicalOp} +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.operator.{LogicalOp, StateTransferFunc} +import org.apache.texera.amber.util.JSONUtils.objectMapper import scala.util.{Success, Try} @@ -47,7 +47,7 @@ class LimitOpDesc extends LogicalOp { executionId, operatorIdentifier, OpExecWithClassName( - "org.apache.amber.operator.limit.LimitOpExec", + "org.apache.texera.amber.operator.limit.LimitOpExec", objectMapper.writeValueAsString(this) ) ) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/limit/LimitOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/limit/LimitOpExec.scala similarity index 84% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/limit/LimitOpExec.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/limit/LimitOpExec.scala index 2c862599f2e..09046149097 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/limit/LimitOpExec.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/limit/LimitOpExec.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.operator.limit +package org.apache.texera.amber.operator.limit -import org.apache.amber.core.executor.OperatorExecutor -import org.apache.amber.core.tuple.{Tuple, TupleLike} -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.OperatorExecutor +import org.apache.texera.amber.core.tuple.{Tuple, TupleLike} +import org.apache.texera.amber.util.JSONUtils.objectMapper class LimitOpExec(descString: String) extends OperatorExecutor { private val desc: LimitOpDesc = objectMapper.readValue(descString, classOf[LimitOpDesc]) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/machineLearning/Scorer/MachineLearningScorerOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/Scorer/MachineLearningScorerOpDesc.scala similarity index 93% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/machineLearning/Scorer/MachineLearningScorerOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/Scorer/MachineLearningScorerOpDesc.scala index 099ce60786a..0020b547aee 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/machineLearning/Scorer/MachineLearningScorerOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/Scorer/MachineLearningScorerOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.machineLearning.Scorer +package org.apache.texera.amber.operator.machineLearning.Scorer import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.{ @@ -25,11 +25,11 @@ import com.kjetland.jackson.jsonSchema.annotations.{ JsonSchemaString, JsonSchemaTitle } -import org.apache.amber.core.tuple.{Attribute, AttributeType, Schema} -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.annotations.{AutofillAttributeName, HideAnnotation} -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.tuple.{Attribute, AttributeType, Schema} +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.annotations.{AutofillAttributeName, HideAnnotation} +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} class MachineLearningScorerOpDesc extends PythonOperatorDescriptor { @JsonProperty(required = true, defaultValue = "false") diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/machineLearning/Scorer/classificationMetricsFnc.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/Scorer/classificationMetricsFnc.java similarity index 94% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/machineLearning/Scorer/classificationMetricsFnc.java rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/Scorer/classificationMetricsFnc.java index 5b144beb59a..b426b6a2ca8 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/machineLearning/Scorer/classificationMetricsFnc.java +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/Scorer/classificationMetricsFnc.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.machineLearning.Scorer; +package org.apache.texera.amber.operator.machineLearning.Scorer; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/machineLearning/Scorer/regressionMetricsFnc.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/Scorer/regressionMetricsFnc.java similarity index 94% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/machineLearning/Scorer/regressionMetricsFnc.java rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/Scorer/regressionMetricsFnc.java index 7871e9fa5e2..6ca830326f2 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/machineLearning/Scorer/regressionMetricsFnc.java +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/Scorer/regressionMetricsFnc.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.machineLearning.Scorer; +package org.apache.texera.amber.operator.machineLearning.Scorer; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/machineLearning/sklearnAdvanced/KNNTrainer/SklearnAdvancedKNNClassifierTrainerOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/KNNTrainer/SklearnAdvancedKNNClassifierTrainerOpDesc.scala similarity index 85% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/machineLearning/sklearnAdvanced/KNNTrainer/SklearnAdvancedKNNClassifierTrainerOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/KNNTrainer/SklearnAdvancedKNNClassifierTrainerOpDesc.scala index 81ac6c632e4..33b7ccb4e5b 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/machineLearning/sklearnAdvanced/KNNTrainer/SklearnAdvancedKNNClassifierTrainerOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/KNNTrainer/SklearnAdvancedKNNClassifierTrainerOpDesc.scala @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.amber.operator.machineLearning.sklearnAdvanced.KNNTrainer +package org.apache.texera.amber.operator.machineLearning.sklearnAdvanced.KNNTrainer -import org.apache.amber.operator.machineLearning.sklearnAdvanced.base.SklearnMLOperatorDescriptor +import org.apache.texera.amber.operator.machineLearning.sklearnAdvanced.base.SklearnMLOperatorDescriptor class SklearnAdvancedKNNClassifierTrainerOpDesc extends SklearnMLOperatorDescriptor[SklearnAdvancedKNNParameters] { diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/machineLearning/sklearnAdvanced/KNNTrainer/SklearnAdvancedKNNParameters.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/KNNTrainer/SklearnAdvancedKNNParameters.java similarity index 89% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/machineLearning/sklearnAdvanced/KNNTrainer/SklearnAdvancedKNNParameters.java rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/KNNTrainer/SklearnAdvancedKNNParameters.java index da1e0bebfaf..7bb8c9dd9ac 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/machineLearning/sklearnAdvanced/KNNTrainer/SklearnAdvancedKNNParameters.java +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/KNNTrainer/SklearnAdvancedKNNParameters.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.amber.operator.machineLearning.sklearnAdvanced.KNNTrainer; +package org.apache.texera.amber.operator.machineLearning.sklearnAdvanced.KNNTrainer; -import org.apache.amber.operator.machineLearning.sklearnAdvanced.base.ParamClass; +import org.apache.texera.amber.operator.machineLearning.sklearnAdvanced.base.ParamClass; public enum SklearnAdvancedKNNParameters implements ParamClass { n_neighbors("n_neighbors", "int"), diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/machineLearning/sklearnAdvanced/KNNTrainer/SklearnAdvancedKNNRegressorTrainerOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/KNNTrainer/SklearnAdvancedKNNRegressorTrainerOpDesc.scala similarity index 85% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/machineLearning/sklearnAdvanced/KNNTrainer/SklearnAdvancedKNNRegressorTrainerOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/KNNTrainer/SklearnAdvancedKNNRegressorTrainerOpDesc.scala index 5691dfde3cf..aaab2a5631c 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/machineLearning/sklearnAdvanced/KNNTrainer/SklearnAdvancedKNNRegressorTrainerOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/KNNTrainer/SklearnAdvancedKNNRegressorTrainerOpDesc.scala @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.amber.operator.machineLearning.sklearnAdvanced.KNNTrainer +package org.apache.texera.amber.operator.machineLearning.sklearnAdvanced.KNNTrainer -import org.apache.amber.operator.machineLearning.sklearnAdvanced.base.SklearnMLOperatorDescriptor +import org.apache.texera.amber.operator.machineLearning.sklearnAdvanced.base.SklearnMLOperatorDescriptor class SklearnAdvancedKNNRegressorTrainerOpDesc extends SklearnMLOperatorDescriptor[SklearnAdvancedKNNParameters] { diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/machineLearning/sklearnAdvanced/SVCTrainer/SklearnAdvancedSVCParameters.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/SVCTrainer/SklearnAdvancedSVCParameters.java similarity index 89% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/machineLearning/sklearnAdvanced/SVCTrainer/SklearnAdvancedSVCParameters.java rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/SVCTrainer/SklearnAdvancedSVCParameters.java index f308b2321f4..c2e6b6df3f6 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/machineLearning/sklearnAdvanced/SVCTrainer/SklearnAdvancedSVCParameters.java +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/SVCTrainer/SklearnAdvancedSVCParameters.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.amber.operator.machineLearning.sklearnAdvanced.SVCTrainer; +package org.apache.texera.amber.operator.machineLearning.sklearnAdvanced.SVCTrainer; -import org.apache.amber.operator.machineLearning.sklearnAdvanced.base.ParamClass; +import org.apache.texera.amber.operator.machineLearning.sklearnAdvanced.base.ParamClass; public enum SklearnAdvancedSVCParameters implements ParamClass { C("C", "float"), diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/machineLearning/sklearnAdvanced/SVCTrainer/SklearnAdvancedSVCTrainerOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/SVCTrainer/SklearnAdvancedSVCTrainerOpDesc.scala similarity index 85% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/machineLearning/sklearnAdvanced/SVCTrainer/SklearnAdvancedSVCTrainerOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/SVCTrainer/SklearnAdvancedSVCTrainerOpDesc.scala index 3b908d556b8..8e1b9c9acce 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/machineLearning/sklearnAdvanced/SVCTrainer/SklearnAdvancedSVCTrainerOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/SVCTrainer/SklearnAdvancedSVCTrainerOpDesc.scala @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.amber.operator.machineLearning.sklearnAdvanced.SVCTrainer +package org.apache.texera.amber.operator.machineLearning.sklearnAdvanced.SVCTrainer -import org.apache.amber.operator.machineLearning.sklearnAdvanced.base.SklearnMLOperatorDescriptor +import org.apache.texera.amber.operator.machineLearning.sklearnAdvanced.base.SklearnMLOperatorDescriptor class SklearnAdvancedSVCTrainerOpDesc extends SklearnMLOperatorDescriptor[SklearnAdvancedSVCParameters] { diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/machineLearning/sklearnAdvanced/SVRTrainer/SklearnAdvancedSVRParameters.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/SVRTrainer/SklearnAdvancedSVRParameters.java similarity index 90% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/machineLearning/sklearnAdvanced/SVRTrainer/SklearnAdvancedSVRParameters.java rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/SVRTrainer/SklearnAdvancedSVRParameters.java index 5a163503aff..898db274dc8 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/machineLearning/sklearnAdvanced/SVRTrainer/SklearnAdvancedSVRParameters.java +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/SVRTrainer/SklearnAdvancedSVRParameters.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.amber.operator.machineLearning.sklearnAdvanced.SVRTrainer; +package org.apache.texera.amber.operator.machineLearning.sklearnAdvanced.SVRTrainer; -import org.apache.amber.operator.machineLearning.sklearnAdvanced.base.ParamClass; +import org.apache.texera.amber.operator.machineLearning.sklearnAdvanced.base.ParamClass; public enum SklearnAdvancedSVRParameters implements ParamClass { C("C", "float"), diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/machineLearning/sklearnAdvanced/SVRTrainer/SklearnAdvancedSVRTrainerOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/SVRTrainer/SklearnAdvancedSVRTrainerOpDesc.scala similarity index 85% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/machineLearning/sklearnAdvanced/SVRTrainer/SklearnAdvancedSVRTrainerOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/SVRTrainer/SklearnAdvancedSVRTrainerOpDesc.scala index 13aa7d1791b..5632a7614f8 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/machineLearning/sklearnAdvanced/SVRTrainer/SklearnAdvancedSVRTrainerOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/SVRTrainer/SklearnAdvancedSVRTrainerOpDesc.scala @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.amber.operator.machineLearning.sklearnAdvanced.SVRTrainer +package org.apache.texera.amber.operator.machineLearning.sklearnAdvanced.SVRTrainer -import org.apache.amber.operator.machineLearning.sklearnAdvanced.base.SklearnMLOperatorDescriptor +import org.apache.texera.amber.operator.machineLearning.sklearnAdvanced.base.SklearnMLOperatorDescriptor class SklearnAdvancedSVRTrainerOpDesc extends SklearnMLOperatorDescriptor[SklearnAdvancedSVRParameters] { diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/machineLearning/sklearnAdvanced/base/HyperParameters.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/base/HyperParameters.java similarity index 91% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/machineLearning/sklearnAdvanced/base/HyperParameters.java rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/base/HyperParameters.java index 74906d401d8..06906325ba3 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/machineLearning/sklearnAdvanced/base/HyperParameters.java +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/base/HyperParameters.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.amber.operator.machineLearning.sklearnAdvanced.base; +package org.apache.texera.amber.operator.machineLearning.sklearnAdvanced.base; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.kjetland.jackson.jsonSchema.annotations.*; -import org.apache.amber.operator.metadata.annotations.CommonOpDescAnnotation; -import org.apache.amber.operator.metadata.annotations.HideAnnotation; +import org.apache.texera.amber.operator.metadata.annotations.CommonOpDescAnnotation; +import org.apache.texera.amber.operator.metadata.annotations.HideAnnotation; public class HyperParameters { @JsonProperty(required = true) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/machineLearning/sklearnAdvanced/base/SklearnAdvancedBaseDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/base/SklearnAdvancedBaseDesc.scala similarity index 92% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/machineLearning/sklearnAdvanced/base/SklearnAdvancedBaseDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/base/SklearnAdvancedBaseDesc.scala index 38ddad0dc3f..189eb0be799 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/machineLearning/sklearnAdvanced/base/SklearnAdvancedBaseDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/machineLearning/sklearnAdvanced/base/SklearnAdvancedBaseDesc.scala @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.amber.operator.machineLearning.sklearnAdvanced.base +package org.apache.texera.amber.operator.machineLearning.sklearnAdvanced.base import com.fasterxml.jackson.annotation.{JsonIgnore, JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.core.tuple.{Attribute, AttributeType, Schema} -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.annotations.{ +import org.apache.texera.amber.core.tuple.{Attribute, AttributeType, Schema} +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.annotations.{ AutofillAttributeName, AutofillAttributeNameList } -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} trait ParamClass { def getName: String diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/map/MapOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/map/MapOpDesc.scala similarity index 81% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/map/MapOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/map/MapOpDesc.scala index 210714b3dd8..e407c52e0bf 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/map/MapOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/map/MapOpDesc.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.operator.map +package org.apache.texera.amber.operator.map -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow.PhysicalOp -import org.apache.amber.operator.{LogicalOp, StateTransferFunc} +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow.PhysicalOp +import org.apache.texera.amber.operator.{LogicalOp, StateTransferFunc} import scala.util.{Success, Try} diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/map/MapOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/map/MapOpExec.scala similarity index 89% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/map/MapOpExec.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/map/MapOpExec.scala index 8f6cf2fb3f8..a7abf7cde11 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/map/MapOpExec.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/map/MapOpExec.scala @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.amber.operator.map +package org.apache.texera.amber.operator.map -import org.apache.amber.core.executor.OperatorExecutor -import org.apache.amber.core.tuple.{Tuple, TupleLike} +import org.apache.texera.amber.core.executor.OperatorExecutor +import org.apache.texera.amber.core.tuple.{Tuple, TupleLike} /** * Common operator executor of a map() function diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/metadata/OPVersion.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/OPVersion.java similarity index 97% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/metadata/OPVersion.java rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/OPVersion.java index 3d2adae23a1..acf8828d560 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/metadata/OPVersion.java +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/OPVersion.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.metadata; +package org.apache.texera.amber.operator.metadata; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.errors.GitAPIException; diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/metadata/OperatorGroupConstants.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/OperatorGroupConstants.scala similarity index 98% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/metadata/OperatorGroupConstants.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/OperatorGroupConstants.scala index c0a8075c109..27ec48d4731 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/metadata/OperatorGroupConstants.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/OperatorGroupConstants.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.metadata +package org.apache.texera.amber.operator.metadata object OperatorGroupConstants { final val INPUT_GROUP = "Data Input" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/metadata/OperatorMetadataGenerator.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/OperatorMetadataGenerator.scala similarity index 95% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/metadata/OperatorMetadataGenerator.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/OperatorMetadataGenerator.scala index f72fa844278..6899f06a2d5 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/metadata/OperatorMetadataGenerator.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/OperatorMetadataGenerator.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.metadata +package org.apache.texera.amber.operator.metadata import com.fasterxml.jackson.databind.JsonNode import com.fasterxml.jackson.databind.introspect.AnnotatedClassResolver @@ -25,10 +25,10 @@ import com.fasterxml.jackson.databind.jsontype.NamedType import com.fasterxml.jackson.databind.node.{ArrayNode, ObjectNode} import com.kjetland.jackson.jsonSchema.JsonSchemaConfig.html5EnabledSchema import com.kjetland.jackson.jsonSchema.{JsonSchemaConfig, JsonSchemaDraft, JsonSchemaGenerator} -import org.apache.amber.core.workflow.{InputPort, OutputPort} -import org.apache.amber.operator.LogicalOp -import org.apache.amber.operator.source.scan.csv.CSVScanSourceOpDesc -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort} +import org.apache.texera.amber.operator.LogicalOp +import org.apache.texera.amber.operator.source.scan.csv.CSVScanSourceOpDesc +import org.apache.texera.amber.util.JSONUtils.objectMapper import java.util import scala.jdk.CollectionConverters.{IteratorHasAsScala, ListHasAsScala} diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/metadata/PropertyNameConstants.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/PropertyNameConstants.scala similarity index 97% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/metadata/PropertyNameConstants.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/PropertyNameConstants.scala index 092bdcca502..52bb0414692 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/metadata/PropertyNameConstants.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/PropertyNameConstants.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.metadata +package org.apache.texera.amber.operator.metadata /** * PropertyNameConstants defines the key names diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/metadata/annotations/AutofillAttributeName.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/AutofillAttributeName.java similarity index 96% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/metadata/annotations/AutofillAttributeName.java rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/AutofillAttributeName.java index 6dfdac47a6e..f53a081f8c2 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/metadata/annotations/AutofillAttributeName.java +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/AutofillAttributeName.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.metadata.annotations; +package org.apache.texera.amber.operator.metadata.annotations; import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaInject; diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/metadata/annotations/AutofillAttributeNameLambda.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/AutofillAttributeNameLambda.java similarity index 97% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/metadata/annotations/AutofillAttributeNameLambda.java rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/AutofillAttributeNameLambda.java index f5888785aa9..2fd22628e82 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/metadata/annotations/AutofillAttributeNameLambda.java +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/AutofillAttributeNameLambda.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.metadata.annotations; +package org.apache.texera.amber.operator.metadata.annotations; import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaInject; diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/metadata/annotations/AutofillAttributeNameList.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/AutofillAttributeNameList.java similarity index 96% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/metadata/annotations/AutofillAttributeNameList.java rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/AutofillAttributeNameList.java index 761824de947..1178245ee54 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/metadata/annotations/AutofillAttributeNameList.java +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/AutofillAttributeNameList.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.metadata.annotations; +package org.apache.texera.amber.operator.metadata.annotations; import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaInject; diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/metadata/annotations/AutofillAttributeNameOnPort1.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/AutofillAttributeNameOnPort1.java similarity index 96% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/metadata/annotations/AutofillAttributeNameOnPort1.java rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/AutofillAttributeNameOnPort1.java index 13ea2804fb4..451665900cb 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/metadata/annotations/AutofillAttributeNameOnPort1.java +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/AutofillAttributeNameOnPort1.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.metadata.annotations; +package org.apache.texera.amber.operator.metadata.annotations; import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaInject; diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/metadata/annotations/BatchByColumn.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/BatchByColumn.java similarity index 95% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/metadata/annotations/BatchByColumn.java rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/BatchByColumn.java index 407a3ec45ff..c070614f2cf 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/metadata/annotations/BatchByColumn.java +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/BatchByColumn.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.metadata.annotations; +package org.apache.texera.amber.operator.metadata.annotations; import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaInject; diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/metadata/annotations/CommonOpDescAnnotation.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/CommonOpDescAnnotation.java similarity index 95% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/metadata/annotations/CommonOpDescAnnotation.java rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/CommonOpDescAnnotation.java index 0ae5dab9639..9402348102e 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/metadata/annotations/CommonOpDescAnnotation.java +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/CommonOpDescAnnotation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.metadata.annotations; +package org.apache.texera.amber.operator.metadata.annotations; public class CommonOpDescAnnotation { // JSON schema key diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/metadata/annotations/EnablePresets.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/EnablePresets.java similarity index 95% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/metadata/annotations/EnablePresets.java rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/EnablePresets.java index 81634a2bbd3..f70971edd42 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/metadata/annotations/EnablePresets.java +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/EnablePresets.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.metadata.annotations; +package org.apache.texera.amber.operator.metadata.annotations; import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaBool; diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/metadata/annotations/HideAnnotation.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/HideAnnotation.java similarity index 97% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/metadata/annotations/HideAnnotation.java rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/HideAnnotation.java index 08cd5f7fa2c..3973f5860be 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/metadata/annotations/HideAnnotation.java +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/HideAnnotation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.metadata.annotations; +package org.apache.texera.amber.operator.metadata.annotations; /* For every hide annotation, you specify on a formly field three things: the target (field name of dependent comparison), diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/metadata/annotations/UIWidget.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/UIWidget.java similarity index 95% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/metadata/annotations/UIWidget.java rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/UIWidget.java index efa30b94521..04bc6a05e68 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/metadata/annotations/UIWidget.java +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/metadata/annotations/UIWidget.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.metadata.annotations; +package org.apache.texera.amber.operator.metadata.annotations; public class UIWidget { diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/projection/AttributeUnit.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/projection/AttributeUnit.java similarity index 94% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/projection/AttributeUnit.java rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/projection/AttributeUnit.java index 8a00ca20823..2c7bf3585c4 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/projection/AttributeUnit.java +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/projection/AttributeUnit.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.amber.operator.projection; +package org.apache.texera.amber.operator.projection; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle; -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName; +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName; import org.jooq.tools.StringUtils; import java.util.Objects; diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/projection/ProjectionOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/projection/ProjectionOpDesc.scala similarity index 83% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/projection/ProjectionOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/projection/ProjectionOpDesc.scala index b8aac8d6d86..3af25b98326 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/projection/ProjectionOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/projection/ProjectionOpDesc.scala @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.amber.operator.projection +package org.apache.texera.amber.operator.projection import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.core.executor.OpExecWithClassName -import org.apache.amber.core.tuple.Schema -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow.PhysicalOp.oneToOnePhysicalOp -import org.apache.amber.core.workflow._ -import org.apache.amber.operator.map.MapOpDesc -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.OpExecWithClassName +import org.apache.texera.amber.core.tuple.Schema +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow.PhysicalOp.oneToOnePhysicalOp +import org.apache.texera.amber.core.workflow._ +import org.apache.texera.amber.operator.map.MapOpDesc +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.util.JSONUtils.objectMapper class ProjectionOpDesc extends MapOpDesc { @@ -48,7 +48,7 @@ class ProjectionOpDesc extends MapOpDesc { executionId, operatorIdentifier, OpExecWithClassName( - "org.apache.amber.operator.projection.ProjectionOpExec", + "org.apache.texera.amber.operator.projection.ProjectionOpExec", objectMapper.writeValueAsString(this) ) ) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/projection/ProjectionOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/projection/ProjectionOpExec.scala similarity index 90% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/projection/ProjectionOpExec.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/projection/ProjectionOpExec.scala index 5bbc8f65802..158d15e274e 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/projection/ProjectionOpExec.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/projection/ProjectionOpExec.scala @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.amber.operator.projection +package org.apache.texera.amber.operator.projection import com.google.common.base.Preconditions -import org.apache.amber.core.tuple.{Tuple, TupleLike} -import org.apache.amber.operator.map.MapOpExec -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.tuple.{Tuple, TupleLike} +import org.apache.texera.amber.operator.map.MapOpExec +import org.apache.texera.amber.util.JSONUtils.objectMapper import scala.collection.mutable diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/randomksampling/RandomKSamplingOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/randomksampling/RandomKSamplingOpDesc.scala similarity index 76% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/randomksampling/RandomKSamplingOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/randomksampling/RandomKSamplingOpDesc.scala index fcf5d980bde..31cafcbc76b 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/randomksampling/RandomKSamplingOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/randomksampling/RandomKSamplingOpDesc.scala @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.amber.operator.randomksampling +package org.apache.texera.amber.operator.randomksampling import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} -import org.apache.amber.core.executor.OpExecWithClassName -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow.{InputPort, OutputPort, PhysicalOp} -import org.apache.amber.operator.filter.FilterOpDesc -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.OpExecWithClassName +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PhysicalOp} +import org.apache.texera.amber.operator.filter.FilterOpDesc +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.util.JSONUtils.objectMapper class RandomKSamplingOpDesc extends FilterOpDesc { @@ -43,7 +43,7 @@ class RandomKSamplingOpDesc extends FilterOpDesc { executionId, operatorIdentifier, OpExecWithClassName( - "org.apache.amber.operator.randomksampling.RandomKSamplingOpExec", + "org.apache.texera.amber.operator.randomksampling.RandomKSamplingOpExec", objectMapper.writeValueAsString(this) ) ) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/randomksampling/RandomKSamplingOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/randomksampling/RandomKSamplingOpExec.scala similarity index 86% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/randomksampling/RandomKSamplingOpExec.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/randomksampling/RandomKSamplingOpExec.scala index 349f15a0105..a23ed5a74ea 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/randomksampling/RandomKSamplingOpExec.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/randomksampling/RandomKSamplingOpExec.scala @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.amber.operator.randomksampling +package org.apache.texera.amber.operator.randomksampling -import org.apache.amber.operator.filter.FilterOpExec -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.operator.filter.FilterOpExec +import org.apache.texera.amber.util.JSONUtils.objectMapper import scala.util.Random diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/regex/RegexOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/regex/RegexOpDesc.scala similarity index 78% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/regex/RegexOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/regex/RegexOpDesc.scala index e78933bd17e..0f886ae53be 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/regex/RegexOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/regex/RegexOpDesc.scala @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.amber.operator.regex +package org.apache.texera.amber.operator.regex import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.core.executor.OpExecWithClassName -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow.{InputPort, OutputPort, PhysicalOp} -import org.apache.amber.operator.filter.FilterOpDesc -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.OpExecWithClassName +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PhysicalOp} +import org.apache.texera.amber.operator.filter.FilterOpDesc +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.util.JSONUtils.objectMapper class RegexOpDesc extends FilterOpDesc { @@ -55,7 +55,7 @@ class RegexOpDesc extends FilterOpDesc { executionId, operatorIdentifier, OpExecWithClassName( - "org.apache.amber.operator.regex.RegexOpExec", + "org.apache.texera.amber.operator.regex.RegexOpExec", objectMapper.writeValueAsString(this) ) ) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/regex/RegexOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/regex/RegexOpExec.scala similarity index 86% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/regex/RegexOpExec.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/regex/RegexOpExec.scala index 825aa124989..c8e840de5be 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/regex/RegexOpExec.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/regex/RegexOpExec.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.operator.regex +package org.apache.texera.amber.operator.regex -import org.apache.amber.core.tuple.Tuple -import org.apache.amber.operator.filter.FilterOpExec -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.tuple.Tuple +import org.apache.texera.amber.operator.filter.FilterOpExec +import org.apache.texera.amber.util.JSONUtils.objectMapper import java.util.regex.Pattern diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/reservoirsampling/ReservoirSamplingOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/reservoirsampling/ReservoirSamplingOpDesc.scala similarity index 76% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/reservoirsampling/ReservoirSamplingOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/reservoirsampling/ReservoirSamplingOpDesc.scala index af6877ab66b..eda2aa299fe 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/reservoirsampling/ReservoirSamplingOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/reservoirsampling/ReservoirSamplingOpDesc.scala @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.amber.operator.reservoirsampling +package org.apache.texera.amber.operator.reservoirsampling import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} -import org.apache.amber.core.executor.OpExecWithClassName -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow.{InputPort, OutputPort, PhysicalOp} -import org.apache.amber.operator.LogicalOp -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.OpExecWithClassName +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PhysicalOp} +import org.apache.texera.amber.operator.LogicalOp +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.util.JSONUtils.objectMapper class ReservoirSamplingOpDesc extends LogicalOp { @@ -43,7 +43,7 @@ class ReservoirSamplingOpDesc extends LogicalOp { executionId, operatorIdentifier, OpExecWithClassName( - "org.apache.amber.operator.reservoirsampling.ReservoirSamplingOpExec", + "org.apache.texera.amber.operator.reservoirsampling.ReservoirSamplingOpExec", objectMapper.writeValueAsString(this) ) ) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/reservoirsampling/ReservoirSamplingOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/reservoirsampling/ReservoirSamplingOpExec.scala similarity index 84% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/reservoirsampling/ReservoirSamplingOpExec.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/reservoirsampling/ReservoirSamplingOpExec.scala index 5e43dec88ec..155b0c99b24 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/reservoirsampling/ReservoirSamplingOpExec.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/reservoirsampling/ReservoirSamplingOpExec.scala @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.amber.operator.reservoirsampling +package org.apache.texera.amber.operator.reservoirsampling -import org.apache.amber.core.executor.OperatorExecutor -import org.apache.amber.core.tuple.{Tuple, TupleLike} -import org.apache.amber.operator.util.OperatorDescriptorUtils.equallyPartitionGoal -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.OperatorExecutor +import org.apache.texera.amber.core.tuple.{Tuple, TupleLike} +import org.apache.texera.amber.operator.util.OperatorDescriptorUtils.equallyPartitionGoal +import org.apache.texera.amber.util.JSONUtils.objectMapper import scala.util.Random diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sink/ProgressiveUtils.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sink/ProgressiveUtils.scala similarity index 94% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sink/ProgressiveUtils.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sink/ProgressiveUtils.scala index 68cfadceca6..aee2b6237b7 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sink/ProgressiveUtils.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sink/ProgressiveUtils.scala @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.amber.operator.sink +package org.apache.texera.amber.operator.sink -import org.apache.amber.core.tuple.{Attribute, AttributeType, Schema, Tuple} +import org.apache.texera.amber.core.tuple.{Attribute, AttributeType, Schema, Tuple} object ProgressiveUtils { diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnAdaptiveBoostingOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnAdaptiveBoostingOpDesc.scala similarity index 95% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnAdaptiveBoostingOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnAdaptiveBoostingOpDesc.scala index fa9fd124f89..9d8d66917d6 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnAdaptiveBoostingOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnAdaptiveBoostingOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn +package org.apache.texera.amber.operator.sklearn class SklearnAdaptiveBoostingOpDesc extends SklearnClassifierOpDesc { override def getImportStatements = "from sklearn.ensemble import AdaBoostClassifier" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnBaggingOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnBaggingOpDesc.scala similarity index 95% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnBaggingOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnBaggingOpDesc.scala index c398a7d6b82..59cba35ba67 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnBaggingOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnBaggingOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn +package org.apache.texera.amber.operator.sklearn class SklearnBaggingOpDesc extends SklearnClassifierOpDesc { override def getImportStatements = "from sklearn.ensemble import BaggingClassifier" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnBernoulliNaiveBayesOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnBernoulliNaiveBayesOpDesc.scala similarity index 95% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnBernoulliNaiveBayesOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnBernoulliNaiveBayesOpDesc.scala index 858f277830b..ddee295588a 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnBernoulliNaiveBayesOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnBernoulliNaiveBayesOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn +package org.apache.texera.amber.operator.sklearn class SklearnBernoulliNaiveBayesOpDesc extends SklearnClassifierOpDesc { override def getImportStatements = "from sklearn.naive_bayes import BernoulliNB" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnClassifierOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnClassifierOpDesc.scala similarity index 92% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnClassifierOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnClassifierOpDesc.scala index b3fac2663a0..3fcea191e18 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnClassifierOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnClassifierOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn +package org.apache.texera.amber.operator.sklearn import com.fasterxml.jackson.annotation.{JsonIgnore, JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.{ @@ -26,15 +26,15 @@ import com.kjetland.jackson.jsonSchema.annotations.{ JsonSchemaString, JsonSchemaTitle } -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.annotations.{ +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.annotations.{ AutofillAttributeName, CommonOpDescAnnotation, HideAnnotation } -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} abstract class SklearnClassifierOpDesc extends PythonOperatorDescriptor { diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnComplementNaiveBayesOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnComplementNaiveBayesOpDesc.scala similarity index 95% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnComplementNaiveBayesOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnComplementNaiveBayesOpDesc.scala index fab0e32ac17..171a0a2717b 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnComplementNaiveBayesOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnComplementNaiveBayesOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn +package org.apache.texera.amber.operator.sklearn class SklearnComplementNaiveBayesOpDesc extends SklearnClassifierOpDesc { override def getImportStatements = "from sklearn.naive_bayes import ComplementNB" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnDecisionTreeOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnDecisionTreeOpDesc.scala similarity index 95% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnDecisionTreeOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnDecisionTreeOpDesc.scala index 86ffa864d13..80827b9c64d 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnDecisionTreeOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnDecisionTreeOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn +package org.apache.texera.amber.operator.sklearn class SklearnDecisionTreeOpDesc extends SklearnClassifierOpDesc { override def getImportStatements = "from sklearn.tree import DecisionTreeClassifier" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnDummyClassifierOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnDummyClassifierOpDesc.scala similarity index 95% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnDummyClassifierOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnDummyClassifierOpDesc.scala index 3c31d781e64..2e4d8367944 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnDummyClassifierOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnDummyClassifierOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn +package org.apache.texera.amber.operator.sklearn class SklearnDummyClassifierOpDesc extends SklearnClassifierOpDesc { override def getImportStatements = "from sklearn.dummy import dummy" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnExtraTreeOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnExtraTreeOpDesc.scala similarity index 95% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnExtraTreeOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnExtraTreeOpDesc.scala index 47fc54ded6c..c7c5d7d9b8c 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnExtraTreeOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnExtraTreeOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn +package org.apache.texera.amber.operator.sklearn class SklearnExtraTreeOpDesc extends SklearnClassifierOpDesc { override def getImportStatements = "from sklearn.tree import ExtraTreeClassifier" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnExtraTreesOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnExtraTreesOpDesc.scala similarity index 95% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnExtraTreesOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnExtraTreesOpDesc.scala index 342988a0000..b8bda3b4e70 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnExtraTreesOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnExtraTreesOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn +package org.apache.texera.amber.operator.sklearn class SklearnExtraTreesOpDesc extends SklearnClassifierOpDesc { override def getImportStatements = "from sklearn.ensemble import ExtraTreesClassifier" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnGaussianNaiveBayesOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnGaussianNaiveBayesOpDesc.scala similarity index 95% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnGaussianNaiveBayesOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnGaussianNaiveBayesOpDesc.scala index d92eefbeb7a..0b9c9efecee 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnGaussianNaiveBayesOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnGaussianNaiveBayesOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn +package org.apache.texera.amber.operator.sklearn class SklearnGaussianNaiveBayesOpDesc extends SklearnClassifierOpDesc { override def getImportStatements = "from sklearn.naive_bayes import GaussianNB" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnGradientBoostingOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnGradientBoostingOpDesc.scala similarity index 95% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnGradientBoostingOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnGradientBoostingOpDesc.scala index 47e4cc9e97e..52184a26420 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnGradientBoostingOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnGradientBoostingOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn +package org.apache.texera.amber.operator.sklearn class SklearnGradientBoostingOpDesc extends SklearnClassifierOpDesc { override def getImportStatements = "from sklearn.ensemble import GradientBoostingClassifier" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnKNNOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnKNNOpDesc.scala similarity index 95% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnKNNOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnKNNOpDesc.scala index 94b472f365d..df919963f8c 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnKNNOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnKNNOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn +package org.apache.texera.amber.operator.sklearn class SklearnKNNOpDesc extends SklearnClassifierOpDesc { override def getImportStatements = "from sklearn.neighbors import KNeighborsClassifier" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnLinearRegressionOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnLinearRegressionOpDesc.scala similarity index 88% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnLinearRegressionOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnLinearRegressionOpDesc.scala index eb4c6214baf..1c4c7e6288c 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnLinearRegressionOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnLinearRegressionOpDesc.scala @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.amber.operator.sklearn +package org.apache.texera.amber.operator.sklearn import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} class SklearnLinearRegressionOpDesc extends PythonOperatorDescriptor { diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnLinearSVMOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnLinearSVMOpDesc.scala similarity index 95% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnLinearSVMOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnLinearSVMOpDesc.scala index fcd639657d3..5d1c9977f88 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnLinearSVMOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnLinearSVMOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn +package org.apache.texera.amber.operator.sklearn class SklearnLinearSVMOpDesc extends SklearnClassifierOpDesc { override def getImportStatements = "from sklearn.svm import LinearSVC" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnLogisticRegressionCVOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnLogisticRegressionCVOpDesc.scala similarity index 95% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnLogisticRegressionCVOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnLogisticRegressionCVOpDesc.scala index d9faf9f72a7..4e50b934ff4 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnLogisticRegressionCVOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnLogisticRegressionCVOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn +package org.apache.texera.amber.operator.sklearn class SklearnLogisticRegressionCVOpDesc extends SklearnClassifierOpDesc { override def getImportStatements = "from sklearn.linear_model import LogisticRegressionCV" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnLogisticRegressionOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnLogisticRegressionOpDesc.scala similarity index 95% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnLogisticRegressionOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnLogisticRegressionOpDesc.scala index 1b7e4d4cd11..19d07097f10 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnLogisticRegressionOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnLogisticRegressionOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn +package org.apache.texera.amber.operator.sklearn class SklearnLogisticRegressionOpDesc extends SklearnClassifierOpDesc { override def getImportStatements = "from sklearn.linear_model import LogisticRegression" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnMultiLayerPerceptronOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnMultiLayerPerceptronOpDesc.scala similarity index 95% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnMultiLayerPerceptronOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnMultiLayerPerceptronOpDesc.scala index b561d5d49dc..03694aaee4c 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnMultiLayerPerceptronOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnMultiLayerPerceptronOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn +package org.apache.texera.amber.operator.sklearn class SklearnMultiLayerPerceptronOpDesc extends SklearnClassifierOpDesc { override def getImportStatements = "from sklearn.neural_network import MLPClassifier" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnMultinomialNaiveBayesOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnMultinomialNaiveBayesOpDesc.scala similarity index 95% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnMultinomialNaiveBayesOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnMultinomialNaiveBayesOpDesc.scala index fe4857c77f3..cd8ba43f2ba 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnMultinomialNaiveBayesOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnMultinomialNaiveBayesOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn +package org.apache.texera.amber.operator.sklearn class SklearnMultinomialNaiveBayesOpDesc extends SklearnClassifierOpDesc { override def getImportStatements = "from sklearn.naive_bayes import MultinomialNB" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnNearestCentroidOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnNearestCentroidOpDesc.scala similarity index 95% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnNearestCentroidOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnNearestCentroidOpDesc.scala index 32e5737bdb5..f9fd36e9e06 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnNearestCentroidOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnNearestCentroidOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn +package org.apache.texera.amber.operator.sklearn class SklearnNearestCentroidOpDesc extends SklearnClassifierOpDesc { override def getImportStatements = "from sklearn.neighbors import NearestCentroid" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnPassiveAggressiveOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnPassiveAggressiveOpDesc.scala similarity index 95% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnPassiveAggressiveOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnPassiveAggressiveOpDesc.scala index 5ba82a2721b..791b0bf4a0e 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnPassiveAggressiveOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnPassiveAggressiveOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn +package org.apache.texera.amber.operator.sklearn class SklearnPassiveAggressiveOpDesc extends SklearnClassifierOpDesc { override def getImportStatements = "from sklearn.linear_model import PassiveAggressiveClassifier" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnPerceptronOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnPerceptronOpDesc.scala similarity index 95% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnPerceptronOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnPerceptronOpDesc.scala index ddd13da879c..221863dbd00 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnPerceptronOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnPerceptronOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn +package org.apache.texera.amber.operator.sklearn class SklearnPerceptronOpDesc extends SklearnClassifierOpDesc { override def getImportStatements = "from sklearn.linear_model import Perceptron" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnPredictionOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnPredictionOpDesc.scala similarity index 89% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnPredictionOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnPredictionOpDesc.scala index 4dabe31176e..0e0a5772f36 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnPredictionOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnPredictionOpDesc.scala @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.amber.operator.sklearn +package org.apache.texera.amber.operator.sklearn import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.annotations.{ +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.annotations.{ AutofillAttributeName, AutofillAttributeNameOnPort1 } -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} class SklearnPredictionOpDesc extends PythonOperatorDescriptor { @JsonProperty(value = "Model Attribute", required = true, defaultValue = "model") diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnProbabilityCalibrationOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnProbabilityCalibrationOpDesc.scala similarity index 95% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnProbabilityCalibrationOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnProbabilityCalibrationOpDesc.scala index c68665f5463..fd53a665cdf 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnProbabilityCalibrationOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnProbabilityCalibrationOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn +package org.apache.texera.amber.operator.sklearn class SklearnProbabilityCalibrationOpDesc extends SklearnClassifierOpDesc { override def getImportStatements = "from sklearn.calibration import CalibratedClassifierCV" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnRandomForestOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnRandomForestOpDesc.scala similarity index 95% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnRandomForestOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnRandomForestOpDesc.scala index 2f3a843042a..f2f3a51cf8a 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnRandomForestOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnRandomForestOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn +package org.apache.texera.amber.operator.sklearn class SklearnRandomForestOpDesc extends SklearnClassifierOpDesc { override def getImportStatements = "from sklearn.ensemble import RandomForestClassifier" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnRidgeCVOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnRidgeCVOpDesc.scala similarity index 95% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnRidgeCVOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnRidgeCVOpDesc.scala index d6583838d60..ae5d2dbc916 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnRidgeCVOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnRidgeCVOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn +package org.apache.texera.amber.operator.sklearn class SklearnRidgeCVOpDesc extends SklearnClassifierOpDesc { override def getImportStatements = "from sklearn.linear_model import RidgeClassifierCV" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnRidgeOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnRidgeOpDesc.scala similarity index 95% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnRidgeOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnRidgeOpDesc.scala index ade382afd57..52ffebb71d6 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnRidgeOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnRidgeOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn +package org.apache.texera.amber.operator.sklearn class SklearnRidgeOpDesc extends SklearnClassifierOpDesc { override def getImportStatements = "from sklearn.linear_model import RidgeClassifier" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnSDGOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnSDGOpDesc.scala similarity index 95% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnSDGOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnSDGOpDesc.scala index 0f446626708..b88f792e975 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnSDGOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnSDGOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn +package org.apache.texera.amber.operator.sklearn class SklearnSDGOpDesc extends SklearnClassifierOpDesc { override def getImportStatements = "from sklearn.linear_model import SGDClassifier" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnSVMOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnSVMOpDesc.scala similarity index 95% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnSVMOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnSVMOpDesc.scala index c27bbf9619e..02eea7dee4a 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/SklearnSVMOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/SklearnSVMOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn +package org.apache.texera.amber.operator.sklearn class SklearnSVMOpDesc extends SklearnClassifierOpDesc { override def getImportStatements = "from sklearn.svm import SVC" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingAdaptiveBoostingOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingAdaptiveBoostingOpDesc.scala similarity index 94% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingAdaptiveBoostingOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingAdaptiveBoostingOpDesc.scala index 6495683960c..d9558dc3da1 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingAdaptiveBoostingOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingAdaptiveBoostingOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn.training +package org.apache.texera.amber.operator.sklearn.training class SklearnTrainingAdaptiveBoostingOpDesc extends SklearnTrainingOpDesc { override def getImportStatements = "from sklearn.ensemble import AdaBoostClassifier" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingBaggingOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingBaggingOpDesc.scala similarity index 94% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingBaggingOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingBaggingOpDesc.scala index 714f10809f7..4db059d1096 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingBaggingOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingBaggingOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn.training +package org.apache.texera.amber.operator.sklearn.training class SklearnTrainingBaggingOpDesc extends SklearnTrainingOpDesc { override def getImportStatements = "from sklearn.ensemble import BaggingClassifier" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingBernoulliNaiveBayesOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingBernoulliNaiveBayesOpDesc.scala similarity index 94% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingBernoulliNaiveBayesOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingBernoulliNaiveBayesOpDesc.scala index 5b779041c57..92672cf15a4 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingBernoulliNaiveBayesOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingBernoulliNaiveBayesOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn.training +package org.apache.texera.amber.operator.sklearn.training class SklearnTrainingBernoulliNaiveBayesOpDesc extends SklearnTrainingOpDesc { override def getImportStatements = "from sklearn.naive_bayes import BernoulliNB" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingComplementNaiveBayesOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingComplementNaiveBayesOpDesc.scala similarity index 94% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingComplementNaiveBayesOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingComplementNaiveBayesOpDesc.scala index e847acbdaef..53b540aca18 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingComplementNaiveBayesOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingComplementNaiveBayesOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn.training +package org.apache.texera.amber.operator.sklearn.training class SklearnTrainingComplementNaiveBayesOpDesc extends SklearnTrainingOpDesc { override def getImportStatements = "from sklearn.naive_bayes import ComplementNB" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingDecisionTreeOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingDecisionTreeOpDesc.scala similarity index 94% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingDecisionTreeOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingDecisionTreeOpDesc.scala index ce4c6ec1a76..8fb45fba078 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingDecisionTreeOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingDecisionTreeOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn.training +package org.apache.texera.amber.operator.sklearn.training class SklearnTrainingDecisionTreeOpDesc extends SklearnTrainingOpDesc { override def getImportStatements = "from sklearn.tree import DecisionTreeClassifier" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingDummyClassifierOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingDummyClassifierOpDesc.scala similarity index 94% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingDummyClassifierOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingDummyClassifierOpDesc.scala index 114d0a57c55..4ad7af21814 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingDummyClassifierOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingDummyClassifierOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn.training +package org.apache.texera.amber.operator.sklearn.training class SklearnTrainingDummyClassifierOpDesc extends SklearnTrainingOpDesc { override def getImportStatements = "from sklearn.dummy import dummy" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingExtraTreeOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingExtraTreeOpDesc.scala similarity index 94% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingExtraTreeOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingExtraTreeOpDesc.scala index cc887daa9e4..34d362700c9 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingExtraTreeOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingExtraTreeOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn.training +package org.apache.texera.amber.operator.sklearn.training class SklearnTrainingExtraTreeOpDesc extends SklearnTrainingOpDesc { override def getImportStatements = "from sklearn.tree import ExtraTreeClassifier" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingExtraTreesOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingExtraTreesOpDesc.scala similarity index 94% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingExtraTreesOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingExtraTreesOpDesc.scala index 5b20ea07458..155d6facbe8 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingExtraTreesOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingExtraTreesOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn.training +package org.apache.texera.amber.operator.sklearn.training class SklearnTrainingExtraTreesOpDesc extends SklearnTrainingOpDesc { override def getImportStatements = "from sklearn.ensemble import ExtraTreesClassifier" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingGaussianNaiveBayesOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingGaussianNaiveBayesOpDesc.scala similarity index 94% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingGaussianNaiveBayesOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingGaussianNaiveBayesOpDesc.scala index f2a5b3a861e..8d4101b2689 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingGaussianNaiveBayesOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingGaussianNaiveBayesOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn.training +package org.apache.texera.amber.operator.sklearn.training class SklearnTrainingGaussianNaiveBayesOpDesc extends SklearnTrainingOpDesc { override def getImportStatements = "from sklearn.naive_bayes import GaussianNB" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingGradientBoostingOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingGradientBoostingOpDesc.scala similarity index 94% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingGradientBoostingOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingGradientBoostingOpDesc.scala index c839088483e..68fd0cd7a85 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingGradientBoostingOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingGradientBoostingOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn.training +package org.apache.texera.amber.operator.sklearn.training class SklearnTrainingGradientBoostingOpDesc extends SklearnTrainingOpDesc { override def getImportStatements = "from sklearn.ensemble import GradientBoostingClassifier" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingKNNOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingKNNOpDesc.scala similarity index 94% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingKNNOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingKNNOpDesc.scala index 5f0a0cf7324..7a56c28b795 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingKNNOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingKNNOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn.training +package org.apache.texera.amber.operator.sklearn.training class SklearnTrainingKNNOpDesc extends SklearnTrainingOpDesc { override def getImportStatements = "from sklearn.neighbors import KNeighborsClassifier" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingLinearRegressionOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingLinearRegressionOpDesc.scala similarity index 94% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingLinearRegressionOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingLinearRegressionOpDesc.scala index 5d1b9101155..1fc1a002525 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingLinearRegressionOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingLinearRegressionOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn.training +package org.apache.texera.amber.operator.sklearn.training class SklearnTrainingLinearRegressionOpDesc extends SklearnTrainingOpDesc { override def getImportStatements = "from sklearn.linear_model import LinearRegression" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingLinearSVMOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingLinearSVMOpDesc.scala similarity index 94% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingLinearSVMOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingLinearSVMOpDesc.scala index 5d73b446313..c65b4fcab0f 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingLinearSVMOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingLinearSVMOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn.training +package org.apache.texera.amber.operator.sklearn.training class SklearnTrainingLinearSVMOpDesc extends SklearnTrainingOpDesc { override def getImportStatements = "from sklearn.svm import LinearSVC" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingLogisticRegressionCVOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingLogisticRegressionCVOpDesc.scala similarity index 94% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingLogisticRegressionCVOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingLogisticRegressionCVOpDesc.scala index 4fd96d28ba6..edf1fa59999 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingLogisticRegressionCVOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingLogisticRegressionCVOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn.training +package org.apache.texera.amber.operator.sklearn.training class SklearnTrainingLogisticRegressionCVOpDesc extends SklearnTrainingOpDesc { override def getImportStatements = "from sklearn.linear_model import LogisticRegressionCV" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingLogisticRegressionOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingLogisticRegressionOpDesc.scala similarity index 94% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingLogisticRegressionOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingLogisticRegressionOpDesc.scala index 4f91433c3f1..42b5db73bbd 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingLogisticRegressionOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingLogisticRegressionOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn.training +package org.apache.texera.amber.operator.sklearn.training class SklearnTrainingLogisticRegressionOpDesc extends SklearnTrainingOpDesc { override def getImportStatements = "from sklearn.linear_model import LogisticRegression" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingMultiLayerPerceptronOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingMultiLayerPerceptronOpDesc.scala similarity index 94% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingMultiLayerPerceptronOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingMultiLayerPerceptronOpDesc.scala index c843998b9cd..dc19592a18d 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingMultiLayerPerceptronOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingMultiLayerPerceptronOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn.training +package org.apache.texera.amber.operator.sklearn.training class SklearnTrainingMultiLayerPerceptronOpDesc extends SklearnTrainingOpDesc { override def getImportStatements = "from sklearn.neural_network import MLPClassifier" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingMultinomialNaiveBayesOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingMultinomialNaiveBayesOpDesc.scala similarity index 94% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingMultinomialNaiveBayesOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingMultinomialNaiveBayesOpDesc.scala index 4c01d9a35d4..653cc8a32aa 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingMultinomialNaiveBayesOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingMultinomialNaiveBayesOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn.training +package org.apache.texera.amber.operator.sklearn.training class SklearnTrainingMultinomialNaiveBayesOpDesc extends SklearnTrainingOpDesc { override def getImportStatements = "from sklearn.naive_bayes import MultinomialNB" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingNearestCentroidOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingNearestCentroidOpDesc.scala similarity index 94% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingNearestCentroidOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingNearestCentroidOpDesc.scala index f285999d580..0ae83b73aaa 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingNearestCentroidOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingNearestCentroidOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn.training +package org.apache.texera.amber.operator.sklearn.training class SklearnTrainingNearestCentroidOpDesc extends SklearnTrainingOpDesc { override def getImportStatements = "from sklearn.neighbors import NearestCentroid" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingOpDesc.scala similarity index 91% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingOpDesc.scala index c928195e0f8..c842ffafac3 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn.training +package org.apache.texera.amber.operator.sklearn.training import com.fasterxml.jackson.annotation.{JsonIgnore, JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.{ @@ -26,15 +26,15 @@ import com.kjetland.jackson.jsonSchema.annotations.{ JsonSchemaString, JsonSchemaTitle } -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.annotations.{ +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.annotations.{ AutofillAttributeName, CommonOpDescAnnotation, HideAnnotation } -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} class SklearnTrainingOpDesc extends PythonOperatorDescriptor { diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingPassiveAggressiveOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingPassiveAggressiveOpDesc.scala similarity index 94% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingPassiveAggressiveOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingPassiveAggressiveOpDesc.scala index b4fde6c5266..eeb97394dc7 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingPassiveAggressiveOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingPassiveAggressiveOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn.training +package org.apache.texera.amber.operator.sklearn.training class SklearnTrainingPassiveAggressiveOpDesc extends SklearnTrainingOpDesc { override def getImportStatements = "from sklearn.linear_model import PassiveAggressiveClassifier" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingPerceptronOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingPerceptronOpDesc.scala similarity index 94% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingPerceptronOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingPerceptronOpDesc.scala index e30c37a4d2c..cae3462f493 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingPerceptronOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingPerceptronOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn.training +package org.apache.texera.amber.operator.sklearn.training class SklearnTrainingPerceptronOpDesc extends SklearnTrainingOpDesc { override def getImportStatements = "from sklearn.linear_model import Perceptron" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingProbabilityCalibrationOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingProbabilityCalibrationOpDesc.scala similarity index 94% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingProbabilityCalibrationOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingProbabilityCalibrationOpDesc.scala index aebad47747f..bb1a2377d30 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingProbabilityCalibrationOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingProbabilityCalibrationOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn.training +package org.apache.texera.amber.operator.sklearn.training class SklearnTrainingProbabilityCalibrationOpDesc extends SklearnTrainingOpDesc { override def getImportStatements = "from sklearn.calibration import CalibratedClassifierCV" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingRandomForestOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingRandomForestOpDesc.scala similarity index 94% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingRandomForestOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingRandomForestOpDesc.scala index c3dfac4cd5d..a9121052d54 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingRandomForestOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingRandomForestOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn.training +package org.apache.texera.amber.operator.sklearn.training class SklearnTrainingRandomForestOpDesc extends SklearnTrainingOpDesc { override def getImportStatements = "from sklearn.ensemble import RandomForestClassifier" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingRidgeCVOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingRidgeCVOpDesc.scala similarity index 94% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingRidgeCVOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingRidgeCVOpDesc.scala index d3c1c6fa6cf..459f0f85fc0 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingRidgeCVOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingRidgeCVOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn.training +package org.apache.texera.amber.operator.sklearn.training class SklearnTrainingRidgeCVOpDesc extends SklearnTrainingOpDesc { override def getImportStatements = "from sklearn.linear_model import RidgeClassifierCV" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingRidgeOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingRidgeOpDesc.scala similarity index 94% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingRidgeOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingRidgeOpDesc.scala index 23580126721..2e60ca2c9cf 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingRidgeOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingRidgeOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn.training +package org.apache.texera.amber.operator.sklearn.training class SklearnTrainingRidgeOpDesc extends SklearnTrainingOpDesc { override def getImportStatements = "from sklearn.linear_model import RidgeClassifier" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingSDGOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingSDGOpDesc.scala similarity index 94% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingSDGOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingSDGOpDesc.scala index 0b6661a86da..821aafc7edb 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingSDGOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingSDGOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn.training +package org.apache.texera.amber.operator.sklearn.training class SklearnTrainingSDGOpDesc extends SklearnTrainingOpDesc { override def getImportStatements = "from sklearn.linear_model import SGDClassifier" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingSVMOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingSVMOpDesc.scala similarity index 94% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingSVMOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingSVMOpDesc.scala index 01fc4f794ba..cc51b1acb0b 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sklearn/training/SklearnTrainingSVMOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sklearn/training/SklearnTrainingSVMOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sklearn.training +package org.apache.texera.amber.operator.sklearn.training class SklearnTrainingSVMOpDesc extends SklearnTrainingOpDesc { override def getImportStatements = "from sklearn.svm import SVC" diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sleep/SleepOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sleep/SleepOpDesc.scala similarity index 76% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sleep/SleepOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sleep/SleepOpDesc.scala index e8d83cf2e1e..3eee3cd33b7 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sleep/SleepOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sleep/SleepOpDesc.scala @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.amber.operator.sleep +package org.apache.texera.amber.operator.sleep import com.fasterxml.jackson.annotation.JsonProperty import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.core.executor.OpExecWithClassName -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow.{InputPort, OutputPort, PhysicalOp} -import org.apache.amber.operator.LogicalOp -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.OpExecWithClassName +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PhysicalOp} +import org.apache.texera.amber.operator.LogicalOp +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.util.JSONUtils.objectMapper class SleepOpDesc extends LogicalOp { @@ -44,7 +44,7 @@ class SleepOpDesc extends LogicalOp { executionId, operatorIdentifier, OpExecWithClassName( - "org.apache.amber.operator.sleep.SleepOpExec", + "org.apache.texera.amber.operator.sleep.SleepOpExec", objectMapper.writeValueAsString(this) ) ) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sleep/SleepOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sleep/SleepOpExec.scala similarity index 82% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sleep/SleepOpExec.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sleep/SleepOpExec.scala index 55cbd4fa651..87255c900e9 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sleep/SleepOpExec.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sleep/SleepOpExec.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.operator.sleep +package org.apache.texera.amber.operator.sleep -import org.apache.amber.core.executor.OperatorExecutor -import org.apache.amber.core.tuple.{Tuple, TupleLike} -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.OperatorExecutor +import org.apache.texera.amber.core.tuple.{Tuple, TupleLike} +import org.apache.texera.amber.util.JSONUtils.objectMapper class SleepOpExec(descString: String) extends OperatorExecutor { private val desc: SleepOpDesc = objectMapper.readValue(descString, classOf[SleepOpDesc]) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sort/SortCriteriaUnit.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sort/SortCriteriaUnit.java similarity index 85% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sort/SortCriteriaUnit.java rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sort/SortCriteriaUnit.java index 7b64c225da8..09c35a8c1b6 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sort/SortCriteriaUnit.java +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sort/SortCriteriaUnit.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.operator.sort; +package org.apache.texera.amber.operator.sort; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName; +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName; public class SortCriteriaUnit { @@ -32,5 +32,5 @@ public class SortCriteriaUnit { @JsonProperty(value = "sortPreference", required = true) @JsonPropertyDescription("Sort preference (ASC or DESC)") - public org.apache.amber.operator.sort.SortPreference sortPreference; + public org.apache.texera.amber.operator.sort.SortPreference sortPreference; } diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sort/SortOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sort/SortOpDesc.scala similarity index 88% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sort/SortOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sort/SortOpDesc.scala index 7226f2bc201..2e46fb81333 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sort/SortOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sort/SortOpDesc.scala @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.amber.operator.sort +package org.apache.texera.amber.operator.sort import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} -import org.apache.amber.core.tuple.Schema -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.tuple.Schema +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} class SortOpDesc extends PythonOperatorDescriptor { @JsonProperty(required = true) @JsonPropertyDescription("column to perform sorting on") diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sort/SortPreference.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sort/SortPreference.java similarity index 94% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sort/SortPreference.java rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sort/SortPreference.java index 06f4793101f..40914a7f8de 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sort/SortPreference.java +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sort/SortPreference.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.sort; +package org.apache.texera.amber.operator.sort; public enum SortPreference { ASC, DESC diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sort/StableMergeSortOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sort/StableMergeSortOpDesc.scala similarity index 80% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sort/StableMergeSortOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sort/StableMergeSortOpDesc.scala index efecc5a8de1..318089da5e3 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sort/StableMergeSortOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sort/StableMergeSortOpDesc.scala @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.amber.operator.sort +package org.apache.texera.amber.operator.sort import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.core.executor.OpExecWithClassName -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow.{InputPort, OutputPort, PhysicalOp} -import org.apache.amber.operator.LogicalOp -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.OpExecWithClassName +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PhysicalOp} +import org.apache.texera.amber.operator.LogicalOp +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.util.JSONUtils.objectMapper import scala.collection.mutable.ListBuffer @@ -53,7 +53,7 @@ class StableMergeSortOpDesc extends LogicalOp { executionId, operatorIdentifier, OpExecWithClassName( - "org.apache.amber.operator.sort.StableMergeSortOpExec", + "org.apache.texera.amber.operator.sort.StableMergeSortOpExec", objectMapper.writeValueAsString(this) ) ) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sort/StableMergeSortOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sort/StableMergeSortOpExec.scala similarity index 97% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sort/StableMergeSortOpExec.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sort/StableMergeSortOpExec.scala index ba13e12b8f3..6b45f40c3eb 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sort/StableMergeSortOpExec.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sort/StableMergeSortOpExec.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.operator.sort +package org.apache.texera.amber.operator.sort -import org.apache.amber.core.executor.OperatorExecutor -import org.apache.amber.core.tuple.{AttributeType, Schema, Tuple, TupleLike} -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.OperatorExecutor +import org.apache.texera.amber.core.tuple.{AttributeType, Schema, Tuple, TupleLike} +import org.apache.texera.amber.util.JSONUtils.objectMapper import scala.collection.mutable.ArrayBuffer diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sortPartitions/SortPartitionsOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sortPartitions/SortPartitionsOpDesc.scala similarity index 79% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sortPartitions/SortPartitionsOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sortPartitions/SortPartitionsOpDesc.scala index 71585e6f101..9290d549f2e 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sortPartitions/SortPartitionsOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sortPartitions/SortPartitionsOpDesc.scala @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.amber.operator.sortPartitions +package org.apache.texera.amber.operator.sortPartitions import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} -import org.apache.amber.core.executor.OpExecWithClassName -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow.{InputPort, OutputPort, PhysicalOp, RangePartition} -import org.apache.amber.operator.LogicalOp -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.OpExecWithClassName +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PhysicalOp, RangePartition} +import org.apache.texera.amber.operator.LogicalOp +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.util.JSONUtils.objectMapper @JsonSchemaInject(json = """ { @@ -66,7 +66,7 @@ class SortPartitionsOpDesc extends LogicalOp { executionId, operatorIdentifier, OpExecWithClassName( - "org.apache.amber.operator.sortPartitions.SortPartitionsOpExec", + "org.apache.texera.amber.operator.sortPartitions.SortPartitionsOpExec", objectMapper.writeValueAsString(this) ) ) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sortPartitions/SortPartitionsOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sortPartitions/SortPartitionsOpExec.scala similarity index 88% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/sortPartitions/SortPartitionsOpExec.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sortPartitions/SortPartitionsOpExec.scala index 5748a41da68..86052f13a23 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/sortPartitions/SortPartitionsOpExec.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/sortPartitions/SortPartitionsOpExec.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.operator.sortPartitions +package org.apache.texera.amber.operator.sortPartitions -import org.apache.amber.core.executor.OperatorExecutor -import org.apache.amber.core.tuple.{AttributeTypeUtils, Tuple, TupleLike} -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.OperatorExecutor +import org.apache.texera.amber.core.tuple.{AttributeTypeUtils, Tuple, TupleLike} +import org.apache.texera.amber.util.JSONUtils.objectMapper import scala.collection.mutable.ArrayBuffer diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/BufferedBlockReader.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/BufferedBlockReader.java similarity index 98% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/source/BufferedBlockReader.java rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/BufferedBlockReader.java index ee30824a17f..7883841c8cd 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/BufferedBlockReader.java +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/BufferedBlockReader.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.source; +package org.apache.texera.amber.operator.source; import com.google.common.primitives.Ints; diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/PythonSourceOperatorDescriptor.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/PythonSourceOperatorDescriptor.scala similarity index 89% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/source/PythonSourceOperatorDescriptor.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/PythonSourceOperatorDescriptor.scala index 0b68f15c570..4221352dfca 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/PythonSourceOperatorDescriptor.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/PythonSourceOperatorDescriptor.scala @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.amber.operator.source +package org.apache.texera.amber.operator.source -import org.apache.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.PythonOperatorDescriptor abstract class PythonSourceOperatorDescriptor extends SourceOperatorDescriptor diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/SourceOperatorDescriptor.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/SourceOperatorDescriptor.scala similarity index 86% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/source/SourceOperatorDescriptor.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/SourceOperatorDescriptor.scala index 3ebc1f1d26a..5e9a9c7dd46 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/SourceOperatorDescriptor.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/SourceOperatorDescriptor.scala @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.amber.operator.source +package org.apache.texera.amber.operator.source -import org.apache.amber.core.tuple.Schema -import org.apache.amber.operator.LogicalOp +import org.apache.texera.amber.core.tuple.Schema +import org.apache.texera.amber.operator.LogicalOp abstract class SourceOperatorDescriptor extends LogicalOp { diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/apis/reddit/RedditSearchSourceOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/reddit/RedditSearchSourceOpDesc.scala similarity index 94% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/source/apis/reddit/RedditSearchSourceOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/reddit/RedditSearchSourceOpDesc.scala index 95a45b4ff00..adaef827180 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/apis/reddit/RedditSearchSourceOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/reddit/RedditSearchSourceOpDesc.scala @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.amber.operator.source.apis.reddit +package org.apache.texera.amber.operator.source.apis.reddit import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.workflow.{OutputPort, PortIdentity} -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import org.apache.amber.operator.source.PythonSourceOperatorDescriptor +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.workflow.{OutputPort, PortIdentity} +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.operator.source.PythonSourceOperatorDescriptor class RedditSearchSourceOpDesc extends PythonSourceOperatorDescriptor { @JsonProperty(required = true) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/apis/reddit/RedditSourceOperatorFunction.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/reddit/RedditSourceOperatorFunction.java similarity index 95% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/source/apis/reddit/RedditSourceOperatorFunction.java rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/reddit/RedditSourceOperatorFunction.java index 874f89fb32b..4dc4822ea8a 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/apis/reddit/RedditSourceOperatorFunction.java +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/reddit/RedditSourceOperatorFunction.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.source.apis.reddit; +package org.apache.texera.amber.operator.source.apis.reddit; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/apis/twitter/TwitterSourceOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/twitter/TwitterSourceOpDesc.scala similarity index 86% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/source/apis/twitter/TwitterSourceOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/twitter/TwitterSourceOpDesc.scala index 8f9e20a15a4..d65bb12451b 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/apis/twitter/TwitterSourceOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/twitter/TwitterSourceOpDesc.scala @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.amber.operator.source.apis.twitter +package org.apache.texera.amber.operator.source.apis.twitter import com.fasterxml.jackson.annotation.{JsonIgnore, JsonProperty} import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaDescription, JsonSchemaTitle} -import org.apache.amber.core.workflow.OutputPort -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import org.apache.amber.operator.source.SourceOperatorDescriptor +import org.apache.texera.amber.core.workflow.OutputPort +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.operator.source.SourceOperatorDescriptor abstract class TwitterSourceOpDesc extends SourceOperatorDescriptor { diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/apis/twitter/TwitterSourceOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/twitter/TwitterSourceOpExec.scala similarity index 91% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/source/apis/twitter/TwitterSourceOpExec.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/twitter/TwitterSourceOpExec.scala index 5646c5a08c9..aff988b2359 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/apis/twitter/TwitterSourceOpExec.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/twitter/TwitterSourceOpExec.scala @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.amber.operator.source.apis.twitter +package org.apache.texera.amber.operator.source.apis.twitter import io.github.redouane59.twitter.TwitterClient import io.github.redouane59.twitter.signature.TwitterCredentials -import org.apache.amber.core.executor.SourceOperatorExecutor -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.SourceOperatorExecutor +import org.apache.texera.amber.util.JSONUtils.objectMapper abstract class TwitterSourceOpExec( descString: String diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/apis/twitter/v2/TwitterFullArchiveSearchSourceOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/twitter/v2/TwitterFullArchiveSearchSourceOpDesc.scala similarity index 86% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/source/apis/twitter/v2/TwitterFullArchiveSearchSourceOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/twitter/v2/TwitterFullArchiveSearchSourceOpDesc.scala index 392129520a3..6c3c74d3cd7 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/apis/twitter/v2/TwitterFullArchiveSearchSourceOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/twitter/v2/TwitterFullArchiveSearchSourceOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.source.apis.twitter.v2 +package org.apache.texera.amber.operator.source.apis.twitter.v2 import com.fasterxml.jackson.annotation.{JsonIgnore, JsonProperty} import com.kjetland.jackson.jsonSchema.annotations.{ @@ -25,13 +25,13 @@ import com.kjetland.jackson.jsonSchema.annotations.{ JsonSchemaInject, JsonSchemaTitle } -import org.apache.amber.core.executor.OpExecWithClassName -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc} -import org.apache.amber.operator.metadata.annotations.UIWidget -import org.apache.amber.operator.source.apis.twitter.TwitterSourceOpDesc -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.OpExecWithClassName +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc} +import org.apache.texera.amber.operator.metadata.annotations.UIWidget +import org.apache.texera.amber.operator.source.apis.twitter.TwitterSourceOpDesc +import org.apache.texera.amber.util.JSONUtils.objectMapper class TwitterFullArchiveSearchSourceOpDesc extends TwitterSourceOpDesc { @@ -70,7 +70,7 @@ class TwitterFullArchiveSearchSourceOpDesc extends TwitterSourceOpDesc { executionId, operatorIdentifier, OpExecWithClassName( - "org.apache.amber.operator.source.apis.twitter.v2.TwitterFullArchiveSearchSourceOpExec", + "org.apache.texera.amber.operator.source.apis.twitter.v2.TwitterFullArchiveSearchSourceOpExec", objectMapper.writeValueAsString(this) ) ) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/apis/twitter/v2/TwitterFullArchiveSearchSourceOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/twitter/v2/TwitterFullArchiveSearchSourceOpExec.scala similarity index 93% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/source/apis/twitter/v2/TwitterFullArchiveSearchSourceOpExec.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/twitter/v2/TwitterFullArchiveSearchSourceOpExec.scala index 0a558ee0201..46053543b1c 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/apis/twitter/v2/TwitterFullArchiveSearchSourceOpExec.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/twitter/v2/TwitterFullArchiveSearchSourceOpExec.scala @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.amber.operator.source.apis.twitter.v2 +package org.apache.texera.amber.operator.source.apis.twitter.v2 import io.github.redouane59.twitter.dto.endpoints.AdditionalParameters import io.github.redouane59.twitter.dto.tweet.TweetList import io.github.redouane59.twitter.dto.tweet.TweetV2.TweetData import io.github.redouane59.twitter.dto.user.UserV2.UserData -import org.apache.amber.core.tuple.{Schema, Tuple, TupleLike} -import org.apache.amber.operator.source.apis.twitter.TwitterSourceOpExec -import org.apache.amber.operator.source.apis.twitter.v2.TwitterUtils.tweetDataToTuple -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.tuple.{Schema, Tuple, TupleLike} +import org.apache.texera.amber.operator.source.apis.twitter.TwitterSourceOpExec +import org.apache.texera.amber.operator.source.apis.twitter.v2.TwitterUtils.tweetDataToTuple +import org.apache.texera.amber.util.JSONUtils.objectMapper import java.time.LocalDateTime import java.time.format.DateTimeFormatter diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/apis/twitter/v2/TwitterSearchSourceOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/twitter/v2/TwitterSearchSourceOpDesc.scala similarity index 85% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/source/apis/twitter/v2/TwitterSearchSourceOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/twitter/v2/TwitterSearchSourceOpDesc.scala index 45550df7f9b..8b6976f4f2c 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/apis/twitter/v2/TwitterSearchSourceOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/twitter/v2/TwitterSearchSourceOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.source.apis.twitter.v2 +package org.apache.texera.amber.operator.source.apis.twitter.v2 import com.fasterxml.jackson.annotation.{JsonIgnore, JsonProperty} import com.kjetland.jackson.jsonSchema.annotations.{ @@ -25,13 +25,13 @@ import com.kjetland.jackson.jsonSchema.annotations.{ JsonSchemaInject, JsonSchemaTitle } -import org.apache.amber.core.executor.OpExecWithClassName -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc} -import org.apache.amber.operator.metadata.annotations.UIWidget -import org.apache.amber.operator.source.apis.twitter.TwitterSourceOpDesc -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.OpExecWithClassName +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc} +import org.apache.texera.amber.operator.metadata.annotations.UIWidget +import org.apache.texera.amber.operator.source.apis.twitter.TwitterSourceOpDesc +import org.apache.texera.amber.util.JSONUtils.objectMapper class TwitterSearchSourceOpDesc extends TwitterSourceOpDesc { @@ -60,7 +60,7 @@ class TwitterSearchSourceOpDesc extends TwitterSourceOpDesc { executionId, operatorIdentifier, OpExecWithClassName( - "org.apache.amber.operator.source.apis.twitter.v2.TwitterSearchSourceOpExec", + "org.apache.texera.amber.operator.source.apis.twitter.v2.TwitterSearchSourceOpExec", objectMapper.writeValueAsString(this) ) ) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/apis/twitter/v2/TwitterSearchSourceOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/twitter/v2/TwitterSearchSourceOpExec.scala similarity index 93% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/source/apis/twitter/v2/TwitterSearchSourceOpExec.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/twitter/v2/TwitterSearchSourceOpExec.scala index ffeba4dea05..95046646871 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/apis/twitter/v2/TwitterSearchSourceOpExec.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/twitter/v2/TwitterSearchSourceOpExec.scala @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.amber.operator.source.apis.twitter.v2 +package org.apache.texera.amber.operator.source.apis.twitter.v2 import io.github.redouane59.twitter.dto.endpoints.AdditionalParameters import io.github.redouane59.twitter.dto.tweet.TweetList import io.github.redouane59.twitter.dto.tweet.TweetV2.TweetData import io.github.redouane59.twitter.dto.user.UserV2.UserData -import org.apache.amber.core.tuple.{Schema, Tuple, TupleLike} -import org.apache.amber.operator.source.apis.twitter.TwitterSourceOpExec -import org.apache.amber.operator.source.apis.twitter.v2.TwitterUtils.tweetDataToTuple -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.tuple.{Schema, Tuple, TupleLike} +import org.apache.texera.amber.operator.source.apis.twitter.TwitterSourceOpExec +import org.apache.texera.amber.operator.source.apis.twitter.v2.TwitterUtils.tweetDataToTuple +import org.apache.texera.amber.util.JSONUtils.objectMapper import scala.collection.mutable.ListBuffer import scala.collection.{Iterator, mutable} diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/apis/twitter/v2/TwitterUtils.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/twitter/v2/TwitterUtils.scala similarity index 96% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/source/apis/twitter/v2/TwitterUtils.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/twitter/v2/TwitterUtils.scala index 0978a2d9eed..a1fc6dd7d69 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/apis/twitter/v2/TwitterUtils.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/apis/twitter/v2/TwitterUtils.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.operator.source.apis.twitter.v2 +package org.apache.texera.amber.operator.source.apis.twitter.v2 import io.github.redouane59.twitter.dto.tweet.TweetV2.TweetData import io.github.redouane59.twitter.dto.user.UserV2.UserData -import org.apache.amber.core.tuple.{Attribute, AttributeTypeUtils, Schema, Tuple} +import org.apache.texera.amber.core.tuple.{Attribute, AttributeTypeUtils, Schema, Tuple} import java.time.format.DateTimeFormatter import java.time.{ZoneId, ZoneOffset} diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/cache/CacheSourceOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/cache/CacheSourceOpExec.scala similarity index 79% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/source/cache/CacheSourceOpExec.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/cache/CacheSourceOpExec.scala index 2e48bc74f05..b1f76489eb9 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/cache/CacheSourceOpExec.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/cache/CacheSourceOpExec.scala @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.amber.operator.source.cache +package org.apache.texera.amber.operator.source.cache import com.typesafe.scalalogging.LazyLogging -import org.apache.amber.core.executor.SourceOperatorExecutor -import org.apache.amber.core.storage.model.VirtualDocument -import org.apache.amber.core.storage.{DocumentFactory, VFSResourceType, VFSURIFactory} -import org.apache.amber.core.tuple.{Tuple, TupleLike} +import org.apache.texera.amber.core.executor.SourceOperatorExecutor +import org.apache.texera.amber.core.storage.model.VirtualDocument +import org.apache.texera.amber.core.storage.{DocumentFactory, VFSResourceType, VFSURIFactory} +import org.apache.texera.amber.core.tuple.{Tuple, TupleLike} import java.net.URI diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/fetcher/DecodingMethod.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/fetcher/DecodingMethod.java similarity index 95% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/source/fetcher/DecodingMethod.java rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/fetcher/DecodingMethod.java index 98249b7d941..a9c7879672c 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/fetcher/DecodingMethod.java +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/fetcher/DecodingMethod.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.source.fetcher; +package org.apache.texera.amber.operator.source.fetcher; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/fetcher/RandomUserAgent.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/fetcher/RandomUserAgent.java similarity index 99% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/source/fetcher/RandomUserAgent.java rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/fetcher/RandomUserAgent.java index 15b7bf5fc5c..7be21fea74e 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/fetcher/RandomUserAgent.java +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/fetcher/RandomUserAgent.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.source.fetcher; +package org.apache.texera.amber.operator.source.fetcher; import java.util.HashMap; import java.util.Map; diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/fetcher/URLFetchUtil.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/fetcher/URLFetchUtil.scala similarity index 96% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/source/fetcher/URLFetchUtil.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/fetcher/URLFetchUtil.scala index 000b5cf6321..443e12be301 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/fetcher/URLFetchUtil.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/fetcher/URLFetchUtil.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.source.fetcher +package org.apache.texera.amber.operator.source.fetcher import java.io.InputStream import java.net.URL diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/fetcher/URLFetcherOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/fetcher/URLFetcherOpDesc.scala similarity index 78% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/source/fetcher/URLFetcherOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/fetcher/URLFetcherOpDesc.scala index e2a29c68974..01f6ddc5234 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/fetcher/URLFetcherOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/fetcher/URLFetcherOpDesc.scala @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.amber.operator.source.fetcher +package org.apache.texera.amber.operator.source.fetcher import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.core.executor.OpExecWithClassName -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow.{OutputPort, PhysicalOp, SchemaPropagationFunc} -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import org.apache.amber.operator.source.SourceOperatorDescriptor -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.OpExecWithClassName +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow.{OutputPort, PhysicalOp, SchemaPropagationFunc} +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.operator.source.SourceOperatorDescriptor +import org.apache.texera.amber.util.JSONUtils.objectMapper class URLFetcherOpDesc extends SourceOperatorDescriptor { @@ -63,7 +63,7 @@ class URLFetcherOpDesc extends SourceOperatorDescriptor { executionId, operatorIdentifier, OpExecWithClassName( - "org.apache.amber.operator.source.fetcher.URLFetcherOpExec", + "org.apache.texera.amber.operator.source.fetcher.URLFetcherOpExec", objectMapper.writeValueAsString(this) ) ) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/fetcher/URLFetcherOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/fetcher/URLFetcherOpExec.scala similarity index 82% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/source/fetcher/URLFetcherOpExec.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/fetcher/URLFetcherOpExec.scala index 732d76ea10c..3f7b45421a2 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/fetcher/URLFetcherOpExec.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/fetcher/URLFetcherOpExec.scala @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.amber.operator.source.fetcher +package org.apache.texera.amber.operator.source.fetcher -import org.apache.amber.core.executor.SourceOperatorExecutor -import org.apache.amber.core.tuple.TupleLike -import org.apache.amber.operator.source.fetcher.URLFetchUtil.getInputStreamFromURL -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.SourceOperatorExecutor +import org.apache.texera.amber.core.tuple.TupleLike +import org.apache.texera.amber.operator.source.fetcher.URLFetchUtil.getInputStreamFromURL +import org.apache.texera.amber.util.JSONUtils.objectMapper import org.apache.commons.io.IOUtils import java.net.URL diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/AutoClosingIterator.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/AutoClosingIterator.scala similarity index 96% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/AutoClosingIterator.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/AutoClosingIterator.scala index 81ed6a5ead4..df6a24dbf47 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/AutoClosingIterator.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/AutoClosingIterator.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.source.scan +package org.apache.texera.amber.operator.source.scan /** * A wrapper around an Interator that automatically invokes a cleanup function diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/FileAttributeType.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/FileAttributeType.java similarity index 94% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/FileAttributeType.java rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/FileAttributeType.java index aa198a9d2d6..9e1dfc2b8c3 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/FileAttributeType.java +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/FileAttributeType.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.amber.operator.source.scan; +package org.apache.texera.amber.operator.source.scan; import com.fasterxml.jackson.annotation.JsonValue; -import org.apache.amber.core.tuple.AttributeType; +import org.apache.texera.amber.core.tuple.AttributeType; public enum FileAttributeType { STRING("string", AttributeType.STRING), diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/FileDecodingMethod.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/FileDecodingMethod.java similarity index 96% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/FileDecodingMethod.java rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/FileDecodingMethod.java index ca1c138a578..2cd3ecb7e70 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/FileDecodingMethod.java +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/FileDecodingMethod.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.source.scan; +package org.apache.texera.amber.operator.source.scan; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/FileScanSourceOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/FileScanSourceOpDesc.scala similarity index 82% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/FileScanSourceOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/FileScanSourceOpDesc.scala index 16452db46a3..a76a855cade 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/FileScanSourceOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/FileScanSourceOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.source.scan +package org.apache.texera.amber.operator.source.scan import com.fasterxml.jackson.annotation.{JsonIgnoreProperties, JsonProperty} import com.kjetland.jackson.jsonSchema.annotations.{ @@ -25,13 +25,13 @@ import com.kjetland.jackson.jsonSchema.annotations.{ JsonSchemaString, JsonSchemaTitle } -import org.apache.amber.core.executor.OpExecWithClassName -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc} -import org.apache.amber.operator.metadata.annotations.HideAnnotation -import org.apache.amber.operator.source.scan.text.TextSourceOpDesc -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.OpExecWithClassName +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc} +import org.apache.texera.amber.operator.metadata.annotations.HideAnnotation +import org.apache.texera.amber.operator.source.scan.text.TextSourceOpDesc +import org.apache.texera.amber.util.JSONUtils.objectMapper @JsonIgnoreProperties(value = Array("limit", "offset", "fileEncoding")) class FileScanSourceOpDesc extends ScanSourceOpDesc with TextSourceOpDesc { @@ -73,7 +73,7 @@ class FileScanSourceOpDesc extends ScanSourceOpDesc with TextSourceOpDesc { executionId, operatorIdentifier, OpExecWithClassName( - "org.apache.amber.operator.source.scan.FileScanSourceOpExec", + "org.apache.texera.amber.operator.source.scan.FileScanSourceOpExec", objectMapper.writeValueAsString(this) ) ) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/FileScanSourceOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/FileScanSourceOpExec.scala similarity index 92% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/FileScanSourceOpExec.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/FileScanSourceOpExec.scala index c039b6e2d8a..11bfd60cf06 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/FileScanSourceOpExec.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/FileScanSourceOpExec.scala @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.amber.operator.source.scan +package org.apache.texera.amber.operator.source.scan -import org.apache.amber.core.executor.SourceOperatorExecutor -import org.apache.amber.core.storage.DocumentFactory -import org.apache.amber.core.tuple.AttributeTypeUtils.parseField -import org.apache.amber.core.tuple.{BigObject, TupleLike} -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.SourceOperatorExecutor +import org.apache.texera.amber.core.storage.DocumentFactory +import org.apache.texera.amber.core.tuple.AttributeTypeUtils.parseField +import org.apache.texera.amber.core.tuple.{BigObject, TupleLike} +import org.apache.texera.amber.util.JSONUtils.objectMapper import org.apache.texera.service.util.BigObjectOutputStream import org.apache.commons.compress.archivers.ArchiveStreamFactory import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/ScanSourceOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/ScanSourceOpDesc.scala similarity index 88% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/ScanSourceOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/ScanSourceOpDesc.scala index 53127572f4c..6c1c2c5fbd3 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/ScanSourceOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/ScanSourceOpDesc.scala @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.amber.operator.source.scan +package org.apache.texera.amber.operator.source.scan import com.fasterxml.jackson.annotation.{JsonIgnore, JsonProperty, JsonPropertyDescription} import com.fasterxml.jackson.databind.annotation.JsonDeserialize import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.core.storage.FileResolver -import org.apache.amber.core.tuple.Schema -import org.apache.amber.core.workflow.OutputPort -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import org.apache.amber.operator.source.SourceOperatorDescriptor +import org.apache.texera.amber.core.storage.FileResolver +import org.apache.texera.amber.core.tuple.Schema +import org.apache.texera.amber.core.workflow.OutputPort +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.operator.source.SourceOperatorDescriptor import org.apache.commons.lang3.builder.EqualsBuilder import java.net.URI diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/arrow/ArrowSourceOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/arrow/ArrowSourceOpDesc.scala similarity index 79% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/arrow/ArrowSourceOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/arrow/ArrowSourceOpDesc.scala index 9b334a46c42..ac43dbe65dd 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/arrow/ArrowSourceOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/arrow/ArrowSourceOpDesc.scala @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.amber.operator.source.scan.arrow +package org.apache.texera.amber.operator.source.scan.arrow import com.fasterxml.jackson.annotation.JsonIgnoreProperties -import org.apache.amber.core.executor.OpExecWithClassName -import org.apache.amber.core.storage.DocumentFactory -import org.apache.amber.core.tuple.Schema -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc} -import org.apache.amber.operator.source.scan.ScanSourceOpDesc -import org.apache.amber.util.ArrowUtils -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.OpExecWithClassName +import org.apache.texera.amber.core.storage.DocumentFactory +import org.apache.texera.amber.core.tuple.Schema +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc} +import org.apache.texera.amber.operator.source.scan.ScanSourceOpDesc +import org.apache.texera.amber.util.ArrowUtils +import org.apache.texera.amber.util.JSONUtils.objectMapper import org.apache.arrow.memory.RootAllocator import org.apache.arrow.vector.ipc.ArrowFileReader import org.apache.arrow.vector.types.pojo.{Schema => ArrowSchema} @@ -53,7 +53,7 @@ class ArrowSourceOpDesc extends ScanSourceOpDesc { executionId, operatorIdentifier, OpExecWithClassName( - "org.apache.amber.operator.source.scan.arrow.ArrowSourceOpExec", + "org.apache.texera.amber.operator.source.scan.arrow.ArrowSourceOpExec", objectMapper.writeValueAsString(this) ) ) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/arrow/ArrowSourceOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/arrow/ArrowSourceOpExec.scala similarity index 90% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/arrow/ArrowSourceOpExec.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/arrow/ArrowSourceOpExec.scala index f43c95eaba2..f23833206f9 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/arrow/ArrowSourceOpExec.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/arrow/ArrowSourceOpExec.scala @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.amber.operator.source.scan.arrow +package org.apache.texera.amber.operator.source.scan.arrow -import org.apache.amber.core.executor.SourceOperatorExecutor -import org.apache.amber.core.storage.DocumentFactory -import org.apache.amber.core.tuple.TupleLike -import org.apache.amber.util.ArrowUtils -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.SourceOperatorExecutor +import org.apache.texera.amber.core.storage.DocumentFactory +import org.apache.texera.amber.core.tuple.TupleLike +import org.apache.texera.amber.util.ArrowUtils +import org.apache.texera.amber.util.JSONUtils.objectMapper import org.apache.arrow.memory.RootAllocator import org.apache.arrow.vector.VectorSchemaRoot import org.apache.arrow.vector.ipc.ArrowFileReader diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/csv/CSVScanSourceOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/csv/CSVScanSourceOpDesc.scala similarity index 84% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/csv/CSVScanSourceOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/csv/CSVScanSourceOpDesc.scala index 64dd6760979..9879835e763 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/csv/CSVScanSourceOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/csv/CSVScanSourceOpDesc.scala @@ -17,19 +17,19 @@ * under the License. */ -package org.apache.amber.operator.source.scan.csv +package org.apache.texera.amber.operator.source.scan.csv import com.fasterxml.jackson.annotation.{JsonInclude, JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle import com.univocity.parsers.csv.{CsvFormat, CsvParser, CsvParserSettings} -import org.apache.amber.core.executor.OpExecWithClassName -import org.apache.amber.core.storage.DocumentFactory -import org.apache.amber.core.tuple.AttributeTypeUtils.inferSchemaFromRows -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc} -import org.apache.amber.operator.source.scan.ScanSourceOpDesc -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.OpExecWithClassName +import org.apache.texera.amber.core.storage.DocumentFactory +import org.apache.texera.amber.core.tuple.AttributeTypeUtils.inferSchemaFromRows +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc} +import org.apache.texera.amber.operator.source.scan.ScanSourceOpDesc +import org.apache.texera.amber.util.JSONUtils.objectMapper import java.io.{IOException, InputStreamReader} import java.net.URI @@ -65,7 +65,7 @@ class CSVScanSourceOpDesc extends ScanSourceOpDesc { executionId, operatorIdentifier, OpExecWithClassName( - "org.apache.amber.operator.source.scan.csv.CSVScanSourceOpExec", + "org.apache.texera.amber.operator.source.scan.csv.CSVScanSourceOpExec", objectMapper.writeValueAsString(this) ) ) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/csv/CSVScanSourceOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/csv/CSVScanSourceOpExec.scala similarity index 90% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/csv/CSVScanSourceOpExec.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/csv/CSVScanSourceOpExec.scala index 5be68f9df23..c3fbbe9bb55 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/csv/CSVScanSourceOpExec.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/csv/CSVScanSourceOpExec.scala @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.amber.operator.source.scan.csv +package org.apache.texera.amber.operator.source.scan.csv import com.univocity.parsers.csv.{CsvFormat, CsvParser, CsvParserSettings} -import org.apache.amber.core.executor.SourceOperatorExecutor -import org.apache.amber.core.storage.DocumentFactory -import org.apache.amber.core.tuple.{AttributeTypeUtils, Schema, TupleLike} -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.SourceOperatorExecutor +import org.apache.texera.amber.core.storage.DocumentFactory +import org.apache.texera.amber.core.tuple.{AttributeTypeUtils, Schema, TupleLike} +import org.apache.texera.amber.util.JSONUtils.objectMapper import java.io.InputStreamReader import java.net.URI diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/csv/ParallelCSVScanSourceOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/csv/ParallelCSVScanSourceOpDesc.scala similarity index 82% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/csv/ParallelCSVScanSourceOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/csv/ParallelCSVScanSourceOpDesc.scala index aae2e76af75..b159e59c3e6 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/csv/ParallelCSVScanSourceOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/csv/ParallelCSVScanSourceOpDesc.scala @@ -17,20 +17,20 @@ * under the License. */ -package org.apache.amber.operator.source.scan.csv +package org.apache.texera.amber.operator.source.scan.csv import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.fasterxml.jackson.databind.annotation.JsonDeserialize import com.github.tototoshi.csv.{CSVReader, DefaultCSVFormat} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.core.executor.OpExecWithClassName -import org.apache.amber.core.storage.DocumentFactory -import org.apache.amber.core.tuple.AttributeTypeUtils.inferSchemaFromRows -import org.apache.amber.core.tuple.{Attribute, AttributeType, Schema} -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc} -import org.apache.amber.operator.source.scan.ScanSourceOpDesc -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.OpExecWithClassName +import org.apache.texera.amber.core.storage.DocumentFactory +import org.apache.texera.amber.core.tuple.AttributeTypeUtils.inferSchemaFromRows +import org.apache.texera.amber.core.tuple.{Attribute, AttributeType, Schema} +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc} +import org.apache.texera.amber.operator.source.scan.ScanSourceOpDesc +import org.apache.texera.amber.util.JSONUtils.objectMapper import java.io.IOException import java.net.URI @@ -66,7 +66,7 @@ class ParallelCSVScanSourceOpDesc extends ScanSourceOpDesc { executionId, operatorIdentifier, OpExecWithClassName( - "org.apache.amber.operator.source.scan.csv.ParallelCSVScanSourceOpExec", + "org.apache.texera.amber.operator.source.scan.csv.ParallelCSVScanSourceOpExec", objectMapper.writeValueAsString(this) ) ) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/csv/ParallelCSVScanSourceOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/csv/ParallelCSVScanSourceOpExec.scala similarity index 91% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/csv/ParallelCSVScanSourceOpExec.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/csv/ParallelCSVScanSourceOpExec.scala index 65217426622..1c9377e564e 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/csv/ParallelCSVScanSourceOpExec.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/csv/ParallelCSVScanSourceOpExec.scala @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.amber.operator.source.scan.csv +package org.apache.texera.amber.operator.source.scan.csv -import org.apache.amber.core.executor.SourceOperatorExecutor -import org.apache.amber.core.storage.DocumentFactory -import org.apache.amber.core.tuple.{Attribute, AttributeTypeUtils, TupleLike} -import org.apache.amber.operator.source.BufferedBlockReader -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.SourceOperatorExecutor +import org.apache.texera.amber.core.storage.DocumentFactory +import org.apache.texera.amber.core.tuple.{Attribute, AttributeTypeUtils, TupleLike} +import org.apache.texera.amber.operator.source.BufferedBlockReader +import org.apache.texera.amber.util.JSONUtils.objectMapper import org.tukaani.xz.SeekableFileInputStream import java.net.URI diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/csvOld/CSVOldScanSourceOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/csvOld/CSVOldScanSourceOpDesc.scala similarity index 82% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/csvOld/CSVOldScanSourceOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/csvOld/CSVOldScanSourceOpDesc.scala index af42fed04ed..08b5ea1ce10 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/csvOld/CSVOldScanSourceOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/csvOld/CSVOldScanSourceOpDesc.scala @@ -17,19 +17,19 @@ * under the License. */ -package org.apache.amber.operator.source.scan.csvOld +package org.apache.texera.amber.operator.source.scan.csvOld import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.github.tototoshi.csv.{CSVReader, DefaultCSVFormat} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.core.executor.OpExecWithClassName -import org.apache.amber.core.storage.DocumentFactory -import org.apache.amber.core.tuple.AttributeTypeUtils.inferSchemaFromRows -import org.apache.amber.core.tuple.{Attribute, AttributeType, Schema} -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc} -import org.apache.amber.operator.source.scan.ScanSourceOpDesc -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.OpExecWithClassName +import org.apache.texera.amber.core.storage.DocumentFactory +import org.apache.texera.amber.core.tuple.AttributeTypeUtils.inferSchemaFromRows +import org.apache.texera.amber.core.tuple.{Attribute, AttributeType, Schema} +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc} +import org.apache.texera.amber.operator.source.scan.ScanSourceOpDesc +import org.apache.texera.amber.util.JSONUtils.objectMapper import java.io.IOException import java.net.URI @@ -63,7 +63,7 @@ class CSVOldScanSourceOpDesc extends ScanSourceOpDesc { executionId, operatorIdentifier, OpExecWithClassName( - "org.apache.amber.operator.source.scan.csvOld.CSVOldScanSourceOpExec", + "org.apache.texera.amber.operator.source.scan.csvOld.CSVOldScanSourceOpExec", objectMapper.writeValueAsString(this) ) ) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/csvOld/CSVOldScanSourceOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/csvOld/CSVOldScanSourceOpExec.scala similarity index 88% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/csvOld/CSVOldScanSourceOpExec.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/csvOld/CSVOldScanSourceOpExec.scala index 86577edc2e0..e7b1e938c35 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/csvOld/CSVOldScanSourceOpExec.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/csvOld/CSVOldScanSourceOpExec.scala @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.amber.operator.source.scan.csvOld +package org.apache.texera.amber.operator.source.scan.csvOld import com.github.tototoshi.csv.{CSVReader, DefaultCSVFormat} -import org.apache.amber.core.executor.SourceOperatorExecutor -import org.apache.amber.core.storage.DocumentFactory -import org.apache.amber.core.tuple.{Attribute, AttributeTypeUtils, Schema, TupleLike} -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.SourceOperatorExecutor +import org.apache.texera.amber.core.storage.DocumentFactory +import org.apache.texera.amber.core.tuple.{Attribute, AttributeTypeUtils, Schema, TupleLike} +import org.apache.texera.amber.util.JSONUtils.objectMapper import java.net.URI import scala.collection.compat.immutable.ArraySeq diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/json/JSONLScanSourceOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/json/JSONLScanSourceOpDesc.scala similarity index 82% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/json/JSONLScanSourceOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/json/JSONLScanSourceOpDesc.scala index 42403f313a2..2d86052fa58 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/json/JSONLScanSourceOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/json/JSONLScanSourceOpDesc.scala @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.amber.operator.source.scan.json +package org.apache.texera.amber.operator.source.scan.json import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.fasterxml.jackson.databind.JsonNode -import org.apache.amber.core.executor.OpExecWithClassName -import org.apache.amber.core.storage.DocumentFactory -import org.apache.amber.core.tuple.AttributeTypeUtils.inferSchemaFromRows -import org.apache.amber.core.tuple.{Attribute, Schema} -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc} -import org.apache.amber.operator.source.scan.ScanSourceOpDesc -import org.apache.amber.util.JSONUtils.{JSONToMap, objectMapper} +import org.apache.texera.amber.core.executor.OpExecWithClassName +import org.apache.texera.amber.core.storage.DocumentFactory +import org.apache.texera.amber.core.tuple.AttributeTypeUtils.inferSchemaFromRows +import org.apache.texera.amber.core.tuple.{Attribute, Schema} +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc} +import org.apache.texera.amber.operator.source.scan.ScanSourceOpDesc +import org.apache.texera.amber.util.JSONUtils.{JSONToMap, objectMapper} import java.io._ import java.net.URI @@ -55,7 +55,7 @@ class JSONLScanSourceOpDesc extends ScanSourceOpDesc { executionId, operatorIdentifier, OpExecWithClassName( - "org.apache.amber.operator.source.scan.json.JSONLScanSourceOpExec", + "org.apache.texera.amber.operator.source.scan.json.JSONLScanSourceOpExec", objectMapper.writeValueAsString(this) ) ) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/json/JSONLScanSourceOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/json/JSONLScanSourceOpExec.scala similarity index 85% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/json/JSONLScanSourceOpExec.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/json/JSONLScanSourceOpExec.scala index 1ef474540bb..c96278c3e3d 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/json/JSONLScanSourceOpExec.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/json/JSONLScanSourceOpExec.scala @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.amber.operator.source.scan.json +package org.apache.texera.amber.operator.source.scan.json -import org.apache.amber.core.executor.SourceOperatorExecutor -import org.apache.amber.core.storage.DocumentFactory -import org.apache.amber.core.tuple.AttributeTypeUtils.parseField -import org.apache.amber.core.tuple.TupleLike -import org.apache.amber.operator.source.scan.json.JSONUtil.JSONToMap -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.SourceOperatorExecutor +import org.apache.texera.amber.core.storage.DocumentFactory +import org.apache.texera.amber.core.tuple.AttributeTypeUtils.parseField +import org.apache.texera.amber.core.tuple.TupleLike +import org.apache.texera.amber.operator.source.scan.json.JSONUtil.JSONToMap +import org.apache.texera.amber.util.JSONUtils.objectMapper import java.io.{BufferedReader, InputStreamReader} import java.net.URI diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/json/JSONUtil.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/json/JSONUtil.scala similarity index 98% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/json/JSONUtil.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/json/JSONUtil.scala index 7a22f5a5c44..d5c7f2b4e48 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/json/JSONUtil.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/json/JSONUtil.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.source.scan.json +package org.apache.texera.amber.operator.source.scan.json import com.fasterxml.jackson.databind.JsonNode diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/text/TextInputSourceOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/text/TextInputSourceOpDesc.scala similarity index 74% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/text/TextInputSourceOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/text/TextInputSourceOpDesc.scala index 3a811848346..cfb14940f43 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/text/TextInputSourceOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/text/TextInputSourceOpDesc.scala @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.amber.operator.source.scan.text +package org.apache.texera.amber.operator.source.scan.text import com.fasterxml.jackson.annotation.JsonProperty import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} -import org.apache.amber.core.executor.OpExecWithClassName -import org.apache.amber.core.tuple.Schema -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow.{OutputPort, PhysicalOp, SchemaPropagationFunc} -import org.apache.amber.operator.metadata.annotations.UIWidget -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import org.apache.amber.operator.source.SourceOperatorDescriptor -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.OpExecWithClassName +import org.apache.texera.amber.core.tuple.Schema +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow.{OutputPort, PhysicalOp, SchemaPropagationFunc} +import org.apache.texera.amber.operator.metadata.annotations.UIWidget +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.operator.source.SourceOperatorDescriptor +import org.apache.texera.amber.util.JSONUtils.objectMapper class TextInputSourceOpDesc extends SourceOperatorDescriptor with TextSourceOpDesc { @JsonProperty(required = true) @@ -46,7 +46,7 @@ class TextInputSourceOpDesc extends SourceOperatorDescriptor with TextSourceOpDe executionId, operatorIdentifier, OpExecWithClassName( - "org.apache.amber.operator.source.scan.text.TextInputSourceOpExec", + "org.apache.texera.amber.operator.source.scan.text.TextInputSourceOpExec", objectMapper.writeValueAsString(this) ) ) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/text/TextInputSourceOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/text/TextInputSourceOpExec.scala similarity index 81% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/text/TextInputSourceOpExec.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/text/TextInputSourceOpExec.scala index efe8ff88c39..8ade443ef9b 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/text/TextInputSourceOpExec.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/text/TextInputSourceOpExec.scala @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.amber.operator.source.scan.text +package org.apache.texera.amber.operator.source.scan.text -import org.apache.amber.core.executor.SourceOperatorExecutor -import org.apache.amber.core.tuple.AttributeTypeUtils.parseField -import org.apache.amber.core.tuple.TupleLike -import org.apache.amber.operator.source.scan.FileAttributeType -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.SourceOperatorExecutor +import org.apache.texera.amber.core.tuple.AttributeTypeUtils.parseField +import org.apache.texera.amber.core.tuple.TupleLike +import org.apache.texera.amber.operator.source.scan.FileAttributeType +import org.apache.texera.amber.util.JSONUtils.objectMapper class TextInputSourceOpExec private[text] ( descString: String diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/text/TextSourceOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/text/TextSourceOpDesc.scala similarity index 93% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/text/TextSourceOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/text/TextSourceOpDesc.scala index 65a82e9853e..afa4a3604c0 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/scan/text/TextSourceOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/scan/text/TextSourceOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.source.scan.text +package org.apache.texera.amber.operator.source.scan.text import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.databind.annotation.JsonDeserialize @@ -26,8 +26,8 @@ import com.kjetland.jackson.jsonSchema.annotations.{ JsonSchemaString, JsonSchemaTitle } -import org.apache.amber.operator.metadata.annotations.HideAnnotation -import org.apache.amber.operator.source.scan.FileAttributeType +import org.apache.texera.amber.operator.metadata.annotations.HideAnnotation +import org.apache.texera.amber.operator.source.scan.FileAttributeType /** * TextSourceOpDesc is a trait holding commonly used properties and functions used for variations of text input processing diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/sql/SQLSourceOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/SQLSourceOpDesc.scala similarity index 96% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/source/sql/SQLSourceOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/SQLSourceOpDesc.scala index 39b283b6305..4cccd0ff2ad 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/sql/SQLSourceOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/SQLSourceOpDesc.scala @@ -17,19 +17,19 @@ * under the License. */ -package org.apache.amber.operator.source.sql +package org.apache.texera.amber.operator.source.sql import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.fasterxml.jackson.databind.annotation.JsonDeserialize import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} -import org.apache.amber.core.tuple.{Attribute, AttributeType, Schema} -import org.apache.amber.operator.metadata.annotations.{ +import org.apache.texera.amber.core.tuple.{Attribute, AttributeType, Schema} +import org.apache.texera.amber.operator.metadata.annotations.{ AutofillAttributeName, BatchByColumn, EnablePresets, UIWidget } -import org.apache.amber.operator.source.SourceOperatorDescriptor +import org.apache.texera.amber.operator.source.SourceOperatorDescriptor import java.sql._ diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/sql/SQLSourceOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/SQLSourceOpExec.scala similarity index 98% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/source/sql/SQLSourceOpExec.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/SQLSourceOpExec.scala index d87c0113fc8..be04ba2a46d 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/sql/SQLSourceOpExec.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/SQLSourceOpExec.scala @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.amber.operator.source.sql +package org.apache.texera.amber.operator.source.sql -import org.apache.amber.core.executor.SourceOperatorExecutor -import org.apache.amber.core.tuple.AttributeTypeUtils.{parseField, parseTimestamp} -import org.apache.amber.core.tuple._ -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.SourceOperatorExecutor +import org.apache.texera.amber.core.tuple.AttributeTypeUtils.{parseField, parseTimestamp} +import org.apache.texera.amber.core.tuple._ +import org.apache.texera.amber.util.JSONUtils.objectMapper import java.sql._ import scala.collection.mutable.ArrayBuffer diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/sql/asterixdb/AsterixDBConnUtil.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/asterixdb/AsterixDBConnUtil.scala similarity index 98% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/source/sql/asterixdb/AsterixDBConnUtil.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/asterixdb/AsterixDBConnUtil.scala index 4ade3e132c8..1cdf9026dbf 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/sql/asterixdb/AsterixDBConnUtil.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/asterixdb/AsterixDBConnUtil.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.source.sql.asterixdb +package org.apache.texera.amber.operator.source.sql.asterixdb import kong.unirest.json.JSONObject import kong.unirest.{HttpResponse, JsonNode, Unirest} diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/sql/asterixdb/AsterixDBSourceOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/asterixdb/AsterixDBSourceOpDesc.scala similarity index 86% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/source/sql/asterixdb/AsterixDBSourceOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/asterixdb/AsterixDBSourceOpDesc.scala index 0ba67b2c027..8a679fd2b41 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/sql/asterixdb/AsterixDBSourceOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/asterixdb/AsterixDBSourceOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.source.sql.asterixdb +package org.apache.texera.amber.operator.source.sql.asterixdb import com.fasterxml.jackson.annotation.{ JsonIgnoreProperties, @@ -27,23 +27,23 @@ import com.fasterxml.jackson.annotation.{ import com.fasterxml.jackson.databind.annotation.JsonDeserialize import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} import kong.unirest.json.JSONObject -import org.apache.amber.core.executor.OpExecWithClassName -import org.apache.amber.core.tuple.{Attribute, AttributeType, Schema} -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow.{OutputPort, PhysicalOp, SchemaPropagationFunc} -import org.apache.amber.operator.filter.FilterPredicate -import org.apache.amber.operator.metadata.annotations.{ +import org.apache.texera.amber.core.executor.OpExecWithClassName +import org.apache.texera.amber.core.tuple.{Attribute, AttributeType, Schema} +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow.{OutputPort, PhysicalOp, SchemaPropagationFunc} +import org.apache.texera.amber.operator.filter.FilterPredicate +import org.apache.texera.amber.operator.metadata.annotations.{ AutofillAttributeName, AutofillAttributeNameList, UIWidget } -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import org.apache.amber.operator.source.sql.SQLSourceOpDesc -import org.apache.amber.operator.source.sql.asterixdb.AsterixDBConnUtil.{ +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.operator.source.sql.SQLSourceOpDesc +import org.apache.texera.amber.operator.source.sql.asterixdb.AsterixDBConnUtil.{ fetchDataTypeFields, queryAsterixDB } -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.util.JSONUtils.objectMapper @JsonIgnoreProperties(value = Array("username", "password")) class AsterixDBSourceOpDesc extends SQLSourceOpDesc { @@ -117,7 +117,7 @@ class AsterixDBSourceOpDesc extends SQLSourceOpDesc { executionId, this.operatorIdentifier, OpExecWithClassName( - "org.apache.amber.operator.source.sql.asterixdb.AsterixDBSourceOpExec", + "org.apache.texera.amber.operator.source.sql.asterixdb.AsterixDBSourceOpExec", objectMapper.writeValueAsString(this) ) ) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/sql/asterixdb/AsterixDBSourceOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/asterixdb/AsterixDBSourceOpExec.scala similarity index 96% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/source/sql/asterixdb/AsterixDBSourceOpExec.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/asterixdb/AsterixDBSourceOpExec.scala index 80dac70c409..c82dcfe2e06 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/sql/asterixdb/AsterixDBSourceOpExec.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/asterixdb/AsterixDBSourceOpExec.scala @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.amber.operator.source.sql.asterixdb +package org.apache.texera.amber.operator.source.sql.asterixdb import com.github.tototoshi.csv.CSVParser -import org.apache.amber.core.tuple.AttributeTypeUtils.parseField -import org.apache.amber.core.tuple.{AttributeType, Tuple, TupleLike} -import org.apache.amber.operator.source.sql.SQLSourceOpExec -import org.apache.amber.operator.source.sql.asterixdb.AsterixDBConnUtil.{ +import org.apache.texera.amber.core.tuple.AttributeTypeUtils.parseField +import org.apache.texera.amber.core.tuple.{AttributeType, Tuple, TupleLike} +import org.apache.texera.amber.operator.source.sql.SQLSourceOpExec +import org.apache.texera.amber.operator.source.sql.asterixdb.AsterixDBConnUtil.{ queryAsterixDB, updateAsterixDBVersionMapping } -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.util.JSONUtils.objectMapper import java.sql._ import java.time.format.DateTimeFormatter diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/sql/mysql/MySQLConnUtil.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/mysql/MySQLConnUtil.scala similarity index 95% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/source/sql/mysql/MySQLConnUtil.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/mysql/MySQLConnUtil.scala index 2f569747da2..3e1ea938263 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/sql/mysql/MySQLConnUtil.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/mysql/MySQLConnUtil.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.source.sql.mysql +package org.apache.texera.amber.operator.source.sql.mysql import java.sql.{Connection, DriverManager, SQLException} diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/sql/mysql/MySQLSourceOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/mysql/MySQLSourceOpDesc.scala similarity index 73% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/source/sql/mysql/MySQLSourceOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/mysql/MySQLSourceOpDesc.scala index f6e89c24363..92b1d4e0931 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/sql/mysql/MySQLSourceOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/mysql/MySQLSourceOpDesc.scala @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.amber.operator.source.sql.mysql +package org.apache.texera.amber.operator.source.sql.mysql -import org.apache.amber.core.executor.OpExecWithClassName -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow.{OutputPort, PhysicalOp, SchemaPropagationFunc} -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import org.apache.amber.operator.source.sql.SQLSourceOpDesc -import org.apache.amber.operator.source.sql.mysql.MySQLConnUtil.connect -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.OpExecWithClassName +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow.{OutputPort, PhysicalOp, SchemaPropagationFunc} +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.operator.source.sql.SQLSourceOpDesc +import org.apache.texera.amber.operator.source.sql.mysql.MySQLConnUtil.connect +import org.apache.texera.amber.util.JSONUtils.objectMapper import java.sql.{Connection, SQLException} @@ -41,7 +41,7 @@ class MySQLSourceOpDesc extends SQLSourceOpDesc { executionId, this.operatorIdentifier, OpExecWithClassName( - "org.apache.amber.operator.source.sql.mysql.MySQLSourceOpExec", + "org.apache.texera.amber.operator.source.sql.mysql.MySQLSourceOpExec", objectMapper.writeValueAsString(this) ) ) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/sql/mysql/MySQLSourceOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/mysql/MySQLSourceOpExec.scala similarity index 88% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/source/sql/mysql/MySQLSourceOpExec.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/mysql/MySQLSourceOpExec.scala index be164a408d1..c7b0eaf6e2c 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/sql/mysql/MySQLSourceOpExec.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/mysql/MySQLSourceOpExec.scala @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.amber.operator.source.sql.mysql +package org.apache.texera.amber.operator.source.sql.mysql -import org.apache.amber.core.tuple.AttributeType -import org.apache.amber.operator.source.sql.SQLSourceOpExec -import org.apache.amber.operator.source.sql.mysql.MySQLConnUtil.connect -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.tuple.AttributeType +import org.apache.texera.amber.operator.source.sql.SQLSourceOpExec +import org.apache.texera.amber.operator.source.sql.mysql.MySQLConnUtil.connect +import org.apache.texera.amber.util.JSONUtils.objectMapper import java.sql._ diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/sql/postgresql/PostgreSQLConnUtil.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/postgresql/PostgreSQLConnUtil.scala similarity index 95% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/source/sql/postgresql/PostgreSQLConnUtil.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/postgresql/PostgreSQLConnUtil.scala index cec9ccbf89a..c6fb4ff7922 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/sql/postgresql/PostgreSQLConnUtil.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/postgresql/PostgreSQLConnUtil.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.source.sql.postgresql +package org.apache.texera.amber.operator.source.sql.postgresql import java.sql.{Connection, DriverManager, SQLException} diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/sql/postgresql/PostgreSQLSourceOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/postgresql/PostgreSQLSourceOpDesc.scala similarity index 76% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/source/sql/postgresql/PostgreSQLSourceOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/postgresql/PostgreSQLSourceOpDesc.scala index 69588dacd8d..0d13179aef7 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/sql/postgresql/PostgreSQLSourceOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/postgresql/PostgreSQLSourceOpDesc.scala @@ -17,19 +17,19 @@ * under the License. */ -package org.apache.amber.operator.source.sql.postgresql +package org.apache.texera.amber.operator.source.sql.postgresql import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.fasterxml.jackson.databind.annotation.JsonDeserialize import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} -import org.apache.amber.core.executor.OpExecWithClassName -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow.{OutputPort, PhysicalOp, SchemaPropagationFunc} -import org.apache.amber.operator.metadata.annotations.UIWidget -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import org.apache.amber.operator.source.sql.SQLSourceOpDesc -import org.apache.amber.operator.source.sql.postgresql.PostgreSQLConnUtil.connect -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.OpExecWithClassName +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow.{OutputPort, PhysicalOp, SchemaPropagationFunc} +import org.apache.texera.amber.operator.metadata.annotations.UIWidget +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.operator.source.sql.SQLSourceOpDesc +import org.apache.texera.amber.operator.source.sql.postgresql.PostgreSQLConnUtil.connect +import org.apache.texera.amber.util.JSONUtils.objectMapper import java.sql.{Connection, SQLException} @@ -54,7 +54,7 @@ class PostgreSQLSourceOpDesc extends SQLSourceOpDesc { executionId, operatorIdentifier, OpExecWithClassName( - "org.apache.amber.operator.source.sql.postgresql.PostgreSQLSourceOpExec", + "org.apache.texera.amber.operator.source.sql.postgresql.PostgreSQLSourceOpExec", objectMapper.writeValueAsString(this) ) ) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/sql/postgresql/PostgreSQLSourceOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/postgresql/PostgreSQLSourceOpExec.scala similarity index 88% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/source/sql/postgresql/PostgreSQLSourceOpExec.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/postgresql/PostgreSQLSourceOpExec.scala index a3b864d5a60..4ce3a34cddd 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/source/sql/postgresql/PostgreSQLSourceOpExec.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/source/sql/postgresql/PostgreSQLSourceOpExec.scala @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.amber.operator.source.sql.postgresql +package org.apache.texera.amber.operator.source.sql.postgresql -import org.apache.amber.core.tuple.AttributeType -import org.apache.amber.operator.source.sql.SQLSourceOpExec -import org.apache.amber.operator.source.sql.postgresql.PostgreSQLConnUtil.connect -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.tuple.AttributeType +import org.apache.texera.amber.operator.source.sql.SQLSourceOpExec +import org.apache.texera.amber.operator.source.sql.postgresql.PostgreSQLConnUtil.connect +import org.apache.texera.amber.util.JSONUtils.objectMapper import java.sql._ diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/split/SplitOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/split/SplitOpDesc.scala similarity index 84% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/split/SplitOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/split/SplitOpDesc.scala index ec214347d46..0cd9d68b1cb 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/split/SplitOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/split/SplitOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.split +package org.apache.texera.amber.operator.split import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.google.common.base.Preconditions @@ -26,13 +26,13 @@ import com.kjetland.jackson.jsonSchema.annotations.{ JsonSchemaString, JsonSchemaTitle } -import org.apache.amber.core.executor.OpExecWithClassName -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow._ -import org.apache.amber.operator.LogicalOp -import org.apache.amber.operator.metadata.annotations.HideAnnotation -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.OpExecWithClassName +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow._ +import org.apache.texera.amber.operator.LogicalOp +import org.apache.texera.amber.operator.metadata.annotations.HideAnnotation +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.util.JSONUtils.objectMapper class SplitOpDesc extends LogicalOp { @@ -68,7 +68,7 @@ class SplitOpDesc extends LogicalOp { executionId, operatorIdentifier, OpExecWithClassName( - "org.apache.amber.operator.split.SplitOpExec", + "org.apache.texera.amber.operator.split.SplitOpExec", objectMapper.writeValueAsString(this) ) ) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/split/SplitOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/split/SplitOpExec.scala similarity index 84% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/split/SplitOpExec.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/split/SplitOpExec.scala index 53004e9072b..3d3e8690917 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/split/SplitOpExec.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/split/SplitOpExec.scala @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.amber.operator.split +package org.apache.texera.amber.operator.split -import org.apache.amber.core.executor.OperatorExecutor -import org.apache.amber.core.tuple.{Tuple, TupleLike} -import org.apache.amber.core.workflow.PortIdentity -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.OperatorExecutor +import org.apache.texera.amber.core.tuple.{Tuple, TupleLike} +import org.apache.texera.amber.core.workflow.PortIdentity +import org.apache.texera.amber.util.JSONUtils.objectMapper import scala.util.Random diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/substringSearch/SubstringSearchOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/substringSearch/SubstringSearchOpDesc.scala similarity index 77% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/substringSearch/SubstringSearchOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/substringSearch/SubstringSearchOpDesc.scala index a5b290d237b..da4a7437b93 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/substringSearch/SubstringSearchOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/substringSearch/SubstringSearchOpDesc.scala @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.amber.operator.substringSearch +package org.apache.texera.amber.operator.substringSearch import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.core.executor.OpExecWithClassName -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow.{InputPort, OutputPort, PhysicalOp} -import org.apache.amber.operator.filter.FilterOpDesc -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.OpExecWithClassName +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PhysicalOp} +import org.apache.texera.amber.operator.filter.FilterOpDesc +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.util.JSONUtils.objectMapper class SubstringSearchOpDesc extends FilterOpDesc { @@ -57,7 +57,7 @@ class SubstringSearchOpDesc extends FilterOpDesc { executionId, operatorIdentifier, OpExecWithClassName( - "org.apache.amber.operator.substringSearch.SubstringSearchOpExec", + "org.apache.texera.amber.operator.substringSearch.SubstringSearchOpExec", objectMapper.writeValueAsString(this) ) ) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/substringSearch/SubstringSearchOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/substringSearch/SubstringSearchOpExec.scala similarity index 85% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/substringSearch/SubstringSearchOpExec.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/substringSearch/SubstringSearchOpExec.scala index 704854b3393..5331a4601d0 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/substringSearch/SubstringSearchOpExec.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/substringSearch/SubstringSearchOpExec.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.operator.substringSearch +package org.apache.texera.amber.operator.substringSearch -import org.apache.amber.core.tuple.Tuple -import org.apache.amber.operator.filter.FilterOpExec -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.tuple.Tuple +import org.apache.texera.amber.operator.filter.FilterOpExec +import org.apache.texera.amber.util.JSONUtils.objectMapper class SubstringSearchOpExec(descString: String) extends FilterOpExec { private val desc: SubstringSearchOpDesc = diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/symmetricDifference/SymmetricDifferenceOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/symmetricDifference/SymmetricDifferenceOpDesc.scala similarity index 81% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/symmetricDifference/SymmetricDifferenceOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/symmetricDifference/SymmetricDifferenceOpDesc.scala index d72588ef8db..d0d6deecbe6 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/symmetricDifference/SymmetricDifferenceOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/symmetricDifference/SymmetricDifferenceOpDesc.scala @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.amber.operator.symmetricDifference +package org.apache.texera.amber.operator.symmetricDifference import com.google.common.base.Preconditions -import org.apache.amber.core.executor.OpExecWithClassName -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow._ -import org.apache.amber.operator.LogicalOp -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.executor.OpExecWithClassName +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow._ +import org.apache.texera.amber.operator.LogicalOp +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} class SymmetricDifferenceOpDesc extends LogicalOp { @@ -39,7 +39,7 @@ class SymmetricDifferenceOpDesc extends LogicalOp { executionId, operatorIdentifier, OpExecWithClassName( - "org.apache.amber.operator.symmetricDifference.SymmetricDifferenceOpExec" + "org.apache.texera.amber.operator.symmetricDifference.SymmetricDifferenceOpExec" ) ) .withInputPorts(operatorInfo.inputPorts) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/symmetricDifference/SymmetricDifferenceOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/symmetricDifference/SymmetricDifferenceOpExec.scala similarity index 90% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/symmetricDifference/SymmetricDifferenceOpExec.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/symmetricDifference/SymmetricDifferenceOpExec.scala index 100dc7b098f..518dc984ceb 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/symmetricDifference/SymmetricDifferenceOpExec.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/symmetricDifference/SymmetricDifferenceOpExec.scala @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.amber.operator.symmetricDifference +package org.apache.texera.amber.operator.symmetricDifference -import org.apache.amber.core.executor.OperatorExecutor -import org.apache.amber.core.tuple.{Tuple, TupleLike} +import org.apache.texera.amber.core.executor.OperatorExecutor +import org.apache.texera.amber.core.tuple.{Tuple, TupleLike} import scala.collection.mutable diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/timeSeriesPlot/TimeSeriesPlot.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/timeSeriesPlot/TimeSeriesPlot.scala similarity index 91% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/timeSeriesPlot/TimeSeriesPlot.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/timeSeriesPlot/TimeSeriesPlot.scala index 091df93e935..aae1c339331 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/timeSeriesPlot/TimeSeriesPlot.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/timeSeriesPlot/TimeSeriesPlot.scala @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.amber.operator.visualization.timeSeriesplot +package org.apache.texera.amber.operator.visualization.timeSeriesplot import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.workflow.OutputPort.OutputMode -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.workflow.OutputPort.OutputMode +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import javax.validation.constraints.{NotBlank, NotNull} diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/typecasting/TypeCastingOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/typecasting/TypeCastingOpDesc.scala similarity index 79% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/typecasting/TypeCastingOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/typecasting/TypeCastingOpDesc.scala index bd3b0ec0637..82b0af60b36 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/typecasting/TypeCastingOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/typecasting/TypeCastingOpDesc.scala @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.amber.operator.typecasting +package org.apache.texera.amber.operator.typecasting import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.core.executor.OpExecWithClassName -import org.apache.amber.core.tuple.{AttributeTypeUtils, Schema} -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow._ -import org.apache.amber.operator.map.MapOpDesc -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.OpExecWithClassName +import org.apache.texera.amber.core.tuple.{AttributeTypeUtils, Schema} +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow._ +import org.apache.texera.amber.operator.map.MapOpDesc +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.util.JSONUtils.objectMapper class TypeCastingOpDesc extends MapOpDesc { @@ -47,7 +47,7 @@ class TypeCastingOpDesc extends MapOpDesc { executionId, operatorIdentifier, OpExecWithClassName( - "org.apache.amber.operator.typecasting.TypeCastingOpExec", + "org.apache.texera.amber.operator.typecasting.TypeCastingOpExec", objectMapper.writeValueAsString(this) ) ) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/typecasting/TypeCastingOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/typecasting/TypeCastingOpExec.scala similarity index 83% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/typecasting/TypeCastingOpExec.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/typecasting/TypeCastingOpExec.scala index 6bdb1960a8f..3390784ef45 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/typecasting/TypeCastingOpExec.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/typecasting/TypeCastingOpExec.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.operator.typecasting +package org.apache.texera.amber.operator.typecasting -import org.apache.amber.core.tuple.{AttributeTypeUtils, Tuple, TupleLike} -import org.apache.amber.operator.map.MapOpExec -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.tuple.{AttributeTypeUtils, Tuple, TupleLike} +import org.apache.texera.amber.operator.map.MapOpExec +import org.apache.texera.amber.util.JSONUtils.objectMapper class TypeCastingOpExec(descString: String) extends MapOpExec { diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/typecasting/TypeCastingUnit.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/typecasting/TypeCastingUnit.java similarity index 95% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/typecasting/TypeCastingUnit.java rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/typecasting/TypeCastingUnit.java index 83687214938..2e942cf3232 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/typecasting/TypeCastingUnit.java +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/typecasting/TypeCastingUnit.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.amber.operator.typecasting; +package org.apache.texera.amber.operator.typecasting; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaInject; import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle; -import org.apache.amber.core.tuple.AttributeType; -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName; +import org.apache.texera.amber.core.tuple.AttributeType; +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName; @JsonSchemaInject(json = "{" + diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/udf/java/JavaUDFOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/java/JavaUDFOpDesc.scala similarity index 89% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/udf/java/JavaUDFOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/java/JavaUDFOpDesc.scala index 314cdd8f4bc..5c452a6c1d6 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/udf/java/JavaUDFOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/java/JavaUDFOpDesc.scala @@ -17,26 +17,26 @@ * under the License. */ -package org.apache.amber.operator.udf.java +package org.apache.texera.amber.operator.udf.java import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.google.common.base.Preconditions import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.core.executor.OpExecWithCode -import org.apache.amber.core.tuple.{Attribute, Schema} -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow._ -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import org.apache.amber.operator.{LogicalOp, PortDescription, StateTransferFunc} +import org.apache.texera.amber.core.executor.OpExecWithCode +import org.apache.texera.amber.core.tuple.{Attribute, Schema} +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow._ +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.operator.{LogicalOp, PortDescription, StateTransferFunc} import scala.util.{Success, Try} class JavaUDFOpDesc extends LogicalOp { @JsonProperty( required = true, defaultValue = - "import org.apache.amber.operator.map.MapOpExec;\n" + - "import org.apache.amber.core.tuple.Tuple;\n" + - "import org.apache.amber.core.tuple.TupleLike;\n" + + "import org.apache.texera.amber.operator.map.MapOpExec;\n" + + "import org.apache.texera.amber.core.tuple.Tuple;\n" + + "import org.apache.texera.amber.core.tuple.TupleLike;\n" + "import scala.Function1;\n" + "import java.io.Serializable;\n" + "\n" + diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/udf/python/DualInputPortsPythonUDFOpDescV2.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/python/DualInputPortsPythonUDFOpDescV2.scala similarity index 92% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/udf/python/DualInputPortsPythonUDFOpDescV2.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/python/DualInputPortsPythonUDFOpDescV2.scala index 5119d676610..3f056c96055 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/udf/python/DualInputPortsPythonUDFOpDescV2.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/python/DualInputPortsPythonUDFOpDescV2.scala @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.amber.operator.udf.python +package org.apache.texera.amber.operator.udf.python import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.google.common.base.Preconditions import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.core.executor.OpExecWithCode -import org.apache.amber.core.tuple.{Attribute, Schema} -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow._ -import org.apache.amber.operator.LogicalOp -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.executor.OpExecWithCode +import org.apache.texera.amber.core.tuple.{Attribute, Schema} +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow._ +import org.apache.texera.amber.operator.LogicalOp +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} class DualInputPortsPythonUDFOpDescV2 extends LogicalOp { @JsonProperty( diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/udf/python/LambdaAttributeUnit.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/python/LambdaAttributeUnit.java similarity index 92% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/udf/python/LambdaAttributeUnit.java rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/python/LambdaAttributeUnit.java index 661856dc7ec..532fcb93a69 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/udf/python/LambdaAttributeUnit.java +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/python/LambdaAttributeUnit.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.udf.python; +package org.apache.texera.amber.operator.udf.python; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -25,9 +25,9 @@ import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaInject; import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaString; import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle; -import org.apache.amber.core.tuple.AttributeType; -import org.apache.amber.operator.metadata.annotations.AutofillAttributeNameLambda; -import org.apache.amber.operator.metadata.annotations.HideAnnotation; +import org.apache.texera.amber.core.tuple.AttributeType; +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeNameLambda; +import org.apache.texera.amber.operator.metadata.annotations.HideAnnotation; import java.util.Objects; diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/udf/python/PythonLambdaFunctionOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/python/PythonLambdaFunctionOpDesc.scala similarity index 90% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/udf/python/PythonLambdaFunctionOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/python/PythonLambdaFunctionOpDesc.scala index 007e194ea66..9b66dde0759 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/udf/python/PythonLambdaFunctionOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/python/PythonLambdaFunctionOpDesc.scala @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.amber.operator.udf.python +package org.apache.texera.amber.operator.udf.python import com.google.common.base.Preconditions import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.core.tuple.{AttributeTypeUtils, Schema} -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.tuple.{AttributeTypeUtils, Schema} +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} class PythonLambdaFunctionOpDesc extends PythonOperatorDescriptor { @JsonSchemaTitle("Add/Modify column(s)") diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/udf/python/PythonTableReducerOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/python/PythonTableReducerOpDesc.scala similarity index 86% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/udf/python/PythonTableReducerOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/python/PythonTableReducerOpDesc.scala index f5101f801f6..0c2bb07ff13 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/udf/python/PythonTableReducerOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/python/PythonTableReducerOpDesc.scala @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.amber.operator.udf.python +package org.apache.texera.amber.operator.udf.python import com.google.common.base.Preconditions import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.core.tuple.Schema -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.tuple.Schema +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} class PythonTableReducerOpDesc extends PythonOperatorDescriptor { @JsonSchemaTitle("Output columns") diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/udf/python/PythonUDFOpDescV2.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/python/PythonUDFOpDescV2.scala similarity index 92% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/udf/python/PythonUDFOpDescV2.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/python/PythonUDFOpDescV2.scala index 755906b044c..ef4da06cef9 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/udf/python/PythonUDFOpDescV2.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/python/PythonUDFOpDescV2.scala @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.amber.operator.udf.python +package org.apache.texera.amber.operator.udf.python import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.google.common.base.Preconditions import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.core.executor.OpExecWithCode -import org.apache.amber.core.tuple.{Attribute, Schema} -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow._ -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import org.apache.amber.operator.{LogicalOp, PortDescription, StateTransferFunc} +import org.apache.texera.amber.core.executor.OpExecWithCode +import org.apache.texera.amber.core.tuple.{Attribute, Schema} +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow._ +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.operator.{LogicalOp, PortDescription, StateTransferFunc} import scala.util.{Success, Try} diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/udf/python/source/PythonUDFSourceOpDescV2.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/python/source/PythonUDFSourceOpDescV2.scala similarity index 85% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/udf/python/source/PythonUDFSourceOpDescV2.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/python/source/PythonUDFSourceOpDescV2.scala index 9e94b75b1e3..b575612d884 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/udf/python/source/PythonUDFSourceOpDescV2.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/python/source/PythonUDFSourceOpDescV2.scala @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.amber.operator.udf.python.source +package org.apache.texera.amber.operator.udf.python.source import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.core.executor.OpExecWithCode -import org.apache.amber.core.tuple.{Attribute, Schema} -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow.{OutputPort, PhysicalOp, SchemaPropagationFunc} -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import org.apache.amber.operator.source.SourceOperatorDescriptor +import org.apache.texera.amber.core.executor.OpExecWithCode +import org.apache.texera.amber.core.tuple.{Attribute, Schema} +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow.{OutputPort, PhysicalOp, SchemaPropagationFunc} +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.operator.source.SourceOperatorDescriptor class PythonUDFSourceOpDescV2 extends SourceOperatorDescriptor { diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/udf/r/RUDFOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/r/RUDFOpDesc.scala similarity index 92% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/udf/r/RUDFOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/r/RUDFOpDesc.scala index 97acc954a08..8a84c99a195 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/udf/r/RUDFOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/r/RUDFOpDesc.scala @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.amber.operator.udf.r +package org.apache.texera.amber.operator.udf.r import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.google.common.base.Preconditions import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.core.executor.OpExecWithCode -import org.apache.amber.core.tuple.{Attribute, Schema} -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow._ -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import org.apache.amber.operator.{LogicalOp, PortDescription, StateTransferFunc} +import org.apache.texera.amber.core.executor.OpExecWithCode +import org.apache.texera.amber.core.tuple.{Attribute, Schema} +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow._ +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.operator.{LogicalOp, PortDescription, StateTransferFunc} import scala.util.{Success, Try} diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/udf/r/RUDFSourceOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/r/RUDFSourceOpDesc.scala similarity index 86% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/udf/r/RUDFSourceOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/r/RUDFSourceOpDesc.scala index 8a893c85261..6df89a9a0f6 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/udf/r/RUDFSourceOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/udf/r/RUDFSourceOpDesc.scala @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.amber.operator.udf.r +package org.apache.texera.amber.operator.udf.r import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.core.executor.OpExecWithCode -import org.apache.amber.core.tuple.{Attribute, Schema} -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow.{OutputPort, PhysicalOp, SchemaPropagationFunc} -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import org.apache.amber.operator.source.SourceOperatorDescriptor +import org.apache.texera.amber.core.executor.OpExecWithCode +import org.apache.texera.amber.core.tuple.{Attribute, Schema} +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow.{OutputPort, PhysicalOp, SchemaPropagationFunc} +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.operator.source.SourceOperatorDescriptor class RUDFSourceOpDesc extends SourceOperatorDescriptor { diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/union/UnionOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/union/UnionOpDesc.scala similarity index 74% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/union/UnionOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/union/UnionOpDesc.scala index ffc9e2dcb46..a10a4e43004 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/union/UnionOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/union/UnionOpDesc.scala @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.amber.operator.union +package org.apache.texera.amber.operator.union -import org.apache.amber.core.executor.OpExecWithClassName -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow.{InputPort, OutputPort, PhysicalOp, PortIdentity} -import org.apache.amber.operator.LogicalOp -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.executor.OpExecWithClassName +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PhysicalOp, PortIdentity} +import org.apache.texera.amber.operator.LogicalOp +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} class UnionOpDesc extends LogicalOp { @@ -36,7 +36,7 @@ class UnionOpDesc extends LogicalOp { workflowId, executionId, operatorIdentifier, - OpExecWithClassName("org.apache.amber.operator.union.UnionOpExec") + OpExecWithClassName("org.apache.texera.amber.operator.union.UnionOpExec") ) .withInputPorts(operatorInfo.inputPorts) .withOutputPorts(operatorInfo.outputPorts) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/union/UnionOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/union/UnionOpExec.scala similarity index 84% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/union/UnionOpExec.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/union/UnionOpExec.scala index 3b85d3058f0..aa9d585c46c 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/union/UnionOpExec.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/union/UnionOpExec.scala @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.amber.operator.union +package org.apache.texera.amber.operator.union -import org.apache.amber.core.executor.OperatorExecutor -import org.apache.amber.core.tuple.{Tuple, TupleLike} +import org.apache.texera.amber.core.executor.OperatorExecutor +import org.apache.texera.amber.core.tuple.{Tuple, TupleLike} class UnionOpExec extends OperatorExecutor { override def processTuple(tuple: Tuple, port: Int): Iterator[TupleLike] = { diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/unneststring/UnnestStringOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/unneststring/UnnestStringOpDesc.scala similarity index 78% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/unneststring/UnnestStringOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/unneststring/UnnestStringOpDesc.scala index 86995d2f260..ef742de3ae4 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/unneststring/UnnestStringOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/unneststring/UnnestStringOpDesc.scala @@ -17,17 +17,22 @@ * under the License. */ -package org.apache.amber.operator.unneststring +package org.apache.texera.amber.operator.unneststring import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} -import org.apache.amber.core.executor.OpExecWithClassName -import org.apache.amber.core.tuple.AttributeType -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow.{InputPort, OutputPort, PhysicalOp, SchemaPropagationFunc} -import org.apache.amber.operator.flatmap.FlatMapOpDesc -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.OpExecWithClassName +import org.apache.texera.amber.core.tuple.AttributeType +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow.{ + InputPort, + OutputPort, + PhysicalOp, + SchemaPropagationFunc +} +import org.apache.texera.amber.operator.flatmap.FlatMapOpDesc +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.util.JSONUtils.objectMapper class UnnestStringOpDesc extends FlatMapOpDesc { @JsonProperty(value = "Delimiter", required = true, defaultValue = ",") @@ -63,7 +68,7 @@ class UnnestStringOpDesc extends FlatMapOpDesc { executionId, operatorIdentifier, OpExecWithClassName( - "org.apache.amber.operator.unneststring.UnnestStringOpExec", + "org.apache.texera.amber.operator.unneststring.UnnestStringOpExec", objectMapper.writeValueAsString(this) ) ) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/unneststring/UnnestStringOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/unneststring/UnnestStringOpExec.scala similarity index 84% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/unneststring/UnnestStringOpExec.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/unneststring/UnnestStringOpExec.scala index 5a1ede28a86..1e59968217b 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/unneststring/UnnestStringOpExec.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/unneststring/UnnestStringOpExec.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.operator.unneststring +package org.apache.texera.amber.operator.unneststring -import org.apache.amber.core.tuple.{Tuple, TupleLike} -import org.apache.amber.operator.flatmap.FlatMapOpExec -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.tuple.{Tuple, TupleLike} +import org.apache.texera.amber.operator.flatmap.FlatMapOpExec +import org.apache.texera.amber.util.JSONUtils.objectMapper class UnnestStringOpExec(descString: String) extends FlatMapOpExec { private val desc: UnnestStringOpDesc = diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/util/OperatorDescriptorUtils.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/util/OperatorDescriptorUtils.scala similarity index 97% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/util/OperatorDescriptorUtils.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/util/OperatorDescriptorUtils.scala index efb0bb3ce79..3a9e71f8323 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/util/OperatorDescriptorUtils.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/util/OperatorDescriptorUtils.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.util +package org.apache.texera.amber.operator.util import scala.collection.mutable import scala.jdk.CollectionConverters._ diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/DotPlot/DotPlotOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/DotPlot/DotPlotOpDesc.scala similarity index 88% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/DotPlot/DotPlotOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/DotPlot/DotPlotOpDesc.scala index 3e7484e72a5..bf2e152c79d 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/DotPlot/DotPlotOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/DotPlot/DotPlotOpDesc.scala @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.amber.operator.visualization.DotPlot +package org.apache.texera.amber.operator.visualization.DotPlot import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.workflow.OutputPort.OutputMode -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.workflow.OutputPort.OutputMode +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import javax.validation.constraints.NotNull diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/IcicleChart/IcicleChartOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/IcicleChart/IcicleChartOpDesc.scala similarity index 88% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/IcicleChart/IcicleChartOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/IcicleChart/IcicleChartOpDesc.scala index 45181fe40e8..7705194685a 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/IcicleChart/IcicleChartOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/IcicleChart/IcicleChartOpDesc.scala @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.amber.operator.visualization.IcicleChart +package org.apache.texera.amber.operator.visualization.IcicleChart import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.workflow.OutputPort.OutputMode -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import org.apache.amber.operator.visualization.hierarchychart.HierarchySection +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.workflow.OutputPort.OutputMode +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.operator.visualization.hierarchychart.HierarchySection import javax.validation.constraints.{NotEmpty, NotNull} diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/ImageUtility.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/ImageUtility.scala similarity index 96% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/ImageUtility.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/ImageUtility.scala index 45947796ce3..50dc8e2f544 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/ImageUtility.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/ImageUtility.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.visualization +package org.apache.texera.amber.operator.visualization object ImageUtility { def encodeImageToHTML(): String = { diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/ImageViz/ImageVisualizerOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/ImageViz/ImageVisualizerOpDesc.scala similarity index 87% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/ImageViz/ImageVisualizerOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/ImageViz/ImageVisualizerOpDesc.scala index c96b2e6841d..2f1b9a5e970 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/ImageViz/ImageVisualizerOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/ImageViz/ImageVisualizerOpDesc.scala @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.amber.operator.visualization.ImageViz +package org.apache.texera.amber.operator.visualization.ImageViz import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.workflow.OutputPort.OutputMode -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.workflow.OutputPort.OutputMode +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} class ImageVisualizerOpDesc extends PythonOperatorDescriptor { @JsonProperty(required = true) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/ScatterMatrixChart/ScatterMatrixChartOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/ScatterMatrixChart/ScatterMatrixChartOpDesc.scala similarity index 87% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/ScatterMatrixChart/ScatterMatrixChartOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/ScatterMatrixChart/ScatterMatrixChartOpDesc.scala index 3d22bd1666b..bcb159a8119 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/ScatterMatrixChart/ScatterMatrixChartOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/ScatterMatrixChart/ScatterMatrixChartOpDesc.scala @@ -17,19 +17,19 @@ * under the License. */ -package org.apache.amber.operator.visualization.ScatterMatrixChart +package org.apache.texera.amber.operator.visualization.ScatterMatrixChart import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.workflow.OutputPort.OutputMode -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.annotations.{ +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.workflow.OutputPort.OutputMode +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.annotations.{ AutofillAttributeName, AutofillAttributeNameList } -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} @JsonSchemaInject(json = """ { "attributeTypeRules": { diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/barChart/BarChartOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/barChart/BarChartOpDesc.scala similarity index 91% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/barChart/BarChartOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/barChart/BarChartOpDesc.scala index 56e0fd4a5d7..c2a8740c30e 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/barChart/BarChartOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/barChart/BarChartOpDesc.scala @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.amber.operator.visualization.barChart +package org.apache.texera.amber.operator.visualization.barChart import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.workflow.OutputPort.OutputMode -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.workflow.OutputPort.OutputMode +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import javax.validation.constraints.NotNull diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/boxViolinPlot/BoxViolinPlotOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/boxViolinPlot/BoxViolinPlotOpDesc.scala similarity index 91% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/boxViolinPlot/BoxViolinPlotOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/boxViolinPlot/BoxViolinPlotOpDesc.scala index 5674b2e7e5b..5f57f17937c 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/boxViolinPlot/BoxViolinPlotOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/boxViolinPlot/BoxViolinPlotOpDesc.scala @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.amber.operator.visualization.boxViolinPlot +package org.apache.texera.amber.operator.visualization.boxViolinPlot import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription, JsonPropertyOrder} import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.workflow.OutputPort.OutputMode -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.workflow.OutputPort.OutputMode +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} @JsonPropertyOrder(Array("value", "quartileType", "horizontalOrientation", "violinPlot")) @JsonSchemaInject(json = """ diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/boxViolinPlot/BoxViolinPlotQuartileFunction.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/boxViolinPlot/BoxViolinPlotQuartileFunction.java similarity index 94% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/boxViolinPlot/BoxViolinPlotQuartileFunction.java rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/boxViolinPlot/BoxViolinPlotQuartileFunction.java index 19674cfa8b2..d427508ef3f 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/boxViolinPlot/BoxViolinPlotQuartileFunction.java +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/boxViolinPlot/BoxViolinPlotQuartileFunction.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.visualization.boxViolinPlot; +package org.apache.texera.amber.operator.visualization.boxViolinPlot; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/bubbleChart/BubbleChartOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/bubbleChart/BubbleChartOpDesc.scala similarity index 91% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/bubbleChart/BubbleChartOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/bubbleChart/BubbleChartOpDesc.scala index 7fb181ccda9..3b95d95158a 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/bubbleChart/BubbleChartOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/bubbleChart/BubbleChartOpDesc.scala @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.amber.operator.visualization.bubbleChart +package org.apache.texera.amber.operator.visualization.bubbleChart import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.workflow.OutputPort.OutputMode -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.workflow.OutputPort.OutputMode +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import javax.validation.constraints.NotNull diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/bulletChart/BulletChartOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/bulletChart/BulletChartOpDesc.scala similarity index 95% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/bulletChart/BulletChartOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/bulletChart/BulletChartOpDesc.scala index 0d100cd8098..93bb11db4b2 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/bulletChart/BulletChartOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/bulletChart/BulletChartOpDesc.scala @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.amber.operator.visualization.bulletChart +package org.apache.texera.amber.operator.visualization.bulletChart import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.workflow.OutputPort.OutputMode -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.workflow.OutputPort.OutputMode +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import java.util.{ArrayList, List => JList} import scala.jdk.CollectionConverters._ diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/bulletChart/BulletChartStepDefinition.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/bulletChart/BulletChartStepDefinition.scala similarity index 94% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/bulletChart/BulletChartStepDefinition.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/bulletChart/BulletChartStepDefinition.scala index 3c3c178a254..0fdc9989928 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/bulletChart/BulletChartStepDefinition.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/bulletChart/BulletChartStepDefinition.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.visualization.bulletChart +package org.apache.texera.amber.operator.visualization.bulletChart import com.fasterxml.jackson.annotation.{JsonCreator, JsonProperty} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/candlestickChart/CandlestickChartOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/candlestickChart/CandlestickChartOpDesc.scala similarity index 87% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/candlestickChart/CandlestickChartOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/candlestickChart/CandlestickChartOpDesc.scala index 7d01df93aa1..62156031213 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/candlestickChart/CandlestickChartOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/candlestickChart/CandlestickChartOpDesc.scala @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.amber.operator.visualization.candlestickChart +package org.apache.texera.amber.operator.visualization.candlestickChart import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.workflow.OutputPort.OutputMode -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.workflow.OutputPort.OutputMode +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} class CandlestickChartOpDesc extends PythonOperatorDescriptor { diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/choroplethMap/ChoroplethMapOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/choroplethMap/ChoroplethMapOpDesc.scala similarity index 89% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/choroplethMap/ChoroplethMapOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/choroplethMap/ChoroplethMapOpDesc.scala index 91c51023291..629739dcd15 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/choroplethMap/ChoroplethMapOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/choroplethMap/ChoroplethMapOpDesc.scala @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.amber.operator.visualization.choroplethMap +package org.apache.texera.amber.operator.visualization.choroplethMap import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.workflow.OutputPort.OutputMode -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.workflow.OutputPort.OutputMode +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} @JsonSchemaInject(json = """ { diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/continuousErrorBands/BandConfig.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/continuousErrorBands/BandConfig.scala similarity index 86% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/continuousErrorBands/BandConfig.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/continuousErrorBands/BandConfig.scala index b9cf852ca73..c4ae7f7ae02 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/continuousErrorBands/BandConfig.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/continuousErrorBands/BandConfig.scala @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.amber.operator.visualization.continuousErrorBands +package org.apache.texera.amber.operator.visualization.continuousErrorBands import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName -import org.apache.amber.operator.visualization.lineChart.LineConfig +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.visualization.lineChart.LineConfig class BandConfig extends LineConfig { diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/continuousErrorBands/ContinuousErrorBandsOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/continuousErrorBands/ContinuousErrorBandsOpDesc.scala similarity index 92% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/continuousErrorBands/ContinuousErrorBandsOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/continuousErrorBands/ContinuousErrorBandsOpDesc.scala index 8f019039a8c..dd343ca5f68 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/continuousErrorBands/ContinuousErrorBandsOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/continuousErrorBands/ContinuousErrorBandsOpDesc.scala @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.amber.operator.visualization.continuousErrorBands +package org.apache.texera.amber.operator.visualization.continuousErrorBands import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.workflow.OutputPort.OutputMode -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.workflow.OutputPort.OutputMode +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import java.util import scala.jdk.CollectionConverters.ListHasAsScala diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/contourPlot/ContourPlotColoringFunction.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/contourPlot/ContourPlotColoringFunction.java similarity index 94% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/contourPlot/ContourPlotColoringFunction.java rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/contourPlot/ContourPlotColoringFunction.java index 0361efd0760..f16547964fd 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/contourPlot/ContourPlotColoringFunction.java +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/contourPlot/ContourPlotColoringFunction.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.visualization.contourPlot; +package org.apache.texera.amber.operator.visualization.contourPlot; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/contourPlot/ContourPlotOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/contourPlot/ContourPlotOpDesc.scala similarity index 89% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/contourPlot/ContourPlotOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/contourPlot/ContourPlotOpDesc.scala index 474dd47d921..3c77dd4e044 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/contourPlot/ContourPlotOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/contourPlot/ContourPlotOpDesc.scala @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.amber.operator.visualization.contourPlot +package org.apache.texera.amber.operator.visualization.contourPlot import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.workflow.OutputPort.OutputMode -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.workflow.OutputPort.OutputMode +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} class ContourPlotOpDesc extends PythonOperatorDescriptor { diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/dendrogram/DendrogramOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/dendrogram/DendrogramOpDesc.scala similarity index 89% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/dendrogram/DendrogramOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/dendrogram/DendrogramOpDesc.scala index f22e133d49f..4cb31e76746 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/dendrogram/DendrogramOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/dendrogram/DendrogramOpDesc.scala @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.amber.operator.visualization.dendrogram +package org.apache.texera.amber.operator.visualization.dendrogram import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.workflow.OutputPort.OutputMode -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.workflow.OutputPort.OutputMode +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} class DendrogramOpDesc extends PythonOperatorDescriptor { @JsonProperty(value = "xVal", required = true) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/dumbbellPlot/DumbbellDotConfig.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/dumbbellPlot/DumbbellDotConfig.scala similarity index 90% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/dumbbellPlot/DumbbellDotConfig.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/dumbbellPlot/DumbbellDotConfig.scala index ba7bb2013d1..13a803debbf 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/dumbbellPlot/DumbbellDotConfig.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/dumbbellPlot/DumbbellDotConfig.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.operator.visualization.dumbbellPlot +package org.apache.texera.amber.operator.visualization.dumbbellPlot import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName import javax.validation.constraints.NotNull diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/dumbbellPlot/DumbbellPlotOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/dumbbellPlot/DumbbellPlotOpDesc.scala similarity index 93% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/dumbbellPlot/DumbbellPlotOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/dumbbellPlot/DumbbellPlotOpDesc.scala index ed946f99006..ac49336c0a9 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/dumbbellPlot/DumbbellPlotOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/dumbbellPlot/DumbbellPlotOpDesc.scala @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.amber.operator.visualization.dumbbellPlot +package org.apache.texera.amber.operator.visualization.dumbbellPlot import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.workflow.OutputPort.OutputMode -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.workflow.OutputPort.OutputMode +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import java.util import javax.validation.constraints.{NotBlank, NotNull} diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/figureFactoryTable/FigureFactoryTableConfig.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/figureFactoryTable/FigureFactoryTableConfig.scala similarity index 87% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/figureFactoryTable/FigureFactoryTableConfig.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/figureFactoryTable/FigureFactoryTableConfig.scala index 1c5d2cc43e0..f8d5f0dd354 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/figureFactoryTable/FigureFactoryTableConfig.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/figureFactoryTable/FigureFactoryTableConfig.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.operator.visualization.figureFactoryTable +package org.apache.texera.amber.operator.visualization.figureFactoryTable import com.fasterxml.jackson.annotation.JsonProperty import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName class FigureFactoryTableConfig { @JsonProperty(required = true) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/figureFactoryTable/FigureFactoryTableOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/figureFactoryTable/FigureFactoryTableOpDesc.scala similarity index 91% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/figureFactoryTable/FigureFactoryTableOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/figureFactoryTable/FigureFactoryTableOpDesc.scala index fe73759fce9..15d79e327da 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/figureFactoryTable/FigureFactoryTableOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/figureFactoryTable/FigureFactoryTableOpDesc.scala @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.amber.operator.visualization.figureFactoryTable +package org.apache.texera.amber.operator.visualization.figureFactoryTable import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.workflow.OutputPort.OutputMode -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.workflow.OutputPort.OutputMode +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} class FigureFactoryTableOpDesc extends PythonOperatorDescriptor { @JsonProperty(required = false) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/filledAreaPlot/FilledAreaPlotOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/filledAreaPlot/FilledAreaPlotOpDesc.scala similarity index 92% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/filledAreaPlot/FilledAreaPlotOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/filledAreaPlot/FilledAreaPlotOpDesc.scala index 91891efa28c..f8e54a93f0e 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/filledAreaPlot/FilledAreaPlotOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/filledAreaPlot/FilledAreaPlotOpDesc.scala @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.amber.operator.visualization.filledAreaPlot +package org.apache.texera.amber.operator.visualization.filledAreaPlot import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.workflow.OutputPort.OutputMode -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.workflow.OutputPort.OutputMode +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import javax.validation.constraints.NotNull diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/funnelPlot/FunnelPlotOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/funnelPlot/FunnelPlotOpDesc.scala similarity index 88% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/funnelPlot/FunnelPlotOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/funnelPlot/FunnelPlotOpDesc.scala index bf04f07dccd..61ff4ddd393 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/funnelPlot/FunnelPlotOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/funnelPlot/FunnelPlotOpDesc.scala @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.amber.operator.visualization.funnelPlot +package org.apache.texera.amber.operator.visualization.funnelPlot import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.workflow.OutputPort.OutputMode -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.workflow.OutputPort.OutputMode +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} @JsonSchemaInject(json = """ { "attributeTypeRules": { diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/ganttChart/GanttChartOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/ganttChart/GanttChartOpDesc.scala similarity index 91% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/ganttChart/GanttChartOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/ganttChart/GanttChartOpDesc.scala index 3a9602660e0..3be1ae9fa55 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/ganttChart/GanttChartOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/ganttChart/GanttChartOpDesc.scala @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.amber.operator.visualization.ganttChart +package org.apache.texera.amber.operator.visualization.ganttChart import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.workflow.OutputPort.OutputMode -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.workflow.OutputPort.OutputMode +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import javax.validation.constraints.NotNull diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/gaugeChart/GaugeChartOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/gaugeChart/GaugeChartOpDesc.scala similarity index 94% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/gaugeChart/GaugeChartOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/gaugeChart/GaugeChartOpDesc.scala index 228a854c764..fdc48ccc2a3 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/gaugeChart/GaugeChartOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/gaugeChart/GaugeChartOpDesc.scala @@ -16,18 +16,18 @@ * limitations under the License. */ -package org.apache.amber.operator.visualization.gaugeChart +package org.apache.texera.amber.operator.visualization.gaugeChart import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.module.scala.DefaultScalaModule import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.workflow.OutputPort.OutputMode -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.workflow.OutputPort.OutputMode +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} class GaugeChartOpDesc extends PythonOperatorDescriptor { @JsonProperty(value = "value", required = true) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/gaugeChart/GaugeChartSteps.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/gaugeChart/GaugeChartSteps.scala similarity index 94% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/gaugeChart/GaugeChartSteps.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/gaugeChart/GaugeChartSteps.scala index 972c6ebed76..78f407af37e 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/gaugeChart/GaugeChartSteps.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/gaugeChart/GaugeChartSteps.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.amber.operator.visualization.gaugeChart +package org.apache.texera.amber.operator.visualization.gaugeChart import com.fasterxml.jackson.annotation.JsonProperty import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/heatMap/HeatMapOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/heatMap/HeatMapOpDesc.scala similarity index 87% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/heatMap/HeatMapOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/heatMap/HeatMapOpDesc.scala index 873a080f326..f66730090e7 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/heatMap/HeatMapOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/heatMap/HeatMapOpDesc.scala @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.amber.operator.visualization.heatMap +package org.apache.texera.amber.operator.visualization.heatMap import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.workflow.OutputPort.OutputMode -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.workflow.OutputPort.OutputMode +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} class HeatMapOpDesc extends PythonOperatorDescriptor { @JsonProperty(value = "x", required = true) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/hierarchychart/HierarchyChartOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/hierarchychart/HierarchyChartOpDesc.scala similarity index 90% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/hierarchychart/HierarchyChartOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/hierarchychart/HierarchyChartOpDesc.scala index 7f3f0eb3324..5b42935307c 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/hierarchychart/HierarchyChartOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/hierarchychart/HierarchyChartOpDesc.scala @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.amber.operator.visualization.hierarchychart +package org.apache.texera.amber.operator.visualization.hierarchychart import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.workflow.OutputPort.OutputMode -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.workflow.OutputPort.OutputMode +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import javax.validation.constraints.{NotEmpty, NotNull} diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/hierarchychart/HierarchyChartType.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/hierarchychart/HierarchyChartType.java similarity index 94% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/hierarchychart/HierarchyChartType.java rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/hierarchychart/HierarchyChartType.java index 17735aa9cf8..91a28d3f54d 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/hierarchychart/HierarchyChartType.java +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/hierarchychart/HierarchyChartType.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.visualization.hierarchychart; +package org.apache.texera.amber.operator.visualization.hierarchychart; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/hierarchychart/HierarchySection.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/hierarchychart/HierarchySection.scala similarity index 89% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/hierarchychart/HierarchySection.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/hierarchychart/HierarchySection.scala index a7b721920bc..9d8946f7b1d 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/hierarchychart/HierarchySection.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/hierarchychart/HierarchySection.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.operator.visualization.hierarchychart +package org.apache.texera.amber.operator.visualization.hierarchychart import com.fasterxml.jackson.annotation.JsonProperty import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName import javax.validation.constraints.NotNull diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/histogram/HistogramChartOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/histogram/HistogramChartOpDesc.scala similarity index 89% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/histogram/HistogramChartOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/histogram/HistogramChartOpDesc.scala index 5de483b4a39..8e3ac2c3793 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/histogram/HistogramChartOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/histogram/HistogramChartOpDesc.scala @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.amber.operator.visualization.histogram +package org.apache.texera.amber.operator.visualization.histogram import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.workflow.OutputPort.OutputMode -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.workflow.OutputPort.OutputMode +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} class HistogramChartOpDesc extends PythonOperatorDescriptor { @JsonProperty(value = "value", required = true) @JsonSchemaTitle("Value Column") diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/histogram2d/Histogram2DOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/histogram2d/Histogram2DOpDesc.scala similarity index 88% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/histogram2d/Histogram2DOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/histogram2d/Histogram2DOpDesc.scala index e974ade6402..1068b5e8fa8 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/histogram2d/Histogram2DOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/histogram2d/Histogram2DOpDesc.scala @@ -16,16 +16,16 @@ * limitations under the License. */ -package org.apache.amber.operator.visualization.histogram2d +package org.apache.texera.amber.operator.visualization.histogram2d import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.workflow.OutputPort.OutputMode -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.workflow.OutputPort.OutputMode +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} class Histogram2DOpDesc extends PythonOperatorDescriptor { diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/histogram2d/NormalizationType.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/histogram2d/NormalizationType.java similarity index 94% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/histogram2d/NormalizationType.java rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/histogram2d/NormalizationType.java index be5bc986b1e..62d670ba4e7 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/histogram2d/NormalizationType.java +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/histogram2d/NormalizationType.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.amber.operator.visualization.histogram2d; +package org.apache.texera.amber.operator.visualization.histogram2d; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/htmlviz/HtmlVizOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/htmlviz/HtmlVizOpDesc.scala similarity index 72% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/htmlviz/HtmlVizOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/htmlviz/HtmlVizOpDesc.scala index 8eddc4bf415..f5b9bb81e7c 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/htmlviz/HtmlVizOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/htmlviz/HtmlVizOpDesc.scala @@ -17,19 +17,24 @@ * under the License. */ -package org.apache.amber.operator.visualization.htmlviz +package org.apache.texera.amber.operator.visualization.htmlviz import com.fasterxml.jackson.annotation.JsonProperty import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.core.executor.OpExecWithClassName -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow.OutputPort.OutputMode -import org.apache.amber.core.workflow.{InputPort, OutputPort, PhysicalOp, SchemaPropagationFunc} -import org.apache.amber.operator.LogicalOp -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.OpExecWithClassName +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow.OutputPort.OutputMode +import org.apache.texera.amber.core.workflow.{ + InputPort, + OutputPort, + PhysicalOp, + SchemaPropagationFunc +} +import org.apache.texera.amber.operator.LogicalOp +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.util.JSONUtils.objectMapper /** * HTML Visualization operator to render any given HTML code @@ -50,7 +55,7 @@ class HtmlVizOpDesc extends LogicalOp { executionId, operatorIdentifier, OpExecWithClassName( - "org.apache.amber.operator.visualization.htmlviz.HtmlVizOpExec", + "org.apache.texera.amber.operator.visualization.htmlviz.HtmlVizOpExec", objectMapper.writeValueAsString(this) ) ) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/htmlviz/HtmlVizOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/htmlviz/HtmlVizOpExec.scala similarity index 82% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/htmlviz/HtmlVizOpExec.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/htmlviz/HtmlVizOpExec.scala index 98384054552..d9d8135cb51 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/htmlviz/HtmlVizOpExec.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/htmlviz/HtmlVizOpExec.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.operator.visualization.htmlviz +package org.apache.texera.amber.operator.visualization.htmlviz -import org.apache.amber.core.executor.OperatorExecutor -import org.apache.amber.core.tuple.{Tuple, TupleLike} -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.OperatorExecutor +import org.apache.texera.amber.core.tuple.{Tuple, TupleLike} +import org.apache.texera.amber.util.JSONUtils.objectMapper /** * HTML Visualization operator to render any given HTML code diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/lineChart/LineChartOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/lineChart/LineChartOpDesc.scala similarity index 90% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/lineChart/LineChartOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/lineChart/LineChartOpDesc.scala index 715393855f2..90613e855e4 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/lineChart/LineChartOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/lineChart/LineChartOpDesc.scala @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.amber.operator.visualization.lineChart +package org.apache.texera.amber.operator.visualization.lineChart import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.workflow.OutputPort.OutputMode -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.workflow.OutputPort.OutputMode +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import java.util import scala.jdk.CollectionConverters.ListHasAsScala diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/lineChart/LineConfig.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/lineChart/LineConfig.scala similarity index 93% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/lineChart/LineConfig.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/lineChart/LineConfig.scala index fcf109d5a39..46eb19004d2 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/lineChart/LineConfig.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/lineChart/LineConfig.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.operator.visualization.lineChart +package org.apache.texera.amber.operator.visualization.lineChart import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName import javax.validation.constraints.NotNull diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/lineChart/LineMode.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/lineChart/LineMode.java similarity index 96% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/lineChart/LineMode.java rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/lineChart/LineMode.java index 76cb503785f..ba21a5d7f25 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/lineChart/LineMode.java +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/lineChart/LineMode.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.visualization.lineChart; +package org.apache.texera.amber.operator.visualization.lineChart; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/nestedTable/NestedTableConfig.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/nestedTable/NestedTableConfig.scala similarity index 89% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/nestedTable/NestedTableConfig.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/nestedTable/NestedTableConfig.scala index 7195d07fdee..832346a3790 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/nestedTable/NestedTableConfig.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/nestedTable/NestedTableConfig.scala @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.amber.operator.visualization.nestedTable +package org.apache.texera.amber.operator.visualization.nestedTable import com.fasterxml.jackson.annotation.JsonProperty import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName class NestedTableConfig { @JsonProperty(required = true) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/nestedTable/NestedTableOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/nestedTable/NestedTableOpDesc.scala similarity index 92% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/nestedTable/NestedTableOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/nestedTable/NestedTableOpDesc.scala index c3b418ed21c..f27face37d3 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/nestedTable/NestedTableOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/nestedTable/NestedTableOpDesc.scala @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.amber.operator.visualization.nestedTable +package org.apache.texera.amber.operator.visualization.nestedTable import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.workflow.OutputPort.OutputMode -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.workflow.OutputPort.OutputMode +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import java.util import scala.jdk.CollectionConverters.ListHasAsScala diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/networkGraph/NetworkGraphOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/networkGraph/NetworkGraphOpDesc.scala similarity index 93% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/networkGraph/NetworkGraphOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/networkGraph/NetworkGraphOpDesc.scala index e6008b01382..16537e5d944 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/networkGraph/NetworkGraphOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/networkGraph/NetworkGraphOpDesc.scala @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.amber.operator.visualization.networkGraph +package org.apache.texera.amber.operator.visualization.networkGraph import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.workflow.OutputPort.OutputMode -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.workflow.OutputPort.OutputMode +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} class NetworkGraphOpDesc extends PythonOperatorDescriptor { @JsonProperty(required = true) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/pieChart/PieChartOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/pieChart/PieChartOpDesc.scala similarity index 89% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/pieChart/PieChartOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/pieChart/PieChartOpDesc.scala index ed94c2b202c..444987eebf6 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/pieChart/PieChartOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/pieChart/PieChartOpDesc.scala @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.amber.operator.visualization.pieChart +package org.apache.texera.amber.operator.visualization.pieChart import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.workflow.OutputPort.OutputMode -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.workflow.OutputPort.OutputMode +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import javax.validation.constraints.NotNull diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/quiverPlot/QuiverPlotOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/quiverPlot/QuiverPlotOpDesc.scala similarity index 90% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/quiverPlot/QuiverPlotOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/quiverPlot/QuiverPlotOpDesc.scala index d55a4d33d4a..4eaf9a35ca6 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/quiverPlot/QuiverPlotOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/quiverPlot/QuiverPlotOpDesc.scala @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.amber.operator.visualization.quiverPlot +package org.apache.texera.amber.operator.visualization.quiverPlot import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.workflow.OutputPort.OutputMode -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.workflow.OutputPort.OutputMode +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} @JsonSchemaInject(json = """ { diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/rangeSlider/RangeSliderHandleDuplicateFunction.java b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/rangeSlider/RangeSliderHandleDuplicateFunction.java similarity index 95% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/rangeSlider/RangeSliderHandleDuplicateFunction.java rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/rangeSlider/RangeSliderHandleDuplicateFunction.java index 3e5cf3abee8..b1dc6e8444d 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/rangeSlider/RangeSliderHandleDuplicateFunction.java +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/rangeSlider/RangeSliderHandleDuplicateFunction.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.visualization.rangeSlider; +package org.apache.texera.amber.operator.visualization.rangeSlider; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/rangeSlider/RangeSliderOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/rangeSlider/RangeSliderOpDesc.scala similarity index 90% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/rangeSlider/RangeSliderOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/rangeSlider/RangeSliderOpDesc.scala index 6e8966f3ad5..b0691ccdbd6 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/rangeSlider/RangeSliderOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/rangeSlider/RangeSliderOpDesc.scala @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.amber.operator.visualization.rangeSlider +package org.apache.texera.amber.operator.visualization.rangeSlider import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.workflow.OutputPort.OutputMode -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.workflow.OutputPort.OutputMode +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import javax.validation.constraints.NotNull diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/sankeyDiagram/SankeyDiagramOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/sankeyDiagram/SankeyDiagramOpDesc.scala similarity index 91% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/sankeyDiagram/SankeyDiagramOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/sankeyDiagram/SankeyDiagramOpDesc.scala index 1dbab51c345..76d089d345f 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/sankeyDiagram/SankeyDiagramOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/sankeyDiagram/SankeyDiagramOpDesc.scala @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.amber.operator.visualization.sankeyDiagram +package org.apache.texera.amber.operator.visualization.sankeyDiagram import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.workflow.OutputPort.OutputMode -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.workflow.OutputPort.OutputMode +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import javax.validation.constraints.NotNull diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/scatter3DChart/Scatter3dChartOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/scatter3DChart/Scatter3dChartOpDesc.scala similarity index 89% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/scatter3DChart/Scatter3dChartOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/scatter3DChart/Scatter3dChartOpDesc.scala index ecba7e4a739..f81e2b654a8 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/scatter3DChart/Scatter3dChartOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/scatter3DChart/Scatter3dChartOpDesc.scala @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.amber.operator.visualization.scatter3DChart +package org.apache.texera.amber.operator.visualization.scatter3DChart import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.workflow.OutputPort.OutputMode -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.workflow.OutputPort.OutputMode +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} @JsonSchemaInject(json = """ { "attributeTypeRules": { diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/scatterplot/ScatterplotOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/scatterplot/ScatterplotOpDesc.scala similarity index 91% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/scatterplot/ScatterplotOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/scatterplot/ScatterplotOpDesc.scala index 6549cd911ac..ffdbb2b8cc3 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/scatterplot/ScatterplotOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/scatterplot/ScatterplotOpDesc.scala @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.amber.operator.visualization.scatterplot +package org.apache.texera.amber.operator.visualization.scatterplot import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.workflow.OutputPort.OutputMode -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.workflow.OutputPort.OutputMode +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import javax.validation.constraints.NotNull diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/stripChart/StripChartOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/stripChart/StripChartOpDesc.scala similarity index 89% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/stripChart/StripChartOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/stripChart/StripChartOpDesc.scala index 1906ce469f2..89f14b5a717 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/stripChart/StripChartOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/stripChart/StripChartOpDesc.scala @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.amber.operator.visualization.stripChart +package org.apache.texera.amber.operator.visualization.stripChart import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.workflow.OutputPort.OutputMode -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.workflow.OutputPort.OutputMode +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} class StripChartOpDesc extends PythonOperatorDescriptor { diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/tablesChart/TablesConfig.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/tablesChart/TablesConfig.scala similarity index 88% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/tablesChart/TablesConfig.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/tablesChart/TablesConfig.scala index 530cf5b53fe..fddc63b67d1 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/tablesChart/TablesConfig.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/tablesChart/TablesConfig.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.operator.visualization.tablesChart +package org.apache.texera.amber.operator.visualization.tablesChart import com.fasterxml.jackson.annotation.JsonProperty import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName import javax.validation.constraints.NotNull diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/tablesChart/TablesPlotOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/tablesChart/TablesPlotOpDesc.scala similarity index 89% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/tablesChart/TablesPlotOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/tablesChart/TablesPlotOpDesc.scala index 23fd5f7285a..b02c1b5f4fe 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/tablesChart/TablesPlotOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/tablesChart/TablesPlotOpDesc.scala @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.amber.operator.visualization.tablesChart +package org.apache.texera.amber.operator.visualization.tablesChart import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.workflow.OutputPort.OutputMode -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.workflow.OutputPort.OutputMode +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import javax.validation.constraints.NotEmpty class TablesPlotOpDesc extends PythonOperatorDescriptor { diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/ternaryPlot/TernaryPlotOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/ternaryPlot/TernaryPlotOpDesc.scala similarity index 91% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/ternaryPlot/TernaryPlotOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/ternaryPlot/TernaryPlotOpDesc.scala index 077819b45c6..ac42186fc2f 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/ternaryPlot/TernaryPlotOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/ternaryPlot/TernaryPlotOpDesc.scala @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.amber.operator.visualization.ternaryPlot +package org.apache.texera.amber.operator.visualization.ternaryPlot import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.workflow.OutputPort.OutputMode -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.workflow.OutputPort.OutputMode +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} /** * Visualization Operator for Ternary Plots. diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/treeplot/TreeplotOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/treeplot/TreeplotOpDesc.scala similarity index 93% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/treeplot/TreeplotOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/treeplot/TreeplotOpDesc.scala index cd5e661077a..8c4ef7181a0 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/treeplot/TreeplotOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/treeplot/TreeplotOpDesc.scala @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.amber.operator.visualization.treeplot +package org.apache.texera.amber.operator.visualization.treeplot import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.workflow.OutputPort.OutputMode -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.workflow.OutputPort.OutputMode +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} /** * Visualization Operator for Tree Plots. diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/urlviz/UrlVizOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/urlviz/UrlVizOpDesc.scala similarity index 73% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/urlviz/UrlVizOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/urlviz/UrlVizOpDesc.scala index d7ad5ca463a..e367cbc3012 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/urlviz/UrlVizOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/urlviz/UrlVizOpDesc.scala @@ -17,19 +17,24 @@ * under the License. */ -package org.apache.amber.operator.visualization.urlviz +package org.apache.texera.amber.operator.visualization.urlviz import com.fasterxml.jackson.annotation.JsonProperty import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} -import org.apache.amber.core.executor.OpExecWithClassName -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import org.apache.amber.core.workflow.OutputPort.OutputMode -import org.apache.amber.core.workflow.{InputPort, OutputPort, PhysicalOp, SchemaPropagationFunc} -import org.apache.amber.operator.LogicalOp -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.OpExecWithClassName +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import org.apache.texera.amber.core.workflow.OutputPort.OutputMode +import org.apache.texera.amber.core.workflow.{ + InputPort, + OutputPort, + PhysicalOp, + SchemaPropagationFunc +} +import org.apache.texera.amber.operator.LogicalOp +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.util.JSONUtils.objectMapper /** * URL Visualization operator to render any content in given URL link @@ -61,7 +66,7 @@ class UrlVizOpDesc extends LogicalOp { executionId, operatorIdentifier, OpExecWithClassName( - "org.apache.amber.operator.visualization.urlviz.UrlVizOpExec", + "org.apache.texera.amber.operator.visualization.urlviz.UrlVizOpExec", objectMapper.writeValueAsString(this) ) ) diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/urlviz/UrlVizOpExec.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/urlviz/UrlVizOpExec.scala similarity index 86% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/urlviz/UrlVizOpExec.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/urlviz/UrlVizOpExec.scala index f1b65da891b..5e5338aee36 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/urlviz/UrlVizOpExec.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/urlviz/UrlVizOpExec.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.operator.visualization.urlviz +package org.apache.texera.amber.operator.visualization.urlviz -import org.apache.amber.core.executor.OperatorExecutor -import org.apache.amber.core.tuple.{Tuple, TupleLike} -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.executor.OperatorExecutor +import org.apache.texera.amber.core.tuple.{Tuple, TupleLike} +import org.apache.texera.amber.util.JSONUtils.objectMapper /** * URL Visualization operator to render any given URL link diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/volcanoPlot/VolcanoPlotOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/volcanoPlot/VolcanoPlotOpDesc.scala similarity index 89% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/volcanoPlot/VolcanoPlotOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/volcanoPlot/VolcanoPlotOpDesc.scala index 61afeca0517..86aa6f833fb 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/volcanoPlot/VolcanoPlotOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/volcanoPlot/VolcanoPlotOpDesc.scala @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.amber.operator.visualization.volcanoPlot +package org.apache.texera.amber.operator.visualization.volcanoPlot import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.workflow.OutputPort.OutputMode -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.workflow.OutputPort.OutputMode +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} class VolcanoPlotOpDesc extends PythonOperatorDescriptor { diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/waterfallChart/WaterfallChartOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/waterfallChart/WaterfallChartOpDesc.scala similarity index 88% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/waterfallChart/WaterfallChartOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/waterfallChart/WaterfallChartOpDesc.scala index 3e387821f01..c2bb497aec4 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/waterfallChart/WaterfallChartOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/waterfallChart/WaterfallChartOpDesc.scala @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.amber.operator.visualization.waterfallChart +package org.apache.texera.amber.operator.visualization.waterfallChart import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.workflow.OutputPort.OutputMode -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.workflow.OutputPort.OutputMode +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} class WaterfallChartOpDesc extends PythonOperatorDescriptor { diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/wordCloud/WordCloudOpDesc.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/wordCloud/WordCloudOpDesc.scala similarity index 87% rename from common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/wordCloud/WordCloudOpDesc.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/wordCloud/WordCloudOpDesc.scala index e7a2a96df85..5a78978d867 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/wordCloud/WordCloudOpDesc.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/wordCloud/WordCloudOpDesc.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.visualization.wordCloud +package org.apache.texera.amber.operator.visualization.wordCloud import com.fasterxml.jackson.annotation.JsonProperty import com.kjetland.jackson.jsonSchema.annotations.{ @@ -25,13 +25,13 @@ import com.kjetland.jackson.jsonSchema.annotations.{ JsonSchemaInt, JsonSchemaTitle } -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.workflow.OutputPort.OutputMode -import org.apache.amber.core.workflow.{InputPort, OutputPort, PortIdentity} -import org.apache.amber.operator.PythonOperatorDescriptor -import org.apache.amber.operator.metadata.annotations.AutofillAttributeName -import org.apache.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import org.apache.amber.operator.visualization.ImageUtility +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.workflow.OutputPort.OutputMode +import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity} +import org.apache.texera.amber.operator.PythonOperatorDescriptor +import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName +import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} +import org.apache.texera.amber.operator.visualization.ImageUtility class WordCloudOpDesc extends PythonOperatorDescriptor { @JsonProperty(required = true) @JsonSchemaTitle("Text column") diff --git a/common/workflow-operator/src/main/scala/org/apache/amber/util/ObjectMapperUtils.scala b/common/workflow-operator/src/main/scala/org/apache/texera/amber/util/ObjectMapperUtils.scala similarity index 92% rename from common/workflow-operator/src/main/scala/org/apache/amber/util/ObjectMapperUtils.scala rename to common/workflow-operator/src/main/scala/org/apache/texera/amber/util/ObjectMapperUtils.scala index d8f8a907f8f..7d7168299a6 100644 --- a/common/workflow-operator/src/main/scala/org/apache/amber/util/ObjectMapperUtils.scala +++ b/common/workflow-operator/src/main/scala/org/apache/texera/amber/util/ObjectMapperUtils.scala @@ -16,9 +16,9 @@ * limitations under the License. */ -package org.apache.amber.util +package org.apache.texera.amber.util -import org.apache.amber.operator.metadata.OperatorMetadataGenerator +import org.apache.texera.amber.operator.metadata.OperatorMetadataGenerator object ObjectMapperUtils { diff --git a/common/workflow-operator/src/test/scala/org/apache/amber/operator/aggregate/AggregateOpSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/aggregate/AggregateOpSpec.scala similarity index 98% rename from common/workflow-operator/src/test/scala/org/apache/amber/operator/aggregate/AggregateOpSpec.scala rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/aggregate/AggregateOpSpec.scala index 9eb405d817d..e43f3398ccf 100644 --- a/common/workflow-operator/src/test/scala/org/apache/amber/operator/aggregate/AggregateOpSpec.scala +++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/aggregate/AggregateOpSpec.scala @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.amber.operator.aggregate +package org.apache.texera.amber.operator.aggregate -import org.apache.amber.core.tuple.{Attribute, AttributeType, Schema, Tuple} -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.tuple.{Attribute, AttributeType, Schema, Tuple} +import org.apache.texera.amber.util.JSONUtils.objectMapper import org.scalatest.funsuite.AnyFunSuite class AggregateOpSpec extends AnyFunSuite { diff --git a/common/workflow-operator/src/test/scala/org/apache/amber/operator/cartesianProduct/CartesianProductOpExecSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/cartesianProduct/CartesianProductOpExecSpec.scala similarity index 97% rename from common/workflow-operator/src/test/scala/org/apache/amber/operator/cartesianProduct/CartesianProductOpExecSpec.scala rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/cartesianProduct/CartesianProductOpExecSpec.scala index 5d5d94a0046..7d753ed7571 100644 --- a/common/workflow-operator/src/test/scala/org/apache/amber/operator/cartesianProduct/CartesianProductOpExecSpec.scala +++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/cartesianProduct/CartesianProductOpExecSpec.scala @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.amber.operator.cartesianProduct +package org.apache.texera.amber.operator.cartesianProduct -import org.apache.amber.core.tuple._ -import org.apache.amber.core.workflow.PortIdentity +import org.apache.texera.amber.core.tuple._ +import org.apache.texera.amber.core.workflow.PortIdentity import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec diff --git a/common/workflow-operator/src/test/scala/org/apache/amber/operator/dictionary/DictionaryMatcherOpExecSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/dictionary/DictionaryMatcherOpExecSpec.scala similarity index 97% rename from common/workflow-operator/src/test/scala/org/apache/amber/operator/dictionary/DictionaryMatcherOpExecSpec.scala rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/dictionary/DictionaryMatcherOpExecSpec.scala index e514708b45f..20a10c9ef53 100644 --- a/common/workflow-operator/src/test/scala/org/apache/amber/operator/dictionary/DictionaryMatcherOpExecSpec.scala +++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/dictionary/DictionaryMatcherOpExecSpec.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.operator.dictionary +package org.apache.texera.amber.operator.dictionary -import org.apache.amber.core.tuple._ -import org.apache.amber.core.workflow.PortIdentity -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.tuple._ +import org.apache.texera.amber.core.workflow.PortIdentity +import org.apache.texera.amber.util.JSONUtils.objectMapper import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec diff --git a/common/workflow-operator/src/test/scala/org/apache/amber/operator/difference/DifferenceOpExecSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/difference/DifferenceOpExecSpec.scala similarity index 97% rename from common/workflow-operator/src/test/scala/org/apache/amber/operator/difference/DifferenceOpExecSpec.scala rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/difference/DifferenceOpExecSpec.scala index 3913ec93928..6819ed5259c 100644 --- a/common/workflow-operator/src/test/scala/org/apache/amber/operator/difference/DifferenceOpExecSpec.scala +++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/difference/DifferenceOpExecSpec.scala @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.amber.operator.difference +package org.apache.texera.amber.operator.difference -import org.apache.amber.core.tuple._ +import org.apache.texera.amber.core.tuple._ import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec class DifferenceOpExecSpec extends AnyFlatSpec with BeforeAndAfter { diff --git a/common/workflow-operator/src/test/scala/org/apache/amber/operator/distinct/DistinctOpExecSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/distinct/DistinctOpExecSpec.scala similarity index 96% rename from common/workflow-operator/src/test/scala/org/apache/amber/operator/distinct/DistinctOpExecSpec.scala rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/distinct/DistinctOpExecSpec.scala index e84441cf4c1..18e9af46fb4 100644 --- a/common/workflow-operator/src/test/scala/org/apache/amber/operator/distinct/DistinctOpExecSpec.scala +++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/distinct/DistinctOpExecSpec.scala @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.amber.operator.distinct +package org.apache.texera.amber.operator.distinct -import org.apache.amber.core.tuple._ +import org.apache.texera.amber.core.tuple._ import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec class DistinctOpExecSpec extends AnyFlatSpec with BeforeAndAfter { diff --git a/common/workflow-operator/src/test/scala/org/apache/amber/operator/filter/SpecializedFilterOpExecSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/filter/SpecializedFilterOpExecSpec.scala similarity index 96% rename from common/workflow-operator/src/test/scala/org/apache/amber/operator/filter/SpecializedFilterOpExecSpec.scala rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/filter/SpecializedFilterOpExecSpec.scala index fda327d6ec4..95758fabc90 100644 --- a/common/workflow-operator/src/test/scala/org/apache/amber/operator/filter/SpecializedFilterOpExecSpec.scala +++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/filter/SpecializedFilterOpExecSpec.scala @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.amber.operator.filter +package org.apache.texera.amber.operator.filter -import org.apache.amber.core.tuple.{Attribute, AttributeType, Schema, Tuple} -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.tuple.{Attribute, AttributeType, Schema, Tuple} +import org.apache.texera.amber.util.JSONUtils.objectMapper import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec diff --git a/common/workflow-operator/src/test/scala/org/apache/amber/operator/hashJoin/HashJoinOpSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/hashJoin/HashJoinOpSpec.scala similarity index 95% rename from common/workflow-operator/src/test/scala/org/apache/amber/operator/hashJoin/HashJoinOpSpec.scala rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/hashJoin/HashJoinOpSpec.scala index 3d8a46217a4..5f99297fb45 100644 --- a/common/workflow-operator/src/test/scala/org/apache/amber/operator/hashJoin/HashJoinOpSpec.scala +++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/hashJoin/HashJoinOpSpec.scala @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.amber.operator.hashJoin +package org.apache.texera.amber.operator.hashJoin -import org.apache.amber.core.tuple._ -import org.apache.amber.core.workflow.PortIdentity -import org.apache.amber.operator.hashJoin.HashJoinOpDesc.HASH_JOIN_INTERNAL_KEY_NAME -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.tuple._ +import org.apache.texera.amber.core.workflow.PortIdentity +import org.apache.texera.amber.operator.hashJoin.HashJoinOpDesc.HASH_JOIN_INTERNAL_KEY_NAME +import org.apache.texera.amber.util.JSONUtils.objectMapper import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec class HashJoinOpSpec extends AnyFlatSpec with BeforeAndAfter { diff --git a/common/workflow-operator/src/test/scala/org/apache/amber/operator/intersect/IntersectOpExecSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/intersect/IntersectOpExecSpec.scala similarity index 94% rename from common/workflow-operator/src/test/scala/org/apache/amber/operator/intersect/IntersectOpExecSpec.scala rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/intersect/IntersectOpExecSpec.scala index d0285eec16a..5f3c30d0dea 100644 --- a/common/workflow-operator/src/test/scala/org/apache/amber/operator/intersect/IntersectOpExecSpec.scala +++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/intersect/IntersectOpExecSpec.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.operator.intersect +package org.apache.texera.amber.operator.intersect -import org.apache.amber.core.tuple._ -import org.apache.amber.core.virtualidentity.{OperatorIdentity, PhysicalOpIdentity} -import org.apache.amber.core.workflow.{PhysicalLink, PortIdentity} +import org.apache.texera.amber.core.tuple._ +import org.apache.texera.amber.core.virtualidentity.{OperatorIdentity, PhysicalOpIdentity} +import org.apache.texera.amber.core.workflow.{PhysicalLink, PortIdentity} import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec diff --git a/common/workflow-operator/src/test/scala/org/apache/amber/operator/intervalJoin/IntervalOpExecSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/intervalJoin/IntervalOpExecSpec.scala similarity index 97% rename from common/workflow-operator/src/test/scala/org/apache/amber/operator/intervalJoin/IntervalOpExecSpec.scala rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/intervalJoin/IntervalOpExecSpec.scala index b88d9c968e9..97c60129833 100644 --- a/common/workflow-operator/src/test/scala/org/apache/amber/operator/intervalJoin/IntervalOpExecSpec.scala +++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/intervalJoin/IntervalOpExecSpec.scala @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.amber.operator.intervalJoin +package org.apache.texera.amber.operator.intervalJoin -import org.apache.amber.core.tuple._ -import org.apache.amber.core.virtualidentity.{OperatorIdentity, PhysicalOpIdentity} -import org.apache.amber.core.workflow.{PhysicalLink, PortIdentity} -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.tuple._ +import org.apache.texera.amber.core.virtualidentity.{OperatorIdentity, PhysicalOpIdentity} +import org.apache.texera.amber.core.workflow.{PhysicalLink, PortIdentity} +import org.apache.texera.amber.util.JSONUtils.objectMapper import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec diff --git a/common/workflow-operator/src/test/scala/org/apache/amber/operator/keywordSearch/KeywordSearchOpExecSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/keywordSearch/KeywordSearchOpExecSpec.scala similarity index 97% rename from common/workflow-operator/src/test/scala/org/apache/amber/operator/keywordSearch/KeywordSearchOpExecSpec.scala rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/keywordSearch/KeywordSearchOpExecSpec.scala index 5abea46468a..e9e6cc72a69 100644 --- a/common/workflow-operator/src/test/scala/org/apache/amber/operator/keywordSearch/KeywordSearchOpExecSpec.scala +++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/keywordSearch/KeywordSearchOpExecSpec.scala @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.amber.operator.keywordSearch +package org.apache.texera.amber.operator.keywordSearch -import org.apache.amber.core.tuple.{Attribute, AttributeType, Schema, Tuple} -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.tuple.{Attribute, AttributeType, Schema, Tuple} +import org.apache.texera.amber.util.JSONUtils.objectMapper import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec diff --git a/common/workflow-operator/src/test/scala/org/apache/amber/operator/projection/ProjectionOpDescSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/projection/ProjectionOpDescSpec.scala similarity index 94% rename from common/workflow-operator/src/test/scala/org/apache/amber/operator/projection/ProjectionOpDescSpec.scala rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/projection/ProjectionOpDescSpec.scala index 03806072f7d..7ba36af7a36 100644 --- a/common/workflow-operator/src/test/scala/org/apache/amber/operator/projection/ProjectionOpDescSpec.scala +++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/projection/ProjectionOpDescSpec.scala @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.amber.operator.projection +package org.apache.texera.amber.operator.projection -import org.apache.amber.core.tuple.{Attribute, AttributeType, Schema} -import org.apache.amber.core.workflow.PortIdentity +import org.apache.texera.amber.core.tuple.{Attribute, AttributeType, Schema} +import org.apache.texera.amber.core.workflow.PortIdentity import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec class ProjectionOpDescSpec extends AnyFlatSpec with BeforeAndAfter { diff --git a/common/workflow-operator/src/test/scala/org/apache/amber/operator/projection/ProjectionOpExecSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/projection/ProjectionOpExecSpec.scala similarity index 97% rename from common/workflow-operator/src/test/scala/org/apache/amber/operator/projection/ProjectionOpExecSpec.scala rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/projection/ProjectionOpExecSpec.scala index 208d1effa7b..a514f0ab3e8 100644 --- a/common/workflow-operator/src/test/scala/org/apache/amber/operator/projection/ProjectionOpExecSpec.scala +++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/projection/ProjectionOpExecSpec.scala @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.amber.operator.projection +package org.apache.texera.amber.operator.projection -import org.apache.amber.core.tuple._ -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.tuple._ +import org.apache.texera.amber.util.JSONUtils.objectMapper import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec class ProjectionOpExecSpec extends AnyFlatSpec with BeforeAndAfter { diff --git a/common/workflow-operator/src/test/scala/org/apache/amber/operator/sort/StableMergeSortOpExecSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/sort/StableMergeSortOpExecSpec.scala similarity index 99% rename from common/workflow-operator/src/test/scala/org/apache/amber/operator/sort/StableMergeSortOpExecSpec.scala rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/sort/StableMergeSortOpExecSpec.scala index ecb38cfff4f..bd8d41eed0e 100644 --- a/common/workflow-operator/src/test/scala/org/apache/amber/operator/sort/StableMergeSortOpExecSpec.scala +++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/sort/StableMergeSortOpExecSpec.scala @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.amber.operator.sort +package org.apache.texera.amber.operator.sort -import org.apache.amber.core.tuple.{Attribute, AttributeType, Schema, Tuple} -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.tuple.{Attribute, AttributeType, Schema, Tuple} +import org.apache.texera.amber.util.JSONUtils.objectMapper import org.scalatest.flatspec.AnyFlatSpec import java.sql.Timestamp diff --git a/common/workflow-operator/src/test/scala/org/apache/amber/operator/sortPartitions/SortPartitionsOpExecSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/sortPartitions/SortPartitionsOpExecSpec.scala similarity index 93% rename from common/workflow-operator/src/test/scala/org/apache/amber/operator/sortPartitions/SortPartitionsOpExecSpec.scala rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/sortPartitions/SortPartitionsOpExecSpec.scala index 55198c4ab8c..afa9bda8180 100644 --- a/common/workflow-operator/src/test/scala/org/apache/amber/operator/sortPartitions/SortPartitionsOpExecSpec.scala +++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/sortPartitions/SortPartitionsOpExecSpec.scala @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.amber.operator.sortPartitions +package org.apache.texera.amber.operator.sortPartitions -import org.apache.amber.core.tuple._ -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.tuple._ +import org.apache.texera.amber.util.JSONUtils.objectMapper import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec class SortPartitionsOpExecSpec extends AnyFlatSpec with BeforeAndAfter { diff --git a/common/workflow-operator/src/test/scala/org/apache/amber/operator/source/fetcher/URLFetcherOpExecSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/source/fetcher/URLFetcherOpExecSpec.scala similarity index 92% rename from common/workflow-operator/src/test/scala/org/apache/amber/operator/source/fetcher/URLFetcherOpExecSpec.scala rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/source/fetcher/URLFetcherOpExecSpec.scala index e40dd1d099c..c61468c6832 100644 --- a/common/workflow-operator/src/test/scala/org/apache/amber/operator/source/fetcher/URLFetcherOpExecSpec.scala +++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/source/fetcher/URLFetcherOpExecSpec.scala @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.amber.operator.source.fetcher +package org.apache.texera.amber.operator.source.fetcher -import org.apache.amber.core.tuple.Schema -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.tuple.Schema +import org.apache.texera.amber.util.JSONUtils.objectMapper import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec class URLFetcherOpExecSpec extends AnyFlatSpec with BeforeAndAfter { diff --git a/common/workflow-operator/src/test/scala/org/apache/amber/operator/source/scan/FileScanSourceOpExecSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/source/scan/FileScanSourceOpExecSpec.scala similarity index 96% rename from common/workflow-operator/src/test/scala/org/apache/amber/operator/source/scan/FileScanSourceOpExecSpec.scala rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/source/scan/FileScanSourceOpExecSpec.scala index 07b09f0a268..9a23b3f1d61 100644 --- a/common/workflow-operator/src/test/scala/org/apache/amber/operator/source/scan/FileScanSourceOpExecSpec.scala +++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/source/scan/FileScanSourceOpExecSpec.scala @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.amber.operator.source.scan +package org.apache.texera.amber.operator.source.scan -import org.apache.amber.core.tuple.{AttributeType, BigObject, Schema, SchemaEnforceable} -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.tuple.{AttributeType, BigObject, Schema, SchemaEnforceable} +import org.apache.texera.amber.util.JSONUtils.objectMapper import org.scalatest.BeforeAndAfterAll import org.scalatest.flatspec.AnyFlatSpec diff --git a/common/workflow-operator/src/test/scala/org/apache/amber/operator/source/scan/csv/CSVScanSourceOpDescSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/source/scan/csv/CSVScanSourceOpDescSpec.scala similarity index 93% rename from common/workflow-operator/src/test/scala/org/apache/amber/operator/source/scan/csv/CSVScanSourceOpDescSpec.scala rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/source/scan/csv/CSVScanSourceOpDescSpec.scala index 5486fd03c85..96161672bac 100644 --- a/common/workflow-operator/src/test/scala/org/apache/amber/operator/source/scan/csv/CSVScanSourceOpDescSpec.scala +++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/source/scan/csv/CSVScanSourceOpDescSpec.scala @@ -17,12 +17,15 @@ * under the License. */ -package org.apache.amber.operator.source.scan.csv +package org.apache.texera.amber.operator.source.scan.csv -import org.apache.amber.core.storage.FileResolver -import org.apache.amber.core.tuple.{AttributeType, Schema} -import org.apache.amber.core.workflow.WorkflowContext.{DEFAULT_EXECUTION_ID, DEFAULT_WORKFLOW_ID} -import org.apache.amber.operator.TestOperators +import org.apache.texera.amber.core.storage.FileResolver +import org.apache.texera.amber.core.tuple.{AttributeType, Schema} +import org.apache.texera.amber.core.workflow.WorkflowContext.{ + DEFAULT_EXECUTION_ID, + DEFAULT_WORKFLOW_ID +} +import org.apache.texera.amber.operator.TestOperators import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec diff --git a/common/workflow-operator/src/test/scala/org/apache/amber/operator/source/scan/text/FileScanSourceOpDescSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/source/scan/text/FileScanSourceOpDescSpec.scala similarity index 95% rename from common/workflow-operator/src/test/scala/org/apache/amber/operator/source/scan/text/FileScanSourceOpDescSpec.scala rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/source/scan/text/FileScanSourceOpDescSpec.scala index a167c970ffe..8c086867052 100644 --- a/common/workflow-operator/src/test/scala/org/apache/amber/operator/source/scan/text/FileScanSourceOpDescSpec.scala +++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/source/scan/text/FileScanSourceOpDescSpec.scala @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.amber.operator.source.scan.text +package org.apache.texera.amber.operator.source.scan.text -import org.apache.amber.core.storage.FileResolver -import org.apache.amber.core.tuple.{AttributeType, Schema, SchemaEnforceable, Tuple} -import org.apache.amber.operator.TestOperators -import org.apache.amber.operator.source.scan.{ +import org.apache.texera.amber.core.storage.FileResolver +import org.apache.texera.amber.core.tuple.{AttributeType, Schema, SchemaEnforceable, Tuple} +import org.apache.texera.amber.operator.TestOperators +import org.apache.texera.amber.operator.source.scan.{ FileAttributeType, FileDecodingMethod, FileScanSourceOpDesc, FileScanSourceOpExec } -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.util.JSONUtils.objectMapper import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec diff --git a/common/workflow-operator/src/test/scala/org/apache/amber/operator/source/scan/text/TextInputSourceOpDescSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/source/scan/text/TextInputSourceOpDescSpec.scala similarity index 95% rename from common/workflow-operator/src/test/scala/org/apache/amber/operator/source/scan/text/TextInputSourceOpDescSpec.scala rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/source/scan/text/TextInputSourceOpDescSpec.scala index a5717e0daa1..d1b5a5f94ad 100644 --- a/common/workflow-operator/src/test/scala/org/apache/amber/operator/source/scan/text/TextInputSourceOpDescSpec.scala +++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/source/scan/text/TextInputSourceOpDescSpec.scala @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.amber.operator.source.scan.text +package org.apache.texera.amber.operator.source.scan.text -import org.apache.amber.core.tuple.{AttributeType, Schema, SchemaEnforceable, Tuple} -import org.apache.amber.operator.TestOperators -import org.apache.amber.operator.source.scan.FileAttributeType -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.tuple.{AttributeType, Schema, SchemaEnforceable, Tuple} +import org.apache.texera.amber.operator.TestOperators +import org.apache.texera.amber.operator.source.scan.FileAttributeType +import org.apache.texera.amber.util.JSONUtils.objectMapper import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec diff --git a/common/workflow-operator/src/test/scala/org/apache/amber/operator/symmetricDifference/SymmetricDifferenceOpExecSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/symmetricDifference/SymmetricDifferenceOpExecSpec.scala similarity index 97% rename from common/workflow-operator/src/test/scala/org/apache/amber/operator/symmetricDifference/SymmetricDifferenceOpExecSpec.scala rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/symmetricDifference/SymmetricDifferenceOpExecSpec.scala index fc222d4053d..7e263debe76 100644 --- a/common/workflow-operator/src/test/scala/org/apache/amber/operator/symmetricDifference/SymmetricDifferenceOpExecSpec.scala +++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/symmetricDifference/SymmetricDifferenceOpExecSpec.scala @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.amber.operator.symmetricDifference +package org.apache.texera.amber.operator.symmetricDifference -import org.apache.amber.core.tuple._ +import org.apache.texera.amber.core.tuple._ import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec class SymmetricDifferenceOpExecSpec extends AnyFlatSpec with BeforeAndAfter { diff --git a/common/workflow-operator/src/test/scala/org/apache/amber/operator/typecasting/TypeCastingOpExecSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/typecasting/TypeCastingOpExecSpec.scala similarity index 95% rename from common/workflow-operator/src/test/scala/org/apache/amber/operator/typecasting/TypeCastingOpExecSpec.scala rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/typecasting/TypeCastingOpExecSpec.scala index f906d127e2a..02b710a849d 100644 --- a/common/workflow-operator/src/test/scala/org/apache/amber/operator/typecasting/TypeCastingOpExecSpec.scala +++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/typecasting/TypeCastingOpExecSpec.scala @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.amber.operator.typecasting +package org.apache.texera.amber.operator.typecasting -import org.apache.amber.core.tuple._ -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.tuple._ +import org.apache.texera.amber.util.JSONUtils.objectMapper import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec class TypeCastingOpExecSpec extends AnyFlatSpec with BeforeAndAfter { diff --git a/common/workflow-operator/src/test/scala/org/apache/amber/operator/udf/python/PythonLambdaFunctionOpDescSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/udf/python/PythonLambdaFunctionOpDescSpec.scala similarity index 94% rename from common/workflow-operator/src/test/scala/org/apache/amber/operator/udf/python/PythonLambdaFunctionOpDescSpec.scala rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/udf/python/PythonLambdaFunctionOpDescSpec.scala index 9b70e2936a8..9a51257cc01 100644 --- a/common/workflow-operator/src/test/scala/org/apache/amber/operator/udf/python/PythonLambdaFunctionOpDescSpec.scala +++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/udf/python/PythonLambdaFunctionOpDescSpec.scala @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.amber.operator.udf.python +package org.apache.texera.amber.operator.udf.python -import org.apache.amber.core.tuple.{Attribute, AttributeType, Schema} -import org.apache.amber.core.workflow.PortIdentity +import org.apache.texera.amber.core.tuple.{Attribute, AttributeType, Schema} +import org.apache.texera.amber.core.workflow.PortIdentity import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec class PythonLambdaFunctionOpDescSpec extends AnyFlatSpec with BeforeAndAfter { diff --git a/common/workflow-operator/src/test/scala/org/apache/amber/operator/unneststring/UnnestStringOpExecSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/unneststring/UnnestStringOpExecSpec.scala similarity index 96% rename from common/workflow-operator/src/test/scala/org/apache/amber/operator/unneststring/UnnestStringOpExecSpec.scala rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/unneststring/UnnestStringOpExecSpec.scala index b9d823702d2..a746180c55d 100644 --- a/common/workflow-operator/src/test/scala/org/apache/amber/operator/unneststring/UnnestStringOpExecSpec.scala +++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/unneststring/UnnestStringOpExecSpec.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.operator.unneststring +package org.apache.texera.amber.operator.unneststring -import org.apache.amber.core.tuple._ -import org.apache.amber.core.workflow.PortIdentity -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.tuple._ +import org.apache.texera.amber.core.workflow.PortIdentity +import org.apache.texera.amber.util.JSONUtils.objectMapper import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec class UnnestStringOpExecSpec extends AnyFlatSpec with BeforeAndAfter { diff --git a/common/workflow-operator/src/test/scala/org/apache/amber/operator/visualization/DotPlot/DotPlotOpDescSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/DotPlot/DotPlotOpDescSpec.scala similarity index 95% rename from common/workflow-operator/src/test/scala/org/apache/amber/operator/visualization/DotPlot/DotPlotOpDescSpec.scala rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/DotPlot/DotPlotOpDescSpec.scala index 91a4c87f503..df1f4792cdd 100644 --- a/common/workflow-operator/src/test/scala/org/apache/amber/operator/visualization/DotPlot/DotPlotOpDescSpec.scala +++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/DotPlot/DotPlotOpDescSpec.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.visualization.DotPlot +package org.apache.texera.amber.operator.visualization.DotPlot import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec diff --git a/common/workflow-operator/src/test/scala/org/apache/amber/operator/visualization/ImageViz/ImageVisualizerOpDescSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/ImageViz/ImageVisualizerOpDescSpec.scala similarity index 94% rename from common/workflow-operator/src/test/scala/org/apache/amber/operator/visualization/ImageViz/ImageVisualizerOpDescSpec.scala rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/ImageViz/ImageVisualizerOpDescSpec.scala index 88732f55ad3..266f14e4d8a 100644 --- a/common/workflow-operator/src/test/scala/org/apache/amber/operator/visualization/ImageViz/ImageVisualizerOpDescSpec.scala +++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/ImageViz/ImageVisualizerOpDescSpec.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.visualization.ImageViz +package org.apache.texera.amber.operator.visualization.ImageViz import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec diff --git a/common/workflow-operator/src/test/scala/org/apache/amber/operator/visualization/barChart/BarChartOpDescSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/barChart/BarChartOpDescSpec.scala similarity index 96% rename from common/workflow-operator/src/test/scala/org/apache/amber/operator/visualization/barChart/BarChartOpDescSpec.scala rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/barChart/BarChartOpDescSpec.scala index 71064d4b77f..8e16d761919 100644 --- a/common/workflow-operator/src/test/scala/org/apache/amber/operator/visualization/barChart/BarChartOpDescSpec.scala +++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/barChart/BarChartOpDescSpec.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.visualization.barChart +package org.apache.texera.amber.operator.visualization.barChart import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec diff --git a/common/workflow-operator/src/test/scala/org/apache/amber/operator/visualization/bubbleChart/BubbleChartOpDescSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/bubbleChart/BubbleChartOpDescSpec.scala similarity index 95% rename from common/workflow-operator/src/test/scala/org/apache/amber/operator/visualization/bubbleChart/BubbleChartOpDescSpec.scala rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/bubbleChart/BubbleChartOpDescSpec.scala index 7697b3781f0..e03babbddb2 100644 --- a/common/workflow-operator/src/test/scala/org/apache/amber/operator/visualization/bubbleChart/BubbleChartOpDescSpec.scala +++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/bubbleChart/BubbleChartOpDescSpec.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.visualization.bubbleChart +package org.apache.texera.amber.operator.visualization.bubbleChart import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec diff --git a/common/workflow-operator/src/test/scala/org/apache/amber/operator/visualization/filledAreaPlot/FilledAreaPlotOpDescSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/filledAreaPlot/FilledAreaPlotOpDescSpec.scala similarity index 96% rename from common/workflow-operator/src/test/scala/org/apache/amber/operator/visualization/filledAreaPlot/FilledAreaPlotOpDescSpec.scala rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/filledAreaPlot/FilledAreaPlotOpDescSpec.scala index 7d341b1ea5e..244f65c60cb 100644 --- a/common/workflow-operator/src/test/scala/org/apache/amber/operator/visualization/filledAreaPlot/FilledAreaPlotOpDescSpec.scala +++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/filledAreaPlot/FilledAreaPlotOpDescSpec.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.visualization.filledAreaPlot +package org.apache.texera.amber.operator.visualization.filledAreaPlot import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec diff --git a/common/workflow-operator/src/test/scala/org/apache/amber/operator/visualization/ganttChart/GanttChartOpDescSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/ganttChart/GanttChartOpDescSpec.scala similarity index 97% rename from common/workflow-operator/src/test/scala/org/apache/amber/operator/visualization/ganttChart/GanttChartOpDescSpec.scala rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/ganttChart/GanttChartOpDescSpec.scala index ffdfea18f27..9a3461121e3 100644 --- a/common/workflow-operator/src/test/scala/org/apache/amber/operator/visualization/ganttChart/GanttChartOpDescSpec.scala +++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/ganttChart/GanttChartOpDescSpec.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.visualization.ganttChart +package org.apache.texera.amber.operator.visualization.ganttChart import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec diff --git a/common/workflow-operator/src/test/scala/org/apache/amber/operator/visualization/hierarchychart/HierarchyChartOpDescSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/hierarchychart/HierarchyChartOpDescSpec.scala similarity index 96% rename from common/workflow-operator/src/test/scala/org/apache/amber/operator/visualization/hierarchychart/HierarchyChartOpDescSpec.scala rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/hierarchychart/HierarchyChartOpDescSpec.scala index 51c98943502..7e11d005bb6 100644 --- a/common/workflow-operator/src/test/scala/org/apache/amber/operator/visualization/hierarchychart/HierarchyChartOpDescSpec.scala +++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/hierarchychart/HierarchyChartOpDescSpec.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.visualization.hierarchychart +package org.apache.texera.amber.operator.visualization.hierarchychart import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec diff --git a/common/workflow-operator/src/test/scala/org/apache/amber/operator/visualization/htmlviz/HtmlVizOpExecSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/htmlviz/HtmlVizOpExecSpec.scala similarity index 91% rename from common/workflow-operator/src/test/scala/org/apache/amber/operator/visualization/htmlviz/HtmlVizOpExecSpec.scala rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/htmlviz/HtmlVizOpExecSpec.scala index 5cf0635fe2b..05fb87556cd 100644 --- a/common/workflow-operator/src/test/scala/org/apache/amber/operator/visualization/htmlviz/HtmlVizOpExecSpec.scala +++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/htmlviz/HtmlVizOpExecSpec.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.operator.visualization.htmlviz +package org.apache.texera.amber.operator.visualization.htmlviz -import org.apache.amber.core.tuple._ -import org.apache.amber.core.workflow.PortIdentity -import org.apache.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.core.tuple._ +import org.apache.texera.amber.core.workflow.PortIdentity +import org.apache.texera.amber.util.JSONUtils.objectMapper import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec class HtmlVizOpExecSpec extends AnyFlatSpec with BeforeAndAfter { diff --git a/common/workflow-operator/src/test/scala/org/apache/amber/operator/visualization/pieChart/PieChartOpDescSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/pieChart/PieChartOpDescSpec.scala similarity index 94% rename from common/workflow-operator/src/test/scala/org/apache/amber/operator/visualization/pieChart/PieChartOpDescSpec.scala rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/pieChart/PieChartOpDescSpec.scala index fbaaf04a996..6c989a0a0e2 100644 --- a/common/workflow-operator/src/test/scala/org/apache/amber/operator/visualization/pieChart/PieChartOpDescSpec.scala +++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/pieChart/PieChartOpDescSpec.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.visualization.pieChart +package org.apache.texera.amber.operator.visualization.pieChart import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec diff --git a/common/workflow-operator/src/test/scala/org/apache/amber/operator/visualization/scatterplot/ScatterPlotOpDescSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/scatterplot/ScatterPlotOpDescSpec.scala similarity index 95% rename from common/workflow-operator/src/test/scala/org/apache/amber/operator/visualization/scatterplot/ScatterPlotOpDescSpec.scala rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/scatterplot/ScatterPlotOpDescSpec.scala index 6832e7e17cb..480d30512cb 100644 --- a/common/workflow-operator/src/test/scala/org/apache/amber/operator/visualization/scatterplot/ScatterPlotOpDescSpec.scala +++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/operator/visualization/scatterplot/ScatterPlotOpDescSpec.scala @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.amber.operator.visualization.scatterplot +package org.apache.texera.amber.operator.visualization.scatterplot import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec diff --git a/common/workflow-operator/src/test/scala/org/apache/amber/util/ArrowUtilsSpec.scala b/common/workflow-operator/src/test/scala/org/apache/texera/amber/util/ArrowUtilsSpec.scala similarity index 97% rename from common/workflow-operator/src/test/scala/org/apache/amber/util/ArrowUtilsSpec.scala rename to common/workflow-operator/src/test/scala/org/apache/texera/amber/util/ArrowUtilsSpec.scala index 3cd4dae4365..edeaf7d4ae7 100644 --- a/common/workflow-operator/src/test/scala/org/apache/amber/util/ArrowUtilsSpec.scala +++ b/common/workflow-operator/src/test/scala/org/apache/texera/amber/util/ArrowUtilsSpec.scala @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.amber.util +package org.apache.texera.amber.util -import org.apache.amber.core.tuple.AttributeTypeUtils.AttributeTypeException -import org.apache.amber.core.tuple.{AttributeType, Schema, Tuple} +import org.apache.texera.amber.core.tuple.AttributeTypeUtils.AttributeTypeException +import org.apache.texera.amber.core.tuple.{AttributeType, Schema, Tuple} import org.apache.arrow.memory.{BufferAllocator, RootAllocator} import org.apache.arrow.vector.VectorSchemaRoot import org.apache.arrow.vector.types.pojo.{ArrowType, Field} diff --git a/computing-unit-managing-service/src/main/scala/org/apache/texera/service/ComputingUnitManagingService.scala b/computing-unit-managing-service/src/main/scala/org/apache/texera/service/ComputingUnitManagingService.scala index 4639789fb10..1c0cf8768df 100644 --- a/computing-unit-managing-service/src/main/scala/org/apache/texera/service/ComputingUnitManagingService.scala +++ b/computing-unit-managing-service/src/main/scala/org/apache/texera/service/ComputingUnitManagingService.scala @@ -23,7 +23,7 @@ import com.fasterxml.jackson.module.scala.DefaultScalaModule import io.dropwizard.auth.AuthDynamicFeature import io.dropwizard.core.Application import io.dropwizard.core.setup.{Bootstrap, Environment} -import org.apache.amber.config.StorageConfig +import org.apache.texera.amber.config.StorageConfig import org.apache.texera.auth.{JwtAuthFilter, SessionUser} import org.apache.texera.dao.SqlServer import org.apache.texera.service.resource.{ diff --git a/computing-unit-managing-service/src/main/scala/org/apache/texera/service/resource/ComputingUnitManagingResource.scala b/computing-unit-managing-service/src/main/scala/org/apache/texera/service/resource/ComputingUnitManagingResource.scala index 640de35fc23..f1fddcd4d9d 100644 --- a/computing-unit-managing-service/src/main/scala/org/apache/texera/service/resource/ComputingUnitManagingResource.scala +++ b/computing-unit-managing-service/src/main/scala/org/apache/texera/service/resource/ComputingUnitManagingResource.scala @@ -25,7 +25,7 @@ import io.fabric8.kubernetes.client.KubernetesClientException import jakarta.annotation.security.RolesAllowed import jakarta.ws.rs._ import jakarta.ws.rs.core.{MediaType, Response} -import org.apache.amber.config.{EnvironmentalVariable, StorageConfig} +import org.apache.texera.amber.config.{EnvironmentalVariable, StorageConfig} import org.apache.commons.lang3.StringUtils import org.apache.texera.auth.JwtAuth.{TOKEN_EXPIRE_TIME_IN_MINUTES, jwtClaims} import org.apache.texera.auth.{JwtAuth, SessionUser} diff --git a/config-service/src/main/scala/org/apache/texera/service/ConfigService.scala b/config-service/src/main/scala/org/apache/texera/service/ConfigService.scala index ca3c2917401..c226eaf9c44 100644 --- a/config-service/src/main/scala/org/apache/texera/service/ConfigService.scala +++ b/config-service/src/main/scala/org/apache/texera/service/ConfigService.scala @@ -24,7 +24,7 @@ import com.typesafe.scalalogging.LazyLogging import io.dropwizard.auth.AuthDynamicFeature import io.dropwizard.core.Application import io.dropwizard.core.setup.{Bootstrap, Environment} -import org.apache.amber.config.StorageConfig +import org.apache.texera.amber.config.StorageConfig import org.apache.texera.auth.{JwtAuthFilter, SessionUser} import org.apache.texera.config.DefaultsConfig import org.apache.texera.dao.SqlServer diff --git a/file-service/src/main/scala/org/apache/texera/service/FileService.scala b/file-service/src/main/scala/org/apache/texera/service/FileService.scala index 9eab6fc1a48..a92eaca511a 100644 --- a/file-service/src/main/scala/org/apache/texera/service/FileService.scala +++ b/file-service/src/main/scala/org/apache/texera/service/FileService.scala @@ -25,8 +25,8 @@ import com.typesafe.scalalogging.LazyLogging import io.dropwizard.auth.AuthDynamicFeature import io.dropwizard.core.Application import io.dropwizard.core.setup.{Bootstrap, Environment} -import org.apache.amber.config.StorageConfig -import org.apache.amber.core.storage.util.LakeFSStorageClient +import org.apache.texera.amber.config.StorageConfig +import org.apache.texera.amber.core.storage.util.LakeFSStorageClient import org.apache.texera.auth.{JwtAuthFilter, SessionUser} import org.apache.texera.dao.SqlServer import org.apache.texera.service.`type`.DatasetFileNode diff --git a/file-service/src/main/scala/org/apache/texera/service/resource/DatasetResource.scala b/file-service/src/main/scala/org/apache/texera/service/resource/DatasetResource.scala index 75e2f6e601e..2a67440cf0e 100644 --- a/file-service/src/main/scala/org/apache/texera/service/resource/DatasetResource.scala +++ b/file-service/src/main/scala/org/apache/texera/service/resource/DatasetResource.scala @@ -23,10 +23,10 @@ import io.dropwizard.auth.Auth import jakarta.annotation.security.RolesAllowed import jakarta.ws.rs._ import jakarta.ws.rs.core._ -import org.apache.amber.config.StorageConfig -import org.apache.amber.core.storage.model.OnDataset -import org.apache.amber.core.storage.util.LakeFSStorageClient -import org.apache.amber.core.storage.{DocumentFactory, FileResolver} +import org.apache.texera.amber.config.StorageConfig +import org.apache.texera.amber.core.storage.model.OnDataset +import org.apache.texera.amber.core.storage.util.LakeFSStorageClient +import org.apache.texera.amber.core.storage.{DocumentFactory, FileResolver} import org.apache.texera.auth.SessionUser import org.apache.texera.dao.SqlServer import org.apache.texera.dao.SqlServer.withTransaction diff --git a/file-service/src/main/scala/org/apache/texera/service/type/dataset/DatasetFileNode.scala b/file-service/src/main/scala/org/apache/texera/service/type/dataset/DatasetFileNode.scala index d8efe083e49..7c91d30b94a 100644 --- a/file-service/src/main/scala/org/apache/texera/service/type/dataset/DatasetFileNode.scala +++ b/file-service/src/main/scala/org/apache/texera/service/type/dataset/DatasetFileNode.scala @@ -20,7 +20,7 @@ package org.apache.texera.service.`type` import io.lakefs.clients.sdk.model.ObjectStats -import org.apache.amber.core.storage.util.dataset.PhysicalFileNode +import org.apache.texera.amber.core.storage.util.dataset.PhysicalFileNode import java.util import scala.collection.mutable diff --git a/file-service/src/test/scala/org/apache/texera/service/MockLakeFS.scala b/file-service/src/test/scala/org/apache/texera/service/MockLakeFS.scala index 215ae9a47da..fd1f0b8c903 100644 --- a/file-service/src/test/scala/org/apache/texera/service/MockLakeFS.scala +++ b/file-service/src/test/scala/org/apache/texera/service/MockLakeFS.scala @@ -20,7 +20,7 @@ package org.apache.texera.service import com.dimafeng.testcontainers._ -import org.apache.amber.config.StorageConfig +import org.apache.texera.amber.config.StorageConfig import org.apache.texera.service.util.S3StorageClient import org.scalatest.{BeforeAndAfterAll, Suite} import org.testcontainers.containers.Network diff --git a/file-service/src/test/scala/org/apache/texera/service/resource/DatasetResourceSpec.scala b/file-service/src/test/scala/org/apache/texera/service/resource/DatasetResourceSpec.scala index da5edd94eb0..f526d9d5610 100644 --- a/file-service/src/test/scala/org/apache/texera/service/resource/DatasetResourceSpec.scala +++ b/file-service/src/test/scala/org/apache/texera/service/resource/DatasetResourceSpec.scala @@ -20,7 +20,7 @@ package org.apache.texera.service.resource import jakarta.ws.rs.{BadRequestException, ForbiddenException} -import org.apache.amber.core.storage.util.LakeFSStorageClient +import org.apache.texera.amber.core.storage.util.LakeFSStorageClient import org.apache.texera.auth.SessionUser import org.apache.texera.dao.MockTexeraDB import org.apache.texera.dao.jooq.generated.enums.{PrivilegeEnum, UserRoleEnum} diff --git a/frontend/src/app/common/type/physical-plan.ts b/frontend/src/app/common/type/physical-plan.ts index f0a045a1b34..a2efaa5b936 100644 --- a/frontend/src/app/common/type/physical-plan.ts +++ b/frontend/src/app/common/type/physical-plan.ts @@ -21,8 +21,8 @@ import { ExecutionIdentity, PhysicalOpIdentity, WorkflowIdentity, -} from "./proto/org/apache/amber/engine/common/virtualidentity"; -import { PhysicalLink } from "./proto/org/apache/amber/engine/common/workflow"; +} from "./proto/org/apache/texera/amber/engine/common/virtualidentity"; +import { PhysicalLink } from "./proto/org/apache/texera/amber/engine/common/workflow"; export interface PhysicalOp { id: PhysicalOpIdentity; diff --git a/frontend/src/app/common/type/proto/org/apache/amber/engine/common/virtualidentity.ts b/frontend/src/app/common/type/proto/org/apache/texera/amber/engine/common/virtualidentity.ts similarity index 99% rename from frontend/src/app/common/type/proto/org/apache/amber/engine/common/virtualidentity.ts rename to frontend/src/app/common/type/proto/org/apache/texera/amber/engine/common/virtualidentity.ts index b0821b0ba8b..9b1b10d0c7c 100644 --- a/frontend/src/app/common/type/proto/org/apache/amber/engine/common/virtualidentity.ts +++ b/frontend/src/app/common/type/proto/org/apache/texera/amber/engine/common/virtualidentity.ts @@ -26,7 +26,7 @@ /* eslint-disable */ import { BinaryReader, BinaryWriter } from "@bufbuild/protobuf/wire"; -export const protobufPackage = "org.apache.amber.engine.common"; +export const protobufPackage = "org.apache.texera.amber.engine.common"; export interface WorkflowIdentity { id: number; diff --git a/frontend/src/app/common/type/proto/org/apache/amber/engine/common/workflow.ts b/frontend/src/app/common/type/proto/org/apache/texera/amber/engine/common/workflow.ts similarity index 99% rename from frontend/src/app/common/type/proto/org/apache/amber/engine/common/workflow.ts rename to frontend/src/app/common/type/proto/org/apache/texera/amber/engine/common/workflow.ts index 917762f0b22..05dc6cde454 100644 --- a/frontend/src/app/common/type/proto/org/apache/amber/engine/common/workflow.ts +++ b/frontend/src/app/common/type/proto/org/apache/texera/amber/engine/common/workflow.ts @@ -27,7 +27,7 @@ import { BinaryReader, BinaryWriter } from "@bufbuild/protobuf/wire"; import { PhysicalOpIdentity } from "./virtualidentity"; -export const protobufPackage = "org.apache.amber.engine.common"; +export const protobufPackage = "org.apache.texera.amber.engine.common"; export interface PortIdentity { id: number; diff --git a/frontend/src/app/common/util/port-identity-serde.ts b/frontend/src/app/common/util/port-identity-serde.ts index 136907aa5c2..3041c7d454c 100644 --- a/frontend/src/app/common/util/port-identity-serde.ts +++ b/frontend/src/app/common/util/port-identity-serde.ts @@ -16,7 +16,7 @@ * limitations under the License. */ -import { PortIdentity } from "../type/proto/org/apache/amber/engine/common/workflow"; +import { PortIdentity } from "../type/proto/org/apache/texera/amber/engine/common/workflow"; /** * Serializes a PortIdentity object to a string in the format "{isInput}-{id}-{internal}" diff --git a/workflow-compiling-service/src/main/scala/org/apache/amber/compiler/WorkflowCompiler.scala b/workflow-compiling-service/src/main/scala/org/apache/texera/amber/compiler/WorkflowCompiler.scala similarity index 93% rename from workflow-compiling-service/src/main/scala/org/apache/amber/compiler/WorkflowCompiler.scala rename to workflow-compiling-service/src/main/scala/org/apache/texera/amber/compiler/WorkflowCompiler.scala index 5e21add56ed..25166e7ac52 100644 --- a/workflow-compiling-service/src/main/scala/org/apache/amber/compiler/WorkflowCompiler.scala +++ b/workflow-compiling-service/src/main/scala/org/apache/texera/amber/compiler/WorkflowCompiler.scala @@ -17,20 +17,25 @@ * under the License. */ -package org.apache.amber.compiler +package org.apache.texera.amber.compiler import com.google.protobuf.timestamp.Timestamp import com.typesafe.scalalogging.{LazyLogging, Logger} -import org.apache.amber.compiler.WorkflowCompiler.{ +import org.apache.texera.amber.compiler.WorkflowCompiler.{ collectOutputSchemaFromPhysicalPlan, convertErrorListToWorkflowFatalErrorMap } -import org.apache.amber.compiler.model.{LogicalPlan, LogicalPlanPojo} -import org.apache.amber.core.tuple.Schema -import org.apache.amber.core.virtualidentity.OperatorIdentity -import org.apache.amber.core.workflow.{PhysicalLink, PhysicalPlan, PortIdentity, WorkflowContext} -import org.apache.amber.core.workflowruntimestate.FatalErrorType.COMPILATION_ERROR -import org.apache.amber.core.workflowruntimestate.WorkflowFatalError +import org.apache.texera.amber.compiler.model.{LogicalPlan, LogicalPlanPojo} +import org.apache.texera.amber.core.tuple.Schema +import org.apache.texera.amber.core.virtualidentity.OperatorIdentity +import org.apache.texera.amber.core.workflow.{ + PhysicalLink, + PhysicalPlan, + PortIdentity, + WorkflowContext +} +import org.apache.texera.amber.core.workflowruntimestate.FatalErrorType.COMPILATION_ERROR +import org.apache.texera.amber.core.workflowruntimestate.WorkflowFatalError import java.time.Instant import scala.collection.mutable diff --git a/workflow-compiling-service/src/main/scala/org/apache/amber/compiler/model/LogicalLink.scala b/workflow-compiling-service/src/main/scala/org/apache/texera/amber/compiler/model/LogicalLink.scala similarity index 88% rename from workflow-compiling-service/src/main/scala/org/apache/amber/compiler/model/LogicalLink.scala rename to workflow-compiling-service/src/main/scala/org/apache/texera/amber/compiler/model/LogicalLink.scala index 3d77354ef09..5c7662f9668 100644 --- a/workflow-compiling-service/src/main/scala/org/apache/amber/compiler/model/LogicalLink.scala +++ b/workflow-compiling-service/src/main/scala/org/apache/texera/amber/compiler/model/LogicalLink.scala @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.amber.compiler.model +package org.apache.texera.amber.compiler.model import com.fasterxml.jackson.annotation.{JsonCreator, JsonProperty} -import org.apache.amber.core.virtualidentity.OperatorIdentity -import org.apache.amber.core.workflow.PortIdentity +import org.apache.texera.amber.core.virtualidentity.OperatorIdentity +import org.apache.texera.amber.core.workflow.PortIdentity case class LogicalLink( @JsonProperty("fromOpId") fromOpId: OperatorIdentity, diff --git a/workflow-compiling-service/src/main/scala/org/apache/amber/compiler/model/LogicalPlan.scala b/workflow-compiling-service/src/main/scala/org/apache/texera/amber/compiler/model/LogicalPlan.scala similarity index 92% rename from workflow-compiling-service/src/main/scala/org/apache/amber/compiler/model/LogicalPlan.scala rename to workflow-compiling-service/src/main/scala/org/apache/texera/amber/compiler/model/LogicalPlan.scala index ed6f9d9ee12..eecb435cc87 100644 --- a/workflow-compiling-service/src/main/scala/org/apache/amber/compiler/model/LogicalPlan.scala +++ b/workflow-compiling-service/src/main/scala/org/apache/texera/amber/compiler/model/LogicalPlan.scala @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.amber.compiler.model +package org.apache.texera.amber.compiler.model import com.typesafe.scalalogging.LazyLogging -import org.apache.amber.core.storage.FileResolver -import org.apache.amber.core.virtualidentity.OperatorIdentity -import org.apache.amber.core.workflow.PortIdentity -import org.apache.amber.operator.LogicalOp -import org.apache.amber.operator.source.scan.ScanSourceOpDesc +import org.apache.texera.amber.core.storage.FileResolver +import org.apache.texera.amber.core.virtualidentity.OperatorIdentity +import org.apache.texera.amber.core.workflow.PortIdentity +import org.apache.texera.amber.operator.LogicalOp +import org.apache.texera.amber.operator.source.scan.ScanSourceOpDesc import org.jgrapht.graph.DirectedAcyclicGraph import org.jgrapht.util.SupplierUtil diff --git a/workflow-compiling-service/src/main/scala/org/apache/amber/compiler/model/LogicalPlanPojo.scala b/workflow-compiling-service/src/main/scala/org/apache/texera/amber/compiler/model/LogicalPlanPojo.scala similarity index 90% rename from workflow-compiling-service/src/main/scala/org/apache/amber/compiler/model/LogicalPlanPojo.scala rename to workflow-compiling-service/src/main/scala/org/apache/texera/amber/compiler/model/LogicalPlanPojo.scala index 27e23939fc4..151ee863fa7 100644 --- a/workflow-compiling-service/src/main/scala/org/apache/amber/compiler/model/LogicalPlanPojo.scala +++ b/workflow-compiling-service/src/main/scala/org/apache/texera/amber/compiler/model/LogicalPlanPojo.scala @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.amber.compiler.model +package org.apache.texera.amber.compiler.model -import org.apache.amber.operator.LogicalOp +import org.apache.texera.amber.operator.LogicalOp case class LogicalPlanPojo( operators: List[LogicalOp], diff --git a/workflow-compiling-service/src/main/scala/org/apache/texera/service/WorkflowCompilingService.scala b/workflow-compiling-service/src/main/scala/org/apache/texera/service/WorkflowCompilingService.scala index 0763a514201..27aad902fee 100644 --- a/workflow-compiling-service/src/main/scala/org/apache/texera/service/WorkflowCompilingService.scala +++ b/workflow-compiling-service/src/main/scala/org/apache/texera/service/WorkflowCompilingService.scala @@ -22,8 +22,8 @@ package org.apache.texera.service import com.fasterxml.jackson.module.scala.DefaultScalaModule import io.dropwizard.core.Application import io.dropwizard.core.setup.{Bootstrap, Environment} -import org.apache.amber.config.StorageConfig -import org.apache.amber.util.ObjectMapperUtils +import org.apache.texera.amber.config.StorageConfig +import org.apache.texera.amber.util.ObjectMapperUtils import org.apache.texera.dao.SqlServer import org.apache.texera.service.resource.{HealthCheckResource, WorkflowCompilationResource} diff --git a/workflow-compiling-service/src/main/scala/org/apache/texera/service/resource/WorkflowCompilationResource.scala b/workflow-compiling-service/src/main/scala/org/apache/texera/service/resource/WorkflowCompilationResource.scala index c2413907a31..f311f31d0b7 100644 --- a/workflow-compiling-service/src/main/scala/org/apache/texera/service/resource/WorkflowCompilationResource.scala +++ b/workflow-compiling-service/src/main/scala/org/apache/texera/service/resource/WorkflowCompilationResource.scala @@ -24,13 +24,13 @@ import com.typesafe.scalalogging.LazyLogging import jakarta.annotation.security.RolesAllowed import jakarta.ws.rs.core.MediaType import jakarta.ws.rs.{Consumes, POST, Path, Produces} -import org.apache.amber.compiler.WorkflowCompiler -import org.apache.amber.compiler.model.LogicalPlanPojo -import org.apache.amber.core.tuple.Attribute -import org.apache.amber.core.virtualidentity.WorkflowIdentity -import org.apache.amber.core.workflow.{PhysicalPlan, WorkflowContext} -import org.apache.amber.core.workflowruntimestate.WorkflowFatalError -import org.apache.amber.util.serde.PortIdentityKeySerializer +import org.apache.texera.amber.compiler.WorkflowCompiler +import org.apache.texera.amber.compiler.model.LogicalPlanPojo +import org.apache.texera.amber.core.tuple.Attribute +import org.apache.texera.amber.core.virtualidentity.WorkflowIdentity +import org.apache.texera.amber.core.workflow.{PhysicalPlan, WorkflowContext} +import org.apache.texera.amber.core.workflowruntimestate.WorkflowFatalError +import org.apache.texera.amber.util.serde.PortIdentityKeySerializer @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, diff --git a/workflow-compiling-service/src/test/scala/org/apache/texera/service/resource/WorkflowCompilationResourceSpec.scala b/workflow-compiling-service/src/test/scala/org/apache/texera/service/resource/WorkflowCompilationResourceSpec.scala index b603ac2574a..17e231270c0 100644 --- a/workflow-compiling-service/src/test/scala/org/apache/texera/service/resource/WorkflowCompilationResourceSpec.scala +++ b/workflow-compiling-service/src/test/scala/org/apache/texera/service/resource/WorkflowCompilationResourceSpec.scala @@ -23,20 +23,20 @@ import com.fasterxml.jackson.databind.node.ObjectNode import io.dropwizard.testing.junit5.ResourceExtension import jakarta.ws.rs.client.Entity import jakarta.ws.rs.core.{MediaType, Response} -import org.apache.amber.compiler.model.{LogicalLink, LogicalPlanPojo} -import org.apache.amber.core.tuple.{Attribute, AttributeType} -import org.apache.amber.core.workflow.PortIdentity -import org.apache.amber.operator.filter.{ +import org.apache.texera.amber.compiler.model.{LogicalLink, LogicalPlanPojo} +import org.apache.texera.amber.core.tuple.{Attribute, AttributeType} +import org.apache.texera.amber.core.workflow.PortIdentity +import org.apache.texera.amber.operator.filter.{ ComparisonType, FilterOpDesc, FilterPredicate, SpecializedFilterOpDesc } -import org.apache.amber.operator.limit.LimitOpDesc -import org.apache.amber.operator.projection.{AttributeUnit, ProjectionOpDesc} -import org.apache.amber.operator.source.scan.csv.CSVScanSourceOpDesc -import org.apache.amber.util.JSONUtils.objectMapper -import org.apache.amber.util.serde.PortIdentityKeySerializer +import org.apache.texera.amber.operator.limit.LimitOpDesc +import org.apache.texera.amber.operator.projection.{AttributeUnit, ProjectionOpDesc} +import org.apache.texera.amber.operator.source.scan.csv.CSVScanSourceOpDesc +import org.apache.texera.amber.util.JSONUtils.objectMapper +import org.apache.texera.amber.util.serde.PortIdentityKeySerializer import org.assertj.core.api.Assertions.assertThat import org.scalatest.BeforeAndAfterAll import org.scalatest.flatspec.AnyFlatSpec From cb7da2a03537b2d35b6298c3795d47e5aa48beda Mon Sep 17 00:00:00 2001 From: LJX2017 <48950301+LJX2017@users.noreply.github.com> Date: Mon, 1 Dec 2025 19:22:19 -0800 Subject: [PATCH 123/136] feat: add run configurations to improve developer experience (#4087) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ### What changes were proposed in this PR? This PR adds pre-configured IntelliJ run configurations for: - launching all 8 backend microservices, - the frontend service, - and lakeFS via Docker Compose. With these changes, developers can now launch the backend services, lakeFS, and frontend directly from IntelliJ’s run menu, eliminating the need to manually locate and configure each relevant class or compose file. This leverages IntelliJ’s built-in Compound and individual run configurations, so no additional plugins are required. https://github.com/user-attachments/assets/9ef8fb13-2dc3-4598-ba44-0540d37202db ### Any related issues, documentation, discussions? Fixes #4045 ### How was this PR tested? Verified on a local IntelliJ IDEA environment. The Compound run config cleanly launches all backend microservices in parallel. ### Was this PR authored or co-authored using generative AI tooling? No --------- Co-authored-by: Xinyuan Lin Co-authored-by: Chen Li --- .run/AccessControlService.run.xml | 33 +++++++++++++++++++++++ .run/ComputingUnitManagingService.run.xml | 33 +++++++++++++++++++++++ .run/ComputingUnitMaster.run.xml | 33 +++++++++++++++++++++++ .run/ComputingUnitWorker.run.xml | 33 +++++++++++++++++++++++ .run/ConfigService.run.xml | 33 +++++++++++++++++++++++ .run/FileService.run.xml | 33 +++++++++++++++++++++++ .run/TexeraWebApplication.run.xml | 33 +++++++++++++++++++++++ .run/WorkflowCompilingService.run.xml | 33 +++++++++++++++++++++++ .run/frontend.run.xml | 30 +++++++++++++++++++++ .run/texera micro services.run.xml | 31 +++++++++++++++++++++ .run/texera-lakefs.run.xml | 28 +++++++++++++++++++ 11 files changed, 353 insertions(+) create mode 100644 .run/AccessControlService.run.xml create mode 100644 .run/ComputingUnitManagingService.run.xml create mode 100644 .run/ComputingUnitMaster.run.xml create mode 100644 .run/ComputingUnitWorker.run.xml create mode 100644 .run/ConfigService.run.xml create mode 100644 .run/FileService.run.xml create mode 100644 .run/TexeraWebApplication.run.xml create mode 100644 .run/WorkflowCompilingService.run.xml create mode 100644 .run/frontend.run.xml create mode 100644 .run/texera micro services.run.xml create mode 100644 .run/texera-lakefs.run.xml diff --git a/.run/AccessControlService.run.xml b/.run/AccessControlService.run.xml new file mode 100644 index 00000000000..20e908f2ad3 --- /dev/null +++ b/.run/AccessControlService.run.xml @@ -0,0 +1,33 @@ + + + + + \ No newline at end of file diff --git a/.run/ComputingUnitManagingService.run.xml b/.run/ComputingUnitManagingService.run.xml new file mode 100644 index 00000000000..c7a2c4bf85e --- /dev/null +++ b/.run/ComputingUnitManagingService.run.xml @@ -0,0 +1,33 @@ + + + + + \ No newline at end of file diff --git a/.run/ComputingUnitMaster.run.xml b/.run/ComputingUnitMaster.run.xml new file mode 100644 index 00000000000..78a818af291 --- /dev/null +++ b/.run/ComputingUnitMaster.run.xml @@ -0,0 +1,33 @@ + + + + + \ No newline at end of file diff --git a/.run/ComputingUnitWorker.run.xml b/.run/ComputingUnitWorker.run.xml new file mode 100644 index 00000000000..a5e4c905057 --- /dev/null +++ b/.run/ComputingUnitWorker.run.xml @@ -0,0 +1,33 @@ + + + + + \ No newline at end of file diff --git a/.run/ConfigService.run.xml b/.run/ConfigService.run.xml new file mode 100644 index 00000000000..cfbd94abc99 --- /dev/null +++ b/.run/ConfigService.run.xml @@ -0,0 +1,33 @@ + + + + + \ No newline at end of file diff --git a/.run/FileService.run.xml b/.run/FileService.run.xml new file mode 100644 index 00000000000..76a3f5cf31e --- /dev/null +++ b/.run/FileService.run.xml @@ -0,0 +1,33 @@ + + + + + \ No newline at end of file diff --git a/.run/TexeraWebApplication.run.xml b/.run/TexeraWebApplication.run.xml new file mode 100644 index 00000000000..b6537a0ef15 --- /dev/null +++ b/.run/TexeraWebApplication.run.xml @@ -0,0 +1,33 @@ + + + + + \ No newline at end of file diff --git a/.run/WorkflowCompilingService.run.xml b/.run/WorkflowCompilingService.run.xml new file mode 100644 index 00000000000..78f1a05861d --- /dev/null +++ b/.run/WorkflowCompilingService.run.xml @@ -0,0 +1,33 @@ + + + + + \ No newline at end of file diff --git a/.run/frontend.run.xml b/.run/frontend.run.xml new file mode 100644 index 00000000000..8132f576027 --- /dev/null +++ b/.run/frontend.run.xml @@ -0,0 +1,30 @@ + + + + + + +