This is an automated email from the ASF dual-hosted git repository. Xiao-zhen-Liu pushed a commit to branch xiaozhen-caching-prototype in repository https://gitbox.apache.org/repos/asf/texera.git
commit a72fe949c5deb7be57db822e7c0fd683a8bd5546 Author: Xiaozhen Liu <[email protected]> AuthorDate: Fri Jan 9 10:08:21 2026 -0800 feat(cache): update file paths after merge. --- .../architecture/scheduling/RegionExecutionCoordinator.scala | 2 +- .../architecture/scheduling/WorkflowExecutionCoordinator.scala | 2 +- .../org/apache/texera/web/service/WorkflowExecutionService.scala | 8 ++++---- .../org/apache/texera/amber/core/workflow/WorkflowSettings.scala | 2 +- .../{ => texera}/amber/core/workflow/cache/FingerprintUtil.scala | 9 ++++----- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/RegionExecutionCoordinator.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/RegionExecutionCoordinator.scala index 1bcd478b9a..a1bd6bdd17 100644 --- a/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/RegionExecutionCoordinator.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/RegionExecutionCoordinator.scala @@ -74,7 +74,7 @@ import scala.concurrent.duration.Duration class RegionExecutionCoordinator( region: Region, workflowExecution: WorkflowExecution, - executionId: org.apache.amber.core.virtualidentity.ExecutionIdentity, + executionId: org.apache.texera.amber.core.virtualidentity.ExecutionIdentity, asyncRPCClient: AsyncRPCClient, controllerConfig: ControllerConfig, actorService: AkkaActorService, diff --git a/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/WorkflowExecutionCoordinator.scala b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/WorkflowExecutionCoordinator.scala index dd6c1041da..893955f5a6 100644 --- a/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/WorkflowExecutionCoordinator.scala +++ b/amber/src/main/scala/org/apache/texera/amber/engine/architecture/scheduling/WorkflowExecutionCoordinator.scala @@ -37,7 +37,7 @@ class WorkflowExecutionCoordinator( workflowExecution: WorkflowExecution, controllerConfig: ControllerConfig, asyncRPCClient: AsyncRPCClient, - executionId: org.apache.amber.core.virtualidentity.ExecutionIdentity + executionId: org.apache.texera.amber.core.virtualidentity.ExecutionIdentity ) extends LazyLogging { private val executedRegions: mutable.ListBuffer[Set[Region]] = mutable.ListBuffer() 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 5e6683024a..ade57d403b 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 @@ -28,9 +28,9 @@ import org.apache.texera.amber.engine.architecture.rpc.controlreturns.WorkflowAg 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.amber.core.workflow.cache.FingerprintUtil -import org.apache.amber.core.workflow.{CachedOutput, GlobalPortIdentity} -import org.apache.amber.util.serde.GlobalPortIdentitySerde.SerdeOps +import org.apache.texera.amber.core.workflow.cache.FingerprintUtil +import org.apache.texera.amber.core.workflow.{CachedOutput, GlobalPortIdentity} +import org.apache.texera.amber.util.serde.GlobalPortIdentitySerde.SerdeOps import org.apache.texera.web.model.websocket.event.{ TexeraWebSocketEvent, WorkflowErrorEvent, @@ -107,7 +107,7 @@ class WorkflowExecutionService( var executionConsoleService: ExecutionConsoleService = _ private def computeCachedOutputs( - physicalPlan: org.apache.amber.core.workflow.PhysicalPlan + physicalPlan: org.apache.texera.amber.core.workflow.PhysicalPlan ): Map[String, CachedOutput] = { physicalPlan.operators .flatMap(op => op.outputPorts.keys.map(pid => GlobalPortIdentity(op.id, pid))) diff --git a/common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/WorkflowSettings.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/WorkflowSettings.scala index c331de2def..d9799f0104 100644 --- a/common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/WorkflowSettings.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/WorkflowSettings.scala @@ -19,7 +19,7 @@ package org.apache.texera.amber.core.workflow -import org.apache.amber.core.virtualidentity.ExecutionIdentity +import org.apache.texera.amber.core.virtualidentity.ExecutionIdentity import java.net.URI diff --git a/common/workflow-core/src/main/scala/org/apache/amber/core/workflow/cache/FingerprintUtil.scala b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/cache/FingerprintUtil.scala similarity index 95% rename from common/workflow-core/src/main/scala/org/apache/amber/core/workflow/cache/FingerprintUtil.scala rename to common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/cache/FingerprintUtil.scala index 0ec50917f5..c4c7b2c5d6 100644 --- a/common/workflow-core/src/main/scala/org/apache/amber/core/workflow/cache/FingerprintUtil.scala +++ b/common/workflow-core/src/main/scala/org/apache/texera/amber/core/workflow/cache/FingerprintUtil.scala @@ -17,14 +17,13 @@ * under the License. */ -package org.apache.amber.core.workflow.cache +package org.apache.texera.amber.core.workflow.cache import com.fasterxml.jackson.annotation.JsonInclude -import com.fasterxml.jackson.databind.SerializationFeature +import com.fasterxml.jackson.databind.{ObjectMapper, SerializationFeature} import com.fasterxml.jackson.databind.node.ObjectNode -import com.fasterxml.jackson.databind.ObjectMapper -import org.apache.amber.core.executor.OpExecInitInfo -import org.apache.amber.core.workflow.{GlobalPortIdentity, PhysicalLink, PhysicalOp, PhysicalPlan} +import org.apache.texera.amber.core.executor.OpExecInitInfo +import org.apache.texera.amber.core.workflow.{GlobalPortIdentity, PhysicalLink, PhysicalOp, PhysicalPlan} import java.nio.charset.StandardCharsets import java.security.MessageDigest
